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

(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

4 files changed, 15 insertions, 10 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/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() {