11 files changed, 72 insertions, 563 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 3ca51ec..8caed03 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,17 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.939 2013/05/12 02:28:47 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.943 2013/06/27 12:19:41 jer Exp $
+
+  27 Jun 2013; Jeroen Roovers <jer@gentoo.org> glibc-2.17.ebuild:
+  Stable for HPPA too.
+
+  26 Jun 2013; Mike Frysinger <vapier@gentoo.org> glibc-2.17.ebuild:
+  Fix from upstream for localedef behavior on arches where MAP_FIXED requires
+  SHMLBA alignment #471020 by Jeroen Roovers.
+
+  23 Jun 2013; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild,
+  glibc-2.17.ebuild:
+  Fix from upstream for qecvt func decl handling #450714 by Dennis Schridde.
 
   12 May 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Drop obsolete use flags from metadata.xml
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bb0b7b9..8f6a0e5 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -4,9 +4,12 @@ AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 SHA256 dcf78c6524c222
 AUX 2.10/glibc-2.10-hardened-ssp-compat.patch 4802 SHA256 bd6f0aa8eace0a935731749e101d5fe30210f9edb65f2f5ccd425cef581ddce4 SHA512 16fc6cbf366c3a0f476f28da8d4e465b1d894f68d33ebdb02de60d6b22bdc6341915d8529952fa4213b11c377302f18a63c462898fe0e4b13f5ec9e3ceda96c7 WHIRLPOOL 059e84269286b285261cc57846b34462524661fef3582396a6b301ee2dd156d2511c88f17f52679e4d5fd96ae0ed6673c8b75a32048e40efa87fad34da6cc066
 AUX 2.11/glibc-2.11-hardened-pie.patch 1492 SHA256 74277f76ace9cb6b408ef7c1d43a3604ae0d6c1af539055aeaeb542d2bfa2a46 SHA512 31ad12fdafc20f783bde32fa3cb477e18d19c5436309b0023284c3134f99c849b0281ea7815ae7509b96f1a88e9c24d52805044cd1c65a88a1a62eebc519a0e5 WHIRLPOOL cf3fe8c5e164623bf553487cf589f85eff28d1073e55a87ef14da716ce313bfaec0dadbf322f2e705c1d4f975458d9cbd6f2eca268a9dc5dce16e54305907aa7
 AUX 2.12/glibc-2.12-hardened-pie.patch 1542 SHA256 9d11da52900a4cfdaa9052476029cb1b4c8004dfaef3cf446f3b728035f75fbe SHA512 97abb62a72d95b07f546658846718755ed78286b11cb72b2cf6ebc809afb1e775ca860e3903f9936ee54761b6d6bb309e822957387900454dd3c66be35ba8148 WHIRLPOOL 4b9b95d1c6c6e02ba21ec43f382a1d932ed8be5ff548a828c3e9a1d945c44cb8435fd502f6c8becf6a2c19bd23c77ad003598b3b3b68b7bad5a5af79e92d6077
+AUX 2.15/glibc-2.15-localstatedir-backport.patch 412 SHA256 465bedaaf735a48825cd6433007abfb1e40c2ef8ddf94d12d452b486c70ce36b SHA512 76506a540d47ad7e76073c3b25bc46278a9e56e34e17d49caf9fffc0622646e8e0d6905fe7d00599db02f444420ed0b9d64d3d70df78446564b137fd65021e45 WHIRLPOOL f21fb6d6eb3555421f7d90b179a7a2745e7056316eacbf209066f01e742037fd283689c5a5f5a313666a2fb79d5ad0631dbada94d9c7eb958ee01217b605533a
 AUX 2.16/glibc-2.16-hardened-pie.patch 1570 SHA256 9a8d8a8268605251782b1fba509cda090f39f56edc8a5497c7b4acfc428041f7 SHA512 1dff16b1ce4ba6246336d19fac21ea6e8d5710e138a23603fa6b79896d895834b6d28bb1948c83648120ca1d038805db7dd7138ba3e28e9071254d6320cdc092 WHIRLPOOL f96487ac4bd95a99e9e70204c686c3f19bb8238cfd4a9856b031be58ac23927886f228a8b4add14213e0489a204c51ebbeb8a376311305025116b8ae45fc90c2
 AUX 2.17/glibc-2.17-hardened-pie.patch 1784 SHA256 bba32e40c73aef20122b2825f31e5c3aa058b61feae4f32f336e1941f83f82d1 SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc WHIRLPOOL 1baffbef9e6d870ea2f2ae5be014b71020a213a1a11e9856fa207545867de444ed164cb926b2aac23471854eaaf72a87e38760702b32bfcfa639add8733d925e
