diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-04-20 20:11:46 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-04-20 20:11:46 +0000 |
| commit | c3872a850df84e2e9ca246ea4f996a121ee7ccfb (patch) | |
| tree | 5c101e9ed14fa9275e3e236580905fc63c5b9214 /net-libs | |
| parent | unmask net-libs/libetpan 1.0, everything seems to work (diff) | |
| download | gentoo-2-c3872a850df84e2e9ca246ea4f996a121ee7ccfb.tar.gz gentoo-2-c3872a850df84e2e9ca246ea4f996a121ee7ccfb.tar.bz2 gentoo-2-c3872a850df84e2e9ca246ea4f996a121ee7ccfb.zip | |
Use Python 2 (bug #315325).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/xulrunner/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index 3a0e501dadc2..8bd758a61004 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/xulrunner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.311 2010/04/20 09:27:45 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.312 2010/04/20 20:11:46 arfrever Exp $ + + 20 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + xulrunner-1.9.2.3-r1.ebuild: + Use Python 2 (bug #315325). 20 Apr 2010; Christian Faulhammer <fauli@gentoo.org> xulrunner-1.9.2.3-r1.ebuild: diff --git a/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild index ed197f989921..f794757a4bb9 100644 --- a/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild +++ b/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild,v 1.5 2010/04/20 09:27:45 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.3-r1.ebuild,v 1.6 2010/04/20 20:11:46 arfrever Exp $ EAPI="2" WANT_AUTOCONF="2.1" -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python MY_PV="${PV/_rc/rc}" # Handle beta MY_PV="${MY_PV/1.9.2/3.6}" @@ -23,7 +23,6 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE="+alsa debug libnotify system-sqlite wifi" RDEPEND="java? ( >=virtual/jre-1.4 ) - >=dev-lang/python-2.3[threads] >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.6 >=dev-libs/nspr-4.8 @@ -39,6 +38,7 @@ RDEPEND="java? ( >=virtual/jre-1.4 ) DEPEND="java? ( >=virtual/jdk-1.4 ) ${RDEPEND} + =dev-lang/python-2*[threads] dev-util/pkgconfig" S="${WORKDIR}/mozilla-${MAJ_PV}" @@ -51,6 +51,8 @@ pkg_setup() { export LC_CTYPE="C" java-pkg-opt-2_pkg_setup + + python_set_active_version 2 } src_prepare() { @@ -180,7 +182,7 @@ src_configure() { sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf } src_install() { |