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

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

5 files changed, 24 insertions, 11 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index f2fbc311907c..48cddd913f82 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.287 2011/03/02 18:35:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.288 2011/03/04 05:17:30 polynomial-c Exp $
+
+  04 Mar 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.0.11.ebuild,
+  seamonkey-2.0.11-r2.ebuild, seamonkey-2.0.12.ebuild:
+  Forced usage of python-2 for building (bug #357239 by Pacho Ramos).
 
 *seamonkey-2.0.12 (02 Mar 2011)
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index e8d8e831a81f..4a3d6464a756 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -58,8 +58,8 @@ DIST seamonkey-2.0.12-tr.xpi 493823 RMD160 ea245cdf817e3455066800f7fcb9f61b7b830
 DIST seamonkey-2.0.12-zh-CN.xpi 503858 RMD160 3a6b8a545987f372628c805faf90aee8dfd53d05 SHA1 ebf0ac6f9be6060b110079bf2f07c88a4a77d90c SHA256 933ec671a9e76ee22b5de7f50b19ce52d0cacbbe58bb8f69e50e907a17deb155
 DIST seamonkey-2.0.12.source.tar.bz2 61633659 RMD160 1f6b438036341a9d1f9c770fc557ee6d42c6adeb SHA1 bacbaacbe2b2c09b8c99f2bdbf594b541880aee2 SHA256 b80650856efadcd4099a83a941bb64de4bbb586f68ef12e06fe349ce36d0c2a2
 DIST seamonkey-2.0.7-patches-01.tar.bz2 15779 RMD160 b601a910c09ffa6c23db19e5e089e7759556ca92 SHA1 f6f4f6a6028089652425911fe5ac9a0f4ab52fe9 SHA256 8584bc566c408a58f1ce77da308c10cd9c7ef36637970424be124013454e9fbb
-EBUILD seamonkey-2.0.11-r2.ebuild 9390 RMD160 9f967832f8eb09a9156801f4b1f8b1fa5e195773 SHA1 a5786fc545134d03768779f6e1a7651e0479269b SHA256 63c39921844d61b642560a00c048df1f7bc9537ca43abc99eeb94af0e22c439b
-EBUILD seamonkey-2.0.11.ebuild 9460 RMD160 8a413318e45bfe31d61ee9529e069b035bd8266b SHA1 aa840ae119d9d72094c6ed12b8530292ea75fa89 SHA256 34e4760d3193afa01ad50f4879784f0c409d07fef556bd9007750fede1db59ea
-EBUILD seamonkey-2.0.12.ebuild 9725 RMD160 b950d38feb5838d9810a9173c09ffcc65726a113 SHA1 99259084fd9e41502680e6d94d8cfd3ac12960db SHA256 9e709ba70b35580e5e5eea427e70be286fb0d724d0b74040b60bea2458086d16
-MISC ChangeLog 37055 RMD160 be11573972494748842439cb5d5d0c03a8bda3b1 SHA1 ada40020e3d7d5e2302a0c0ae3c71159a23ba9bc SHA256 120908e1cea53cc3d785d311280ca0f40f64c83fd3925a2fbc2183a1d7451cb4
+EBUILD seamonkey-2.0.11-r2.ebuild 9457 RMD160 ed7301cd9cd110bb85954419e061ba71a80012ad SHA1 9dc0a7728cf51adeab417702a05e5184efe3517e SHA256 ee6c61af55622933226ce562a7e2684f7f9d8156d7b03be88925b6629c977efd
+EBUILD seamonkey-2.0.11.ebuild 9532 RMD160 572e43d78dc8e43a6a84cad3adbf27cf966461a9 SHA1 b89969fadf03f7c19eb26a273e3673942f8bff05 SHA256 e3868c51d09bdd053b57a5d1990d6ccb14a65033867e73b95a5d8f3f50c61254
+EBUILD seamonkey-2.0.12.ebuild 9792 RMD160 2ed6f33dff959c3502da66831b52248e80b2f806 SHA1 8030f2ced536647b2ba03ea64572861b46d2afd0 SHA256 f5191370bba8de29d11d9deac768bd171360edcc9d14fa26dafe2f6187616e49
+MISC ChangeLog 37260 RMD160 81f82a02353279b67f696b9532661eaf87be283a SHA1 c901dba1e507b7e85ff00ecdc3017bbdecfc1884 SHA256 4dd34b3fb5bfd36c8fa81aa02fb6d994fede22248a51fd7c39fd5fa499365353
 MISC metadata.xml 845 RMD160 d313bde4cd255346a825ea0d99afb7585151cc0f SHA1 7941c776107161a6278ba5893345aeac2a5cbe7a SHA256 404caecf817491893c2ef118b48f025bc0d5c37d910979dd5602273127e479f9
diff --git a/www-client/seamonkey/seamonkey-2.0.11-r2.ebuild b/www-client/seamonkey/seamonkey-2.0.11-r2.ebuild
index 48b0c8e9bbc2..20b8270306fb 100644
--- a/www-client/seamonkey/seamonkey-2.0.11-r2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.11-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/www-client/seamonkey/seamonkey-2.0.11-r2.ebuild,v 1.1 2011/01/05 15:24:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.11-r2.ebuild,v 1.2 2011/03/04 05:17:30 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 python
 
 PATCH="${PN}-2.0.11-patches-01"
 EMVER="1.0.1"
@@ -77,6 +77,7 @@ RDEPEND="java? ( virtual/jre )
 	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
 
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig
 	java? ( >=virtual/jdk-1.4 )"
 
@@ -136,6 +137,8 @@ pkg_setup() {
 	export MOZILLA_OFFICIAL=1
 
 	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
 }
 
 src_prepare() {
diff --git a/www-client/seamonkey/seamonkey-2.0.11.ebuild b/www-client/seamonkey/seamonkey-2.0.11.ebuild
index 82c32605df7e..f3b560f7fcae 100644
--- a/www-client/seamonkey/seamonkey-2.0.11.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.11.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/www-client/seamonkey/seamonkey-2.0.11.ebuild,v 1.8 2011/01/01 19:52:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.11.ebuild,v 1.9 2011/03/04 05:17:30 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 python
 
 PATCH="${PN}-2.0.7-patches-01"
 EMVER="1.0.1"
@@ -77,6 +77,7 @@ RDEPEND="java? ( virtual/jre )
 	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
 
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig
 	java? ( >=virtual/jdk-1.4 )"
 
@@ -136,6 +137,8 @@ pkg_setup() {
 	export MOZILLA_OFFICIAL=1
 
 	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
 }
 
 src_prepare() {
diff --git a/www-client/seamonkey/seamonkey-2.0.12.ebuild b/www-client/seamonkey/seamonkey-2.0.12.ebuild
index 171e0db2badc..f83a00f94a65 100644
--- a/www-client/seamonkey/seamonkey-2.0.12.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.12.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/www-client/seamonkey/seamonkey-2.0.12.ebuild,v 1.1 2011/03/02 18:35:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.12.ebuild,v 1.2 2011/03/04 05:17:30 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 python
 
 PATCH="${PN}-2.0.11-patches-01"
 EMVER="1.0.1"
@@ -77,6 +77,7 @@ RDEPEND="java? ( virtual/jre )
 	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
 
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig
 	java? ( >=virtual/jdk-1.4 )"
 
@@ -136,6 +137,8 @@ pkg_setup() {
 	export MOZILLA_OFFICIAL=1
 
 	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
 }
 
 src_prepare() {