Make portageq call compatible with paludis (bug #480994), and remove old version.

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

4 files changed, 14 insertions, 585 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index ee25328e9f2a..cce19d7b1682 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1345 2013/08/22 04:45:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1346 2013/08/24 14:59:29 zmedico Exp $
+
+  24 Aug 2013; Zac Medico <zmedico@gentoo.org> -portage-2.2.0.ebuild,
+  portage-2.2.1.ebuild:
+  Make portageq call compatible with paludis (bug #480994), and remove old
+  version.
 
 *portage-2.2.1 (22 Aug 2013)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6812aeffeef2..8f26c74fe157 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,22 +7,20 @@ DIST portage-2.1.12.2.tar.bz2 868695 SHA256 700cf7118d60aa14a2d759887e50988a3e52
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
 DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 SHA512 d035f84601802ecaea3c0edea037a783fec743733bd40895eb5bb8a220449eb24cf1e2623cbca2e378197caba63a833d8cc54f1e49d886266307288b0adcfbdc WHIRLPOOL 25b6a6e3810f428c630ec7a6dc3cf2cfbe6bfdf276553786e1436b2630532ab442186e427bc75f249a224c5171b508a92303ce352b07be1a8a4d805c568ec10f
-DIST portage-2.2.0.tar.bz2 898674 SHA256 67f47009c0646b311767127dcc3f9bc3ea6dacc1e9008568f539883a65833fdc SHA512 f123c4ed61452248aacaafbda04568b7092bd1f97d1f56cf5b985792fb7c84d3198a9672763c08c25f3bc96bf8554aa0775eb34a1760281dc1f0e73815c125ea WHIRLPOOL f90719ffa39ca32cbe94f83fb7abf3bc25694f49e56c7b9c420b18963bc3b0741e958b4bf53c1985d732e25c328dbdff2de0e3530cc92dacdcc04025ef643f5c
 DIST portage-2.2.1.tar.bz2 901964 SHA256 fe75ead9460bae22d66c18e263e3fc71b9e9415c8d5aa737351997fd2a42dde7 SHA512 775544325d3258d958126241c3a6c332eb222da6f3aeb7b4363d1ab76839cf50c8fcce0d3108648045bbcae4470ef2314806ca5ff71abf1bae6d0b51ea3c5803 WHIRLPOOL 6a0b24d7df52e07716e5518f1c31ac52d5d14c0ad5e117c40ba8e852e7aa3c63ecbdf375b83127f1070a0e2a5083820f81799da1b7ec1d18dcd0455e3ed985fd
 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.2.ebuild 14484 SHA256 a5cebb63f164de6794e7289c6de5dfda427ea18cbaae3e1a331651384571b806 SHA512 5471e45eb74887770d5cd554d59cb22acb340d4bcd3b371cab0349d08c9423fba268cb1cc6e4ee62d47fec1c0f794ed986e805353c068f67f2b02d59d37bc547 WHIRLPOOL 601f80baecea469a066ea532a46c314968c283bbf40f186d09e44a51dc2fe933e470637e9b72db6239600a0b99f34af6780e8df8f0d53b51b839a0e85eaed950
 EBUILD portage-2.1.6.7_p1.ebuild 8308 SHA256 5c5c52664f4d3a09679d09d4ab060c52752e4f1f8b5d86c2e60c20c9a9c6655b SHA512 582549d643094f08fced94741b474d38bef9f7605aaa3b8308138b32ad331424d62019b172635639e7a2dc00b02d2f2fd3dd1507fdee36bb300a79459e7cd4ce WHIRLPOOL 62e3fd88109b1d2563fd875a1afada9cbb1fb1721b5d4f73bc361a5389f85e1c985960106123c9aaa8545cef1bc7d877c307a7610dd7749b10524aac055168ca
-EBUILD portage-2.2.0.ebuild 19343 SHA256 894ee38dd97c7d303bd43cd0bea9fb2213379ea4e51c2f51dc44c39d52354dff SHA512 e8768c98099aef556499ebe7bbedaa626ef36e192d63c1cf60943e279fadfa8e7935af4437013d03cc2ddbd3ce7462751e85930ae3a277bceaca7629d03850a8 WHIRLPOOL bc52e40d384a748a3c685ee4d3c0bc9eea183a421b10d45230675b369181b40bd3fe3ce1d5254431235596c6bdfaec7790624b2dda39a7ac42bd5205006c791e
-EBUILD portage-2.2.1.ebuild 19343 SHA256 d0e23cd5e4921432ca2c54638da02ff2fd6e903cdb2649535855b2bc49d66211 SHA512 ebe75552693a4df3cee568f11bdabe9b56cda014fdd83bce0a3ff72980b45c47b4d81ba47ea0dc0561f2d8a2dcebcbaf97c8303782fe33795e41c35a23154cc6 WHIRLPOOL b14335f0dc547f5a1f76fb1294466f5a13259bb98705061b63084473db11aa99aa11803fe90bfd302f12061881e71c3e696297c6c28422b3c6e59801dacae943
+EBUILD portage-2.2.1.ebuild 19357 SHA256 8d8dbc180982240f03fb5250ceb2d5ec19bd6e1d4dbc6595d834728871964b85 SHA512 0e48c5d6c050fc0246bf631cee9e03aa30b9087f23ac96060e77daa38fb36ba0dd6d20711082b61a4e636f4e186ca9de9e0981967256ab1c6239f271ac7060fc WHIRLPOOL 2ee90dc8760e54806220d0bb3f46862efccde2ad9234a4392bfbff94a6731ed1529afebe66308069e3662d7a92d2bea754d8beaa38a204b084f9a3d1ed2d84f8
 EBUILD portage-9999.ebuild 13747 SHA256 3d6bbc4177de0644353c9f9a2b4c1afdaa3a3bb51961cbac13624a8ac51e89ce SHA512 8490e08a319f48cf4ad901facc080a26caa06997c3827149a163cb14f4359c2bee461125b40251044a8d7b7628a412aae4afafae62db0ef5d1521f4f3e0b7840 WHIRLPOOL 38b4845c2a5d4e0b8fdf8408aad0a93b3a335b69cab9a7eb004cc6b6eacab1e7483eee8e15bfbc729b6b9b910a4cb1b0c9786f29adbdd079395ecbda33297e86
-MISC ChangeLog 47846 SHA256 3f263812b75c275d8702497fe0ef6cfefa39da6a9674729293164b8e1f96549e SHA512 003cb649e7e7cada2977bf32912bc23e45f4324d8d84d4c62c3a25f623e7f53ea3c3ed5fe00828e753b9289f995bfccf9ed500286912f5803ed38505f50f4949 WHIRLPOOL 33ea30b3645a95739ed32131fde841097f00ef19162db88c2e503b64191d015723c985282574b73f0205e74706b8ddd3a087cdd24846d11b4644ec41ab8f61f4
+MISC ChangeLog 48027 SHA256 c67b3508e8230c76ac48149391974002ddb6a213b98aceb1e40b5a4adc4c6623 SHA512 951f29626659bd2051734fd3a97d2503a426f88730e81a1b3257bccea074b7eb5a0f4f18ce3610b3416f5e92810ba6e75047f9db914257eb58f35ea14afa34f5 WHIRLPOOL a31456a3bda26099fb8294fca4da93c7ad434a69166c6bf06d23a62136ea37ebf48344d7d769b513acd91a7374ed3b3d07f344ecb695353a07ec0694937181ce
 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)
 
-iEYEAREIAAYFAlIVl34ACgkQ/ejvha5XGaMEVACg6T1N9djQy+U7B/OH2VaGM7DD
-WQoAoLbIaNLxFtPj76AQbfk6fC4xYJw7
-=3yaQ
+iEYEAREIAAYFAlIYylYACgkQ/ejvha5XGaMT4ACg2x/y3F/DKgbSVIHkWktseCbx
+ivwAn1rim7i4CFd2ayRDOe03R45L9wXK
+=1HtM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0.ebuild b/sys-apps/portage/portage-2.2.0.ebuild
deleted file mode 100644
index b6de87bcf9a8..000000000000
--- a/sys-apps/portage/portage-2.2.0.ebuild
+++ /dev/null
@@ -1,574 +0,0 @@
-# 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.ebuild,v 1.2 2013/08/13 00:59:44 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
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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
-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:-${ROOT}}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${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:-${D}}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:-${D}}"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:-${D}}" -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:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED:-${D}}"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:-${ROOT}}"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:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}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:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	if ${NEEDED_REBUILD_UPGRADE} ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		local cpv filename line newline
-		for cpv in "${EROOT:-${ROOT}}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}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-}
diff --git a/sys-apps/portage/portage-2.2.1.ebuild b/sys-apps/portage/portage-2.2.1.ebuild
index 183aac01f846..04841887aecc 100644
--- a/sys-apps/portage/portage-2.2.1.ebuild
+++ b/sys-apps/portage/portage-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2013/08/22 04:45:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.1.ebuild,v 1.2 2013/08/24 14:59:29 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -430,8 +430,8 @@ pkg_preinst() {
 		USERSYNC_UPGRADE=true
 		REPOS_CONF_UPGRADE=true
 		REPOS_CONF_SYNC=
-		type portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$(portageq envvar SYNC)
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$($(type -P portageq) envvar SYNC)
 	else
 		USERPRIV_UPGRADE=false
 		USERSYNC_UPGRADE=false