2.2.0_alpha191 version bump. This includes all of the fixes in 2.1.13.2.

Bug #210077 tracks all bugs fixed since portage-2.1.x.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 556 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index dcb836741714..15ad020a614f 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1325 2013/07/30 07:01:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1326 2013/07/30 07:03:31 zmedico Exp $
+
+*portage-2.2.0_alpha191 (30 Jul 2013)
+
+  30 Jul 2013; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha191.ebuild:
+  2.2.0_alpha191 version bump. This includes all of the fixes in 2.1.13.2. Bug
+  #210077 tracks all bugs fixed since portage-2.1.x.
 
   30 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.13.2.ebuild:
   Tweak repos.conf logic for bug #478726.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index aa56bcd40c51..481e4ab7e5e9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -14,6 +14,7 @@ DIST portage-2.2.0_alpha175.tar.bz2 866662 SHA256 97976729bbdac82e790ec0691ccd15
 DIST portage-2.2.0_alpha177.patch.bz2 12456 SHA256 4a4659a0cadc7e92eee630419586155b5a7f1e869b5ece5a3689f6adfbc49c21 SHA512 f137864b191d4605c12266889021259d4448063c96eb1e8601f17c5ec71c584fa81ef79cf5609d9e3fdbe89300a06de86da8d122b229ccb3bf352d9cb85654c2 WHIRLPOOL ede934ba974b7ab2da815d607301c3c86e2370f9f5c1c75841dbdf163dcb4ce7b8c472e8967b04b4094705f547ffca89c4a013c3072938f413afa03947ab8385
 DIST portage-2.2.0_alpha188.patch.bz2 64370 SHA256 d75c56425096507ed180f690849832c1970dcdeac96b6aa90cf97b29c7aaa91f SHA512 4fa84a75f2288ade7b3c02dc95f67dd32eb92b636f63ad365a3688708d2514f7819ea1b6fa19bbb27f047c10cd944940d03fe1a37d4bc348e2a2457cc7010507 WHIRLPOOL 30c82da2252100b50494399542fe45f652632005d310c89543b904c952fbd34ed2d1b370f4b02fa5e53f79e1007c78dd7775af761f5a08608fc9614a68ac6e82
 DIST portage-2.2.0_alpha190.tar.bz2 892695 SHA256 a1d20df4240662661deb23b957c53f1e22253517bccd7c28a08356ed2e663df5 SHA512 3c89ffe9b1817580e129031b98cf03f2c77b0bd0915a5c596a2e4da566d27ba5736ec3aba95e9f0e9719c6ceb4a0208962c0a8e1bd0f25da7ac4f3718d4cc93a WHIRLPOOL 1207122c3737d79f030c4cbc069777f77bd153c1bd60c6b1e1a77d7e1137c8e73e77c1fd9abcfcd6918cebc1b0932c674f81195ad8d0b882e7ec32631355785c
+DIST portage-2.2.0_alpha191.patch.bz2 6347 SHA256 62ef1e47d322e3993d5bfd21e64d03c1ca36419d0362271f79b4d22aec6f66f0 SHA512 6470a3eb99a084a86f2e90298a12d293bdc4b1481b6ef2b9ef39180dfed761ea05fd8e4fa47901013debf10e8556fb56520d53a5d0b0c2f4c80d2d1640fe5ac4 WHIRLPOOL 3fe3129d07805a00f64a0efb0509fff9da96000157cc5c269664d73053644af53509998ea00358b7d876fbf9827842586e9ec42c43fd055d13b8ed81cfa46aae
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
 EBUILD portage-2.1.11.62.ebuild 13579 SHA256 4ca79541f61fb0bd97289e521913b7cd5f65bb63c7442ef7f0b4dc0f507b863f SHA512 6cc21f6696b13f28db6ebdfab805b965b5455c44864a06ad5bec34193694ecba118427803ccb96957d64bd563c0120dd37cbc06642e60aeb1f7595a3dff94161 WHIRLPOOL 5c50a6f7909a0989599413b672a46d5732e7dd151da898dac6a3f465fc578504357b824964ae5843de21e90266a8b6f885dff256aa538a907aff8356cce77220
 EBUILD portage-2.1.12.13.ebuild 14220 SHA256 b9e5c3d3f540f0a1f3faf033f155a6184d206ad7045a307fb72f3b91fba1098f SHA512 4d9c7cdd46738a36ffa070df7c0e6255f62636b84828807a4af0ca47d686b5eb700cb4dc8c1d929d3c8e52429aa377428e19e2d4feee26fc48a5d385b28c94ff WHIRLPOOL 7091a42e4937edd14a6f100f012692a245baad23c8c068d0dbefe316ba4931328dfe1a669f288f2762a8577b550bc53f96b1e218b4c88dd6ecf14e6345b86aa9
