Forced usage of python-2 for building (bug #355585)

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

7 files changed, 50 insertions, 20 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 30f1326a8003..8ee0cfe448b2 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.60 2011/01/02 21:13:49 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.61 2011/03/04 05:36:22 polynomial-c Exp $
+
+  04 Mar 2011; Lars Wendler <polynomial-c@gentoo.org> thunderbird-3.1.3.ebuild,
+  thunderbird-3.1.5.ebuild, thunderbird-3.1.6.ebuild, thunderbird-3.1.7.ebuild,
+  thunderbird-3.1.7-r2.ebuild:
+  Forced usage of python-2 for building (bug #355585 by Adrian Bassett).
 
 *thunderbird-3.1.7-r2 (02 Jan 2011)
 
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index c502f109729e..af304fe94856 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -198,10 +198,10 @@ DIST thunderbird-3.1.7-uk.xpi 244865 RMD160 82f2870914e11354dbabbc50afd3d6f7dbc3
 DIST thunderbird-3.1.7-zh-CN.xpi 219645 RMD160 373e89d87879c26c1eced73c74cfc5e2fb5d1ad4 SHA1 7e4c21e53c99479aa7d1b947fe72af361fd34f29 SHA256 31372d3c8f2b184536592ad68b0603c4eac076300ba531d6f63ebd14f6f4ff09
 DIST thunderbird-3.1.7-zh-TW.xpi 220637 RMD160 0b4268075f3e625f0f3a1ebc87605fd545cee493 SHA1 31ec9c985f607ea7fcb9c31628fea5acfdfb5b38 SHA256 651023dfef22a2c1a284d9e1b314f885140d153efa7efac4a2c4928f66cf511e
 DIST thunderbird-3.1.7.source.tar.bz2 65948060 RMD160 c5e25004565decf1467a9b452139c0aedec4299e SHA1 c2d6cdedfe399c1ab41c00045e4fce835cc0b36f SHA256 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662
-EBUILD thunderbird-3.1.3.ebuild 7651 RMD160 6937123960be614a273103521b55c5a86c93c8b4 SHA1 975a1bb7aa7d502534141f2ce45afe931d859fc4 SHA256 680bf0f7f67f6ec09d1d08f98db3159346e2674b3fb46a7c868b0dbdd8257a21
-EBUILD thunderbird-3.1.5.ebuild 7614 RMD160 083d852a83cb7587af001f64a78e81e5e3c8780c SHA1 b3de974b205460f9dcaff6f67f74212bba94cea9 SHA256 98e783fac42e5d576a47fbfda1045a1a8f61044e51f24c4f7821c67bf6ec0dbd
-EBUILD thunderbird-3.1.6.ebuild 7665 RMD160 1604a2dafe34043793add0e17bebe82237ec4b02 SHA1 f069a70443c95128f35e521930a2eaee0ad7f649 SHA256 4c5e3028af9385f87a2d8927dc778e6dd58c8a8e695756f8c686427a97ae9684
-EBUILD thunderbird-3.1.7-r2.ebuild 7779 RMD160 a151e3decc858cd912cb10bf42c26530ccc9cf9d SHA1 b3df03f22e8f8142c65a8f3a2c2581544f08d73c SHA256 c1139b1d7777879dcef5a400b29ecbc787fbcab96aeaf60fb903003266bd0d5d
-EBUILD thunderbird-3.1.7.ebuild 7611 RMD160 93002c4fe86cc7fb0da2da7b35ea7ab2675704ad SHA1 51b124ce8d85009ee4609812814b49f3b9f1ffd8 SHA256 1dac783c338daed3f98b68a83c0b575fe35eab051d8ba31c091a800477d95124
-MISC ChangeLog 59276 RMD160 6b27f01e6993f1e76a91685265497ed11ad27b36 SHA1 c7426bd08b69120d83038e3b3208004e87214b30 SHA256 24f67dc015ae3176928dfc73f43d8633fac71f414bb2b502456da4346ea9274d
+EBUILD thunderbird-3.1.3.ebuild 7744 RMD160 bfdb6990edea1755172fc54d51ce4a8756e38457 SHA1 f349db0da900e1033b3b25edbef722d16cfce96f SHA256 930f641dc22ddbe60c39385f3b0fff4290a157a5c378dc965605d057e74360bc
+EBUILD thunderbird-3.1.5.ebuild 7709 RMD160 122058aa0c9fa4a10852bbb234b5c2de4e93fc4d SHA1 b06dd9efb1968172e3c39bbd43d32429ec00a7d2 SHA256 ad0107361fa0fe821d25002ed06d87359dfcc27735459d61c940a420824c8392
+EBUILD thunderbird-3.1.6.ebuild 7758 RMD160 14ef12a2f3dea6a50fc9db5edbdcb3813e23ce2e SHA1 ecc819b72aa04907bcbdccb7db4fbcbd61f23331 SHA256 9b5c5366521d0b0778e074da832d9bbad95d07930cbf8a08895ef4e4cb6220a6
+EBUILD thunderbird-3.1.7-r2.ebuild 7872 RMD160 7a6e1d642ea67de465c98b35bcbadca97bafa0a7 SHA1 f48a44606dc549f9b9fdca20bad6f1e0d8a01bab SHA256 14121589a2fae720d0684b8d810a20b595e55ab5ce1ee92d62fcde6d7ddd53cd
+EBUILD thunderbird-3.1.7.ebuild 7704 RMD160 033f40cc43d728c0c80c7cc741bd56a4b06d1893 SHA1 1d469ca6a1e6f69b19f5ce352830707dcd83d2dc SHA256 8efdb8c174a72472363c6638ed2245577e1266d308601c59ccdfcf9c63c08097
+MISC ChangeLog 59546 RMD160 fcd67271a8e449f8742a56172601746634094d1f SHA1 4b5d2627173a3acf3749e207087ce762501bd3fe SHA256 f9aaf9440315c0530565ca20533df281a58109123a85c9f8536eff807f3a16cc
 MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3
diff --git a/mail-client/thunderbird/thunderbird-3.1.3.ebuild b/mail-client/thunderbird/thunderbird-3.1.3.ebuild
index cc7a224c5b31..ca13bc07389d 100644
--- a/mail-client/thunderbird/thunderbird-3.1.3.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.3.ebuild,v 1.6 2010/09/14 19:38:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.3.ebuild,v 1.7 2011/03/04 05:36:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python
 
 # This list can be updated using get_langs.sh from the mozilla overlay
 LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
@@ -58,6 +58,9 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	cups? ( net-print/cups[gnutls] )
 	!x11-plugins/lightning"
 
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]"
+
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
 S="${WORKDIR}"/comm-1.9.2
@@ -94,6 +97,8 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
+
+	python_set_active_version 2
 }
 
 src_unpack() {
diff --git a/mail-client/thunderbird/thunderbird-3.1.5.ebuild b/mail-client/thunderbird/thunderbird-3.1.5.ebuild
index 8a21c1388fd1..05bf64f64637 100644
--- a/mail-client/thunderbird/thunderbird-3.1.5.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.5.ebuild,v 1.6 2010/10/25 00:29:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.5.ebuild,v 1.7 2011/03/04 05:36:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python
 
 # This list can be updated using get_langs.sh from the mozilla overlay
 LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
@@ -57,6 +57,9 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]"
+
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
 S="${WORKDIR}"/comm-1.9.2
@@ -93,6 +96,8 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
+
+	python_set_active_version 2
 }
 
 src_unpack() {
diff --git a/mail-client/thunderbird/thunderbird-3.1.6.ebuild b/mail-client/thunderbird/thunderbird-3.1.6.ebuild
index e97072f478c1..14b6c0fb4ced 100644
--- a/mail-client/thunderbird/thunderbird-3.1.6.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild,v 1.6 2010/11/14 12:47:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild,v 1.7 2011/03/04 05:36:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python
 
 # This list can be updated using get_langs.sh from the mozilla overlay
 LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
@@ -57,6 +57,9 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]"
+
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
 S="${WORKDIR}"/comm-1.9.2
@@ -93,6 +96,8 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
+
+	python_set_active_version 2
 }
 
 src_unpack() {
diff --git a/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild b/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild
index 45ede0d7983a..447a70583af7 100644
--- a/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild,v 1.1 2011/01/02 21:13:49 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.7-r2.ebuild,v 1.2 2011/03/04 05:36:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python
 
 # This list can be updated using get_langs.sh from the mozilla overlay
 LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
@@ -57,6 +57,9 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]"
+
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
 S="${WORKDIR}"/comm-1.9.2
@@ -93,6 +96,8 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
+
+	python_set_active_version 2
 }
 
 src_unpack() {
diff --git a/mail-client/thunderbird/thunderbird-3.1.7.ebuild b/mail-client/thunderbird/thunderbird-3.1.7.ebuild
index a0d71c2d0c95..2097abb19b67 100644
--- a/mail-client/thunderbird/thunderbird-3.1.7.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.7.ebuild,v 1.6 2011/01/01 19:51:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.7.ebuild,v 1.7 2011/03/04 05:36:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python
 
 # This list can be updated using get_langs.sh from the mozilla overlay
 LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
@@ -57,6 +57,9 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]"
+
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
 S="${WORKDIR}"/comm-1.9.2
@@ -81,6 +84,8 @@ linguas() {
 		fi
 		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
 	done
+
+	python_set_active_version 2
 }
 
 pkg_setup() {