Version bump, cleanout old

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)

9 files changed, 44 insertions, 3156 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 84e8ca139e89..22923687a205 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1411 2014/09/26 17:04:07 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1412 2014/09/26 18:58:45 dolsen Exp $
+
+*portage-2.2.14_rc1 (26 Sep 2014)
+
+  26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> -portage-2.1.6.7_p1.ebuild,
+  -portage-2.2.1.ebuild, -portage-2.2.7.ebuild, -portage-2.2.10.ebuild,
+  -portage-2.2.11-r1.ebuild, -portage-2.2.12-r1.ebuild, -portage-2.2.13.ebuild,
+  +portage-2.2.14_rc1.ebuild, portage-9999.ebuild:
+  Version bump, cleanout old. Move sbin relocation code from pkg_preinst() to
+  python_install_all() for 9999,
 
   26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
   Move the admin scripts to /usr/sbin/ in pkg_preinst
diff --git a/sys-apps/portage/portage-2.1.6.7_p1.ebuild b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
deleted file mode 100644
index 642c5a8244cb..000000000000
--- a/sys-apps/portage/portage-2.1.6.7_p1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.11 2014/03/25 17:24:02 vapier Exp $
-
-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 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc less linguas_pl"
-
-python_dep=">=dev-lang/python-2.4 <dev-lang/python-3"
-
-DEPEND="${python_dep}
-	>=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 )"
-# the debugedit blocker is for bug #289967
-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.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
-	>=app-misc/pax-utils-0.1.17
-	!>=dev-util/debugedit-4.4.6-r2"
-PDEPEND="
-	!build? (
-		less? ( sys-apps/less )
-		>=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.1.6
-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) )"
-
-for PATCHVER in 2.1.6.7 ${PV} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-done
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	for PATCHVER in 2.1.6.7 ${PV} ; do
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	done
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-}
-
-src_compile() {
-
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		# Workaround for bug #272063, remove in 2.1.6.14.
-		sed 's:^XMLTO_FLAGS =:XMLTO_FLAGS = --skip-validation:' -i Makefile
-		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=""
-		# A name collision between the portage.dbapi class and the
-		# module with the same name triggers an epydoc crash unless
-		# portage.dbapi is excluded from introspection.
-		ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \
-			epydoc_opts='--exclude-introspect portage\.dbapi'
-		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}" 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() {
-	./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
-
-	dodir "${portage_share_config}"
-	insinto "${portage_share_config}"
-	doins "${S}/cnf/"make.globals
-	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
-	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
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary
-
-	dodir ${portage_base}/bin
-	exeinto ${portage_base}/bin
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-	fi
-
-	cd "${S}"/bin
-	doexe *
-	dosym newins ${portage_base}/bin/donewins
-
-	local symlinks
-	for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		[ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}"
-	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 emerge portageq repoman xpak; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local x
-	for x in archive-conf dispatch-conf emaint emerge-webrsync env-update \
-		etc-update fixpackages quickpkg regenworld ; 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
-
-	/usr/bin/python -m compileall -q -f -d "${portage_base}/pym" "${D%/}${portage_base}/pym" || die
-	/usr/bin/python -O -m compileall -q -f -d "${portage_base}/pym" "${D%/}${portage_base}/pym" || die
-}
-
-pkg_preinst() {
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
-	fi
-	has_version ">=${CATEGORY}/${PN}-2.2_pre"
-	DOWNGRADE_FROM_2_2=$?
-	has_version "<${CATEGORY}/${PN}-2.1.6_pre"
-	UPGRADE_FROM_2_1=$?
-}
-
-pkg_postinst() {
-	local warning_shown=0
-	if [ $DOWNGRADE_FROM_2_2 = 0 ] ; then
-		ewarn
-		echo "Since you have downgraded from portage-2.2, do not forget to" \
-		"use revdep-rebuild when appropriate, since the @preserved-rebuild" \
-		"package set is only supported with portage-2.2." | fmt -w 70 | \
-		while read ; do ewarn "$REPLY" ; done
-		warning_shown=1
-	fi
-	if [ $UPGRADE_FROM_2_1 = 0 ] ; then
-		ewarn
-		echo "In portage-2.1.6, the default behavior has changed for" \
-		"\`emerge world\` and \`emerge system\` commands. These commands" \
-		"will reinstall all packages from the given set unless an option" \
-		"such as --noreplace, --update, or --newuse is specified." \
-		| fmt -w 70 | while read ; do ewarn "$REPLY" ; done
-		ewarn
-		echo "File collision protection is now enabled by default via" \
-		"make.globals with FEATURES=protect-owned. If you want to" \
-		"disable collision protection completely (not recommended), then" \
-		"you need to ensure that neither protect-owned nor collision-protect" \
-		"are enabled." | fmt -w 70 | while read ; do ewarn "$REPLY" ; done
-		ewarn
-		echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND variables," \
-		"for compatibility with EAPI 2, you must ensure that these variables" \
-		"are written such that the downloaded file will be placed at" \
-		"\"\${DISTDIR}/\${FILE}\". Refer to make.conf(5) for" \
-		"information about FETCHCOMMAND and RESUMECOMMAND." | \
-		fmt -w 70 | while read ; do ewarn "$REPLY" ; done
-		warning_shown=1
-	fi
-	if [ $warning_shown = 1 ] ; then
-		ewarn # for symmetry
-	fi
-}
diff --git a/sys-apps/portage/portage-2.2.1.ebuild b/sys-apps/portage/portage-2.2.1.ebuild
deleted file mode 100644
index 699357d580b5..000000000000
--- a/sys-apps/portage/portage-2.2.1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2014 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.15 2014/01/17 06:16:22 vapier 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=(
-	pypy2_0
-	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_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_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=${PV}
-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://prefix.gentooexperimental.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 -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P 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.10.ebuild b/sys-apps/portage/portage-2.2.10.ebuild
deleted file mode 100644
index 55144510d663..000000000000
--- a/sys-apps/portage/portage-2.2.10.ebuild
+++ /dev/null
@@ -1,579 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.10.ebuild,v 1.2 2014/04/06 17:00:03 mgorny 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=(
-	pypy pypy2_0
-	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 ~arm64 ~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 pypy 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] )
-	!pypy? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy? ( !python2? ( !python3? ( virtual/pypy: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_pypy? ( virtual/pypy:0 )
-	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_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
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	xattr? ( kernel_linux? (
-		$(for python_impl in python{2_6,2_7,3_2} pypy pypy2_0; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
-	!<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/~dolsen/releases/portage"
-
-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)"
-
-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}
-			;;
-		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 pypy && use python3 ; then
-		ewarn "Both pypy and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy && use python2 ; then
-		ewarn "Both pypy and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy && ! 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 pypy; then
-		EPYTHON=pypy
-	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 pypy; then
-		set_shebang=pypy
-	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://prefix.gentooexperimental.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 -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P 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.11-r1.ebuild b/sys-apps/portage/portage-2.2.11-r1.ebuild
deleted file mode 100644
index 496ce2d708e7..000000000000
--- a/sys-apps/portage/portage-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.11-r1.ebuild,v 1.2 2014/08/05 14:19:02 dolsen 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=(
-	pypy
-	python3_2 python3_3 python3_4
-	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 ~arm64 ~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 pypy python2 python3 selinux xattr"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-	IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy? ( !python2? ( !python3? (
-		>=dev-lang/python-2.7[ssl]
-	) ) )
-	pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
-	python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-	python_targets_pypy? ( virtual/pypy:0 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	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
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(for python_impl in python{2_7,3_2} pypy; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
-	!<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/~dolsen/releases/portage"
-
-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)"
-
-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}
-			;;
-		*)
-			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 pypy && use python3 ; then
-		ewarn "Both pypy and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy && use python2 ; then
-		ewarn "Both pypy and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy && ! 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 pypy; then
-		EPYTHON=pypy
-	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 pypy; then
-		set_shebang=pypy
-	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://prefix.gentooexperimental.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 -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P 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.12-r1.ebuild b/sys-apps/portage/portage-2.2.12-r1.ebuild
deleted file mode 100644
index 537f290aef60..000000000000
--- a/sys-apps/portage/portage-2.2.12-r1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.12-r1.ebuild,v 1.1 2014/08/31 21:27:58 hasufell Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=5
-PYTHON_COMPAT=(
-	pypy
-	python3_2 python3_3 python3_4
-	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 ~arm64 ~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 pypy python2 python3 selinux xattr"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-	IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy? ( !python2? ( !python3? (
-		>=dev-lang/python-2.7[ssl]
-	) ) )
-	pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
-	python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-	python_targets_pypy? ( virtual/pypy:0 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	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
-	selinux? ( >=sys-libs/libselinux-2.0.94[python] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(for python_impl in python{2_7,3_2} pypy; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
-	!<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/~dolsen/releases/portage"
-
-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)"
-
-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}
-			;;
-		*)
-			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 pypy && use python3 ; then
-		ewarn "Both pypy and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy && use python2 ; then
-		ewarn "Both pypy and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy && ! 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 pypy; then
-		EPYTHON=pypy
-	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 pypy; then
-		set_shebang=pypy
-	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://prefix.gentooexperimental.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 -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P 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.13.ebuild b/sys-apps/portage/portage-2.2.14_rc1.ebuild
index 3b0686992b64..8830a0ab89f0 100644
--- a/sys-apps/portage/portage-2.2.13.ebuild
+++ b/sys-apps/portage/portage-2.2.14_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.13.ebuild,v 1.3 2014/09/17 06:51:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.14_rc1.ebuild,v 1.1 2014/09/26 18:58:45 dolsen Exp $
 
 EAPI=5
 
