2.2.0_alpha116 version bump. This includes all of the fixes in 2.1.11.5.

Bug #210077 tracks all bugs fixed since portage-2.1.x.

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

4 files changed, 15 insertions, 294 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 1a631156fbfa..240f9b19f877 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1052 2012/07/05 03:58:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1053 2012/07/05 03:59:52 zmedico Exp $
+
+*portage-2.2.0_alpha116 (05 Jul 2012)
+
+  05 Jul 2012; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha116.ebuild,
+  -portage-2.1.11.3.ebuild, -portage-2.2.0_alpha114.ebuild:
+  2.2.0_alpha116 version bump. This includes all of the fixes in 2.1.11.5. Bug
+  #210077 tracks all bugs fixed since portage-2.1.x.
 
 *portage-2.1.11.5 (05 Jul 2012)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 29a06214f102..fefc6d3b86a9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.1.10.65.tar.bz2 826100 SHA256 aaeba4789b05864e8ca142752dc31c017d47976332394c1bf533aba6b3748f8c SHA512 fd7807cbde6c9de85c2b4acd7ef6848c36b7f569fd22decb4b684529f65e9ff3f6a29af0038c88ca7861873251e8cb3bf17ce25140b18e3b7bfe6492ff8edc6c WHIRLPOOL d0e22726fb65bd80f58d70c155b6c669dcc1c086d9b77303fd987bc7cfaeeb3b6922300ddc01a05eca948167e09c3c16462f023fa7bfeca963958d6e3036cf7b
-DIST portage-2.1.11.3.tar.bz2 837481 SHA256 767f1223a144a3e714b0adb9ed01aa666576ae64bb851941965b6d1130093f61 SHA512 a3b651e2b354194dfa93db21ba321d2ca9fcba42433426420e2dd724ced27817492f4fe11e64559145f003321d8d4ad5115243c995491dc36290a0b0150716ed WHIRLPOOL a537efaf6b7c53430b967b0fa7b14471a994e3cd570a2979ed9b8b6a14755a38f2a279eb8bbbdf2b036da6e2fdcbd13bcdaf3f9e6d72c3135f46f5cfe324873e
 DIST portage-2.1.11.4.tar.bz2 838605 SHA256 3587dee2f530509d03e17c6f64a11040f48b4d5b68358b930ce35a0d94c39425 SHA512 39a527833c1e946b61092886479d222bc7d15934e15835357a92ef84b57696772a54f37dc5aeeb890011852bd30209b19e7f8f38764c14ed8cb44b1c95d58f70 WHIRLPOOL a1f5e640a3005d65dc8ed2ac92181f851682d70285b85f2c8ccce1c9e7a51ae3b515961e3b6bb6a9f88c04acda8589eee49117bb4e4d1b8d00440e62bea46652
 DIST portage-2.1.11.5.tar.bz2 839678 SHA256 9d0d652180193bfca9ebc9f18ccc4a498b88123e0f485c023ce7e36a9e6adb4e SHA512 393abefb7ab9ea070b1f40f2db51224a55baf9d14927f9bf8a85931a7d3f4384eb0c51c879431c550c94b104ab9a3154c47d9e3d61da224b9b69aba8dc08da36 WHIRLPOOL 605afdae03cd8b0146a8e5b3c5deacf50740e5a69e2213f6a3f05a204f9b4c2f247f0ac19830b59828a1b4796aefc973e685786bec360b5fc3a0c964cb63901c
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
@@ -12,24 +11,23 @@ DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b232
 DIST portage-2.2.0_alpha108.tar.bz2 821498 SHA256 c5ffc4abe03696319bfd89082b5a5bbb8f427acc92a8557f29a585fc8f2b6f9a SHA512 752a40c3dd40d2f96803d52342cbcace733f974561213153ae7c15d848194062a76be9e764b9d1403e7792e620a2707a6cde936f762a8d7c0b5f5bf85af02e05 WHIRLPOOL 3daa2f5572f6b3fa81ca27e274c15c5a7423aa7482494abc895c1115fdfadd343b22eb8e8d6926841fad14ca4fd579a8db993895747be9cfeaee8d914a384fd0
 DIST portage-2.2.0_alpha110.patch.bz2 14215 SHA256 af73f05b918634835a0d99a914502b6d0870f3a59a7af0f2aa3b3e2aa0f52c88 SHA512 9e691a9171be7fd2e2fa4a53c90d91c61c488e05b2697608a5a45514c36f4e5b88d95dd98a661813be3a68ac627ca7430b28eb30fdeb705cb4a7cf86a9abc165 WHIRLPOOL 1831e3dec8c5396f300a7e6d910149b32a9d01f89ae45a8a4604542d9f607b48eea375820787036c9941265c3717a5c1aeb10b68d4c5d2eeafdff4b2213a5f76
 DIST portage-2.2.0_alpha111.tar.bz2 836193 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df SHA512 b1dfee2c1869cf30ac50c5ecaa603571bd7c71879d5e9fae80b89602b5d7e3016636703ffc7aec384e7d93356c93415200609dcd2f0f9f74a56ca0364144c120 WHIRLPOOL e7a5cea176b66f632388920bf8e1635b2ec8b7ce70f9aedea2289cdc6a7d560e6b0e6f3a7f3636217539d4883857aa84bb85e3b146e749600d57435f613b60a8
