*portage-2.2.0_alpha23 (08 Feb 2011)

  08 Feb 2011; Zac Medico <zmedico@gentoo.org> -portage-2.2.0_alpha22.ebuild,
  +portage-2.2.0_alpha23.ebuild:
  2.2.0_alpha23 version bump. This includes all of the fixes in
  portage-2.1.9.39. Bug #210077 tracks all bugs fixed since portage-2.1.x.

*portage-2.1.9.39 (08 Feb 2011)

  08 Feb 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.38.ebuild,
  +portage-2.1.9.39.ebuild:
  2.1.9.39 version bump. This fixes bug #354057 (test failure involving
  ENODATA on FreeBSD), bug #354137 (clarify emerge man page description
  of package arguments), and bug #354141 (support paths starting with
  ../ for emerge package arguments). This also fixes a regression in
  2.1.9.38 which can cause emerge to crash with an AttributeError.
  Bug #349307 tracks all bugs fixed since 2.1.9.25.

  08 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
  Prefer python3 if both python2 and python3 are enabled.

(Portage version: 2.2.0_alpha23/cvs/Linux i686)

4 files changed, 70 insertions, 27 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index fcabf46fba02..b7ec043a196a 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,27 @@
 # 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.799 2011/02/08 22:03:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.800 2011/02/08 23:00:59 zmedico Exp $
+
+*portage-2.2.0_alpha23 (08 Feb 2011)
+
+  08 Feb 2011; Zac Medico <zmedico@gentoo.org> -portage-2.2.0_alpha22.ebuild,
+  +portage-2.2.0_alpha23.ebuild:
+  2.2.0_alpha23 version bump. This includes all of the fixes in
+  portage-2.1.9.39. Bug #210077 tracks all bugs fixed since portage-2.1.x.
+
+*portage-2.1.9.39 (08 Feb 2011)
+
+  08 Feb 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.38.ebuild,
+  +portage-2.1.9.39.ebuild:
+  2.1.9.39 version bump. This fixes bug #354057 (test failure involving
+  ENODATA on FreeBSD), bug #354137 (clarify emerge man page description
+  of package arguments), and bug #354141 (support paths starting with
+  ../ for emerge package arguments). This also fixes a regression in
+  2.1.9.38 which can cause emerge to crash with an AttributeError.
+  Bug #349307 tracks all bugs fixed since 2.1.9.25.
+
+  08 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Prefer python3 if both python2 and python3 are enabled.
 
   08 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild,
   metadata.xml:
diff --git a/sys-apps/portage/portage-2.1.9.38.ebuild b/sys-apps/portage/portage-2.1.9.39.ebuild
index 3114e04297d4..fdf31111014b 100644
--- a/sys-apps/portage/portage-2.1.9.38.ebuild
+++ b/sys-apps/portage/portage-2.1.9.39.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-2.1.9.38.ebuild,v 1.1 2011/02/08 01:32:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.39.ebuild,v 1.1 2011/02/08 23:00:59 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,13 +13,14 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 PROVIDE="virtual/portage"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl 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 ) )
-	)"
+	!python2? ( !python3? (
+		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+	) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
@@ -79,7 +80,11 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
-	if ! use python3 && ! compatible_python_is_selected ; then
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	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
@@ -101,6 +106,8 @@ pkg_setup() {
 
 	if use python3; then
 		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
 	fi
 }
 
@@ -130,6 +137,9 @@ src_prepare() {
 	if use python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
 	fi
 }
 
diff --git a/sys-apps/portage/portage-2.2.0_alpha22.ebuild b/sys-apps/portage/portage-2.2.0_alpha23.ebuild
index 3d1ee5a5419a..017ae4249c2a 100644
--- a/sys-apps/portage/portage-2.2.0_alpha22.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha23.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-2.2.0_alpha22.ebuild,v 1.1 2011/02/08 01:32:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha23.ebuild,v 1.1 2011/02/08 23:00:59 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,13 +13,14 @@ LICENSE="GPL-2"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
 PROVIDE="virtual/portage"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl 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 ) )
-	)"
+	!python2? ( !python3? (
+		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+	) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
@@ -79,7 +80,11 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
-	if ! use python3 && ! compatible_python_is_selected ; then
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	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
@@ -101,6 +106,8 @@ pkg_setup() {
 
 	if use python3; then
 		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
 	fi
 }
 
@@ -130,6 +137,9 @@ src_prepare() {
 	if use python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
 	fi
 }
 
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 5e97f12bfbc0..546e6407ccb0 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.18 2011/02/08 22:03:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.19 2011/02/08 23:00:59 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -16,10 +16,11 @@ SLOT="0"
 IUSE="build doc epydoc +ipc python2 python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
-	!python3? (
+	!python2? ( !python3? (
 		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 ) ) )
-	)"
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+	) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
@@ -65,7 +66,8 @@ compatible_python_is_selected() {
 
 pkg_setup() {
 	if use python2 && use python3 ; then
-		die "Do not enable python2 and python3 USE flags simultaneously"
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
 	fi
 	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
@@ -87,10 +89,10 @@ pkg_setup() {
 		fi
 	fi
 
-	if use python2; then
-		python_set_active_version 2
-	elif use python3; then
+	if use python3; then
 		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
 	fi
 }
 
@@ -112,12 +114,12 @@ src_prepare() {
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
-	if use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	elif use python3; then
+	if use python3; then
 		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
 	fi
 }