Grab a few more fixes from upstream git/tracker.

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

3 files changed, 14 insertions, 10 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 01ff8aad3c1c..8260c16e7fcf 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.783 2011/08/19 23:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.784 2011/08/23 15:28:32 vapier Exp $
+
+  23 Aug 2011; Mike Frysinger <vapier@gentoo.org> glibc-2.14.ebuild:
+  Grab a few more fixes from upstream git/tracker.
 
   19 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
   Make sync_fetch_and_add warnings a little more user friendly.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5834dca07c60..4d53da77a596 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -36,7 +36,7 @@ DIST glibc-2.12.2.tar.bz2 15667759 RMD160 1855ebbbca52dc036de159cca720f6153e173e
 DIST glibc-2.13-patches-6.tar.bz2 103372 RMD160 bedadc250a515f57dc7fa23a4743ad3b8ecae9a8 SHA1 a9eccf14fcac6441fc206de4ca23e7b6beb6b3f0 SHA256 86335122c8523bf588b00508f656d5343e44f13001ec4fca088c127417e18846
 DIST glibc-2.13-patches-8.tar.bz2 114419 RMD160 6f3f1542184d9765b38f599297514e36b11694ad SHA1 73887ad82a102a7fde091e54c7284b8ce2dfcf0c SHA256 536d06763d87ac8b43517df34bcf8f0cfb9263eec8dbd2f2d6cc0a510f7b03b2
 DIST glibc-2.13.tar.bz2 15725729 RMD160 cf34e4a06a2602deed709e2ee10cf7446a824989 SHA1 14d83dced873a21a3da6a0bfa0926f40d82ef980 SHA256 0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2
-DIST glibc-2.14-patches-4.tar.bz2 87382 RMD160 2a4d8a44da84dca45145110e2ca7b68c3f69a426 SHA1 2e835066d7e9047e0a9938bf04153189ad163fc9 SHA256 a8f739c36407b56aec9e488b014188c4ffec9147d1f18d56e70a0fb0991541d5
+DIST glibc-2.14-patches-5.tar.bz2 87904 RMD160 d2ec86d5db826553d902e67f7f648c4ed0921e24 SHA1 91e5ed6e3c5c422978684770eef86ede2c16aada SHA256 b815c855ddf27eb435eddaede90fadddbb0db977fee2c22c0684a49e3990604e
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-7.tar.bz2 106373 RMD160 06fcd1e07521942e3edb822719e398a5a45a0bf7 SHA1 a3c63e638b99a5b4422cc0ee54c0f75e62b59662 SHA256 165d7d9babd332b115ea7e72f879ffab6ee897b761aa052f1b409a028a731b53
@@ -46,20 +46,21 @@ DIST glibc-ports-2.10.1.tar.bz2 584860 RMD160 1f094d4df18306ccb01037d07f0a0e3014
 DIST glibc-ports-2.11.tar.bz2 599606 RMD160 e7262cb903b42d27bd0666fb170d2abb4c8b478f SHA1 76a0513c74b80e34f81abcaabbc538fa0f33b6a4 SHA256 38d212b1a22ed121c97f2827e7357e3e077084635ebc197246993d328b1b6589
 DIST glibc-ports-2.12.1.tar.bz2 621800 RMD160 98b5d5f544336f16bfc8af193e5c447ee6c197ed SHA1 396c1e3958a7563ebdffc8ada8e142e0d6c0b225 SHA256 3986c166d08c30b83c9cc7d972651550b548386d5a02e4e4c985d9832de83110
 DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3aa6a SHA1 1cc771b4bf80f4b0872a342763f4aa4a9a9292cd SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a
