2.1.1_pre2-r7 revbump. This fixes bugs #95741, #120653, and #135834.

Package-Manager: portage-2.1.1_pre2-r7

4 files changed, 15 insertions, 303 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4250ccbbb111..7ca1476389b2 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 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
-SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664 files/bugs_138246_138259.patch 3224
 AUX depend_phase_category.patch 451 RMD160 b62754a7eeaf5552e3a21364dcddd051239457bf SHA1 dd116f3e15ed1a7475c9dfd84ed4039ac368475a SHA256 5ab3d24adbda12a31f494325732f6c3d7f6c4a6805b73c9bef14dcda31d44314
 MD5 3f79fc72a0099fdcfeb6d47dcc37c0b2 files/depend_phase_category.patch 451
 RMD160 b62754a7eeaf5552e3a21364dcddd051239457bf files/depend_phase_category.patch 451
@@ -24,9 +20,8 @@ SHA256 5ab3d24adbda12a31f494325732f6c3d7f6c4a6805b73c9bef14dcda31d44314 files/de
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
-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-r5.patch.bz2 14811 RMD160 6d5fb74511e27b22e3aaea7240b7abf661d2c9ba SHA1 b70b367e6ce2da6ccaab8f2fbf0b1d9281e58222 SHA256 bae0b087ae3661ed4650e985a7b7122c40ff601baba3014f9413a85560803c6d
+DIST portage-2.1.1_pre2-r7.patch.bz2 20013 RMD160 098bdee8781a159502901b8e59b7b727e28c18ac SHA1 11a1eb1531981077221cce5645748418eee265c7 SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7
 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
@@ -44,18 +39,18 @@ EBUILD portage-2.1-r1.ebuild 7519 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a
 MD5 4573216aa36cf4904976d82b14825c02 portage-2.1-r1.ebuild 7519
 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 portage-2.1-r1.ebuild 7519
 SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1 portage-2.1-r1.ebuild 7519
-EBUILD portage-2.1.1_pre1-r5.ebuild 5686 RMD160 824053e6cd304ce142934660bbb647e91054ca62 SHA1 799a4cd4b358e4576f69429064bdd4b894354f40 SHA256 5a3e35178728f935e23eccaab373e007d6da5f6b2c33e3980409d945e6a0c929
-MD5 de6e10e1ef1add7046303b16caf5f442 portage-2.1.1_pre1-r5.ebuild 5686
-RMD160 824053e6cd304ce142934660bbb647e91054ca62 portage-2.1.1_pre1-r5.ebuild 5686
-SHA256 5a3e35178728f935e23eccaab373e007d6da5f6b2c33e3980409d945e6a0c929 portage-2.1.1_pre1-r5.ebuild 5686
 EBUILD portage-2.1.1_pre2-r6.ebuild 5828 RMD160 676007ad6f1de4f001ce2b036f25c3f9d761e430 SHA1 f83809ba96bda644506b4a898c3d6536dafe4fd6 SHA256 430d9c178aa01bf1c74ec03d76613357e3e8ff295f373a187707e44e4bb361c2
 MD5 7b40a97555396626a85639ec0eaeb8ca portage-2.1.1_pre2-r6.ebuild 5828
 RMD160 676007ad6f1de4f001ce2b036f25c3f9d761e430 portage-2.1.1_pre2-r6.ebuild 5828
 SHA256 430d9c178aa01bf1c74ec03d76613357e3e8ff295f373a187707e44e4bb361c2 portage-2.1.1_pre2-r6.ebuild 5828
