add missing dep on zlib, remove old ebuilds

Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A
author: Richard Farina <zerochaos@gentoo.org> 2015-02-24 02:47:24 +0000
committer: Richard Farina <zerochaos@gentoo.org> 2015-02-24 02:47:24 +0000
commit: 6c3e9544b6ac148e70df68828c6b4ef3e257ccac (patch)
tree: 7c22afaa58f5c41c18478741c955b6f4461abace /app-crypt
parent: Remove old. (diff)
download: historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.tar.gz
historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.tar.bz2
historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.zip
14 files changed, 31 insertions, 2501 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 897980588198..8dce7f558823 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.166 2015/01/28 19:13:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.167 2015/02/24 02:47:19 zerochaos Exp $
+
+*johntheripper-1.7.9-r10 (24 Feb 2015)
+
+  24 Feb 2015; Rick Farina <zerochaos@gentoo.org>
+  +johntheripper-1.7.9-r10.ebuild, -johntheripper-1.7.6-r1.ebuild,
+  -johntheripper-1.7.8.ebuild, -johntheripper-1.7.9-r1.ebuild,
+  -johntheripper-1.7.9-r2.ebuild, -johntheripper-1.7.9-r3.ebuild,
+  -johntheripper-1.7.9-r4.ebuild, -johntheripper-1.7.9-r5.ebuild,
+  -johntheripper-1.7.9-r6.ebuild, -johntheripper-1.7.9-r7.ebuild,
+  -johntheripper-1.7.9-r8.ebuild, -johntheripper-1.7.9-r9.ebuild,
+  -johntheripper-1.7.9.ebuild:
+  add missing dep on zlib, remove old ebuilds
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> johntheripper-1.7.6-r1.ebuild,
   johntheripper-1.7.8.ebuild, johntheripper-1.7.9-r1.ebuild,
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 126dfe990330..f09edcfe39a7 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -5,44 +5,25 @@ AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 SHA256 9bf9577ed74048b4df82bc6
 AUX johntheripper-1.7.6-cflags.patch 2927 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732 WHIRLPOOL 9e209861eef8276515fdc46573a5ed2ba9dda658aebc6c767481cbdd0ccb1c30d35a8b1463b973a81c957dcb76455697814a8461f790415a7c07730bfdfba155
 AUX johntheripper-1.7.9-jumbo-5-NT-performance-02.patch 1300 SHA256 27ab9ee6cd7b83aa94dbe3c66fb507432f230fde4818a9a754eeb93388f01513 SHA512 1bedce39dd17f492a9897f1d6caed77959022f50c03fe5dc0d4860c7478025e2899fb552de054fb47ed9ff9c2fb2f1fec260766c12e0ce2fde7d49305f4461d3 WHIRLPOOL 79396d44d98869aeb936d49deabe787ae8a4a60aaf1a98564054e73d85f7b02545e51a979d3db12412e3edcee9e1697eb4c68ec10a7b20d19398bb8b221924b7
 AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 SHA256 cd7174313d4592f39274e473623a8943c86c92ba896df23ee9cbdc6c7673d4fb SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513 WHIRLPOOL 6da1106b38cc3129ff1e170366c255c44d1e159bd158c5a743279225134c4899c8a7325f87cbc40e269e64aaa00d33ba0a6972778e6b44e10c01925bad0ba948
