2.1.11.50 version bump. This fixes bug #453892 ('TypeError: must

be char, not unicode' exception with Python 2 when renaming files during
merge), a regression since 2.1.11.44 and 2.2.0_alpha155.
Bug #445274 tracks all bugs fixed since portage-2.1.11.31.

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

4 files changed, 17 insertions, 297 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 69dde561bce9..09dd88c6f65c 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # 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.1182 2013/01/24 02:07:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1183 2013/01/24 22:12:26 zmedico Exp $
+
+*portage-2.1.11.50 (24 Jan 2013)
+
+  24 Jan 2013; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.50.ebuild,
+  -portage-2.1.11.48.ebuild, -portage-2.1.11.49.ebuild:
+  2.1.11.50 version bump. This fixes bug #453892 ('TypeError: must be char, not
+  unicode' exception with Python 2 when renaming files during merge), a
+  regression since 2.1.11.44 and 2.2.0_alpha155. Bug #445274 tracks all bugs
+  fixed since portage-2.1.11.31.
 
 *portage-2.2.0_alpha160 (24 Jan 2013)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a1696406e7a1..54755231a4b4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,8 +3,7 @@ Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.1.11.31.tar.bz2 848585 SHA256 3013e9ba1fc3f87a5fedff8e5a1d2b36d6a9e06538fdebee6ab7b4cf61d273ce SHA512 12222ecb8e3f3b239c7616568475d87f2ef705b83cb72311c0d70df49c7eef1f1bb4e898afb6f17023b40077a80f9ae26129aef0a52f9f16e22140e5ea8d8522 WHIRLPOOL b3d3b0fc90476c6bd6c41a1dea17999ca21598db547c8e691fdd378e9bbacb991954f03378a033755008d7bc27d15b2505f62e6408ec914e840ead4edc0a5c9a
-DIST portage-2.1.11.48.tar.bz2 894077 SHA256 8c673b2ff29ad4eb2494de7ea186213bcc2fd3863f2a26f45d8949aaa54ff9ac SHA512 14bad553c502f6b407b711c38912fbb6228216e8a1568adfa1e23cf00bd7e88675c6a136062b506f02f81a69cf575415b18d570ce6645607942b8ab01aac2702 WHIRLPOOL e67b58755a5d9286b522fb9846c28968009717d3482d78dbb74d6b9ae9e718c5ea9bcc661362d4c755542fd87fa1c2339c2fa8e5f139b98af60afda68012c36a
-DIST portage-2.1.11.49.tar.bz2 895047 SHA256 ff8210f15a3e7d7086336ac7cc025a672d82083699f9ccbd4d383fedd15bb715 SHA512 68a675dbf1cfe108b3ea6439510950c5b502161ef5d7ae220e4410273aea040e71908fd8aa61c40b56b8301c9507b2441b4a444f8d3dbcef596847e6a8b26a9f WHIRLPOOL 53bc70404db5051afc42731baa0f225c4f0d7b4ecb6212569d26f46b1c27cf70ebe67993a84356a8fa7406b34139cc22d3beb5c63812f1728c0d568283ac22ba
+DIST portage-2.1.11.50.tar.bz2 895469 SHA256 39f61e4f2256cbc9f7b6e5da9d6eeb43ff16fd674d7304a7b280ff84d8835110 SHA512 4d313e62ee250b852950ebfd2bb8edf465f56d8e6b9f473b0c55b3856755ad4cb6c6875ab067ca2978c4a0cc75ad6583dc14425b5b4fcf096e72797bc5271a8c WHIRLPOOL cf0b2212eda9c78a8e57f37570dc87a0af0f11ea7b9b79938e7ac78b2196283880571e8bd000c35d665e5188500064aa5065dc7b5a2d0de21c9b8e4d54a2bfec
 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
