2.1.2-r8 revbump. This fixes bugs #165334, #165349, and #165382.

Package-Manager: portage-2.1.2-r8

6 files changed, 27 insertions, 265 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 34d2b7a0fd66..86163cc4ddd4 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.342 2007/02/03 14:12:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.343 2007/02/05 23:16:07 zmedico Exp $
+
+*portage-2.1.2-r8 (05 Feb 2007)
+
+  05 Feb 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2-r8.ebuild:
+  2.1.2-r8 revbump. This fixes bugs #165334, #165349, and #165382. Bugs
+  #162453 and #147007 track fixes since 2.1.1.
 
 *portage-2.1.2-r7 (03 Feb 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 114e6e03ddf5..8e4fd1e91837 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,8 +16,7 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2-r5.patch.bz2 13738 RMD160 e118d07177007ab88e00d308c46df83c50d05036 SHA1 549a07354519aba39b399186e71ee99aaa012478 SHA256 7a132ffe4ffbe82be5b82a3262210af0a64412adb272459794111e8a50414c37
-DIST portage-2.1.2-r7.patch.bz2 16032 RMD160 d818284f2dddce8f561314de31651b2e4f2a39de SHA1 c5bfc4c8e63dd82ff48240735d9add1434183b6d SHA256 eeeb08c95a7b772cbdde4676ff1d3e3a1fa7d23b8ad27ee015eb06a2a413292c
+DIST portage-2.1.2-r8.patch.bz2 17491 RMD160 6c792b348f51abc05ab4f591403197ae14f4bd14 SHA1 eccf5bdfeec8d7fe6e22e15a09a831c57c07688f SHA256 bc03eb8375f413b27dedd131869a4f612aeb4fa42ad2abc7976bb3d2f6ea2208
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
@@ -30,18 +29,14 @@ EBUILD portage-2.1.1-r2.ebuild 7230 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862
 MD5 0c9d6a4a1e21df4128b7dfb51d4eba97 portage-2.1.1-r2.ebuild 7230
 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862602 portage-2.1.1-r2.ebuild 7230
 SHA256 1f5f3a9f58f62acc2adb3d61ef5e574bc114cbad6d6acd598b82b78071271ee6 portage-2.1.1-r2.ebuild 7230
-EBUILD portage-2.1.2-r5.ebuild 6919 RMD160 b7af50d604247cf677ec69115c41bbe075fd6162 SHA1 7154fe130aa0574bb8e0e24283d046bf0d72d4dc SHA256 a1267791fa73051fb9d1ee5ad051cac9c8a0af9bb1736adcac0794893e3b8be5
-MD5 db1e01ad3196b3f5820c4bbfcad7de59 portage-2.1.2-r5.ebuild 6919
-RMD160 b7af50d604247cf677ec69115c41bbe075fd6162 portage-2.1.2-r5.ebuild 6919
-SHA256 a1267791fa73051fb9d1ee5ad051cac9c8a0af9bb1736adcac0794893e3b8be5 portage-2.1.2-r5.ebuild 6919
-EBUILD portage-2.1.2-r7.ebuild 6919 RMD160 98ee9d5c31e1ee83ab361716330202f0d052c6e7 SHA1 f3a17a643b8e0f050286dd4eece0915daf092874 SHA256 fc7b58334f34495e8d52f625d285743dc88ceb043776768681b78f7aa668ed92
-MD5 1a983a08d7142f2d5959ff38bb33b18c portage-2.1.2-r7.ebuild 6919
-RMD160 98ee9d5c31e1ee83ab361716330202f0d052c6e7 portage-2.1.2-r7.ebuild 6919
-SHA256 fc7b58334f34495e8d52f625d285743dc88ceb043776768681b78f7aa668ed92 portage-2.1.2-r7.ebuild 6919
-MISC ChangeLog 19316 RMD160 bcf02fb028d25d417d68212b0720484125b08ca7 SHA1 61e84dbcd08abdd4f53d8b01362977687160902c SHA256 ddf7cf2e78b7fd41e3ca91ac71e32f4de24076e8b7131292701dc2ab0fc7c1f0
-MD5 e943cd5edf42dc3a7986315260fb0f36 ChangeLog 19316
-RMD160 bcf02fb028d25d417d68212b0720484125b08ca7 ChangeLog 19316
-SHA256 ddf7cf2e78b7fd41e3ca91ac71e32f4de24076e8b7131292701dc2ab0fc7c1f0 ChangeLog 19316
+EBUILD portage-2.1.2-r8.ebuild 6919 RMD160 8e8297cf4e23cf93f0ac66a6c9cffa53326f5b22 SHA1 a2cbc5292a67c3a4191571d8da46ced2247b4f72 SHA256 e90f5905f1f9f32bd80fd25d235e8b10f4dc1252fc2b11bfc384a3f653abcbd2
+MD5 13f498b5b2a9acaa38e159ee06194d2a portage-2.1.2-r8.ebuild 6919
+RMD160 8e8297cf4e23cf93f0ac66a6c9cffa53326f5b22 portage-2.1.2-r8.ebuild 6919
+SHA256 e90f5905f1f9f32bd80fd25d235e8b10f4dc1252fc2b11bfc384a3f653abcbd2 portage-2.1.2-r8.ebuild 6919
+MISC ChangeLog 19542 RMD160 f9cd40d998208c7c48fb6374f75f9e6900427d0f SHA1 c6cfd17c31604bafc3116b82c4bf272f12aab001 SHA256 cb4f514548ba93c2265bc4f4d0102a8a5cab6a96eb36460c3213acc045c82f38
+MD5 a16445cd0bde5b13a1e0c4dad997ccbd ChangeLog 19542
+RMD160 f9cd40d998208c7c48fb6374f75f9e6900427d0f ChangeLog 19542
+SHA256 cb4f514548ba93c2265bc4f4d0102a8a5cab6a96eb36460c3213acc045c82f38 ChangeLog 19542
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -52,16 +47,13 @@ SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/di
 MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021
 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021
 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021
-MD5 b4fab0025677257d932ea13742b51749 files/digest-portage-2.1.2-r5 762
-RMD160 134279ba2d0847e0e665ce6898f57ddb195d9abc files/digest-portage-2.1.2-r5 762
-SHA256 b1ab67ac8a5ca9d7e6ebad72300875f4ebfa1fca4adc71eda392b470be311138 files/digest-portage-2.1.2-r5 762
-MD5 9f8aaafb2db7263085783e7ddc0a6c6c files/digest-portage-2.1.2-r7 762
-RMD160 2a381c1b74f2f6bf3efca914f30bc79e7e522ae5 files/digest-portage-2.1.2-r7 762
-SHA256 66563e957ed7db9746e1a956698af8e18f110ee782510a4abd5ad6b1417762d6 files/digest-portage-2.1.2-r7 762
+MD5 fc654129ebcda66b31d7e18ab4f0b309 files/digest-portage-2.1.2-r8 762
+RMD160 44d1a751bfb8e5a073cf561f6093cac10821f78d files/digest-portage-2.1.2-r8 762
+SHA256 561f492bbfd576b12369123580b06296ddd3c4d9be7b0d2a70e2238e591a22ab files/digest-portage-2.1.2-r8 762
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxJhL/ejvha5XGaMRAir5AJ9s1i5poSneZ40zJgyHa9Fy6YQiWgCghKaB
-X8LpjUqIv500kVkGA8VlGPE=
-=BNdc
+iD8DBQFFx7q9/ejvha5XGaMRAjrmAJ9kir8CNjIdYafiw/DwXHg7HRR2RACg0GSW
+Jcj/5s7J3CVhSEQObhM4F48=
+=GiO6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r7 b/sys-apps/portage/files/digest-portage-2.1.2-r7
deleted file mode 100644
index 0b349481e17a..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2-r7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7303f4ee34452742eb5ebfc534f0dba0 portage-2.1.2-r7.patch.bz2 16032
-RMD160 d818284f2dddce8f561314de31651b2e4f2a39de portage-2.1.2-r7.patch.bz2 16032
-SHA256 eeeb08c95a7b772cbdde4676ff1d3e3a1fa7d23b8ad27ee015eb06a2a413292c portage-2.1.2-r7.patch.bz2 16032
-MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
-RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
-SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
-MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
-RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
-SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r5 b/sys-apps/portage/files/digest-portage-2.1.2-r8
index dcb40da2177b..70d277b30c3f 100644
--- a/sys-apps/portage/files/digest-portage-2.1.2-r5
+++ b/sys-apps/portage/files/digest-portage-2.1.2-r8
@@ -1,6 +1,6 @@
-MD5 1a30a1fc2770ec13c48c46125e9350fc portage-2.1.2-r5.patch.bz2 13738
-RMD160 e118d07177007ab88e00d308c46df83c50d05036 portage-2.1.2-r5.patch.bz2 13738
-SHA256 7a132ffe4ffbe82be5b82a3262210af0a64412adb272459794111e8a50414c37 portage-2.1.2-r5.patch.bz2 13738
+MD5 91b07a6894ecd948144700c839fd5b1c portage-2.1.2-r8.patch.bz2 17491
+RMD160 6c792b348f51abc05ab4f591403197ae14f4bd14 portage-2.1.2-r8.patch.bz2 17491
+SHA256 bc03eb8375f413b27dedd131869a4f612aeb4fa42ad2abc7976bb3d2f6ea2208 portage-2.1.2-r8.patch.bz2 17491
 MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
diff --git a/sys-apps/portage/portage-2.1.2-r7.ebuild b/sys-apps/portage/portage-2.1.2-r7.ebuild
deleted file mode 100644
index 2a675440a19d..000000000000
--- a/sys-apps/portage/portage-2.1.2-r7.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2007 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-r7.ebuild,v 1.1 2007/02/03 14:12: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 ~sparc-fbsd ~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 epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )
-	epydoc? ( >=dev-python/epydoc-2.0 )"
-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-1.2.17 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2"
-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
-}
-
-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
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g')" || die "error listing modules"
-		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-			-qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed"
-	fi
-}
-
-src_test() {
-	./tests/runTests || \
-		die "test(s) failed"
-}
-
-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
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	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 bin 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."
-	echo
-	elog "See NEWS and RELEASE-NOTES for further changes."
-	echo
-	portage_docs
-}
diff --git a/sys-apps/portage/portage-2.1.2-r5.ebuild b/sys-apps/portage/portage-2.1.2-r8.ebuild
index ae17322e13d7..711d5533eae4 100644
--- a/sys-apps/portage/portage-2.1.2-r5.ebuild
+++ b/sys-apps/portage/portage-2.1.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r5.ebuild,v 1.3 2007/01/31 17:50:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r8.ebuild,v 1.1 2007/02/05 23:16:07 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic