Stable for amd64, wrt to bug #369075, remove old and ppc has losed the stable keyword because of bug #476732

Package-Manager: portage-2.1.12.2/cvs/Linux ppc64
Manifest-Sign-Key: 0x7194459F

12 files changed, 26 insertions, 2283 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 7c0d7eec07dd..fde74382e2df 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.91 2013/07/23 17:33:20 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.92 2013/08/24 12:23:49 ago Exp $
+
+  24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> -klibc-1.1.ebuild,
+  -klibc-1.5.11.ebuild, -klibc-1.5.12-r1.ebuild, -klibc-1.5.12.ebuild,
+  -klibc-1.5.15-r1.ebuild, -klibc-1.5.15.ebuild, -klibc-1.5.20.ebuild,
+  -klibc-1.5.23.ebuild, -klibc-1.5.24.ebuild, klibc-1.5.25.ebuild:
+  Stable for amd64, wrt to bug #369075, remove old and ppc has losed the stable
+  keyword because of bug #476732
 
   23 Jul 2013; Andreas Schuerch <nativemad@gentoo.org> klibc-1.5.25.ebuild:
   x86 stable, see bug 369075
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 9976de0a5ecd..73169407747e 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX klibc-1.1-mips32.patch 670 SHA256 42d127d2d5348b7856d33b7ffce986d49c7adbef82cf2bb34aa06a022fabad4c SHA512 d7795bc86da263535e998a33147c4cb5797cd8747ff6f4bfc23f2d77d36ede4aaf60fff5c1c926764e6cd126fe8af29b68540b5222815dcf1ad9fd7bfa6f8b48 WHIRLPOOL 12e5a2b91642e326584cd782ffcff84a0d4fce67cfd90982f254e0c095a05ff79cfc46984d3eedf7146fc12e797c2e6b8964e0842f4b02831824eb037a9f6943
 AUX klibc-1.4.11-interp-flags.patch 494 SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a SHA512 64242223dee668467b52092dba81a3ab29137d3611cf11f331aae1fa9eb8a3ae19b3847128bd693cd2c835c7e2ff1e247cae821561ca7c039bb4a212c8726a42 WHIRLPOOL 46bb64ab7a398f4998d1455d42d8596a9be37f2919835198d098f5935e2f7aa0b8735acb1b79f5ddaf4b17e7af3c4f805b8d63496aa0568757a15bc187461a37
@@ -12,40 +12,32 @@ AUX klibc-1.5.20-parallel-make.patch 813 SHA256 0350a1bfbbf5b71ba79f2ceda94ea9c7
 AUX klibc-1.5.23-parallel-make.patch 759 SHA256 4934bff9ec96bef18e1177485c50b70c886fc33a0d527a27feeaa717e25fd70f SHA512 effe06ac0e7e3fba04d4efb75f307e0ba125ea4ab4f28f3a19d4be5714a587a5dd4f80108c4207b40fbfd69b99bb8d3ffc78dd75a4e2bc998cfa1a6b10121d18 WHIRLPOOL 171c240d384a63085259f651e8e061ea4d7f205bb5b0808434d0f64c9687139d2f2e060f5fd5233b4129236e00e645e9f7bfd61cd4bfedcbf8f91480d332a60d
 AUX klibc-1.5.7-strip-fix-dash-s.patch 420 SHA256 971cadc28aa362ff76ebfee8187bb6986afb4f3425b70b7200d1aa1c6fd746e7 SHA512 c1c70c86d34ac1ea716fe5f2caeb3005db6d060ed0c5dabe94a44f0317725c7775a9da8e463b71b8533f0315d6e0cd861c8684ddf1f426586296dc69d88ac438 WHIRLPOOL 38622e4a1a00cd418f39e5b23e90f83486c0c6d3421fc3b900a039739294552ab5f080de8f17c17c39efc0038451ba0345d3f3ffebbe77fb3f63d111873881de
 AUX klibc.m4 3619 SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 SHA512 42cf4add07031105689d7438838e0306d32a637e8a4719afc11722fd8f1ac040e6bb92cc7ba3536b83a6de8907a91bc5ad11036f22810443f4cd24161950cc6b WHIRLPOOL 798f1af18939edb2c48aacf34cf4ef107468eeb47679d2695350c873bf19121ecdecb797b3a825675bee32b04f057211b2402b2a86d138a203c14f699da45c28
