Don't call PYTHON before python_pkg_setup.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 17 insertions, 13 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index aa15c8566101..d0d83a4c552f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.375 2012/11/26 16:08:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.376 2012/11/26 16:19:56 tetromino Exp $
+
+  26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-3.2.3-r1.ebuild, evolution-3.4.4.ebuild:
+  Don't call PYTHON before python_pkg_setup.
 
   26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-2.32.3-r1.ebuild, evolution-3.2.3-r1.ebuild,
diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild
index d3aaeebaa36f..a3311e64b0a4 100644
--- a/mail-client/evolution/evolution-3.2.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.5 2012/11/26 16:08:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -90,6 +90,11 @@ REQUIRED_USE="map? ( clutter )
 	networkmanager? ( !connman )"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
@@ -131,11 +136,6 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
 	epatch "${FILESDIR}"/${PN}-3.2.1-reorder-mx-clutter-gtk.patch
 	# Fix build failure with glib-2.32
diff --git a/mail-client/evolution/evolution-3.4.4.ebuild b/mail-client/evolution/evolution-3.4.4.ebuild
index d301832e3975..d5d48b47238d 100644
--- a/mail-client/evolution/evolution-3.4.4.ebuild
+++ b/mail-client/evolution/evolution-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.5 2012/11/26 16:08:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -89,6 +89,11 @@ REQUIRED_USE="map? ( clutter )
 	networkmanager? ( !connman )"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
@@ -131,11 +136,6 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
 	# Fix paths for Gentoo spamassassin executables
 	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \