2.1.2_pre2-r9 revbump. This fixes bugs #150121, #150454, #150866, #150876, #150883, and #150932.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 15 insertions, 246 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bc625d1c3933..ddaa1494c443 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,10 +13,6 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
-AUX dep_transform.patch 393 RMD160 b44d58a9fa75852f9bbce2dfd23210edd04c8107 SHA1 bea095da413210df413652cecb0ff4007724c717 SHA256 286fab6b2087f3aa96159d255741f618111f4ebdc8ad792630ff3e86bd624740
-MD5 0fba1146ee69b597384777dbcffe7a2f files/dep_transform.patch 393
-RMD160 b44d58a9fa75852f9bbce2dfd23210edd04c8107 files/dep_transform.patch 393
-SHA256 286fab6b2087f3aa96159d255741f618111f4ebdc8ad792630ff3e86bd624740 files/dep_transform.patch 393
 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
@@ -25,9 +21,9 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 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-r6.patch.bz2 11618 RMD160 de8fa5c9d3dc263cdb488d49935d05e3fd633a24 SHA1 469c033ef6001fe704959aceb427cbc485c119b1 SHA256 8ac31dbfddadf4e383595090dd8268bb4b3b9a79523daf97050bf893738522a4
 DIST portage-2.1.2_pre2-r7.patch.bz2 13902 RMD160 51ba3a5702704490c593d69ca80484d6301d792d SHA1 6baf75ced9aae10ee7d21ec1ad05ad3e030699e2 SHA256 6d968fa1dc759d71db882fdcf4bba411b7b96359375670984c5ba73d0f0a3d7a
 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-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
@@ -49,10 +45,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-r6.ebuild 6192 RMD160 b308e282d26abedad551d85602e0f054a4b66a57 SHA1 70593908ccff73410825b9a911abf4f2d4a5c76f SHA256 4c51eee925da5d9a3399aa8d92dc609f7d033324bc9426e50edafe714fead935
-MD5 9a6866cc8f178228b22e5056cc69d87f portage-2.1.2_pre2-r6.ebuild 6192
-RMD160 b308e282d26abedad551d85602e0f054a4b66a57 portage-2.1.2_pre2-r6.ebuild 6192
-SHA256 4c51eee925da5d9a3399aa8d92dc609f7d033324bc9426e50edafe714fead935 portage-2.1.2_pre2-r6.ebuild 6192
 EBUILD portage-2.1.2_pre2-r7.ebuild 6153 RMD160 eb3822e40e9ef05d46ff51ac233bb3a129c841d0 SHA1 8b1a76b56bd9491f2569e951ef13f38ca2ff3fc9 SHA256 0b4ce82d9299d9e918db0dd4f0bbc1bb71edf2a8808f0b6ae9554dfe0f71d8aa
 MD5 a3d2d094eabfb782868e8da7befa8743 portage-2.1.2_pre2-r7.ebuild 6153
 RMD160 eb3822e40e9ef05d46ff51ac233bb3a129c841d0 portage-2.1.2_pre2-r7.ebuild 6153
@@ -61,10 +53,14 @@ EBUILD portage-2.1.2_pre2-r8.ebuild 6198 RMD160 c7f44c7390c60fe91ab27536b33366f6
 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
-MISC ChangeLog 16042 RMD160 bc98011318d75d20549eb29f88b7177549604ecb SHA1 d329a5d6f93fb55a51a81635c56288c293a8357d SHA256 078897e036240e7946e9a3c9516d678057070d368f5a974004f2c04ca42d3414
-MD5 944fdf58f79309d0dc4c61609f2f7c4c ChangeLog 16042
-RMD160 bc98011318d75d20549eb29f88b7177549604ecb ChangeLog 16042
-SHA256 078897e036240e7946e9a3c9516d678057070d368f5a974004f2c04ca42d3414 ChangeLog 16042
+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
+SHA256 6a18956278533c722172687b91e72ef20c01ead3ff7af694403f16fdc40f89c0 portage-2.1.2_pre2-r9.ebuild 6153
+MISC ChangeLog 16260 RMD160 3c2ccd1a0900b535dae15658ab3c7c7f7a734fb7 SHA1 c65081fdada7ef6904502950069e7adec8e5f71f SHA256 526f74308c68039d6db455f1e2436a0bca02d87fb00611af74705202a143333d
+MD5 c46a3ef01cc4c60ee86d91859712a4e8 ChangeLog 16260
+RMD160 3c2ccd1a0900b535dae15658ab3c7c7f7a734fb7 ChangeLog 16260
+SHA256 526f74308c68039d6db455f1e2436a0bca02d87fb00611af74705202a143333d ChangeLog 16260
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -81,19 +77,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 9dbea86f2781fe18c066c2aeb54f693f files/digest-portage-2.1.2_pre2-r6 807
-RMD160 d8be0d3640f0192adb89823def1a7c3e9da96383 files/digest-portage-2.1.2_pre2-r6 807
-SHA256 12ca4f57829aa2a2032ff04b1a264f492d44bd1a93eb7a94aed26dc63d0c5d89 files/digest-portage-2.1.2_pre2-r6 807
 MD5 7ee5a014c90671c2cf293f8c693609d0 files/digest-portage-2.1.2_pre2-r7 1099
 RMD160 a905ada84de1cb9096a650a46aafaef5c972cb78 files/digest-portage-2.1.2_pre2-r7 1099
 SHA256 b1a2fedd0b5c6ef5930eca6276bac6e896803aeeb1415a89142f9e8f29d3c3d1 files/digest-portage-2.1.2_pre2-r7 1099
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLA/J/ejvha5XGaMRAts0AJ93ljVVqVMbob3Axifs8Wkg1BF20gCg66uO
-ZyH5BCHKK7aWVhboCY3pv6Q=
-=kGSF
+iD8DBQFFLbUa/ejvha5XGaMRAjHmAKDaz9rFV/yjt650VXWPDRCx63kR5gCfXqAL
+yVbBny29+ZBpAPSoNHn0QoA=
+=9dLn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/dep_transform.patch b/sys-apps/portage/files/dep_transform.patch
deleted file mode 100644
index c4760111671a..000000000000
--- a/sys-apps/portage/files/dep_transform.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: pym/portage_update.py
-===================================================================
---- pym/portage_update.py	(revision 4616)
-+++ pym/portage_update.py	(revision 4617)
-@@ -214,4 +214,6 @@
- 			continue
- 
- def dep_transform(mydep, oldkey, newkey):
--	return mydep.replace(oldkey, newkey, 1)
-+	if dep_getkey(mydep) == oldkey:
-+		return mydep.replace(oldkey, newkey, 1)
-+	return mydep
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r6 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r6
deleted file mode 100644
index 4752bcda721c..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 07ba5c5c4277aaa5e23b031dce2932d7 portage-2.1.2_pre2-r6.patch.bz2 11618
-RMD160 de8fa5c9d3dc263cdb488d49935d05e3fd633a24 portage-2.1.2_pre2-r6.patch.bz2 11618
-SHA256 8ac31dbfddadf4e383595090dd8268bb4b3b9a79523daf97050bf893738522a4 portage-2.1.2_pre2-r6.patch.bz2 11618
-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 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/portage-2.1.2_pre2-r6.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r6.ebuild
deleted file mode 100644
index 6e02754c14c3..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre2-r6.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-r6.ebuild,v 1.1 2006/10/08 01:21:20 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=""
-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
-	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
-	epatch "${FILESDIR}"/dep_transform.patch
-}
-
-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
-}