Stable for amd64, wrt bug #478904

Package-Manager: portage-2.2.1/cvs/Linux x86_64
RepoMan-Options: --include-arches="amd64"
Manifest-Sign-Key: 0x7194459F

3 files changed, 23 insertions, 25 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 432326c1c301..ef471e91ecf7 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # 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.1351 2013/09/08 12:45:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1352 2013/09/08 12:47:55 ago Exp $
+
+  08 Sep 2013; Agostino Sarubbo <ago@gentoo.org> portage-2.2.1.ebuild:
+  Stable for amd64, wrt bug #478904
 
   08 Sep 2013; Michał Górny <mgorny@gentoo.org> portage-2.1.11.62.ebuild,
   portage-2.1.12.2.ebuild, portage-2.2.1.ebuild, portage-9999.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3a30482cfa8a..5ec32c4eff9c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.1.11.62.tar.bz2 916085 SHA256 894bd50830264d222210f5417448263355830d5d8d2de446c1b6b3a4c7a14bfb SHA512 1a969c5164871ce12cc87014f69d44fc54c11a2c58d472fc0dfaa82e9561fbfeac442a3b8a0d5cccd39b117f762acfc0e7abcc00c2e16719940e93746a7c4ba7 WHIRLPOOL b681b290e98162ba7f770b4e5d63d5b42398ecd325629a166b158a6e3becd15de5bae8b4a5808612a5a9529683e544473f33d030f20838fb03086501b7e89cc2
@@ -12,30 +12,25 @@ DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e8846
 EBUILD portage-2.1.11.62.ebuild 13464 SHA256 45d2b14fcea683b7b345a59ae209403034e8e5a441299578eee5823a1835e7b2 SHA512 40ccd1f1490f61a8eee1c58b39e3cbd01f46b9eb98ee9239ec4b98c6251325407deb3eeac2fdcab9304a298b5c45c6d70acf6307b2e8d4af990607210488dd0d WHIRLPOOL d9df350b6b56c9806512b506029071d1b5ca5fb7a5e5a12489b28610dd02fd75b23a4147146d8a0f222c4e23e54d005b3a6dd0e657218e6a2a50c2f3eb548737
 EBUILD portage-2.1.12.2.ebuild 14369 SHA256 250b7e9203afb449229fe7f2fcfadfddd205b4674a54a8f17b965e174f304473 SHA512 7c45908eda3aa20c0d4e9e89f645bb463634a9edd06029831c42eff125dea4a5f72cbbd4ae1f2d60567f55fc58af25c27e95a943a4fcaeef392fe85c08f74783 WHIRLPOOL eee28993d66ef774e591f61892ba177a6aeade268f32a1b561d6e63920d8b9059b0b63eea55b7dd70bef21da39b16bb66f7b280e3d642bc739f1e8b5ab4cd0c5
 EBUILD portage-2.1.6.7_p1.ebuild 8308 SHA256 5c5c52664f4d3a09679d09d4ab060c52752e4f1f8b5d86c2e60c20c9a9c6655b SHA512 582549d643094f08fced94741b474d38bef9f7605aaa3b8308138b32ad331424d62019b172635639e7a2dc00b02d2f2fd3dd1507fdee36bb300a79459e7cd4ce WHIRLPOOL 62e3fd88109b1d2563fd875a1afada9cbb1fb1721b5d4f73bc361a5389f85e1c985960106123c9aaa8545cef1bc7d877c307a7610dd7749b10524aac055168ca