-DIST klibc-1.1.tar.bz2 444770 SHA256 42de47159a382d852750e38fe4877ee2f97f2ff4c47e27f3ce512193d31f63e7 SHA512 1c4f2cc50e15d17b228b9e7e9dd14464bc9cd5b07486c7f7b4f216332223321d52a94c8fad1e6a32d5cfee2aeadd3aeb60647bc3ad99b86af0eba7a92eff255f WHIRLPOOL b7e7cddf2ba2a05859c0b72f6aceaa486ab7cb28d1718ed348c33e22ee3475824eca93e038a91aa1d1790902dd9c6efe221bd1402887dd19061ee288a6298dcf
-DIST klibc-1.5.11.tar.bz2 492789 SHA256 8b38c69e5b851df0634122a3d0d1b8d34284f30d3bf3186c8fceab4d75ebeaef SHA512 1ed35ace6a5ded714d837a2529251f3662d3e7d2f67391f3bdebdd6d6d644b7ad3ee0929f4835bf3fc0271849053456ba619c5ad8511627951ae0fd0ef45720a WHIRLPOOL 4ecdcef04587bf413f115d2386922d8b342fa37b9f59b8f90adf97d51fd0a8e22137874319794b52c5abae7093bb4835c8695b378ce42938582ee4ee78032b8e
-DIST klibc-1.5.12.tar.bz2 492589 SHA256 83c92f40e4e010485dd443fd4d70cd12c83bc7065d2e78d2145723a7f2c96363 SHA512 31e0337204db2072682466dcbf93d1f93280628f13b9b85cc3613abdccc271e3c4840be17f19bd96956375a50bbeae13d31f12283ecfd9fe452c5cbf818be68b WHIRLPOOL 0d6e45380ebdaa4ca01e7d544ed40b6de44fc0b5375e9ba28a00c5af4f4f099c2c75ceb82f3947c66470b0cc08a5e791663cb06867f0c54a3f66022f3c7dbc0e
-DIST klibc-1.5.15.tar.bz2 488692 SHA256 8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4 SHA512 32bd9913b4359ac57305d59bbd9bf2681f7fa46f686a7dc70b0727fb68c8d84c63a6cb51fbb92adced78c99c6fbb63da3f766ef8ef136a0a7fea84e5755698ac WHIRLPOOL 37a3c2eb98fa9381720eeee14a7a7e599230b1c15c7df9cdf05b9a5e47d586a6220e76a731d0e38c57091b95f33c5767b3286e6db84b65b8cef44e32f3a05499
-DIST klibc-1.5.20.tar.bz2 506232 SHA256 f55c4c12902116f29f70a68e8e1b6da7337c11b21adc6b5a197364146c1bc81c SHA512 4375e228bbc1cf43772ac2743c179718385a00aeaf313e52c6f92c0c3a8f33df3595a18b30eff3a7f07c69bc05a90af0d4bbdac6f2ab00a16a38475c52dbde6f WHIRLPOOL d48b07b917cf7c219f5f898cb68aab50e3509ff4b901f575899fc4193ffe416c81c3c9e5bc65eed00817608abe3abdbc03e9cec4f248d9ea77f74bc64ed1db29
-DIST klibc-1.5.23.tar.bz2 506362 SHA256 71741882b8323fc1ce1c22a41b1901526c7fa2b7c97845d7a9558ca9d3931ef0 SHA512 aa6b98ef806281bf278b89eeb9afe69ff738dcc1d76f1b40af243febe4dfe69d057933dccc1281243970e515a8ffafcb08d5a9a2b35c7a3f2eee1a54dcf959d1 WHIRLPOOL e05be3ecadf955a1bf66fe630071f9ba1cdcced2e3e4912281b4d40626086cf73f550918509621091d5bdcfddd4ae2316469486a2f0dc362c4814c9e38113d96
-DIST klibc-1.5.24.tar.bz2 506682 SHA256 71fac12937ead3f104aad8ac40567ecdcac1ea27474cce939f6226499b1895a2 SHA512 d1c72dc492385cf19c3f6b7bc615f1833ff80d082f4d286de42391336f2200dc495ac0768a211bb9791808ceea970102f5b2e78d9fbab06cc69f141e7b962f0f WHIRLPOOL 11fc69c1257cf77a61bcfd28d2c84ed5a4a846adcaf91c897f68a780557c137de8dfbe0b9163d5e63b71a47b4eee1790853a0402e8ac4f9950742788dd78ee43
 DIST klibc-1.5.25.tar.bz2 510064 SHA256 0b910ec0b2a97d4c775ed06e44ad7bca7be150efdf2a77a19253a573e16367d3 SHA512 e550afb319cd995fb9c7fb086bc8ede550e5e4a48856ff5856e2296f691ba643c9fcc314c5e973f4d5b4f33b543ef4bc10d29b389f83e5418ec860a80e7cac45 WHIRLPOOL d986dcdcc95e2c7846d2eda9338519d5d84f50e94f82f1eee0234a17504ae10abaa75b6c89e9cf4c228690c0cc489d4323d98e5e62cde10cf7a04581026309f3
 DIST klibc-1.5.8.tar.bz2 490132 SHA256 b010fd9ea4624f4abc62a0ec93cecae9e9f0a7f856dd678da3fc61cc1d59ca0d SHA512 d286e36796e0fd7c588e25e0463745d0bd3316437f67da88ea686b991b87852ca50b50b67cf548f348c8d7ab796d6bb6975b4da67269ef0b42cb23c4887e1518 WHIRLPOOL 07aed9e3c93e00c3596bb0f3e6bd5d22d893c84a987de6533c4213ad7a3da289ad1cd4e4ebd0c251f7e417182ff31a2fa3772fe489354ebae627887a6374aeba
 DIST klibc-2.0.2.tar.xz 466696 SHA256 1e9d4ba6fe2aeea0bd27d14a9a674c29fb7cf766ff021e9c5f99256cb409474e SHA512 14c862ac58da37db98b40cc03a216643a4d2c424ea1b988f6ea274c999515c6661f711adcf5aac8ed10c7668e05004b8844b0a862c2f32fa28c240dd37003722 WHIRLPOOL 6fea496b32e08e8fd0c54b60997da70db2d6216a8f4a2c6d56ce83485f41c82cce291344ecffac0a38cfa88308033fe768e9b50d2102d803f7b8ff18412100a0
 DIST linux-2.6.23.tar.bz2 45488158 SHA256 d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb SHA512 432f10a6af54f67b4489a9f07a269e26f06b01de74ee59faa8304bc712f9a7106d0d422911ab7fea05c1295340e3a8e823062c6e7acafad6d73a91c8a518deff WHIRLPOOL d81ed03b9aba855c449b9d9d6dd78e72fc51d7f4bc976a53e2f42d96e0e841586d2cc77f365995bc12ee37864457066a2896327c44e0560f1b8c9b147d64a2bd
