Fix build failure with python3 as system interpreter (bug #444694, thanks to Jens Kasten).

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

5 files changed, 24 insertions, 11 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index f79238250eca..aa15c8566101 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.374 2012/11/17 12:12:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.375 2012/11/26 16:08:14 tetromino Exp $
+
+  26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.3-r1.ebuild, evolution-3.2.3-r1.ebuild,
+  evolution-3.4.4.ebuild:
+  Fix build failure with python3 as system interpreter (bug #444694, thanks to
+  Jens Kasten).
 
   17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -evolution-2.32.3.ebuild,
   evolution-2.32.3-r1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index b32c4a1a0ba1..4aa032a09bf3 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -16,15 +16,19 @@ DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
 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 5980 SHA256 e2a8e8f51b1491cc421e4121cc36d84198418b53841f74ca3378851726dbf6cd SHA512 a2d6e7e084cae41523df743e432ca880a8d048faaeb8fcf528e443ceba87e6caa764b3515d1c6fcd3af0cfc51e788e10d8fb5ca18cb540e62e2b7219a09bf129 WHIRLPOOL d19ed8a66891cce0035056a5e42c2d7e33f94b6b2e259360a5e182ac2b184c2d783c90c04287b72b35de586b11346ea1a40a2b0e26862eaec42977d89539ab40
-EBUILD evolution-3.2.3-r1.ebuild 5713 SHA256 c9a3dc468a9777bb1e36749622d27ea0b26460cd82b9c061a04511b64f682753 SHA512 97dd03e86eeab6acc637da8b6ca2146a449bbceba8b6ad5b132d6587e011e0aeb903dc85030f81115b052c03943cadbafba20e4bddb72a4a0778a5211b2d69c5 WHIRLPOOL 063dd52d97c2d29c564d834c9a6eaf369afdb0dda5ae53b2599a49529762925ea1f70b44742b0da20a3a293e77850bc1540665e0d1f37f7f87c2e59734e85b4e
-EBUILD evolution-3.4.4.ebuild 5484 SHA256 70f5ebd77a5a830005b2c0683fa681a538a59d19eacc79b7fb154d4af1766a5a SHA512 89a41ac9acd29235946578e2f5d0f69cae098bc94997384c0a4db8561d908567dae5d376dd033aa482f700f491a5bf9aaecdc97227b2261d7afb1c79c6f9de95 WHIRLPOOL 8cb2d05496f5476f699cfc395b110ef4350b1a209d12ce85ba185733634c0b65e76d754642a8946ba96c5d80573413d5ca951c1b3d36c3051ec19d87dadb6aa6
-MISC ChangeLog 84586 SHA256 f6553f9d4464bf40ec6c62186aee92c98d40e1a51c6f900fa65f236e1b532d41 SHA512 b45c69653288c4c91916fe85a484bb2028dd507b384b0a535d9495fac2a36560f85e52673a10ff1fc41e602fb3517903e58b13f67f8d7b6fa564ce222b4298d2 WHIRLPOOL 65465eed89c5d1f67a07f532b3a96b3aec8f0ba138350d9271d4d8e6d2617e29b10bb5c46629ac264eb2832a7320f0d5117d8a8693ffb3b9525079080c8b7dc7
+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
 MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCnfyAACgkQCaWpQKGI+9TsggCfQpaoout1gQMDRjoUEIjXMptC
-elQAn0RnXlI3aRtDZ8+MXdoe9O7QOqCL
-=cY8S
+iQEcBAEBCAAGBQJQs5PvAAoJEJ0WA1zPCt1h/i8H/3LPtMUo7ZWFxCBjSD1ZmT5l
+gXpP3HF1gHhCeXrN53NHT1ODDVYGI/tUHOtZqr6sglwrq8lSHFOywX1Y7Xea/I7a
+JUP7DUTivrZTnoi5ZuYgraZwpYGW2JsoJ6zOojxk/qgfz6abcm3/6aRqR/q9yAU2
+q/R0fGDIwmNWPHhJfMHaPhaYdpkVkJ9r6wWQC1dYjk+02/2+hku4f7o6vbA00AXC
+AYUBpu+CYxWAFIUhSYvffpLKyZ1bSENirPRp8qeWmO4Os0YuhApYIgAnnuAcDpBk
+Aot7k4gYe7ooH2vq/yAgKP1gYH5+jlVEXFcP0Eq/mCRGfOsNFzDSwvajgD9JlTY=
+=L3OQ
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index a87ce28171ba..f302533ff8d5 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.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-2.32.3-r1.ebuild,v 1.16 2012/11/17 12:12:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.17 2012/11/26 16:08:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -106,6 +106,7 @@ src_prepare() {
 		--disable-profiling
 		--disable-pst-import
 		$(use_enable python)
+		pythonpath=$(PYTHON -2 -a)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 /usr)
diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild
index c076907ccf9d..d3aaeebaa36f 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.4 2012/10/17 09:55:53 tetromino Exp $
+# $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 $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -110,6 +110,7 @@ pkg_setup() {
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
 		$(use_enable python)
+		pythonpath=$(PYTHON -2 -a)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
diff --git a/mail-client/evolution/evolution-3.4.4.ebuild b/mail-client/evolution/evolution-3.4.4.ebuild
index 7acf320e4a8a..d301832e3975 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.4 2012/10/27 07:24:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.5 2012/11/26 16:08:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -110,6 +110,7 @@ pkg_setup() {
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
 		$(use_enable python)
+		pythonpath=$(PYTHON -2 -a)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"