2.1.11.14 version bump. This fixes bug #380551 (note in dispatch-conf.conf

to install rcs if necessary), bug #400641 (ignore ENOTDIR when removing temp
dirs), bug #416917 (add etc-update --quiet option), and bug #423403 (update
pkg_nofetch description in ebuild.5 man page). Bug #431026 tracks all bugs
fixed since portage-2.1.11.9.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

3 files changed, 299 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index ff0708032878..4a5594926fdf 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1087 2012/09/06 17:43:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1088 2012/09/08 23:45:50 zmedico Exp $
+
+*portage-2.1.11.14 (08 Sep 2012)
+
+  08 Sep 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.14.ebuild:
+  2.1.11.14 version bump. This fixes bug #380551 (note in dispatch-conf.conf to
+  install rcs if necessary), bug #400641 (ignore ENOTDIR when removing temp
+  dirs), bug #416917 (add etc-update --quiet option), and bug #423403 (update
+  pkg_nofetch description in ebuild.5 man page). Bug #431026 tracks all bugs
+  fixed since portage-2.1.11.9.
 
   06 Sep 2012; Zac Medico <zmedico@gentoo.org> -portage-2.1.11.12-r2.ebuild,
   -portage-2.2.0_alpha123-r2.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7dd40b0d19ac..2241b6b102d1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.1.11.13.tar.bz2 815127 SHA256 488667f639140c9285e52cc5ffda21fc0109df31fb75cd3f9afd74149fd9e386 SHA512 5c22c77c365ebe6622836884fbdda37ef9a6979490873913673168845a44712c571eca5f240d9e08ef508460f57145087f62edb074a128201ab04e4b63d1891b WHIRLPOOL 5cfba9ac6d95aa7ed9a2e668a0a2c564149245511af35060b66715de5579d65afb550bd8fd943b90f9d5e2fda95c5a92aa2043ed44df20744be52a39ed6bea7b
+DIST portage-2.1.11.14.tar.bz2 817003 SHA256 1c5fd7a68e7317ea6202431af527844bb21f9b9f9423454a9a9eca2b6e92758a SHA512 7d4391f8f5484aab815d08a5233f5bc5fed944a1501a14ef62a9864f825da222edd54ab441469d4eab13f85b29dad7354c87d268321d0a330b22ed76cf1e2d88 WHIRLPOOL ea2df719251fa92ad834fd96939895a5122901a96610ad8580cc638425c7fb88073721c4a5d1770bc12a43c97d3aafd54555862f55aaf2ca2a03c388a844b72e
 DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
@@ -12,17 +13,18 @@ DIST portage-2.2.0_alpha120.patch.bz2 33973 SHA256 24a5447e9af37013e30c3372e3eef
 DIST portage-2.2.0_alpha124.tar.bz2 814900 SHA256 1734aa790f341eb6a5854caaa7625e3a313715695ff9086dbe258c11b4a2cd59 SHA512 f37d94464232c871e89038a5a4effdf4cc07f48766ccf5f14ee9b7be211e80ed9164819ff8c82d55012a27a28d39f397966845abcdbc898c95f46e0ce8520b86 WHIRLPOOL 4bed04745a6d6489cdb6c7747cbdee63af408069c407e973a9aca6e0af6c81738cd01b2e7b8097e4824aac9afeaa48233c71f3cea1246fccae3d0b90709166d6
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
 EBUILD portage-2.1.11.13.ebuild 9673 SHA256 06ebc321f275230d9b7cdc7ec4818a24c80260a85b09088eb58199f612fefaf2 SHA512 ccf3d0b7f65538fe486c25278253a903078e5606165647ca44bc6dc91a4af02159b85c5ef783273608e137cac873b38c7062155b0fcfa25a7d16b4df9145dc91 WHIRLPOOL 8d93b5997bdf3bf9a5a1051cfdb1df51f4c5eca9fe9667082dae71a468ba53113ca102ff883838da042577b53581c693d63d966cd98836527b9dddcab9d15b60