-DIST linux-2.6.26.tar.bz2 49441874 SHA256 666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a SHA512 0d80b3381e47d2ce24a75f6ce41488dac650854490755a6a3813268a2aea245d87adbc265d7586da8219dd9da784fd9d3a96b4d202071964e40a977341c1d779 WHIRLPOOL 615aafc45cefbbcb495cea6cf4a6daccf323de83e5229d6f689b59d477d90e191f89bc9d3b40658d3629a94a149e68723d65b66140fc03bff23517e3b112a400
-DIST linux-2.6.36.tar.bz2 70277083 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04 SHA512 d9855936baf77308b221f38207e13168009ec9c97ae436787e5247d8207317513b0c825cd3199adfbb241e78c131a7feb5fe89d504058fc12fdb3d0709f8f493 WHIRLPOOL 6646edd4b03791cb22cf6e2763e25d23599c55fe295cd6112007c324320707de8b92a09cb3532f6d7d23930b8009d269b646c8a31d5a28a06606f98fa7dd6600
 DIST linux-2.6.39.tar.bz2 76096559 SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 SHA512 06cb5aba7c53c68d43afcebbbb9507d8b398b3e994d8a237c66a49374ca569237f074adaa3fccba7f908eab4f51f99bae40656793eab5c2f5ce03cd3a65fa02c WHIRLPOOL 2f2c833ab1d8ddbe3e0b862b71a38d47fd3fc5688ea81cdd818369b09e72fa50481bf84533ddcea992af1130b2ceec10b6ff5eaff393a14ee70639293a555912
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
 DIST patch-2.6.24-rc7.bz2 9658462 SHA256 dbd8403cc9ad11afb51b8050d6cbda97caec87d1b07c80266b1e4b1f437268a3 SHA512 722e4cfee69f1782f691d4965289de9a5cb5fe9c736dbcfd49c3a4c374e6d5abda38f48ea47e50f36a004bcbf549cd8213a4c9b8c083465c7b6b23b9dff0f524 WHIRLPOOL 9b84c8d954f0247c2cb657f54269ecfc9c2ce605b8b2bc3736303a9d128e1f5b000d8df306a5ea24c9c3f4d962bf40902e3c478888de2b7de89dfe3efb86589c
