2.1.2_pre3-r2 revbump for bugs #150879 and #151331.

(Portage version: 2.1.2_pre3-r2)
 (Signed Manifest commit)

4 files changed, 15 insertions, 257 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0a8eb652a215..40ca722a0b36 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,17 +17,13 @@ AUX blockers_151331.patch 1396 RMD160 439fcd2246f003ad9147c3727f6dee4e7e20f17b S
 MD5 7f53cf2629324140aee17628d500c896 files/blockers_151331.patch 1396
 RMD160 439fcd2246f003ad9147c3727f6dee4e7e20f17b files/blockers_151331.patch 1396
 SHA256 ef50d03fa338f939e931e03edfc2e23f515e4241fbd6acf2963375b991bcc160 files/blockers_151331.patch 1396
-AUX repoman_settings.patch 675 RMD160 b063e487176541dd96e325e404ef1bde41fa34c1 SHA1 ea1e06000fa86aae7214b86f0bf0c4046a97951c SHA256 72653e6f1ee23dc93940a6270248355a49f36e6946939523d9946c76e68f6173
-MD5 cd4f7a267aaf9c4e6d408f2722fa275c files/repoman_settings.patch 675
-RMD160 b063e487176541dd96e325e404ef1bde41fa34c1 files/repoman_settings.patch 675
-SHA256 72653e6f1ee23dc93940a6270248355a49f36e6946939523d9946c76e68f6173 files/repoman_settings.patch 675
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2_pre2-r8.patch.bz2 18452 RMD160 3e7848156f0abe21c0bd384a53441f40b310375f SHA1 c91bc2dd521c7705ee3f3bfe9393afd74c5c6281 SHA256 7dbbeb3710e42e5ec301542fc2e05a9803566a737d4a84966f6850c7b16b3e22
 DIST portage-2.1.2_pre2-r9.patch.bz2 21911 RMD160 9f91798a79769753ab611f78e1130a570669d04c SHA1 952b44eae625e670b827a335f82e23da9a63453d SHA256 d5cf4d3ca1dce1d672bb057a47607d67b88b73b20ad222a842dce6df6748610d
 DIST portage-2.1.2_pre2.tar.bz2 302712 RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 SHA1 11297373bc85c6b870ac04f711278d8ec0fffaeb SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3
+DIST portage-2.1.2_pre3-r2.patch.bz2 3223 RMD160 df91331fd15103c5ed20dffbf64f27d4052ae7a2 SHA1 c64ea2c97fbac60fa1f98dd5f04cbec4e8178476 SHA256 c333c9c6f618d0fe994af97e91e948155a675f79e1cf0df3e405f4c2402567da
 DIST portage-2.1.2_pre3.tar.bz2 307042 RMD160 7ac4a2453eb9c50b0c1e224f627913aa95dbce0b SHA1 619f2ef48464e04ee009ecb1f580e97a360168fe SHA256 6beea20e872d7256f881e47a2c25fe40fd7edac02a9967b7dd4a2bb54ba6ad44
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 RMD160 f6b798efcc39b81541f5a324dc68f832886731db SHA1 04958eeae1ffd7d32b518e421fb9cefd47844c3f SHA256 e621cb572cf8626c0dd9021830b67f1a3cfabbdffe89f3a7f85f4447e0aaa6e5
@@ -50,10 +46,6 @@ EBUILD portage-2.1.1.ebuild 6223 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d
 MD5 4ea59171eb61742c3894f253c040b584 portage-2.1.1.ebuild 6223
 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d portage-2.1.1.ebuild 6223
 SHA256 e5cf6598da0ae949cd6e6ac07e8bf9881bbf352791503fbe50d04ce59358a830 portage-2.1.1.ebuild 6223
-EBUILD portage-2.1.2_pre2-r8.ebuild 6198 RMD160 c7f44c7390c60fe91ab27536b33366f6fffd9471 SHA1 ccfaca678bf53617ddad9ed6c0d0320e06d39f1b SHA256 d08fad9813a493214f18144ebf3c88e2fc33a1e3fd10609110749765116b69ab
-MD5 400606d54470bc1c2f48d1040eda7ce1 portage-2.1.2_pre2-r8.ebuild 6198
-RMD160 c7f44c7390c60fe91ab27536b33366f6fffd9471 portage-2.1.2_pre2-r8.ebuild 6198
-SHA256 d08fad9813a493214f18144ebf3c88e2fc33a1e3fd10609110749765116b69ab portage-2.1.2_pre2-r8.ebuild 6198
 EBUILD portage-2.1.2_pre2-r9.ebuild 6153 RMD160 485112da1370f904f543baf7920c9b1ba6a72948 SHA1 a1ee2a1ecbaaa11727be36d591710545bb25b8f0 SHA256 6a18956278533c722172687b91e72ef20c01ead3ff7af694403f16fdc40f89c0
 MD5 d25867aecdbdc21106d77bc4609995aa portage-2.1.2_pre2-r9.ebuild 6153
 RMD160 485112da1370f904f543baf7920c9b1ba6a72948 portage-2.1.2_pre2-r9.ebuild 6153