-EBUILD portage-2.2.1.ebuild 19240 SHA256 c7669f325b9cb7ca47c2c34753ff800b7a28b314236c2b2fe3f1ccadfc935890 SHA512 c7253e71b42532895fda8b1e5ec32c1685c94cceeb7b53501b4dc690f65e83cf809b3376c047633513c2cf1444d622292d8954fced0359f2e4a4eb966de56378 WHIRLPOOL 191e3b6d5bcfdf38e97f654f58194f492a6c73c8e2bd7a313e6091a0657d37f96dd446beceb9dea994ce5bdf1eb46ccfa19fbaf15d884e0d36e9f06177c9167d
+EBUILD portage-2.2.1.ebuild 19236 SHA256 bd86efb6b1216b9ab0007654d67825ea68574203cd7ed779cd7d43a66d97c1be SHA512 51dbb7e2dff9306544b122c54dc0115669e449150dbfc1f7c5b9668452ddd8390b60656d3048440fc8c8f538540d167d7efa98d62dbfa77939ac77fbcbf53481 WHIRLPOOL 299f86bcde54b5fd2c5b07d270ccad328cee444ddf2e3fbe8317958f9c515645d242b48f4c623ace74190f8b3605e7de87141b8301d3d50e73c13d421b90c563
 EBUILD portage-9999.ebuild 13632 SHA256 bdff1cc61460b86c52bb361f1bc53efca2ce4764a130235decdd81dabfad9546 SHA512 7a466c898911a490f8aa43472e92e8e9dee6423df8d1b8c82e1c08d7bc287365e7739df4bed0e9de94833e0b35669c35251c1f5d6ca71b7ca9974f05ad145971 WHIRLPOOL 13db2916160a4cb1249dc76e4adb6a04b356f44277d643eab8e002d3e46850006e6a1f98422c8ef9d5d3f4ad82a4047b9df7b191682495f69eebcac0ea4fe939
