Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

15 files changed, 18 insertions, 626 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index a6b2b976f645..04c7ff5f4142 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.201 2014/02/04 02:38:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.202 2014/02/04 02:43:46 radhermit Exp $
+
+  04 Feb 2014; Tim Harder <radhermit@gentoo.org> -libgcrypt-1.4.6.ebuild,
+  -libgcrypt-1.4.6-r1.ebuild, -libgcrypt-1.5.0.ebuild,
+  -libgcrypt-1.5.0-r1.ebuild, -libgcrypt-1.5.0-r2.ebuild,
+  -libgcrypt-1.5.0-r3.ebuild, -libgcrypt-1.5.0-r4.ebuild,
+  -libgcrypt-1.5.1.ebuild, -libgcrypt-1.5.2-r1.ebuild,
+  -libgcrypt-1.6.0-r1.ebuild, -files/libgcrypt-1.5.0-aesni.patch,
+  -files/libgcrypt-1.5.0-x32.patch, -files/libgcrypt-1.6.0-gcry_md_reset.patch:
+  Remove old.
 
 *libgcrypt-1.6.1 (04 Feb 2014)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 18a291ab5edf..a36d3be00b28 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,43 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgcrypt-1.5.0-aesni.patch 1063 SHA256 59d52c27964b29d71f9f410525dcb0256c31c20e754dc469ad95adad0988053e SHA512 a32fb0935de408b5456198ca3d13d961b09e49cb5e2f95e951dabbe9c5ad594fd9aebb3ec358c7065b892ec247817472029f89351a4b2bfe4d60fb6523993bed WHIRLPOOL bac76044643cc7613bdc39c6b415707754bcc5a900a6cd9cb0b53329a8337fcd37a1df68a02a85ff302c40aba5f016620154780c28bc53608333535beb401ba9
 AUX libgcrypt-1.5.0-uscore.patch 981 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601 WHIRLPOOL 6b6b1944539127c9c41fda46c54d8e331597d249ab91a0024a38d60a907a0fba114fb064c8d956c90a91e27e6ae30aa2e6dd4a3b61b2e8d771e53499b9810016
-AUX libgcrypt-1.5.0-x32.patch 371 SHA256 8117456bc7cb569d349b4980884156ac9fe7d2585d353c86b9f011028dd2ea12 SHA512 83716a319bfa355e828c272e395b2ea7a5176596ac43285a10b4c2548978c6b432af3939db760e7bc209e924d0758cf4f0aa260f7e50dc2dfd73f3ca7283b8db WHIRLPOOL e84b783c4f34454119185360fe9ab6b590cb204b28bc957491fd38ed08c397902341876db99df73516202a6370a74cf29b4071e33c5fbc452197942bd492639d
-AUX libgcrypt-1.6.0-gcry_md_reset.patch 2121 SHA256 5842f65905a1b4628f40efc2c912dff076dd524fa8d7065d04ec41c6c01a7297 SHA512 da1142fb899428796132c6ba23ed9627c22f64785053e4de012a2faed15cecaa7c70178ca29c319cc37d28dedf18373183cc09cac18607f940a2935eb450d901 WHIRLPOOL 5b99e86800d79a1d82d43585ddacfdd84a3e2a84a07ece541afc51d62f3c396005f64cb67858bf62bb1c8ad3813623526d74d8b944997c36762c2521ea85b0db
 AUX libgcrypt-1.6.0-serial-tests.patch 331 SHA256 368f31f2bfab568fac5b782851bcbcd9fdbab97240729d311a015d91c7dd2ddf SHA512 3bb833c7b5f3ad19b1856472676a0000a6837997c0ebb8eeee5ec67b0d415bde733dd98db5dd3060c03e78d5ced219e85acb40dd115aa044d526f530e8459fd2 WHIRLPOOL d219b5b4973c19b81f76d01463c152f04bb44a1f5dd6bf588bd6b24a4a199a438db43440dd71a65080b4ba90da941b0766a0499398c1a58817742f088140e264
 AUX libgcrypt-1.6.1-uscore.patch 843 SHA256 458ebc904185a5d08ef89f0c8ac797b87eec619341b4c0f8130fde2af8749459 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791 WHIRLPOOL bbadf4816e081929e8739fbbd3574bd291d9de86c4fe2344dba2c1ceb5f84d3e0bdede194efadefbcbf7409c44c218ab28f48d05b367c225b1687fced7565e15
 AUX libgcrypt-multilib-syspath.patch 588 SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc WHIRLPOOL 8d066987dc3cfa1dd686047fd5332b11199e5add63f82e397a34b22b5ce2f97af17d60042681c1eb50617402189a0d7fca5db48db7d41f4ef0f1cbe1acc645ab