-AUX 2.17/locale-gen_prefix.patch 2340 SHA256 4eea740a98fac5837abae6e8fdfe14721cc6455477718eb868993ca46a6d7f57 SHA512 311d59138529a9587ccf78bea3aeacaf284ce9a184418b7367c98d6115415e64ca8abecee0969cfd38ef65e4b975d932fba0165479a71ddb9fa12b1d7ddd93d2 WHIRLPOOL 9ae651653dbafbeeb2b8b3bb58898e017944c15a43e11250aaa7b196caf43b341ab158688138a8dc5ca5d3e3aa6461688d41e696bc24f9b183c1e34e559b6d68
+AUX 2.17/locale-gen_prefix.patch 2704 SHA256 0807c8979b7a1a63b48d155417ff8ecc7e14773e928a0d1fe6c349a36fcdadef SHA512 d6b41b953713f7fe0ba14af6d045fc0e6b649f278da691ca5f021d95be5cdabfc87de399880cf988fec2b189fac22864d004ec8d159e59a2348b41945de1d5db WHIRLPOOL 3c7d6b4e789ae494cebea620ed64a6ba8dd401837914f4ead72c7b2d6af94538c9a28f65781db7e6ae0d21c7fac13c531b71147fdb5456ffd39ae1246b331069
+AUX 2.17/vdso-disable.patch 1136 SHA256 49006855c1ba3ae3d3aa5ed71787056dc64e993eec70a4bef05bcc9f4d824014 SHA512 6eeb6eae8b8c1777ebd18170a7651b9e95297125cfc3829786c4d02887cad4a5d768fc2950723d1d040d16d15d72491d7443a3c14ca9f20eb2adb1ba6d1649ca WHIRLPOOL 80367da491b958d0b7855d23d3225a5c17a3a7a1b1f9a54ebc093c53823a5ef1642b974b45e079aec0abff0476494368ed9afcaed83b87576ed8458b8348e41e
+AUX 2.17/vdso.patch 697 SHA256 26f2089344709de9c1bdd2f974d02ff5d4c465f6ebebd5d1ac2cd72b732de201 SHA512 a303a6828ed001b16f2f5c3532890cff66a50259c2e2aa2843e992f2bed5e6141abc9e120afed25f2e1f30d77bc218c3940d680c3d73c227d2056370d5e6b806 WHIRLPOOL edcaa815b8f86e17d77f0582453a717fbbd848400bfdbd302730fec20a952a584ea8f5ba4f7175b25d84752bc895519d7baa55664073cae5037962b0c1825aa3
 AUX 2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329 SHA256 b5cf51d1ff5479d09fbc82992f126ca4969006c90c3a2ae94ad586d4902d791b SHA512 939ec7da977837ef46aa8894f99ac06b3fccfc36dd672889b85ae8cbbfc9a963c5d0c031d776aa2feee29ddf8341b4cc7a50ea19b7c6f7e80df74eef5f1fd977 WHIRLPOOL 47d248ddba815a517aed9b7dbfa247bdedf293cb5adad8079be803ea4a682136f01b47fd3817a1696b3758c4631d1a25376bf58ef039998ace4a6b65807fe75e
 AUX 2.5/glibc-2.5-gentoo-stack_chk_fail.c 9058 SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df SHA512 2d404bec1e009d111b775fde620102b3d0ea7614d07ba31350940f2693e937e825acc43d1ab94bad2eecac61d47c696098327096dff8f08b4b7312d0873d71a6 WHIRLPOOL bb27ef90afb256d3822787b93574d4f4f5632995663e08b7201db17a4f38f6e2a8fd6368aaf699a808cd8f7acc346625b5607dcbf1e88f8b28dcc6d3dba92399
 AUX 2.5/glibc-2.5-hardened-configure-picdefault.patch 794 SHA256 0c0359f567e4ad2d3184618bf6ac7e6102b703eab6227c7e9a4ff4dcdeed2c91 SHA512 99caace6c3528db400f8039c3f5aa65a2d5088d9758894c8a49df2b5045226a4056972de2d162411617162edd9023b6c6f80d85509638b5d68a8d0cda40adafe WHIRLPOOL 1271cea2155149e789f1242759e516443c5cf152ae9612d91d2a25a727952684eb043fbcfb38186a31fc6a1568201de5ef40af45436b137453e0582f2f6facde
@@ -15,17 +18,14 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 10901 SHA256 03f5cc0ec972f9367adf1843c00b4255f81e68df9223a2236fbc0bc994dfa629 SHA512 a7a33fde24775e4b1259c0f657798a295af0488d105e35a2f7534c05c17e0fc113fd3e5f9b0ca24aac1474aeabe9c139622a283ab5e7416824f5ff1f2ece9300 WHIRLPOOL 2f5797fd92bf9dc3ee9ac2c8cc095476c330e219c60b6bc7346ec52b212414b7600158bbcee51ce32417bce5c16dcbd837a6b50b02986da95c54300f7866aae8
-AUX eblits/common.eblit.rej 327 SHA256 fa1fd7723ab34b564ec8e1512c13c380e6ea3c85b08f3fc3f8a8eae7adddb94c SHA512 06ad7a43e850785ea53c1fcdafb680778c355fb072b89b4df61ac7de9c3ac2b2939185addfac841965ed0350eb00b7f5d113d47a2a22d85cb6f25c5a78f3aeba WHIRLPOOL b616f952040a60d8462fea91790f2365a01d73e1bf2c41ba95d18e6379490b31d91b389d0c395fa696c729f1a0e93a6be601df5bf4c7fe713eaa1eb333f734b8
+AUX eblits/common.eblit 10936 SHA256 daccdb9645d2fcf214ba16500ab74388b580f18a565a52157c7d1f7a3da007e8 SHA512 11e39b4e716431225cedc7ba8ab5261489919cf83e4ed0c7de5f721e12f38458bb53677f15167b3a993cf419bd13e94cf8cd58722451c547e1fb43e3448a122a WHIRLPOOL c5fc42a97f5dd63db753f5717388ddeb8d555f41cf00bdd10d558c6da2b7ddc95b76aec1a9272efeb7fc172e368bb6ad31a6853644b55daa43fff3ad4da2d738
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2287 SHA256 5cc4ff72c7637e5f7a1534b805250ce69e4c5bdab211b39831068cbd8e7af678 SHA512 4ed0d857568f567f4d707d6d90b596371b6a75bf7ef78bc5d468e7e3e65458d4b8e3d8df3b63bd3616f1c239babc6594880f69856d6b83923d65d6281de5a5d5 WHIRLPOOL 189388d6f9162efe10492d74b691be4a977f5621453bf56f1ac99d1b5106ef15519ee495a71b8e0ce5b2f9a186de42b93468156eb8ac645ec357731262a6d097
 AUX eblits/pkg_setup.eblit 3897 SHA256 eb384c601e2a48edd1f2e3ad591847d65c88d9560ce24efa69502ad75fc7350c SHA512 7af588bfdf9ac0c7042ca96578b7c1c9f67abfbf7d653d9ec1a811addafc9a800cc89d250f44a0570f9c02e8294a28b330eb278c020de7eed4c181e44ecbe57e WHIRLPOOL 271229a58dd9498bcaab420f4d5ab2648122c81b39e6611551cbd3f693fddbc9ae44787c34b7b68644d8cab270147c716a362fbe414602d8938d0166f2b5a99b
 AUX eblits/src_compile.eblit 7177 SHA256 5ad914a83c00537e68dbad7b354d865346e6abb8a736359b30aa5e1203eba140 SHA512 d68bac6b896219f13e284065c6f2e5f8ad080981c98ac9794cd2612eaea74744b7c3914dc4b5a1c1d3416254d6caffa05227a33adbb82360dab07c775558d9fa WHIRLPOOL c61d9d68386ef54fe2c89939afc225b2c6d8fe72a0bc3d5e5d90b38a601cd4fcbcf1fd399cbece20d6933f4ccbe28b224bafaddef0098aa26be16d5d6c0d9196
