2.1.2_pre2-r6 revbump. This fixes bugs #149608, #150359, #150377, and #150381.

Package-Manager: portage-2.1.2_pre2-r6

3 files changed, 20 insertions, 232 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 151efb18d7b2..4ebc42f2c423 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,15 +13,20 @@ 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
 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-r3.patch.bz2 6246 RMD160 8f5bf3da796bb0575179f906e2f4a21bf38167a8 SHA1 ebdc22458ca014cf61158720a157a188ed1bd4c4 SHA256 164bb464ba528acee71ff20190c18b7f250501a2b7619840ee7a6f900dfda8aa
 DIST portage-2.1.2_pre2-r4.patch.bz2 8550 RMD160 9e32f27abe3dc59aa4a563dc58d58290dddf3a68 SHA1 39796251833ffb1f024a98c2741c78d6f758dbaf SHA256 85e0074ac5f5c015fb0b5f8c40140b76fdceaa903e6961d7ff0df6dd23d6cde7
 DIST portage-2.1.2_pre2-r5.patch.bz2 10242 RMD160 e8fa1cd22b51bddb533d3c4ea7f7cfa759643917 SHA1 e59dcf2b9ec46677e36856792ed4098556a77bcc SHA256 578fdc0fdc063b008932c48f6e8bbdd7162767eb2fb68e632971ff32d980c436
+DIST portage-2.1.2_pre2-r6.patch.bz2 11618 RMD160 de8fa5c9d3dc263cdb488d49935d05e3fd633a24 SHA1 469c033ef6001fe704959aceb427cbc485c119b1 SHA256 8ac31dbfddadf4e383595090dd8268bb4b3b9a79523daf97050bf893738522a4
 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.tar.bz2 52838 RMD160 c3d9d59fd68606cb9c1b3f058a1ba2ebb6774101 SHA1 8d9132b1ff6f7b6c991de3e32acf1e0189e14cda SHA256 cda86d66967304338c73eb391a782aeee0b239c03d3484df04ca8db2a31bfc8c
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
 EBUILD portage-2.0.51.22-r3.ebuild 5746 RMD160 acc2d23c94adbe7823d4193ff3af316be5e173c7 SHA1 a2378c598b797d463bcbac3cada663589fc45d9c SHA256 973bf27adcb1ff03fc1d06aa5851c2a1d82df571297064f41e2d0802a8cd3410
 MD5 19f5c196e9fdb3f1a4916a4c9914583c portage-2.0.51.22-r3.ebuild 5746
@@ -39,10 +44,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-r3.ebuild 6146 RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 SHA1 d519498d0474c12dbc453257f8d25d11d1307998 SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462
-MD5 c9ac86876d09d9de69ad4a757c2bfb0f portage-2.1.2_pre2-r3.ebuild 6146
-RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 portage-2.1.2_pre2-r3.ebuild 6146
-SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462 portage-2.1.2_pre2-r3.ebuild 6146
 EBUILD portage-2.1.2_pre2-r4.ebuild 6146 RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 SHA1 a1d1242d2cda6ae46ae2d283d07caa55058a34e2 SHA256 0943fe678a3f97fba6d0ee7b0a34ad53ec88f5995c48802356cdc788801eebba
 MD5 5e624d1602e409609649b80e8e6998c2 portage-2.1.2_pre2-r4.ebuild 6146
 RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 portage-2.1.2_pre2-r4.ebuild 6146
@@ -51,10 +52,14 @@ EBUILD portage-2.1.2_pre2-r5.ebuild 6146 RMD160 475c00d3b1fc12debcb84f36ea6d1e20
 MD5 1cf9bdf12563a10e3cdba4d6b1b30e9f portage-2.1.2_pre2-r5.ebuild 6146
 RMD160 475c00d3b1fc12debcb84f36ea6d1e2030c34833 portage-2.1.2_pre2-r5.ebuild 6146
 SHA256 4110d3dfd80ee5b74f9607b3ef4b2acddc51ef969eab6f659b558d4a15264db0 portage-2.1.2_pre2-r5.ebuild 6146
