Update by Jeroen Roovers for hppa patch fail #357005.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 18 insertions, 14 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 765b1fcfd8c4..8f127b9127c4 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.747 2011/03/01 21:53:46 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.748 2011/03/02 02:37:10 vapier Exp $
+
+  02 Mar 2011; Mike Frysinger <vapier@gentoo.org> glibc-2.11.3.ebuild,
+  glibc-2.12.2.ebuild:
+  Update by Jeroen Roovers for hppa patch fail #357005.
 
   01 Mar 2011; Thomas Kahle <tomka@gentoo.org> glibc-2.11.3.ebuild:
   x86 stable per bug 350744
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 611be0c9ba0f..5880fa29f079 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb508bd3af2 SHA1 0e9330d57de714dd1ecd7040d3eabf4723cdee7c SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e
 AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 RMD160 744bdbfb73f1dbced4cb33cb5aa92f3b41d3b4fb SHA1 21e0f83598f5342032a794315f0e3dac07f647da SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774
@@ -33,11 +33,11 @@ DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
 DIST glibc-2.11.2-patches-6.tar.bz2 117116 RMD160 5e2dda6ddd8620af9513aae1033595ebd149c8f9 SHA1 b0f4b73a49d1117649acd74523bb5358e54cbf5e SHA256 490b81357fc43f2d23a050ed39440363b223c1e3f34e77b4596b981680fd9f23
 DIST glibc-2.11.2.tar.bz2 15675392 RMD160 15d14fb6b0b58ec3fb7781efa2f8a558fcb99a7e SHA1 23b477f4816a97e007be1e98abc1ffe2af13ba9e SHA256 c2ac76ee363eed31b2a377489fb2818139f4668b5505ad583009eb9b0e228713
-DIST glibc-2.11.3-patches-1.tar.bz2 111407 RMD160 25e2332f1c9461ef9aa288bdb17a684bf8d393ac SHA1 81839e0ff24d37cb09922a95d2a5bfba6a5cf861 SHA256 36a2c6d2d3b648e5b58e50202892f2e97055a6a2665037944f5ac2dd5eac3a89
+DIST glibc-2.11.3-patches-2.tar.bz2 110859 RMD160 82150c671e19df102cf4cf92f5ff914e6328c064 SHA1 e371d86437839227c5927cf8c13730aeb893f75b SHA256 4dabab8bbe0acf80bac483105ef17f0968be30bb67579a5225e1bab590948d29
 DIST glibc-2.11.3.tar.bz2 15667797 RMD160 a5cc802ddff6c2e96f63a9dacbb429d0e9114e2d SHA1 2685601493829b0399578c87add614786b98c30b SHA256 9c10538262c13018910721b8160e6caf65ba38ca2750c5710bd220e44d696afa
 DIST glibc-2.12.1-patches-8.tar.bz2 112063 RMD160 5bf50dbd1bb30d5cc9a41ebfdc72fa8aaab31389 SHA1 4084514fea111eed609721ba45339ca45060e34e SHA256 564fe8d9dbf80763c32eca13129ecc69aa276eb8364fe15b400d0cf0cbbf7085
 DIST glibc-2.12.1.tar.bz2 15667516 RMD160 4a46745f4220f4253af0b882d0c2072499e17653 SHA1 ef5ca1e765719d3290bd24f94705f27534f3744b SHA256 759f115c52bc12c5bb453af559dcd456d32138250b7cc96e47804e3d0ec97407
-DIST glibc-2.12.2-patches-1.tar.bz2 103230 RMD160 b78486c52a04a317991f4de6b50c9a8fd92fffe3 SHA1 971195f9d9dde067a08beca69434269ff2072a76 SHA256 674e2e2d028d1f3815bfc578135ffc2adef5f1345daddcda7367da15846678b6
+DIST glibc-2.12.2-patches-2.tar.bz2 102778 RMD160 3ea56ec3bc175414dfe095965541cb0b58654912 SHA1 941f77b676971cd88b8a39fcd3b1958790422717 SHA256 90413af688f52d2aa9f4a4a98823dd6267e6270270f6d7d477d62dd9e90fc57c
 DIST glibc-2.12.2.tar.bz2 15667759 RMD160 1855ebbbca52dc036de159cca720f6153e173e21 SHA1 3ef6d36eee2dc7c4351f215f689e6a04c161a35e SHA256 22f8eb3c49b9eb5e88fc249daf8670899adef24eb1f74708fb150a6502fa1216
 DIST glibc-2.13-patches-2.tar.bz2 104617 RMD160 a582795b5102ff6204eb8937dba9352376a607ee SHA1 c67c30ead5cbaee0fbc55eca4115256bec1718e0 SHA256 fd643ddba1676a87678519e3c0d62692704a2073efe8905325707fb4d49c38b5
 DIST glibc-2.13.tar.bz2 15725729 RMD160 cf34e4a06a2602deed709e2ee10cf7446a824989 SHA1 14d83dced873a21a3da6a0bfa0926f40d82ef980 SHA256 0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2
@@ -74,9 +74,9 @@ DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.10.1-r1.ebuild 8161 RMD160 b21cba3d443ff63ebb776c9f15959c1e1e660136 SHA1 e08b8a9ef1f33e85912c5a9e70ce5fd885727bcd SHA256 19b9232a48a904243440581472a71f79bae7cc9674d26d875a6ab0b53ccee75d
 EBUILD glibc-2.11.2-r3.ebuild 8375 RMD160 800dbbaf586794c984d02375a7d984b9d4b6f69a SHA1 3b5c162b3aec1ffe113a264f753f2975118e8adc SHA256 fae93ee25e1ca48bbc7876b3cf0f11f2b146b184420798195291ce79ef7f79b2
-EBUILD glibc-2.11.3.ebuild 8377 RMD160 e85dc3f23ceca4b3d110b355b2ab2bcb86c3e240 SHA1 bdf7471f9063116c414f37c116e7d428a1eb771c SHA256 a6a14bb059661f64a380cf80583b08aeb7c74df4708d80a9de6249546dda95a8
+EBUILD glibc-2.11.3.ebuild 8378 RMD160 a21e371ca74ef1911a150dbeb09241a28f475d60 SHA1 05995b783c185c6ba82461dd91dd444894e52bd9 SHA256 89549712c34bdfac13c8ee263535c576d734a9f0e8537e25df96f61b58fae577
 EBUILD glibc-2.12.1-r3.ebuild 8742 RMD160 59a9f5cf261a657ccbe3c2913b6b64ad57c61c3b SHA1 5a190f7915f945a8ebf002b55dc86c27cfbafca9 SHA256 122b698a3f2519106636fee326d72fcf2f2369eb807ef43d573197c99bb252e3
-EBUILD glibc-2.12.2.ebuild 8740 RMD160 84fddc96440cc059b1b67b65daaf5e1380d0b6d2 SHA1 5190b96eb0294f3c751a18fec0a390202a68720b SHA256 691a4677af538f61a84236a98638633a6de90f309439403efc0271f665478e0d
+EBUILD glibc-2.12.2.ebuild 8740 RMD160 2630d8ca3ff0afb730ed157b02c7989146e5435f SHA1 b326995c8fc11eb09fa97eacaec4737b732dd2ea SHA256 7d96388127871ff075f139f17175ad42c72f1bacefb8c9746172fe0b355a7e68
 EBUILD glibc-2.13-r1.ebuild 8615 RMD160 f660abd89da733451a54c4c8aef8f922e5bc9927 SHA1 4d16fbba7922ae1309da640a1561f96e79c379dc SHA256 1661bdd4205a1b29a41d067a93faeee3043e7c7675f73d1bf10146e36c82a5df
 EBUILD glibc-2.2.5-r10.ebuild 4756 RMD160 4f255886949a3a5d1ab7d41325b6b23b6d15dcbf SHA1 457db7a16a2ac9066c75b4a5d23484dcb0a8492e SHA256 9db3d80305f1c1318b8b111949c3b7980be9cfc1437144b022ff7ff39fcbfd0e
 EBUILD glibc-2.5-r4.ebuild 38423 RMD160 d69065dbb8292d3f4db94ac5f2c6831835516615 SHA1 ac52aa4d3b4c525b4418b15babd666b9fd3d63be SHA256 bab027fb3be23d2a80444b3e28c5214d950afc8e6ed4a98242bb2274595e2a3f
@@ -86,12 +86,12 @@ EBUILD glibc-2.7-r2.ebuild 12941 RMD160 461ae1f64ad710426a485eb5593f1e13c4a618d8
 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30
 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c
-MISC ChangeLog 133824 RMD160 9cafd7809499bd8291853738576be404ae38e90a SHA1 a98172dd396c1d4313c1c2cb5e905c4f38f530fe SHA256 134d2a219f81b5393fe270dcf9c1b014726f58e43a9a1ae1f39ded037c420e89
+MISC ChangeLog 133976 RMD160 7d34fcd21ec7e82e355e210ad87d6ac09344fc6e SHA1 98cc0460b50810833c93dcdbe347ac8afcf992ab SHA256 74c452c153c12e1f331f8fa86f883125f1466ed146b0c73a8f4c2d17dae5d51c
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1tawMACgkQnZsgo/h8kNaVzwCgwdA0sXxceZbxMzs3hyJVQIBS
-mRgAnj3gyrwNcNq9aA7Lw7UGthd1CnXP
-=/C1/
+iF4EAREIAAYFAk1trVkACgkQaC/OocHi7JYp7wD8C/EEJNQ8QZMsPnOMUPNmslEQ
+mnNJ4yR69eS7xUR1GtAA/16x62bRXHext00Bhg2GITkj0810CY4WQyPN9d03L2R5
+=PAb1
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.11.3.ebuild b/sys-libs/glibc/glibc-2.11.3.ebuild
index 0f0720270f72..8c91b694efba 100644
--- a/sys-libs/glibc/glibc-2.11.3.ebuild
+++ b/sys-libs/glibc/glibc-2.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.3 2011/03/01 21:53:46 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.4 2011/03/02 02:37:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -25,7 +25,7 @@ fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="1"                                  # Gentoo patchset
+PATCH_VER="2"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER%.?}                    # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
diff --git a/sys-libs/glibc/glibc-2.12.2.ebuild b/sys-libs/glibc/glibc-2.12.2.ebuild
index 47b0784c8c76..f4f29269d896 100644
--- a/sys-libs/glibc/glibc-2.12.2.ebuild
+++ b/sys-libs/glibc/glibc-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.1 2011/01/09 00:55:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.2 2011/03/02 02:37:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -25,7 +25,7 @@ fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="1"                                  # Gentoo patchset
+PATCH_VER="2"                                  # Gentoo patchset
 PORTS_VER="2.12.1"                             # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires