2.1_rc2-r2 revbump

(Portage version: 2.1_rc2-r2)
 (Signed Manifest commit)

7 files changed, 12 insertions, 483 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cf8c68e93ed0..a46629af1b36 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,15 +10,9 @@ RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 1057
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
-AUX bug_134135.patch 365 RMD160 b0e523a59a64f035be6fc715adba52786506654c SHA1 b23bad40670ef0ca295a4e6593c4f4fdfd4de6a1
-MD5 20dd254c5266ee6fa362ba42ee53e4c0 files/bug_134135.patch 365
-RMD160 b0e523a59a64f035be6fc715adba52786506654c files/bug_134135.patch 365
-AUX use_expand_hidden_kernel.patch 393 RMD160 6672fffd3eb34fda7483f11009ca222836c2fdde SHA1 989efd68ef3b25906e3814b317840313347672b4
-MD5 3c997574a4ccb32d023fc06dba9d595c files/use_expand_hidden_kernel.patch 393
-RMD160 6672fffd3eb34fda7483f11009ca222836c2fdde files/use_expand_hidden_kernel.patch 393
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83
-DIST portage-2.1_rc2-r1.patch.bz2 1081 RMD160 9583a9c8bb38df3a422d6c16a382f47e5c0cb34d SHA1 2850c1d46148c21746ab055f679775fc1d92e011
+DIST portage-2.1_rc2-r2.patch.bz2 1503 RMD160 d2ff69703c9a4ee980fdaf877693d6fa929b42d6 SHA1 4442ffbc33a706365d466409fb37efb589acab83
 DIST portage-2.1_rc2.tar.bz2 271929 RMD160 a4b414057dd4ebaf5e6ff301933ec1fc9183fecd SHA1 283570b40e57d277601faac149f72c5d41ea60b1
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8
@@ -34,15 +28,12 @@ RMD160 f6acf6bbd72e8114dbc4c2e6861f3052b1cfa0ff portage-2.0.54-r2.ebuild 4187
 EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
-EBUILD portage-2.1_rc2-r1.ebuild 6769 RMD160 06822b6b3628032def983fa61e5c585d26bd9976 SHA1 62467ca068938c7bd67527c695595a3fd5c6aa13
-MD5 7e48d8fb7f6f89b2b8108c597600073e portage-2.1_rc2-r1.ebuild 6769
-RMD160 06822b6b3628032def983fa61e5c585d26bd9976 portage-2.1_rc2-r1.ebuild 6769
-EBUILD portage-2.1_rc2.ebuild 6638 RMD160 2764f41b5d23c3cac72900d205ed980887553b7d SHA1 8a4a9223506da1f9d920fd2b8c90404010d741f9
-MD5 e0414fd3e33220c581ab3f1283b05144 portage-2.1_rc2.ebuild 6638
-RMD160 2764f41b5d23c3cac72900d205ed980887553b7d portage-2.1_rc2.ebuild 6638
-MISC ChangeLog 22257 RMD160 6a4829245b4ad799c04d159c1f302e1366174394 SHA1 05681686b1c3f785601e78125ee45dc61ac9d7c5
-MD5 28c6614e968fb5b78fad8cdab9f3a7c1 ChangeLog 22257
-RMD160 6a4829245b4ad799c04d159c1f302e1366174394 ChangeLog 22257
+EBUILD portage-2.1_rc2-r2.ebuild 6675 RMD160 bdc1c88cf6b0e87a02bb7b46c1aee058d098f021 SHA1 85301bbd2928cf3d92021a234beefeeb664daec2
+MD5 01b947fe6f5d5238265ded8126aeba50 portage-2.1_rc2-r2.ebuild 6675
+RMD160 bdc1c88cf6b0e87a02bb7b46c1aee058d098f021 portage-2.1_rc2-r2.ebuild 6675
+MISC ChangeLog 8505 RMD160 54dabbcb70b65898982a2a505eb999be53788280 SHA1 2a4962e15ad27edff254880694a80b706717f07e
+MD5 0fd8676d6b03cf6c0f54786f4ea44078 ChangeLog 8505
+RMD160 54dabbcb70b65898982a2a505eb999be53788280 ChangeLog 8505
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -54,14 +45,12 @@ MD5 5b857931bd168ec3192114e2ab6c5a72 files/digest-portage-2.0.54-r1 306
 RMD160 990b4d62ad267177500fbaf3b8170c9de54b304f files/digest-portage-2.0.54-r1 306
 MD5 6cbef6dfb5cc519ab1dbcf288b05681d files/digest-portage-2.0.54-r2 306
 RMD160 8610a1ba4262db214f6d990bf6587f78ed5f4a5d files/digest-portage-2.0.54-r2 306
-MD5 d28fbffaabe1373542ff1b228bcfbe76 files/digest-portage-2.1_rc2 147
-RMD160 70637c0d96c138c9e4b54ee0d5288f0524101baa files/digest-portage-2.1_rc2 147
-MD5 8556328554b24c1aa7e229af0cfb2854 files/digest-portage-2.1_rc2-r1 300
-RMD160 058e2bab464c622088c64c8414ea4ffcec85c774 files/digest-portage-2.1_rc2-r1 300
+MD5 eec7d8b43611c8779aace795dab63e7c files/digest-portage-2.1_rc2-r2 300
+RMD160 c213769c2f582fb134724e6f9c3365b68f71ccd3 files/digest-portage-2.1_rc2-r2 300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEc1vy/ejvha5XGaMRAvOHAJ9ojVkALxgA91Zyh2hIezooGPz8fQCgwU1N
-jOkCnls3sYZU/5Dc6W5Q8hs=
-=q7iU
+iD8DBQFEc8zg/ejvha5XGaMRAtKXAJ9b+Y6xXWxzWwpuJDVruANqjLtedQCeKChs
+kpoLieqIONQ1eYstVNfmYOk=
+=7JFg
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_134135.patch b/sys-apps/portage/files/bug_134135.patch
deleted file mode 100644
index 1a180be78c53..000000000000
--- a/sys-apps/portage/files/bug_134135.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bin/prepstrip
-===================================================================
---- bin/prepstrip	(revision 3402)
-+++ bin/prepstrip	(revision 3403)
-@@ -6,7 +6,7 @@
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
- 
- if hasq nostrip ${FEATURES} ${RESTRICT} || \
--   hasq strip RESTRICT
-+   hasq strip ${RESTRICT}
- then
- 	exit 0
- fi
diff --git a/sys-apps/portage/files/digest-portage-2.1_rc2 b/sys-apps/portage/files/digest-portage-2.1_rc2
deleted file mode 100644
index 5a803a4515ab..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_rc2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 01d6dbb143179bc67dad3ec3c1e5d6d2 portage-2.1_rc2.tar.bz2 271929
-RMD160 a4b414057dd4ebaf5e6ff301933ec1fc9183fecd portage-2.1_rc2.tar.bz2 271929
diff --git a/sys-apps/portage/files/digest-portage-2.1_rc2-r1 b/sys-apps/portage/files/digest-portage-2.1_rc2-r1
deleted file mode 100644
index 12115741477e..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_rc2-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e0d8d27c639ea74108597321cc650d7f portage-2.1_rc2-r1.patch.bz2 1081
-RMD160 9583a9c8bb38df3a422d6c16a382f47e5c0cb34d portage-2.1_rc2-r1.patch.bz2 1081
-MD5 01d6dbb143179bc67dad3ec3c1e5d6d2 portage-2.1_rc2.tar.bz2 271929
-RMD160 a4b414057dd4ebaf5e6ff301933ec1fc9183fecd portage-2.1_rc2.tar.bz2 271929
diff --git a/sys-apps/portage/files/use_expand_hidden_kernel.patch b/sys-apps/portage/files/use_expand_hidden_kernel.patch
deleted file mode 100644
index 2a1405d12012..000000000000
--- a/sys-apps/portage/files/use_expand_hidden_kernel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cnf/make.globals
-===================================================================
---- cnf/make.globals	(revision 3403)
-+++ cnf/make.globals	(revision 3404)
-@@ -60,7 +60,7 @@
- CONFIG_PROTECT="/etc"
- 
- # Hide USE flags that can't be changed easily.
--USE_EXPAND_HIDDEN="ELIBC USERLAND"
-+USE_EXPAND_HIDDEN="ELIBC KERNEL USERLAND"
- 
- # Disable auto-use
- USE_ORDER="env:pkg:conf:defaults"
diff --git a/sys-apps/portage/portage-2.1_rc2-r1.ebuild b/sys-apps/portage/portage-2.1_rc2-r1.ebuild
deleted file mode 100644
index 06897e5337b9..000000000000
--- a/sys-apps/portage/portage-2.1_rc2-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_rc2-r1.ebuild,v 1.1 2006/05/23 19:01:12 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# bug #134086 is fixed already, but hide these until people have upgraded.
-#IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-#IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		userland_GNU? ( sys-apps/debianutils )
-		>=app-shells/bash-2.05a )
-	elibc_glibc? ( sys-apps/sandbox )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
-	selinux? ( >=dev-python/python-selinux-2.15 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-
-portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
-}
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		epatch "${FILESDIR}/bug_134135.patch"
-		epatch "${FILESDIR}/use_expand_hidden_kernel.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-	fi
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		chmod +x setup.py
-		./setup.py build || die "Failed to build missingos module"
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		chmod +x setup.py
-		./setup.py build || die "Failed to install bsd-chflags module"
-	fi
-}
-
-src_install() {
-	local portage_base="/usr/lib/portage"
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf 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
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		./setup.py install --root "${D}" || \
-			die "Failed to install missingos module"
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		./setup.py install --root "${D}" || \
-			die "Failed to install bsd-chflags module"
-	fi
-
-	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
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins ${portage_base}/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py *.pyo
-	done
-
-	doman "${S}"/man/*.[0-9]
-	dodoc "${S}"/ChangeLog
-	dodoc "${S}"/NEWS
-	dodoc "${S}"/RELEASE-NOTES
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../lib/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		quickpkg
-		regenworld"
-	for x in ${my_syms}; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/lib/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-		done
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-	   [ -f "${ROOT}"/var/cache/edb/world ] &&
-	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-		ln -s ../../lib/portage/world /var/cache/edb/world
-	fi
-
-	for x in "${ROOT}"/etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-	done
-
-	ewarn "Portage 2.1 contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules from portage-2.0.x (such as"
-	ewarn "the CDB cache module), portage will not work until they have"
-	ewarn "been disabled via /etc/portage/modules."
-	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
-	echo
-	einfo "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
-	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
-	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
-
-	portage_docs
-}
diff --git a/sys-apps/portage/portage-2.1_rc2.ebuild b/sys-apps/portage/portage-2.1_rc2.ebuild
deleted file mode 100644
index 33111c24c223..000000000000
--- a/sys-apps/portage/portage-2.1_rc2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_rc2.ebuild,v 1.2 2006/05/23 08:21:07 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# Hide these until bug #134086 is fixed.
-#IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-#IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		userland_GNU? ( sys-apps/debianutils )
-		>=app-shells/bash-2.05a )
-	elibc_glibc? ( sys-apps/sandbox )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
-	selinux? ( >=dev-python/python-selinux-2.15 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-
-portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
-}
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-	fi
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		chmod +x setup.py
-		./setup.py build || die "Failed to build missingos module"
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		chmod +x setup.py
-		./setup.py build || die "Failed to install bsd-chflags module"
-	fi
-}
-
-src_install() {
-	local portage_base="/usr/lib/portage"
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf 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
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		./setup.py install --root "${D}" || \
-			die "Failed to install missingos module"
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		./setup.py install --root "${D}" || \
-			die "Failed to install bsd-chflags module"
-	fi
-
-	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
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins ${portage_base}/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py *.pyo
-	done
-
-	doman "${S}"/man/*.[0-9]
-	dodoc "${S}"/ChangeLog
-	dodoc "${S}"/NEWS
-	dodoc "${S}"/RELEASE-NOTES
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../lib/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		quickpkg
-		regenworld"
-	for x in ${my_syms}; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/lib/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-		done
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-	   [ -f "${ROOT}"/var/cache/edb/world ] &&
-	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-		ln -s ../../lib/portage/world /var/cache/edb/world
-	fi
-
-	for x in "${ROOT}"/etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-	done
-
-	ewarn "Portage 2.1 contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules from portage-2.0.x (such as"
-	ewarn "the CDB cache module), portage will not work until they have"
-	ewarn "been disabled via /etc/portage/modules."
-	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
-	echo
-	einfo "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
-	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
-	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
-
-	portage_docs
-}