-MISC ChangeLog 15394 RMD160 f7b4270a7c26a53405c488a337a8b540c8a40fc8 SHA1 aa72fb26b4db5e7f886ede2c9e6467a5c0230d96 SHA256 25b33371984d751419f2be017e092770068d01369db2832e481084797c813206
-MD5 99a2c602ac48add834d3cd438918eb24 ChangeLog 15394
-RMD160 f7b4270a7c26a53405c488a337a8b540c8a40fc8 ChangeLog 15394
-SHA256 25b33371984d751419f2be017e092770068d01369db2832e481084797c813206 ChangeLog 15394
+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
+MISC ChangeLog 15625 RMD160 57f8596a33424b3b5c47bfd812e8f57f6e277669 SHA1 a24773be28b44b06ac37e79eec3faf47a89a473a SHA256 135a66c3bfcc75f3eee5df48c9881211f76f1c40d515845926350b8b0a3827a8
+MD5 8a62403b467d85ad70b72dc88cfa5fbf ChangeLog 15625
+RMD160 57f8596a33424b3b5c47bfd812e8f57f6e277669 ChangeLog 15625
+SHA256 135a66c3bfcc75f3eee5df48c9881211f76f1c40d515845926350b8b0a3827a8 ChangeLog 15625
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -71,19 +76,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 58b661807163b02e69fd863587591696 files/digest-portage-2.1.2_pre2-r3 1051
-RMD160 7407f80a1bc14f44c2c1eab7172b96a65aa53ffe files/digest-portage-2.1.2_pre2-r3 1051
-SHA256 4359b9111ce866510feac0bebf14352b235857965168081f2bc00136713eccb3 files/digest-portage-2.1.2_pre2-r3 1051
 MD5 76ba2ce853dd121f7e47e436c701654b files/digest-portage-2.1.2_pre2-r4 1051
 RMD160 6ba26ccbd3aa56b18181cc4ced7de1cf08f49c24 files/digest-portage-2.1.2_pre2-r4 1051
 SHA256 2f362727a6a2cb9c3c8986c3583c934579af973284e05873a64fab0231a798a6 files/digest-portage-2.1.2_pre2-r4 1051
 MD5 d284fed621cc6ce115fb97af1a675d60 files/digest-portage-2.1.2_pre2-r5 1054
 RMD160 96192f7b025912b597f04bd6923c20929482abab files/digest-portage-2.1.2_pre2-r5 1054
 SHA256 d207cf18c10cc8d4dd7a30a7f1a0b5c329e8354b278a1ccc375e65e01b6b8570 files/digest-portage-2.1.2_pre2-r5 1054
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJj8j/ejvha5XGaMRAmP9AJ0fUfDlXqO1lXHKfRWkQ1CHeWA0mACg0zIe
-QTX4v3T5pMsnVITosAhygU8=
-=8LgJ
+iD8DBQFFKFBQ/ejvha5XGaMRAhz2AKDHoJx2ypGAjb+v9epKn5TdTQTHuACgvKkW
+D2rl4hEl/w667au3sFrUOMU=
+=hz69
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r3 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r3
deleted file mode 100644
index 62cdd89cc026..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 f8033cdde0e9757c6581d12fcd8a86d2 portage-2.1.2_pre2-r3.patch.bz2 6246
-RMD160 8f5bf3da796bb0575179f906e2f4a21bf38167a8 portage-2.1.2_pre2-r3.patch.bz2 6246
-SHA256 164bb464ba528acee71ff20190c18b7f250501a2b7619840ee7a6f900dfda8aa portage-2.1.2_pre2-r3.patch.bz2 6246
-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 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
-RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
-SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
-MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
-RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
-SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/portage-2.1.2_pre2-r3.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r3.ebuild
deleted file mode 100644
index 678bf918c0e4..000000000000
--- a/sys-apps/portage/portage-2.1.2_pre2-r3.ebuild
+++ /dev/null
@@ -1,205 +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-r3.ebuild,v 1.1 2006/10/04 10:46:18 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"
-PATCHVER_PL="-r1"
-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
-}
-
-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
-}