@@ -14,20 +13,19 @@ DIST portage-2.2.0_alpha159.patch.bz2 5338 SHA256 04f6d3c53505343575525ad8b40998
 DIST portage-2.2.0_alpha160.tar.bz2 895123 SHA256 25741e1a0cb2169008a20a3eda99666223694f1a046b3ed26ef43246f77acc84 SHA512 bfaf840c56d088a57211fcb6a7e78279f9980078dc0d199828a6cd663fe3801b76a0375ba4cfe00c4455fe822a40d104b3424608751d85f577824cdc03605b35 WHIRLPOOL e3c4a8f9a484e42c30319fe842807557e2953c4bf6c8849a639b6b908044f84f7283f18dd260cd3d8ce5c8ef1f037fa51b67d08c062b76f8267d76ab83f2f6d0
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
 EBUILD portage-2.1.11.31.ebuild 9906 SHA256 5d22a8861ce3655199cb139f90910c04363d5d95252f150d5936d566f3f67ef2 SHA512 aa2b8d62b49466bbeddacb92d42f3c8c0b42f1004d49c8b000f528a770398005994359e349df1bd8e2a93e72468151b9be79a7c46f4f9d79d64682c6ee1d4342 WHIRLPOOL b39414b7a7c40a8b151f0a75cfe4502809243e2f3feab8b6f49f915c98e89f07d51e1ede206a285ea3d82692381c6803511cd9dbe0532d78c6cb65e7d9d294b2
-EBUILD portage-2.1.11.48.ebuild 9942 SHA256 2e9014be0e84dc922734f95f9767afd6d21e69d6d75728b33b7b4deb7ec46a2d SHA512 2dd15fe00cdff009f401db3e375d7815898cc98e3803faa0b18ad1ccf9e1d25ddf239426ee014a2c362a48f0e39c1ad1de6a89f315baed5ed848c82dabcded15 WHIRLPOOL 0dca3f11344063599d85cd0a78f2b5d0c820d2aaf94fb47a3525066d9484f9f623d948d27a791daf4e4ec8be207ca2e974926d9d9a35e2d0d66f421f79b4ef47
-EBUILD portage-2.1.11.49.ebuild 9942 SHA256 442d678d62a29cb35aee4a851c90c7c834a990fbf5a3877149c43dd5daf35801 SHA512 97ffa6ceb154c7fd241954f7a395b594dffcfd2bdce843761b24459b2ff2ade49c8b5aae9aac6a268c9f2129e53320dd20f48cfc60baf21ff28590bebd6605da WHIRLPOOL a3df94cabe37ccb5cd9095fd2ebd0f8f34961030166104d037f907047d425b5cd3131bc01bea09ff71eb3a0c596035817e342b5d19ba9404bfe18735302ad4a9
+EBUILD portage-2.1.11.50.ebuild 9942 SHA256 db1d1502d3fd74740ee716afeb6c92766956abed98a5c937a008d5ea0a8eb6ac SHA512 461359d5f33d99107131532eef4f3113a55001fd4ee79d1ee8c77e7b2836d47cdf75082b5b363b26719a7169687d35cf767ba6591f8f018b46d3bc1bfa77e7ad WHIRLPOOL 048723cbea4c23baa9dce723ba54d41b8cd288c6a70ea83d989a9774ac3d9381ee8a78cb5c34711a47a71cd004938621b7ba65c19d8d5d55658e6b3c1a9ff7ce
 EBUILD portage-2.1.6.7_p1.ebuild 8391 SHA256 aa62c9abf35aa31026863d881fcc47eab499992fa290a4aeda39435289358c94 SHA512 f5c66cf066f6096c930a25825314837b214d9c23386f62af8ee4f50b92c8878765ce81274a5335b5f45c8707849ecd3ca5dedb466af7dbbd2744cd356ab7bcbc WHIRLPOOL 6eca21d68dc0ad96d0ab6c9bb84b14dd21100cd48a7531305fa63a1276a1d90ddda33724c32d695632215da338aa91fba412b2f398d2d1ee91fd730d4678484d
 EBUILD portage-2.2.0_alpha142.ebuild 12019 SHA256 114f3a0ea3f7da57c0a92f07ffdb0aa67b70cc01dcc1094b0ad687ccd0375a06 SHA512 5706f1230b4c4826a828995304c0715cb2f73c8f5abc4087ec403fa878d98b800998e788f10664c3bc6365ce71082d3d3413365a9a799af39b82f6b24c2b9273 WHIRLPOOL db34366a873b409605196b7903203cd7df11ab6c50f5c0b6447440e91e0e7edbad65c593cd64d406b1023351f3e926e8ea23be07845231521bb5bd040bd9c6a0
 EBUILD portage-2.2.0_alpha159.ebuild 12044 SHA256 c24eb1a4f1b5d71ff5b1540fbd2feefa8ae12db0186592da8d5a70933d09927f SHA512 a9ceacf033a251f06d303e37b5e984ad6b7fac1cc0ecbb4aba82a0d8b7390fd563b5a573a0759050129702839a088fecf09e9af4a1ac252b50c6e32dc59f4892 WHIRLPOOL 9a7cfe9f76b8cac14f82dac66f897d0d89d04c456667e56d3326de7abd82cdd8418683ae0896564ba9df947bfc5cccf2960778533d32dfc97ac3635134ba33a5
 EBUILD portage-2.2.0_alpha160.ebuild 12044 SHA256 83ef4971d3067f7cad0ac6c57a1c5df9f78d0dd0b5a005590bd6b096f101147e SHA512 57384c50ea328a3ece12ffc4b528bfc71e7f8e7aac16fa2488df541c735649ac32029d849b7a189c4022a4828999db48d2288694b510e5ae1806db6dbadcd697 WHIRLPOOL 5db99728131ce8ed2c45d4ce3bef54f43f90f0874b6ea9eae254dc271433201d82360781099670dbfba2541aa0a1c375c0bf5560f4bd92427bd465b84b6f66ac
 EBUILD portage-9999.ebuild 11294 SHA256 288979d72a2904c6d970cf568c412255b24ccc290f0ec7884d3c92d2a2326da5 SHA512 adeb39ffa9072d33366e1ca85cbf7a2bef51c516015d9b96f2ad2c817c1cb94d4e7ef27c8ffdc39ef744c9c193174695b2dd30208814654f5cf70478e96f3fd3 WHIRLPOOL 2e2eca7d4dd09c5f0fdd84924642b292bc185c3658733c7192fcb1263ddd2ef048418ded5db62f82a09d048d049bdacdf2887d0746956d35f622b4e17f413292