-DIST libgcrypt-1.4.6.tar.bz2 1151877 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85 SHA512 d219b23b36870a526d378a4ce784abc044bcb3a547a5e667b8185f2aceffab707918a6be6420d8473fc0c4d293968be5824b5dcf0cc5f0ef0866490f250b101c WHIRLPOOL 1725c87e68aee064488a6abd2be5a8541a0dc98a191c708a39f7f13faca02d92748d87b1ba9a0a499711632ddb484a23b72fe7cac2a2d11ea30c9b9b2a6986ae
-DIST libgcrypt-1.5.0-idea.patch.bz2 4291 SHA256 c6facb5733454cbd5ab0caf76b9ffe32a95973853a67cc422697f5f1cb354ad9 SHA512 1368ccf6bf8c78717fbfd1e6c05526d209a9e5c714ca5063cd2996fcf043cf15a12f0798385a6321b0525b52fcc9fa87c52be7101ac37e656dfaec2f093e34f1 WHIRLPOOL ffd011522b782cbaaac1b38f44a943956cb2275518119bf4df73fa914a473469db90c0220c81293fb8da3be43f34b89591ad47c6d09a144cb7059f963e1be414
-DIST libgcrypt-1.5.0.tar.bz2 1433506 SHA256 4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa SHA512 1422ca739d41952b71ea4512d6c7f2a76924867671bec35f92e573a7f02a9569938daf109d7ecaf6b1cfd45425511d2bae068d6945e5792dfd1bb15434ff27a8 WHIRLPOOL c1beb69a508108c8ea6463cbcff54b85abab1ff43fb338c8f029fccd93711c6d81c1e7c1764e6574b769803b0a3e810ad73220ca9e5abeeac3081fcf00c20a03
-DIST libgcrypt-1.5.1.tar.bz2 1503471 SHA256 ad9eb15808e769998c0bd8c181ac881423919f4f105586913dccbc0dfbfae527 SHA512 e7ae8ed5080e9168ff2e9061b333f7de0e9dcba7dea2702aeb7f38d8b5cfefb7efbdd57f6fb0f7b53e26cb95779711415c7e458dfb4091b9b24953fca049a48a WHIRLPOOL e3812694791da36af16f0d910f9318c8a64e4c2e596dc091551fb93478d205a20e35f129ad579fa26ebf2550ec7b082e926f0e3a1bf80f1b96eccb06e63841f5
-DIST libgcrypt-1.5.2.tar.bz2 1507418 SHA256 e41a4339f50294f3c925f2f71aaf2427eb162d2994da91666dfc32621afe963f SHA512 2e9e2edb2f216f3b25622bba994780cb592d115d9b41643ef2b9e11fb8cbe097636340dfbdcb263b8627b02479507ba20b74aacfdbfd14d12886467b72e1dffb WHIRLPOOL 4a99852a3885716219415ad271cb49fdbc98b63307a87c2770666296e9fb2864d221edff4651e2f1f372d2c215db2468f1980944de248f692532b050663bdfdd
 DIST libgcrypt-1.5.3.tar.bz2 1508530 SHA256 bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1 SHA512 2fc2771d00d5fef9a7158790a8914da10154a5fac9124bf21ee43edd08b43dd4452f38a3aee12deb46d86f574ffdd0688c5829e978f4de2fa3e07be486e99723 WHIRLPOOL da8b354e772ba830d3fbecc2c707c96f8b0f65f98d4af9d5b79ac639a9029bc364688836e0af1d9f7810c5df2679f8d4ba61d9afa775530c4b0f755ac88049fe