-EBUILD klibc-1.1.ebuild 4163 SHA256 9c7ceca03ed22f085b0208220c425530a2ca57ff4263f2781e7df03d2a9e435e SHA512 6467ae21d3cba51bc130e88c47fd4a733171ed93d1f9cb27652ed9f0b5fa7c6d2823869a7a075ad65424a33541cd92fd1b90db99f67d8a7d934d16a994741695 WHIRLPOOL 7df04e0cc70a566e0bb85debbf7166460476b5b74c7e17bf391d09735a8ed1f3687cf375eeb355479cc2a10dd5711d237d1d10465181207f33dc01eca2046c83
-EBUILD klibc-1.5.11.ebuild 6963 SHA256 44dd341a6a0fe82a62255d5814f46f99e08225267161efe9467aa3ef77eae3e3 SHA512 58aff6c6f742bf3dfba57503ccc4319a09ffad64ab607d6759c45e67808bf062a0bb0cb054ebfa42d07675cf076013d518dc4c766b81b9b17fde48a1bcb6a42a WHIRLPOOL 1979559f9bbd49cc13615c093334382bfa49e123e6c9dbf6c85a00e145f21c3e8eaf165c6abd00cc68ff944ffd59d18774179ad3a0dc7b39a8dd88379dd7990d
-EBUILD klibc-1.5.12-r1.ebuild 7648 SHA256 57036f56c8de52460bf5924352ce96f93397aafcbac364427e9f57742106b9d3 SHA512 1e2eaf9c3af72bb0a42175fc656c5fbd3a5342ec1944c730f5e792b3ba73cf6a8d5c80fa85e8c0545acd5c11cea53c92725ac3ed0afe8ef9ac764ab6434edf62 WHIRLPOOL 0f3fcffe8d312a301af09e5d2238df2b383d4f8569033499f8a81fc420595bda797d61d3e3a2a3bfba8e2c64766fe9f0849acce032fd18eda1161eb89dc75b92
-EBUILD klibc-1.5.12.ebuild 6963 SHA256 25a667bb974ddc5f8ec306035f338f4a095814567b38ce713bad1c34c6f36bd6 SHA512 359e12e298b7ff6511489f4f204e37daf767a2e7678bdcdf0406f625b91fd1a0a5514ada7e965ba458fd0a0d1cc9d92c0c612b14a2d9dbe9907fdb77449afc61 WHIRLPOOL 734be5b711a72b66ed51a3511a57fad56dfa618afdb44d3193cdce6b37f4a7109051eb48f394522362bd0b9562df35d7f183d9cb25ee2b67f09c1313f49ff099
-EBUILD klibc-1.5.15-r1.ebuild 8075 SHA256 fea7645e5f083b91d9153dd486a000071fd40237ec6dcf9d1ff3fc667394716a SHA512 d633a11463c007bce40c74ff4c1d7b518ee00ee5990eacadf63282889c9af683713e312c76c34e243c96e5bbd92ee2f8ef0282fbff9facf645022bac55f94d8d WHIRLPOOL 33a3a228298d5817184576093b4b961fd557d582b833a8cb17845aef21154cdaedc5d4639cf6db88e3265838e00c4ffc75ef5f2f01e4a2f85d3bbe2f195c62b0
-EBUILD klibc-1.5.15.ebuild 8072 SHA256 e4c498d6b3b61fa91cf57fcbb8f758c06db0a7fd0ad93d4dc429f7d9b1cb607e SHA512 38feb967d2901ed5a814222faf464ae300beee4dde71d8a95cbace6599f5af73ba5882c1e93dda973d45aa5e22165eaa4b7d2c646be1c6915dbe0444fac9372b WHIRLPOOL 5fb68ba453e4ffdd8fc7f57adc1b55b913901606aeb13ad14a570bda12d8ee22ec6c9fdad9d4a59e5278dcdec222c3a0f8f3df246e8192d43171023a09356d24
-EBUILD klibc-1.5.20.ebuild 7878 SHA256 b80a142562cc7d8d8185f881d902924d791522bdc1f2bb9cdf2389a78e6fc8b8 SHA512 1cb2960e57cbe5c943ff0032c6f5d02c6e36b1505a7d3a1dd3fad6e2886d4c9cbc4d4dadcb7a62256516fec76c7002fc5dc8d331bbda5ddf0c05eb98fdc85395 WHIRLPOOL 4604b5938ceff2d2a39db5b472edae096f7f6446c79a0c157d8edbdedff7bf1d955f174870bad4d14b29740a77c03907bdbe5fd04748409a36c7446b09c3f97f
-EBUILD klibc-1.5.23.ebuild 7713 SHA256 5a2125e3e03cf7420103ee1f16313e614d51f7c4b344f77c9d77aeff4a3b5808 SHA512 dc0c2101d9da354d7e1c39d45866de46088cf423f035eeb460b1a2b7f310a48ada130cc8f2d806e5f539ec11c0f39b5f418269b072f4d2b26cabc7670aef929b WHIRLPOOL a6b4a1a4afb54dc53bd209a9e8dd0ba98130054042b3b433857ec4543ae9312c1bdb8a64c36f300a13a6751f77db9ab92d14d492576777cd3a85c90b38d91351
-EBUILD klibc-1.5.24.ebuild 7586 SHA256 95ac310267dbf7364b092947157bb31ff8eeb3d815929fc9ad2c817552014b81 SHA512 4fe34fec46fd47bafa3fe7bb57a5f655abdfba3f754fb5a6bffad9f7fe0a2ea12afbd7ac1b1cc8d6702689971c3d544b9e32474285a9ffd4297bf09ea5bba0f9 WHIRLPOOL 696564b758a08c3e9ae88637e87913be733db72c9a32834d36a9a52b067d856c5e3ae68956e51274627d596076631a7545d31594f554a21158c7231ece5a55c5
-EBUILD klibc-1.5.25.ebuild 7612 SHA256 a302da7e9ed63d7235cc9a5007a21f242c2e3ba1626383bcabb01f940e5e6b58 SHA512 146a4d9fabda99a3e7a2832bb8c8c23c2fe9a81fd1f17ac6614acebe94065cbafcdc0e2e71805aec4060178a4cb02e904c8546a2b86926b621e39da1ca829d47 WHIRLPOOL 1596755228df79c6a0d13f975ca2f73500f7bf6d56ad2c8fb196be858740918b11d557ce0a864be6fa85e5fe335d2deec0e5899b80ffba45b9f14189e41f5687
+EBUILD klibc-1.5.25.ebuild 7605 SHA256 48b2924efd4cece6a3c6d100ebd6cf40402fcedbe766297faa825ed7a1d69712 SHA512 98804fad0d8652da84db78ceb2c3c210bd39798b2a2e8416507d898e228439ed2aff8f99cab3ad1c26b1aa9736d71285b44740e6437c5d753f3909222436ad4a WHIRLPOOL c8b1ccf03928d07e2555f00149c07328cf33aba3ca2d5d723ec97389e51f711fb4ddbb451721e674ff4210586b29cb6facb0e332d5baa8f99092cfe3cdd762aa
 EBUILD klibc-1.5.8.ebuild 6826 SHA256 94ad6efd58dd2b037b55b05a9218988dc297f8d0dca936db258b6aa91ec3fb35 SHA512 91595c505fc8235c0bfffe91494d00203cce1796820cbf52c3d695e5b5342e0ed7d4296d12b37e6b650f992f771ea8a93a3c20de360d8f774551c95caa7c4f82 WHIRLPOOL 00b541e42c920c9ae1b415a281d75f1d3d5141d00dd22895b81801ee464ca14dc15df4acacf392216708135932546bd61b2c6886ff82fca40e39136a709430ce
 EBUILD klibc-2.0.2.ebuild 8110 SHA256 42b1696b9f614cb8db9981cd44f0ce4ad80df67171e84b5c2d46f6665d7ab562 SHA512 51ba0e93c5bb71dfe8addcb9a8a7d5b5e0feb9078e0bd49afee533ed40deed144cd3f3226a99d29b24ac6b4d1e927f394197019fe2816c3368f0ef4248c801c6 WHIRLPOOL 480efa538a39f7bfd93d375f4d06161aaf1fa4f6686bc1be5909b16083db331ac4d9240c19b36659a075044bcfef9fb8a668da828ffbef8552ff0f434dae6619
-MISC ChangeLog 14797 SHA256 128cbaff2cbbf4080bf980483fc37c4bdb09b3974bb983742233d9f0292ba716 SHA512 8fd609b73fb3d0ab63cece760e906a30b6c236be71df9b74fe6bed9f0d25f94eb8ebcc003a71803aefbe330007a6e0f366e9e6df46521d6e1a2c254808b08994 WHIRLPOOL e4fd9e8c51273f95332ff2718e4b3cb36642d1b146616d98425a0f34454b9fbf58d7995dc6efe35a3d562284448ddd41e996ec40d146a3e2c6fa7ff1e97795a7
+MISC ChangeLog 15182 SHA256 32b8cd3c21e9fa8acde73531498e1052b5b6512da7d6f4c5564210f7d8d8b3d0 SHA512 7445f90f6e5c7ce584a9b89adb4532071366985528170d4cf0704789d6d1128f315ae2d876d59ee63fd0c5943ea8bd52c91a7766193249c146cdee86937697c2 WHIRLPOOL bedaacab109114c859e963b75948b21a449eec8af6d98da395b0bb1c594735a1ccdae0b48bdf7194c31494b586639846543ac9664520fa236c4392db358ddf32
 MISC metadata.xml 164 SHA256 3b1b59f5a5a6e3a377f6124aa855936c20e9b883f7bbbef0210fdef022da34f3 SHA512 84cc2f3f5b3ece35f020ba9a4b29f5ea9082ee201bc21b5a386c5f8a44a685967a27e2af96e3f6addc19ee0b6ee80e116f2afab770ec4e57b994f97c3d1161ea WHIRLPOOL 9b0f6952edfd4458f8d8f2186f89ae04ecc2b8de5eb819626c8da501dbac0ab3bcf8606b10a896582b2c5ab9de015f174ca4962f98fd4772759046213767e13e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHuvawACgkQakKUmsHeVLIICACbBQezXD8242V0HXe7H1lH7n1v
-4aUAn27x1x0pxTQ38TNCEkZC2VVXfc5k
-=p5JH
+iQIcBAEBCgAGBQJSGKUiAAoJELp701BxlEWf/wMQAKrGfM8Ay6b9C3k5G7TJBozi
+GwPVpM2DDDndSUP1hFxRzpTfP8aogGTqB7QOj/8GXXY7azAwH+yK2mwLZatb13+q
+N1oOieb4QdWL70ZAsZs4Ba05fT/jZ8TfW3jI+xc/J10Om/SVBvqusoNYWVUJecSM
+Sb2v9aCUxhx+IVac7TIsHhL33GLcwEPNf/nGSTJ0gwITbAs7ZocXEakFcoRO27+c
+trE/GCFle/WAV/dWjmAmU+lMro7FHlQQvPycTGV6XPhcXqSOSMrjPtiHMWRwPHrJ
+hGKlEB9DO77GO/boAVCzmmgYaXr6I+3U7CY16fRlYbua4p+CSrLSsK9JZzRFlsRj
+F+kCMYNXi4immtSd8CIqGT1dMxq9xepny+oZVhCle05ryLyJxbTRXKgIdgYlak0p
+ndz9narWMWw2cl6kKjrjsQyodGZd4w+1gIogXXREvOetFX3JE06nRiCTp93CJj68
+zVYUIOd8AC9XtS5FMqeT5s4IrERCrbi9k3Zr4GYXrL8rl+oeTGb1ST+0YcyNebn3
+gfHZEDLYE5V4uqLf69Kl2hKcAgv65i1+vOJu550ALJGHyLVsGH/ld/w0bTk65dR9
+vfF5hM/T6hf2mCnipe3iAwwFdCSny6KmLuRlyKVw8/cJSSkXmUAeHSI+J/5cfSx7
+Z8zeTagNCtMl3VzAezmP
+=IO9+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/klibc-1.1.ebuild b/dev-libs/klibc/klibc-1.1.ebuild
deleted file mode 100644
index 9a6d3bcf2d7f..000000000000
--- a/dev-libs/klibc/klibc-1.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.ebuild,v 1.5 2011/02/06 12:36:26 leio Exp $
-
-inherit eutils linux-mod
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="dev-lang/perl
-	virtual/linux-sources"
-RDEPEND="dev-lang/perl"
-
-if [[ ${CTARGET} != ${CHOST} ]] ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-guess_arch() {
-	local x
-	local host=$(echo "${CTARGET%%-*}" | sed -e 's/i.86/i386/' \
-	                                         -e 's/sun4u/sparc64/' \
-	                                         -e 's/arm.*/arm/' \
-	                                         -e 's/sa110/arm/' \
-	                                         -e 's/powerpc/ppc/')
-
-	# Sort reverse so that we will get ppc64 before ppc, etc
-	for x in $(ls -1 "${S}/include/arch/" | sort -r) ; do
-		if [[ ${host} == "${x}" ]] ; then
-			echo "${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	# Make sure kernel sources are OK
-	# (Override for linux-mod eclass)
-	check_kernel_built
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [[ ! -d /usr/${CTARGET} ]] ; then
-		echo
-		eerror "It does not look like your cross-compiler is setup properly!"
-		die "It does not look like your cross-compiler is setup properly!"
-	fi
-
-	if ! guess_arch &>/dev/null ; then
-		echo
-		eerror "Could not guess klibc's ARCH from your CTARGET!"
-		die "Could not guess klibc's ARCH from your CTARGET!"
-	fi
-
-	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
-	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
-		echo
-		eerror "Your kernel sources are not configured for your chosen arch!"
-		eerror "(KERNEL_ARCH=\"${kernel_arch}\", ARCH=\"$(guess_arch)\")"
-		die "Your kernel sources are not configured for your chosen arch!"
-	fi
-
-	cd ${S}
-
-	# Add our linux source tree symlink
-	ln -snf ${KV_DIR} linux
-
-	# set the build directory
-	echo "KRNLOBJ = ${KV_OUT_DIR}" >> MCONFIG
-
-	# We do not want all the nice prelink warnings
-	# NOTE: for amd64, we might change below to '/usr/$(get_libdir)/klibc',
-	#       but I do not do it right now, as the build system do not support
-	#       the lib64 yet ....
-	cat > "${S}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/lib/klibc"
-	EOF
-
-	# klibc detects mips64 systems as having 64bit userland
-	# Force them to 32bit userlands instead
-	epatch ${FILESDIR}/${P}-mips32.patch
-}
-
-src_compile() {
-	if is_cross ; then
-		einfo "ARCH = \"$(guess_arch)\""
-		einfo "CROSS = \"${CTARGET}-\""
-		emake ARCH=$(guess_arch) \
-			CROSS="${CTARGET}-" || die "Compile failed!"
-	else
-		env -u ARCH \
-		emake || die "Compile failed!"
-	fi
-}
-
-src_install() {
-	local klibc_prefix
-
-	if is_cross ; then
-		make INSTALLROOT=${D} \
-			ARCH=$(guess_arch) \
-			CROSS="${CTARGET}-" \
-			install || die "Install failed!"
-
-		klibc_prefix=$("${S}/${CTARGET}-klcc" -print-klibc-bindir)
-	else
-		env -u ARCH \
-		make INSTALLROOT=${D} install || die "Install failed!"
-
-		klibc_prefix=$("${S}/klcc" -print-klibc-bindir)
-	fi
-
-	# Hardlinks becoming copies
-	dosym gzip "${klibc_prefix}/gunzip"
-	dosym gzip "${klibc_prefix}/zcat"
-
-	if ! is_cross ; then
-		insinto /usr/share/aclocal
-		doins ${FILESDIR}/klibc.m4
-
-		doenvd ${S}/70klibc
-
-		dodoc ${S}/README ${S}/klibc/{LICENSE,CAVEATS}
-		newdoc ${S}/klibc/README README.klibc
-		newdoc ${S}/klibc/arch/README README.klibc.arch
-		docinto ash; newdoc ${S}/ash/README.klibc README
-		docinto gzip; dodoc ${S}/gzip/{COPYING,README}
-		docinto ipconfig; dodoc ${S}/ipconfig/README
-		docinto kinit; dodoc ${S}/kinit/README
-	fi
-}
-
-pkg_postinst() {
-	# Override for linux-mod eclass
-	return 0
-}
diff --git a/dev-libs/klibc/klibc-1.5.11.ebuild b/dev-libs/klibc/klibc-1.5.11.ebuild
deleted file mode 100644
index 165081131aa8..000000000000
--- a/dev-libs/klibc/klibc-1.5.11.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.11.ebuild,v 1.4 2011/06/12 17:19:42 mattst88 Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="23"
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-rc7"
-PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fixes for sparc and ppc
-	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
-
-	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
-	epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables
-	epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_compile() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} || die "No defconfig"
-	emake prepare || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS usr/klibc/README
-		newdoc usr/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc usr/dash/README.klibc README
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.12-r1.ebuild b/dev-libs/klibc/klibc-1.5.12-r1.ebuild
deleted file mode 100644
index a2b66eb51907..000000000000
--- a/dev-libs/klibc/klibc-1.5.12-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.12-r1.ebuild,v 1.11 2011/06/12 17:19:42 mattst88 Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="26"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="amd64 -mips ppc x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fixes for sparc and ppc
-	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
-
-	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
-	epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables
-	epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} || die "No defconfig"
-	emake prepare || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS usr/klibc/README
-		newdoc usr/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc usr/dash/README.klibc README
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="idtest fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.12.ebuild b/dev-libs/klibc/klibc-1.5.12.ebuild
deleted file mode 100644
index 9933b41a9565..000000000000
--- a/dev-libs/klibc/klibc-1.5.12.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.12.ebuild,v 1.4 2011/06/12 17:19:42 mattst88 Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="23"
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-rc7"
-PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fixes for sparc and ppc
-	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
-
-	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
-	epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables
-	epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_compile() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} || die "No defconfig"
-	emake prepare || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS usr/klibc/README
-		newdoc usr/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc usr/dash/README.klibc README
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.15-r1.ebuild b/dev-libs/klibc/klibc-1.5.15-r1.ebuild
deleted file mode 100644
index d636ba33d795..000000000000
--- a/dev-libs/klibc/klibc-1.5.15-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.15-r1.ebuild,v 1.5 2011/06/12 17:19:42 mattst88 Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="26"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~arm -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fixes for sparc and ppc
-	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
-
-	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
-	epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables
-	epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS usr/klibc/README
-		newdoc usr/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc usr/dash/README.klibc README
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="idtest fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.15.ebuild b/dev-libs/klibc/klibc-1.5.15.ebuild
deleted file mode 100644
index 542fb856d358..000000000000
--- a/dev-libs/klibc/klibc-1.5.15.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.15.ebuild,v 1.6 2011/06/12 17:19:42 mattst88 Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="26"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~arm -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fixes for sparc and ppc
-	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
-
-	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
-	epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables
-	epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS usr/klibc/README
-		newdoc usr/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc usr/dash/README.klibc README
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="idtest fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.20.ebuild b/dev-libs/klibc/klibc-1.5.20.ebuild
deleted file mode 100644
index 489c2f599cb0..000000000000
--- a/dev-libs/klibc/klibc-1.5.20.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.8 2013/03/14 14:31:04 mpagano Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="36"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/1.5/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Current/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="amd64 ~arm -mips ppc x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# Fix parallel make install
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	# Fix infinite loop during build with make 3.82
-	# http://www.zytor.com/pipermail/klibc/2010-November/002786.html
-	epatch "${FILESDIR}"/${PN}-1.5.20-kbuild.patch
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="idtest fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.23.ebuild b/dev-libs/klibc/klibc-1.5.23.ebuild
deleted file mode 100644
index 004f202366d5..000000000000
--- a/dev-libs/klibc/klibc-1.5.23.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.23.ebuild,v 1.2 2013/07/12 20:40:29 ago Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="39"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/1.5/${P}.tar.bz2
-	mirror://kernel/linux/libs/klibc/Current/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="amd64 ~arm -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-
-	# Fix parallel make install
-	epatch "${FILESDIR}"/${PN}-1.5.23-parallel-make.patch
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.24.ebuild b/dev-libs/klibc/klibc-1.5.24.ebuild
deleted file mode 100644
index 0735d7e420fe..000000000000
--- a/dev-libs/klibc/klibc-1.5.24.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.24.ebuild,v 1.1 2011/08/17 21:16:51 radhermit Exp $
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunetly.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-KV_MAJOR="2" KV_MINOR="6" KV_SUB="39"
-PKV_EXTRA=""
-if [ -n "${PKV_EXTRA}" ]; then
-	PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
-fi
-OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.bz2
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~arm -mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
-	[ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
-	cd "${S}"
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-
-	# Fix usage of -s, bug #201006
-	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/klibc-1.5.25.ebuild b/dev-libs/klibc/klibc-1.5.25.ebuild
index 64e7ce8439b6..68889972929d 100644
--- a/dev-libs/klibc/klibc-1.5.25.ebuild
+++ b/dev-libs/klibc/klibc-1.5.25.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/dev-libs/klibc/klibc-1.5.25.ebuild,v 1.7 2013/07/23 17:33:20 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.25.ebuild,v 1.8 2013/08/24 12:23:49 ago Exp $
 
 # Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
 # This still needs major work.
@@ -36,7 +36,7 @@ SRC_URI="
 	${KERNEL_URI}"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="debug"