2.1.5.3 bump. This fixes bugs #223417 (KeyError in merge phase),

(elog messages lost after build failure). Bug #216231 tracks all
bugs fixed since 2.1.4.x.

Drop eclass-manpages and portage-manpages deps from all ebuilds
to make repoman happy.
Package-Manager: portage-2.1.5.3

7 files changed, 286 insertions, 21 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 82db225e0baf..688c50b7ca86 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.521 2008/05/29 18:01:52 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.522 2008/06/01 10:30:18 zmedico Exp $
+
+*portage-2.1.5.3 (01 Jun 2008)
+
+  01 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.3.ebuild:
+  2.1.5.3 bump. This fixes bugs #223417 (KeyError in merge phase),
+  #223447 (depclean removes newly installed packages), and #223685
+  (elog messages lost after build failure). Bug #216231 tracks all
+  bugs fixed since 2.1.4.x.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> portage-2.2_pre3.ebuild,
   portage-2.2_pre5.ebuild, portage-2.2_pre6.ebuild, portage-2.2_pre7.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7d92cd901585..8145418878af 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,6 +11,7 @@ DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f25
 DIST portage-2.1.4.4.patch.bz2 15469 RMD160 c5fb833e97f4fced0d9c4b72056693f4b092fa51 SHA1 ebed38fd327e06c36d4b68a82ae205b65a7f1ebc SHA256 f832e388fe308f398597a0d0c5a0918898b7f06c9f146e7b105de40cff235803
 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11
 DIST portage-2.1.5.2.patch.bz2 4977 RMD160 817271d8b847ae3b2411938becdd9c56d7f948d1 SHA1 c36a8678a54ed005567c0f93563a138d6c6cac02 SHA256 38a85c9a00b78777df3bda8649a6aca78e9706a45b11f99e6bb467f2d1abd2d3
+DIST portage-2.1.5.3.patch.bz2 26180 RMD160 a6cb5ce1bba0f5b40f3808287aec185868c6d783 SHA1 f01c70ab96a0cb63dfad513ebfa3a827656c1963 SHA256 ea266d2a5b6e1e44f2f71a46b9ad086ee4657723887c48217ebd5a426d1ab9f7
 DIST portage-2.1.5.tar.bz2 380031 RMD160 18cefc905c2a25b8c2bdfd71161d6326f7122dae SHA1 2143560f501b7ba1b284c8ee7a29f02c078a55e9 SHA256 e644bece703de9e407dda94b365f570f757e665a11243194ac2cb30d84578f69
 DIST portage-2.2_pre3.tar.bz2 526090 RMD160 00226a5f5cd74d505d051007d04c61942008b3ce SHA1 11912bfb27baa3b87289089bdcec0476e873f69b SHA256 83e47dc5520019ecbbff8887b9853c26ba6c95810c3e1d50905bd9a3ea413c0e
 DIST portage-2.2_pre5.tar.bz2 529773 RMD160 6d5c71c0782850256ab5fd0480c549b5216e33d7 SHA1 da0aece95699a54a4fce60a28a797705f9e9a00f SHA256 6363e3e176eec78a533d6765362d3eb5f3490ab0cb9127981792dec129429295
@@ -19,20 +20,21 @@ DIST portage-2.2_pre7.tar.bz2 566688 RMD160 cef3093abd478c5abdb41f004cd1e89c8f32
 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
-EBUILD portage-2.0.51.22-r3.ebuild 5693 RMD160 85e119fa96f372b25ae327c8e49fb3f7d8a056db SHA1 4bb6346c67ae4746b98f5e5ec00ec74bbdd323b4 SHA256 ba0500de044c12abcaaaac03a61f91c0dd278cb7f8b2516c7352a8ae86eef2c4
-EBUILD portage-2.1.1-r2.ebuild 7170 RMD160 9a9ea70cce0cc5c21ccf67faee9c9d75065d6f57 SHA1 33ca63714b9e013a4d6a2cf1e52fb9b62f1cc6bf SHA256 3c3c6eb2c2fabeb84f58ebd71b39148899d529b4fc0a95ba5cb31d9dbf239f44
-EBUILD portage-2.1.4.4.ebuild 8116 RMD160 ac80146c73a0024c6634e4f0e0e29171e4c23a74 SHA1 0b3a9d88a7cdeed816cd35198d7e0240f5a8929f SHA256 3d9683bdcfb75c83d0f028d3a9f4f3e4ad7fc65b26dab56859c6143795bc8ce3
-EBUILD portage-2.1.5.2.ebuild 8164 RMD160 bcc614b83ac4b0801149a1100bbeb19a071682c6 SHA1 dffd0ad6169894d058bc0d4c9c576613497e838f SHA256 f1bc52bf582b4f96e1e7918027ba74838db9e83a75d68c2e2eeed1d0245d7c2e
+EBUILD portage-2.0.51.22-r3.ebuild 5645 RMD160 aa9a32e18b1190c809eca4bf780d7a33acc18459 SHA1 e62b7740112bba2ec367a83be7c7318403559735 SHA256 121f16d7a18818a9f5f93990170fb27f4510d91537c3150c40e85f3717c00899
+EBUILD portage-2.1.1-r2.ebuild 7131 RMD160 17e776429c7fa50a687660b44f0ed9fef7ae0a66 SHA1 957c90e2a19c6b961a6a817d368b42f18abecf04 SHA256 aa2cfb822e7bfc79829359650c1a8259635db72a47ff12976bbcfcc7cc416bea
+EBUILD portage-2.1.4.4.ebuild 8040 RMD160 a7503dd4cc751c71b9fc01b23b34c6a544c84355 SHA1 2079cbf4ad68622c340ab6971e3e01bc73a4781a SHA256 0b00f1d93651606931d3b6e6addd9fe70183f6d7a8127146d48e093b00ff6198
+EBUILD portage-2.1.5.2.ebuild 8087 RMD160 5196b1827b4dbf29df261ed5bc8ebf7488e07ff3 SHA1 4f6aad85bcec330fa72e082c9ab9cf56ca4f801a SHA256 aa96d9d1fa9ca4efba5866b482ca7becc803471513167c6eb0af47446a7290d4
+EBUILD portage-2.1.5.3.ebuild 8087 RMD160 130477155ce01c4af911567778b99635c6b90192 SHA1 6739f888abced79fb4ca6894b8d6216cd7fe3461 SHA256 033341ce04f44a30cf33bb7a56cf61faeef239ed8573544d051bcf61d752e2f3
 EBUILD portage-2.2_pre3.ebuild 7491 RMD160 bd097774df3370e64b5b5e2d23e1294a4b07cd0a SHA1 eeaa78440e2696df964b850715f9a37589218514 SHA256 50689ab89fc69b25959fb957422f6ae3ead83b344250bb999a5949ba43a3e3dc
 EBUILD portage-2.2_pre5.ebuild 7491 RMD160 5c03122f260d5e71b912568a6dcd38f3b4c12222 SHA1 4f0040a9e1d569d20dec21b2feac2e5e4fdb9e1b SHA256 93025f91854f01dd9f53200900775b206c9ab23bf088cee8819e925cddc5a720
 EBUILD portage-2.2_pre6.ebuild 8140 RMD160 55d18a4ff98551758f37276d80978e8a8b5950f6 SHA1 ad286a54420ccf9a94b37c918bffd67ef29ce40b SHA256 27b49a9852a1c953cb3f06d3dbe8179fbc83d1b06891d6ca5c0907b0276451c6
 EBUILD portage-2.2_pre7.ebuild 7946 RMD160 58991e9ea9b0ebbb41bc421553ee8a14387e0050 SHA1 faff7a6e8adca3eecabd09ba831fa51236ceebec SHA256 7d6115afbfb541039e11121ca467ff79ea371d3da73e381f9660f841789d4f81
-MISC ChangeLog 7895 RMD160 c68d3705028ce09d8ba79c33c3da9caabf6ddfbf SHA1 d6e8f23a84befe227ff695020d6f46f102c26509 SHA256 09bcd45c69654cb2b221d79b908e92185971b4283df6fb4f241e04501eb7d353
+MISC ChangeLog 8229 RMD160 435268045c21b650ca3da2cf3513aafdbaffe86f SHA1 4f6155ed55447fb1a2e460071df54e970ff9e4cc SHA256 79ab61ca72d05a1c22a21e9f1157e4746447a30f07cb3f4cdfbda07163855ee9
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+75IACgkQQU4yORhF8iBQ7QCfWWKfZx7YcpAE7uo9o4p7evJg
-/6kAoIhKyONUaAJ+asctusyR5vXx7CNA
-=L3BY
+iEYEARECAAYFAkhCej4ACgkQ/ejvha5XGaM3ZwCbB4CuIiFAaBrRpLHm7R32oquD
+nFMAoIbQiiMQrS6Y+k/qi0HF39Wq9oUP
+=wzmv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51.22-r3.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
index 4e1f155aff94..e292649907e1 100644
--- a/sys-apps/portage/portage-2.0.51.22-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.13 2008/01/12 03:50:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.14 2008/06/01 10:30:18 zmedico Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -15,7 +15,6 @@ SLOT="0"
 IUSE="build doc selinux"
 DEPEND=">=dev-lang/python-2.2.1"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) !x86-fbsd? ( !mips? ( >=sys-apps/sandbox-1.2.17 ) ) selinux? ( >=dev-python/python-selinux-2.15 )"
-PDEPEND="doc? ( app-portage/portage-manpages )"
 PROVIDE="virtual/portage"
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/sys-apps/portage/portage-2.1.1-r2.ebuild b/sys-apps/portage/portage-2.1.1-r2.ebuild
index f87914264fb2..4933dfa35c59 100644
--- a/sys-apps/portage/portage-2.1.1-r2.ebuild
+++ b/sys-apps/portage/portage-2.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.16 2008/01/12 03:50:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1-r2.ebuild,v 1.17 2008/06/01 10:30:18 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -24,7 +24,6 @@ RDEPEND=">=dev-lang/python-2.3
 	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
 	!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"
 
diff --git a/sys-apps/portage/portage-2.1.4.4.ebuild b/sys-apps/portage/portage-2.1.4.4.ebuild
index 980fe8bb3319..a4f5975a648c 100644
--- a/sys-apps/portage/portage-2.1.4.4.ebuild
+++ b/sys-apps/portage/portage-2.1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.4.4.ebuild,v 1.8 2008/02/18 09:51:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.4.4.ebuild,v 1.9 2008/06/01 10:30:18 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
@@ -24,9 +24,6 @@ RDEPEND=">=dev-lang/python-2.4
 	>=app-misc/pax-utils-0.1.13
 	selinux? ( >=dev-python/python-selinux-2.16 )"
 PDEPEND="
-	doc? (
-		|| ( app-portage/eclass-manpages app-portage/portage-manpages )
-	)
 	!build? (
 		>=net-misc/rsync-2.6.4
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
diff --git a/sys-apps/portage/portage-2.1.5.2.ebuild b/sys-apps/portage/portage-2.1.5.2.ebuild
index 92b5904568b7..958feb1f5f66 100644
--- a/sys-apps/portage/portage-2.1.5.2.ebuild
+++ b/sys-apps/portage/portage-2.1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5.2.ebuild,v 1.1 2008/05/20 19:23:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5.2.ebuild,v 1.2 2008/06/01 10:30:18 zmedico Exp $
 
 inherit eutils multilib
 
@@ -24,9 +24,6 @@ RDEPEND=">=dev-lang/python-2.4
 	>=app-misc/pax-utils-0.1.13
 	selinux? ( >=dev-python/python-selinux-2.16 )"
 PDEPEND="
-	doc? (
-		|| ( app-portage/eclass-manpages app-portage/portage-manpages )
-	)
 	!build? (
 		>=net-misc/rsync-2.6.4
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
diff --git a/sys-apps/portage/portage-2.1.5.3.ebuild b/sys-apps/portage/portage-2.1.5.3.ebuild
new file mode 100644
index 000000000000..56ba139a99ee
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.5.3.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5.3.ebuild,v 1.1 2008/06/01 10:30:18 zmedico Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Portage is the 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"
+IUSE="build doc epydoc selinux linguas_pl"
+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
+		>=app-shells/bash-3.2_p17 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	>=app-misc/pax-utils-0.1.13
+	selinux? ( >=dev-python/python-selinux-2.16 )"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		|| ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 )
+	)"
+# 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.5"
+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="${PV}"
+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() {
+	cd "${S}"/src
+
+	if use doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		sed -i "s/svn-trunk/${PVR}/" fragment/version
+		make xhtml 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 --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 *
+	dosym newins ${portage_base}/bin/donewins
+
+	local mydir
+	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
+	local x
+	for x in ebuild emerge portageq repoman 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() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		has_version '>=dev-lang/python-2.5' ; then
+		if ! built_with_use '>=dev-lang/python-2.5' ssl ; then
+			echo "If you are a Gentoo developer and you plan to" \
+			"commit ebuilds with this system then please install" \
+			"pycrypto or enable python's ssl USE flag in order" \
+			"to enable RMD160 hash support. See bug #198398 for" \
+			"more information." | \
+			fmt -w 70 | while read line ; do ewarn "${line}" ; done
+		fi
+	fi
+	local portage_base="/usr/$(get_libdir)/portage"
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf "${D}"/${portage_base}/pym/*
+		rm -rf "${D}"/${portage_base}/bin/*
+	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
+
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+
+	echo "The metadata-transfer feature is now disabled" \
+		"by default. This disables the \"Updating Portage cache\"" \
+		"routine that used to run at the tail end of each" \
+		"\`emerge --sync\` operation. If you use something" \
+		"like the sqlite module and want to keep all metadata" \
+		"in that format alone (useful for querying), enable" \
+		"FEATURES=\"metadata-transfer\" in make.conf. You should" \
+		"also enable FEATURES=\"metadata-transfer\" if you have" \
+		"any eclasses from PORTDIR_OVERLAY that override eclasses" \
+		"from PORTDIR (in this case, you may have disabled" \
+		"a relevant warning message by setting" \
+		"PORTAGE_ECLASS_WARNING_ENABLE=\"0\" in make.conf)." \
+		| fmt -w 75 | while read x ; do elog "$x" ; done
+
+	portage_docs
+}
+
+pkg_postrm() {
+	remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+}
+
+compile_all_python_bytecodes() {
+	python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+	python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+}
+
+remove_orphan_python_bytecodes() {
+	[[ -d ${1} ]] || return
+	find "${1}" -name '*.py[co]' -print0 | \
+	while read -d $'\0' f ; do
+		src_py=${f%[co]}
+		[[ -f ${src_py} ]] && continue
+		rm -f "${src_py}"[co]
+	done
+}