-DIST john-1.7.6-jumbo-4.diff.gz 206601 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a SHA512 7e26d103d202d2458c961c840678f82124c733b449db1b47c13f8ecdd08e47b91aa0c329762d76a0c2efbebd1a38dcf5158d6d936c2e2dc43917e09b157b825a WHIRLPOOL 3ac4b610539da97e16caf39269de0a2c066ab49259f5f229454dbd5b826cc5bb0d2692feee2905ae4df46b5c19c32c6a3b5c48dd7acf502cedc1b2047aadebec
-DIST john-1.7.6.tar.gz 832790 SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73 SHA512 9fd70b3d77b021b90b7b156982fcfd238a742fa114c8a739923ac8214868a69399ff02f4609993be3c5a7d8386b05783f312de172d33749bbe61e9faaccc62a1 WHIRLPOOL a6b8a71a3d8af14b60b0fd02ab9dadcf2363e40e6a4e02ab00e36425a4f0e29f66bdddcef74ba9446ddc65ea11400f8ee178f9c271e0bf61e877db2d269ad368
-DIST john-1.7.8-jumbo-2.diff.gz 402639 SHA256 fb1b83f1a5db8f42de25d65f78b605e44d1d0dfefb87161ed38c5216a75039a6 SHA512 565a936b92c03bbde8dc4fd55b81235e49fa80ac5c82247ec20fd31dcbdce512fe3c3a4cb5119985d7015d97c8725b07cd16e6d5f141e2d21a9c1de300be5d21 WHIRLPOOL f3b43ae08c0f0a3b8e2a94785767f12fee671a79f1ceb8b01f3c61553593eb777b225b0c8dcc3a71dfe9729af66c95f5342f3410ccf20ddb43a0e66226c69669
-DIST john-1.7.8.tar.gz 849810 SHA256 12f4307602b9a8f0d3f82daf28e0f59de21aa82c9dcccd16819b288ec83ab559 SHA512 a1d9cd984a271b6cf9ed61d283bee08b33a014bc2af164df6dee9e37a7dd4a9a092eda5ec7cb49775befb53a48781db393307f343eb05da136de3edf4ccf0149 WHIRLPOOL 0ac6f04a7a665aff5ebc37e0490540bb863afe11ce36fd848d21ed23922fd73a19fbb0828d7f86f301184da64ce43bad20989278f4739649eda06fff86d1c0b0
-DIST john-1.7.9-jumbo-5.diff.gz 622881 SHA256 9a0ff6b912723a393122fa969b9af8efd9f47b154917870053141a372d5963bd SHA512 06b49db26c2a4794d657a4e2869b67abdbd4e93555f752a1b2aae62bd05cbf4604c997b55ba3e0c1afd6747d6f22d0fe634aa84dc97a646fa8a8983e0469eab4 WHIRLPOOL 262082d460538c11e151b32107609d5ca7cf67aae1c3ab59032569048c16e197020c055b068a2939d32e41082b865440e30ed79de5cc6e0b4862c59ed7393c77
-DIST john-1.7.9-jumbo-6.diff.gz 1016874 SHA256 1f314caef8d4c6b98b24a74d28c89ee92c07456b8d7c6386a280f9b529073ac6 SHA512 ea7ed1733d25a7958e6fb27465a08ebb84b2cd2e6e2518f64d7764c641949a87fe616eaa895c9795e9c57cffda4b6eaad017ac03ed874ffe28450bc9909308f3 WHIRLPOOL 75dccfe58d0558c99ce1d043f8c6118c8d0e74bf4749b438823468eb6111d688625595ea05c5f9e133d2556573b19ebb8c70b1786b0216bd66a25e96b78d0b6c
 DIST john-1.7.9-jumbo-7.diff.gz 1074044 SHA256 9e87e5660965e6e55214176299f67dd1b8a40820805441c62a57af6a6a4a19f5 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a WHIRLPOOL da09df93277d90580cd08de2981a9d45df89f9a82f901f8bdc43acc66b97b6eb5515e603dc691cc000852a0847b943a104dee1826a59a000e09488604224f15a
 DIST john-1.7.9.tar.bz2 717505 SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b WHIRLPOOL e217d3ae3bafaa0d2465402a1c98f05018da9a95ce61effc7f2f20af4aa9ef9a54a636fc7025dfc283e815f5ebd07fafd64e4b01564739fe97053dbeafbd2b13
