2.1_rc1 release candidate

Package-Manager: portage-2.1_rc1

4 files changed, 39 insertions, 285 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bb1fa7b12d11..896a41c9eb95 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,65 +1,55 @@
-AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 size 34
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 size 34
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
-SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
-AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 SHA1 6305707411c213cd78f028952f7aabcb8b56e0ce SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c size 10579
+AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 SHA1 6305707411c213cd78f028952f7aabcb8b56e0ce size 10579
 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
-AUX 2.1/pre10/1150_r3334_make_profile_realpath.patch 414 RMD160 04ed98982137a5710b879e5208a529e7753292e0 SHA1 f759cf6a73fc8c3942423e0331838da66bb1c846 SHA256 e8e4a4ec598017a386af3afd004fca879404b373639f95692c62a93099663acf size 414
-MD5 9171630257c115eaf795e55f9532b266 files/2.1/pre10/1150_r3334_make_profile_realpath.patch 414
-RMD160 04ed98982137a5710b879e5208a529e7753292e0 files/2.1/pre10/1150_r3334_make_profile_realpath.patch 414
-SHA256 e8e4a4ec598017a386af3afd004fca879404b373639f95692c62a93099663acf files/2.1/pre10/1150_r3334_make_profile_realpath.patch 414
-AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 size 137
+AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 size 137
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
-SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
-DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c size 257823
-DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06 size 234784
-DIST portage-2.1_pre10.tar.bz2 265067 RMD160 5fa51f0ecc7ccf5072a9765c81cf3e0a593b1de2 SHA256 14f795e9d39b6a1a32f67e63c6a18e4d74b18a95bdc9f3b827483bf01ffef50c size 265067
-DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 SHA256 50a8c9a618ab0e15237a638635318f97f7c56c307d2d1abaeba12d34733ce08a size 4398
-DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc size 6722
-DIST portage-patches-2.1_pre10-r5.tar.bz2 7804 RMD160 044ce00ab342781c112aab89c9edbf8717a7b5bf SHA256 b86a0cf159e0c201e2828030b42b8b9887a592c77b84e524ab5e42b15d68aa9a size 7804
-EBUILD portage-2.0.51.22-r3.ebuild 5796 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 SHA1 b88b2898eb5ba5b4471a10f8fa82df9b8dc747f0 SHA256 f634d807fcc92500d9acc3dd5d79aadd2f565dbf1ee64a0f75a3543e2a372e25 size 5796
+DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe size 257823
+DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b size 234784
+DIST portage-2.1_rc1.tar.bz2 269500 RMD160 1fa54bfe61f7a30bf3178997a78ef7272f560a35 size 269500
+DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 size 4398
+DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 size 6722
+EBUILD portage-2.0.51.22-r3.ebuild 5796 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 SHA1 b88b2898eb5ba5b4471a10f8fa82df9b8dc747f0 size 5796
 MD5 4df85686b65f5591383e16bf3d6845ba portage-2.0.51.22-r3.ebuild 5796
 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 portage-2.0.51.22-r3.ebuild 5796
-SHA256 f634d807fcc92500d9acc3dd5d79aadd2f565dbf1ee64a0f75a3543e2a372e25 portage-2.0.51.22-r3.ebuild 5796
-EBUILD portage-2.0.54-r1.ebuild 3998 RMD160 c654aaedcd2c20c78b8ced9ba5407af631819e96 SHA1 33ff554a9c1b4021bc982a45c82ea5c5ff6adeef SHA256 0c4984b4249f74dca6ce25815e28824917b0df6c3755a0c97bb103148271e89c size 3998
+EBUILD portage-2.0.54-r1.ebuild 3998 RMD160 c654aaedcd2c20c78b8ced9ba5407af631819e96 SHA1 33ff554a9c1b4021bc982a45c82ea5c5ff6adeef size 3998
 MD5 4f62f37006f604eb560eaa27666edd6e portage-2.0.54-r1.ebuild 3998
 RMD160 c654aaedcd2c20c78b8ced9ba5407af631819e96 portage-2.0.54-r1.ebuild 3998
-SHA256 0c4984b4249f74dca6ce25815e28824917b0df6c3755a0c97bb103148271e89c portage-2.0.54-r1.ebuild 3998
-EBUILD portage-2.0.54-r2.ebuild 4190 RMD160 012bca79eee13230e47e963277bf36f33c509fe8 SHA1 63e6d6469cc089fda79593547d9d89bbcb1637f1 SHA256 cd2cb66201e50278f47ea765b385e6f723eccd6b08225a2758230988109152e6 size 4190
+EBUILD portage-2.0.54-r2.ebuild 4190 RMD160 012bca79eee13230e47e963277bf36f33c509fe8 SHA1 63e6d6469cc089fda79593547d9d89bbcb1637f1 size 4190
 MD5 989347bcf352304dfa0430cacfcde3e3 portage-2.0.54-r2.ebuild 4190
 RMD160 012bca79eee13230e47e963277bf36f33c509fe8 portage-2.0.54-r2.ebuild 4190
-SHA256 cd2cb66201e50278f47ea765b385e6f723eccd6b08225a2758230988109152e6 portage-2.0.54-r2.ebuild 4190
-EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853 SHA256 583690c187f8d9c7fdfaf83626cad866492f144104bee7d26f4beb5544f2a429 size 3891
+EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853 size 3891
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
-SHA256 583690c187f8d9c7fdfaf83626cad866492f144104bee7d26f4beb5544f2a429 portage-2.0.54.ebuild 3891
-EBUILD portage-2.1_pre10-r5.ebuild 6650 RMD160 5097da996cd443b3858a8b413a6974860427112c SHA1 70381ae8b4c8c42db403bbdc97bbb1da2f400661 SHA256 4e1074f0ecae78d6fdc25974ecf4946f4d84742a54f535724b20d75254f56d59 size 6650
-MD5 f4aa9d14a966b38bdf5734dbc2970b7d portage-2.1_pre10-r5.ebuild 6650
-RMD160 5097da996cd443b3858a8b413a6974860427112c portage-2.1_pre10-r5.ebuild 6650
-SHA256 4e1074f0ecae78d6fdc25974ecf4946f4d84742a54f535724b20d75254f56d59 portage-2.1_pre10-r5.ebuild 6650
-MISC ChangeLog 20582 RMD160 168b0974ea22e3dcbfd18cce8b790bd0b26c30f6 SHA1 0b94f46e825675fc458d306455a4e70300996049 SHA256 eaccd9652360e6443057eec37cb0c95fac0d09dc737ec3d148e203ca9c40e0b0 size 20582
-MD5 088a13b063f695bd23d1e0d336dd28a4 ChangeLog 20582
-RMD160 168b0974ea22e3dcbfd18cce8b790bd0b26c30f6 ChangeLog 20582
-SHA256 eaccd9652360e6443057eec37cb0c95fac0d09dc737ec3d148e203ca9c40e0b0 ChangeLog 20582
-MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 size 276
+EBUILD portage-2.1_rc1.ebuild 6562 RMD160 209073f09b4d4713dd8d5038e7858ffa9e5e030d SHA1 6767460cf8371682b584cb46cb55b1aadb3a4f9e size 6562
+MD5 ab03e0f489155bcefb6a5d4ed0cd7034 portage-2.1_rc1.ebuild 6562
+RMD160 209073f09b4d4713dd8d5038e7858ffa9e5e030d portage-2.1_rc1.ebuild 6562
+MISC ChangeLog 20717 RMD160 6e1ea1cc1f67493bd3ef75068ca193fdebb949ec SHA1 b032474940348db94197d8400f2a90d867780abf size 20717
+MD5 8d9c6bb9198849344a914b0f221941c0 ChangeLog 20717
+RMD160 6e1ea1cc1f67493bd3ef75068ca193fdebb949ec ChangeLog 20717
+MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 size 276
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
-SHA256 b57f85b96f11cfb55dc61ac16d743816af60f09660b3f40defa0196d9044f1b7 metadata.xml 276
-MD5 705737811b9ae5871759cca1a00013d0 files/digest-portage-2.0.51.22-r3 256
-RMD160 1bab4fc9bf2e3d805e696a68704ea119671f0474 files/digest-portage-2.0.51.22-r3 256
-SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/digest-portage-2.0.51.22-r3 256
-MD5 9e5bd07f71a62b11c8d1f5c128a5c220 files/digest-portage-2.0.54 247
-RMD160 a2154fa14f7806c5aeee80b2533632aa6e985cb9 files/digest-portage-2.0.54 247
-SHA256 3e6241c64444dedca714fe8d09557fabd11d4212dd9baf22251f197c7651908c files/digest-portage-2.0.54 247
-MD5 5c917f224be67cca41a62284c21f5877 files/digest-portage-2.0.54-r1 518
-RMD160 55e93cf68ff50faba851c5e938ad7b1baf515372 files/digest-portage-2.0.54-r1 518
-SHA256 eed2cd362ddd79b3068eb40cb11e65917eb4b1ae1590f92c303b6b784bf2fc65 files/digest-portage-2.0.54-r1 518
-MD5 e45f7d0e8e0ac69dbe448716a15fed01 files/digest-portage-2.0.54-r2 518
-RMD160 ba39dd410b0e4fb7a4f95e3ea17c3827431b1d56 files/digest-portage-2.0.54-r2 518
-SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/digest-portage-2.0.54-r2 518
-MD5 9d2b165e66c34e7799f23e4c1e0a8413 files/digest-portage-2.1_pre10-r5 539
-RMD160 17b3ed4e4982f893389f972a1404597f3e39efd4 files/digest-portage-2.1_pre10-r5 539
-SHA256 6eef87ac25c38f52fb6156b755cb6ddf22f348c3a862643b66d3bd9278404cda files/digest-portage-2.1_pre10-r5 539
+MD5 1afde18626699ccfbc46fdd394c8edeb files/digest-portage-2.0.51.22-r3 151
+RMD160 49e1e3e1f2a2002ff24296f50498930449d4e4b7 files/digest-portage-2.0.51.22-r3 151
+MD5 65372f5d0f6b19c94cdae92150cdab01 files/digest-portage-2.0.54 145
+RMD160 603688a05b8057b777d33ebefb17e1c9fcc4b938 files/digest-portage-2.0.54 145
+MD5 5b857931bd168ec3192114e2ab6c5a72 files/digest-portage-2.0.54-r1 306
+RMD160 990b4d62ad267177500fbaf3b8170c9de54b304f files/digest-portage-2.0.54-r1 306
+MD5 6cbef6dfb5cc519ab1dbcf288b05681d files/digest-portage-2.0.54-r2 306
+RMD160 8610a1ba4262db214f6d990bf6587f78ed5f4a5d files/digest-portage-2.0.54-r2 306
+MD5 476ee7c4cbf56f2343bdad3b9a8511de files/digest-portage-2.1_rc1 147
+RMD160 cb27af4cc53e0b758947d3570fba2a4c14dc426f files/digest-portage-2.1_rc1 147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEZkd+/ejvha5XGaMRAu0gAJ9IE54bDkYwDtJO8UA5VCmIICAW4wCeNd5X
+VHAsUICfzxl3MTG0YQVQFZE=
+=hAvs
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1/pre10/1150_r3334_make_profile_realpath.patch b/sys-apps/portage/files/2.1/pre10/1150_r3334_make_profile_realpath.patch
deleted file mode 100644
index 3d694cc97680..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1150_r3334_make_profile_realpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1017,7 +1017,7 @@
- 			if self.profile_path is None:
- 				self.profiles = []
- 			else:
--				self.profiles = [abssymlink(self.profile_path)]
-+				self.profiles = [os.path.realpath(self.profile_path)]
- 				mypath = self.profiles[0]
- 				while os.path.exists(os.path.join(mypath, "parent")):
- 					mypath = os.path.normpath(os.path.join(
-
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre10-r5 b/sys-apps/portage/files/digest-portage-2.1_pre10-r5
deleted file mode 100644
index 81945bf28902..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre10-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ba74433ad7d1471074e79ac512ad6158 portage-2.1_pre10.tar.bz2 265067
-RMD160 5fa51f0ecc7ccf5072a9765c81cf3e0a593b1de2 portage-2.1_pre10.tar.bz2 265067
-SHA256 14f795e9d39b6a1a32f67e63c6a18e4d74b18a95bdc9f3b827483bf01ffef50c portage-2.1_pre10.tar.bz2 265067
-MD5 5114cffce19d538d462a9ec9cdb05bb9 portage-patches-2.1_pre10-r5.tar.bz2 7804
-RMD160 044ce00ab342781c112aab89c9edbf8717a7b5bf portage-patches-2.1_pre10-r5.tar.bz2 7804
-SHA256 b86a0cf159e0c201e2828030b42b8b9887a592c77b84e524ab5e42b15d68aa9a portage-patches-2.1_pre10-r5.tar.bz2 7804
diff --git a/sys-apps/portage/portage-2.1_pre10-r5.ebuild b/sys-apps/portage/portage-2.1_pre10-r5.ebuild
deleted file mode 100644
index d3ae66856d7d..000000000000
--- a/sys-apps/portage/portage-2.1_pre10-r5.ebuild
+++ /dev/null
@@ -1,217 +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_pre10-r5.ebuild,v 1.1 2006/05/08 20:45:02 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"
-IUSE="build doc selinux"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND="!build? ( >=dev-lang/python-2.3
-		dev-python/python-fchksum
-		userland_GNU? ( sys-apps/debianutils )
-		>=app-shells/bash-2.05a
-		>=sys-apps/sed-4.0.5 )
-	elibc_glibc? ( sys-apps/sandbox )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
-	selinux? ( >=dev-python/python-selinux-2.15 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-PATCHVER="-r5"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-[ -n "${PATCHVER}" ] && \
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PV}${PATCHVER}.tar.bz2"
-unset PATCHVER
-
-S="${WORKDIR}"/${PN}-${PV}
-
-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 [ -d "${WORKDIR}/patch" ]; then
-		local p
-		for p in $(ls "${WORKDIR}"/patch | sort); do
-			epatch "${WORKDIR}"/patch/${p}
-		done
-	fi
-
-	epatch "${FILESDIR}"/${PV%_*}/${PV/*_}/1150_r3334_make_profile_realpath.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"
-	fi
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	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() {
-	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 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 ${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
-	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 *.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
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		quickpkg
-		regenworld"
-	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 "Portage 2.1 contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules from portage-2.0.x (such as"
-	ewarn "the CDB cache module), portage will not work until they have"
-	ewarn "been disabled via /etc/portage/modules."
-	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
-	echo
-	einfo "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
-	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."
-
-	portage_docs
-}