2.1.11.20 version bump. This fixes bug #435720 (prefer mirrors explicitly

listed in SRC_URI when fetching with RESTRICT=primaryuri). This also adds
support for FEATURES=preserve-libs, though it's not enabled by default.
Bug #431026 tracks all bugs fixed since portage-2.1.11.9.

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

3 files changed, 17 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c0e6e2f23a0a..5a7dcf5a2d0d 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.1100 2012/09/21 19:00:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1101 2012/09/21 22:44:21 zmedico Exp $
+
+*portage-2.1.11.20 (21 Sep 2012)
+
+  21 Sep 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.20.ebuild,
+  -portage-2.1.11.18.ebuild:
+  2.1.11.20 version bump. This fixes bug #435720 (prefer mirrors explicitly
+  listed in SRC_URI when fetching with RESTRICT=primaryuri). This also adds
+  support for FEATURES=preserve-libs, though it's not enabled by default. Bug
+  #431026 tracks all bugs fixed since portage-2.1.11.9.
 
   21 Sep 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Append FEATURES=preserve-libs in make.globals, since it will soon be removed
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5d381cdb4a74..920c58f1c188 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,8 +2,8 @@
 Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.1.11.18.tar.bz2 820886 SHA256 1b006199abb76ea4b5e2812c424403d50f636f5e0990f71647021c8d4764acd3 SHA512 02038c342a2521cd72e9c84de3e0ba395e2dd6573e4dd4d4d7ee28cbd090344f96b879a57e0498ce4c2e22531d3265eeca39c4bec61ff61587b1c7ac7b1289f1 WHIRLPOOL f7f9145f86fa0ddc7cb1041dab072c6be62b35fd871fe5a032f37e881757755ad043b2622269b87b4a026e17842a35a969802349c78cb5660b025a39121cf9b8
 DIST portage-2.1.11.19.tar.bz2 822248 SHA256 daedb847ce4ee3e122ef32aee21162a45368f2fe911ba0d9a2aed0c8226795ab SHA512 dcc74a5313abc2509a689a3a8c6b6a40366f3da60ac9f08a15c68f46e3c4d1dfa0443543dd947866f0bb8e3306818403b898d7132dca31368c92c6db97bf5acd WHIRLPOOL 8a85ca8700d0a86a1109e5c85fba2672f6520fe7eff1ec607e7759886b704d598b8fa4be9216478f5110d05faf7908bfd99bd2125a98c344b07ca5f4aafb05a4
+DIST portage-2.1.11.20.tar.bz2 823864 SHA256 6d1b2fc0063eda9b229a22691de07144c9d4ccd9887dd6e45769d656c7b0834d SHA512 2bc719d71797ac70fb71661712cda134c3ff9492517a1dbda80e49abfb1b04d997c37e407d8c147651b77457ca892f7b9c43f123a9901ebf1c5497bd75f8d457 WHIRLPOOL 939ef61b6a61cc6709f823b2977d01b97caec2cdcb468d8094d1abda665c9d63149f2ee1f9127b06a28e1dbd823408e2ef692f110b30e175dd63d70326bc3e0d
 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
@@ -14,20 +14,20 @@ DIST portage-2.2.0_alpha124.tar.bz2 814900 SHA256 1734aa790f341eb6a5854caaa7625e
 DIST portage-2.2.0_alpha129.patch.bz2 58147 SHA256 fe01db2e4b9a0bbe0a00782ac78413ba6c7e0b5b45f0c6a31e3484c16446b757 SHA512 64895ee270fa7ad61e83bc97518c319ce9ed67693f1626e1d31fa968332afa735af8e63671c99254465454c6c89d0143a2541b6eb85e200d352e6551b7e5f3d3 WHIRLPOOL 8ccd3d0478217ba64e3745131d977adf3ac1d9326125f127df9887d687ee5c5570d216c61abbf8a05cd2af62ac78cf681e27637654036104bd5533561a6a0113
 DIST portage-2.2.0_alpha130.patch.bz2 62903 SHA256 aed1e188350f478fc15ebfb9807f7194b3dc03dac04b6ceaac2800fa909345e6 SHA512 9a7188c08f5592d6438d365e287292fe8ff204373bb1e0c7792af38be6cb05ac317a826896173f9b0abc2fc090d581082197e6692e6a24088c017ac75440289c WHIRLPOOL 60d44f88b471988a7b9a5a02af0a261827c363bdd86c0d2326cf153c1f8287eae9d8bf178cb98083affda4c4c7d598f167584200b38b234970a406d9c85fdc87
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
-EBUILD portage-2.1.11.18.ebuild 9673 SHA256 02265245438af32929778e926ce397076713212a5ab3c41dd2fd2d7191febef7 SHA512 1617b5ea8ac44ac939884624553f9cfdaaec84c3e4893b2fd908c384f3c18ff1e80e4ae4021248ad92381a4a0b3d53fb624591d4ce769da579370f90c0d559f6 WHIRLPOOL 328ec4e8d36b145a28076ee6f6c1095fa9fc8fbb47a0e52c4573742993be0043ac5abb27f423f05bc7a4af34d66e8dd99a674fedaa14d5531aa852ac15b39444
 EBUILD portage-2.1.11.19.ebuild 9673 SHA256 a4ea9d6d320f0f6ecf45aab12d6a32554a8d26f05f4cc1aea0a066b98c6848b9 SHA512 e3de82c8b9bf51cdd2fe4da458ee412165058e1a8b86dbb388053176f7c2e57093cebaa6e20f2f011d90dd967942438f60b4350ddb185e7b742206af5cbe298f WHIRLPOOL f7f6ab562a051b63ee65324809f689a4b3047443ee5a0c54ca4cb258846276070169f2f9edc32100b067ce00aa6c1e5526544e1233ddeafcb293578ecdc22152
