Don't call PYTHON before python_pkg_setup.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 27 insertions, 23 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/Manifest b/mail-client/evolution/Manifest
index 4aa032a09bf3..f65008a1ffde 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -17,18 +17,18 @@ DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c35344
 DIST evolution-3.2.3.tar.xz 12419112 SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d SHA512 751bf3eaca2215ee9a3adfd41c2396b92ee4831763d5b5f1be555189b1ab1b476fa223e2ad34990145952babf54384611cef2e08ecf0df2ee30b59ba0481a23c WHIRLPOOL 58ceedf4863ff0f7fba596c8fa493308a9f4fd45d3a31f101316880bd15597b17aeac168fc2fecddaef387ac144a0c3dd2b14d78a1d3495d1ba3d601f7972169
 DIST evolution-3.4.4.tar.xz 11899620 SHA256 7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a SHA512 b72100c39016c2e9436b2e2318918e57e8945dc850b9b47a6738c17b6b25048bcb29269b5e3a481939b493147b537a0158adf0f32aec98268489ccfa1fa7be6b WHIRLPOOL 0c621797311158cbd0e9322fb2af615bc123ff84c5c31470afd00c6ed9c12402b54ef0cec02cb87880843ca778e0cc451d9e72fc9b4a3b259ee5f185c6686f22
 EBUILD evolution-2.32.3-r1.ebuild 6013 SHA256 e810c8d93f88425b83a7f99f799e1b71deeab8874c9c80c83c95c5e1e094451a SHA512 59f7cdf82202b3fc827b02db30a69def78840999456b4ed5de7e16ee4c38db27f591ebdf1bdce0b9acf6e5ed3e6f7d85db24bbee5c060dac551cd4314aa349f9 WHIRLPOOL 8e68f9edc12bfac580dfc566a873a505d277d25428d2958e911ef26455d147895dcb8af3f180ebc7a340774b3b7e0e3ee96908f9f7082d7bb0004bf29cea3692
