Fix from upstream for ia64 atomics/semaphores.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 22 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index aff1593347d1..a88b1fdb58ba 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1062 2015/07/21 03:54:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1063 2015/07/28 09:07:27 vapier Exp $
+
+  28 Jul 2015; Mike Frysinger <vapier@gentoo.org> glibc-2.21-r1.ebuild:
+  Fix from upstream for ia64 atomics/semaphores.
 
 *glibc-2.21-r1 (21 Jul 2015)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 390154743d57..6c45d9154d3f 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -50,7 +50,7 @@ DIST glibc-2.20-patches-1.tar.bz2 78477 SHA256 b3b1c4022503dc433cc4969534f27ee01
 DIST glibc-2.20-patches-3.tar.bz2 30916 SHA256 c10cc881a1ee587dcaaff234c8e05dcc6a6e4d4bbafcae21e6267616a20bb354 SHA512 cbbfccdf0ba0ad7fb740a557a246b647c020dd841aabd256c34bb8c5f4aac2ee0ed50e5f15ac28a161e294a9a3803560317bcf934cc938daa58111d7373b1b66 WHIRLPOOL 2889809da097e148bae7769316f7a744880fce0c1cd74ef16e45e343c5aa02f549ff6f9e13ac114cb061b914d3517151ab803af5683864ed09ebc72326561e64
 DIST glibc-2.20-patches-5.tar.bz2 55986 SHA256 3d3eec9ac9b5d0530f9e05614f4646d64ff93a48865b42c156990bea69247cda SHA512 409f59a028127e02f0c9f91107715b540d8d234475830adc17108a02664be232098d119b43bcc8df9b328ab50c1fffb0868d510e6487ce1c34ec2c7c7a78375b WHIRLPOOL b3c41b01af5d8ae8e901ac48ae124e13ff1c76fbeb35315cb9630c648c03d7abbfb753294cbdfe1dc939bda260e24d8450ffb19cfe5c255b32f8c5500f2c43f3
 DIST glibc-2.20.tar.xz 12283992 SHA256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa WHIRLPOOL 042f74d75c62a655ae35348c9cd0bed0845ab199e37a76635eb74c04ed927b5eca77723c38d2dc46f12fca62c1004001887b43946a914b079ad22f6a9cc8daaa
-DIST glibc-2.21-patches-3.tar.bz2 30954 SHA256 44e76732ad414cfb55ddff4ba3ab23763d55708b81a720000974abc4c1eb9f39 SHA512 e50e4f9e3a249b210e1a14b40533ec50c393d8829a794ba5ea2063086ecb6a3a284099d6ca43beb28cbc952804794ed2f73d2d97e090fc0c21477417ca96e5a0 WHIRLPOOL 54a33326924d805a0dbfeccbe3ff024769fe2989e84cbcfcba6c643197cb0907e109f0c13b76994fbd0d2a02fa9288d12f411b52d44fd24b280e77bf7c1b3b70
+DIST glibc-2.21-patches-4.tar.bz2 32021 SHA256 2a77ab05ff0df464a0f2deb642d9ac9dc7b42d94b333e1db033ef2a33ba0a8e1 SHA512 39e128a550617d9b692e9ec12e77466767907e5066f78141af3089d06241282f06cf333fc9f7c932c5d5ecdd5020fdd79bfb33827332cce765cad2bcc06758cc WHIRLPOOL 98cc3324127c91c97e59f705a05b46abcd499c345eab873605d9fc3e456ec103ccb52f97b2aeaf59b4bfa5f47ed81cce32899aed3d7d46d201f3b6657c00c1dc
 DIST glibc-2.21.tar.xz 12322092 SHA256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d WHIRLPOOL d07fec32bd92eade065a3b6170932b8bd41d07df4aa69dd5a860ebb9678c22bd1e20bf88b1fc05c3ecc18e709c0a63118e12525dc668e0399d7ef7fe4454702d
 DIST glibc-ports-2.13.tar.bz2 625945 SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a SHA512 39ed578db363dab05e54d5272d3a8a0600493b91985c65a4d043b5a88d617ff46cca2d66d99ae69e92282d8f8a2357e79dcd5b0ae45b505497417d5137866ad6 WHIRLPOOL 766309e315f2f7edbe0b431691ea16f9917dd2f1c8d54b707e819b695f26dedac2d60c3a58499ee1b51a218b982e9930e49f79db096e166576c215a6ccac21e5
 DIST glibc-ports-2.14.1.tar.bz2 630641 SHA256 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9 SHA512 4ed18be51e2dec4395bf89701b32e443ba02e4e6b26ee1a72684a1f84ef302d58ed8b58f99e4e0ba3f539da0ade668de5881bb2b86fcd065d741448d9c129bae WHIRLPOOL 463aac8660f7f8d9d6e4ee5728aef2948892a54dc250d0543ffb3c2fb636a816384d5984631ab4420b98a51254d62b4b0ad8381a8006ceb1f632de135155939d
@@ -67,25 +67,25 @@ EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca
 EBUILD glibc-2.20-r1.ebuild 6222 SHA256 8727c37f0777c5e5415622766c0770e2344cac050b3317cd9f33b8f07ce71b7e SHA512 46de3aebd273a88a8b0f859f5a20bf1a8ab30a76c95e8b437160ed91fc39e372d7143e5556739b7bc1012638349ac985feb3ba07c733817e4a59040f321ade43 WHIRLPOOL a9cd80481a671ccd80a006884214106d0bd08a0455568bb40686bcfabd9c2b20dc0fd44aaac8ef1dab31f08b903255213cfd21d2e3f2f5f82ae04f9d23a46141
 EBUILD glibc-2.20-r2.ebuild 6467 SHA256 b79992af6f6dce82ebefd62e759d4c8d6cd8d657aa700eb4ab1457c87650104d SHA512 977449e7916c5cd56eb0b250d46e03606c79e31b654b2af85c4646432dcdeb6a9fd3e6cbaab4cbbad2954fa451d645afdd39fc19f8cdad1a4a64021c4ae32b09 WHIRLPOOL 60a1561f3e870c8a70f193a7657aa51a2d962c422e0857f73a6e8de8a94f32a1917b4453fe661e5d61468fd2184cd255c5fc221932d7bbc6c09d7b1c6a86e048
 EBUILD glibc-2.20.ebuild 6168 SHA256 28bb3f0631787df2ff60a97ca9d7c40cdc31c8f411db86d977aab4592cfa1921 SHA512 8c046b30aa0ac2512bc4ec67684857e05bcfa3d4675734682fa79339c9c8255ee02f89bec797481a32e2d63b95547c9754b318232b205d69e65c52b49d5b2cc4 WHIRLPOOL 96838132b77387beb50ab2e02772e7f98a7713717fd010ac77a3979757a15537785b13ef58b5669d13658161174d37d37f3555720821dc83b241b7d647c611f6
-EBUILD glibc-2.21-r1.ebuild 6453 SHA256 252c6544a04aa5d5d39dac6c948b0cdf52dc0de586c77de68fc2e1ee47244639 SHA512 489c55e9acf5d709498364b4023927a0d410f8883a600102cd9f28d9a76b5efcf08d12df4391d790ab1b24cb30797c09d7cb16c49becab7556a7f12e37319889 WHIRLPOOL 7749d5870df9194a0f2c82803155a53420c28585b06c5a4f08702a0fcc1ea59e371682add417d83fea2eba64c21875a416bf8822adfbefc3ffae7f51f60b5698
+EBUILD glibc-2.21-r1.ebuild 6453 SHA256 e11bdb5681e892c55d2bfe3ee4cfb00a651de983b2e5538b098e9b39a3fbfec1 SHA512 b47d66022b269995a980c996aaee90cdddfad6f6336b79cba540952c8a44eebd945563cf02ba7eebed2129c117542bd7fab49411353af566156cc51dae7560c1 WHIRLPOOL f8214b98ff398482e6a2dd756a66686b21b86784c6a42947b3109fc9223bec1563a802835028f24026026dd5620e788c68d8ce56350b8a3db10f45039b605199
 EBUILD glibc-9999.ebuild 6196 SHA256 f3a4708bdc99c597105fa17d769c04c8d770718f0e905c5050e678c97a896398 SHA512 8edafd12ee20e4130cc61fc0b70dd8f790745a85c0719e5eeac5bbe1d3be4d5f0ec79382431cfd3c9d1d8914523e1a43beb6412ba2849107347959f3c0ee45a4 WHIRLPOOL ceca61c66c3e1df52098590053e67122d882a1a9a38b1d5671a731f262a7e971b7b9783554ccb61a91ea2e01afc76c5b9edb83ff895162d9ba57839e5c12fbba
-MISC ChangeLog 77564 SHA256 aed691df0518e479029b6d3ee236b7b722e480ebda5e8730b4c47528a92a32ef SHA512 f264eee99a90f5124f368bb7a9b78f3ac65a315febeeecc46e6703448241b86e2fb2969e325554023a86e58aaf40f14b13963661f58e568fa52fc5d9603d29c0 WHIRLPOOL cd38e390091834d12940e0caeaaf4ced9b376151cb0e74e2d7aa9ee9e2f7ec807a27244342744ca1ab97611e683ff0cced3895bbba506d50a71311a0c0e1babb
+MISC ChangeLog 77686 SHA256 125c1bef3183185accbeef04ca148ce11d9c4423318c3819ebe856905dda79e7 SHA512 41ee63e4f0f0341680150c334eb6a080f98d7865c536b5c7d0fde33a34da4131b08d6af32ea4ea16b6b76d8f59925a37184eed1726f40f7a6b08dfa5c3830401 WHIRLPOOL 5a94ed915572b84d446e0f2c3134c510865861d3a6108f992e1db21e13d3956e123671bc910e82da620d0419a55e038d9c2cef626c0107ad9667b233785f5f4d
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVrcJaAAoJEPGu1DbS6WIABiwP/RxM2Xv3w3KVKoLeZUlDIaxM
-byOii8p8GZjPZHSl5iy9DTo8NQ7UBjAw/o4zErD/qy5Ex8JCZanurzgn3hazojEA
-kYDxEon4Fh9uI/5gFxNHPUPkhIU1HoKX4Tr/byRZLzO+MthsshTYw7obHjB+YXx9
-ixd17H7FB+bQRE3apAhm4nAl+GMf8cRHsaBtREgqPhp/dVMNjBYmGi3bGbbzGAhH
-pr+DBU8KGYS/87qy9jwMHrlW1jMc6PglMtX2Dl2EtSYJjqVTRgzUtWjSI1m8jZH+
-M+PdKiOokTEgKvYuGcOjpT5ShhIPCjOTzkyou3DYTyiLCYoeJRVG3GwKyZJAZdAq
-aR4MHNcAIw4N5hTNuP/5LAxVOYJUZUKR0+FLNnQedmyBQa/75Oke77hy9BMQOPd4
-Z1jqsyYbXIkjx/4IA7FrphXLg6Mg+zOjFcThGlfVGSqMkA0skzYJb5zrkxZ0NxxH
-v2K09XBqXIvVILbNS6+hJcE8FxDJrxLwTl/u+42G1Q48SiquBUxD5F9sm7cWKUD0
-hxHiz5yRMWB8LfPeXTdoGv0aHjpvOKMABMQjgoVio9r8Ze3YxQJpMuzXBYUQxPWw
-hdztYbDRFM8h08Fwz2G3ne9vnU4Woso7Ch0bVSwLsh17nvsjdafXPkD4wVBFZZfo
-OSGXKM74NmAtKDqEQhLS
-=/f6r
+iQIcBAEBCAAGBQJVt0ZTAAoJEPGu1DbS6WIACFwP/RYmMTdMvl4HE9yNrNuy67xp
+3qBRP+0XmUDA95p+0uIExDYMd5x+rY5Kt8HKFga8/o7CuItvxo4ncpQJXMUC9tEb
+pCs9M2wSmGD0raH1xu0K8doRlbs+PhfO9eAD9isdC0pnahtpxDU5BdLyv8Paw4Qc
+k+Qqc3fj7X+8o2TiGutrrzGqEpiOVGcC1OgIHFX5VhBbI70U6dtoE1MNn2oDcyAh
+oE6+0RAX/ln1lnewNbPYwhfrQw5gowSbGR1QI4CB41+j0RyrSX/AlLNRvP5JDKNe
+TP6uROV5Ech3ol/0OUNhF3gP1Tsc42HqyWn+bFMQ6Yg1gzOilagDGmUbY8PEtaN/
+aKc9WswL66XDMuEE2DBAg1OatH1e7/dypNfmRKOqxtt0JNjSvwg+2JQ7FqJv/w5+
+E7rXDW+p3QUK0erYwv3/3KUDpD+ogXlgdvbxTgbGdW3uHU1fd13YNXC1Dv/dino8
+omS9jQh/CM5lHGot+rVpOKCLHnChzdi7G+8XyqpfpEHPjmLZ9F+U0DCl4clGXYvg
+2NOEgiZbZyEomCnkpmKD9PmBeOlTMa8vQLifYG9uS7ifX1s+ipUzqj1vU6J+2Hcz
+tKE6xMcHToElvyGY9StVr83PvBgup4H0xb/QA765rCnRkxTHncZD5lKD9T7VtkhE
+14FT0lvnFzQu8u8c/10P
+=EvkK
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.21-r1.ebuild b/sys-libs/glibc/glibc-2.21-r1.ebuild
index af08badb1279..f774d99c23a5 100644
--- a/sys-libs/glibc/glibc-2.21-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21-r1.ebuild,v 1.1 2015/07/21 03:54:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21-r1.ebuild,v 1.2 2015/07/28 09:07:27 vapier Exp $
 
 EAPI="4"
 
@@ -27,7 +27,7 @@ case ${PV} in
 	;;
 esac
 GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="3"                                  # Gentoo patchset
+PATCH_VER="4"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
 IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"