Use Python 2 (bug #315325).

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

3 files changed, 13 insertions, 17 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/Manifest b/net-libs/xulrunner/Manifest
index 92aa1e628d8e..2ea30fdf14f8 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/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 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX 1000_fix_alignment.patch 796 RMD160 d6098c483a90d47ead8cc7c643bf51270465b4cd SHA1 d2e861a0892550659a152d6a4ae9a1d31996c800 SHA256 49675bf2771b3e1bc50069f3a07f96062c771e8281d8e5abc2219dd08a23d377
@@ -28,13 +25,6 @@ EBUILD xulrunner-1.9.0.11-r1.ebuild 4789 RMD160 9b685ad897cb07e281d9afef45f55dd1
 EBUILD xulrunner-1.9.0.14.ebuild 4938 RMD160 90dab4447b3470cca3da354555665fe4b8b2f4fa SHA1 0c7a70964acad5a9a59e379199914a4f440fc979 SHA256 5927ce6c646f4bc73edef6d404a8c253d59af276ee6ca8050181f059289a4d70
 EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 b3bca093dcb0ae36a7d493cb2990d7fe519a6a0f SHA1 9acb71f4171a6bc79c5e62732e085342ac77f7c5 SHA256 a59d74e0e3594f387d707b26277dc819d713c27d0d813024ba636fffa9aa7cff
 EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12aad05 SHA1 5fb4b96ba83ef678ac01faa354d4b67b53149dbd SHA256 d2d1768a7ecf76e310cfec673961605fe9c36c836dc50242541b3a46e3fc2938
-EBUILD xulrunner-1.9.2.3-r1.ebuild 7064 RMD160 882503d836227b2652ff0c4f813053f7963455e1 SHA1 8d8e36f867cee175469678d4426a94d5893dd961 SHA256 1c574db2a1edab8690462fd1482c0b1f8b4a54239fc7787951609c702c85be91
-MISC ChangeLog 42116 RMD160 f497be4cb3fc06e4ee022c7aa4b7774c7db31977 SHA1 5b09ec8cfad7c36b865a5e96e7166f887aeb85d3 SHA256 40825b9e081d0ffd0de9b48c031d5e413eb5fad33be7aadbfa7a709e74d7ef0f
+EBUILD xulrunner-1.9.2.3-r1.ebuild 7121 RMD160 03b19ef37bd8ac26a489b62dbcfe02ded5614040 SHA1 88c6b17d93362d71cf810f38c8e3f5fa0d6edd33 SHA256 cb83390964a603cb75d447c59938a48042248855161e123ebd91baee6d5f484f
+MISC ChangeLog 42254 RMD160 d9c1f782e63a457f758be961af1251c8624303af SHA1 a753c3ec22bfd3f68430e268328610a656f71a45 SHA256 dd0b17914fd83246b6cbb807a77926306098c6180ff178332003798cf5e84c5f
 MISC metadata.xml 394 RMD160 87c4429eed631c2727f7d3372f664d39db20be7f SHA1 30b52729cbc65b0d0f683c576d3e9f8865d9e893 SHA256 c0acfe25d1d0e91b0df61729e61ce47fb8f97ec02a4eb94ca21fd48fda20102e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvNc5cACgkQNQqtfCuFneNshACdHdij4mM0HGwmwmKofxKzKP9Z
-wHIAoJPAYvFsty4C6UVis6wKrKcy3CCZ
-=Z7QE
------END PGP SIGNATURE-----
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() {