-EBUILD evolution-3.2.3-r1.ebuild 5742 SHA256 024f35e6724be8f85b237fdd88414b1731e9afe1bce8a37d680a3e62b31c228c SHA512 1cfb056d64dd5475d150ef81792d5904f4321084c1b4a6bc7522b43c2673aa42bb695803e8e9d6c7de2d2265001aa1b2c8e178e08cd70fcb45210f14303b5546 WHIRLPOOL b65924d8e19d530f8c8b935e6d91a2930e6da27c0a6bf047fac9f79995601e4fe7ac15982105729a92ce359f5841e5a15c5f45fb3330a52857b5244dcdd24704
-EBUILD evolution-3.4.4.ebuild 5513 SHA256 c55085e4aa145cdf56c4ee727764a6a541fc800bff6588dd9ce33e57b48e59c3 SHA512 e465af86d06ee736654cc6911ee6dd2d151c572587beed968af857d11b0141968c139020233d3f9164679845760d4c2a0de8ba5216b8fca12ea4e19bbdfacd6c WHIRLPOOL fa8809e0d3a364a7dbb5131d058305d53618b0c48160de1f9552a81771765ddc647bf93e98c42d066559ba9a05d2513b76ec9a49600877a8fbd1170a59f77637
-MISC ChangeLog 84828 SHA256 cf442b120bfc1a5c814c1a00a51651fcdb75fe996cb1faccbb98864e304dcf5a SHA512 b0690b33fcd1dfc952855007a5624593b9a79d357a8c780111a31de59360f9405b2e28bdc4da97ec024e75bcee4414beca394cd429af15fc5529c89288a53076 WHIRLPOOL 5843c19cc1f61c804242ccb632b18ed67b3cb7afb1d30f31e8273a443485de630052d18dc566fa58a3cdab3180ed6609e8a79b70ebe4f46320b82c0ab6067e0a
+EBUILD evolution-3.2.3-r1.ebuild 5742 SHA256 298c84db2aa537d7570f102d92e211c4227fb9ea491635a30f2ebd792d511f91 SHA512 981b69f483284763c2f7ef7fa254201ed929fc1d4b31b8ab458c0cffe05e94ebe40c980b1e9e04372faa7cd158a7374032b958bca3bb0ea6da45dedefaa5ccec WHIRLPOOL eca982eaca2f7e0d2f207975d307826d7e0869f81dd57d26df964607905c660d9c9f4c27df3cf7e8c58e1688b5ec295cf7a0eebc178036f3f90b2b521a2bef34
+EBUILD evolution-3.4.4.ebuild 5513 SHA256 a567c62ac7ee9fc2e4cd1b07ad3b23d633a2dbd9c273ecaec431c588634ba092 SHA512 1d258dc1ec8d0389a41f9de5cb595a2bfd1309f068752d520e34a8aba26d5f39eb802509329c09bfa6db622a6ca9f8f0f27547507d455ee91b77fe33635fa0e9 WHIRLPOOL 9225b9b446e60470224f07cfea1a3fc75b09ca80d2137dab9b47687b8486ea3d4d4b79df61016e68906828dbe0b6ce899eaa58e1e5f5d6e654a642d4eedf89e8
+MISC ChangeLog 84986 SHA256 a8b5477b3f57a3f6abb9c0d29d83f6b459d7c0d1a00403af15c9c12157ef606e SHA512 eb744b553f89c7cc5c9a5c20529254965668e9ca5d9e6009ba00041c2f209e0dc7cad28b0e14fc5d4b2e89631d5d05ac21ae81f28981da09834a048afea98cd8 WHIRLPOOL c6423c1f42047cc88fb6a16cab9fa5f77dbfee64d3f1d776088e288de8905d65d826ec62e7f35851299283f9ead7cd0fdd8577694e993471eeacf543c27538e9
 MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQs5PvAAoJEJ0WA1zPCt1h/i8H/3LPtMUo7ZWFxCBjSD1ZmT5l
-gXpP3HF1gHhCeXrN53NHT1ODDVYGI/tUHOtZqr6sglwrq8lSHFOywX1Y7Xea/I7a
-JUP7DUTivrZTnoi5ZuYgraZwpYGW2JsoJ6zOojxk/qgfz6abcm3/6aRqR/q9yAU2
-q/R0fGDIwmNWPHhJfMHaPhaYdpkVkJ9r6wWQC1dYjk+02/2+hku4f7o6vbA00AXC
-AYUBpu+CYxWAFIUhSYvffpLKyZ1bSENirPRp8qeWmO4Os0YuhApYIgAnnuAcDpBk
-Aot7k4gYe7ooH2vq/yAgKP1gYH5+jlVEXFcP0Eq/mCRGfOsNFzDSwvajgD9JlTY=
-=L3OQ
+iQEcBAEBCAAGBQJQs5auAAoJEJ0WA1zPCt1h+7IIAI9/nA5yOoAzYeW+6Ki3Yp36
+PoMl1EU0/aamXH1WYwbPuisoh0dYo6Sjiyifo9h+urNGszDuxFCcz/kKHv5spKFy
+y5NxCqIRBOw8IG5YrdZz2WRgLYN3j9p+rW0b4nIbehbf3nkA5gpe8U5nfBwBToWU
+/IfFNTiSrjwe9Ov3F56YtVm8preLY+mojAl25MbBMtYkcmloy1gwEZIK0LCLHwfE
+t2TTjuMTxpytMFs8PhRFDIoeGBwyeaHNmozkcCpOk2BoGiHUhu+mlZxuKVcN1G3N
+LaO3WmUeAxhkD3th0f1qN3H9EVzddlbmcrghuG96N6ZDXM0WzP8KnQmh6DjqenE=
+=K+hM
 -----END PGP SIGNATURE-----
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" \