-AUX eblits/src_compile.eblit.orig 6953 SHA256 7a2cab65ad5d253be9d41a23d74c10dd1131eb6c4b75a4811db3ab9ac36240d8 SHA512 b2e18ae52dfc40ed4b8a9042c66110f493238d944c596e1bb04079bd110a8dc876d66e78ef3aa0b557eaedbf06f4ade417c83ad7930b12dc103d6334c033f216 WHIRLPOOL ea66c74cb145af7b19e5c01bf3498ddf52ba378b5119aa7957f080c28adb9469c5726b1fdc22487fccdb676d6fffe0f477c76a1090c91ae21e622323f4c19240
 AUX eblits/src_install.eblit 8240 SHA256 da21623cf7e439b359aaf1c838b5ccddb7938e6c896abe2d2e65a1d0135e1354 SHA512 b2e0cc313e3d71f8ac72876ee9bc54487e1215bffb9bf9b8b258b827f232d3c1d7d81a6061828250f728a3096ca5767bbf1298c8e55e59cc43c5cda6c6cb965c WHIRLPOOL 2ca7df1e56dbf70cddcad71c7aeb13c16c87df2eee4012e3c0d9d8df140025652b50f556a4c5e1a755772ad13e6f80309fb761cc76abc0d2c238bf640a3be5b9
-AUX eblits/src_install.eblit.orig 8582 SHA256 03f6caf665249b7cf4db897a1984b76271152002411b49ff5876cac07916ab4e SHA512 070e2c0980f02734fbce86b1b2b625c7908f23174b4215bfdd83345ccaa5236ffaf15be84b8e43105c9fd64753a06777f46eae2e33ab374cf34dfc058bda3a61 WHIRLPOOL 69f46b24b98b0c755b035551abdfa57274f2462fc2c3755ab3c27c866502042794d15e3462c9f2d62cac2bd389d4ad941bc8443a9d5ad69c9df1252fe0123a58
 AUX eblits/src_test.eblit 1278 SHA256 4cc565c9688292f1a195b4d9a5ba2d1b90ccc505e62229fc21d9fdf67d9655d5 SHA512 b058884a9ec43f047f10b6d61338366388dfb58c920e3f55baa85a9795750af7b8eafba427bb8ec59b1269853a4e4135b86a951f6513f64304461364b6f36a6f WHIRLPOOL 50b798092b0a9734767a8f9b7d3e1dc087d76e60f1dc83d6d5dde8aba48b992fb1b6eb6f07a9259b6fc4dac9bb391ab8972fd705be91ca15033d4d4144044e93
-AUX eblits/src_unpack.eblit 5177 SHA256 c22b479fb56eed3c67fe03039ce6167f878d60e183814bbcd585ccf7154d8f2e SHA512 a348198ee078b28855b951a67cd645729ccb6560270b7fd3a4dd52a39e0d089c4067de7b286e060e021fb2cb67d65ea134a22b6d66b2d1980f4c183a4dd852c4 WHIRLPOOL 91f76ed06a3a8ece260901a357d73ba50aea9a67a41abb569c322e16c711770fa7983c9c4a603db68a99075d001390cfc68bc50cc21e5ab6148d62ebb55bea0f
+AUX eblits/src_unpack.eblit 5278 SHA256 296653a28e5aa6a5ab2270686a02b4a8fe61fe7e638d368b42a81ddc66f7c14c SHA512 b650623f7d5f6bc5c9e72f2503a62aca18f52f5e0f5e33a81491a34ed22d46dee37ce66990f7a6c3acd91d75736d5368dee56d0bb191d076e9bdeb92bc11bb74 WHIRLPOOL 8671430359bd8f8fc92d10459be2a7cc034441324217cce3d4ceb3aa184841f3bc273a74a5d8c99affc83c7a88dfe4fbdacfb7db017a8c6363fe3883c6ce80dd
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
 AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e
 DIST glibc-2.10.1-patches-7.tar.bz2 113612 SHA256 6c94493e08c13072c94c967f55b659e6c950ec470c9677c43cfab10e24a88370 SHA512 6f1d575273ee354e6b9fb85d1a25b660e52fc77ed50bbe0a2c25f60d4ad11ed4560b27358d1b7a5412d5f1fafac2dd83b7ce5b1420205ef2d4906e4c99b610ba WHIRLPOOL 70efe90ab258bf15cf6c0b2ec826aacf25d4cab0d0e09b8883ecfdc34bdc54072bcd3330dd622b8f12ee6a1c74928ecd022e844a351717b53397f056b376992a