@@ -24,14 +25,15 @@ EBUILD portage-2.1.6.7_p1.ebuild 8308 SHA256 5c5c52664f4d3a09679d09d4ab060c52752
 EBUILD portage-2.2.0_alpha177.ebuild 15614 SHA256 e27b1114dbc2549ea485ea5328ce784bc8ee00a07d3d944b7e12b94fcb9b6489 SHA512 d72bc7841bbc18df28d18084d41472c5f6b5e73ad0f20e8121b2694ff83b041b46db327acd76e557fc07fd879ecfa19b6ebfd775699c2c4fb03683e4dccc3fdf WHIRLPOOL 22450f30c9b5456b031ba30c041dabd4ee35f23d28ffb91654a334bfb7d67b6094bf5852e9b37f3c21441e86b6b6dc2a723932ca5b3bcb05048d424f6a63b146
 EBUILD portage-2.2.0_alpha188.ebuild 15339 SHA256 ef820ac474387bd5a9d852fe6762f8b41b150b66a6976a9d3b81087c1bbb8e6f SHA512 093defdb436f1685a845554e85279828b9ad1f0855fcef42d327298a947ee32f85db3f2372b36a321efd7fa49bc8ae7734f2b2884e26e3680bc6ea2e3801be9f WHIRLPOOL b2691a8e527a2a1ad9ef4e6f10075e9ee6b5f91b7268ea5dcca24cb557c721708b025d3d4a5bda9b7805cffba0920e4de31d1b85e473d965bf1b81d0cc130ad2
 EBUILD portage-2.2.0_alpha190.ebuild 17889 SHA256 2836eb723e1cfd062330395ed3fc546437b78d51c31b01e7b0ed004c5452f4c3 SHA512 a822068000e5acb0c4b35c4019f957a142aa66668f33acf8a29ae7e47a6bf5fb299a448e5733a64d92829c60802212f2e2034462c09613f33ce2b667e724848d WHIRLPOOL 07a9d7c7d065122d6b3e2683873390eb798102f9a5a1b7ff0be229d83b545aeb1d893bd25123ec0bb61b487f3f4220ea0b6a09b2719a0e287ee5a601aa435787
+EBUILD portage-2.2.0_alpha191.ebuild 18139 SHA256 ee4c53bc992ef180518929733dff94f51ecc4a8f9159c671093e4d1db1357f96 SHA512 6164cdd1bafb958ccc707564757d723f05eda1828ed16d296e62d485500d115af0fa3046f2fa1dc2f842c63bd8256128af52f7e6378b8e805de70e96787eecec WHIRLPOOL d9af99ba8879f766c17803599eeca3136fa1314659422cdfd9b58be90e125951d24997081d7ab85e09bf4fe1c3b565b0a35a361652366534cac50c4fb5a09a61
 EBUILD portage-9999.ebuild 13747 SHA256 3d6bbc4177de0644353c9f9a2b4c1afdaa3a3bb51961cbac13624a8ac51e89ce SHA512 8490e08a319f48cf4ad901facc080a26caa06997c3827149a163cb14f4359c2bee461125b40251044a8d7b7628a412aae4afafae62db0ef5d1521f4f3e0b7840 WHIRLPOOL 38b4845c2a5d4e0b8fdf8408aad0a93b3a335b69cab9a7eb004cc6b6eacab1e7483eee8e15bfbc729b6b9b910a4cb1b0c9786f29adbdd079395ecbda33297e86