+DIST glibc-ports-6cc02c7.tar.bz2 630607 RMD160 070c9c0ef196e7f3f79ab920a98219b222cd125e SHA1 e178203449b5d882f7b89dd6d507a1d50d7d686b SHA256 23921bf3040c12b78fd3f99e564b301f141cc14fceee65e1ee431afea5f38583
 EBUILD glibc-2.10.1-r1.ebuild 8134 RMD160 caf886c79a63e70de533274e6c910ff2a4daeb13 SHA1 1ce93d47ab0994b2581d5bddec5c4b6b4ae36856 SHA256 45c57b61e79f971ed97cae021d1a952478c57e136bfde48c334832ac81ab8536
 EBUILD glibc-2.11.3.ebuild 8344 RMD160 d16edbdf20cc3757ecdd415c439efde6c8d32f4a SHA1 ec5bbdad8e12f427a287125705fc479d572c5f53 SHA256 00c000290e8933082528b3e8f87fdd3afbc9ffa1ae41f666b8097443e0d6c53d
 EBUILD glibc-2.12.1-r3.ebuild 8716 RMD160 4974eaa02a6712aa918dbc4f7d266bac5d8c99dd SHA1 6ab92a29268d7aa2923c60458a24eec3b1ffb55b SHA256 16dc1a2d765c02873c3864d7e3fbc96ead1e9ce0af6813d8ede293d3cd81d9e5
 EBUILD glibc-2.12.2.ebuild 8721 RMD160 6ea5b296311cc9da0fb912bf21a166ac428a2273 SHA1 8d831dcf6b1475bd3fbd18d6673d4aebea59bdb6 SHA256 293536a87b7929b3b447e4bd3130ba2afcf735bb68a5ac489c823ef5bab35b6d
 EBUILD glibc-2.13-r2.ebuild 8618 RMD160 f97a8e83bf6cd2d2e7a0e3495784846d3eea511b SHA1 7e8efe0fb0574d813f8672f0306b4f270df22d40 SHA256 22b04f258efc03abd1e5dc0aa2e80e2bb0fe310201d9dbf7855275db71e6fc0e
 EBUILD glibc-2.13-r4.ebuild 8621 RMD160 abd708804687e041ca7b69ace94a0760d9d64e7f SHA1 1b4f91c3c4a199f9753945507960a3f320cef29b SHA256 e2d5b6563261bb719f30854e3fc34b698ba1e4445a73bb97601d2b66c670b5c7
-EBUILD glibc-2.14.ebuild 8589 RMD160 fe47820cc647f1f9c5f6db2d5235297b5243746c SHA1 73205df6ec41340e2bf6089e3035d8a0fb0846fd SHA256 ab153a96e31c0c57e953026a1289af31eaba6fa3e0719da6502096f5bfbeb589
+EBUILD glibc-2.14.ebuild 8589 RMD160 4c4457b665ba4ce191a8a0c2b0b7744c5fce5ff0 SHA1 dc4bd64291acdabe12004927b7c1338a637c7bf4 SHA256 2aef29dd791d084b8e6f4aa745d5897404a55a43ca57dc54962f3230e8cfc676
 EBUILD glibc-2.9_p20081201-r3.ebuild 7776 RMD160 d39bb361d39b3c0cea8a2fff12a78aa5ade97ef0 SHA1 176d5ea4e8dc116f2de3b589551a8ad6b56c98f7 SHA256 3dfd5c6bf0983d723cebc491f1940e446210e48b485c6b9a8fa9a4b929e3c29e
-MISC ChangeLog 139850 RMD160 9f5ef2db24c8dcf3840e823d689ae95621d4a8a9 SHA1 6f56dd69f659c350c8468d665adaf1e9bcd09ed6 SHA256 bbf74a8d6b47974d1d683819d82f02eeba797c677c02fede60c4a8dda08c5625
+MISC ChangeLog 139971 RMD160 73652fd46a16c707c5d4b2124f2be514a1aef924 SHA1 f32c0cc01997b48565b3f20234022c717b24e58a SHA256 7d453ddd3b1a58677c29efc132d28a6cb80c6198ab9a00b646de815219285f67
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5O67YACgkQaC/OocHi7JaJwAD/TOk0vBuYVH1AXHZwGJ8KG2NH
-9AFMuxTc04FujMt4JPMA/33Dij2xROBtkX33MjuX18S2fI/AbNhmwAXxtAG+BHbE
-=Vp5c
+iF4EAREIAAYFAk5TxyYACgkQaC/OocHi7Ja3EAD+NrWXOSdddyOSChzjISc47J+3
+W0jLIjqf4HJNO8R4xxEA/iZMJeRKH8M7rtuhtVBqbHtphLyZmOb4xiLTRKI6nHbA
+=cUra
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index 175d8374c408..fd7463e43d84 100644
--- a/sys-libs/glibc/glibc-2.14.ebuild
+++ b/sys-libs/glibc/glibc-2.14.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.14.ebuild,v 1.4 2011/07/13 06:04:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.5 2011/08/23 15:28:32 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -25,8 +25,8 @@ fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="4"                                  # Gentoo patchset
-PORTS_VER=""                                   # version of glibc ports addon
+PATCH_VER="5"                                  # Gentoo patchset
+PORTS_VER="6cc02c7"                            # 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
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires