removing 2.1_pre5 because 2.1_pre6 is better

(Portage version: 2974-svn)

11 files changed, 3 insertions, 378 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ebe07ada7232..22779eebe435 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,30 +10,6 @@ SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579
 SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579
-MD5 b521971700cd2a96cf1b2d5ccbcb3483 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
-RMD160 0e1c4807fc7c1cb88d221586e7d5e5b0bd9498a9 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
-SHA256 aa859a7008d893861b449745a0b37a719dfe6ad7974fafa01608435379d0b864 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
-MD5 708990e216332c66ab18535802abd98c files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
-RMD160 9e954dda6c7e1a87b29e6c5695151ea96da5a328 files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
-SHA256 441c2f40044c4dfc90c6971c9d68ab2ec062ebbe37b935cd6d167a9b4fab51e7 files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
-MD5 76114c0ae60af1b0ad2fa3b16625dcaa files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
-RMD160 d11994c0e501e2591127d7728506039fd48e75ad files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
-SHA256 a7245038f9dc0fd0fa48d16f3984389da2a321c773b4e32fcf71fa64f7d242dc files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
-MD5 2cb5a3738011c3e76db406d104b26469 files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
-RMD160 7ee7c82c9cba9345892063fb74edaed68e4d6c0c files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
-SHA256 d934f43e3c598494b648624584dd8ae540836fab258ea01c4aea1281ce967887 files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
-MD5 ca228fd976bf237da71e048ffcaef0c7 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
-RMD160 3aa471e8ac8ad9397b598ab01c05fe1a20246812 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
-SHA256 15152e70ab862849749f64a54eea8bc3ab45ceb46aba9742f255c0101872dd17 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
-MD5 8279193615d35ccb8d8496f2fcbb58bb files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
-RMD160 776c2812dc6536e54d133904a760faa038a65acc files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
-SHA256 cd12a5e31772411563894bf174cef7e49965dbb2c3dc58321441995e26ea4820 files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
-MD5 d3f491aba0c765a9f06f473d92262789 files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
-RMD160 a4c7695a5298c819b24f75fe9821d585ff5e5347 files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
-SHA256 3ad39a43bef0fa94b5fd3ffd2173c8b076ffbd3179e9c15c9844fdaddeaa6aed files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
-MD5 b0f0aee3708359245752289af4a8923b files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
-RMD160 3e96116e5c06994417fc3dfa2fd344676f8f7a53 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
-SHA256 5619c164def7cd20db802ca878714669fe258ac285a219e24068f378f8e70d98 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
 MD5 43e6f0038bd9660c6df8c3b6019b33d8 files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
 RMD160 9f83e5d105348dcab20d37212e83422be4b4b86d files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
 SHA256 7277668d65bb47fa5d82f7b9e098378872ff6c8b67b3caa2298324d242952d17 files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
@@ -100,9 +76,6 @@ SHA256 d12b5844039163fd2cb532560d0e82ef7c4b860ea3ef02e0616b34264be13299 files/di
 MD5 2e597ebca5c4c3f101022a5a35d091c7 files/digest-portage-2.1_pre3-r1 253
 RMD160 c0cf87ab1669aea8b35951f9ded0a477377f0265 files/digest-portage-2.1_pre3-r1 253
 SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/digest-portage-2.1_pre3-r1 253
-MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253
-RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253
-SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253
 MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r6 253
 RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r6 253
 SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r6 253
@@ -124,16 +97,13 @@ SHA256 12bd64c40cfb73bbf504a314688437b2b94f18b37a3d8944f28e315291ce191c portage-
 MD5 908c5af92ff8ea543ed011aefd0832ea portage-2.1_pre3-r1.ebuild 4715
 RMD160 e73644193a07d9957562ea6442b4e7759d8c35a8 portage-2.1_pre3-r1.ebuild 4715
 SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-2.1_pre3-r1.ebuild 4715
-MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072
-RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072
-SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072
 MD5 5296b2ec9f9abee2364631d8346bfb6e portage-2.1_pre6-r6.ebuild 5774
 RMD160 0d59861f5af0e3d87a9b14b443cebe179a630457 portage-2.1_pre6-r6.ebuild 5774
 SHA256 35fa1b8057eb5d6a52a0db89e287e8a7549b2615cd6552887a1b695f68dd173d portage-2.1_pre6-r6.ebuild 5774
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEInK8/ejvha5XGaMRAg0LAKDVtVpYGEcBHyexX7eTSzyl5aIG2QCfSctm
-Dea1QosQ8jUHxXIBJyaiFBo=
-=V/Po
+iD8DBQFEIx2Y/ejvha5XGaMRAtY9AJ4mAhUq+DhKEXK0SoUZ1OrN3J8QZACcD5Vz
+wTvm4FOI3xOLKy9Zfoxr5gQ=
+=Hvvl
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch b/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch
deleted file mode 100644
index 7a948ba95d00..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -5334,6 +5334,8 @@
- 		return 1
- 
- 	def update_ents(self, update_iter):
-+		if len(update_iter) == 0:
-+			return
- 		if not self.populated:
- 			self.populate()
- 
-
diff --git a/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch b/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch
deleted file mode 100644
index 45aac5746a9d..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -1934,7 +1934,7 @@
- 			y=portage.portdb.findname(x[pkgindex])
- 			if not "--pretend" in myopts:
- 				print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1]
--				emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
-+				emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
- 
- 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
- 			self.pkgsettings.backup_changes("EMERGE_FROM")
-
diff --git a/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch b/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch
deleted file mode 100644
index 556f875867f9..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'bin/ebuild.sh'
---- bin/ebuild.sh	
-+++ bin/ebuild.sh	
-@@ -727,6 +727,11 @@
- }
- 
- dyn_clean() {
-+	if [ -z "${PORTAGE_BUILDDIR}" ]; then
-+		echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!"
-+		return 1
-+	fi
-+
- 	if [ "$USERLAND" == "BSD" ] && type -p chflags &>/dev/null; then
- 		chflags -R noschg,nouchg,nosappnd,nouappnd,nosunlnk,nouunlnk \
- 			"${PORTAGE_BUILDDIR}"
-
diff --git a/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch b/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch
deleted file mode 100644
index 685f365c95be..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'pym/portage_locks.py'
---- pym/portage_locks.py	
-+++ pym/portage_locks.py	
-@@ -122,7 +122,8 @@
- 			raise
- 
- 		
--	if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1:
-+	if type(lockfilename) == types.StringType and \
-+		myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1:
- 		# The file was deleted on us... Keep trying to make one...
- 		os.close(myfd)
- 		portage_util.writemsg("lockfile recurse\n",1)
-
diff --git a/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch b/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch
deleted file mode 100644
index 79850c303f71..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-=== modified file 'bin/dobin'
---- bin/dobin	
-+++ bin/dobin	
-@@ -12,16 +12,11 @@
- 	install -d "${D}${DESTTREE}/bin" || exit 2
- fi
- 
--case ${CHOST} in
--	*-freebsd*) group=wheel ;;
--	*)          group=root ;;
--esac
--
- ret=0
- 
- for x in "$@" ; do
- 	if [[ -e ${x} ]] ; then
--		install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/bin"
-+		install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/bin"
- 	else
- 		echo "!!! ${0##*/}: ${x} does not exist" 1>&2
- 		false
-
-=== modified file 'bin/dosbin'
---- bin/dosbin	
-+++ bin/dosbin	
-@@ -12,16 +12,11 @@
- 	install -d "${D}${DESTTREE}/sbin" || exit 2
- fi
- 
--case ${CHOST} in
--	*-freebsd*) group=wheel ;;
--	*)          group=root ;;
--esac
--
- ret=0
- 
- for x in "$@" ; do
- 	if [[ -e ${x} ]] ; then
--		install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/sbin"
-+		install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/sbin"
- 	else
- 		echo "!!! ${0##*/}: ${x} does not exist" 1>&2
- 		false
-
diff --git a/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch b/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch
deleted file mode 100644
index a0b5da9035a6..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-=== modified file 'bin/emerge-webrsync'
---- bin/emerge-webrsync	
-+++ bin/emerge-webrsync	
-@@ -5,13 +5,11 @@
- # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
- # Rewritten from the old, Perl-based emerge-webrsync script
- 
--if [ -z "$PULLED_NICENESS" ]; then
--	PULLED_NICENESS="$(/usr/lib/portage/bin/portageq envvar PORTAGE_NICENESS)"
--	if [ -n "$PULLED_NICENESS" ]; then
--		export PULLED_NICENESS
--		exec nice -n $PORTAGE_NICENESS "$0" "$@"
--		echo "failed pulling PORTAGE_NICENESS, disabling"
--	fi
-+# If PORTAGE_NICENESS is overriden via the env then it will
-+# still pass through the portageq call and override properly.
-+PORTAGE_NICENESS="$(/usr/lib/portage/bin/portageq envvar PORTAGE_NICENESS)"
-+if [ -n "${PORTAGE_NICENESS}" ]; then
-+	renice $PORTAGE_NICENESS $$ > /dev/null
- fi
- 
- GENTOO_MIRRORS="${GENTOO_MIRRORS} $(/usr/lib/portage/bin/portageq gentoo_mirrors)"
-
diff --git a/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch b/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch
deleted file mode 100644
index 9a311bc82269..000000000000
--- a/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: pym/portage.py
-===================================================================
---- pym/portage.py	(revision 2811)
-+++ pym/portage.py	(working copy)
-@@ -5826,7 +5826,8 @@
- 				os.chown(pdir, 0, portage_gid)
- 				os.chmod(pdir, 02770)
- 
--			write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))
-+			write_atomic(os.path.join(self.myroot, WORLD_FILE.lstrip(os.sep)),
-+			"\n".join(newworldlist))
- 
- 		#do original postrm
- 		if myebuildpath and os.path.exists(myebuildpath):
-Index: bin/emerge
-===================================================================
---- bin/emerge	(revision 2811)
-+++ bin/emerge	(working copy)
-@@ -1861,7 +1861,9 @@
- 							myfavdict[myfavkey]=myfavkey
- 							print ">>> Recording",myfavkey,"in \"world\" favorites file..."
- 			if not "--fetchonly" in myopts:
--				portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values()))
-+				portage.write_atomic(
-+				os.path.join(portage.root, portage.WORLD_FILE.lstrip(os.sep)),
-+				"\n".join(myfavdict.values()))
- 
- 			portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
- 
-@@ -2032,7 +2034,9 @@
- 						myfavdict[myfavkey]=myfavkey
- 						print ">>> Recording",myfavkey,"in \"world\" favorites file..."
- 						emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")
--						portage.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values()))
-+						portage.write_atomic(
-+						os.path.join(myroot, portage.WORLD_FILE.lstrip(os.sep)),
-+						"\n".join(myfavdict.values()))
- 
- 				if ("noclean" not in portage.features) and (x[0] != "binary"):
- 					short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"
diff --git a/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch b/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch
deleted file mode 100644
index 770a5a9df203..000000000000
--- a/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -4,7 +4,7 @@
- # $Id: version_bump_2.1_pre5-r4.patch,v 1.1 2006/03/05 01:44:49 zmedico Exp $
- 
- 
--VERSION="2.1_pre5"
-+VERSION="2.1_pre5-r4"
- 
- # ===========================================================================
- # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
-
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre5-r4 b/sys-apps/portage/files/digest-portage-2.1_pre5-r4
deleted file mode 100644
index c818d7ae4b7c..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre5-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d389d9e87957429d4b49647d1339b220 portage-2.1_pre5.tar.bz2 256872
-RMD160 6d296e089345ddc44866cea7649005870a91786c portage-2.1_pre5.tar.bz2 256872
-SHA256 bdbd2e6e922750250592fbbd9e0cf91cd3f9024a33cf32b979bf2dd8cb344c13 portage-2.1_pre5.tar.bz2 256872
diff --git a/sys-apps/portage/portage-2.1_pre5-r4.ebuild b/sys-apps/portage/portage-2.1_pre5-r4.ebuild
deleted file mode 100644
index 12bfad4615e7..000000000000
--- a/sys-apps/portage/portage-2.1_pre5-r4.ebuild
+++ /dev/null
@@ -1,166 +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_pre5-r4.ebuild,v 1.2 2006/03/05 23:28:35 zmedico Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~zmedico/releases/${PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-SLOT="0"
-IUSE="build doc selinux"
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
-					dev-python/python-fchksum \
-					>=dev-lang/python-2.3 \
-					userland_GNU? ( sys-apps/debianutils ) \
-					>=app-shells/bash-2.05a ) \
-		!userland_Darwin? ( app-misc/pax-utils sys-apps/sandbox ) \
-		selinux? ( >=dev-python/python-selinux-2.15 ) \
-		doc? ( app-portage/portage-manpages )
-		>=dev-python/pycrypto-2.0.1-r4"
-
-PROVIDE="virtual/portage"
-
-S=${WORKDIR}/${PN}-${PV}
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local my_patches="1000_r2763_fixpackages_features.patch
-		1010_r2764_emergelog_genlop.patch
-		1020_r2800_bug_124203_clean_phase_sanity.patch
-		1030_r2790_bug_124140_portage_locks_hardlink.patch
-		1040_r2804_bug_124568_dobin_wheel.patch
-		1050_r2805_bug_124621_webrsync_niceness.patch
-		1060_r2812_bug_124471_worldfile_ROOT.patch
-		version_bump_2.1_pre5-r4.patch"
-	for patch_name in ${my_patches}; do
-		patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} || die "Failed to apply patch"
-	done
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		chmod +x setup.py
-		./setup.py build || die "Failed to build missingos module"
-	fi
-
-	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() {
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf make.globals
-	if [ -f "make.conf.${ARCH}" ]; then
-		newins make.conf.${ARCH} 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 userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	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 /usr/lib/portage/bin
-	exeinto /usr/lib/portage/bin
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins /usr/lib/portage/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir /usr/lib/portage/${mydir}
-		insinto /usr/lib/portage/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py *.pyo
-	done
-
-	doman "${S}"/man/*.[0-9]
-	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
-	for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf ${IMAGE}/usr/lib/portage/pym/*
-		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
-		rm -rf ${IMAGE}/usr/lib/portage/bin/*
-		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
-	else
-		rm /usr/lib/portage/pym/*.pyc >& /dev/null
-		rm /usr/lib/portage/pym/*.pyo >& /dev/null
-	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 "This series contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules (such as the CDB cache"
-	ewarn "module) portage will not work until they have been disabled."
-	echo
-	einfo "The default cache format has changed beginning with this"
-	einfo "version. Before using emerge, run \`emerge --metadata\` to"
-	einfo "restore portage's local cache."
-	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
-	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
-}