-DIST portage-2.2.0_alpha114.patch.bz2 8978 SHA256 2d1ebdd54ac301abea5dd6221da5c7076b89d25de7a673d7287a5b524ca46111 SHA512 985740e6a7bb057b9667ff2d2ae229972f726b56a4cacedc08a63a27049653a55dec2e913c2ee328d25d4657f4d8c356e436b6b47b6e12036ffc4692c3a46ff6 WHIRLPOOL 7cb837bd233134362aee73f750bf223f6926a7537ee9a869d3c36941393f8028ae1859e23a2bd955ca1681963cc37675bfa84bb076e2bce2d628261dbfac3ba5
 DIST portage-2.2.0_alpha115.patch.bz2 14520 SHA256 b0888ce52ada388ee218d346ec7526b07d30fac0e46c3a6582d2d83b1d88ce0d SHA512 502ea8396b9605a5430c079cc5b063b78eae4d83beafe31b6a99fdd03cdc41027857e042fca4d2112dc5746efe6f5e808fecce50e7afa6f1ffba7c9200ecc748 WHIRLPOOL 403c165b1c77071845f976ab8ba0faac746a5cad1346fa8e0c7dd04a5d5139ddd17005f7064c474567537c7cb06feacb159e65e5a90ebb9a01244b6478534123
+DIST portage-2.2.0_alpha116.patch.bz2 18601 SHA256 ed3dbe16d0506df3d0002ada02f104a44648adf884c72a7dfcd5043ac9198bbd SHA512 5b0e5e72497994378fe0fe8129a8ceee9cd04526c811200546a6a93617d28941b048d037bb747a27f80c49f563354afefa767bbcba41a60b055e59a6b0510f36 WHIRLPOOL e5c8a15e3097f1ae989ec89ba9d97ac0a4d7fb3a68c2630a17ea4b4d6b26b95de4d7cf9c8dfe74686351cb6382ce6fc5a5ff603f84f4a825fe7d7730dba59ed8
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
 EBUILD portage-2.1.10.65.ebuild 9991 SHA256 fab70894154ec4a2109828e70bb5b76e86a977d01de9fc77dc2ea855b610c35f SHA512 d10534e90a4c0672f27564ec2568b4f10a90a821fdea043a27d0548e8b06db7bc21449b1a1a37f2d39cb41bf57c573153e089a5493b4098487f0d0adb7d52fa0 WHIRLPOOL 9d414ce3dcc82d944a04fc12e88cb0cebeaee09813d6a9239f4a368d8295942e3942820398654af8bd83a8c449c3e03bbdd14003c1e993bf273869fd83b2e2d8