+EBUILD portage-2.1.11.14.ebuild 9673 SHA256 c05bba4f7371ef3a40d76b3b70b4a946b09e4f311f9411ebb0c6dd67e6c9010a SHA512 3b8a7b1be6a2cc4bdc2ef04d998443e1dac4946e163e151aa430d393560f688738597c9f7355d010a19c580f3085c5456958224857f24f2046f89fe6d5fadf30 WHIRLPOOL ff3b081a8408986c6fb9ccb584373a33a8bb46246a9a6b979a51e93b8456cb0192266def796c8b72ce45e06a692f9c4f22918e74703e544b42520ac405fbb760
 EBUILD portage-2.1.11.9.ebuild 9833 SHA256 4b4e3df3e35a4cfba3fd3134d1dc16514e382af4474a42c925fae058440c197c SHA512 9cc3b74e87904575b7646cc1de33cadb249d7b1b03d6e3dda94a347c2ed27291d217ebcb4410cd520551289830d69c8a80a2a9a739c883a11cc9e8693f5c8335 WHIRLPOOL 4031694d504fa820b9470204d6d3297de7e98c5a6b087967977db0190326c0b6d52d611af4f3086f66a04eafa08edd277c259e4257d2ce7997a704533359c44f
 EBUILD portage-2.1.6.7_p1.ebuild 8392 SHA256 75dfa3bdb1100ca28ba46eb83e34ffc196cb3e57204e7b4f451cfb19a1644e62 SHA512 ac70b4ba9d658c4d79953088b2fdaeed8d0e31986ff7c649272c39a743ddfdf112e44d3f0f8078941c47a06b373002cfcd454100585d5bbaa807a2079b19eb8c WHIRLPOOL 57c26b40de86f3d6969fe66d5b1fd6df55f5478e03c855813ff83b1e485f99d1b34cbf30422b5b60986263cae4d4ee066daaa01c0166a04f53c7bb829fd214e1
 EBUILD portage-2.2.0_alpha120.ebuild 11951 SHA256 9530b793174de796ecf951a2808cb163005b605630b0455c57194e97f2a36dd2 SHA512 f6af265d8d9b1cbf884787105abb32335727c179d904fbdecba598878083f7384088a5db063aee4282afd4daa4d20f02466911d6c5625bf538c7cdb437026866 WHIRLPOOL 93daa1caa5b31023b1fbb11e8baabf1abced715c879acdc1bb578f75dc58d3737e23bba2c9fa3bd69702810640e47a1debbf3464d16db7a6f68a3d37799b3b76
 EBUILD portage-2.2.0_alpha124.ebuild 11774 SHA256 49f5aa234fe436575aec2e077e7da04aa9e9eef80df2ab19d0cbb1d23d25281a SHA512 1851aeec9dbc4eb00cdb849396c8dd6b6dc6ac2485fbd7edcdedd09b39ac4af5fef2a981178b9dbb8ff2c37a25e36f403a31e040788a8106dfc08b36d01d5e33 WHIRLPOOL bb0c6af9b622d064981eaf7e59bba5379210bdfbaf2e28c35b13124ffbaf93308f5445e4b96cd0600a96b1a7d53dd7d7bd62ef7f45e2f5783f95189600fb1b77
 EBUILD portage-9999.ebuild 11024 SHA256 08e1c594ca54d46a18b231a46416425186a5f21d2bbbd2edac55d775818ea8b2 SHA512 ddc74357dfd1d6fc9f48259e10bcf97dea69cc475404071b91da269798d474bd930d71f793145ea263ea6e0c2369a94f857f6b3976a41f70e17934440f3920af WHIRLPOOL a63765e46e7b530448c20dec5cb9e4029b34b5f7667accf8bbdef2ae0a783db7adf85ba31048e66fc8f14515168b2b51f77a8cbaa84a5f50bab6a0e991f6403c
-MISC ChangeLog 113314 SHA256 9a35a0888c5939ebafda1ae77565f3cc6d0b2842b2db4bc6c34c352580ece2d8 SHA512 c053925b2eaf50f20fb4a2aeca3a9a376b83fdb24452009cec7d20bc64126e07673db70ed426787a29bba11a717a0958e991fae4ef4d81ffaf303603daabdd2c WHIRLPOOL 517966f2f7cff6122264634d23c2a6a31ce927c6f66cc03df4569acd1d120ce7392c0f15b887b961c86b4942b798d984a1dd3b76e8a6c3846f3f0d8060d26a53
+MISC ChangeLog 113766 SHA256 3d2332272a8858cff04ef1af3710533225d2fba5f285f0f1a0878f1038bb10ac SHA512 a45aa346a621f00c6c6cec2ee02b11c5f5783026de06962ff54b3e8d671279d72e4bdc2474023fbc026a76f107b5359e411e7f6e153e0c2cbe0a5e1b811d548d WHIRLPOOL e47566c3d2fd80ae7adfb87a9b986741064e4af270c375bc2f3ed697e846777125a307e37b0b3184d98adc500ec02bf0c75b95f34ff1cdd963ecd0fcf756ce4a
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBI4N4ACgkQ/ejvha5XGaPlfgCgx4N8t/uHkGDy6kCeqMB4hvr2
-ZAEAnRvtHwz4OKnSIK8x3hilWFz4bME0
-=yY1x
+iEYEAREIAAYFAlBL2LUACgkQ/ejvha5XGaN+kgCgxynBxxNDvQ/6+m/gDgTCer0k
+0i4An14hH+9NcJSD38JSwwG1JsuxDolq
+=zXHx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.14.ebuild b/sys-apps/portage/portage-2.1.11.14.ebuild
new file mode 100644
index 000000000000..f3633a809f1c
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.11.14.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.14.ebuild,v 1.1 2012/09/08 23:45:50 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils python
+
+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 ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy1_9? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+python_dep="${python_dep_ssl//\[ssl\]}"
+python_dep="${python_dep//,ssl}"
+python_dep="${python_dep//ssl,}"
+
+# The pysqlite blocker is for bug #282760.
+DEPEND="${python_dep}
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=$PV
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	/usr/bin/python -c 'import xattr' 2>/dev/null
+}
+
+pkg_setup() {
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python3 ; then
+		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python2 ; then
+		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in /usr/bin/python2.* ; do
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	elif use pypy1_9; then
+		python_set_active_version 2.7-pypy-1.9
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use pypy1_9; then
+		einfo "Converting shebangs for pypy-c1.9..."
+		python_convert_shebangs -r 2.7-pypy-1.9 .
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch 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 ""
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="/etc" \
+		prefix="/usr" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
+	fi
+
+	# Set PYTHONPATH for portage API consumers. This way we don't have
+	# to rely on patched python having the correct path, since it has
+	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
+	echo "PYTHONPATH=/usr/lib/portage/pym" > \
+		"${T}/05portage" || die
+	doenvd "${T}/05portage" || die
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$D" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+
+	if [[ -d ${ROOT}var/log/portage && \
+		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
+		has_version '<sys-apps/portage-2.1.10.11' ; then
+		# Initialize permissions for bug #378451 and bug #377177, since older
+		# portage does not create /var/log/portage with the desired default
+		# permissions.
+		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+		chown portage:portage "${ROOT}var/log/portage"
+		chmod g+ws "${ROOT}var/log/portage"
+	fi
+
+	if has_version '<sys-apps/portage-2.1.10.61' ; then
+		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
+		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
+		ewarn "files that have not been modified since they were installed."
+	fi
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/lib/portage/pym
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/portage/pym
+}