@@ -62,10 +54,14 @@ EBUILD portage-2.1.2_pre3-r1.ebuild 6195 RMD160 4834423ec8316815de676f4364c244e2
 MD5 5ecbc31dc8fc0bfa473ded6b553083cb portage-2.1.2_pre3-r1.ebuild 6195
 RMD160 4834423ec8316815de676f4364c244e2a9321011 portage-2.1.2_pre3-r1.ebuild 6195
 SHA256 3127a0f1230ab99174cfd6e3cf61bcf631d06a918b70e54b6d0c470c239340e1 portage-2.1.2_pre3-r1.ebuild 6195
-MISC ChangeLog 16681 RMD160 d3734b5af31201af6004e0205b6e738da5e779d0 SHA1 eee02ed8c8c300b30695250ab11d787abe391424 SHA256 1c41337cbd5dc5a5976efdc11421c30667ddaf6b968ee2941cbdc47ddab5fba4
-MD5 a0a3e0f0bb398ee5f38c7389ecd0dd41 ChangeLog 16681
-RMD160 d3734b5af31201af6004e0205b6e738da5e779d0 ChangeLog 16681
-SHA256 1c41337cbd5dc5a5976efdc11421c30667ddaf6b968ee2941cbdc47ddab5fba4 ChangeLog 16681
+EBUILD portage-2.1.2_pre3-r2.ebuild 6150 RMD160 7aecf79342b26f1c4512990b50fd300048f537fe SHA1 eceabfaad9b90e50d6ba11edd4f2bc72ee39222f SHA256 960b535ae3d0e9b02538cc7219f2c9a5fc4d53b0ebd4e21d0185db6cb17f4b44
+MD5 caba3dd3e1f1cafbda82bc3923a3e990 portage-2.1.2_pre3-r2.ebuild 6150
+RMD160 7aecf79342b26f1c4512990b50fd300048f537fe portage-2.1.2_pre3-r2.ebuild 6150
+SHA256 960b535ae3d0e9b02538cc7219f2c9a5fc4d53b0ebd4e21d0185db6cb17f4b44 portage-2.1.2_pre3-r2.ebuild 6150
+MISC ChangeLog 16852 RMD160 ebc25460a0979ff6b2ef2050d5651d71076d56b0 SHA1 ca940c27a79cfa1bd1885b0e71c14ee29db545ee SHA256 70e1ea19040d87fd81d734a72a0d27d79a3a81a3d32a2ac7c964b58e797fe33f
+MD5 72c523dc4e275e6f96c12f0ff18d0690 ChangeLog 16852
+RMD160 ebc25460a0979ff6b2ef2050d5651d71076d56b0 ChangeLog 16852
+SHA256 70e1ea19040d87fd81d734a72a0d27d79a3a81a3d32a2ac7c964b58e797fe33f ChangeLog 16852
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -82,19 +78,19 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di
 MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021
 RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021
 SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021
-MD5 dd7a13c9fdfc5df162000420fa4cf12e files/digest-portage-2.1.2_pre2-r8 1099
-RMD160 ff44c5da83eedb477ed139d40910778604e27564 files/digest-portage-2.1.2_pre2-r8 1099
-SHA256 00b4462e504e664a74c3a83fae36a07472a45fb52e839b94b9b505841208616f files/digest-portage-2.1.2_pre2-r8 1099
 MD5 1e3b37de9d967fb789ea5d121cc22126 files/digest-portage-2.1.2_pre2-r9 1099
 RMD160 c88ca5a071c793b8721f12347a70bae6917614cb files/digest-portage-2.1.2_pre2-r9 1099
 SHA256 3facb727187827fe424fdb63460bc383ac2cdf86e21fad9348b68ad6fd0c0d17 files/digest-portage-2.1.2_pre2-r9 1099
 MD5 8ae5b5dbfd90fb20116bbb81743ce44e files/digest-portage-2.1.2_pre3-r1 536
 RMD160 9233df534c08592f803baeca80efc7014f3d7b71 files/digest-portage-2.1.2_pre3-r1 536
 SHA256 cfa852e871d940289e273518552f3cf9357ebccff74d04820d69b53baddae709 files/digest-portage-2.1.2_pre3-r1 536
+MD5 cfe0d3dbf587e70f3c9f169558cfa09b files/digest-portage-2.1.2_pre3-r2 804
+RMD160 65eae4fe297df33cff60154a9eeafdd65937f32e files/digest-portage-2.1.2_pre3-r2 804
+SHA256 b723d764f12ff534480e44b08a37234b301ce673c45d06b959a19f43272a3abc files/digest-portage-2.1.2_pre3-r2 804
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMPGs/ejvha5XGaMRAtsdAKClXRERfRLQ/2h7CSsW9TFVAm3ZXQCg00g2
-k7gn+DHJEj3FphB9sZas4KI=
-=O/ev
+iD8DBQFFMYtm/ejvha5XGaMRAhRlAJkBQL3he3WImfKD0pkLF244FuVGUwCfY8oS
+24E9ak+EsVHHresqTgUEimM=
+=d/Co
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8
deleted file mode 100644
index 3fcdf6eaa9ab..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 ea6c1b9700d46ef71df2b830ff1b1a18 portage-2.1.2_pre2-r8.patch.bz2 18452
-RMD160 3e7848156f0abe21c0bd384a53441f40b310375f portage-2.1.2_pre2-r8.patch.bz2 18452
-SHA256 7dbbeb3710e42e5ec301542fc2e05a9803566a737d4a84966f6850c7b16b3e22 portage-2.1.2_pre2-r8.patch.bz2 18452
-MD5 5b419eec00e4534c412ac7e9ac92760b portage-2.1.2_pre2.tar.bz2 302712
-RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 portage-2.1.2_pre2.tar.bz2 302712
-SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 portage-2.1.2_pre2.tar.bz2 302712
-MD5 674cd0d78d06836736a711066e0fca9f portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420
-RMD160 f6b798efcc39b81541f5a324dc68f832886731db portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420
-SHA256 e621cb572cf8626c0dd9021830b67f1a3cfabbdffe89f3a7f85f4447e0aaa6e5 portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420
-MD5 322f3be926245292fc0c90bc1bf2d8cd portage-man-pl-2.1.2_pre2.tar.bz2 52838
-RMD160 c3d9d59fd68606cb9c1b3f058a1ba2ebb6774101 portage-man-pl-2.1.2_pre2.tar.bz2 52838
-SHA256 cda86d66967304338c73eb391a782aeee0b239c03d3484df04ca8db2a31bfc8c portage-man-pl-2.1.2_pre2.tar.bz2 52838
diff --git a/sys-apps/portage/files/repoman_settings.patch b/sys-apps/portage/files/repoman_settings.patch
deleted file mode 100644
index 922bfc334fb4..000000000000
--- a/sys-apps/portage/files/repoman_settings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: bin/repoman
-===================================================================
---- bin/repoman	(revision 4649)
-+++ bin/repoman	(revision 4651)
-@@ -395,7 +395,6 @@
- isCvs=False
- myreporoot=None
- if os.path.isdir("CVS"):
--	repoman_settings["PORTDIR_OVERLAY"]=""
- 	if "cvs" not in repoman_settings.features:
- 		print
- 		print
-@@ -477,7 +476,6 @@
- # Now that PORTDIR_OVERLAY is properly overridden, create the portdb.
- repoman_settings = portage.config(local_config=False,
- 	config_incrementals=portage_const.INCREMENTALS)
--repoman_settings.lock()
- trees = portage.create_trees()
- trees["/"]["porttree"].settings = repoman_settings
- portdb = trees["/"]["porttree"].dbapi
diff --git a/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild
deleted file mode 100644
index 4a9b1c75e4ef..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre2-r8.ebuild
+++ /dev/null
@@ -1,206 +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.2_pre2-r8.ebuild,v 1.1 2006/10/10 21:27:44 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-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"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux linguas_pl ${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_Darwin? ( >=app-shells/bash-3.0 ) )
-	elibc_glibc? ( sys-apps/sandbox )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2_pre2"
-PATCHVER_PL="-r7"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER=""
-[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-	SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-	elog ""
-	elog "For help with using portage please consult the Gentoo Handbook"
-	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	elog ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-	fi
-	epatch "${FILESDIR}/repoman_settings.patch"
-	if [ "${PR}" != "r0" ]; then
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	fi
-	if [ -n "${PATCHVER_PL}" ]; then
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	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 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 || die "Failed to remove sed wrapper"
-	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
-	done
-
-	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
-	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"
-	local x
-	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 "In portage-2.1.2, installation actions do not necessarily pull in build time"
-	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-	ewarn "For more information regarding this change, please refer to bug #148870."
-
-	portage_docs
-}