-EBUILD portage-2.1.11.3.ebuild 9578 SHA256 e10d4f146ca27a62a7aaccc409976a72c46e55a0b9209262163b7f449c961444 SHA512 2ba6db7d8103ac1ef8961e5cca5013b655739e883a26c06889ca8818ee70bdd5cb742fc3faf77ec9d5c944625927e6f64d50de908189d0898538110eb298f213 WHIRLPOOL 9b4a03f882bec32e7f2bc34942e678d5288fb9b3387768de62f67ccd9cf7e8fa98df6344f65a673f93ad3536609c3f0e5874c7f4fa9d61619c5db084bb9d8b88
 EBUILD portage-2.1.11.4.ebuild 9578 SHA256 e092706b4d3d6d3801fcfcd8858fd9a92120098afe1d2d96f440e969ee88fcd8 SHA512 9a8dda918afcc6052dc3e69d8cca62956eba1210d0b3270019d85176416b75152087a919749acc3600ad5ed28fd7d3ace33c85390640df54c5388f92853ee2ac WHIRLPOOL d8a564e1341a17d1e3b5917519bab0c94cd56219c3b025896e18144ed2f1695adb44c412a0c98032865f958bed8871ae04405ed89d2548aad9458843e85709ed
 EBUILD portage-2.1.11.5.ebuild 9578 SHA256 d6b3f5653514e7c9a64555de217f4a55d5d32ad715477bfc85f9b8b42d30e7f2 SHA512 4e91571f6256dd1ef7d6bdafdac1361c41923135a450108d0e31288203f40585ef45ad7349e3976cd946b7db41777dafe6acafeef4a9a96692977d9073cee61b WHIRLPOOL 8dcc0805e9a9721b086d39c9ce7c5fe8f15035b087bfffca3534e73994604b05945fad354598a8880e48bdfd0f6f2c88d2e8e8ce10ab4739dd86556626e18d47
 EBUILD portage-2.1.6.7_p1.ebuild 8388 SHA256 9213666cb89e2439a01317dd8fbdc5576687f777576b822cb4625d7ca8d09ac3 SHA512 3d4768c7ea2a1efa933d0221411e3aa6bc69d2b9d4a7b7890d7e3ee6652a42e008a3edf7dfddb476cc6bd6ea1ca96619f9ae0c1d9edd2ec19c942a2124d7609b WHIRLPOOL fdbbccaaabd196bcce6dc34ac1eb30f907551d7b86b8216ac73ad57f4da83898fd474cbc855332329c6ff5f9846b146021e1cf6955c8e5031cde1bfff02e8ba1
 EBUILD portage-2.2.0_alpha110.ebuild 12448 SHA256 0242748306e94fc210bc34b564ef41c3d8b5116278bdf8de59fe80c355555bba SHA512 55b189a0014262ac861017a4451f09eb63247c7e264ea240ec8f335b5839c659d3b0c6cd92f9ccf8721af597e28d599e3549795354e87a33e222ed43af6bc47a WHIRLPOOL b1f72469ac096130449298440de6269a2c7bbbd9962740c18b78127f3e5de412a61fc3b46396ad5e04402dc18d4bcf4402d8e84c7b2dbe782af1f7f728bceeac
-EBUILD portage-2.2.0_alpha114.ebuild 11685 SHA256 2db927adcb04dfb4b5181e6746772a4df6845aafa7ed1fc7f0b90f69fb9d7016 SHA512 5f012688d114bc713e3e8bb6c5c920aafb5c1dd3a8b5f06277e97d45d01e75cb1b723e3c92d13ff321cdb6a5275977e090018c2d3dfe761af722369a710ca77c WHIRLPOOL e2e611048787adb7cd49c4e37be2f814c22a3d0c4e58e9b738b0b7f68fb39132c6030b8cc2cc0c4558bd31361994e6f8873e61b0aad68bfc996ccd33265e749a
 EBUILD portage-2.2.0_alpha115.ebuild 11685 SHA256 e0da265d02ab20417db9b5551af0d524a4b4cb16e2fc959d7124bcbc1f67b579 SHA512 c2a427a8efa301152d20f2b79314b66bf08db66a8aa3802d9025dd642ed75c87c2f47b21e1aaeff45e2d984bac386ac07ab17c275eb148a98b809f0e6f039c59 WHIRLPOOL 79ba79632887f1b5d0ae41731d810a330250c8d1bcd3b648202cb9d4c5d41d1d7ef162d67abaa0bd33dc6122e8266d4dd12b6b4b2bc7faaef0d52ad89722c600
