Add append-lfs-flags to src_compile for bug #144754 and punt old 2.1-r1.

Package-Manager: portage-2.1.1_pre5-r3

3 files changed, 27 insertions, 273 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 970996250b38..951015e3641c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,43 +15,37 @@ RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
 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-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1_pre5-r1.patch.bz2 1420 RMD160 ba2e191f273bae68f5f24d569a1e520bbecabcb8 SHA1 84e2e87916389373b176fa15ab93f709295b393a SHA256 778683606257c873bed6beb9e43d0165323576450584804ba93c45974b8f127b
 DIST portage-2.1.1_pre5-r3.patch.bz2 7737 RMD160 94a252bb08fe44ebe0c384a0e8c9cbec12ee1fb9 SHA1 e554314857f7383e3e59147880864930d51c2d92 SHA256 fd1e973bae5818361628d9481dde50d3c9c3a373e28052126d417de133e8c170
 DIST portage-2.1.1_pre5.tar.bz2 293281 RMD160 4c34d0cec6411eb463d0ef0109bf703856dc47c8 SHA1 4bda8ade5e989a1f0abf0c6522dc173c8438f915 SHA256 a2734e694f6208f7d79df894560c14816a981dc679e16daabe490ffe05d5a616
-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
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc
-EBUILD portage-2.0.51.22-r3.ebuild 5784 RMD160 b832375b604d0032e3727ad96d9c766c5f49f448 SHA1 932b3a10dcf86c09600db06084bf4425a55ece20 SHA256 b3eb209b100cb5c1b6eec6028d3b7652b75043ae60a8b8bc0b1b8aa923879b5b
-MD5 b61116f5434ae92ca80cba6e990928d5 portage-2.0.51.22-r3.ebuild 5784
-RMD160 b832375b604d0032e3727ad96d9c766c5f49f448 portage-2.0.51.22-r3.ebuild 5784
-SHA256 b3eb209b100cb5c1b6eec6028d3b7652b75043ae60a8b8bc0b1b8aa923879b5b portage-2.0.51.22-r3.ebuild 5784
-EBUILD portage-2.0.54-r2.ebuild 4247 RMD160 65a378979932e560426f072a67492d9ac4293eb0 SHA1 bb087223860390524508dbb4721877ce925fea8d SHA256 880efc42b6298d4867b140c85b03e4875ccac9715110ce4768f48c58ffdbcbff
-MD5 3e292710aeafbcd854d3c515347fc900 portage-2.0.54-r2.ebuild 4247
-RMD160 65a378979932e560426f072a67492d9ac4293eb0 portage-2.0.54-r2.ebuild 4247
-SHA256 880efc42b6298d4867b140c85b03e4875ccac9715110ce4768f48c58ffdbcbff portage-2.0.54-r2.ebuild 4247
-EBUILD portage-2.1-r1.ebuild 7519 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 SHA1 349d11c693568bf567d24f25ea7b3e22a0c635d5 SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1
-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-r2.ebuild 7043 RMD160 19c97669485e256e3b271d94d29cc84d2330ac71 SHA1 bf0b92fd1cd4424c9b89409577e96fd231225f78 SHA256 43db393da151a02e1956e35ba3bea0e0e309308cb29195fc3c1da2737f8a2280
-MD5 1d342a77b95d6697e3668dbda8208b0f portage-2.1-r2.ebuild 7043
-RMD160 19c97669485e256e3b271d94d29cc84d2330ac71 portage-2.1-r2.ebuild 7043
-SHA256 43db393da151a02e1956e35ba3bea0e0e309308cb29195fc3c1da2737f8a2280 portage-2.1-r2.ebuild 7043
-EBUILD portage-2.1.1_pre5-r1.ebuild 5775 RMD160 535aef840136cb27170a710d42778c57b8a9df0b SHA1 34c0f63c026250fcc48478a661c6a6ec0962950d SHA256 1fa7e1c06f9242c53ba8df98fa6457d5003dbab94af8725679ec9fae663210d6
-MD5 fbaa09e39bb667e2e3e25b717d05e058 portage-2.1.1_pre5-r1.ebuild 5775
-RMD160 535aef840136cb27170a710d42778c57b8a9df0b portage-2.1.1_pre5-r1.ebuild 5775
-SHA256 1fa7e1c06f9242c53ba8df98fa6457d5003dbab94af8725679ec9fae663210d6 portage-2.1.1_pre5-r1.ebuild 5775
-EBUILD portage-2.1.1_pre5-r3.ebuild 5775 RMD160 09b6f8597c4924e172e0335860ec0b8e8fd34e20 SHA1 f5720a9e4de798dd334224824ae7da792b0df68f SHA256 77408e37c68d2a9296d6e09346ee66c42f461b6a323d42e99ec16ba6ab7664c8
-MD5 60f4eb50f009a44487ae341b104960dc portage-2.1.1_pre5-r3.ebuild 5775
-RMD160 09b6f8597c4924e172e0335860ec0b8e8fd34e20 portage-2.1.1_pre5-r3.ebuild 5775
-SHA256 77408e37c68d2a9296d6e09346ee66c42f461b6a323d42e99ec16ba6ab7664c8 portage-2.1.1_pre5-r3.ebuild 5775
-MISC ChangeLog 21440 RMD160 996302c8946883e82f33313daed2387594dca6d7 SHA1 6d85bd4194da3c4bf5293b5ade16cbb251e911d9 SHA256 be88c526ddc3dc7206539f958866485d18f2513dceb21990943ab5d877467b51
-MD5 11559634cdd1bf34f9b2136ed8c2f224 ChangeLog 21440
-RMD160 996302c8946883e82f33313daed2387594dca6d7 ChangeLog 21440
-SHA256 be88c526ddc3dc7206539f958866485d18f2513dceb21990943ab5d877467b51 ChangeLog 21440
+EBUILD portage-2.0.51.22-r3.ebuild 5746 RMD160 acc2d23c94adbe7823d4193ff3af316be5e173c7 SHA1 a2378c598b797d463bcbac3cada663589fc45d9c SHA256 973bf27adcb1ff03fc1d06aa5851c2a1d82df571297064f41e2d0802a8cd3410
+MD5 19f5c196e9fdb3f1a4916a4c9914583c portage-2.0.51.22-r3.ebuild 5746
+RMD160 acc2d23c94adbe7823d4193ff3af316be5e173c7 portage-2.0.51.22-r3.ebuild 5746
+SHA256 973bf27adcb1ff03fc1d06aa5851c2a1d82df571297064f41e2d0802a8cd3410 portage-2.0.51.22-r3.ebuild 5746
+EBUILD portage-2.0.54-r2.ebuild 4209 RMD160 8b0e59b4810531f8e7bd7902fbed2f882febbb16 SHA1 1e4df24a4b5ee0364c41e192a5850031f4e4e9c0 SHA256 a2420d5bfc17fdc2765600eb96741a12c9f1c765343be165c5820947ad5228b7
+MD5 56f62f5452b1ab3a13d39d97a6baefed portage-2.0.54-r2.ebuild 4209
+RMD160 8b0e59b4810531f8e7bd7902fbed2f882febbb16 portage-2.0.54-r2.ebuild 4209
+SHA256 a2420d5bfc17fdc2765600eb96741a12c9f1c765343be165c5820947ad5228b7 portage-2.0.54-r2.ebuild 4209
+EBUILD portage-2.1-r2.ebuild 7077 RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4d SHA1 b2992919246ee4b541bfa8140f16f9fc7f9b3711 SHA256 1a7fd886c4b04bff6cfa34e6d2c11255e87286a0a0ea14da1cac8feeda21a92d
+MD5 1b28b65bd43e57ce31605f24e54732f1 portage-2.1-r2.ebuild 7077
+RMD160 709488f3f40f375fbd8dc38c0fee414b2075dc4d portage-2.1-r2.ebuild 7077
+SHA256 1a7fd886c4b04bff6cfa34e6d2c11255e87286a0a0ea14da1cac8feeda21a92d portage-2.1-r2.ebuild 7077
+EBUILD portage-2.1.1_pre5-r1.ebuild 5807 RMD160 449d85508920ae34debc204049f2ab251f29843b SHA1 4a43bf7141cca5107373672247445e286d913796 SHA256 244dfd84e83cba272702f41916c165e7b6e26efe009b74f4286579700c58ca2e
+MD5 bcaba80237bff6057f078498e609574c portage-2.1.1_pre5-r1.ebuild 5807
+RMD160 449d85508920ae34debc204049f2ab251f29843b portage-2.1.1_pre5-r1.ebuild 5807
+SHA256 244dfd84e83cba272702f41916c165e7b6e26efe009b74f4286579700c58ca2e portage-2.1.1_pre5-r1.ebuild 5807
+EBUILD portage-2.1.1_pre5-r3.ebuild 5807 RMD160 fcafdfe1611dffedbeda9157f99157e10cea0ba5 SHA1 b37c3c9c64ac75629b4e1896809e883c3dfd5e83 SHA256 818a8fdefc53ec51f51840f3c741fb9b4eaf4c1b2f0a94ea8dd65716ff590439
+MD5 e4cb483e8b2f406a9a92a180d32b97a0 portage-2.1.1_pre5-r3.ebuild 5807
+RMD160 fcafdfe1611dffedbeda9157f99157e10cea0ba5 portage-2.1.1_pre5-r3.ebuild 5807
+SHA256 818a8fdefc53ec51f51840f3c741fb9b4eaf4c1b2f0a94ea8dd65716ff590439 portage-2.1.1_pre5-r3.ebuild 5807
+MISC ChangeLog 21729 RMD160 86e3f9e5d592fba723cad9a7959562ab3e641d1c SHA1 79e2c42411e624cbf042481ea0d4ebf8ed8befc9 SHA256 59e46ea0c586530d8386b7e37ad2f044ba77e2c5aa983587c2edd8422af206dd
+MD5 6f782f7873a7223e395121494655a9af ChangeLog 21729
+RMD160 86e3f9e5d592fba723cad9a7959562ab3e641d1c ChangeLog 21729
+SHA256 59e46ea0c586530d8386b7e37ad2f044ba77e2c5aa983587c2edd8422af206dd ChangeLog 21729
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -62,9 +56,6 @@ SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/di
 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 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 de7e755113f65dd715d1660e1fb0da21 files/digest-portage-2.1-r2 771
 RMD160 0579c77c3080d58fc96b4087ab593fb0ea8f24c6 files/digest-portage-2.1-r2 771
 SHA256 96af979679274f1696e26b58a1347812f388963a675147aa03bc7acd65a659b5 files/digest-portage-2.1-r2 771
