Remove old ebuilds and patches.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

16 files changed, 30 insertions, 1258 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 45e96cd60212..3ecebfee3e6a 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.119 2010/12/03 19:02:34 c1pher Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.120 2011/01/05 18:53:27 c1pher Exp $
+
+  05 Jan 2011; Dane Smith <c1pher@gentoo.org>
+  -johntheripper-1.7.2-r3.ebuild, -johntheripper-1.7.2-r4.ebuild,
+  -johntheripper-1.7.2-r5.ebuild,
+  -files/johntheripper-1.7.2-mkdir-sandbox.patch,
+  -files/johntheripper-1.7.2-sha1-memset.patch,
+  -files/johntheripper-1.7.2-stackdef.S.patch,
+  -files/johntheripper-1.7.2-stackdef-2.S.patch,
+  -johntheripper-1.7.3.1.ebuild, -johntheripper-1.7.3.1-r1.ebuild,
+  -files/johntheripper-1.7.3.1-all-5-stackdef.S.patch,
+  -files/johntheripper-1.7.3.1-params.h.patch,
+  -files/johntheripper-1.7.3.1-stackdef.S.patch,
+  -johntheripper-1.7.4.2.ebuild, -johntheripper-1.7.6.ebuild:
+  Remove obsolete version and their associate patches.
 
 *johntheripper-1.7.6-r1 (03 Dec 2010)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 043078e5305f..10c2914dbe9d 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,56 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX johntheripper-1.7.2-mkdir-sandbox.patch 554 RMD160 2dfa6d0e912d15ac6205ea89450a0a43c90e563b SHA1 5cd63044c33774f795f32184c486b88df9bb6fc1 SHA256 ced75f4476fc2fe412f630083a5be1102fbbd5ceafc2f34d703cccefdc03e588
-AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e95391596280d01b3601 SHA1 ec901d34075b32d515993a1918089e29084d234f SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028
-AUX johntheripper-1.7.2-stackdef-2.S.patch 363 RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 SHA1 ea3b75eb936adc98ebfe41650f608173b6b272f9 SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073
-AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f
-AUX johntheripper-1.7.3.1-all-5-stackdef.S.patch 668 RMD160 77560c448ab9586cb51da3009ce25b0babab9c9e SHA1 2d7e3c97405e793193378577149fd0ef311b20e7 SHA256 b307f7c76f0baa2441e53da4f0db9c90fdaef06f3f7b34080513d518ba8b5890
 AUX johntheripper-1.7.3.1-cflags.patch 2215 RMD160 86e02a71dad29cdb59190b3e5fa6bdb8aa476a72 SHA1 9e346f2e7886ea405e937185bb897096d7c98308 SHA256 b734db5141aed15574c8e2f8e9b476cb17fd2f7753c7cf7d6695b8d4b7cb10e0
 AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0
-AUX johntheripper-1.7.3.1-params.h.patch 532 RMD160 9b386fcfa4ecee56aae79822189b04de7bdb7c02 SHA1 2b6392d51fa8edd6f1c8c261d4318863e64f44fb SHA256 60ed06e59e9f355a15056ce52fe5066679262395a6e21e70614b1b8c44e35523
-AUX johntheripper-1.7.3.1-stackdef.S.patch 2112 RMD160 bbf978098ff017700f05d024071a912ed8d8d3bc SHA1 c457fa3c6f8a7de7e877754b593c167579c87d36 SHA256 bceb69e26e4bace6f12eeccdbe00e2c589bd22b0f6421c0468dcfd7e344e12ca
 AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9ba8d24146 SHA1 f2cb76ef4ba742d7fb02c4a1fca1717a932bf93c SHA256 0490311893ec85b4ca9fed1cce39341378959fed307b012f29adf11789a444ae
-DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
-DIST john-1.7.2-all-9.diff.gz 70430 RMD160 20fde9586f5d7938fbb9f187ec0689f48a56590d SHA1 1d5202842e1ba7f68306d1524bb029b29a5c3e29 SHA256 44555f9c2b630d9c35597f1a4319379f4e3f452ab2103b21cee8d3ebe6d38bbe
-DIST john-1.7.2-bp17-mpi8.patch.gz 110095 RMD160 aca159a58c1a8134eb646775ea601a6af4192db5 SHA1 98067712a825f8dc1ae5d0e3ba73b4c69e2a4d1a SHA256 c05bf57a95bda859f54c7a0fbeea2361433cac3a3b3dbce994133ff1cdc0dbae
-DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
-DIST john-1.7.3.1-all-3.diff.gz 90240 RMD160 d3d57fec8a93b04b7e899cb7cf405c920187df98 SHA1 a246a38e738ce2fe9caeb4829338a4ada260b364 SHA256 7342a83a153d7854a4007ea361fee3e66b09af97dc99bab5416ff71f873ac3e8
-DIST john-1.7.3.1-all-5.diff.gz 124682 RMD160 e52e740dd6c89893a8261baace6b8e7c396b3e58 SHA1 09420637257f64442bd51e479a5c5c466503d157 SHA256 e0c735e4972e8ea5e9449a90fbaafe389242c366273aa3e3d9f566b02a61586c
-DIST john-1.7.3.1-mpi10.patch.gz 4723 RMD160 9c43172866591996ae0b135bdf4f90449e33c4c9 SHA1 0b2c6495e3c8aa5711a5f36acb2e8170b3431454 SHA256 23f8d07df3f3a9cfb39d77daffc2f9a5137e1e0c2d9683a03a0b8f3bdc4125c8
-DIST john-1.7.3.1-mpi8-small.patch.gz 9395 RMD160 ca55d3c7c31d6f3e023f74cfc6c453bdb64bb21e SHA1 c6d1d4d91d76a774470b66f120de93aca7906319 SHA256 5242b50d3709698edac17774b4394eef372bdac4b09fe4d2f01178f01a66deba
-DIST john-1.7.3.1.tar.gz 814903 RMD160 c810466241889f307c0e7096bcdd4fb39d8638ca SHA1 29a283933219dabe0f363618a0c8a083e79e6748 SHA256 e152c34bfc2ca1b79d78a5d243cd51930ebf3e4ec77810f4d9eaa560077be635
 DIST john-1.7.3.4-jumbo-1.diff.gz 124346 RMD160 6876511de35b0743df6b9ce23529b2e3e8269ee7 SHA1 05a31bee24685da89bde5d0d13981bb6d1dcd5ca SHA256 580e2db04338fe5a8841943bd588640ba9c80884e1d8a21bb44be7fec581e178
 DIST john-1.7.3.4.tar.gz 816259 RMD160 975116059a26e7030cdd573109dae36812160543 SHA1 9fd327416188c405d4927a32f1a8e756b4a259e1 SHA256 017936a2a98e0a4bcec56c53177e4ee8f515ebd5e39fd97e55b1962076eb5d16
-DIST john-1.7.4.2-jumbo-3.diff.gz 189325 RMD160 4b1a1d48aba31dbe25b6e5a1de9c837203b30419 SHA1 369882a289d28e78b0917bf7b58ce6c486cb9b72 SHA256 cbb99ceb814c786500e61eacd6432fbcc6c69ec6b92218f29c851a9546b0d177
-DIST john-1.7.4.2.tar.gz 823747 RMD160 bf36f64921454ee593bf588dcffe7053e9cbf73a SHA1 954eedaa17868cce0ac507042407269bcea2c63b SHA256 ad1c10e63c8346d4319e156e30fdbbe3457eb44441bd40e93a64ae44f9be7329
 DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a
 DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
-EBUILD johntheripper-1.7.2-r3.ebuild 3270 RMD160 11c92633890bfd0512cb91853223d220d65ed4fa SHA1 2d96500dd2d8575caaa84a095e0cfa52b570bf92 SHA256 121a0cb4f6df1d841738411ceaf7485c90d4b52dbb9e78919930ab8e52a8ffce
-EBUILD johntheripper-1.7.2-r4.ebuild 2978 RMD160 7e8851cec1060b8794d95392bd0c37b5f21ee993 SHA1 72fb81509358e99fa576f59b9ca12c1eb5108f8f SHA256 ee57da8c6129754d2b52195dd7e0a560384a42ae7e4cc154b9074ea580cd511a
-EBUILD johntheripper-1.7.2-r5.ebuild 3246 RMD160 ffd3cef44a37ccdeee90f9a252c35b671842b741 SHA1 0d3d612dac576e58a85afe9b2bb1fc9a5caae844 SHA256 eaec78bba96cc112e1b2c51be1e4600ddab491687e28ba720e2ec9e952bf31e2
-EBUILD johntheripper-1.7.3.1-r1.ebuild 3802 RMD160 cd748e97576a721d12c02cde6eed254e24f4e57b SHA1 6f0226e61d8ca6a574301ef68e0bf3fca4ca52fa SHA256 8bf1feecc435d047e66ef8d3795510f0842dd9b5d1a452caf9370ee5267b8b2c
-EBUILD johntheripper-1.7.3.1.ebuild 3991 RMD160 339f70feb161e7bc6e5716cd02c99a77e8a9ed1a SHA1 f20d2ae314093f270393814abc7dba0a245d3e0d SHA256 249101538909c1a303923662c360c44e5eb0ac99069b8744674bbf2e62f5f812
 EBUILD johntheripper-1.7.3.4.ebuild 3735 RMD160 5267feff38ecbaa90d01eb0da95595e5b3873e63 SHA1 b52b728619943229ebcfe4de336484b4b2f83f5a SHA256 108b17217b5aa0d801077cdc2a35c448c9b8b5cc58f879961ce8a2363b6cc19b
