[gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     332e3408d5e8e343713000dafcbf32cfb77a324d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 11:28:43 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 11:28:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=332e3408

Sync portage

---
 sys-apps/portage/Manifest                          |    2 +-
 ...-r1.ebuild => portage-2.2.0_alpha151-r1.ebuild} |   33 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 18df9bf..1e281eb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-2.2.0_alpha149-r1.ebuild 11792 SHA256 381f06b18523e478b169dca0b21fb955c0469200ea90f9d1613f134eba545f73 SHA512 69c527225e2595f60c5c5beaeb50a1e6a91bd3e5393aba9cb44b9f5cbfde0fde7719263a68faa9e641f4cd2e30db686fd83c098ceb960ae4bedb986526e21460 WHIRLPOOL 2255f7df02f6cfc77be93ee28c6e3fdbf5ae02fa8e2306d29cd90aea1d889a2915e8a63ed60cff5ddf80d13410a389509feb4a5035d23bd6002b5f9364246ece
+EBUILD portage-2.2.0_alpha151-r1.ebuild 11916 SHA256 f97988eb5a3861d2a8f22c39156819f26af71e0b794dbf745d4e22bf95b6120b SHA512 7d5c2f6f3d085a494f5eb307f5a302bd1ec1dffe372e2cd283d83704b0ec541b4ba68bf163be9df5aa92a57b08401e7f42c68bb71ea37c0c43abaf7e99a270a0 WHIRLPOOL 11038f5cf3586111655c0c597f00058a51f64a4d9b57857d60c6055d4e181b49f005c95abde41e9966f86c1b326cf436adf64ecacfe734ff7dd31209b89475ed
 MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630

diff --git a/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild b/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
similarity index 92%
rename from sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
index da1ead1..5615509 100644
--- a/sys-apps/portage/portage-2.2.0_alpha149-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha151-r1.ebuild
@@ -9,21 +9,21 @@ inherit eutils git-2 python
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="5728c6f5e9099f8b8076d0b8315be059a1244bda"
+EGIT_COMMIT="69dc95fb27bbe290ef60e5d826ec868d6baee4b5"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_pl pypy2_0 python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
+	!pypy2_0? ( !python2? ( !python3? (
 		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
 	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
 	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
@@ -41,9 +41,10 @@ DEPEND="${python_dep}
 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
 # for now, don't pull in xattr deps for other kernels.
 # For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
+		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
 		>=app-admin/eselect-1.2
 		|| ( ${python_dep_ssl} dev-python/python-mhash )
 	)
@@ -62,7 +63,7 @@ PDEPEND="
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
+# NOTE: FEATURES=installsources requires debugedit and rsync
 
 compatible_python_is_selected() {
 	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
@@ -78,15 +79,15 @@ pkg_setup() {
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
 	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python2"
 	fi
-	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
@@ -111,8 +112,8 @@ pkg_setup() {
 		python_set_active_version 3
 	elif use python2; then
 		python_set_active_version 2
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
 	fi
 }
 
@@ -152,9 +153,9 @@ src_prepare() {
 	elif use python2; then
 		einfo "Converting shebangs for python2..."
 		python_convert_shebangs -r 2 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
 	fi
 
 	if [[ -n ${EPREFIX} ]] ; then