*portage-2.2.0_alpha37 (27 May 2011)

  27 May 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha37.ebuild:
  2.2.0_alpha37 version bump. This includes all of the fixes in
  portage-2.1.9.50 and also fixes bug #368725 (outdated deps of installed
  packages use for calculations in some cases). Bug #210077 tracks all bugs
  fixed since portage-2.1.x.

*portage-2.1.9.50 (27 May 2011)

  27 May 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.50.ebuild:
  2.1.9.50 version bump. This fixes bug #142508 (make etc-update clear
  term when appropriate), bug #288597 (FEATURES=distcc-pump), and also fixes
  some cases related to bug #364681 (recognize new-style virtual/libc).
  Bug #358927 tracks all bugs fixed since portage-2.1.9.42.

Package-Manager: portage-2.1.9.50/cvs/Linux i686

4 files changed, 736 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 7c3daf64c818..bd2fdb32d30d 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,22 @@
 # 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.829 2011/05/25 07:21:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.830 2011/05/27 04:54:14 zmedico Exp $
+
+*portage-2.2.0_alpha37 (27 May 2011)
+
+  27 May 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha37.ebuild:
+  2.2.0_alpha37 version bump. This includes all of the fixes in
+  portage-2.1.9.50 and also fixes bug #368725 (outdated deps of installed
+  packages use for calculations in some cases). Bug #210077 tracks all bugs
+  fixed since portage-2.1.x.
+
+*portage-2.1.9.50 (27 May 2011)
+
+  27 May 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.50.ebuild:
+  2.1.9.50 version bump. This fixes bug #142508 (make etc-update clear
+  term when appropriate), bug #288597 (FEATURES=distcc-pump), and also fixes
+  some cases related to bug #364681 (recognize new-style virtual/libc).
+  Bug #358927 tracks all bugs fixed since portage-2.1.9.42.
 
 *portage-2.2.0_alpha36 (25 May 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 07e4917f107e..24c97114a108 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,27 +7,31 @@ DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0ef
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
 DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba
 DIST portage-2.1.9.49.tar.bz2 769124 RMD160 ca9fb20d7abee96b96635aa923745c073f0c33bf SHA1 8b4263338eeb90a68d24b47510e78102dd69d0bb SHA256 81fe34df93ddb2187fb106aee560d39f9778725f14e05a1e1efa3103924dd409
+DIST portage-2.1.9.50.tar.bz2 784942 RMD160 f3f208fa2bfb805864f06cd0cf607b518ffc5eef SHA1 3a448f8c9339fbed01b4cc75cf56cebce1cdace5 SHA256 b5793d1631dc60289d55280057b9faf38de3a608cbbe25720e243966aa82de99
 DIST portage-2.2.0_alpha31.tar.bz2 800161 RMD160 3abefc273e8428a4bb74b5c76df077a552020894 SHA1 3478898b8c38bddab4e8c1d40da3ed81a8141238 SHA256 13b4a2c6f15f6ab63e0cd176082b1a52f3ea1a7b3ba816f21668f67c174be273
 DIST portage-2.2.0_alpha33.patch.bz2 23934 RMD160 789e7b504c050b31a32e4be82f2fbbb2853732a0 SHA1 8e69703e7e8ad19d9da4b4fbd9b7f2db67c1fac5 SHA256 d5bdc0a85632395c1ed2ddf82b9540642198cce35bf6855307ab2b20ab964de1
 DIST portage-2.2.0_alpha34.tar.bz2 813056 RMD160 5c8e515b471faa603181dfb6cb80680e5cbd2c54 SHA1 0bce8bcfa1c143411dee69f46fbb839a8a475147 SHA256 348772e97d65a84e14eb690c50c722d052dde218183e5deec41f577379ba647c
 DIST portage-2.2.0_alpha35.patch.bz2 13374 RMD160 683e3b7bb4095f04dbb7f8f4e20ef9a6539b2c16 SHA1 bfc2a7e1b2db0ff468b69a4b43fb9593cb233b9f SHA256 e07a75a5d1f47ce0d5ef913d58a2b81a3983d31b9afbadce26cb2b4d60f0d90f
 DIST portage-2.2.0_alpha36.patch.bz2 22948 RMD160 5fbe977a6902af2666ac00a2d3fdea6d3dd39bc0 SHA1 0a3f18511ee78be071efd5ec994119ee39a93273 SHA256 24abd6fb5d9f2a6cb486289b9d12357db7a7a732cf96d80d95e6b615f6dbfae6
+DIST portage-2.2.0_alpha37.patch.bz2 25655 RMD160 4e3cc944f72cd1834e2c6773b1d1565ca4797d86 SHA1 816c2dabf039e46700cf43a20304b67364780731 SHA256 0206bebbc51cefd3a9ece7b68c23f7d45df394c57b58ea93379df56785b5a03b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 9998 RMD160 536d6829c9e328726b9c78aa042cc3a6f2004157 SHA1 393a2d99780af1f8c9962f0255a41c9ce2699fc4 SHA256 fdc0a2f7595235f0378fc15b6d40b47ddae5cb8b9bbf6c4b5081d44cd3ad4b3f
 EBUILD portage-2.1.6.7.ebuild 8650 RMD160 22340c6b11a4c01a55a234810c50a2e1365de184 SHA1 b56a15fd723a1869809efda3bcd421fb497357d9 SHA256 f2fa83030914d74f104367beb910fdab665d51cc0e9087dfe967b35eee6e371c
 EBUILD portage-2.1.9.42.ebuild 10242 RMD160 0dd7a631c0a3c92b862c5f13f3ff3ee3cd4c4251 SHA1 be2275c866a3c478bae9fba7b0bca8f01dd6df00 SHA256 6af1c9d99df60746a22d8f9987b22ffa2443a462f0e1f3d73f27b4a52ef06339
 EBUILD portage-2.1.9.49.ebuild 10254 RMD160 6c7ad5d186cee1b8b9a7065be29728424edd5a74 SHA1 41403e4767fa8e4a7a7421bef23c0b56aa1ed6e7 SHA256 fc4ac0d441d24775afd3f3e464a8f6cba9c38562156dd7943267e525bf38aa68
+EBUILD portage-2.1.9.50.ebuild 10254 RMD160 cef0b9af6abf5dc3fd1ec6631ac33d80ff47d36b SHA1 bc3a1e198ee892b894af3f2eaea7abf1f56ff850 SHA256 0c20b8798a604025933f8b9615a3cdf27b27eb6397c34669cc56f85286332033
 EBUILD portage-2.2.0_alpha33.ebuild 12016 RMD160 591bbb62fd3154e85337da26ef646b2ade14d926 SHA1 def3b67c72d898823a842e5062e386ec2e01da2c SHA256 d6f18ae460eeebf1b685335ed92808c714d904cebb651f47f9280bb4705cf919
 EBUILD portage-2.2.0_alpha34.ebuild 12016 RMD160 532da5d63c16ec78166001bc33b6799d75e4132c SHA1 9eecb73a9a96453246e9c9c0aa7b75d23add0e48 SHA256 77a87b0b15172ff69af693327557ac8a392851952bba31587e3231db91646c32
 EBUILD portage-2.2.0_alpha35.ebuild 12016 RMD160 ef4afb9673f30b0ce42dfc5e1548adc799332b9e SHA1 ce05564cc3d2db53e88dd104f5affaeea4822a35 SHA256 948c6d8fcb816fc9e98dd9a1745d1cb5b303dd807024bce1dcf1b657d3be683c
 EBUILD portage-2.2.0_alpha36.ebuild 12016 RMD160 68e0bcd5fc0917e60c9fc5ca61a53d7e93120183 SHA1 bc64bd8c213e00cfea23d9736f1ced0d316a496e SHA256 b023ee50162dbfbbba6dfc8c880901c11f2a547bbd36478a6c25f6fcbc4e2886
+EBUILD portage-2.2.0_alpha37.ebuild 12016 RMD160 608f0e65e017e09c496363abee381c2efcbc2dd7 SHA1 0801c8854cfe45c3c2a61d4bc4feac961640a285 SHA256 502a4e422a7d7d1bdc963d148907ce994179d96c8d5936f0cb2d80ac779fdad5
 EBUILD portage-9999.ebuild 11238 RMD160 a57615c31dd306c3dc55448f71f3da6a87af356b SHA1 1d18f22cb2da7b2deb8392f76edf001767d8655c SHA256 6dcd490cf6accead6838aa93baef113fe30ea4b165781cc02827e4d6bc4a657e
-MISC ChangeLog 28485 RMD160 eea8f61e0dee62afd48f13c3002f56c233364b9f SHA1 1ff1b05920263ca49f4987b7bad252e0a5ec4aa0 SHA256 5d42a92a6edee458e2987e1a448130639e1d6138af3e21a7335292056eb65a30
+MISC ChangeLog 29232 RMD160 56c279fafccb72e887428e5759ebe65365d3a7be SHA1 99ce43f05d04266f49e7f51734c9f6387a0c3d4f SHA256 8bb85780e2e0cd8b03df302f4cd518a652740a932b726724f692f237b8bd1b28
 MISC metadata.xml 724 RMD160 becdb078c637d12e9d7402cd9297a942c657717e SHA1 ce260048be905d15470185ad22ee57a192f561a6 SHA256 371fa80623857d4e03f85fb64bc58570a4ec030e6376ea2e8d1232b6aa3ebc44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3crgwACgkQ/ejvha5XGaOHvwCglLxaYgI9vlIEVyE6N9QZ9XcE
-i9UAoIMuJ0brle+32qFSbKScJt7Iwi+x
-=Ebhy
+iEYEARECAAYFAk3fLnIACgkQ/ejvha5XGaN64wCgsw6NOcY6EcjsADYjacFNDC6c
+pMsAoKCUGF985gsBNENaf0lwuKi1FX/9
+=thZN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.9.50.ebuild b/sys-apps/portage/portage-2.1.9.50.ebuild
new file mode 100644
index 000000000000..2f056b30c79e
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.9.50.ebuild
@@ -0,0 +1,328 @@
+# 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.50.ebuild,v 1.1 2011/05/27 04:54:14 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+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 ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+
+python_dep="python3? ( =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}
+	!build? ( >=sys-apps/sed-4.0.5 )
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# rsync-2.6.4 rdep is for the --filter option #167668
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=$PV
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	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
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	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
+}
+
+src_compile() {
+	if use doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		make xhtml xhtml-nochunks || die "failed to make docs"
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		mkdir "${WORKDIR}"/api
+		local my_modules epydoc_opts=""
+		my_modules="$(find "${S}/pym" -name "*.py" \
+			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+			 -e 's:/:.:g' | sort)" || die "error listing modules"
+		# workaround for bug 282760
+		> "$S/pym/pysqlite2.py"
+		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+			epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports $epydoc_opts \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+		rm "$S/pym/pysqlite2.py"
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+		./pym/portage/tests/runTests || die "test(s) failed"
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/portage"
+	local portage_share_config=/usr/share/portage/config
+
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf || die
+
+	insinto "$portage_share_config"
+	doins "$S/cnf/make.globals" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+		newins make.conf make.conf.example || die
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+		newins make.conf make.conf.example || die
+	fi
+
+	dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+	fi
+
+	local x symlinks files
+
+	cd "$S" || die "cd failed"
+	for x in $(find bin -type d) ; do
+		exeinto $portage_base/$x || die "exeinto failed"
+		cd "$S"/$x || die "cd failed"
+		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+		if [ -n "$files" ] ; then
+			doexe $files || die "doexe failed"
+		fi
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	cd "$S" || die "cd failed"
+	for x in $(find pym/* -type d) ; do
+		insinto $portage_base/$x || die "insinto failed"
+		cd "$S"/$x || die "cd failed"
+		# __pycache__ directories contain no py files
+		[[ "*.py" != $(echo *.py) ]] || continue
+		doins *.py || die "doins failed"
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	# Symlinks to directories cause up/downgrade issues and the use of these
+	# modules outside of portage is probably negligible.
+	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+		[ ! -L "${x}" ] && continue
+		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
+	done
+
+	exeinto ${portage_base}/pym/portage/tests
+	doexe  "${S}"/pym/portage/tests/runTests
+
+	doman "${S}"/man/*.[0-9]
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
+	fi
+
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
+	use doc && dohtml -r "${S}"/doc/*
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	for x in ebuild egencache emerge portageq quickpkg repoman ; do
+		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
+	done
+
+	dodir /usr/sbin
+	local my_syms="archive-conf
+		dispatch-conf
+		emaint
+		emerge-webrsync
+		env-update
+		etc-update
+		fixpackages
+		regenworld"
+	local x
+	for x in ${my_syms}; do
+		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+	done
+	dosym env-update /usr/sbin/update-env
+	dosym etc-update /usr/sbin/update-etc
+
+	dodir /etc/portage
+	keepdir /etc/portage
+}
+
+pkg_preinst() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+	if [ -f "${ROOT}/etc/make.globals" ]; then
+		rm "${ROOT}/etc/make.globals"
+	fi
+
+	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+	REPO_LAYOUT_CONF_WARN=$?
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+		ewarn
+		echo "If you want overlay eclasses to override eclasses from" \
+			"other repos then see the portage(5) man page" \
+			"for information about the new layout.conf and repos.conf" \
+			"configuration files." \
+			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+		ewarn
+	fi
+
+	einfo
+	einfo "For help with using portage please consult the Gentoo Handbook"
+	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	einfo
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
diff --git a/sys-apps/portage/portage-2.2.0_alpha37.ebuild b/sys-apps/portage/portage-2.2.0_alpha37.ebuild
new file mode 100644
index 000000000000..a7e5dc7bc270
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.0_alpha37.ebuild
@@ -0,0 +1,383 @@
+# 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_alpha37.ebuild,v 1.1 2011/05/27 04:54:14 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+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="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+
+python_dep="python3? ( =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}
+	!build? ( >=sys-apps/sed-4.0.5 )
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# rsync-2.6.4 rdep is for the --filter option #167668
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=2.2.0_alpha34
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	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
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	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
+}
+
+src_compile() {
+	if use doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		make xhtml xhtml-nochunks || die "failed to make docs"
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		mkdir "${WORKDIR}"/api
+		local my_modules epydoc_opts=""
+		my_modules="$(find "${S}/pym" -name "*.py" \
+			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+			 -e 's:/:.:g' | sort)" || die "error listing modules"
+		# workaround for bug 282760
+		> "$S/pym/pysqlite2.py"
+		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+			epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports $epydoc_opts \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+		rm "$S/pym/pysqlite2.py"
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+		./pym/portage/tests/runTests || die "test(s) failed"
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/portage"
+	local portage_share_config=/usr/share/portage/config
+
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf || die
+
+	insinto "$portage_share_config/sets"
+	doins "$S"/cnf/sets/*.conf || die
+	insinto "$portage_share_config"
+	doins "$S/cnf/make.globals" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+		newins make.conf make.conf.example || die
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+		newins make.conf make.conf.example || die
+	fi
+
+	dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+	fi
+
+	local x symlinks files
+
+	cd "$S" || die "cd failed"
+	for x in $(find bin -type d) ; do
+		exeinto $portage_base/$x || die "exeinto failed"
+		cd "$S"/$x || die "cd failed"
+		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+		if [ -n "$files" ] ; then
+			doexe $files || die "doexe failed"
+		fi
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	cd "$S" || die "cd failed"
+	for x in $(find pym/* -type d) ; do
+		insinto $portage_base/$x || die "insinto failed"
+		cd "$S"/$x || die "cd failed"
+		# __pycache__ directories contain no py files
+		[[ "*.py" != $(echo *.py) ]] || continue
+		doins *.py || die "doins failed"
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	# Symlinks to directories cause up/downgrade issues and the use of these
+	# modules outside of portage is probably negligible.
+	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+		[ ! -L "${x}" ] && continue
+		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
+	done
+
+	exeinto ${portage_base}/pym/portage/tests
+	doexe  "${S}"/pym/portage/tests/runTests
+
+	doman "${S}"/man/*.[0-9]
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
+	fi
+
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
+	use doc && dohtml -r "${S}"/doc/*
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	for x in ebuild egencache emerge portageq quickpkg repoman ; do
+		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
+	done
+
+	dodir /usr/sbin
+	local my_syms="archive-conf
+		dispatch-conf
+		emaint
+		emerge-webrsync
+		env-update
+		etc-update
+		fixpackages
+		regenworld"
+	local x
+	for x in ${my_syms}; do
+		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+	done
+	dosym env-update /usr/sbin/update-env
+	dosym etc-update /usr/sbin/update-etc
+
+	dodir /etc/portage
+	keepdir /etc/portage
+}
+
+pkg_preinst() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+	if [ -f "${ROOT}/etc/make.globals" ]; then
+		rm "${ROOT}/etc/make.globals"
+	fi
+
+	has_version "<${CATEGORY}/${PN}-2.2_alpha"
+	MINOR_UPGRADE=$?
+
+	has_version "<=${CATEGORY}/${PN}-2.2_pre5"
+	WORLD_MIGRATION_UPGRADE=$?
+
+	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
+	# assume that the NEEDED.ELF.2 files have already been generated.
+	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+		! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
+	NEEDED_REBUILD_UPGRADE=$?
+
+	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+	REPO_LAYOUT_CONF_WARN=$?
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
+		einfo "moving set references from the worldfile into world_sets"
+		cd "${ROOT}/var/lib/portage/"
+		grep "^@" world >> world_sets
+		sed -i -e '/^@/d' world
+	fi
+
+	if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
+		einfo "rebuilding NEEDED.ELF.2 files"
+		for cpv in "${ROOT}/var/db/pkg"/*/*; do
+			if [ -f "${cpv}/NEEDED" ]; then
+				rm -f "${cpv}/NEEDED.ELF.2"
+				while read line; do
+					filename=${line% *}
+					needed=${line#* }
+					needed=${needed//+/++}
+					needed=${needed//#/##}
+					needed=${needed//%/%%}
+					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
+					newline=${newline//  -  }
+					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+				done < "${cpv}/NEEDED"
+			fi
+		done
+	fi
+
+	if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+		ewarn
+		echo "If you want overlay eclasses to override eclasses from" \
+			"other repos then see the portage(5) man page" \
+			"for information about the new layout.conf and repos.conf" \
+			"configuration files." \
+			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+		ewarn
+	fi
+
+	einfo
+	einfo "For help with using portage please consult the Gentoo Handbook"
+	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	einfo
+
+	if [ $MINOR_UPGRADE = 0 ] ; then
+		elog "If you're upgrading from a pre-2.2 version of portage you might"
+		elog "want to remerge world (emerge -e world) to take full advantage"
+		elog "of some of the new features in 2.2."
+		elog "This is not required however for portage to function properly."
+		elog
+	fi
+
+	if [ -z "${PV/*_alpha*}" ]; then
+		elog "If you always want to use the latest development version of portage"
+		elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}