-EBUILD johntheripper-1.7.6-r1.ebuild 4847 SHA256 cdd01962c75a3be6309a09a979f972defca9f416c3296ff7f7360354e13200b0 SHA512 fe7a42f7e84d8dcfff490505b7bfa37c12e6db0ea091620d2677b47b3c9c5b731c5b3e14575077b3f25da189134b3b454c3b18be362f8caa4d1fc95f20a43380 WHIRLPOOL ce4c7c7d1be962dc9f0c318cab76e4576fb39f1f0afa3534063605bcd59e2ddb3781949eff5924e910d09effa4201a92e01b8af7fa7f9125ab13bca0481f6822
-EBUILD johntheripper-1.7.8.ebuild 5006 SHA256 2a730076448e96967eb38360a0ffd61ba275164e440c5ed7a9d56e0ab8f56ee8 SHA512 b3f58429d84743612ffbd069735893c567a1445ce04ded8f128d8c021d5a529af02466e879662fdf0dd91d8e51fca1f085914d37392efdd66a433c8a8028d582 WHIRLPOOL 039ae0c2513b0b20dbe5bb856800aec248f7589186e037daae7a84a8959a19970888b68f412927ce0913ceb4a24373d2b66f6262e5bb0fed6d7c9b20ba8a4a25
-EBUILD johntheripper-1.7.9-r1.ebuild 5314 SHA256 1581aab967ff418539c63dac3815fc1400ba40cdf0fbfb203769a68296c47eb1 SHA512 90820eda877ff320c26d93f7d1bbba3d0687f831712b0711548c585d1007d2cd42eeb833a036896388bedf47340df0604bb2af2f35e013ceb341bc404d559bdc WHIRLPOOL 54823f1aa51a351a4d371a53a8cd63c30bcef1c35ab24c3f0ab56bc5b6748ee76e4e7fd50ede2b22fa028bf35e5fe7814f35133447ee0d7b29f389838cf35c9d
-EBUILD johntheripper-1.7.9-r2.ebuild 5451 SHA256 9952f868cc5083809980de1fee6457b1500bf9657d9f2a0164ef25d7b4550cfa SHA512 7e55a86dd20577a9d36f99e73822171c3a148652b58983adb5a67fd24d51939908088207325cb2fd49ab8e6252a371e144a30ffdfc57a84eea2ebf397ed90c47 WHIRLPOOL f8e48d2a63876b8ee04272c69dd01050e3953a940dafbc3d78a198d68dae7f8572a8b2d8758a7d18a860d764e029a2c1934303d6484f5c7ea10064ecb15237cb
-EBUILD johntheripper-1.7.9-r3.ebuild 5387 SHA256 ddc73b552650c9b83dd6cd5e09f771b67c11fff3206e24165a9423ec9cc49736 SHA512 b992593ebab5b19b854b35639ee4f5e1dd62fe1ea79655a60378ebe7d9a65040ffaca9896e33af3f9a166ddf3fc1075fa44f24f8741e60c23525bf97612e6f59 WHIRLPOOL c25828ed88ccde749ac49dcbf5a2fd3d0202fca3d540574a80a1edb443ae337dfbba3b54b3deca28bab5c70fb2c8ab55cf4a2113203d2826e96ac26876d68d58
-EBUILD johntheripper-1.7.9-r4.ebuild 6236 SHA256 3581ed69fdaac56a6643c59af01c430e300db7cc0f9028c02e9f5a57947da1b2 SHA512 541d8eb3448046f92820a4c2eb090b73fa1c918a22a575a33d14ae1197ebd3e10cef2915c30b05e125584bbe43fb4d49a5d5b05d50ceb305602dc3eb53f3d952 WHIRLPOOL ad0631dc92a4777aebebbc830c72a4651280557d3278a324fd6233d9ceab0170e30c62a3121220f160a492b7358764ebffd64989c16e8c930a4e0c2467a9a45d
-EBUILD johntheripper-1.7.9-r5.ebuild 5886 SHA256 ddd4b70a28b73fe33dbb67e737fb8b79aa724383ac34ad033ae0ba28a31a2969 SHA512 2c2b7227003d9de843c7df7023ca0ee34f6cd402c082e0702d620659aca904894c7000acfdab5f53adda7351fdf52dd70e7875e5cfa563b118b48b96895be53b WHIRLPOOL 6251fd728bdbc14b7d5432cbbab4cfadcaa8664782b43a0085ecc2d856095b6568b8455ca35f2850a2be21314f868d9c6599b2e5ef1cb3b02757006cae3155de
-EBUILD johntheripper-1.7.9-r6.ebuild 6133 SHA256 e41e5c8910460a6fdb8083be1397ba2ca89154f2364cc3f534d3b7c50d481d9f SHA512 97b135bd035908fb5da1b05c2d14dd3a0bad87b410b86aa98f7bc37959f70477f28e5ac5cb6d38d93ccb1df21f0ac9eabbe9461ac6f3f37d771fd7dfc1caf21a WHIRLPOOL a830f8696a3ea6abc793ab51627ef19ce8e02ad5686fc38007517d18a17b7cebb1ec9c87faad5123a53e578e8ce0f064f13b7d686b5577945f1afbfe667ebe39
-EBUILD johntheripper-1.7.9-r7.ebuild 6143 SHA256 c56cb298291d39e525dcbc9aeddf67f22adc1603970afbb4bc9f58dcd546d3ff SHA512 7e5100271199fea256836e7220dccf746f7215173106ab418085d816afd370b70987b6dd134b6fbde4510ce6a95c54ee3bc0c6b5850404fc06a03b14c5bb3d10 WHIRLPOOL 646148208574ea446e7bf1a01b870ffc5a4d8e5b80522feddae8895f7ba839b6550b5bb6e63601e9e101bda1e3f0cb821495d9e1cddd66cce2899d0e702fc50b
-EBUILD johntheripper-1.7.9-r8.ebuild 6296 SHA256 445446b5e70cd985269e14b32a23f01bd6c130a6c0915b08808ae5a6f7052cb0 SHA512 e23466b77596aa6a6223d449d1f50d403335211ccf8ceba32082be78072470a55551e60944b6bb781189ac9dd857d3c2e037228df5ad6b18cc2a384ddd40cf8c WHIRLPOOL 1e8e0b3c7f8363ded837c40093eb763439271ae12d76ec5d89e272851fe771e4be101d37ea845760eb4e7575b1ae4edf306374bdfa8a410116abbbd86e4e51e6
-EBUILD johntheripper-1.7.9-r9.ebuild 6527 SHA256 30743f3992ff19f367ec6a399ec50196d1e7b9f27d12346fcae13ce045573a35 SHA512 1e8c0f0d4e36403218a3113186a38a4f2558da29e3de039f63f3bc561b9717570a55637d9ab9b911ce6ea92b0b146286d88a842042a376c967295508c08907c9 WHIRLPOOL eb79f685d2322c25cc16c246d0cb35438be1468702ed9a166921948e3c2969b2205d97fc2dbf3992a50c90967cc6136511a73cab7eb34eb554a31ee8fb30ae37
-EBUILD johntheripper-1.7.9.ebuild 5249 SHA256 bdfb96a341259f85828c6c8fefb3351ef218abb391f9c8a81c13376bd93d55c8 SHA512 09e977d0b50aeb6940f4466596c37f023194e8fb37a1e8f03dc17de2b7c86206c686d38eeefda9b9d4b267a555ae6ab0abecf4dd0b17df1a2000116c9e12cdee WHIRLPOOL daadf2c703ed87a5d3fedb34ffbc4b6943911f5ce624ba270a13129c848f4a7416a3fab44f69e4e09431a830ebc274ef0dd0416f4cbedb3b551f7660e2e4266c
-MISC ChangeLog 27947 SHA256 5611411196ac2470843a53b6a4cd75b781b3d2997a130b30a54a5d531abd0789 SHA512 356ad787fde79dc11ed38c446e538c9fbaf207ef8180488ba88ad25fea4b533a6f40eecf38ce2ec5d55010dbbd79a864bf04a41dcfe335e9067b78e3fa23971a WHIRLPOOL 4b03acffb9ea7e0e6df55389ac6d89236f009f392c0f30d0cee5ea55fa28956c3fc8fc18cb79a7014482223c08f56babcc447f394bc8ae294f6af1298a0dd821
+EBUILD johntheripper-1.7.9-r10.ebuild 6546 SHA256 e7fa0927316ec9ba0fb9503ff301670905c515fdedcf96a9753c47aba76a41f9 SHA512 20a8ed5d36cbb174f62a6309501ac2e109684dd76c15575a736b3fb3ce3c3d6c2e90fbd5afb280725ea72977f6b9e3ee41508384599cd3c1cdda5d1d2f6ee5d0 WHIRLPOOL 01927b14562acb5b2e2b566fa082ae7a71e7accea8d1ddcdd64e5f1740d74975dd764b5fa2635e454a0d9da68d4572ab195ab438533d9b758941954492b500a1
+MISC ChangeLog 28512 SHA256 9b00565fea5459de85354c98055de7e460c27ec968215cc040c1547d340e3e1d SHA512 5638402415ee4da3ab13bee9a6768b73c1baabfd5377c49cb4208debebf833451c3f0ca6258521af8c78dc3fab7c9ed0da6ac501902368643fd65c9844af18db WHIRLPOOL f0179d2220b9d9a6d1dcfe90037b5675ffcf46ead15908f12f7baf2ffaae430f351097b4b64a1ed8bd2b1a76d66d3b3148d4efa7c977fb37a592142f7c55f1a9
 MISC metadata.xml 599 SHA256 50bd157b1e2a064b9b50b388938b5cda68b7eff31c859374b30f496474de5433 SHA512 4d5cab10cf182fa462bdbf8e9d700501dcfbde9a0cc553007a80698d5d96c158dc743001153bb624ac384a2a5b602eeaabfcbfd5d65a0ef038c68816311b67f1 WHIRLPOOL 62e1487da6e4d1588e4c6cd14dac1135e0cdd1eb3e2d46fafeef1e95ded22d48d6b0c8c03af3612a62dc9068f92fe2857adecad9d5f8cd4a10180994a46feff5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyTTYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOR40P/39Qz22hDWKDNrP01TfGCoek
