2.1.3.4 bump

Package-Manager: portage-2.1.3.4

6 files changed, 26 insertions, 281 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index aa7a92252207..760accb83a3c 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.421 2007/08/06 04:17:23 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.422 2007/08/10 22:14:39 zmedico Exp $
+
+*portage-2.1.3.4 (10 Aug 2007)
+
+  10 Aug 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.3.4.ebuild:
+  2.1.3.4 bump. This fixes bugs #187741, #187795, #187806, and #187953.
+  Bug #181949 tracks all bugs fixed since 2.1.2.x.
 
   06 Aug 2007; Joshua Kinard <kumba@gentoo.org> portage-2.1.2.11.ebuild:
   Stable on mips, per #187334.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5ca7c8aa0623..e66326b374fd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -20,9 +20,8 @@ DIST portage-2.1.2.11.tar.bz2 334796 RMD160 cf456fd3da24a3f6df32752253a9db041d89
 DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a884554 SHA1 2897ef16683d7cc8d5b8da04b67b93fcc83634d4 SHA256 1f5dd5105698773d46ce2345e9b5668271147d3b68e223216f965bf75a133f73
 DIST portage-2.1.2.9.patch.bz2 61579 RMD160 ba315f393f8ecf4a89811c650131f3ad51b754d9 SHA1 0dfdc95e9becd0475e417f93417edfd8c0ab4fbb SHA256 4de01cc201f60438a1973aef146c4bbc715bc271fac0717e960c1d5cef8205a4
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
-DIST portage-2.1.3.3.patch.bz2 7273 RMD160 f6682f4841409a8ca76a81aaa552e2ffaf1da360 SHA1 7cb82f7e6f5a96a6abc146c96a373ec9fb9fb1ab SHA256 a0ca15359f6cd6bd00af4ba711078f8e65596a1de9a0ff2322d0d0ec0dcc8a98
+DIST portage-2.1.3.4.patch.bz2 8935 RMD160 4460a4c32a218c238898aaf9f7f6128b4f558153 SHA1 2a35c116a924337d278cd2d08aa983e4cabbc779 SHA256 eb440a48a0900af51164397e0b96914f531784694955f695ecde39e86fa937d4
 DIST portage-2.1.3.tar.bz2 356902 RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 SHA1 946e9d09cfacaddfa9c3570e3599f763f75be2e4 SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883
-DIST portage-2.1.3_rc9.patch.bz2 136937 RMD160 7198009db19d05adb571e64c1fd6bbaf1101f87d SHA1 c11ff897cfa2d3a0e8f435460e5e72bc8aaa6de7 SHA256 a77b492e7006c361840505c569b217a1a107ccc14ed79a0b0a81fc9d9bf410bb
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -46,18 +45,14 @@ EBUILD portage-2.1.2.9.ebuild 7160 RMD160 9e84120d079a59fef4a02bed632ffff4be4a80
 MD5 cc5e4b13ce80d09b07e4178c94e14d50 portage-2.1.2.9.ebuild 7160
 RMD160 9e84120d079a59fef4a02bed632ffff4be4a8016 portage-2.1.2.9.ebuild 7160
 SHA256 085c461eae32f5279c6c44eac3b9158e5a340baf7dfa67e068fea6751ad4b664 portage-2.1.2.9.ebuild 7160