-DIST libgcrypt-1.6.0.tar.bz2 2499149 SHA256 662d508600ad94cc334e665b7016137feedfcca5226998c65ddd56bdfca29708 SHA512 e2e8ef6eacc67cc575bf592192db253a7174218a69e217d05870c8f4a85541209b392e21bebafcf9d7f062300ccf65fa2aabeb1b6ef28821813c8f9ff659fe80 WHIRLPOOL 86655f7f632939ea13a62aa093194806c0574732649a6cd82848e8a85b552f896257f48bd3e8de510aa65e972ab0598b97c0634b9e70b4b4fb08b78e6f33f07e
 DIST libgcrypt-1.6.1.tar.bz2 2470885 SHA256 a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 SHA512 83d502cf998736a5920df7324b7ff658041c34b2cfddccd8b96744ff940c0c84fe91fe7bfe03a69b10b9697a6f04f3007134bbc3c288b0fed78b60fc6ff15bc2 WHIRLPOOL 693de77590ea2da423e43e832f809183a50fa0e5d02d2fe46b860c6e6295d879730a300353d71e63671f498a1041b7b072af6bf4124a1a45eda787fee636a248
-EBUILD libgcrypt-1.4.6-r1.ebuild 1167 SHA256 0d9c4e0a4a0a96304499a18706fd9860c7001417eec1cee064feaee95d0abf89 SHA512 cdc03a6db8855f963cb4ae8a8d425b37afc78f27fb9b1b6f0ed0a6dac0eecb5d23df002e719d53bfa1281140936c0be1d5f8b26bbd5caa11a9e88f8e3feecf8e WHIRLPOOL 98f1ac867298b446ae73dc68d36f4fc48c564718083c961d7a801cd4feab2ddfa6b2606cbd0aa4187fabcabc4fb8380e84319aed03b2019fd92d18654fd3ee96
-EBUILD libgcrypt-1.4.6.ebuild 1126 SHA256 e2bf303262e08375c82d10c921c642bfe9383bf3c5c64a7fd20e1d4e704ecf02 SHA512 b3e697c1cf47af7c79f229a2bb76defb21a78766be4f6412e529fce951f762913e4404876f69aef5da134d80a7241c8d68501a00c60e5defcaeb2a886529e57f WHIRLPOOL e924deec49b1f64ec61735871e81663e33c45f359a897a34ed6ac409346614cf73b808bf19448eaf41e596167d8e960d20226ac9b8ed6b2997bf7dd3ec17d11e
-EBUILD libgcrypt-1.5.0-r1.ebuild 1174 SHA256 c277022044879a876462011cad772a651091aa7695d9326c9837fa3df8b0ff4d SHA512 1beabc4c848acebbd2c356ee2a436e5459b8184336101a6175cdf8f965267f8c3d6ed5fb8fbb11bb952fda62dafdca6e220187125bfb55ce50a245f50565a544 WHIRLPOOL c8e5f976dd833e778234771bd153fba9592bf4a3f7c6a42294b484ad9b759c56354a1fa51e992caaa0d8e00e14840db3aec54f3d22abc19286f64ebaad6fec65
-EBUILD libgcrypt-1.5.0-r2.ebuild 1293 SHA256 c9eedf9269e2e89e630d3c23493d3d05e04bc49182df6fcf3202d21a0928bd19 SHA512 89491cea1e47480ccac3b60c3cb0db0f81a254a448ce7329e88098dc297cb88c3d821f35474d9d9b7a4e698eee77ff0bd7eb01f4b900880342947f9c3e753958 WHIRLPOOL 83c8643d485594a684c9aa15b701e1981609b768d3131616e9468fe5f66188a845148b04e225de099f681380098cf4ea8faeede98f65f86c2424dfb60ea9d76f
-EBUILD libgcrypt-1.5.0-r3.ebuild 1566 SHA256 16d8b1a33c00630c42d92ba3ea599081b84a3807ea112b470ef566971fb8b470 SHA512 c281667f5dd2bc981f42afc7bb11830f2a9a3ab992d3a4f28ca36938ef1acf61de2333b8750e8e8c87bffb0816744a3f10107cce1f7739116219846d48b4eaf0 WHIRLPOOL fd195ffd579344644ac621d1bbc5f54fb8deaedaaf8dd930b1815ff8d507c0ab537d1a7579f355ad635b1d3b6fb10c464428af0544b537cd31f4b852e902a5d2
-EBUILD libgcrypt-1.5.0-r4.ebuild 1719 SHA256 52c051ff384cb1cac57d0e9e9ccd7d5a92fb25e118ce91238b9383e32c0c5cd9 SHA512 5c3e89db7d10c3bd7f65c0ce4d1450760936930043cdb94b2c3ee33feacfcaa48509b6affba62645b50a4df91fc8de9ed27050be57ef7a26d6c0e6fe0aea9ef5 WHIRLPOOL f15f9127d2306d31e105621ebfd0745cf8e211acb8c36daaf40f22f42a84d04cc7643d1c82a6f1df5b942305c748bf230579a9d7ae5a5d9f9b121b1180058b7c
-EBUILD libgcrypt-1.5.0.ebuild 1152 SHA256 e6aa83ade326e53949c053da8cef23aa85b74a16a19b1b6da03a5ede6b83659f SHA512 f77c202e8500b7b10bee50ce9620bf8ac3b2ae6533869ce3686b4b44ce7adaff16312b57ce3cbf6d0d6409d137c97e1ecce9260de18d62dbf7f1289877139c89 WHIRLPOOL af21e0f6cb113c302176980e3875a22ffbe5d1c408c8c01421cc2a66f4ae89322e03498aef6e57b02ae865f073872b3b1a87874b910d55b415c695b106e77b7d
-EBUILD libgcrypt-1.5.1.ebuild 1776 SHA256 aeb4d3dd9201380dd9fb96262a4d1582944d71072ceb07d443946d6fce757551 SHA512 a0d1e7a0bf745123803c93dfd6033590af57e7bdd4fb0a08d6e9260f7b1aec5256863b1fb95c36b56a864d2e966bf313bc5147b61e71c9998121ba9853c63345 WHIRLPOOL c3b7831c72b332e63669c590ef601b508e27570e205133526500c4d4582a0d4091252ec77efee1c619464b77d8e3b22dc2929a77f38388c27c86cc09f3ec6907
-EBUILD libgcrypt-1.5.2-r1.ebuild 1625 SHA256 19e7027726e3699ad955c8037dcdcb49da7c3aff8986cb5cd7ad5ad2108b671f SHA512 dbd087df6dff317a9a329e8eaedc58393e7598d7e48b5e0ce9012f81f1bc72dd1acec02fcc211412f123d5c7e32a3bbe26058fa755fb514439a0444aa6089ea9 WHIRLPOOL d05bb62118af17f8aaa174d87dc37ad49e91d5c5751e57e6479e1b3223d21c6835cd79835da98efc293189c107399d18469f7afcef5fb7196818b2ffedcb0e91
 EBUILD libgcrypt-1.5.3.ebuild 1639 SHA256 2d59b022c5573c77169d6b7f5ab1f9fa219a3cb2efc5fed4a0e08a03f771c87b SHA512 c6ac245ff125d2b14065b98d686f92f0af1152cd92063b792054216ec88c4b95f3a02efb70f2e86ef740f35c184480e7f6edb20d62f3cf08de440045385adeb8 WHIRLPOOL 384fe5b1aade37789ba8e38d45336db29a74f0047bc147a3ea2b89936b14288f44300d0f32724305976bd791efe39418236307f3d2c015141ae20a3cac3fe991