@@ -48,9 +48,9 @@ DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5
 DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441
 DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38ee71f6a86be6cebb59f5f2c575be93830 SHA512 ff3792a0029ea24990fe2419579472bd02119ed6a2dab28e85089d232029be5f1c18c643bcb9d577dce78a7c682bb5eee1ed3644f086b5cf19230bcf37ce8a4b WHIRLPOOL 110ddb5989bf1b66a487c9ebae03a3e62ac22b7a28b4c70d142e1c56160bdd50b9f5fa6f4dc4a28cfb28d94281c582fcfc1f60df8ae2ef4e8a946b3b06d2b1b1
 DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
-DIST glibc-2.16.0-patches-10.tar.bz2 90450 SHA256 e9a9562706374afa9e94ad10231fa850944e4e8fcc19b3a26f3e8ca4fb2a5f3a SHA512 7eaf47f50f100cce752fd1b0d91c9bd2054ab8896554360020f90987e001eab698e694cc1ba6d0a8a139d4e5b1e1957142e2a561953112cae44965c90651663e WHIRLPOOL 8000b269702d8ab6d9c089c8eb0b32adabc66033852d909848b17304fd727cf51c1ada02e626dbe7b04ba159751f3e416eb3d65546a55256a29c086a5270bd29
+DIST glibc-2.16.0-patches-11.tar.bz2 90997 SHA256 4a1abb359e6e73b36eeb21286780fc6f6eb3528f8db25de475779af025c0f762 SHA512 d6f5107ae8cddb82acf6baf256807b1f7a33df4fc3c5baf924c0028781f322732a8913564bb7e3fb337b646b18f13355e06c29f4cb9c618d2d834afc92d7353b WHIRLPOOL 50bb4e186bb1dd1941b3dc7fa02572a624a9530fea3eda5c736dd7e360d34914ad23ff03efa79adb71496f3552c27944475a22da0ebe03ad4f64f6e026113b90
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
-DIST glibc-2.17-patches-5.tar.bz2 75674 SHA256 ad1735cb97c0bb91a59475e564746a0fdb12472f4f5d568de26a8cd304ae100f SHA512 48bb9952cc4ff346383540610fd6617edf0582893c10c11cc70080b8923d820ffda6f68a68595adbf3d67ca4b721720375205878be2d849313d8a82790371ace WHIRLPOOL ff720ed0fe9a740301eb680abbdb74a554a351ae3b41684a644eb6da8592a31c579eb633c269ce6737861d7b888ae62c5334e0e23858653bd2f09a53cbb3a6d2
+DIST glibc-2.17-patches-7.tar.bz2 79288 SHA256 8000409d072571d2d5119d4dd538e3a3ea39213407e202ea10033bf6aed516af SHA512 c6de4d7754cec6e7a9e36d56eadc6605ba6fcfac116eb50553503738873659977beb935112d361620c35e7b15e86f845a49fd13269ffbf98c72f54dffade19f7 WHIRLPOOL 259e938e8f4ca6b7296db4982748429f00135f80cd03965da589e4318134aeddb5acdfa0f8f61871e46330a0c96eb8e734a3c2f50d564882ba37f13f722b78c5
 DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
 DIST glibc-2.9-20081201.tar.bz2 16430489 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6 SHA512 bdd3f5b61f741f09da21020ceef95e8e4f22574d11f8f2341f573ab2225baaf68698446ec26cbc4a63a21a8a400eaf5820fce4bd89c3e1dcf52172a62df561f4 WHIRLPOOL 37e4875e450e8a4067f657b4d71be184844cd45c0d7dbd9242e8f998aab4e15c732fc64ba148c5782078873182d4b132c911da9242b0513eea96a2338aa04722
 DIST glibc-2.9-patches-8.tar.bz2 106638 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c SHA512 f5070bf45c28bcf455f53bee85414e6efa1da3cdbc51425a1bc67fb92ff793d1416d5743a48e69080e636d80e41463c5897d437190d496c0b34f7dcf158e8d9c WHIRLPOOL f15b98a7bd6a8cbfaa9c6e1ad7204de875876bf1640c2a008532537cf65b811b42c45446dba846f6e572e9d763cb6afbe878920a51f772c7367cc7a6f615f4b7
@@ -75,11 +75,11 @@ EBUILD glibc-2.14.1-r3.ebuild 8505 SHA256 3ca82a45f33805983e1b44b468f87e8d64bec9
 EBUILD glibc-2.14.ebuild 8402 SHA256 0c069cf00fb60a2b8dd308efbae48234825833767b4c6c6dc3baf80bdbd2057d SHA512 ae93f480b385a4c1e4f6a690ec16484a6bdc1d844ebe4e7c87243d644fdf26d182df25412ce2738ab9caac1ad42cc137f7c62e39bbea80fc781d848ec7c093dd WHIRLPOOL 2b19b483f8bda35fcfed3497ed0363f8f8ff719f2ecf0eb236c6db9dc9d68ef1dc4fc1df25e9179747953643b25fc51ea1ffb5d831b426c3f5808fa6a9b397ff
 EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8761751b384e85360f77e70bd SHA512 53d5b41729a282362d3447a45dd373c098e04cafddc81d7da0304b7ef56a4bf53058c4ea88763db48d3796345131f6b25cc56949770af1a628549d3e2b24af59 WHIRLPOOL 3f76b15a4db14db99afece549cd4c4982f1fbcefac313bbdf10127f10630da9c43f272ec85ee99afafeb3ab9afcf5f2eafd612386e152e3cfa08d360ca639115
 EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479
-EBUILD glibc-2.15-r3.ebuild 7696 SHA256 35f0d18bc55a9dc99208c7863e106964b12d3d5dac296f68abc021cb8ab53bb4 SHA512 7da5f054a6838937eaf442414379f2ec73527bd4d24b81d31f292eed3b38ed0f6eb34508da4c3b3ede53688f96d7cf87eef029e3650f8f4df3a5554e6ca93733 WHIRLPOOL 47a0f1ca3b6ae7ab0e2600110e003bba9aa5507b922f3a5a32e9e5f50d05c92a3e4b56d01e18fd71a03c9651d63ceee80a9ac89b3ecf8ffbfe0356ad8f84aaba
-EBUILD glibc-2.16.0.ebuild 7495 SHA256 3b9bbb21f548a2d53eadbaae9313d67eb324c75489b560726d9bd002da8ecd72 SHA512 6218c4d725afa0f26a6f89e947a54f48c44b48d00c12c390c42fe402dc1ac9bcc221f9bf13f50a6ae1cae40e5101e756ab05795d571f5ec549ea432fb51167fd WHIRLPOOL a84fca43836ddd7b3fb2a1b5cd2674b20c6f5d2012be3e2dd502137da85c35a63fa4c11bce668cb216c002aada79e2a5cdac0791e6c2ae2ddc5fc461e09a16f9
-EBUILD glibc-2.17.ebuild 6730 SHA256 5a6182b320287e27de47597bccd966f50dc4182fd5ae813f99053dbbf9f2dfdc SHA512 de380ce98a4cb9a934dfc6f2ff88c2b0a141843805a4db94ef01d9d892c3d8208734987c1014aea8a116b20d6cb3ef0fa915275a6767255798132c341d71b011 WHIRLPOOL 0aa4661253703802fa2046bb84aec46dfa82684231086df52c5a3f6f79a59acfbbff6498d5adf124bdd735f52dc16279da664433d8786d3d8401b1db9eae3147
+EBUILD glibc-2.15-r3.ebuild 7764 SHA256 17540bbede72db02e113f556cd3c4a6873c45be1191bade644b5a78d2557c673 SHA512 b9f856356a1dad8f51a62610defce3984477e7f8265427c7e6d21c7868bb6756de4f66b16d3184fd51180155112339e33547a2348d55a2cf1059ccbdf68f0c3f WHIRLPOOL 9c36e9f55427b2cf0180db983446d572d63be309e64b42bbe3571105446f4eddaa815081faf79fe6fc639e3ddf3e3720f11e7af2e85ea19125ef561176eaeff5
+EBUILD glibc-2.16.0.ebuild 7495 SHA256 d498eb21c832602c2711b4fd8607bbb36cbbbcd701405c5f84e2dbbe9ac81774 SHA512 caa429992f3510b4a530fb7d700ba8e67664d5df406ecd198bb7481009e4413cbf9a8f366b77f0e4949670f56dd5e21d7fccee13aa4d13684cfdb8ccf6054aa9 WHIRLPOOL 1f3a56785e164b4d2f8f258bc44b6a324dee3cecd8231b030ac68efdcc007c7cc906519d4f3f3585ed327bc572b8a2ded827afdeed9aaad1b81aeeca915571f7
+EBUILD glibc-2.17.ebuild 7128 SHA256 eee4b5150f9cab01246393d2a4f72c0b782f5c322b531677aa386e00c298fc18 SHA512 8b05b753380e7dc8970c9b0c6c75a1251adb226ae783bbeb94e8804cd72e725b2782319ccb453b070a46d2c5e6ac3d437e5f612353d49bbacf1f0a8de1530a27 WHIRLPOOL 7403426409050e9820a3ce77af937501652a1c42e7db1848addfec1df4cf7392cef54febc4dbd8617ae4b2468ff34d3c591d78dc76d097f688f063dc89ae9b23
 EBUILD glibc-2.9_p20081201-r3.ebuild 6770 SHA256 87e75b306b69d170c7fd6083c7a40303ea292616a810c3e5302eb13ff72932b8 SHA512 3dc0d6f0b99a1e83caa8a152bb7752b8b504324876bed83657b683c73f8a3432150cb5d3b42aea11d064ee9d1a4d1788dab6c9da11cfc5cf716c214ec145e177 WHIRLPOOL 9fec37815cd88eab81f4452e02e13b96e13b1ad8284b1be7f77213280da54a9de85275cf665307d3920e36c3bc02f6005acd5316f6f2ed3dac5b3b60a80690b0
 EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9
-MISC ChangeLog 58596 SHA256 d4ee2e0a3dc53524703d8554972e43cee619161a607d889bdf38adba6c9ffa2b SHA512 17feffc9a76cd7530626a03082df32f84eb6af055b9afb7fb4ef482633b245b1c02f65ebb7817b9af4740ef58784505fdcd2e4b86193c432ae26e8af7714a375 WHIRLPOOL 7520bcc14696a0d4325a7fa29d1739004d412d45bde4c3bf18ae6930bb6916636eddf712be64c0c5a9e7a4e992d3f09e75d9d529a4c172dd5d4391aeeeb1f543
+MISC ChangeLog 59116 SHA256 c145cda049346dfd34078de4c7b7823136c0f4a25aab7bf2c479481966b74de2 SHA512 e2d51f169bde9d5c9ba4cd85857717b8d2fdc81e8f50fad9be9a9e426efd721de0523038960b1ea615b32d6d61a5bcc929d42a18d2db3732e008548ff3b3250e WHIRLPOOL 9bc612e38b91c84c3de5dbee260207321fdc0069c64851be83f294ecec0391ddf399a7ebe8d45a4ba5169b099597fed4edf9023541f95355028f37a01f79cda1
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e
diff --git a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch b/sys-libs/glibc/files/2.17/locale-gen_prefix.patch
index 6c17480..f378605 100644
--- a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch
+++ b/sys-libs/glibc/files/2.17/locale-gen_prefix.patch
@@ -3,24 +3,30 @@ Index: work/extra/locale/locale-gen
 ===================================================================
 --- work.orig/extra/locale/locale-gen
 +++ work/extra/locale/locale-gen
-@@ -8,7 +8,7 @@ unset POSIXLY_CORRECT IFS
+@@ -8,7 +8,13 @@ unset POSIXLY_CORRECT IFS
  umask 0022
  
  argv0=${0##*/}
 -source /etc/init.d/functions.sh || {
-+source "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh || {
++
++EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
++if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
++	EPREFIX=""
++fi
++
++source "${EPREFIX}"/etc/init.d/functions.sh || {
  	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
  	exit 1
  }
-@@ -97,13 +97,14 @@ if [[ -n ${DESTDIR} ]] && [[ ${ROOT} !=
+@@ -97,13 +103,14 @@ if [[ -n ${DESTDIR} ]] && [[ ${ROOT} !=
  	eerror "DESTDIR and ROOT are mutually exclusive options"
  	exit 1
  fi
 -if [[ ${ROOT} != "/" ]] ; then
 -	einfo "Using locale.gen from ROOT ${ROOT}etc/"
-+: ${EROOT:="${ROOT%/}@GENTOO_PORTAGE_EPREFIX@/"}
++: ${EROOT:="${ROOT%/}${EPREFIX}/"}
 +if [[ ${EROOT} != "/" ]] ; then
-+	einfo "Using locale.gen from EROOT ${EROOT}etc/"
++	einfo "Using locale.gen from ROOT ${EROOT}etc/"
  fi
  if [[ -n ${DESTDIR} ]] ; then
  	einfo "Building locales in DESTDIR '${DESTDIR}'"
@@ -30,7 +36,7 @@ Index: work/extra/locale/locale-gen
  fi
  
  # XXX: should fix this ...
-@@ -112,7 +113,7 @@ if [[ ${ROOT} != "/" ]] ; then
+@@ -112,7 +119,7 @@ if [[ ${ROOT} != "/" ]] ; then
  	exit 0
  fi
  
@@ -39,7 +45,7 @@ Index: work/extra/locale/locale-gen
  LOCALES=${DESTDIR}usr/share/i18n/locales
  CHARMAPS=${DESTDIR}usr/share/i18n/charmaps
  SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED
-@@ -150,7 +151,10 @@ fi
+@@ -150,7 +157,10 @@ fi
  
  # Extract the location of the locale dir on the fly as `localedef --help` has:
  #                        locale path    : /usr/lib64/locale:/usr/share/i18n
@@ -47,16 +53,25 @@ Index: work/extra/locale/locale-gen
 +# For long paths, the line may get wrapped into two, in which case space (' ') is replaced
 +# by newline (\n).
 +LOCALEDIR=$(LC_ALL="C" "${DESTDIR}"usr/bin/localedef --help | sed -n -r '/locale path/{N;s|.*:[ \n](.*):/.*|\1|;p}')
-+LOCALEDIR="${DESTDIR}${LOCALEDIR#@GENTOO_PORTAGE_EPREFIX@}"
++LOCALEDIR="${DESTDIR}${LOCALEDIR#${EPREFIX}}"
  if [[ $? -ne 0 ]] || [[ -z ${LOCALEDIR} ]] || [[ ${LOCALEDIR} != ${DESTDIR}/usr/lib*/locale ]] ; then
  	eerror "Unable to parse the output of your localedef utility." 1>&2
  	eerror "File a bug about this issue and include the output of 'localedef --help'." 1>&2
-@@ -280,7 +284,7 @@ generate_locale() {
+@@ -160,7 +170,7 @@ fi
+ 
+ 
+ if [[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
+-   [[ -e ${ROOT}etc/locales.build ]]
++   [[ -e ${EROOT}etc/locales.build ]]
+ then
+ 	ewarn "You should upgrade your /etc/locales.build to /etc/locale.gen"
+ 	ewarn "and then remove /etc/locales.build when you're done.\n"
+@@ -280,7 +290,7 @@ generate_locale() {
  				-i "${input}" \
  				-f "${charmap}" \
  				-A "${ALIAS}" \
 -				--prefix "${DESTDIR}" \
-+				--prefix "${DESTDIR%@GENTOO_PORTAGE_EPREFIX@/}/" \
++				--prefix "${DESTDIR%${EPREFIX}/}/" \
  				"${locale}" 2>&1
  			ret=$?
  			[[ -n ${output} ]] && eend ${ret}
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 654694b..07722e9 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -24,6 +24,9 @@ alt_prefix() {
 
 TPREFIX=$(is_crosscompile || echo "${EPREFIX}")
 
+: ${ED:=${D}}
+: ${EROOT:=${ROOT}}
+
 # We need to be able to set alternative headers for
 # compiling for non-native platform
 # Will also become useful for testing kernel-headers without screwing up
diff --git a/sys-libs/glibc/files/eblits/common.eblit.rej b/sys-libs/glibc/files/eblits/common.eblit.rej
deleted file mode 100644
index 03ccf65..0000000
--- a/sys-libs/glibc/files/eblits/common.eblit.rej
+++ /dev/null
@@ -1,13 +0,0 @@
---- files/eblits/common.eblit
-+++ files/eblits/common.eblit
-@@ -279,8 +279,9 @@
- 	# silly users
- 	unset LD_RUN_PATH
- 	
--	multilib_env ${CTARGET_OPT:-${CTARGET}}
- 	if is_crosscompile || tc-is-cross-compiler ; then
-+		multilib_env ${CTARGET_OPT:-${CTARGET}}
-+
- 		if ! use multilib ; then
- 			MULTILIB_ABIS=${DEFAULT_ABI}
- 		else
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit.orig b/sys-libs/glibc/files/eblits/src_compile.eblit.orig
deleted file mode 100644
index 8c07558..0000000
--- a/sys-libs/glibc/files/eblits/src_compile.eblit.orig
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.35 2013/04/05 18:25:21 vapier Exp $
-
-glibc_do_configure() {
-	local myconf=()
-
-	einfo "Configuring GLIBC for $1"
-
-	# set addons
-	pushd "${S}" > /dev/null
-	local ADDONS=$(echo */configure | sed \
-		-e 's:/configure::g' \
-		-e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \
-		-e 's: \+$::' \
-		-e 's! !,!g' \
-		-e 's!^!,!' \
-		-e '/^,\*$/d')
-	[[ -d ports ]] && ADDONS="${ADDONS},ports"
-	popd > /dev/null
-
-	myconf+=( $(use_enable hardened stackguard-randomization) )
-	if has_version '<sys-libs/glibc-2.13' ; then
-		myconf+=( --enable-old-ssp-compat )
-	fi
-
-	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf+=( --without-fp )
-
-	if [[ $1 == "linuxthreads" ]] ; then
-		if want_tls ; then
-			myconf+=( --with-tls )
-
-			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then
-				myconf+=( --without-__thread )
-			else
-				myconf+=( --with-__thread )
-			fi
-		else
-			myconf+=( --without-tls --without-__thread )
-		fi
-
-		myconf+=( --disable-sanity-checks )
-		myconf+=( --enable-add-ons="linuxthreads${ADDONS}" )
-		myconf+=( --enable-kernel=${LT_KER_VER} )
-	elif [[ $1 == "nptl" ]] ; then
-		myconf+=( --enable-add-ons="nptl${ADDONS}" )
-		myconf+=( --enable-kernel=${NPTL_KERN_VER} )
-	else
-		die "invalid pthread option"
-	fi
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib || has_multilib_profile ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	myconf+=(
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers="$(alt_eprefix)"$(alt_build_headers)
-		--prefix="$(alt_eprefix)"/usr
-		--libdir="$(alt_eprefix)"/usr/$(get_libdir)
-		--mandir="$(alt_eprefix)"/usr/share/man
-		--infodir="$(alt_eprefix)"/usr/share/info
-		--libexecdir="$(alt_eprefix)"/usr/$(get_libdir)/misc/glibc
-		--sysconfdir="$(alt_eprefix)"/etc
-		--localstatedir="$(alt_eprefix)"/var
-		--with-bugurl=http://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_multiarch || echo --disable-multi-arch)
-		--enable-obsolete-rpc
-		$(in_iuse systemtap && use_enable systemtap)
-		$(in_iuse nscd && use_enable nscd)
-		${EXTRA_ECONF}
-	)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_slibdir="$(alt_eprefix)"/$(get_libdir)
-
-	# We take care of patching our binutils to use both hash styles,
-	# and many people like to force gnu hash style only, so disable
-	# this overriding check.  #347761
-	export libc_cv_hashstyle=no
-
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
-	mkdir -p "${GBUILDDIR}"
-	cd "${GBUILDDIR}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-}
-
-toolchain-glibc_src_compile() {
-	echo
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-
-	export CC=$(tc-getCC ${CTARGET})
-	# Glibc does not work with gold (for various reasons) #269274.
-	if $(tc-getLD ${CTARGET}) --version | grep -q 'GNU gold' ; then
-		local d="${T}/bfd-linker"
-		mkdir -p "${d}"
-		ln -sf $(which ${CTARGET}-ld.bfd) "${d}"/ld
-		CC+=" -B${d}"
-	fi
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-	echo
-
-	if want_linuxthreads ; then
-		glibc_do_configure linuxthreads
-		emake || die "make for ${ABI} failed"
-	fi
-	if want_nptl ; then
-		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL
-		glibc_do_configure nptl
-		emake || die "make for ${ABI} failed"
-	fi
-}
-
-toolchain-glibc_headers_compile() {
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
-	mkdir -p "${GBUILDDIR}"
-	cd "${GBUILDDIR}"
-
-	# if we don't have a compiler yet, we cant really test it now ...
-	# hopefully they don't affect header geneation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_{fortify_source,stack_protector}=no
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-	)
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	# Pick out the correct location for build headers
-	local ports="" myconf=()
-	[[ -d ${S}/ports ]] && ports=",ports"
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--enable-add-ons=nptl${ports}
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_eprefix)$(alt_build_headers)
-		--prefix="$(alt_eprefix)"/usr
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i
-	# dont care :p.
-	set -- "${S}"/configure "${myconf[@]}"
-	CC=gcc \
-	CFLAGS="-O1 -pipe" \
-	CPPFLAGS="-U_FORTIFY_SOURCE" \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-eblit-glibc-src_compile() {
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	if just_headers ; then
-		export ABI=default
-		toolchain-glibc_headers_compile
-		return
-	fi
-
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		einfo "Building glibc for ABIs: ${abilist}"
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_compile
-}
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit.orig b/sys-libs/glibc/files/eblits/src_install.eblit.orig
deleted file mode 100644
index a62ec60..0000000
--- a/sys-libs/glibc/files/eblits/src_install.eblit.orig
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.30 2013/04/10 17:36:54 vapier Exp $
-
-toolchain-glibc_src_install() {
-	local GBUILDDIR
-	if want_linuxthreads ; then
-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-	else
-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-	fi
-
-	local install_root="${D}$(alt_prefix)"
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
-	else
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC ${ABI} with NPTL ..."
-	fi
-	emake install_root="${install_root}" install || die
-
-	if want_linuxthreads && want_nptl ; then
-		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl
-
-		local l src_lib
-		for l in libc libm librt libpthread libthread_db ; do
-			# take care of shared lib first ...
-			l=${l}.so
-			if [[ -e ${l} ]] ; then
-				src_lib=${l}
-			else
-				src_lib=$(eval echo */${l})
-			fi
-			cp -a ${src_lib} "${ED}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}"
-			fperms a+rx $(alt_libdir)/tls/${l}
-			dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})
-
-			# then grab the linker script or the symlink ...
-			if [[ -L ${ED}$(alt_usrlibdir)/${l} ]] ; then
-				dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}
-			else
-				sed \
-					-e "s:/${l}:/tls/${l}:g" \
-					-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \
-					"${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(alt_usrlibdir)/nptl/${l}
-			fi
-
-			# then grab the static lib ...
-			src_lib=${src_lib/%.so/.a}
-			[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}
-			cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			src_lib=${src_lib/%.a/_nonshared.a}
-			if [[ -e ${src_lib} ]] ; then
-				cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			fi
-		done
-
-		# use the nptl linker instead of the linuxthreads one as the linuxthreads
-		# one may lack TLS support and that can be really bad for business
-		cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		ppc64   /lib64/ld64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${D}$(alt_eprefix)/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_arch_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if in_iuse suid && ! use suid ; then
-		find "${D}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		cd "${ED}"$(alt_libdir)/..
-		[[ -e lib ]] || mkdir lib
-		cd "${ED}"$(alt_usrlibdir)/..
-		[[ -e lib ]] || mkdir lib
-
-		dosym usr/include $(alt_arch_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen || die
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen || die
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	if ! has noinfo ${FEATURES} && [[ -n ${INFOPAGE_VER} ]] ; then
-		einfo "Installing info pages..."
-
-		emake \
-			-C "${GBUILDDIR}" \
-			install_root="${install_root}" \
-			info -i || die
-	fi
-
-	if [[ -n ${MANPAGE_VER} ]] ; then
-		einfo "Installing man pages..."
-
-		# Install linuxthreads man pages even if nptl is enabled
-		cd "${WORKDIR}"/man
-		doman *.3thr
-	fi
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die
-	doins "${WORKDIR}"/extra/etc/*.conf || die
-
-	if ! in_iuse nscd || use nscd ; then
-		doinitd "${WORKDIR}"/extra/etc/nscd || die
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-		version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' )
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-	else
-		# Do this since extra/etc/*.conf above might have nscd.conf.
-		rm -f "${ED}"/etc/nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc || die
-
-	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-}
-
-toolchain-glibc_headers_install() {
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
-	cd "${GBUILDDIR}"
-	emake install_root="${D}$(alt_prefix)" install-headers || die
-	if ! version_is_at_least 2.16 ; then
-		insinto $(alt_headers)/bits
-		doins bits/stdio_lim.h || die
-	fi
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include /usr/${CTARGET}/sys-include
-}
-
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
-	fi
-}
-
-eblit-glibc-src_install() {
-	if just_headers ; then
-		export ABI=default
-		toolchain-glibc_headers_install
-		return
-	fi
-
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-			einfo "Installing multilib glibc for ABIs: ${abilist}"
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				eblit-glibc-src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			src_strip
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_install
-	[[ -z ${OABI} ]] && src_strip
-}
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
index f2f75a6..352743c 100644
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ b/sys-libs/glibc/files/eblits/src_unpack.eblit
@@ -110,6 +110,9 @@ toolchain-glibc_src_unpack() {
 		done
 	fi
 
+	epatch "${FILESDIR}"/2.17/locale-gen_prefix.patch
+	eprefixify "${WORKDIR}"/extra/locale/locale-gen
+
 	# XXX: We should do the branchupdate, before extracting the manpages and
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
diff --git a/sys-libs/glibc/glibc-2.15-r3.ebuild b/sys-libs/glibc/glibc-2.15-r3.ebuild
index f1203e2..fb2b257 100644
--- a/sys-libs/glibc/glibc-2.15-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r3.ebuild
@@ -173,6 +173,8 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-post() {
+	epatch "${FILESDIR}"/2.15/glibc-2.15-localstatedir-backport.patch
+
 	if use hardened ; then
 		cd "${S}"
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index 04c15f9..707ec70 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.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-libs/glibc/glibc-2.16.0.ebuild,v 1.23 2013/04/10 16:40:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.24 2013/06/23 05:03:42 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -31,7 +31,7 @@ case ${PV} in
 	;;
 esac
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="10"                                 # Gentoo patchset
+PATCH_VER="11"                                 # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index 168ef72..8c88cb3 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.13 2013/04/28 04:00:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.16 2013/06/27 12:19:41 jer Exp $
 
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing prefix
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -24,7 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
-PATCH_VER="5"                                  # Gentoo patchset
+PATCH_VER="7"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
 IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
@@ -189,6 +189,14 @@ eblit-src_unpack-post() {
 			nscd/Makefile \
 			|| die "Failed to ensure nscd builds with ssp-all"
 	fi
+
+	# RHEL(likely CentOS and SL) 5.6 have kernels with vdso bug,
+	#     https://bugzilla.redhat.com/show_bug.cgi?id=673616
+	# we disable vdso loading in ELF handler, as suggest by Mike Frysinger
+	#     http://article.gmane.org/gmane.comp.lib.glibc.user/1904
+	# Benda Xu <heroxbd@gentoo.org> (3 Jul, 2013)
+	elog "Your kernel is known to have vdso bug, disabling this feature"
+	epatch "${FILESDIR}"/2.17/vdso-disable.patch
 }
 
 eblit-pkg_preinst-post() {