@@ -77,7 +68,7 @@ SHA256 cc065cc046b222408fb701c265b2dc8fb21ad06f147ff95c5adce69fa42017de files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE6WQM/ejvha5XGaMRAtmfAKC/7fP4sjjipuYQiugDiA3qNDTpxwCfeERw
-eUtdx28vpuQjt6PYip/j3is=
-=tbln
+iD8DBQFE7JXP/ejvha5XGaMRArOHAKCnYubmX/HD1A9Ar1nTGBFhuN8dgACdGqre
+M4TmXeYBTN1z5LMYNggKYII=
+=bcSN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1-r1 b/sys-apps/portage/files/digest-portage-2.1-r1
deleted file mode 100644
index e692220690de..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 ab61296a369547a788a09b40b9b4e916 portage-2.1-r1.patch.bz2 12201
-RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 portage-2.1-r1.patch.bz2 12201
-SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80 portage-2.1-r1.patch.bz2 12201
-MD5 cb8c8af28d59f267377bba27ceea2337 portage-2.1.tar.bz2 277243
-RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 portage-2.1.tar.bz2 277243
-SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0 portage-2.1.tar.bz2 277243
-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-r1.ebuild b/sys-apps/portage/portage-2.1-r1.ebuild
deleted file mode 100644
index 721acd20bd30..000000000000
--- a/sys-apps/portage/portage-2.1-r1.ebuild
+++ /dev/null
@@ -1,225 +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-r1.ebuild,v 1.12 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 )
-		userland_Darwin? ( >=app-shells/bash-2.05a ) )
-	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="-${PR}"
-	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"
-		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
-
-	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
-	elog "The default cache format has changed between 2.0.x and 2.1"
-	elog "versions. If you have upgraded from 2.0.x, before using"
-	elog "emerge, run \`emerge --metadata\` to restore portage's local"
-	elog "cache."
-	echo
-	elog "With the new metadata_overlay cache module, it is possible to"
-	elog "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	elog "When this module is used, eclasses in \${PORTDIR} must never"
-	elog "be modified by the user because portage will not be able to"
-	elog "detect that cache regeneration is necessary."
-	elog "When metadata_overlay is initially enabled by setting"
-	elog "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	elog "in /etc/portage/modules, the user must completely remove"
-	elog "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	elog "cache regeneration."
-	echo
-	elog "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	elog "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	elog "to restore the previous ordering."
-	echo
-	elog "The default USE_ORDER setting (see make.conf.5) has changed in"
-	elog "2.1 so that auto USE flags (from use.defaults) are no longer"
-	elog "enabled.  In order to find out which flags have been disabled,"
-	elog "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
-	elog "helpful.  These flags can be manually added to make.conf by the"
-	elog "user (the command output may contain a few other automatically"
-	elog "generated flags that do not need to be added to make.conf)."
-	echo
-	elog "See NEWS and RELEASE-NOTES for further changes."
-
-	portage_docs
-}