-pAWWXZBDgjaYq/AHzbLYPOtAtq0JlTHFBQR1yMQr9di6M4Qt4zjY1fCBrIBBKO81
-9SJKKjVeCsP9ZlCHHwHyyPJDV9oTCYpo/gAcn1xDYB2xmURW1p+Ct5cBj50idrM3
-aig0WWPbvmONirKbkfOPoQsNd3Qp1Ko+VtVCeKsLx86RdnZ4SG6OOmbaHaDUgZTf
-FDhTEXOP/Mv1hwbyEeeSvZOC6kQgO+jk9RUlcq93uLxFStKth/y7ZdcRPh0biarR
-8d5WKZ8b/qsQKPI9BbVDX0za2aFsbiIHY48o0QTidbKg6kqdpDv7sgY135B9So28
-8xixqefi1dCUOBhCFinUAEAVEcwJklkGzBhfpHvBIgteyXAVpIYBCZAgiPWVbbI8
-dTN1alzV8H7MVGfXcEAYNC3NVOofL9UyOh68iexOpBPwI1eFEhii56yikdqqCpSk
-YAC/w0Hsx8kxBQRBlXYNAN0rbuV+3nKYgKvD87JCv7l/CGXgEWy+65X4ul2lJ8O5
-aDIBIRjQTtDmDIZI8BNEQ+7vjppRvGf5z7Peyrw+XNUvNfqLYSblo1OYSDnxfCLl
-MvA9Fe2XKgYoqBiHTPA32uVvZWW8YF/Ch/OjAVFjZe6i0P4kQvfp8w64YKKFXWqn
-wTk+aYLT+CPyT4l+Wl7u
-=U0t3
+iQIcBAEBCAAGBQJU6+ZBAAoJEKXdFCfdEflKJzIP/iXfUbPApGcNRuCDPBsYRd9+
+Qve+BomPQ0P4KPnP5ExewD9W904TXjBtaQgt7BQ4YoUd5I83P7CV/BW1EohLWUKk
+AOKaQu7mKWogVWOYpVGuQviuGsNWaVQX8LQ+nB349Zq56rqi9JcTT7D7B1dJ3pzq
+23VOlsMkVhOXQUMUcV5UjvRwMlGauvYo4ZdlDq0UaDgBendu+sqFhjLL8AIgCO7s
+7etbxC4AbaP6Rl7hzDVw/EKcA5tAxF64jH+zEEfIW843QNJGF7le0poRQhtlcP9h
+HNkIL5bdozjJKbUknU36+Tltf7kJaN9zr3S+polcGjHC44oyUK5DKBhtCK1OEQCy
+bflHZ8rrL0aDRaCNeGUnHIqpoxn+VGeRV7+fTQGBXOTIpLCFCTdxJq1ED8xG5L1Q
+a16/omHYQWGQS2tKZznpDw6kmOUDNA6hjphnGXyon3l/YnIYDHa8TmLlwxeTsPD4
+0yBXmePQH7u5xKtmZtZj4Lwcwgfhrjo+1hkOrheGcblGYIOxOlsCUiPK3+OhETX2
+8Zv0M5E7Jk6LBEfXPSWSVp5gpBrcnQH/bMsui7tyLLOAGpNp26iXa4dq2TIw06iz
+s4QN0YxtN3hdt+rH/ZLqt4zQXaXNx0enmqgC9OaOWtBQkpL37vl7QdNmC/l2vOMe
+w+N4QcEiJ6pU3g5sXgIJ
+=5ooX
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
deleted file mode 100644
index 763c8cb6f811..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.15 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-4"
-#MPI="mpi10"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )"
-#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_sse2"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
-#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )"
-#	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}
-	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
-
-S="${WORKDIR}/${MY_P}"
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		echo "linux-x86-64"
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	else
-		echo "generic"
-	fi
-}
-
-src_prepare() {
-#	if use mpi; then
-#		epatch "${WORKDIR}/${MY_P}-${MPI}.patch"
-#	fi
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-	fi
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE -include "${S}"/config.gentoo
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
-#	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	emake -C src/ \
-		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target) || die "emake failed"
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]]; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die 'self test failed'
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john || die
-	newsbin run/mailer john-mailer || die
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs || die
-	dosym john /usr/sbin/unique || die
-	dosym john /usr/sbin/unshadow || die
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop || die
-		dosbin run/calc_stat || die
-		dosbin run/genmkvpwd || die
-		dosbin run/mkvcalcproba || die
-		insinto /etc/john
-		doins run/genincstats.rb run/stats || die
-		doins run/netscreen.py run/sap_prepare.pl || die
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/john.conf || die
-	doins run/*.chr run/password.lst || die
-
-	# documentation
-	dodoc doc/* || die
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
deleted file mode 100644
index 9c82f8dea00d..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.8.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-2"
-#MPI="mpi10"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
-#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )"
-#	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}
-	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
-
-S="${WORKDIR}/${MY_P}"
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		echo "linux-x86-64"
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-src_prepare() {
-#	if use mpi; then
-#		epatch "${WORKDIR}/${MY_P}-${MPI}.patch"
-#	fi
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-	fi
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE -include "${S}"/config.gentoo
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
-#	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	emake -C src/ \
-		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]]; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die 'self test failed'
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap_prepare.pl
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/john.conf
-	doins run/*.chr run/password.lst
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
deleted file mode 100644
index 9482e58f567b..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild,v 1.7 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-5"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-	fi
-
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die "self test failed"
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap_prepare.pl
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
index c8e3b1a6c260..0e58e094e70f 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild,v 1.3 2015/01/28 19:13:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild,v 1.1 2015/02/24 02:47:19 zerochaos Exp $
 
 EAPI="5"
 
@@ -28,7 +28,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	opencl? ( !minimal )
 	mozilla? ( !minimal )"
 
-DEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+DEPEND="sys-libs/zlib
+	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers
 		dev-util/nvidia-cuda-toolkit:= )
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
deleted file mode 100644
index c78c12f0ab3e..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-5"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-	fi
-
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		epatch "${FILESDIR}/${P}-jumbo-5-NT-performance-02.patch"
-
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die "self test failed"
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap_prepare.pl
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
deleted file mode 100644
index 4c3091917f74..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-6"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-	fi
-
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die "self test failed"
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
deleted file mode 100644
index 67bd77ed07b7..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-6"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die "self test failed"
-		#else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
deleted file mode 100644
index 2b66c6608f5b..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.6 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
deleted file mode 100644
index 9ece4a5ada65..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.14 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
deleted file mode 100644
index b177c18102d0..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-DEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild
deleted file mode 100644
index f378ee82b902..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild,v 1.5 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="5"
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-DEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-
-	if use cuda; then
-		cuda_src_prepare
-		sed \
-			-e "/^NVCC_FLAGS/s:$: ${NVCCFLAGS}:g" \
-			-i Makefile || die
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
deleted file mode 100644
index 78f8e12dbb41..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9.ebuild,v 1.5 2015/01/28 19:13:24 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-5"
-#MPI="mpi10"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
-
-LICENSE="GPL-2"
-SLOT="0"
-# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
-#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )"
-#	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-#	if use mpi; then
-#		epatch "${WORKDIR}/${MY_P}-${MPI}.patch"
-#	fi
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-	fi
-	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-${p}.patch"
-	done
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE -include "${S}"/config.gentoo
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
-#	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	emake -C src/ \
-		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(get_target)
-}
-
-src_test() {
-	cd run
-	./john --test || die "self test failed"
-
-	# This requires that MPI is actually 100% online on your system, which might not
-	# be the case, depending on which MPI implementation you are using.
-	#if use mpi; then
-	#	mpirun -np 2 ./john --test || die "self test failed"
-	#else
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		dosym john /usr/sbin/undrop
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap_prepare.pl
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
author	Richard Farina <zerochaos@gentoo.org>	2015-02-24 02:47:24 +0000
committer	Richard Farina <zerochaos@gentoo.org>	2015-02-24 02:47:24 +0000
commit	6c3e9544b6ac148e70df68828c6b4ef3e257ccac (patch)
tree	7c22afaa58f5c41c18478741c955b6f4461abace /app-crypt
parent	Remove old. (diff)
download	historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.tar.gz historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.tar.bz2 historical-6c3e9544b6ac148e70df68828c6b4ef3e257ccac.zip