-EBUILD portage-2.1.3.3.ebuild 7619 RMD160 9f0d1dc8c61fd362a272ad1507fc9198cc529e28 SHA1 b182e5e5185493f8ad09311a76a5be55c91a6656 SHA256 31c05d60efe2ed8f6991f05b4be62f3b2f2f397c12d5580fa409270bfa933296
-MD5 711af3661dddcb41a527dad4d946a88d portage-2.1.3.3.ebuild 7619
-RMD160 9f0d1dc8c61fd362a272ad1507fc9198cc529e28 portage-2.1.3.3.ebuild 7619
-SHA256 31c05d60efe2ed8f6991f05b4be62f3b2f2f397c12d5580fa409270bfa933296 portage-2.1.3.3.ebuild 7619
-EBUILD portage-2.1.3_rc9.ebuild 7319 RMD160 e0c8a5f62f4973b04eae9f0806d71da81c653672 SHA1 b3c503223d37c7edd5b02bb425819a7b48265c2b SHA256 604efd57de8f75e3aa6acf1a500c56728d5cd2125daed032011258355b254f4e
-MD5 ae63d9d0d0babc15901fc450a1c47096 portage-2.1.3_rc9.ebuild 7319
-RMD160 e0c8a5f62f4973b04eae9f0806d71da81c653672 portage-2.1.3_rc9.ebuild 7319
-SHA256 604efd57de8f75e3aa6acf1a500c56728d5cd2125daed032011258355b254f4e portage-2.1.3_rc9.ebuild 7319
-MISC ChangeLog 20899 RMD160 9a3f691b356346a080e6778db688a990e459ce25 SHA1 3c177f2c25da2e720035d80c941adb6718d1ad57 SHA256 df5f04fbad56ffbf449670642afd9dc7f7d9fdf306fa4e4406b09ee013b96eaf
-MD5 c6328842f0eb8be9e54d810d95a81b77 ChangeLog 20899
-RMD160 9a3f691b356346a080e6778db688a990e459ce25 ChangeLog 20899
-SHA256 df5f04fbad56ffbf449670642afd9dc7f7d9fdf306fa4e4406b09ee013b96eaf ChangeLog 20899
+EBUILD portage-2.1.3.4.ebuild 7619 RMD160 769470ef694e668825d6b138d5aa9a5f334fb02f SHA1 78e03292cbd8c0de89f1d8204db43513f614077b SHA256 17d73a31d39276b394de0250ec0c03582df69df735e698f4f3993607d14a0a1e
+MD5 6a978178be9f5032a2a59a70b6bbdb56 portage-2.1.3.4.ebuild 7619
+RMD160 769470ef694e668825d6b138d5aa9a5f334fb02f portage-2.1.3.4.ebuild 7619
+SHA256 17d73a31d39276b394de0250ec0c03582df69df735e698f4f3993607d14a0a1e portage-2.1.3.4.ebuild 7619
+MISC ChangeLog 21129 RMD160 58c4ba19aeea7432c6115c9e18e27a93f3aab5a7 SHA1 8bd24bafa4ee4553445215189573882be5022419 SHA256 944736f215557e8ea58e60ae4f8e1912e53696eff7aff181ad5796a68a10ecbf
+MD5 08cf31693b777ed2f37b2b59a87ff888 ChangeLog 21129
+RMD160 58c4ba19aeea7432c6115c9e18e27a93f3aab5a7 ChangeLog 21129
+SHA256 944736f215557e8ea58e60ae4f8e1912e53696eff7aff181ad5796a68a10ecbf ChangeLog 21129
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -77,16 +72,13 @@ SHA256 d8cbd61eab242247e3a0f76d5fafd63a398e4f1b4219e2193dd41f3a926fae05 files/di
 MD5 9ddf2195951bb996621c49dcadc737cb files/digest-portage-2.1.2.9 759
 RMD160 02e8f49fa6522d49ea28c98da7cd211e5f633d16 files/digest-portage-2.1.2.9 759
 SHA256 930cabb025bc5f9e963cc4f044688bbffb1cbc1e46c4b715ff2314d1469de01c files/digest-portage-2.1.2.9 759
-MD5 14863821087f484c67a5acf3fcf994b8 files/digest-portage-2.1.3.3 756
-RMD160 db41ecddbeaa1e2ab7434a1cfaddc1a9526bfad7 files/digest-portage-2.1.3.3 756
-SHA256 96d68fbbccf21a5b4e71c040c8c1167240539f1ec134aba4df2eba4d92c66c68 files/digest-portage-2.1.3.3 756
-MD5 75e82a4f4fe2e4a3155ba715f27d77fa files/digest-portage-2.1.3_rc9 768
-RMD160 0e0146369ae928ef84c24f00eb793d06923cc3a3 files/digest-portage-2.1.3_rc9 768
-SHA256 49f1c6e9b6ffa4490bc994c508d45cb99f2ac35dbc4103490966147c66f60a42 files/digest-portage-2.1.3_rc9 768
+MD5 f25e5f6939f3f0c8f946e629e2838d35 files/digest-portage-2.1.3.4 756
+RMD160 fe4b9cdea30e4a0c61ac1624d8740b588e9c1c34 files/digest-portage-2.1.3.4 756
+SHA256 cd13d2683c10deea0167e1b201d298b54d645d15e27a3a843d9323154af98a86 files/digest-portage-2.1.3.4 756
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGt6Y2/ejvha5XGaMRAuCnAKDoYIJolhQU1z9v6QfCmQH8mAJB0QCgrgDX
-Ekne/9jzj+pEUnif6ru9N+4=
-=wEkU
+iD8DBQFGvONZ/ejvha5XGaMRArzoAJ0SMhT0TgoGbX6Q1oqRRh8WMaCe7ACfd/Hh
+CBtshxEPG5+PkH3VVFLVuEs=
+=8Z3b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.3.3 b/sys-apps/portage/files/digest-portage-2.1.3.4
index afa6d8b0369a..fd2837631257 100644
--- a/sys-apps/portage/files/digest-portage-2.1.3.3
+++ b/sys-apps/portage/files/digest-portage-2.1.3.4
@@ -1,6 +1,6 @@
-MD5 4a2dd6ad17eefadfc3eeb587840961f8 portage-2.1.3.3.patch.bz2 7273
-RMD160 f6682f4841409a8ca76a81aaa552e2ffaf1da360 portage-2.1.3.3.patch.bz2 7273
-SHA256 a0ca15359f6cd6bd00af4ba711078f8e65596a1de9a0ff2322d0d0ec0dcc8a98 portage-2.1.3.3.patch.bz2 7273
+MD5 8175dfeb80faae1ba18cc47894cc8ae0 portage-2.1.3.4.patch.bz2 8935
+RMD160 4460a4c32a218c238898aaf9f7f6128b4f558153 portage-2.1.3.4.patch.bz2 8935
+SHA256 eb440a48a0900af51164397e0b96914f531784694955f695ecde39e86fa937d4 portage-2.1.3.4.patch.bz2 8935
 MD5 c8b48f9de6763a020dd9a44c695668a3 portage-2.1.3.tar.bz2 356902
 RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 portage-2.1.3.tar.bz2 356902
 SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883 portage-2.1.3.tar.bz2 356902
diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc9 b/sys-apps/portage/files/digest-portage-2.1.3_rc9
deleted file mode 100644
index 3675e5025724..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.3_rc9
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
-RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
-SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
-MD5 889aaf8d247054b1625bfa25bf8c9594 portage-2.1.3_rc9.patch.bz2 136937
-RMD160 7198009db19d05adb571e64c1fd6bbaf1101f87d portage-2.1.3_rc9.patch.bz2 136937
-SHA256 a77b492e7006c361840505c569b217a1a107ccc14ed79a0b0a81fc9d9bf410bb portage-2.1.3_rc9.patch.bz2 136937
-MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
-RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
-SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
diff --git a/sys-apps/portage/portage-2.1.3.3.ebuild b/sys-apps/portage/portage-2.1.3.4.ebuild
index 9475b01f4250..f584ec65bfef 100644
--- a/sys-apps/portage/portage-2.1.3.3.ebuild
+++ b/sys-apps/portage/portage-2.1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.3.ebuild,v 1.2 2007/08/06 22:52:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.4.ebuild,v 1.1 2007/08/10 22:14:39 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
diff --git a/sys-apps/portage/portage-2.1.3_rc9.ebuild b/sys-apps/portage/portage-2.1.3_rc9.ebuild
deleted file mode 100644
index dadca6443260..000000000000
--- a/sys-apps/portage/portage-2.1.3_rc9.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc9.ebuild,v 1.1 2007/07/22 22:38:54 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic multilib
-
-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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~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="build doc epydoc selinux linguas_pl userland_GNU ${IUSE_ELIBC}"
-DEPEND=">=dev-lang/python-2.4
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 )"
-RDEPEND=">=dev-lang/python-2.4
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		>=app-shells/bash-3.0 )
-	elibc_FreeBSD? ( dev-python/py-freebsd )
-	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-	>=app-misc/pax-utils-0.1.13
-	userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5
-	>=net-misc/rsync-2.6.4"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# rsync-2.6.4 rdep is for the --filter option #167668
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV="2.1.2"
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER="${PVR}"
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${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}-${TARBALL_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}
-	cd "${S}"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-		die "Failed to patch portage.VERSION"
-	eend 0
-	if [ -n "${PATCHVER_PL}" ]; then
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		sed -i "s/svn-trunk/${PVR}/" fragment/version
-		make xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g')" || die "error listing modules"
-		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-			-qqqqq --ignore-param-mismatch --no-frames --show-imports \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-	fi
-}
-
-src_test() {
-	./tests/runTests || \
-		die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/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
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary
-
-	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
-	use doc && dohtml "${S}"/doc/*.html
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
-	doenvd "${WORKDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/$(get_libdir)/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${D}"/${portage_base}/pym/*
-		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${D}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
-	fi
-	remove_python_bytecodes
-}
-
-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
-
-	elog
-	elog "The world file now supports slot atoms such as 'sys-devel/gcc:3.4'. In some"
-	elog "cases, emerge --depclean may remove slots that it would not have removed"
-	elog "in the past. The emerge --noreplace command can be used to add an atom to"
-	elog "the world file and prevent matching packages from being removed.  A slot"
-	elog "atom will be recorded in the world file for any atom that is precise enough"
-	elog "to identify a specific slot."
-
-	portage_docs
-}
-
-pkg_postrm() {
-	remove_python_bytecodes
-}
-
-remove_python_bytecodes() {
-	local d="${ROOT}/usr/$(get_libdir)/portage/pym"
-	[ -d "${d}" ] || return
-	find "${d}" -type d -print0 | \
-	while read -d $'\0' d ; do
-		cd "${d}"
-		rm -f *.pyc *.pyo
-	done
-}