-EBUILD libgcrypt-1.6.0-r1.ebuild 2038 SHA256 fda510295b08b551288d91c87c88afa975c7a8c8bbcfb44d87c96cf3b804dea5 SHA512 0e4b9e281239275572fe3d4994f4b10a7db5af651614ec8a4cda27934cb2c4fd9110e0b45313e27618818344f0adf996321d5935e49ee1a7d845a9c63b6b864b WHIRLPOOL 860f7bb82aab73e1dd0935598d90b3cdc4c50a5896779d5130c156add7d489b562e200488d4c18a11333f30149271a3ca332126e3471428278dfa704127ac6bc
 EBUILD libgcrypt-1.6.1.ebuild 1979 SHA256 e33e4c12786624fe0bb55ccf78253266296c61198c4c943fcaee681a5a14a510 SHA512 d3bf397c2eb7078b0e38b2d72fccdcca3bceb0667da9234395dcfd44ee014fc370cf0e063c6a07637f78ea52a9725d4247687f4c7edf2409adb37108b4826f4c WHIRLPOOL 53c34787e39f0c73f127a65a7d2571895ab27abb7e9625c3b4d9bde141b41cb3bb1833a5dea39a09accd2c9e6c608e7fd486d4d6b37872ecbfbd9b566e61ab44
