2.1.11.52 version bump. This fixes bug #457142 (regression in 2.1.11.51 and

2.2.0_alpha162 which triggers slot conflicts involving built slot-operator
dependencies) and bug #457034 (repoman warning if FEATURES=sign is not enabled
for commit. Bug #456888 tracks all bugs fixed since portage-2.1.11.50.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 295 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index b47240a96cd0..aa0adc2d9b76 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1200 2013/02/12 04:10:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1201 2013/02/14 06:03:38 zmedico Exp $
+
+*portage-2.1.11.52 (14 Feb 2013)
+
+  14 Feb 2013; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.52.ebuild:
+  2.1.11.52 version bump. This fixes bug #457142 (regression in 2.1.11.51 and
+  2.2.0_alpha162 which triggers slot conflicts involving built slot-operator
+  dependencies) and bug #457034 (repoman warning if FEATURES=sign is not enabled
+  for commit. Bug #456888 tracks all bugs fixed since portage-2.1.11.50.
 
 *portage-2.2.0_alpha162 (12 Feb 2013)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0807c5ae1ca7..b94002ab832f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,6 +5,7 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 DIST portage-2.1.11.31.tar.bz2 848585 SHA256 3013e9ba1fc3f87a5fedff8e5a1d2b36d6a9e06538fdebee6ab7b4cf61d273ce SHA512 12222ecb8e3f3b239c7616568475d87f2ef705b83cb72311c0d70df49c7eef1f1bb4e898afb6f17023b40077a80f9ae26129aef0a52f9f16e22140e5ea8d8522 WHIRLPOOL b3d3b0fc90476c6bd6c41a1dea17999ca21598db547c8e691fdd378e9bbacb991954f03378a033755008d7bc27d15b2505f62e6408ec914e840ead4edc0a5c9a
 DIST portage-2.1.11.50.tar.bz2 895469 SHA256 39f61e4f2256cbc9f7b6e5da9d6eeb43ff16fd674d7304a7b280ff84d8835110 SHA512 4d313e62ee250b852950ebfd2bb8edf465f56d8e6b9f473b0c55b3856755ad4cb6c6875ab067ca2978c4a0cc75ad6583dc14425b5b4fcf096e72797bc5271a8c WHIRLPOOL cf0b2212eda9c78a8e57f37570dc87a0af0f11ea7b9b79938e7ac78b2196283880571e8bd000c35d665e5188500064aa5065dc7b5a2d0de21c9b8e4d54a2bfec
 DIST portage-2.1.11.51.tar.bz2 902040 SHA256 97436abf77919f92f2475c28cf4e5f313e75b7e9bf4d5acbbc91e5d27b5233c4 SHA512 c8a3348b3374d5e446d47c394d308a865dc0387959bc244d421104ab9f0862cb920f043f2a69d53b99787a6e75149aae00e2bb6370e8ef806c7632248f59ca44 WHIRLPOOL 2154958cd8392903da060c214348f955eb6b19c700c4832473850a79ad03acc3d125bf5089888a065c4d2331ab5e5c46f65a3a5e9cf234d2b6391b7405af8819
+DIST portage-2.1.11.52.tar.bz2 903416 SHA256 30f5985f1a92137bfc1399bf6d7a3a32548dedc011d1c694bd0de0bf8ac62882 SHA512 d3d779c29b9b79c4581f64645739b5b1f2d5e8f1590013026908eb90f905a37390501e3de61d0c24cf73c2b5aad06369249604de2755f9ec1503170fe37c6879 WHIRLPOOL d97848f23a5d6d2b2dd789dc440acef57de2b343708e8b053471ef80eece040ad430bb7a845754769a5359314211686abbc55b556dd63eb50f64e53b30b3baf9
 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
 DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 SHA512 d035f84601802ecaea3c0edea037a783fec743733bd40895eb5bb8a220449eb24cf1e2623cbca2e378197caba63a833d8cc54f1e49d886266307288b0adcfbdc WHIRLPOOL 25b6a6e3810f428c630ec7a6dc3cf2cfbe6bfdf276553786e1436b2630532ab442186e427bc75f249a224c5171b508a92303ce352b07be1a8a4d805c568ec10f
