Use Python 2 (bug #321669).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 2dd7ef1993bd4d1ec9b41a4e6b16c997d5a2729b..459b0351db4eddc8a56b526581a16bf301031786 100644 (file)
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.614 2010/05/31 19:25:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.615 2010/06/19 18:38:10 arfrever Exp $
+
+  19 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mozilla-firefox-3.6.3.ebuild:
+  Use Python 2 (bug #321669).
 
   31 May 2010; Joseph Jezak <josejx@gentoo.org>
   mozilla-firefox-3.6.3.ebuild:

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 69910a0b264385a419cc5e6f4f8c0762eea17297..7368013c5de5e56cca39fba995d8b5185c38088f 100644 (file)
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX 1000_fix_alignment.patch 796 RMD160 d6098c483a90d47ead8cc7c643bf51270465b4cd SHA1 d2e861a0892550659a152d6a4ae9a1d31996c800 SHA256 49675bf2771b3e1bc50069f3a07f96062c771e8281d8e5abc2219dd08a23d377
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
@@ -211,13 +208,6 @@ DIST mozilla-firefox-3.6.3-zh-CN.xpi 126678 RMD160 c7323e2ce8b6a6a80000166f92a57
 DIST mozilla-firefox-3.6.3-zh-TW.xpi 128220 RMD160 f8eacf72bb974e7fdbb4719ac9894457537680db SHA1 da625df3e40f6995b43e92d5ef11420c8cd89215 SHA256 5ea447d1511feb269ae1b46dd14919472d37301cc98208c0c49979fdaa755920
 EBUILD mozilla-firefox-2.0.0.19.ebuild 10148 RMD160 0abf5dac24c47da9df18690fbbada3dcd5c612be SHA1 62d453d2a38fa7353c991e07aa0753c1e361ccd8 SHA256 15f59686b4948e52d46221483b4c3124886846f100b9266047b236ada6a30fe1
 EBUILD mozilla-firefox-3.5.8.ebuild 8551 RMD160 1ade6f7f07446b1da263d1a58fd6e0dad42dec1e SHA1 a7660c3308b5953d8b0a48f5e1beb75194ffcc3a SHA256 4c7154f594860a5471ba4d1b75a10edec968ff0cccd1f2426a355cf1521022ac
-EBUILD mozilla-firefox-3.6.3.ebuild 8564 RMD160 6e53ab30201779cb09387808e2cebea2f1e79d1e SHA1 27b251b56a90432d76b93cac234dab974a8ded6d SHA256 39b1058b8c4a674e4d8debd4a03b97b3eca54b1ccf93e31d24cf374376e4135c
-MISC ChangeLog 113721 RMD160 b4e80453204aa52e4fa13dd5d3abca1851aeda1f SHA1 2793c43922bf6bc0280fdef9cbf1636fb30bc40b SHA256 310ca4f8e7ba5980e7192afa480a75102a20bf8d5da1043a0a12ba2fb57df620
+EBUILD mozilla-firefox-3.6.3.ebuild 8652 RMD160 7709adca8f16a264d4fba4c893fb30161d3f655f SHA1 ba76763dd93b4516303d03983caa7515bd49cbcf SHA256 5ef2b9ab794ec5a839d59d2c946784e2e3fda435323b639f36007d440fc9603a
+MISC ChangeLog 113859 RMD160 1880dafbd1c056b6152ab5bb6c32a9d6e1d8fbd8 SHA1 7ed792601b82a8c6c4c7ea1821d0d5a64a007fe2 SHA256 c88491bbf936fb50c2951151f878cf3cee690e3a8a3f1a8862e7af066df42f48
 MISC metadata.xml 794 RMD160 f793708e71b2d5c06d9719a203cc0c8e9515f327 SHA1 de69509380f667cb4655324a4e88e36ee00954b7 SHA256 dcb03b1e3c0dd4cf6f2aa62a1359893fc32c147fd62bc11df31e795abaf927a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwEDQcACgkQcsIHjyDViGSmOQCg3ohod8Xgljcwo768k1eDdoaf
-M4EAnRW3QKVBlXgDQtSysRrt5PlArRGO
-=5dR1
------END PGP SIGNATURE-----

diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild
index c0a2eb089542858b8e9ebbb764294bf8df7aed5a..93effc2af656813f198f60d2bb9671052d593e8b 100644 (file)
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild,v 1.6 2010/05/31 19:25:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild,v 1.7 2010/06/19 18:38:10 arfrever Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python
 
 LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
 es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
@@ -62,6 +62,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
        java? ( >=virtual/jdk-1.4 )
+       =dev-lang/python-2*[threads]
        dev-util/pkgconfig"
 
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
@@ -108,6 +109,8 @@ pkg_setup() {
        fi
 
        java-pkg-opt-2_pkg_setup
+
+       python_set_active_version 2
 }
 
 src_unpack() {
@@ -213,7 +216,7 @@ src_configure() {
        #
        ####################################
 
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
 }
 
 src_compile() {