diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-06-19 18:38:10 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-06-19 18:38:10 +0000 |
| commit | d63704f8921a9eda6b3b00bc08db96b69ea02053 (patch) | |
| tree | cb06fff9b68e79bd32f87dbdbb81368e6cc716db | |
| parent | Use fedora patch to clean e-d-s version checking (diff) | |
| download | gentoo-2-d63704f8921a9eda6b3b00bc08db96b69ea02053.tar.gz gentoo-2-d63704f8921a9eda6b3b00bc08db96b69ea02053.tar.bz2 gentoo-2-d63704f8921a9eda6b3b00bc08db96b69ea02053.zip | |
Use Python 2 (bug #321669).
(Portage version: HEAD/cvs/Linux x86_64)
| -rw-r--r-- | www-client/mozilla-firefox/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 2dd7ef1993bd..459b0351db4e 100644 --- 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/mozilla-firefox-3.6.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.3.ebuild index c0a2eb089542..93effc2af656 100644 --- 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() { |