@@ -16,18 +17,19 @@ DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e8846
 EBUILD portage-2.1.11.31.ebuild 9545 SHA256 30ce187ab37c32af45c1b6a1063762bafcb5a32643573db5e940f2a8e4b22ac3 SHA512 95ea9c60edcb93f4f5e0a0bd1f6e10dc568e02c78f48d8170f13730ee17eee47a6af7de9fcdda771e8e98cdfe75e74773c1a2094de2d6e01c11fbb4f24523fe4 WHIRLPOOL e8e64368a5c12d3480e1a294e605c65ddac8ae5436855d3a6aa36104ef456125c82fb24b42658f388723491384254c25a6d4469a9908d79fa88cd68bb0397dd0
 EBUILD portage-2.1.11.50.ebuild 9616 SHA256 0eaf9eaa380ebf11043b1c030868bf10b79899728a4d18ca5cb5889857024dd3 SHA512 95c10ce269a8c31ee0e00bcde04cfc352a2afbac6d1c90eb77f18e0fdae226107281d47cbfc11e84fc12b8a7b5e64e0cf2098d5eea2cdfd34254c944cb9e4f39 WHIRLPOOL b8ec608c2f1eaa4478b999a3594c03e6b5c0c6523c8bf88a5aeef8b8343d6d70c3d577b5dfcca187d3a7438b99bfce9584489b8fb2b94696e8e2a041907a8a2e
 EBUILD portage-2.1.11.51.ebuild 9581 SHA256 5691f036049189f8872737906c779709d03166a6bfe98b54768db6d2a1cc388b SHA512 45509f55dc2bae338dc0396b9abff6c5805d04c7701984515b8d413ab5630fe9ae2649fef4a119a152839ac6782195d72297aae1922e1cca419bfd565561470f WHIRLPOOL 783e90556dbd4ad0d7a3b8664838bcca7b92fdb2834b6a57fbf26ce934fa0bb7a579a547749cf10816cbcf5d6f48e07b3194db543bb097ef7f025a2187f9106a
+EBUILD portage-2.1.11.52.ebuild 9581 SHA256 ce8435e22997d8a973828f29ee27dbd126518620fe564364158affd2e5e50d30 SHA512 3d21913ed8c530d90d3726ec6735ab8f7eac114876a19fa5fade6a688c89e77c8884ca32df51344da702d3d9baaa82f31961d1996e9b96719598b4ce6b4b1f4e WHIRLPOOL 22c370baa0c2cc27ce4e40f103c9ec0b64e3fb9ff8ff63b7276d846a6a999d0a5afc0473f2bcd6457045d478f619e16eb371f50588440cd396fcfc653a6e3547
 EBUILD portage-2.1.6.7_p1.ebuild 8391 SHA256 aa62c9abf35aa31026863d881fcc47eab499992fa290a4aeda39435289358c94 SHA512 f5c66cf066f6096c930a25825314837b214d9c23386f62af8ee4f50b92c8878765ce81274a5335b5f45c8707849ecd3ca5dedb466af7dbbd2744cd356ab7bcbc WHIRLPOOL 6eca21d68dc0ad96d0ab6c9bb84b14dd21100cd48a7531305fa63a1276a1d90ddda33724c32d695632215da338aa91fba412b2f398d2d1ee91fd730d4678484d
 EBUILD portage-2.2.0_alpha142.ebuild 11658 SHA256 73168521f83cf15d0530c02adfbee47243681f68430f7c551d671592fdb41d84 SHA512 6c7c1fa8cb48d1a85d1fec24e51b617f89974bf1f595b3b98d5d07050fc9b55deabc8194a7fed1e10748395076ff2283227f789d22f04f336c1fa9c776f5e33b WHIRLPOOL de0f13cb843772089331023fd27e77fb785fbcca1d93b7a36f88d1d8a917d464b09d0c8f69b0f0e05c725b728ab699d9d20df34703ae4704d513b737d09eac74
 EBUILD portage-2.2.0_alpha161.ebuild 11732 SHA256 2373fb4a1532e91215921cf0102d20bf25a8d15a3b0c86ba0d4b6d393ac01c49 SHA512 508211398d45dc1bf8e1a78dde95480004486cf673b2f6572589c15ed480924eb0d15c0f89fbee2e7c8ee20db918150887b5b4a3da7753ef306864407f0e3c44 WHIRLPOOL b264cd8892a8a315cfcb27c1d723b41dffeada402d074d34f50ca0419bc0dc895b06e0a08496de19edc30b22696fa4309816b5dbf0ab7a0eca548716e681f2a0
 EBUILD portage-2.2.0_alpha162.ebuild 11683 SHA256 e322bea31bb7553c50a86d917d15b0a5b7cc30cbef62701f07a51eb48101d20a SHA512 af20eb2ca900115eb623c3b8bafd0b940bd33d28d0ba40c1825eb9eb0fa8c7afce6986eec6c04aa24982f6e20a3c17d76b5663b8b1cf90dd6f9de5118abaa966 WHIRLPOOL 9de93bdebeaed30290284d0f111bac9a8df37f993df47b9859b5c4925886a2b31518adf2d27b6667197cdfb7c5a6b1be4654e3cf0b525e18b48fe014ce57c190
 EBUILD portage-9999.ebuild 10933 SHA256 df8bfc4843071ca9f6f93db097ade40fa89b12d269a75df36e24b88d5c63b96b SHA512 f223651769423b7a3d5e74435b9e4b98ec11ad03045777449783633cb11fcaf2047c64714a613e92fc6d9d55c0ab7d62142148d10eaccdcb924a7d09b0a04b26 WHIRLPOOL c28ae296f4c92cc4d6fbf265d21e2980618c02863aaece2d17695fe860f634c5102b0c180b27bf1af23930980d8503a400569d5cbe4435a3f259f25c6e03528c