-MISC ChangeLog 48697 SHA256 87f0d224b901e1339af2d232c494fc7637a7c7ec44850f12573289c31365308f SHA512 5f23215ab9721f9b15eeb36b2b061070127ed02fee47a907f74ca7d0957af55ae4d9b6916218e9dbc12bd8ffcebf9be28257da34e1eada0202970d1f67a4864c WHIRLPOOL d8124fb97251f1ff5d238c37d404760a67d48bb400fc4e2c27ec7c81fe3699d2bba7a62873288f5b91350af5cb3b25500d5f092a2c59c4157b53156223298645
+MISC ChangeLog 48802 SHA256 ed67ffee01fb4969789675059aa5e060d8319040b3312529b8a26665b2477ed4 SHA512 dd8b1534740e36240e7e87669b76bcc6b0327949b09b2f77a3100b9f8d6b965ec2228ea3f41fb9da518fb8480509700a027691551828dfe005a1b012b52c7ec6 WHIRLPOOL 0ead7a6a7459f26dd66b14eeeccde365ae1ba57729e140484ea8cee5bb5d9bb9eb5ec4a0ce564cc1d12fcc5907875674b52c69407b92d9de3ee43bc07ce336f5
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 957 SHA256 f03704594ee4694b60fcba3df6a5d813a849a9d3454fc902d974555eeea79d3d SHA512 958d90bc465e1a49aec7f0f649bf1026fb8f28811210223cf4149e32bab96695997049d42b12827487f2b5a4f0e2b51a2431dba01fe373d36199a32ab02e6765 WHIRLPOOL 5cb0e38bbfd0b7e7929c4c0167027ce07c5a8fa535c52906b2a2936897be37472be7430f0335aaff5931ae99ca89939047ecb997b172ae2187ae5949f10e1c8a
-MISC portage-2.1.11.62.ebuild.orig 13579 SHA256 4ca79541f61fb0bd97289e521913b7cd5f65bb63c7442ef7f0b4dc0f507b863f SHA512 6cc21f6696b13f28db6ebdfab805b965b5455c44864a06ad5bec34193694ecba118427803ccb96957d64bd563c0120dd37cbc06642e60aeb1f7595a3dff94161 WHIRLPOOL 5c50a6f7909a0989599413b672a46d5732e7dd151da898dac6a3f465fc578504357b824964ae5843de21e90266a8b6f885dff256aa538a907aff8356cce77220
-MISC portage-2.1.12.2.ebuild.orig 14484 SHA256 a5cebb63f164de6794e7289c6de5dfda427ea18cbaae3e1a331651384571b806 SHA512 5471e45eb74887770d5cd554d59cb22acb340d4bcd3b371cab0349d08c9423fba268cb1cc6e4ee62d47fec1c0f794ed986e805353c068f67f2b02d59d37bc547 WHIRLPOOL 601f80baecea469a066ea532a46c314968c283bbf40f186d09e44a51dc2fe933e470637e9b72db6239600a0b99f34af6780e8df8f0d53b51b839a0e85eaed950
-MISC portage-2.2.1.ebuild.orig 19355 SHA256 f4d1033bf6b2eb84a69b77f34e327674a972751f645ede6637426ec593fbb04d SHA512 bf2261ed2aa6148d583d4a832e338239c8b8d4394f80dcf068265fa520afbd792a8577e6d8cb9eb390537a9bebf78f67be741683dbbc796be72a02b945961beb WHIRLPOOL 98066bdf1f69d5e8a215e70d9e920f59918b048bb74f9e3dc989a31368ce50d271d3b46feb72d5da9184d2ede58f7936ecff08d3fde11c51f33dda02b4c14aaf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSLHGUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKDQP/i9BfQehndwuP3dAGm2QnMnN
-OToUPWGNTaDm4QSlREs3mBsGhUlIfRxVt3b3Gf/+SKyWOd8MJLXUYBFQFec/M/SQ
-rNKbicmY7RIyD/wqUarpbcTEWmS98+c/7iTwi4i8/VYP5MjzVpShVC2/yqjXoT1I
-RCeoZqR2IoJ93APZX3APzQCKUQR1SazCUAozBGhI4gApjlE2LEHaRmV0DGy5dfwZ
-Bf3fZDMUIwf3AIPvb6z86CqHZgzI+Eg6foe2mnAoBO8d1cc65Eehqlf0dkJPe5NG
-Rkq5xPyO4k8CmwjwFTPtxd++/dyTKZE560Mtu68Iv4v2i5M5rHR/Dl7lZWTn77Eo
-pH+usRvjE2jyVhKuenDiuxJaz5OrLvF8NEQzNqe4pCw9UX/a0ptuRhxrbXlxGOE4
-J9w33M0+ExB6n1ttCKhXDXHlc7iDab6ykdQfBmiSoI/CD/n7FnAY5TFKWj8bXPQy
-j44/F5B+K3gFE3tzDbhMpqio9CIxGs3+ghsJb+LcxUQ0ONbnzefJ3x4ji9WWjxKi
-YSF7FCJ4+knr4K69GHHowTscLV+75+Ya0/u7Weo9srrabJTOM1dxKm6XlocPIDqc
-SiQ6UDOBaKlRR7T03R8TUbnn2LFuYjNja16XEpn/WwK1ey88KBloH2X3YZc9YOxn
-WW7OGL0w30pSeBvy2aRM
-=eYZB
+iQIcBAEBCgAGBQJSLHHpAAoJELp701BxlEWfm38QAJQwbV4rWov9W/b7EeMtdCwH
+LK4ubOAh32+T7qb7vqLmpvA3wPOE9AVloLtIK3hBzi+lcNonw8yyANuG8ckhEL+Z
+4OZlFlBOujSnzSeXYXmI+P8MpJ0bWpfAgzd0xKqSNypS0ttt5aSzlJmNXyMMI5AV
+T0b4JJDEcu+nr/kNTyqT+I+pdcNtmbjlZeB5YyqZ9p7X88we0nMQ4Q2nUxKhrPHc
+gNUnc1YVPjBSwob+AqbFfhwI38QDkNP+psnAwTW3pe3v4g24koIXjEAHa1CZBX5A
+HnRt21lEVgeIanvKWYGZzc/4aiTI6CRL8/43qxLRgc+TQXvBe89b8TiLwfoNl4wC
+RJKXIK0Ilqvruv7h4tLyafgwvrG4QHWhTaz8CarBfSHF2xmBq9h3Y+WIb9+rxNdg
+hI0Dh4gD+zo1gmDTtNYdTeG+mt92O40ChMXmvpR3Kd3uGmugVCVSO6UYYcbpfvN9
+xA3BI4KR6ump4TTLwsjy7uKbNRWW3qzlpg7NHT6a+UU3NwCQivv5J9iNDYarVFnX
+9Ok/Dx9wDqps5c6TP6vP6buU65oR7IgT0Q2Zjiiv/yC38SHNRB77/5bxQ602Ym8t
++mE83JCZ2vU8UhOVLuMfBjX2UXKEn/bfwS8n0hkUrnH6+f0jF+uF0NCILM7lQNmm
+TjRRR2H5y8RZel/2GX6i
+=lpZn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.1.ebuild b/sys-apps/portage/portage-2.2.1.ebuild
index f771c88c2bb6..c9ddc8dcab1b 100644
--- a/sys-apps/portage/portage-2.2.1.ebuild
+++ b/sys-apps/portage/portage-2.2.1.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.2.1.ebuild,v 1.7 2013/09/08 12:45:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.1.ebuild,v 1.8 2013/09/08 12:47:55 ago Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -15,7 +15,7 @@ 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 x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"