-MISC ChangeLog 41676 SHA256 81fb7714c6ca771fb1021b8a24fb30692099ce6e20d8fc90b3e61c6a2729f511 SHA512 ee9009333dce05259421f123d26a211c7191565114f03fd53c94864d34f61383a391afbff651839a8007233392a2bb3f03950fa77c100cf69222f256429077c9 WHIRLPOOL d3653e7c54e77c424a91ce2f252515f3eb8bc449102920babb67213999b82ccd7c3fae4123e0481041a97428cf399d224e4f0146d9f6603dfc0d8ed5a19a677c
+MISC ChangeLog 41927 SHA256 8d4abc8dac91a57a5189f5005d4a50371d1537f865a6b4fb25ec6be7e025e4f3 SHA512 aa57d42fe9b7e08d58ebc2cb011197fdedea70b949a447187ee05ea7cd170a8e69a79f8266573a49058b6df7de751ceb375da1de298d346ec08b1d3da52a5d4a WHIRLPOOL 0bfac890e370e390c9d3a1384fe38661958a807341ebd19d7286c180c98da201fc0857d041107a2fb10f62c142e4b44e96a9e9872c79dc7f8a2dc1266d809132
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 957 SHA256 f03704594ee4694b60fcba3df6a5d813a849a9d3454fc902d974555eeea79d3d SHA512 958d90bc465e1a49aec7f0f649bf1026fb8f28811210223cf4149e32bab96695997049d42b12827487f2b5a4f0e2b51a2431dba01fe373d36199a32ab02e6765 WHIRLPOOL 5cb0e38bbfd0b7e7929c4c0167027ce07c5a8fa535c52906b2a2936897be37472be7430f0335aaff5931ae99ca89939047ecb997b172ae2187ae5949f10e1c8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH3ZLcACgkQ/ejvha5XGaOfLACghfg7G6xj04sXOEceLS27erd8
-DzwAn0XHVTG3QGJYJMIl2X49tz/4/0LW
-=YPpP
+iEYEAREIAAYFAlH3ZUUACgkQ/ejvha5XGaNbpwCeJyTPIyPhoEwzaAqnSDFuM4tC
+Xk4Ani5CvGs5E/lTFlN12hGS8ahO/z93
+=Wes/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0_alpha191.ebuild b/sys-apps/portage/portage-2.2.0_alpha191.ebuild
new file mode 100644
index 000000000000..06fd60a84c80
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.0_alpha191.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2013 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_alpha191.ebuild,v 1.1 2013/07/30 07:03:31 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=3
+PYTHON_COMPAT=(
+	pypy1_9 pypy2_0
+	python3_1 python3_2 python3_3 python3_4
+	python2_6 python2_7
+)
+inherit eutils multilib
+
+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="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
+
+for _pyimpl in ${PYTHON_COMPAT[@]} ; do
+	IUSE+=" python_targets_${_pyimpl}"
+done
+unset _pyimpl
+
+# 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] )
+	!pypy2_0? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
+	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}"
+python_dep="${python_dep//ssl,}"
+
+python_dep="${python_dep}
+	python_targets_pypy1_9? ( virtual/pypy:1.9 )
+	python_targets_pypy2_0? ( virtual/pypy:2.0 )
+	python_targets_python2_6? ( dev-lang/python:2.6 )
+	python_targets_python2_7? ( dev-lang/python:2.7 )
+	python_targets_python3_1? ( dev-lang/python:3.1 )
+	python_targets_python3_2? ( dev-lang/python:3.2 )
+	python_targets_python3_3? ( dev-lang/python:3.3 )
+	python_targets_python3_4? ( dev-lang/python:3.4 )
+"
+
+# The pysqlite blocker is for bug #282760.
+# make-3.82 is for bug #455858
+DEPEND="${python_dep}
+	>=sys-devel/make-3.82
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	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.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# 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-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 )
+	)
+	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
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+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
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+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_alpha190
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.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() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${PYTHON}" -c 'import xattr' 2>/dev/null
+}
+
+call_with_python_impl() {
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	env EPYTHON=${EPYTHON} "$@"
+}
+
+get_python_interpreter() {
+	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
+	local impl=$1 python
+	case "${impl}" in
+		python*)
+			python=${impl/_/.}
+			;;
+		pypy*)
+			python=${impl/_/.}
+			python=${python/pypy/pypy-c}
+			;;
+		*)
+			die "Unrecognized python target: ${impl}"
+	esac
+	echo ${python}
+}
+
+get_python_sitedir() {
+	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
+	local impl=$1
+	local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+	[[ -d ${EROOT}${site_dir} ]] || \
+		ewarn "site-packages dir missing for ${impl}: ${EROOT}${site_dir}"
+	echo "${site_dir}"
+}
+
+python_compileall() {
+	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	local d_image=${D}${d#/}
+	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
+	case "${EPYTHON}" in
+		python*)
+			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
+			# Note: Using -OO breaks emaint, since it requires __doc__,
+			# and __doc__ is None when -OO is used.
+			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
+			;;
+		pypy*)
+			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
+			;;
+		*)
+			die "Unrecognized EPYTHON value: ${EPYTHON}"
+	esac
+}
+
+pkg_setup() {
+	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 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 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 pypy2_0 && ! 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 "${EPREFIX}"/usr/bin/python2.* ; do
+			x=${x#${EPREFIX}/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
+
+	# We use EPYTHON to designate the active python interpreter,
+	# but we only export when needed, via call_with_python_impl.
+	EPYTHON=python
+	export -n EPYTHON
+	if use python3; then
+		EPYTHON=python3
+	elif use python2; then
+		EPYTHON=python2
+	elif use pypy2_0; then
+		EPYTHON=pypy-c2.0
+	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 $(find man -type f) || \
+		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 xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	local set_shebang=
+	if use python3; then
+		set_shebang=python3
+	elif use python2; then
+		set_shebang=python2
+	elif use pypy2_0; then
+		set_shebang=pypy-c2.0
+	fi
+	if [[ -n ${set_shebang} ]] ; then
+		einfo "Converting shebangs for ${set_shebang}..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
+				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.freens.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	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 ""
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		call_with_python_impl \
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		call_with_python_impl \
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	call_with_python_impl \
+	emake test || die
+}
+
+src_install() {
+	call_with_python_impl \
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	# Allow external portage API consumers to import portage python modules
+	# (this used to be done with PYTHONPATH setting in /etc/env.d).
+	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+	# site-packages, and compile with the corresponding interpreter.
+	local impl files mod_dir dest_mod_dir python relative_path x
+	for impl in "${PYTHON_COMPAT[@]}" ; do
+		use "python_targets_${impl}" || continue
+		if use build && [[ ${ROOT} == / &&
+			! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
+			# Tolerate --nodeps at beginning of stage1 for catalyst
+			ewarn "skipping python_targets_${impl}, interpreter not found"
+			continue
+		fi
+		while read -r mod_dir ; do
+			cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
+			files=$(echo *.py)
+			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+				# __pycache__ directories contain no py files
+				continue
+			fi
+			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
+			dodir "${dest_mod_dir}" || die
+			relative_path=../../../lib/portage/pym/${mod_dir}
+			x=/${mod_dir}
+			while [ -n "${x}" ] ; do
+				relative_path=../${relative_path}
+				x=${x%/*}
+			done
+			for x in ${files} ; do
+				dosym "${relative_path}/${x}" \
+					"${dest_mod_dir}/${x}" || die
+			done
+		done < <(cd "${ED}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
+		cd "${S}" || die
+		EPYTHON=$(get_python_interpreter ${impl}) \
+		python_compileall "$(get_python_sitedir ${impl})"
+	done
+
+	# Compile /usr/lib/portage/pym with the active interpreter, since portage
+	# internal commands force this directory to the beginning of sys.path.
+	python_compileall /usr/lib/portage/pym
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$ED" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	# 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
+		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
+
+	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$(portageq envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = rsync
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+		local dest=${EROOT}/etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+	fi
+
+	if ${NEEDED_REBUILD_UPGRADE} ; then
+		einfo "rebuilding NEEDED.ELF.2 files"
+		local cpv filename line newline
+		for cpv in "${EROOT}/var/db/pkg"/*/*; do
+			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
+			while read -r line; do
+				filename=${line% *}
+				newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
+				newline=${newline//  -  }
+				[[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
+				echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+			done < "${cpv}/NEEDED"
+		done
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+}