-MISC ChangeLog 12251 SHA256 7b91a6695b6237d2720a24105d45b239e84c4093d9cb1b27ab5e49b8a5d21c09 SHA512 d60fb5a7fd2dbc79b38534ea4e052b7de465cd4d385e70a454f06c014f92130cc331d41b720e46a2eec0c509d0bf44680a3930312429aff47f9b1e50c0997773 WHIRLPOOL c531715bce33959e2f10df02c20b34d1540b327dab28a9d7fdfb861822e2db0567ea732fe6bf8c926d29783774bd9cee2bbee1af8bcbff9ed3a68527d456e596
+MISC ChangeLog 12669 SHA256 4a18ea62a089812d0d32b6563ffe7bf7f3490e84baf26b5e669e8e895ec40190 SHA512 5e0a5f34ca7729e48250713c043e2ebc284e6abebb28f8348364da1c417fef8f8b69fac19c9258af4341e9751fc23f89c52f065017b12d3b1149ebbeae3971bb WHIRLPOOL 8fc28a3a650fd97bf5b87529fc91616219f451fef8c126d7a3712e1ea20f5d1f41d363ce5449c842527dbf3d723e348b5f043b64c2d10e92d55799400c2ae72c
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 926 SHA256 8736b6884463a876892a4fd45f6239a123c1229d2372ce47d5dff719f0eba2b9 SHA512 38d3c969b49012a94bfadecd1d48936513391a305eee5e5e55eb6c4a6b82e05b6ebf1dd6dfe6fbb5a96ba5fffc33fddcfda8d41f3d367ff4ad030859a655ef8b WHIRLPOOL 6f9afcacb628f75f84d03e812ed93b4e3613fcfc4e1180bcb0551c1c8025050ebd3b21fcdef79358aaad3606558345fcd6f914928eb62155e5b9a50bde0d3bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEZwM8ACgkQ/ejvha5XGaOIZgCfTlZf0qMESub6dJ7G7Y6+YqKA
-NUoAmwRbi/nzFKLEMAXQWolEqz73nRKk
-=SZT/
+iEYEAREIAAYFAlEcfjsACgkQ/ejvha5XGaMKsgCeMfeKKBHfYqgWDq12rkXvoVI7
+n0kAnRX5I0qBvpTgF62dslUJ8z7cXXTy
+=1Lzw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.52.ebuild b/sys-apps/portage/portage-2.1.11.52.ebuild
new file mode 100644
index 000000000000..4ff69d439b92
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.11.52.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2013 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.52.ebuild,v 1.1 2013/02/14 06:03:38 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 linguas_ru pypy2_0 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] )
+	!pypy2_0? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[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.
+# make-3.82 is for bug #455858
+DEPEND="${python_dep}
+	>=sys-devel/make-3.82
+	>=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).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=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=installsources 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 pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy2_0 && ! 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 pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
+	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 $(find man -type f) || \
+		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 pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
+	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
+
+	# Extended set config is currently disabled in portage-2.1.x.
+	rm -rf "${D}/usr/share/portage/config/sets" || 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 [[ -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
+}