-MISC ChangeLog 28946 SHA256 f541291ee939c90ac2ff9bf701ef3222fd207e8028a8e9ef422cfbfeddbb7241 SHA512 f1733a204f0879922db9a522440719d06583c0d2fd0b14b23ab6a6965b4bc83ecec4e08e848aa19ecc24bcfe7da4ab6324ce5e9f83cca144c0ef76d5cab4e26a WHIRLPOOL f90445b3e2b0701b16125b26c21fc7a20041be323dbfa8602653871d458aad465d21cbfc2264b8fbb829c04e42e98b093a9566f3dfad1059ef764db8c6368e06
+MISC ChangeLog 29407 SHA256 5cf1cc32f99f437c41332d383614535e48cb4566ac6ab628201bf368afe2105a SHA512 d88ac8e544f7552086ded053b443b223ac0aa01153cb8ff77ab96ee7c11b698f5a439245662b62fc600030cefdd250f30162317a5d0914d1633f9a40ef526f19 WHIRLPOOL f8e75630a6a8038a4fdc1852bf3a6e6a09e9020a886dcee01a15f447b531d47352068a3cc1f9968e97231ea056e5b235283a69f02cccd2ec6ce9d6081495b4fd
 MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8FLBAAoJEEqz6FtPBkyjZ/gH/3Ar2fsSes5Z6gmRAz6h9VEu
-GdjE7IgZbWQu0oA6IsrYhkrcLUOeKSbbYtskN5pt+lEa8Q7ZeE2xY7EPSCoVEvOJ
-uTDYT3VbrliTArTcGUQoOQ//HWqjKtI9fGKFnzVbjm5EUcObB9dRQfvkQFD5bY3Q
-w+vqiWo4lOoaGeLL2BAYY4VmOXUpo7guY2vFpFd/5PJ/zBIqUKyGOpqQVIYlzz1U
-HeSLPaTcAIdWwWDorb1F1z8lseGa2RKKgDfVXWkOCUTGKuShkSHP6EonjHSt13DG
-kmpyU9HVAheUfio95SYmHLiAClft38oki7t3oIQOSS0WGU5/1zDoqMuy/P2EsME=
-=PB57
+iQEcBAEBCAAGBQJS8FPjAAoJEEqz6FtPBkyjzwYIAJVWNAjGHt8X2yYX6DUBiGqR
+80m7sqy83AVseebRASU9ooUvXQYUob2bqBbiahx2en4zt5fh+0JpomUYoro8h9sD
+qfLfhkx3ybLHIDG6b8nL7ReJIvI0KTDwaRhF1Eln58d3mucBMJwtQjN4+qFaTGU0
+uBzpH5N8POfY4weJ1ooi6zWcLH+yv2TMH4HkNJJ3MsR9htIdx3/Nsp+I4kI23s+F
+XTgokxVwQUaBxTm3RdAh4hFW7hU0bw5Xs6Bv/Fb7Ljc3n8FZ3BzHqhAzqeX5GKOw
+OXGREM49/OMLYvGKTl54gCIAAvlqFG3A4UP0N69DcJh+DTMgw6oZNDNmnJpIDRw=
+=/rxj
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-aesni.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-aesni.patch
deleted file mode 100644
index c33e8f377393..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-aesni.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a96974de734beb51a733a89b3283bcf7b433b54c Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Wed, 21 Nov 2012 10:35:28 +0100
-Subject: [PATCH] Fix segv with AES-NI on some platforms.
-
-* cipher/rijndael.c (RIJNDAEL_context): Align on 16 bytes.
---
-
-The trigger for this problem is the allocation of the context in the
-selftest functions.  The other code paths use a 16 byte alignment
-anyway by means of the allocation of the context in cipher.c
-Thanks to Gentoo hacker Joakim Tjernlund for figuring out the reason
-of this problem.
-
-GnuPG-bug-id: 1452
----
- cipher/rijndael.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cipher/rijndael.c b/cipher/rijndael.c
-index d9a95cb..a2aedf0 100644
---- a/cipher/rijndael.c
-+++ b/cipher/rijndael.c
-@@ -126,7 +126,7 @@ typedef struct
- #ifdef USE_AESNI
-   int use_aesni;            /* AES-NI shall be used.  */
- #endif /*USE_AESNI*/
--} RIJNDAEL_context;
-+} RIJNDAEL_context ATTR_ALIGNED_16;
- 
- /* Macros defining alias for the keyschedules.  */
- #define keyschenc  u1.keyschedule
--- 
-1.8.0
-
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch
deleted file mode 100644
index 5d39346844bf..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-http://lists.gnupg.org/pipermail/gcrypt-devel/2012-September/001979.html
-https://bugs.gentoo.org/427726
-
---- mpi/amd64/mpi-asm-defs.h
-+++ mpi/amd64/mpi-asm-defs.h
-@@ -0,0 +1,4 @@
-+/* This file defines some basic constants for the MPI machinery.  We
-+ * need to define the types on a per-CPU basis, so it is done with
-+ * this file here.  */
-+#define BYTES_PER_MPI_LIMB 8
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-gcry_md_reset.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.0-gcry_md_reset.patch
deleted file mode 100644
index 2fe4a524a1c1..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-gcry_md_reset.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 04cda6b7cc16f3f52c12d9d3e46c56701003496e Mon Sep 17 00:00:00 2001
-From: Milan Broz <gmazyland@gmail.com>
-Date: Mon, 13 Jan 2014 21:30:42 +0100
-Subject: [PATCH] PBKDF2: Use gcry_md_reset to speed up calculation.
-
-* cipher/kdf.c (_gcry_kdf_pkdf2): Use gcry_md_reset
-to speed up calculation.
---
-
-Current PBKDF2 implementation uses gcry_md_set_key in every iteration
-which is extremely slow (even in comparison with other implementations).
-
-Use gcry_md_reset instead and set key only once.
-
-With this test program:
-
-  char input[32000], salt[8], key[16];
-  gcry_kdf_derive(input, sizeof(input), GCRY_KDF_PBKDF2,
-                  gcry_md_map_name("sha1"),
-                  salt, sizeof(salt), 100000, sizeof(key), key);
-
-running time without patch:
-  real    0m11.165s
-  user    0m11.136s
-  sys     0m0.000s
-
-and with patch applied
-  real    0m0.230s
-  user    0m0.184s
-  sys     0m0.024s
-
-(The problem was found when cryptsetup started to use gcrypt internal PBKDF2
-and for very long keyfiles unlocking time increased drastically.
-See https://bugzilla.redhat.com/show_bug.cgi?id=1051733)
-
-Signed-off-by: Milan Broz <gmazyland@gmail.com>
----
- cipher/kdf.c |   16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/cipher/kdf.c b/cipher/kdf.c
-index 503f068..af0dc48 100644
---- a/cipher/kdf.c
-+++ b/cipher/kdf.c
-@@ -175,19 +175,21 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen,
-       return ec;
-     }
- 
-+  ec = _gcry_md_setkey (md, passphrase, passphraselen);
-+  if (ec)
-+    {
-+      _gcry_md_close (md);
-+      xfree (sbuf);
-+      return ec;
-+    }
-+
-   /* Step 3 and 4. */
-   memcpy (sbuf, salt, saltlen);
-   for (lidx = 1; lidx <= l; lidx++)
-     {
-       for (iter = 0; iter < iterations; iter++)
-         {
--          ec = _gcry_md_setkey (md, passphrase, passphraselen);
--          if (ec)
--            {
--              _gcry_md_close (md);
--              xfree (sbuf);
--              return ec;
--            }
-+          _gcry_md_reset (md);
-           if (!iter) /* Compute U_1:  */
-             {
-               sbuf[saltlen]     = (lidx >> 24);
--- 
-1.7.10.4
-
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild
deleted file mode 100644
index 8ba9b28f9f49..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,43 +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/libgcrypt/libgcrypt-1.4.6-r1.ebuild,v 1.1 2011/04/06 18:37:54 c1pher Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.5"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix build failure with non-bash /bin/sh.
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--with-pic \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild
deleted file mode 100644
index aa8147726970..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.4.6.ebuild
+++ /dev/null
@@ -1,42 +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/libgcrypt/libgcrypt-1.4.6.ebuild,v 1.12 2011/01/29 17:32:34 arfrever Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.5"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix build failure with non-bash /bin/sh.
-	eautoreconf
-
-	epunt_cxx
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--with-pic \
-		--enable-noexecstack \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild
deleted file mode 100644
index 42da63991434..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r1.ebuild,v 1.2 2012/05/21 18:52:09 xarthisius Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uscore.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
deleted file mode 100644
index bc63d5016919..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.10 2012/09/23 22:28:11 vapier Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}-idea.patch.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uscore.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-x32.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-	epatch "${WORKDIR}"/${P}-idea.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r3.ebuild
deleted file mode 100644
index 5088fedbb2f3..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r3.ebuild,v 1.1 2012/11/04 17:36:12 c1pher Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}-idea.patch.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uscore.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-x32.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-	epatch "${WORKDIR}"/${P}-idea.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	# --disable-asm: http://trac.videolan.org/vlc/ticket/620
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static) \
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r4.ebuild
deleted file mode 100644
index f1e878c6b8b9..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r4.ebuild
+++ /dev/null
@@ -1,52 +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/libgcrypt/libgcrypt-1.5.0-r4.ebuild,v 1.3 2013/02/20 22:58:31 zmedico Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}-idea.patch.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uscore.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-x32.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-	epatch "${WORKDIR}"/${P}-idea.patch
-	epatch "${FILESDIR}"/${P}-aesni.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	# --disable-asm: http://trac.videolan.org/vlc/ticket/620
-	# --disable-asm: causes bus-errors on sparc64-solaris
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static) \
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") \
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild
deleted file mode 100644
index fa5a3b2bdf6e..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild,v 1.3 2012/05/21 18:52:09 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uscore.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--with-pic \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild
deleted file mode 100644
index 997d0f36ac0a..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.1.ebuild
+++ /dev/null
@@ -1,54 +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/libgcrypt/libgcrypt-1.5.1.ebuild,v 1.2 2013/04/25 19:23:12 radhermit Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-1.5.0-idea.patch.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-	epatch "${WORKDIR}"/${PN}-1.5.0-idea.patch
-
-	# bug 466938
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-padlock-support for bug #201917
-	# --disable-asm: http://trac.videolan.org/vlc/ticket/620
-	# --disable-asm: causes bus-errors on sparc64-solaris
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static) \
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") \
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild
deleted file mode 100644
index ce021a0adb4b..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,48 +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/libgcrypt/libgcrypt-1.5.2-r1.ebuild,v 1.11 2013/08/06 13:08:07 ago Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.0-r1.ebuild
deleted file mode 100644
index 96d95923b96f..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.0-r1.ebuild,v 1.1 2014/02/03 18:22:10 alonbl Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.13
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
-	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 -arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.11"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${P}-serial-tests.patch
-	"${FILESDIR}"/${P}-gcry_md_reset.patch
-)
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	autotools-utils_src_configure
-}