-EBUILD johntheripper-1.7.4.2.ebuild 3765 RMD160 b75a724991f5bd390beafacd304a36ac95c4d574 SHA1 1c865c064aed90a8e86c3ff9b22db6766047029f SHA256 d7ac7825f96b5cca459037a7d2baa800444e00fc8cf8c18767513e057c43b1cf
 EBUILD johntheripper-1.7.6-r1.ebuild 4001 RMD160 f8248e13359e0e0414b57000c7eca4cbdd34e6f6 SHA1 1fc262de1df95a9ff7f18017717c7b0e28f9c0ce SHA256 b4e0845d1ba6ec73dbfe648c609029565b61aceb8245e57d47527af94e8b0cf2
-EBUILD johntheripper-1.7.6.ebuild 3876 RMD160 ca29ce881ddb3f96b3d62a329f3783be13e6ee74 SHA1 c993f3c4ce6830f0a4e75dd70fd5bfeb18ad9ddb SHA256 e630d0395e6613fac6cf06e1ed7dd084dab9ae1763207c023233ad82b7559ffe
-MISC ChangeLog 19108 RMD160 efb3df7c3eac0c6e680959f9e1a65ddf6d750cc4 SHA1 3858d4addeb8c1a00210e5822ffaf4f0de0cd61b SHA256 31e6248816ce811aa4ad718c83275bbd0bb31b43913d28d019c2ae6e79108007
+MISC ChangeLog 19784 RMD160 0ddd598f530b426290b4164ba73782ff9dddbd9b SHA1 0f6b5c6ed0d4556e068d819992d81446e7616730 SHA256 1f7a7e47e4c2974dbb151e7e85c2861e08f80791faa0b542d4ded7a5fbb07c9f
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM+T6jAAoJEEsurZwMLhUxwgsP/jSfj0FnTkASzVP/ulai4UQl
-IJaShSkj4qakVXdv8exvvq/DuWXM7nhr3mOpSMpBqoB6a4J/16eXb3UTNopcuAOH
-vXyyUNWUgsgskbywCc7kj+r4FFD/atDrB+THsZPSKPCfbvza8VS/2XG+Tgcj5ruW
-Y0s+LJiai+Hv5VLKM+wqP5JhWcKeM5cztCmikR+L07VEoILw1yjSD2cDAaeb+c8F
-Ss3GILd9xjq1H0If5UkR1QwyCJG44ZIdNXeWu4yzszXqeRu6vzYSBJLjH5uskqa7
-UqyLxJj8cc2tbN9JXtH8PWjV+/H5sptNMWzVBJ7LI8sxK5O6KYOtiriG9DNYoObm
-fZet4Z1lsDdNF79vaIN+X1G+HDHFmqM65ug7ZdfBwu0gZEVoQfYmfPowgnlZ7eqd
-dJ4meV7XMieJOeEeAR1YOjsDPONBCOYWJ/S67IkOgxqlzXazXp3Pw2xIHAspp/nL
-BsSXWyo5qf2cKWjEmgOfy99xYwAp3ACD5Z17+n8bpQlCJ5UWJSHWuXvueifZlvTE
-G1fZk9AWKrA9cebYtUjnz5YWdylgIxzl4d3jWpC/J6kjISBUGLaNHj0mLOyoPJtu
-Fx1OGXC5X80If3YpAdYa+GDsic7cnoFQMDKNPbOkbK5jqMiUvvmTOP6NKGdcmcWv
-aB1NQBIbHaYl8WvSQtMy
-=0vBi
+iQIcBAEBAgAGBQJNJL3tAAoJEEsurZwMLhUxID0QAIIox8BuWv/D70KBpJRM3MQ6
+UztC56ix8923+k6RvncWrpoJUqkjgktzCPcZxDxTqVS6ce17gwOE3xywPQA67aNE
+Hg/ALzTmVk1UDTQ+UXsB31i+TgXL1i6XkyA3M4ynhpYBKCHQwJGbFcRMPpRudwF2
+uNVSuYlnSRy6HOwMy14Ck63A6m8E/mdPtCeDK0/Qbbvafy1OHMQr8DZqU2AjxW7e
+RJkGKmWFx/b4jfyzkN4Mt3HeAIHQaif2ilVexr4Ee3DHyPh8pF7wEszEeeNPiOTX
+vn3UgXGgjRZFURAR+I7PFSBuO8rtGY9dwpjIhd/FSWmSp+AJ9MOY1UanrC+21AAm
+1+jE1TxANd5Ve3RXvrEvDX3EKzGKRciIZIYnX/nN7zrlfyxZ7vNxQKXYTL5l1nqq
++x/df3FmYbB1aPaj0CkGvCTu2eb7b8XT003cjExHjuTtgiWzlJL7Bh6csMN4055K
+7bKL3oF7pcSBvC7ZKTAcu2gzZbU1sEWDaJYx4ABRWqKq1YOtbNT6yv5sUb0S605j
+F9wXSJ4UxtRjRPen5gkcxiN7/CuJER3+AWD3ZPkGlYs2xvaK/II/Z9MGy/BCD6U7
+JrlQRbgbTOIRgGkgITfCqsXN/xnfI0fi6sBFET/ZhaXlBFma5D0/U78FaODf6x2j
+jD9FOnsqWjZxBsVCVhry
+=1hJH
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch
deleted file mode 100644
index 7a1562413050..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp john-1.7.2.org/src/path.c john-1.7.2/src/path.c
---- john-1.7.2.org/src/path.c	2003-10-01 04:26:25.000000000 +0300
-+++ john-1.7.2/src/path.c	2007-11-10 15:53:23.000000000 +0200
-@@ -55,7 +55,7 @@ void path_init(char **argv)
- #ifdef JOHN_PRIVATE_HOME
- 	private = path_expand(JOHN_PRIVATE_HOME);
- 	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
--		if (errno != EEXIST) pexit("mkdir: %s", private);
-+		if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
- 	} else
- 		fprintf(stderr, "Created directory: %s\n", private);
- #endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
deleted file mode 100644
index a713deffffe5..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/rawSHA1_fmt.c
-===================================================================
---- src.orig/rawSHA1_fmt.c
-+++ src/rawSHA1_fmt.c
-@@ -100,7 +100,7 @@ static void rawsha1_set_key(char *key, i
- 	if(index==0)
- 	{
- 		total_len = 0;
--		memset(saved_key, 0, PLAINTEXT_LENGTH*MMX_COEF);
-+		memset(saved_key, 0, sizeof(saved_key));
- 	}
- 	len = strlen(key);
- 	if(len>PLAINTEXT_LENGTH)
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch
deleted file mode 100644
index 8ffb8d25c94f..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urNp john-1.7.2.org/src/sha1-mmx.S john-1.7.2/src/sha1-mmx.S
---- john-1.7.2.org/src/sha1-mmx.S	2007-07-19 18:57:26.000000000 +0300
-+++ john-1.7.2/src/sha1-mmx.S	2007-07-19 18:58:20.000000000 +0300
-@@ -558,3 +558,6 @@ endianity:
- 	por tmp2, ctxd
- 	por tmp4, ctxe
- */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
deleted file mode 100644
index e1ed5ae06812..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: john-1.7.2/src/alpha.S
-===================================================================
---- john-1.7.2.orig/src/alpha.S
-+++ john-1.7.2/src/alpha.S
-@@ -318,3 +318,7 @@ DES_KS_current:
- .space 128
- 
- .comm DES_KS_table, (8 * 128 * 16 * 8), 128
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-Index: john-1.7.2/src/sparc.S
-===================================================================
---- john-1.7.2.orig/src/sparc.S
-+++ john-1.7.2/src/sparc.S
-@@ -410,3 +410,7 @@ DES_count:
- .common DES_KS_table, (8 * 128 * 16 * 8), 32
- 
- #endif
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-Index: john-1.7.2/src/x86-64.S
-===================================================================
---- john-1.7.2.orig/src/x86-64.S
-+++ john-1.7.2/src/x86-64.S
-@@ -1040,3 +1040,7 @@ DES_bs_crypt_LM_loop:
- 	subl $1,rounds
- 	jnz DES_bs_crypt_LM_loop
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-Index: john-1.7.2/src/x86-mmx.S
-===================================================================
---- john-1.7.2.orig/src/x86-mmx.S
-+++ john-1.7.2/src/x86-mmx.S
-@@ -1302,3 +1302,7 @@ DES_bs_crypt_LM_loop:
- 	emms
- #endif
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-Index: john-1.7.2/src/x86-sse.S
-===================================================================
---- john-1.7.2.orig/src/x86-sse.S
-+++ john-1.7.2/src/x86-sse.S
-@@ -1289,3 +1289,7 @@ DES_bs_crypt_LM_loop:
- 	jnz DES_bs_crypt_LM_loop
- 	popl %esi
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-Index: john-1.7.2/src/x86.S
-===================================================================
---- john-1.7.2.orig/src/x86.S
-+++ john-1.7.2/src/x86.S
-@@ -1362,3 +1362,7 @@ CPU_detect_ret:
- 	movzbl %al,%eax
- 	popl %ebx
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch
deleted file mode 100644
index 1baced819820..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN john-1.7.3.1.orig/src/md5-mmx.S john-1.7.3.1/src/md5-mmx.S
---- john-1.7.3.1.orig/src/md5-mmx.S	2009-06-26 14:03:21.073960144 -0600
-+++ john-1.7.3.1/src/md5-mmx.S	2009-06-26 14:01:28.889959256 -0600
-@@ -306,3 +306,6 @@ mdfivemmx_noinit:
- 	
- 	ret
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/sha1-mmx.S john-1.7.3.1/src/sha1-mmx.S
---- john-1.7.3.1.orig/src/sha1-mmx.S	2009-06-26 14:03:21.093949076 -0600
-+++ john-1.7.3.1/src/sha1-mmx.S	2009-06-26 14:01:36.706958726 -0600
-@@ -558,3 +558,7 @@ endianity:
- 	por tmp2, ctxd
- 	por tmp4, ctxe
- */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch
deleted file mode 100644
index 0f430df84b02..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: john-1.7.3.1/src/params.h
-===================================================================
---- john-1.7.3.1.orig/src/params.h
-+++ john-1.7.3.1/src/params.h
-@@ -101,8 +101,8 @@
- /*
-  * File names.
-  */
--#define CFG_FULL_NAME			"$JOHN/john.conf"
--#define CFG_ALT_NAME			"$JOHN/john.ini"
-+#define CFG_FULL_NAME			"/etc/john/john.conf"
-+#define CFG_ALT_NAME			"/etc/john/john.ini"
- #if JOHN_SYSTEMWIDE
- #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
- #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch
deleted file mode 100644
index 8600b7d20e69..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urpN john-1.7.3.1.orig/src/alpha.S john-1.7.3.1/src/alpha.S
---- john-1.7.3.1.orig/src/alpha.S	2002-04-10 08:13:25.000000000 -0600
-+++ john-1.7.3.1/src/alpha.S	2009-06-26 13:56:10.635952569 -0600
-@@ -318,3 +318,7 @@ DES_KS_current:
- .space 128
- 
- .comm DES_KS_table, (8 * 128 * 16 * 8), 128
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/sparc.S john-1.7.3.1/src/sparc.S
---- john-1.7.3.1.orig/src/sparc.S	2002-04-10 08:13:25.000000000 -0600
-+++ john-1.7.3.1/src/sparc.S	2009-06-26 13:54:31.388950767 -0600
-@@ -410,3 +410,7 @@ DES_count:
- .common DES_KS_table, (8 * 128 * 16 * 8), 32
- 
- #endif
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/x86-64.S john-1.7.3.1/src/x86-64.S
---- john-1.7.3.1.orig/src/x86-64.S	2008-07-13 15:35:12.000000000 -0600
-+++ john-1.7.3.1/src/x86-64.S	2009-06-26 13:54:31.392950649 -0600
-@@ -1052,3 +1052,7 @@ DES_bs_crypt_LM_loop:
- 	subl $1,rounds
- 	jnz DES_bs_crypt_LM_loop
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/x86-mmx.S john-1.7.3.1/src/x86-mmx.S
---- john-1.7.3.1.orig/src/x86-mmx.S	2008-07-13 15:45:55.000000000 -0600
-+++ john-1.7.3.1/src/x86-mmx.S	2009-06-26 13:54:31.396971552 -0600
-@@ -1314,3 +1314,7 @@ DES_bs_crypt_LM_loop:
- 	emms
- #endif
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/x86.S john-1.7.3.1/src/x86.S
---- john-1.7.3.1.orig/src/x86.S	2008-07-07 12:30:36.000000000 -0600
-+++ john-1.7.3.1/src/x86.S	2009-06-26 13:54:31.404961468 -0600
-@@ -1366,3 +1366,7 @@ CPU_detect_ret:
- 	movzbl %al,%eax
- 	popl %ebx
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
-diff -urpN john-1.7.3.1.orig/src/x86-sse.S john-1.7.3.1/src/x86-sse.S
---- john-1.7.3.1.orig/src/x86-sse.S	2008-07-13 15:44:58.000000000 -0600
-+++ john-1.7.3.1/src/x86-sse.S	2009-06-26 13:54:31.399949655 -0600
-@@ -1301,3 +1301,7 @@ DES_bs_crypt_LM_loop:
- 	jnz DES_bs_crypt_LM_loop
- 	popl %esi
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
deleted file mode 100644
index 67fb16920e19..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild,v 1.9 2008/11/04 08:06:54 dragonheart Exp $
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PBASE=${P/theripper/}
-MY_PNBASE=${PN/theripper/}
-S=${WORKDIR}/${MY_PBASE}
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
-		ftp://ftp.openwall.com/john/contrib/historical/${MY_PNBASE}-1.7.2-all-7.diff.gz"
-
-# banquise-to-bigpatch-17.patch.bz2"
-# based off /var/tmp/portage/johntheripper-1.6.40
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="mmx altivec sse2 custom-cflags"
-
-RDEPEND=">=dev-libs/openssl-0.9.7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
-
-	for p in sha1-memset stackdef.S stackdef-2.S mkdir-sandbox; do
-		epatch "${FILESDIR}/${P}-${p}.patch"
-	done
-}
-
-src_compile() {
-	#
-	# upstream request to strip
-	# any flags, as he optimize the
-	# outputs
-	#
-	use custom-cflags || strip-flags
-	append-flags -fno-PIC -fno-PIE
-	append-ldflags -nopie
-
-	cd "${S}"/src
-
-	# Remove default OPT_NORMAL -funroll-loops bug#198659 for unknown archs
-	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS=\"-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
-		-DJOHN_SYSTEMWIDE_HOME=\\\"\\\\\\\"/etc/john\\\\\\\"\\\"\" \
-		LDFLAGS=\"${LDFLAGS}\" \
-		OPT_NORMAL=\"\""
-
-	if use x86 ; then
-		if use sse2 ; then
-			eval emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
-		elif use mmx ; then
-			eval emake ${OPTIONS} linux-x86-mmx || die "Make failed"
-		else
-			eval emake ${OPTIONS} linux-x86-any || die "Make failed"
-		fi
-	elif use alpha ; then
-		eval emake ${OPTIONS} linux-alpha || die "Make failed"
-	elif use sparc; then
-		eval emake ${OPTIONS} linux-sparc  || die "Make failed"
-	elif use amd64; then
-		eval emake ${OPTIONS} linux-x86-64  || die "Make failed"
-	elif use ppc64; then
-		if use altivec; then
-			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			eval emake ${OPTIONS} linux-ppc64  || die "Make failed"
-		fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use ppc; then
-		if use altivec; then
-			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			eval emake ${OPTIONS} linux-ppc32 || die "Make failed"
-		fi
-	else
-		eval emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-	# currently broken
-	#eval emake bench || die "make failed"
-}
-
-src_test() {
-	cd run
-	if  [ -f /etc/john/john.conf -o -f /etc/john/john.ini  ]; then
-		./john --test || die 'self test failed'
-	else
-		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# for EGG only
-	dosym john /usr/sbin/undrop
-
-	#newsbin src/bench john-bench
-
-	# 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.2-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild
deleted file mode 100644
index 062d75c8bc82..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild,v 1.3 2008/11/04 08:06:54 dragonheart Exp $
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="${PN/theripper/}"
-MY_P="${MY_PN/theripper/}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/f/${MY_P}.tar.gz
-	ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-all-9.diff.gz"
-# When mpi stable:
-#	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-bp17-mpi2.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mmx altivec sse2 custom-cflags"
-
-RDEPEND=">=dev-libs/openssl-0.9.7"
-# When mpi stable:
-#	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}"
-
-get_target() {
-	if use x86 ; then
-		if use sse2 ; then
-			echo "linux-x86-sse2"
-		elif use mmx ; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha ; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	else
-		echo "generic"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-# When mpi stable:
-#	if use mpi ; then
-#		epatch "${WORKDIR}"/${MY_P}-bp17-mpi2.patch
-#	else
-
-	cd "${S}/src"
-	epatch "${WORKDIR}"/${MY_P}-all-9.diff
-
-	for p in stackdef.S stackdef-2.S mkdir-sandbox; do
-		epatch "${FILESDIR}/${P}-${p}.patch"
-	done
-}
-
-src_compile() {
-	cd "${S}/src"
-
-	use custom-cflags || strip-flags
-	append-flags -fno-PIC -fno-PIE
-	append-ldflags -nopie
-
-	emake \
-		CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
-			-DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) \
-		|| die "make failed"
-}
-
-src_test() {
-	cd "${S}/run"
-	if  [ -f /etc/john/john.conf -o -f /etc/john/john.ini  ]; then
-# When mpi stable:
-#		if use mpi ; then
-#			mpirun -np 2 ./john --test || die 'self test failed'
-#		else
-
-		./john --test || die 'self test failed'
-	else
-		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# for EGG only
-	dosym john /usr/sbin/undrop
-
-	#newsbin src/bench john-bench
-
-	# 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.2-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
deleted file mode 100644
index d306c7ccb985..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild,v 1.3 2008/11/04 08:06:54 dragonheart Exp $
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="${PN/theripper/}"
-MY_P="${MY_PN/theripper/}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/f/${MY_P}.tar.gz
-	ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-all-9.diff.gz
-	mpi? ( mirror://gentoo/${MY_P}-bp17-mpi8.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mmx altivec sse2 custom-cflags mpi"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND=">=dev-libs/openssl-0.9.7
-	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}"
-
-get_target() {
-	if use x86 ; then
-		if use sse2 ; then
-			echo "linux-x86-sse2"
-		elif use mmx ; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha ; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	else
-		echo "generic"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	PATCHLIST=""
-	if use mpi ; then
-		epatch "${WORKDIR}"/${MY_P}-bp17-mpi8.patch
-	else
-		cd "${S}/src"
-		epatch "${WORKDIR}"/${MY_P}-all-9.diff
-		PATCHLIST=stackdef.S
-	fi
-	PATCHLIST="${PATCHLIST} stackdef-2.S mkdir-sandbox"
-
-	cd "${S}/src"
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${P}-${p}.patch"
-	done
-}
-
-src_compile() {
-	cd "${S}/src"
-
-	use custom-cflags || strip-flags
-	append-flags -fno-PIC -fno-PIE
-	append-ldflags -nopie
-
-	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
-	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	emake \
-		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
-			-DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) \
-		|| die "make failed"
-}
-
-src_test() {
-	cd "${S}/run"
-	if  [ -f /etc/john/john.conf -o -f /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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# for EGG only
-	dosym john /usr/sbin/undrop
-
-	#newsbin src/bench john-bench
-
-	# 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.3.1-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.1-r1.ebuild
deleted file mode 100644
index bc2e41e965ab..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.3.1-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.1-r1.ebuild,v 1.7 2009/12/26 16:15:50 armin76 Exp $
-
-EAPI=1
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-JUMBO='all-5'
-MPI='mpi10'
-
-MY_PN="${PN/theripper/}"
-MY_P="${MY_PN/theripper/}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( ftp://ftp.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"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc ~x86"
-IUSE="mmx altivec sse2 custom-cflags -minimal -mpi"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
-	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}"
-
-get_target() {
-	if use x86 ; then
-		if use sse2 ; then
-			echo "linux-x86-sse2"
-		elif use mmx ; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha ; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	else
-		echo "generic"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	PATCHLIST="stackdef.S"
-	if use mpi ; then
-		epatch "${WORKDIR}"/${MY_P}-${MPI}.patch
-	fi
-	if ! use minimal ; then
-		epatch "${WORKDIR}"/${MY_P}-${JUMBO}.diff
-		PATCHLIST="${PATCHLIST} ${JUMBO}-stackdef.S"
-	fi
-	PATCHLIST="${PATCHLIST} cflags mkdir-sandbox"
-
-	cd "${S}/src"
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${P}-${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() {
-	use custom-cflags || strip-flags
-	append-flags -fPIC -fPIE
-	append-ldflags -nopie
-
-	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} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"/usr/libexec/john\\\"\"" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) \
-		|| die "emake failed"
-}
-
-src_test() {
-	cd "${S}/run"
-	if  [ -f /etc/john/john.conf -o -f /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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	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.3.1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
deleted file mode 100644
index 16e7e18167f8..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild,v 1.9 2009/06/23 00:03:52 rich0 Exp $
-
-EAPI=1
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-JUMBO='all-3'
-MPI='mpi8-small'
-
-MY_PN="${PN/theripper/}"
-MY_P="${MY_PN/theripper/}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-${JUMBO}.diff.gz )
-	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-${MPI}.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86"
-IUSE="mmx altivec sse2 custom-cflags -minimal -mpi"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
-	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}"
-
-get_target() {
-	if use x86 ; then
-		if use sse2 ; then
-			echo "linux-x86-sse2"
-		elif use mmx ; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha ; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	else
-		echo "generic"
-	fi
-}
-
-#pkg_setup() {
-#	if use mpi && built_with_use sys-cluster/mpich2 threads; then
-#		die 'cannot work with sys-cluster/mpich2 USE=threads'
-#		#http://bindshell.net/tools/johntheripper/
-#	fi
-#}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	PATCHLIST=""
-	if use mpi ; then
-		epatch "${WORKDIR}"/${MY_P}-${MPI}.patch
-		# avoid the conflict on JOHN_VERSION until a better compromise is made
-		sed -i 's/_mpi"/"/' src/params.h
-	fi
-	if ! use minimal ; then
-		epatch "${WORKDIR}"/${MY_P}-${JUMBO}.diff
-		PATCHLIST=stackdef.S
-	fi
-	PATCHLIST="${PATCHLIST} params.h mkdir-sandbox"
-
-	cd "${S}/src"
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${P}-${p}.patch"
-	done
-
-	sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" -i Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	cd "${S}/src"
-
-	use custom-cflags || strip-flags
-	append-flags -fno-PIC -fno-PIE
-	append-ldflags -nopie
-
-	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
-	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	emake \
-		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) \
-		|| die "emake failed"
-}
-
-src_test() {
-	cd "${S}/run"
-	if  [ -f /etc/john/john.conf -o -f /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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	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
-		# >=all-4
-		#dosbin run/calc_stat
-		#dosbin run/genmkvpwd
-		#dosbin run/mkvcalcproba
-		insinto /etc/john
-		# >=all-4
-		#doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap_prepare.pl
-	fi
-
-	#newsbin src/bench john-bench
-
-	# 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.4.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild
deleted file mode 100644
index 065384c9d4ef..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild,v 1.3 2010/08/14 10:46:42 truedfx Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-3"
-#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? ( ftp://ftp.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"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="altivec custom-cflags -minimal mmx 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 )"
-#	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-get_target() {
-	if use x86; then
-		if use sse2; then
-			echo "linux-x86-sse2"
-		elif use mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	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="${PATCHLIST} cflags mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-1.7.3.1-${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() {
-	use custom-cflags || strip-flags
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-
-	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} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"/usr/libexec/john\\\"\"" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) || die "emake failed"
-}
-
-src_test() {
-	cd run
-	if [[ -f "/etc/john/john.conf" || -f "/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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	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.6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6.ebuild
deleted file mode 100644
index c8a4bd17918c..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.6.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.2 2010/10/13 17:28:08 c1pher Exp $
-
-EAPI="2"
-
-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"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="altivec custom-cflags -minimal mmx 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 )"
-#	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-get_target() {
-	if use x86; then
-		if use sse2; then
-			echo "linux-x86-sse2"
-		elif use mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use alpha; then
-		echo "linux-alpha"
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use amd64; then
-		echo "linux-x86-64"
-	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 ppc; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
-			echo "linux-ppc32"
-		fi
-	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="${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() {
-	use custom-cflags || strip-flags
-	append-flags -fPIC -fPIE \
-		'-DJOHN_SYSTEMWIDE' \
-		'-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \
-		'-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"'
-	gcc-specs-pie && append-ldflags -nopie
-
-	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}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		$(get_target) || die "emake failed"
-}
-
-src_test() {
-	cd run
-	if [[ -f "/etc/john/john.conf" || -f "/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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john || die
-	newsbin run/mailer john-mailer || die
-
-	pax-mark -m "${D}"/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
-}