Use python.eclass functions in correct order to make it build if py3k is active, #385107; remove optional dep on net-misc/networkmanager[gnome]

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

5 files changed, 22 insertions, 17 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 741219e76916..400d9d48b25f 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.122 2011/09/24 13:20:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.123 2011/10/04 17:08:20 jlec Exp $
+
+  04 Oct 2011; Justin Lecher <jlec@gentoo.org> gajim-0.14.1-r2.ebuild,
+  gajim-0.14.4.ebuild, gajim-0.14.4-r1.ebuild:
+  Use python.eclass functions in correct order to make it build if py3k is
+  active, #385107; remove optional dep on net-misc/networkmanager[gnome]
 
 *gajim-0.14.4-r1 (24 Sep 2011)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 55cf65badfd5..d32c4c983d02 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -9,15 +9,15 @@ AUX 0.14.4-unicode.patch 671 RMD160 5a1f41e2694051efac82c155399cb19b8d92051c SHA
 AUX gajim-0.13-autotools-enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea
 DIST gajim-0.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
 DIST gajim-0.14.4.tar.bz2 4173732 RMD160 e9c6d14328ca1c13cb1152fde79dd3b5e5204e64 SHA1 0343af3c4bae39aa49e547b641caac197a887bb4 SHA256 24a1c6ac8d8e489f9ea377f1b68707d1b3f55ccdf55131c16cb8e6128ca3e941
-EBUILD gajim-0.14.1-r2.ebuild 2473 RMD160 85cbc6c1c9a8f112148663feeda58a667a3165a3 SHA1 3868a0c9237009a7dd5c05c0a1e2485ad882a885 SHA256 d482cf849b105ac3f8d069bc48e1be4ff2de815006c90c4596d56801f6b3bd31
-EBUILD gajim-0.14.4-r1.ebuild 2591 RMD160 35c5c86bc049463b6444b4e8de31b6760306e97d SHA1 79a2c8ef29bd0a209bee1b536de705718d7e8f11 SHA256 7e3a9d72066ff5fd60fa88e93df8f8ef8334465e09f99bfa90b8b738bea0e4fc
-EBUILD gajim-0.14.4.ebuild 2477 RMD160 d45f9994859e30d90dafc9b73ad3df3004ebc512 SHA1 9c86467479d780203d677105c5e3e3ba29369b0d SHA256 3685553d56bf8ac1e36bf9ef7eee061877ae88a98db183c59fa3d75721c32a0e
-MISC ChangeLog 17599 RMD160 ba2c9c7f9c480a064e05134554d5c969d0ff5930 SHA1 6859991fb418edf9c7419df8e21a240b6fdd8a43 SHA256 ed489e9aa36c264b4e746db4018346e90f885e7032bd907a52ca43fd3f8ef5fe
+EBUILD gajim-0.14.1-r2.ebuild 2427 RMD160 192682a41c15e35d57ebfc5ebdb0f17cb5697880 SHA1 95c94179547c63fa434d053df34765a045865587 SHA256 439b49d715688ba2109e668826fe0e379a66ec5a4f144080d00d3733ca184817
+EBUILD gajim-0.14.4-r1.ebuild 2545 RMD160 84f5a9c95ee0ad47a2d8c5b1449bbbcdee7b1240 SHA1 3da9021fce6e443a0955ce31501e3b2650c59575 SHA256 3380b11abe67c0873bab6ece9102e0d91e69edd2e5fc079acca6cd0d915d03f3
+EBUILD gajim-0.14.4.ebuild 2431 RMD160 fa2ae496130bd870d0e1c0dc73c76447ab48cb49 SHA1 3a9aa64ba3d9a6a554656c877815c636659dd096 SHA256 cd62aa10c613e1c9cf465135c4c44afc50341f90d5399711b5638472126eb487
+MISC ChangeLog 17866 RMD160 ba01c886554e82b7705b854f4183545005361f7a SHA1 d22fc4e424d76286d35e1793666b73bbccb149c5 SHA256 6227c0e041da764cfafd4d9b51dd886a90abfd7d2b1fd2750289f461dc832c92
 MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk592UAACgkQgAnW8HDreRbicwCcCrM1fBNHpQh59g6iVMZhL+VN
-DVQAoLtMNNtFFKTsqzqFiLjH5xi+1fEs
-=vz/A
+iEYEAREKAAYFAk6LPYoACgkQgAnW8HDreRZbSACgtL3KFyM/N9NUMjyzrgowwuif
+St4Anj2J5tZCTraoH+ebrr8nxitaqs+c
+=9xKV
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.14.1-r2.ebuild b/net-im/gajim/gajim-0.14.1-r2.ebuild
index 80fc67fc4423..6b4761de4756 100644
--- a/net-im/gajim/gajim-0.14.1-r2.ebuild
+++ b/net-im/gajim/gajim-0.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.12 2011/08/30 14:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.13 2011/10/04 17:08:20 jlec Exp $
 
 EAPI=3
 
@@ -47,7 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 	jingle? ( net-libs/farsight2[python] )
 	networkmanager? (
 			dev-python/dbus-python
-			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
+			net-misc/networkmanager
 		)
 	srv? (
 		|| (
@@ -68,8 +68,8 @@ pkg_setup() {
 			die "USE=\"dbus\" needed for avahi support"
 		fi
 	fi
-	python_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-im/gajim/gajim-0.14.4-r1.ebuild b/net-im/gajim/gajim-0.14.4-r1.ebuild
index 6762e63e7e47..345a3d06bf79 100644
--- a/net-im/gajim/gajim-0.14.4-r1.ebuild
+++ b/net-im/gajim/gajim-0.14.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r1.ebuild,v 1.1 2011/09/24 13:20:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r1.ebuild,v 1.2 2011/10/04 17:08:20 jlec Exp $
 
 EAPI=3
 
@@ -52,7 +52,7 @@ RDEPEND="${COMMON_DEPEND}
 	jingle? ( net-libs/farsight2[python] )
 	networkmanager? (
 			dev-python/dbus-python
-			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
+			net-misc/networkmanager
 		)
 	srv? (
 		|| (
@@ -73,8 +73,8 @@ pkg_setup() {
 			die "USE=\"dbus\" needed for avahi support"
 		fi
 	fi
-	python_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-im/gajim/gajim-0.14.4.ebuild b/net-im/gajim/gajim-0.14.4.ebuild
index b7e542a1d5e6..67ba9586c12b 100644
--- a/net-im/gajim/gajim-0.14.4.ebuild
+++ b/net-im/gajim/gajim-0.14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4.ebuild,v 1.2 2011/08/15 17:23:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4.ebuild,v 1.3 2011/10/04 17:08:20 jlec Exp $
 
 EAPI=3
 
@@ -47,7 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 	jingle? ( net-libs/farsight2[python] )
 	networkmanager? (
 			dev-python/dbus-python
-			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
+			net-misc/networkmanager
 		)
 	srv? (
 		|| (
@@ -68,8 +68,8 @@ pkg_setup() {
 			die "USE=\"dbus\" needed for avahi support"
 		fi
 	fi
-	python_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {