Version bump for Gnome 3.6. Switch to python-any-r1 and EAPI=5. connman and nm USE flags are mutually exclusive. USE=debug is not handled by gnome2.eclass since it does not rely on gnome macros. Drop old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 43 insertions, 87 deletions

diff --git a/net-im/telepathy-mission-control/ChangeLog b/net-im/telepathy-mission-control/ChangeLog
index 9f4a25b0c0d9..5a6e3b5ddd56 100644
--- a/net-im/telepathy-mission-control/ChangeLog
+++ b/net-im/telepathy-mission-control/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-im/telepathy-mission-control
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.78 2012/12/08 21:40:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.79 2012/12/23 16:22:09 eva Exp $
+
+*telepathy-mission-control-5.14.0-r1 (23 Dec 2012)
+
+  23 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-mission-control-5.10.1.ebuild,
+  -telepathy-mission-control-5.12.2.ebuild,
+  +telepathy-mission-control-5.14.0-r1.ebuild:
+  Version bump for Gnome 3.6. Switch to python-any-r1 and EAPI=5. connman and
+  nm USE flags are mutually exclusive. USE=debug is not handled by
+  gnome2.eclass since it does not rely on gnome macros. Drop old revisions.
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   telepathy-mission-control-5.12.3.ebuild:
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index e2db7c0de319..7108872681f1 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,8 +1,16 @@
-DIST telepathy-mission-control-5.10.1.tar.gz 1010202 SHA256 e1d9ce7b8827c19bf2e5d522641ae86ff2476c605de2533d608721ea49023a10 SHA512 b8021326f52c79086f4f821ea61f38e5861c8b861b6b878941005e577c10c997633ee6b2e62a292dd975b0c3f1de837b07c481706bd573bac7abc75b611ff80c WHIRLPOOL 29379b5f0a21a387df2006db55f1aca7fa198e223bdd8e1b6b514df1edac986a37da47446be9e8a041096784986f1071a7da8335784fe541ddfe1861169fa434
-DIST telepathy-mission-control-5.12.2.tar.gz 1035280 SHA256 85318e371f0c0cec141fa7db538071c0b98b0dce4c6a0ea073745735592656c3 SHA512 61ac0f473a5e9d67ed8f04c83079c1fd0da788109d6d1452c440618e09b97020ed29c95632219987da9e8ad37a80b807a3362365c4a4087112eec518cbb469e7 WHIRLPOOL eb47993217a56ba3f3df8993eb14e0d2ba7f7949d3d2eb90a6b2b9e34f57138dd3f9da54e0e271fdceada342e127471d4229daf284183191b348bea276532091
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST telepathy-mission-control-5.12.3.tar.gz 1036810 SHA256 15db588e662f9f02312afccaadad8a79afe1abf9e5fd478cfb6826770d9bba0b SHA512 2cad06e6ae030181b3d5c357e7dafc115bd2c987a26f5d5fb80053d6704dbe9cd559d2186e0b401041ffe1029ee15bb748e1fe815635998a90e4306c4c4a663e WHIRLPOOL a971ca4889ad4fe773b1889beba4fcab366bd7d714ec401dce29cd20907fe181610e1f5fb9c5966b536ff5031a8fb8a08549602ace3d9912b75beb74eb8573aa
-EBUILD telepathy-mission-control-5.10.1.ebuild 1584 SHA256 14240b8ebba9c349b9543e81dd9029cce476d2e14be00be3ccbbbf056adeff92 SHA512 d698b63c6bffa770abb27596c8204a6bd6a8174758cfda590e7d15c2c615b37ced933955b7264a2f04ab848947f9485f454d7f62ded1300ba360269635d5eab7 WHIRLPOOL 202e71f01b10f0dba4793593207b69ae7a9afa83b29afc2cc44e5ed0fecc12f2de54a9af8061a6fa2c5a5623ced0337aee8e4bd74797756e7bc9b6df1e2d2905
-EBUILD telepathy-mission-control-5.12.2.ebuild 1617 SHA256 52b67f41121560ed24eb8cae9bb09ca7a8a6577cf8e7d4a5a40a195c80768c10 SHA512 f570f3f0525a3e39502ead986ee534cd668a4b2367c9ca0be2d9636c5bc50642d7ed80afe310c3f75a85720d5b6787c79c33eb33fb6a5176410bd99dc0105863 WHIRLPOOL e7415bb0252fef01eb508e4798b75423d0fb219a9e2a73f76d8476b46f06bcf13649b22ae6bc0277be894351274037c9204b8be23db3a95352c8f58cca65481e
+DIST telepathy-mission-control-5.14.0.tar.gz 1026233 SHA256 58e0047f5292836c2c35e1603a908b3ac20a5c0b183869514c63de339fd48a30 SHA512 a083b97050b3da3eb8063b021539c2c229e715489fbd3d48404f601208a329c338b6b5a7eea688c59c09b8f5b98b05b99a9c2c275195a8bd877d2b2e63fa6fda WHIRLPOOL ad5f5e19b417133b62b4810d010e1ce4e2a32d8ff21fbf86ec8e35cff0eb6b440b8ccf2aa33a6460beb6eda935751198649bc133a4a531de43137fc6377b67be
 EBUILD telepathy-mission-control-5.12.3.ebuild 1609 SHA256 6b34bdb7430a8812c7c6807cc50ae9b9d156f986b265e36792cebda21c802a85 SHA512 44191d6bce8f4dc228839f6501b5da3d8c32ae2bb5cf503c40f1f2c5696f8d7b1aeb52cd0a7699a6a70605d4d81a9b4aeb0c7cecc1d1345673e3b5e2cf23b57f WHIRLPOOL 7f4b5b7b7cf3c20f7370df2b11e7f2e2c8e448238ddd23a8e660919078fd9fbc0564ac741bba87af2974e26e3331333691a1e5633c8848c1099b851c4aa77bdc