-MISC ChangeLog 8293 SHA256 ad65e442e1dc14fc45de68e1a0f37d3b1691e796d738f01aa014c8fb5265fa80 SHA512 60a9f8ffc5c81b6764d0bfc23303160acb990182882fead85879182f810d7f9b3260e4c78815e28a5c047b6bb268395f18d7b8a26d64987f9d9fc7da146ecdb5 WHIRLPOOL 513bb73d80172f2ef0948ea8052d165f5b527b4f00e7b5c39a5d68833323eecb0adb7dfb11afb574515301edaf69554daf93d7e4247e6407068c97201f74d31b
+MISC ChangeLog 8720 SHA256 eddf56e669e0e7b1878fcfea238d047e2652bbf59165155643f8ce83cecd163f SHA512 fd557e4b8099c6865ac2269b844c9e7cccaa2b2eddab433d1d264b5701527788081537699a21b43984720fd0afbf0d116014d72a9da310e43eb4514caaba0a62 WHIRLPOOL a0b7e467d802b52501caed71af96d22af498121a51e86a485db959a85ec85b3059d7ff7c8f157a564ebc329e39265a35abcf9a7ec0654d8084367488c2338414
 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)
 
-iEYEAREIAAYFAlEAl1QACgkQ/ejvha5XGaMKQQCeNh/u4vxGH3Fx+B/w+uF77TB1
-M10AoM2fGO9kivWZO5A5ml1gR5HTR9m+
-=WAqK
+iEYEAREIAAYFAlEBscwACgkQ/ejvha5XGaMm8ACfbngpERPP7dfE+ShjVXlfkUVl
+1BUAn2b9TfBVeXfULYv53xJnKLdyNAPf
+=pMwY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.49.ebuild b/sys-apps/portage/portage-2.1.11.49.ebuild
deleted file mode 100644
index 61c2f9e9ad29..000000000000
--- a/sys-apps/portage/portage-2.1.11.49.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# 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.49.ebuild,v 1.1 2013/01/24 02:05:10 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.
-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).
-# 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 ! 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
-}
diff --git a/sys-apps/portage/portage-2.1.11.48.ebuild b/sys-apps/portage/portage-2.1.11.50.ebuild
index cc9780e97d5d..7638a98c8408 100644
--- a/sys-apps/portage/portage-2.1.11.48.ebuild
+++ b/sys-apps/portage/portage-2.1.11.50.ebuild
@@ -1,6 +1,6 @@
 # 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.48.ebuild,v 1.1 2013/01/21 21:57:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.50.ebuild,v 1.1 2013/01/24 22:12:26 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.