-MISC ChangeLog 16930 RMD160 ba0b37c1a65ebf8f54e0dfaa23dc0c3cb0f3e738 SHA1 a8e6a3744bd3b50183a04a849a4a649c4bca1837 SHA256 e7321a66cba356dcaf2c7a5a5fc3bf07eea16f4e9938ffc525ac1ab22a256e68
-MD5 b7cef47841c11f91d15ebcafda442421 ChangeLog 16930
-RMD160 ba0b37c1a65ebf8f54e0dfaa23dc0c3cb0f3e738 ChangeLog 16930
-SHA256 e7321a66cba356dcaf2c7a5a5fc3bf07eea16f4e9938ffc525ac1ab22a256e68 ChangeLog 16930
+EBUILD portage-2.1.1_pre2-r7.ebuild 5781 RMD160 60a7a9c331ccf7968e98adbd39525a5e1974102c SHA1 dadc509162b2e3c998b0802c16123e177a6937e5 SHA256 4f9a1428e0e650f4f318273121d2e16cd067d95c9ec4e0ff37545efce25bc7f6
+MD5 68b3bde25db5611a6050a3b395d21aaa portage-2.1.1_pre2-r7.ebuild 5781
+RMD160 60a7a9c331ccf7968e98adbd39525a5e1974102c portage-2.1.1_pre2-r7.ebuild 5781
+SHA256 4f9a1428e0e650f4f318273121d2e16cd067d95c9ec4e0ff37545efce25bc7f6 portage-2.1.1_pre2-r7.ebuild 5781
+MISC ChangeLog 17119 RMD160 2971188849975652c44c590830568407f7693d99 SHA1 e49fa9f11a3cf33018a60099475ecb38444c8abf SHA256 b4e773bd4a0e7074fa8257a2507ba948b7bdc18fac12cc3da6708fe22acd1d6e
+MD5 f03b4c07e18b16e7fa9159c3099ac571 ChangeLog 17119
+RMD160 2971188849975652c44c590830568407f7693d99 ChangeLog 17119
+SHA256 b4e773bd4a0e7074fa8257a2507ba948b7bdc18fac12cc3da6708fe22acd1d6e ChangeLog 17119
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -69,16 +64,16 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di
 MD5 5a9aac645d5a2bdb9d987f45813d495a files/digest-portage-2.1-r1 1012
 RMD160 ae625221b6669b5f4f1aef277b2a8ea3ae70e1ae files/digest-portage-2.1-r1 1012
 SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/digest-portage-2.1-r1 1012
-MD5 65e33a514b2084c868cb3ee45f7fda32 files/digest-portage-2.1.1_pre1-r5 1054
-RMD160 2c1a5753d848cd1c61d917ec06f346ce838a19bf files/digest-portage-2.1.1_pre1-r5 1054
-SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/digest-portage-2.1.1_pre1-r5 1054
 MD5 c3763350fa7c71736a77cd2724a25779 files/digest-portage-2.1.1_pre2-r6 1054
 RMD160 785885112976473160774f7ba721ece110e8f61b files/digest-portage-2.1.1_pre2-r6 1054
 SHA256 d869f5bca5f06fce7c1e1ea6f8da1167ddef0c008ca7191d3ac3111aeaaee5a6 files/digest-portage-2.1.1_pre2-r6 1054