-MISC ChangeLog 13433 SHA256 9bc4e4490425f6f66cc90d0b2f239f82b45ec8c5e3fb86067eb496097687e90d SHA512 674ee0956154dd84b5bd2d3df54ba27965ac2af54ca78035ec29b3be4ae6f1de142e91597b842f7ab1f788ecd4df7f87654de7f2bbdf8fa7de15aad6c0ba6ebb WHIRLPOOL cea6f20687704e5e422b4911ce6168cf899c8ce4105c40f6fb7ed677258b8a909172eb826da44a6d626ffc1335be27f0133c78a71ec59211e3039ddb087d8a20
+EBUILD telepathy-mission-control-5.14.0-r1.ebuild 1570 SHA256 c6cb394564331053db2b74fad6cf940525df83138a5115e162d755b6f86d9ba3 SHA512 ad69d29c55f8a12b2248ded856da66505527258a734f29451e140789ff28a68d43af6613fb26605ece48450023ecb0d7c1b3cf7b9144ba3fe5c4bf38fba2836f WHIRLPOOL 59d87953dea6244f4a75206ff513016c4cbf36e8c7e2b7c885a116bf314e2c666755e5ea99e8374c7356a9e48148d171cb92cd9cf6c7ac7191404e132c040d3e
+MISC ChangeLog 13896 SHA256 f45582a2c4066295197e60b768de8b2b84e20a9983df5b142357dd2a3ce43d2f SHA512 e9526db892a9fac26fb429067e909dac536651feb117c0c02ba9cf48e76461be260d2f68e47bc4203e67a413fad3a10478552f83cd2b11781d485ba525797e0e WHIRLPOOL 7d93555dbcdbae01e47896a304b2b844d13bfb841b6b34cd02df98380e57e4c04c2426a02f0facf50548db8fb41d3f99e7bb8723b1a68473a192787738fd9bb7
 MISC metadata.xml 703 SHA256 9171e7301903d7cc6e629d1a70330a14bd3bbbf23a32447987f06cbc01f8660c SHA512 1f16e2b0cd60b7f809f49b3a8afa50502638ad3154cf1681e3637679c8c7b0a9fef467a7f0aec10577e5b9c1bfa362d7cebbd2587002daf6d196727bdb5995fe WHIRLPOOL d03b19f25bcea78bbe1e8c81dbcc6b2c56bcb101287d6af8bfba213ad74f2588903d449b1b87bc54d4cd85395a01802627091457360a479adc7126a1c3238f7f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDXL7IACgkQ1fmVwcYIWAbxhwCdFa5fWiS3rayIks9OuBvQfCT7
+sSQAoJtzbpkhTs6a63ri1MBTa4FwEpoR
+=tozs
+-----END PGP SIGNATURE-----
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.10.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.10.1.ebuild
deleted file mode 100644
index b559b1332d96..000000000000
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.10.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.10.1.ebuild,v 1.8 2012/05/04 06:22:14 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework."
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission%20Control"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnome-keyring networkmanager +upower"
-# IUSE="test"
-
-# Fixme: connman support
-RDEPEND=">=net-libs/telepathy-glib-0.13.14
-	>=dev-libs/dbus-glib-0.82
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	upower? ( >=sys-power/upower-0.9.11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/libxslt"
-#	test? ( dev-python/twisted-words )"
-
-# Tests are broken, see upstream bug #29334
-# upstream doesn't want it enabled everywhere
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	# creds is not available and no support mcd-plugins for now
-	econf --disable-static\
-		--disable-mcd-plugins \
-		--disable-schemas-compile \
-		$(use_enable gnome-keyring) \
-		$(use_with networkmanager connectivity nm) \
-		$(use_enable upower)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.12.2.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
index dfe85be8d817..a05962435a88 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.12.2.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.12.2.ebuild,v 1.1 2012/09/15 09:01:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild,v 1.1 2012/12/23 16:22:09 eva Exp $
 
-EAPI="4"
+EAPI="5"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit python gnome2
+inherit gnome2 python-any-r1
 
 DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission%20Control"
@@ -15,39 +16,34 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="connman gnome-keyring networkmanager +upower"
-# IUSE="test"
+IUSE="connman debug gnome-keyring networkmanager +upower" # test
+REQUIRED_USE="?? ( connman networkmanager )"
 
-RDEPEND=">=net-libs/telepathy-glib-0.17.5
+RDEPEND="
 	>=dev-libs/dbus-glib-0.82
 	>=dev-libs/glib-2.30:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.19
 	connman? ( net-misc/connman )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	upower? ( >=sys-power/upower-0.9.11 )"
+	upower? ( >=sys-power/upower-0.9.11 )
+"
 DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
 	virtual/pkgconfig
-	dev-libs/libxslt"
+"
 #	test? ( dev-python/twisted-words )"
 
 # Tests are broken, see upstream bug #29334
 # upstream doesn't want it enabled everywhere
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
+#RESTRICT="test"
 
 src_configure() {
-	# creds is not available and no support mcd-plugins for now
-	econf --disable-static\
-		--disable-mcd-plugins \
-		--disable-schemas-compile \
+	# creds is not available
+	econf --disable-static \
+		$(use_enable debug) \
 		$(use_enable gnome-keyring) \
 		$(use_with connman connectivity connman) \
 		$(use_with networkmanager connectivity nm) \