+EBUILD portage-2.1.11.20.ebuild 9673 SHA256 b294417391852b6e439497b73907035d601cb638fa0f65859abc26a6b384458a SHA512 cb6fbafb48842d65dce9d851d881b0425ed88fcc1a0ee99f209345c26915b5f696c4006f62cf9980fbf41d22e4d97cef25bd109e974a39436b39ed832fad9e08 WHIRLPOOL 78f2b305e5146b9a9f5ed5451c008818f98b846df2b187d91f98f13c1e5606278674b7cabf150e2491d29b5dbeb1b064655671dc0f36a281c60d0bb70b3e513b
 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_alpha129.ebuild 11774 SHA256 d0e5f70c1fe2c0867e9e25c007119c43354aaa760ff7fda5ff980a446c186bff SHA512 0ad1e8f51aa64a5c62950ac4634f89efd96668995f96937fbc26125fa45aa6f1a588b2dec8d51fb117ee1c8df85a6f5292fb57f876f81855937cfed411e32ba3 WHIRLPOOL b854a083a3136b90ad3fa560e890b828f98ea1d3fba38f28d46c1aa3bdddc4699469562ab22a62077c41d5d89f429e5321b07ac0471fbe28552f01ae5b0e95de
 EBUILD portage-2.2.0_alpha130.ebuild 11774 SHA256 390e874bfefaa47766ce2b225df5c107e164a27ab937d609418eb3bb11b08f5f SHA512 507019f8090f1325a72c81a1f4949d117fad7794c99ec8460ad417fa5e35212628d4cc24785431638b336ad952b6a1649e2803759fa22f23f066e565634fa80d WHIRLPOOL 866cef9d32bd0056905a0351a89dd5d45a901741815969e0c7e36620ddaf1b49a1539b83f4f05dc0a62c5e59ff84340373523b92390a4fa7a0da2018b1654940
 EBUILD portage-9999.ebuild 11142 SHA256 d31ffe6471e1b7daa12670c2fe5a4f73634ed27155da0090e1753a8fc8c2a840 SHA512 b83dfc8e7215c4e28b85d7d6c750a15c8382bf8bd7da08177591b9e25da5787a67b8a6d62e3902f121b87030e99ace73c9cc97025e545ea088f501effa2e8f6c WHIRLPOOL f62dc38917c412e3815dbd5119e17f1cd0a53d4d8e6c150812ce25eb58a7e940485dc680cdb27e2754d53f2674b247f13b646ddddad2aee07f28512f5935c540
-MISC ChangeLog 117555 SHA256 7365532f8e8fb2b4c537fccb1e06ad1324dfa0d07b291b07107d6b55e2dfa03c SHA512 6dd129b91a98defb332da2f947317dcbff3fbffb01a3bd8a46a1b812fc53f667bae3954f9ac06b4c2a06659f757b34ca8e9bb7607fea0375f5ce4cf61a53e48e WHIRLPOOL 52c8871a3c754ff0a551bd60e04dc9e8fae0127643ca042891a6eee4515d0178b2cf62e92a9fc938078e18f24f3e11cd526d2048523ac78dc8018f4baa31f8d4
+MISC ChangeLog 117979 SHA256 b36936237ab8a5f90c9df5944851150559e58ff43e67814a35fae7306edd9c27 SHA512 9b700194596703123f4d5d77824f19cde4c1ef02cc4ae8909ecaf359fe43241906c05b3b753718da42ce6ecc373c31de8c8c7caf0cf6924e20e4a514b36ba309 WHIRLPOOL 4a80aa92e5ef41b7995d46c269849142f626f1ea11e9003aa2897862d90363822621716bc6cdc4914c88f4084f25e8fbc441ecf07d768354ebdc02c9b24805f2
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBcuT0ACgkQ/ejvha5XGaORtgCfQTjDtTrtEhjFwQjCvQr9bBY7
-PWwAoM60UH00CjIBqyZ8ZBhEN+N5Z954
-=zKfn
+iEYEAREIAAYFAlBc7csACgkQ/ejvha5XGaMuLQCfXRfajP4N022DjyoQLHrcqnnY
+gX8AoO4OZcuLHvlUbKUdI7u9/EN9dDkn
+=T/4K
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.18.ebuild b/sys-apps/portage/portage-2.1.11.20.ebuild
index 9acfbbee11f4..e3bcc03f8391 100644
--- a/sys-apps/portage/portage-2.1.11.18.ebuild
+++ b/sys-apps/portage/portage-2.1.11.20.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.1.11.18.ebuild,v 1.1 2012/09/18 03:38:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.20.ebuild,v 1.1 2012/09/21 22:44:21 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.