+MD5 6919994cfeb13e5695d5357e3d90cd9b files/digest-portage-2.1.1_pre2-r7 1054
+RMD160 fd9a8c6a1a9eb0dde812e5845f6496face9812b4 files/digest-portage-2.1.1_pre2-r7 1054
+SHA256 58f2f65b45aa2b1f51db361d0c9c174245917520852ee5dc9108b02d4e51f896 files/digest-portage-2.1.1_pre2-r7 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFErwHz/ejvha5XGaMRAosKAJ9MPrBBePiIZI2OknDGjmvygcv18ACglnM7
-1bSIKnCHzx/Q4C1vkEmhwXo=
-=gix4
+iD8DBQFEs/oM/ejvha5XGaMRAk6zAJwLT51ztVks10Bi3CEWWFMZQ04nWQCg3/E3
+wE6oROwQT+7osswbGC1O+Kw=
+=jvF3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bugs_138246_138259.patch b/sys-apps/portage/files/bugs_138246_138259.patch
deleted file mode 100644
index 342223e833a6..000000000000
--- a/sys-apps/portage/files/bugs_138246_138259.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Index: bin/emerge
-===================================================================
---- bin/emerge	(revision 3674)
-+++ bin/emerge	(revision 3678)
-@@ -251,7 +251,7 @@
- 		ticks=range(secs)
- 		ticks.reverse()
- 		for sec in ticks:
--			sys.stdout.write(red(str(sec+1)+" "))
-+			sys.stdout.write(colorize("WARN", str(sec+1)+" "))
- 			sys.stdout.flush()
- 			time.sleep(1)
- 		print
-@@ -2079,20 +2079,21 @@
- 		selected_versions = ",".join(map(get_version, overlapping))
- 		protected_version = get_version(pkg_key)
- 		if ommitted_versions:
--			ommitted_versions = ",".join(map(get_version, ommitted_versions))
-+			ommitted_versions = ", ".join(map(get_version, ommitted_versions))
- 		else:
- 			ommitted_versions = "none"
- 		portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)
--		portage.writemsg_stdout("selected: ".rjust(14) + selected_versions + \
--			"\n", noiselevel=-1)
--		portage.writemsg_stdout("protected: ".rjust(14) + protected_version + \
--			"\n", noiselevel=-1)
--		portage.writemsg_stdout("omitted: ".rjust(14) + ommitted_versions + \
--			"\n", noiselevel=-1)
--		portage.writemsg_stdout("\n>>>" + red("'Selected'") + \
-+		portage.writemsg_stdout("selected: ".rjust(14) + \
-+			colorize("WARN", selected_versions) + "\n", noiselevel=-1)
-+		portage.writemsg_stdout("protected: ".rjust(14) + \
-+			colorize("GOOD", protected_version) + "\n", noiselevel=-1)
-+		portage.writemsg_stdout("omitted: ".rjust(14) + \
-+			colorize("GOOD", ommitted_versions) + "\n", noiselevel=-1)
-+		portage.writemsg_stdout("\n>>>" + colorize("WARN", "'Selected'") + \
- 			" packages are slated for removal.\n", noiselevel=0)
--		portage.writemsg_stdout(">>>" + green("'Protected'") + " and " + \
--			green("'omitted'") + " packages will not be removed.\n\n",
-+		portage.writemsg_stdout(">>>" + colorize("GOOD", "'Protected'") + \
-+			" and " + colorize("GOOD", "'omitted'") + \
-+			" packages will not be removed.\n\n",
- 			noiselevel=0)
- 		countdown(int(mysettings["CLEAN_DELAY"]), ">>> Unmerging")
- 		for other_pkg in overlapping:
-@@ -2307,16 +2308,18 @@
- 					else:
- 						myversion=mysplit[2]+"-"+mysplit[3]
- 					if mytype=="selected":
--						print red(myversion),
-+						portage.writemsg_stdout(colorize("WARN", myversion))
- 					else:
--						print green(myversion),
-+						portage.writemsg_stdout(colorize("GOOD", myversion))
- 			else:
- 					print "none",
- 			print
- 
--	if (not "--quiet" in myopts):
--		print "\n>>>",red("'Selected'"),"packages are slated for removal."
--		print ">>>",green("'Protected'"),"and",green("'omitted'"),"packages will not be removed.\n"
-+	portage.writemsg_stdout("\n>>> " + colorize("WARN", "'Selected'") + \
-+		" packages are slated for removal.\n")
-+	portage.writemsg_stdout(">>> " + colorize("GOOD", "'Protected'") + \
-+			" and " + colorize("GOOD", "'omitted'") + \
-+			" packages will not be removed.\n\n")
- 
- 	if "--pretend" in myopts:
- 		#we're done... return
-Index: bin/isolated-functions.sh
-===================================================================
---- bin/isolated-functions.sh	(revision 3674)
-+++ bin/isolated-functions.sh	(revision 3678)
-@@ -208,6 +208,7 @@
- 	NORMAL=$'\e[0m'
- }
- 
-+export -n GOOD WARN BAD HILITE BRACKET
- RC_ENDCOL="yes"
- RC_INDENTATION=''
- RC_DEFAULT_INDENT=2
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r5 b/sys-apps/portage/files/digest-portage-2.1.1_pre1-r5
deleted file mode 100644
index 088460d4cd7c..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre1-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 090cd06a740f34b7c3af16ffa8f6fd81 portage-2.1.1_pre1-r5.patch.bz2 39728
-RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 portage-2.1.1_pre1-r5.patch.bz2 39728
-SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea portage-2.1.1_pre1-r5.patch.bz2 39728
-MD5 3dc4fb1d5bc1aac640b579e82db58dfd portage-2.1.1_pre1.tar.bz2 277982
-RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e portage-2.1.1_pre1.tar.bz2 277982
-SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e portage-2.1.1_pre1.tar.bz2 277982
-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_pre1-r5.ebuild b/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild
deleted file mode 100644
index 4748b4cd2811..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild
+++ /dev/null
@@ -1,190 +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.1_pre1-r5.ebuild,v 1.2 2006/07/06 23:15:23 genone 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"
-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 )"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	PATCHVER_PL="-r1"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2
-	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}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		epatch "${FILESDIR}/bugs_138246_138259.patch"
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	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
-}