2.1.1_pre2-r3 revbump. This fixes bugs #108449, #121106, #131319, #137446, and #139240. Hopefully bug #132601 is also fixed.

Package-Manager: portage-2.1.1_pre2-r3

5 files changed, 274 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c26e27651039..331aa357ebc5 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.198 2006/07/03 03:39:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.199 2006/07/05 18:19:53 zmedico Exp $
+
+*portage-2.1.1_pre2-r3 (05 Jul 2006)
+
+  05 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r3.ebuild,
+  files/bug_132601.patch:
+  2.1.1_pre2-r3 revbump. This fixes bugs #108449, #121106, #131319, #137446,
+  and #139240.  Hopefully bug #132601 is also fixed.
 
 *portage-2.1.1_pre2-r2 (03 Jul 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 84061a896818..7e574367564c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,10 @@ 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 bug_132601.patch 1435 RMD160 e109fd5b8fc66c86842913a2128d7c27e00adf58 SHA1 1e60f5f4af9828ec15857251d1e02d3e994d9ae5 SHA256 0c54775ef7a97e005cd0725bdf278e00e59e1590489d2c746aad79ea88413b19
+MD5 63b99b5d3eb8d8ccde9e6949ec95890a files/bug_132601.patch 1435
+RMD160 e109fd5b8fc66c86842913a2128d7c27e00adf58 files/bug_132601.patch 1435
+SHA256 0c54775ef7a97e005cd0725bdf278e00e59e1590489d2c746aad79ea88413b19 files/bug_132601.patch 1435
 AUX bugs_138246_138259.patch 3224 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 SHA1 84d746b9c21369febe7c897b6f83fd00c176601a SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664
 MD5 216e8e331f34339920c5eb492e6871b7 files/bugs_138246_138259.patch 3224
 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 files/bugs_138246_138259.patch 3224
@@ -23,6 +27,7 @@ DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2d
 DIST portage-2.1.1_pre1-r5.patch.bz2 39728 RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 SHA1 01ffcc7123c7b89109699d043a86ddafb2cbb80b SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea
 DIST portage-2.1.1_pre1.tar.bz2 277982 RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e SHA1 bd7787676d3db97932867983ab01781cf5f56b78 SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e
 DIST portage-2.1.1_pre2-r2.patch.bz2 2627 RMD160 ab221fbc97aae65a81a474ce7dc06f3dfe507389 SHA1 539d31f39541e79111e24db706b11ed9a90f4d00 SHA256 b4ca589e8f1a497942ca4bc7cb8d7660ce0ef6d2705f8bd7192f77d831be3dc2
+DIST portage-2.1.1_pre2-r3.patch.bz2 12775 RMD160 77c0e096e83a8902ce3ba03912bf71939a640c91 SHA1 89f38ff6025f4651a175cd9b19f2b190520f9149 SHA256 9633c83147121fd2c15df49d581dcfbb0354d3427e7b3cfa3791b6b5d3ad3d1c
 DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -49,14 +54,18 @@ EBUILD portage-2.1.1_pre2-r2.ebuild 5786 RMD160 74d16a113a871eb7a6abbd03149edfeb
 MD5 fd23c3d9a1c76a61294f33c340ebc6c6 portage-2.1.1_pre2-r2.ebuild 5786
 RMD160 74d16a113a871eb7a6abbd03149edfeb61608285 portage-2.1.1_pre2-r2.ebuild 5786
 SHA256 bae713cf1c65dcef314131d18a4e132c48c8966cf9a49bef9880341258500811 portage-2.1.1_pre2-r2.ebuild 5786
+EBUILD portage-2.1.1_pre2-r3.ebuild 5825 RMD160 5e6e18be84d9e06d75c0c3ce2539d66d6a99e158 SHA1 cddedc1cf032dde154e904677b9c07c11d4d9182 SHA256 31d2dc07ebd743a7a3fba20faadc8a281b907e38018b46cc08c249ec55239225
+MD5 3cce514b90085f66652b9621d7caaedd portage-2.1.1_pre2-r3.ebuild 5825
+RMD160 5e6e18be84d9e06d75c0c3ce2539d66d6a99e158 portage-2.1.1_pre2-r3.ebuild 5825
+SHA256 31d2dc07ebd743a7a3fba20faadc8a281b907e38018b46cc08c249ec55239225 portage-2.1.1_pre2-r3.ebuild 5825
 EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 SHA1 820a21fbe6b7b1d60987a9bda32df12cd85b76e7 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13
 MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248
 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248
 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248
-MISC ChangeLog 15685 RMD160 d6fa51a47d577f68984c93600200be89a10b984f SHA1 a9b7a9a88b2bd8bb6d691a5bad3cb21b0d9593d9 SHA256 6ecccbf2fa8bd170dc43db68ce0ec0d0a2c099ac94d9da8c18f364f9996cf223
-MD5 9686b9dda7d3fdd7c8d70b0adf0f8771 ChangeLog 15685
-RMD160 d6fa51a47d577f68984c93600200be89a10b984f ChangeLog 15685
-SHA256 6ecccbf2fa8bd170dc43db68ce0ec0d0a2c099ac94d9da8c18f364f9996cf223 ChangeLog 15685
+MISC ChangeLog 15958 RMD160 b126b878b68a5879ae82f975d6dc4cc69a83df77 SHA1 4c014f7ca7c1be1eace02abac14da55d8a84894a SHA256 90eb613aadae04a922361f3f8a522ddd996167fd374e1e1c7daa1d2588098045
+MD5 3b6b09890cbb24eb50ef9936c32efb81 ChangeLog 15958
+RMD160 b126b878b68a5879ae82f975d6dc4cc69a83df77 ChangeLog 15958
+SHA256 90eb613aadae04a922361f3f8a522ddd996167fd374e1e1c7daa1d2588098045 ChangeLog 15958
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -79,10 +88,13 @@ SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/di
 MD5 e18d610ee65346765e91e141bc432f7c files/digest-portage-2.1.1_pre2-r2 1051
 RMD160 1da3423919fc1215e9df921c72efa9393f207bb4 files/digest-portage-2.1.1_pre2-r2 1051
 SHA256 d6fbc94eed9697210285206f62058cc5487c782efe2336fce3f87bc64a1ff989 files/digest-portage-2.1.1_pre2-r2 1051
+MD5 f69e359bed7935297aeb76a50ae37575 files/digest-portage-2.1.1_pre2-r3 1054
+RMD160 be92e277ac26f6eac09e69896b5a09a49ce39b2f files/digest-portage-2.1.1_pre2-r3 1054
+SHA256 175b5640aa6cea37b0f5fb79b31c277fa33459017426a27d73e9a0ae12c50491 files/digest-portage-2.1.1_pre2-r3 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqJF//ejvha5XGaMRAl6vAJ9FklEeP7tNL7WWfyyISwOXd7tPtgCcCWt0
-RNsLyTc9rw7uDWoXpUXVSrA=
-=rL8+
+iD8DBQFErALG/ejvha5XGaMRAkLTAKCPFhfmh+wS2N8+gtYBMXLOXIhBggCg4YzZ
+0Y6nKMKQPSzpII61PkZeCWw=
+=patJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_132601.patch b/sys-apps/portage/files/bug_132601.patch
new file mode 100644
index 000000000000..099d34592571
--- /dev/null
+++ b/sys-apps/portage/files/bug_132601.patch
@@ -0,0 +1,36 @@
+Index: bin/repoman
+===================================================================
+--- bin/repoman	(revision 3789)
++++ bin/repoman	(revision 3790)
+@@ -481,7 +481,7 @@
+ 	print "PORTDIR = \""+os.environ["PORTDIR"]+"\""
+ 	print "PORTDIR_OVERLAY = \""+os.environ["PORTDIR_OVERLAY"]+"\""
+ 
+-
++portage.close_portdbapi_caches()
+ reload(portage)
+ repoman_settings = portage.config(clone=portage.settings)
+ 
+@@ -1138,14 +1138,16 @@
+ 
+ 				profdir = portdir+"/profiles/"+prof[0]
+ 	
+-				if arch_caches.has_key(prof[0]):
+-					dep_settings, portage.portdb, portage.db["/"]["porttree"] = arch_caches[prof[0]]
++				if prof[0] in arch_caches:
++					dep_settings = arch_caches[prof[0]]
+ 				else:
+-					dep_settings=portage.config(config_profile_path=profdir, config_incrementals=portage_const.INCREMENTALS)
+-					portage.portdb=portage.portdbapi(portdir, dep_settings)
+-					portage.db["/"]["porttree"]=portage.portagetree("/",dep_settings.getvirtuals("/"))
+-					arch_caches[prof[0]]=[dep_settings, portage.portdb, portage.db["/"]["porttree"]]
++					dep_settings = portage.config(
++						config_profile_path=profdir,
++						config_incrementals=portage_const.INCREMENTALS)
++					arch_caches[prof[0]] = dep_settings
+ 
++				portage.db["/"]["porttree"].settings = dep_settings
++				portage.db["/"]["porttree"].dbapi.mysettings = dep_settings
+ 				dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups)
+ 
+ 				for myprovide in myaux["PROVIDE"].split():
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r3 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r3
new file mode 100644
index 000000000000..562d241654a3
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r3
@@ -0,0 +1,12 @@
+MD5 a83edce7d0a6a9aed8392a18492d8269 portage-2.1.1_pre2-r3.patch.bz2 12775
+RMD160 77c0e096e83a8902ce3ba03912bf71939a640c91 portage-2.1.1_pre2-r3.patch.bz2 12775
+SHA256 9633c83147121fd2c15df49d581dcfbb0354d3427e7b3cfa3791b6b5d3ad3d1c portage-2.1.1_pre2-r3.patch.bz2 12775
+MD5 2f933f22a47e42e284639097e6abaa4a portage-2.1.1_pre2.tar.bz2 283920
+RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a portage-2.1.1_pre2.tar.bz2 283920
+SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4 portage-2.1.1_pre2.tar.bz2 283920
+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.1_pre2-r3.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r3.ebuild
new file mode 100644
index 000000000000..f11e5e03684f
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_pre2-r3.ebuild
@@ -0,0 +1,199 @@
+# 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.1_pre2-r3.ebuild,v 1.1 2006/07/05 18:19:53 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"
+# 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_GNU? ( sys-apps/debianutils )
+		!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}"
+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() {
+	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}
+	cd "${S}"
+	if [ -n "${PATCHVER}" ]; then
+		cd "${S}"
+		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
+	fi
+	epatch "${FILESDIR}/bug_132601.patch"
+	if [ "${PR}" != "r0" ]; then
+		einfo "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() {
+	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
+
+	portage_docs
+}