08 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild,

metadata.xml:
Support USE=python2, for cases in which portage dependencies such as
libselinux only work with python2.

Package-Manager: portage-2.2.0_alpha22_p7/cvs/Linux i686

4 files changed, 28 insertions, 14 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index dcfe6af1304f..fcabf46fba02 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.798 2011/02/08 01:32:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.799 2011/02/08 22:03:06 zmedico Exp $
+
+  08 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild,
+  metadata.xml:
+  Support USE=python2, for cases in which portage dependencies such as
+  libselinux only work with python2.
 
 *portage-2.2.0_alpha22 (08 Feb 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8ad9fade81a9..5d12ea180cf1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -23,13 +23,13 @@ EBUILD portage-2.1.9.35.ebuild 9716 RMD160 2a1b50be813e65570b6a70efba8703457c523
 EBUILD portage-2.1.9.38.ebuild 9716 RMD160 46c976bb990648136d9c3f72a239f131db9d5b6a SHA1 f401c8f1da660065a20d9c183002b53acc2768a6 SHA256 aa616d14337d547f26b35fe0954d5337469bd3c83a2122fd1659a9a82cda0f9b
 EBUILD portage-2.2.0_alpha19.ebuild 11478 RMD160 c0c4ea734a80a22b58fad79af45a1a672d22684b SHA1 110d3a4b2b52702ef3a9b3f4a21760bd29d8fe6b SHA256 50d2165b771f6f86bb73e67c05d4f1943e47e7b5ce568e8d1f8e5964849e7e54
 EBUILD portage-2.2.0_alpha22.ebuild 11478 RMD160 d493c0b7534d0b89e243033062bf563761aecff6 SHA1 41c88026c167955e9087146e6837409141a63622 SHA256 6c8fdd4d679e17315735f904d07c9aee081d48c06e4183b40006a9de1bd58d33
-EBUILD portage-9999.ebuild 10693 RMD160 b77ea220025ab1d3912b0197eb53163edc9cda78 SHA1 fcf6862dfbb372d01e785aa5c4699745f58785d4 SHA256 4d762759a1a0d244f33defd8fb2a012dd70ef085bcccfa68298b5600cae0d580
-MISC ChangeLog 57164 RMD160 265667a6f1f375b1409d7932956c19d03773e799 SHA1 3d42bf5af4a480f2f0dbf23a310b62d5788e28ce SHA256 2b62da35afd398d02762e1823d8dd7c5f730b4463d95fccda74d705754e83d5d
-MISC metadata.xml 659 RMD160 7ee0e47eb8f485c2a0d45164b90e0aa4f91bd738 SHA1 afeb226c303b15eb2157cf9f97293c77f92a2919 SHA256 e141c1ecbca4c7c97009ecf16a70628c0470f291683c788dfed5d06efcd6ae2e
+EBUILD portage-9999.ebuild 10957 RMD160 82804a0ca5f0050cf45435959fbf5bb59d71ed9f SHA1 ca5abc6553e67a01dfc2699f4b186d36f2734898 SHA256 74cb0d27b6599af5a2c2daf32352ebc886e45f83d91516cede9681bb5d4ceb16
+MISC ChangeLog 57357 RMD160 04d07970c701df9afd1707ed2be6d21b5d1cf72a SHA1 7b5dbe4cde765dd845339adc9a7ecd25df1bca51 SHA256 1e8d8037f384ee818903b3f9096df5ca4873ddc19450121e27e7ebfe1a469f78
+MISC metadata.xml 724 RMD160 becdb078c637d12e9d7402cd9297a942c657717e SHA1 ce260048be905d15470185ad22ee57a192f561a6 SHA256 371fa80623857d4e03f85fb64bc58570a4ec030e6376ea2e8d1232b6aa3ebc44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1QnScACgkQ/ejvha5XGaN2SgCg18tP5M52gUo7K+kdkMN7wbwy
-4tEAnjEhvfznHakvC86LZNcn/jscJz2Z
-=TITz
+iEYEARECAAYFAk1RvZIACgkQ/ejvha5XGaM5DwCgxWlfdsiXHIexApZUXuttH15a
+Ub8An1Q6V8BGu4wbqZFjdMquJq7phOku
+=tz9q
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index ee29c2ad57b0..dbcbf61f54c5 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -10,6 +10,7 @@
 	<use>
 		<flag name="epydoc">Build html API documentation with epydoc.</flag>
 		<flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
+		<flag name="python2">Use python2 as Python interpreter.</flag>
 		<flag name="python3">Use python3 as Python interpreter.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index bf7b6c4f8d64..5e97f12bfbc0 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.17 2011/02/06 19:36:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.18 2011/02/08 22:03:07 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -13,12 +13,12 @@ LICENSE="GPL-2"
 KEYWORDS=""
 PROVIDE="virtual/portage"
 SLOT="0"
-IUSE="build doc epydoc +ipc python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
 	!python3? (
-		build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
-		!build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 !python2? ( >=dev-lang/python-3 ) ) )
 	)"
 
 # The pysqlite blocker is for bug #282760.
@@ -64,7 +64,10 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
-	if ! use python3 && ! compatible_python_is_selected ; then
+	if use python2 && use python3 ; then
+		die "Do not enable python2 and python3 USE flags simultaneously"
+	fi
+	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
 		for x in /usr/bin/python2.* ; do
@@ -84,7 +87,9 @@ pkg_setup() {
 		fi
 	fi
 
-	if use python3; then
+	if use python2; then
+		python_set_active_version 2
+	elif use python3; then
 		python_set_active_version 3
 	fi
 }
@@ -107,7 +112,10 @@ src_prepare() {
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
-	if use python3; then
+	if use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
 	fi