@@ -158,6 +158,8 @@ python_test() {
 }
 
 python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
 	distutils-r1_python_install \
 		--system-prefix="${EPREFIX}/usr" \
 		--bindir="$(python_get_scriptdir)" \
@@ -172,17 +174,6 @@ python_install() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	# Recompile the emaint module with lower optimization than the
-	# distutils-r1 default, since emaint breaks when __doc__ is
-	# optimized away.
-	local python d
-	for python in "${PYTHON_COMPAT[@]}" ; do
-		use python_targets_${python} || continue
-		python=${python/_/.}
-		d=${EPREFIX}/usr/$(get_libdir)/${python}/site-packages/portage/emaint
-		"${EPREFIX}/usr/bin/${python}" -O -m compileall -q -f -d "${d}" "${D%/}${d}" || die
-	done
-
 	local targets=()
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )
@@ -191,17 +182,29 @@ python_install_all() {
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
 	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}"
+	done
 }
 
 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
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#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
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
diff --git a/sys-apps/portage/portage-2.2.7.ebuild b/sys-apps/portage/portage-2.2.7.ebuild
deleted file mode 100644
index daa2a7c27c3f..000000000000
--- a/sys-apps/portage/portage-2.2.7.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.7.ebuild,v 1.12 2014/01/18 11:37:44 vapier 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=(
-	pypy2_0
-	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 arm64 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_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_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=${PV}
-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://prefix.gentooexperimental.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 -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P 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-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a2a84434a947..028c7f5268f5 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.103 2014/09/26 17:04:07 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.104 2014/09/26 18:58:45 dolsen Exp $
 
 EAPI=5
 
@@ -181,6 +181,16 @@ python_install_all() {
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
 	fi
+
+	# Due to distutils/python-exec limitations
+	# they must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}"
+	done
 }
 
 pkg_preinst() {
@@ -203,14 +213,4 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
-
-	# Due to distutils/python-exec limitations
-	# they must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}"
-	done
 }