+EBUILD portage-2.2.0_alpha116.ebuild 11685 SHA256 4bb900a544c307e052ee16ca9cf8c04985b3875c38c799c817c8bb06515d5f5e SHA512 64b14c430b0bac40ec2a969dcec51d29c0b211476637d9a9d751cb6f7d95e42a275b161bddb3de1d0a4314c187dbcea195359bcc623e4a2ae13973dec28004e3 WHIRLPOOL e8d317014d72785cb7f64e12214ba97f3707e1d1d4fb1b8922767dd04a73ca7eb85eb53601f70d34e74fbf4f4e38232aef2138310c7b2b79efc28c83b9243996
 EBUILD portage-9999.ebuild 10928 SHA256 789e3badd9f720a1b388b27706be62bd38f8616897a754691f57d6d52a2c85bd SHA512 454c05802a7347f313bff37e063fd9d8092f836cd57c9582a61c3d5132920df2e5a8339090aedaf582dc5a1250eda51f17090cb202272dda45a3bf4876ec80b2 WHIRLPOOL 0d7924cce922c2d2fd52e0ca4dc24f57e437b6a505bbb2109fd6d181dd0966c16b778f69b5ee948c6f99bd5636953afdda534a9d3e72eae63a443169418b58a4
-MISC ChangeLog 103667 SHA256 819784aabdf2660aa79b51f622f7642c77ae8574e95ede2ec8cf82e0141b08f1 SHA512 ceecab29912302d4ff63d217940c6c0eb3d05f14e7848f792af42cbd09e422ee87abc58fae0f2f12509e9f1d9e6a61ab0c1fa68d35518505cfffcae088b91631 WHIRLPOOL 953add5b42fb66b8099f336307c4d9a9a96577cd73cdc69e1c93c9bf55992296b8d70adfe42da09f16231377833a1b82640acc84ecc00b4a9c7527205b19cc07
+MISC ChangeLog 103978 SHA256 c3bd37af9a5146cdfc1a1a8c984edf3d5c74fbed3447ed2d0f2b9044c1da5e38 SHA512 88f930c145f9ad9e9321e5066d5ca2978bca602368c9d9568ca54e8d36f402a010d5385bda547755a329557d4c2b05d5444de696d0b60d78994d31fa4838b401 WHIRLPOOL 633daca397f7b25b9e93d9832b6f2bd5cd340c7e256a170d962b330c171b62fc2e3d5c6e7a0486b2994d037ffb530c17c44183b95286c24d9095ba3306b6ed41
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/1EOsACgkQ/ejvha5XGaNJyACg6+GLZO3fUMFbTO+pFtPaR1CR
-O7EAoKj7HaHVj8ikOePAG6LFP8D77018
-=0tf4
+iEYEARECAAYFAk/1ET4ACgkQ/ejvha5XGaMWKACg8pcUx2hIOapd0DB0BUVczON0
+uMEAoLhlFHj53x0sBamtKugzDy9e4mt7
+=b4b6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.3.ebuild b/sys-apps/portage/portage-2.1.11.3.ebuild
deleted file mode 100644
index 40e19c70c04b..000000000000
--- a/sys-apps/portage/portage-2.1.11.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# 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.3.ebuild,v 1.1 2012/06/27 23:07:51 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 multilib 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="python3? ( =dev-lang/python-3* )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	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.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	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() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	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
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm -f "${S}"/bin/ebuild-helpers/sed || \
-			die "Failed to remove sed wrapper"
-	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" \
-		libdir="/usr/$(get_libdir)" \
-		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
-}
-
-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 [[ ! -L "${ROOT}/etc/make.globals" && -f "${ROOT}/etc/make.globals" ]]; then
-		rm "${ROOT}/etc/make.globals"
-	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/$(get_libdir)/portage/pym
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha114.ebuild b/sys-apps/portage/portage-2.2.0_alpha116.ebuild
index 33168687c1f8..b759ad5f0787 100644
--- a/sys-apps/portage/portage-2.2.0_alpha114.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha116.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0_alpha114.ebuild,v 1.1 2012/06/27 23:09:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v 1.1 2012/07/05 03:59:52 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.