Cleanup

Package-Manager: portage-2.1.3_rc8

13 files changed, 12 insertions, 630 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 199b2258bb27..7e390f0aa399 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.55 2007/07/19 16:16:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.56 2007/07/19 16:21:25 alonbl Exp $
+
+  19 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/johntheripper-1.7.0.2-stackdef.S, -files/clk_tck.patch,
+  -files/john-ntlm.skey.patch, -johntheripper-1.6.ebuild,
+  -johntheripper-1.6-r3.ebuild, -johntheripper-1.6.40.ebuild,
+  -johntheripper-1.7.0.2.ebuild:
+  Cleanup
 
 *johntheripper-1.7.2-r1 (19 Jul 2007)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 4ffdf0f481e2..ed5300c6f725 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,15 +1,3 @@
-AUX clk_tck.patch 2864 RMD160 ffcc335bdff4c609574472e3a947d482e123b13e SHA1 5d1c9ebc7f7d0046be3d164c157c2837fe6b10e8 SHA256 57921f1d742e3a42dd1d9b74f70c2d54b78155bc68bf33cad5ffc241f770f7f8
-MD5 686dc0787082b89b5eb11489e71e4474 files/clk_tck.patch 2864
-RMD160 ffcc335bdff4c609574472e3a947d482e123b13e files/clk_tck.patch 2864
-SHA256 57921f1d742e3a42dd1d9b74f70c2d54b78155bc68bf33cad5ffc241f770f7f8 files/clk_tck.patch 2864
-AUX john-ntlm.skey.patch 1168 RMD160 7c52da1f85e4bebfcc7d183dcbf2ee94f2a9b84e SHA1 d08dd1259a9f8314b24618c8ccd4bccf03256d0e SHA256 bb0b60717f16810106a1dc3e26f0abdfd5becde8ede39d4120de6beb3fb1f794
-MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
-RMD160 7c52da1f85e4bebfcc7d183dcbf2ee94f2a9b84e files/john-ntlm.skey.patch 1168
-SHA256 bb0b60717f16810106a1dc3e26f0abdfd5becde8ede39d4120de6beb3fb1f794 files/john-ntlm.skey.patch 1168
-AUX johntheripper-1.7.0.2-stackdef.S 60 RMD160 a310190a3f103441dc9c3a12d4285f9a86641a32 SHA1 8ac4328655ca1202ac119a9208d0d79ad8cc3197 SHA256 a6f0f6d8108c3a54a1a1943a3e2b06a3ce1c96de44be88024d636ef744cf8c3d
-MD5 b1e4f51c896bc6d7e37f9e39d46fae94 files/johntheripper-1.7.0.2-stackdef.S 60
-RMD160 a310190a3f103441dc9c3a12d4285f9a86641a32 files/johntheripper-1.7.0.2-stackdef.S 60
-SHA256 a6f0f6d8108c3a54a1a1943a3e2b06a3ce1c96de44be88024d636ef744cf8c3d files/johntheripper-1.7.0.2-stackdef.S 60
 AUX johntheripper-1.7.2-params.h.patch 526 RMD160 f32582a6bfb5a4a2c8b1813d81dfd065d7f46cbf SHA1 030450dafbbc613aff20fd28e230bd35ecf05cd3 SHA256 fc050acd68ce5f7f79312c0dc54a110c92f074c908ec32394baaf0b172b7d611
 MD5 0d840a57854c6993db5deaa1eaec5fa7 files/johntheripper-1.7.2-params.h.patch 526
 RMD160 f32582a6bfb5a4a2c8b1813d81dfd065d7f46cbf files/johntheripper-1.7.2-params.h.patch 526
@@ -30,31 +18,9 @@ AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc
 MD5 bcd83ae4d1f2990329cc2eaa7de7b78a files/johntheripper-1.7.2-stripping.patch 840
 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 files/johntheripper-1.7.2-stripping.patch 840
 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8 files/johntheripper-1.7.2-stripping.patch 840
-DIST john-1.6-gentoo.patch 156681 RMD160 3d0711fc443e58b157dc8303d8cbcefa34876141 SHA1 3a07286fe14d929bb1ec5c86830dd2db53167c17 SHA256 d49c1dc6c338dacef5d7235baf13701b9493e1beae7d5fb926b5f1e500bb5914
-DIST john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732 RMD160 119079dc28a3140394ada0b456c5cd80e7a028ef SHA1 fabaa1febeab4eff6147ace020d3cf02e4718eda SHA256 d291bfb57deafa4baa753cbd8108e341f589e16d7129c84fd4d41aa6ac230f03
-DIST john-1.6.40.tar.gz 797220 RMD160 b54e41eec65a9c185731b2e137fb155ae2eb348b SHA1 1f9fc46d10eb218065f024775578db3642d2bd20 SHA256 087fc7b4651dab0d57d6a6f8c0715b1f65646ccaeaf5a9698cb0b635ac219b6d
-DIST john-1.6.tar.gz 497341 RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 SHA1 b49d371496b8ba5e439665b83190b1e4d4640bea SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5
 DIST john-1.7-all-4.diff.gz 50311 RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 SHA1 6050745204b38a7dd9fc41889de2b87866c8b528 SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909
-DIST john-1.7.0.2.tar.gz 802354 RMD160 f4e7fead92d0b14ad088c8331d1b5c5ca941b85b SHA1 c1dd6bf2447ca22e016eafa69027e4c01e11f620 SHA256 b53633941ad52083d7143499ea06c60d918881a85d9685cd3f1917de7b0e61df
 DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
 DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
-DIST john_1.6-17.diff.gz 11451 RMD160 52a13303fdfa35b11095c2f8259ed50e45e0bd27 SHA1 bb2b203296df9912779bbc00a53a515a24627b4e SHA256 d50103a722a44c446abb122d1bf1285ae5474bf21f0fd3b5de3b604873d8971e
-EBUILD johntheripper-1.6-r3.ebuild 3013 RMD160 65baac2c1fc2f5849acf31858183808a7564cc4e SHA1 429a59c3655792008f4b4d3b941d7bc6acb19d91 SHA256 5a6b0e9f9f4719c4448d5a5cdff4ffab84308ba47309a57a03d69ce54b45dc6c
-MD5 a4648281f8e56ec9cc199a862c186439 johntheripper-1.6-r3.ebuild 3013
-RMD160 65baac2c1fc2f5849acf31858183808a7564cc4e johntheripper-1.6-r3.ebuild 3013
-SHA256 5a6b0e9f9f4719c4448d5a5cdff4ffab84308ba47309a57a03d69ce54b45dc6c johntheripper-1.6-r3.ebuild 3013
-EBUILD johntheripper-1.6.40.ebuild 3394 RMD160 2f93fb51b1522097b72e16ac8ec87947af44aeb2 SHA1 066500e08c7996f9e977947661795a48b6165fb1 SHA256 7dcb33f4158b54c85e8249f575ce331afdd311b7895b9e60c74c2a5f7dd9a497
-MD5 b70df799d63b075857d94497ec1cc0fe johntheripper-1.6.40.ebuild 3394
-RMD160 2f93fb51b1522097b72e16ac8ec87947af44aeb2 johntheripper-1.6.40.ebuild 3394
-SHA256 7dcb33f4158b54c85e8249f575ce331afdd311b7895b9e60c74c2a5f7dd9a497 johntheripper-1.6.40.ebuild 3394
-EBUILD johntheripper-1.6.ebuild 1477 RMD160 0d7d8fdb290e75ba79795d0b9e42b285fb38fab3 SHA1 b9abc27d2fd3052f30b8145a20724ce35a09f4ce SHA256 024f3a6c96ba8e38ef40fbfa232a03b90cbcb22729a4311a40fbdb27a46f0b6d
-MD5 c5ce19f2b06dcc439b8a854a95b9b1e1 johntheripper-1.6.ebuild 1477
-RMD160 0d7d8fdb290e75ba79795d0b9e42b285fb38fab3 johntheripper-1.6.ebuild 1477
-SHA256 024f3a6c96ba8e38ef40fbfa232a03b90cbcb22729a4311a40fbdb27a46f0b6d johntheripper-1.6.ebuild 1477
-EBUILD johntheripper-1.7.0.2.ebuild 3446 RMD160 6d352049109a314d235350d6e1462db0783c9bc2 SHA1 0c2fb52c50c96f886fa6cfbd7879e57863929531 SHA256 42840ba31b5336c1e9c3ea4b09b0553cc7dfb61e915034537f8cd47d79e5a236
-MD5 8da782f97d3a05ce7ee896686f7f15d6 johntheripper-1.7.0.2.ebuild 3446
-RMD160 6d352049109a314d235350d6e1462db0783c9bc2 johntheripper-1.7.0.2.ebuild 3446
-SHA256 42840ba31b5336c1e9c3ea4b09b0553cc7dfb61e915034537f8cd47d79e5a236 johntheripper-1.7.0.2.ebuild 3446
 EBUILD johntheripper-1.7.2-r1.ebuild 3490 RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 SHA1 436c057004a90832e524d987f306616a10c7d073 SHA256 d5168fadb3f0047f49b233554df9d4b613add06121779c3110732568611bd3c9
 MD5 49c16fe65c9da94f5971c090ce086d6c johntheripper-1.7.2-r1.ebuild 3490
 RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 johntheripper-1.7.2-r1.ebuild 3490
@@ -63,26 +29,14 @@ EBUILD johntheripper-1.7.2.ebuild 3450 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93
 MD5 6fc9ea37ab7434784b13035bf1182356 johntheripper-1.7.2.ebuild 3450
 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be johntheripper-1.7.2.ebuild 3450
 SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750 johntheripper-1.7.2.ebuild 3450
-MISC ChangeLog 10203 RMD160 2591a4f9d81f5a2eb778333c203e6f667a0a3e8d SHA1 d40d087ccbd32de03423aed6ac9dbcad856e77cb SHA256 2bd2f2c92bce76debf1b3093e5ac146b431a3cf80a9d87818056a1abace69cb8
-MD5 cf4fe6b72fdeb3d1c626706934125162 ChangeLog 10203
-RMD160 2591a4f9d81f5a2eb778333c203e6f667a0a3e8d ChangeLog 10203
-SHA256 2bd2f2c92bce76debf1b3093e5ac146b431a3cf80a9d87818056a1abace69cb8 ChangeLog 10203
+MISC ChangeLog 10480 RMD160 907fd6599936362d59a65a4d9d75cc2c295ad9ad SHA1 4e59555ed008b580e71f6fb6d697d807224ea3b8 SHA256 8f2b535e6d97e3abff9520f018a8d5bb75a1ea9264dd08c196587fd926c68ede
+MD5 30e5d0648e8c7278095ec550e3eccf7b ChangeLog 10480
+RMD160 907fd6599936362d59a65a4d9d75cc2c295ad9ad ChangeLog 10480
+SHA256 8f2b535e6d97e3abff9520f018a8d5bb75a1ea9264dd08c196587fd926c68ede ChangeLog 10480
 MISC metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 SHA1 5d59fd95cef5bc44213823f07599ab4a3040e659 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6
 MD5 873a096e13940bcb1684c3d5f4bdb30b metadata.xml 254
 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 metadata.xml 254
 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6 metadata.xml 254
-MD5 d7e6688a493a5e460b339edd4c2e108d files/digest-johntheripper-1.6 461
-RMD160 591a3117fc9bbbd6b26ef67851031fd183fffdbb files/digest-johntheripper-1.6 461
-SHA256 8d6d6092822c392ee8e8656c740f3c3e88ae243fd2ee6d894dfcb33751ca7ee8 files/digest-johntheripper-1.6 461
-MD5 81c6524fa009876ce7a065c055c6b848 files/digest-johntheripper-1.6-r3 470
-RMD160 bc91d3566ef1052ef668f166b9bffdfc9e46d555 files/digest-johntheripper-1.6-r3 470
-SHA256 ca0487519da7b4fd8c6b33f3583a06bd6abf8001db867997086cb8573206d022 files/digest-johntheripper-1.6-r3 470
-MD5 4780ee0f7c3f0ea092133667f7b7bf48 files/digest-johntheripper-1.6.40 548
-RMD160 c57518be35c160a39511b57f59a90860eed2cf64 files/digest-johntheripper-1.6.40 548
-SHA256 7ce5546f48a6e3746583d713f9781b46f6d23c9f8d30e6d46d042a9bd99c6db4 files/digest-johntheripper-1.6.40 548
-MD5 728bef9148d6e2abec450695cbd7ddbd files/digest-johntheripper-1.7.0.2 482
-RMD160 f48d3a4ea9ad0da4b6d5abda7bee9f69fa411280 files/digest-johntheripper-1.7.0.2 482
-SHA256 a4e635dae315e600b36dd82af86b89a770ccfae1b02000891307ccff33598fdb files/digest-johntheripper-1.7.0.2 482
 MD5 fa3d5f08df3d277ee771715466395974 files/digest-johntheripper-1.7.2 476
 RMD160 e159515fd92bd054565f086b4749eaacd71b5473 files/digest-johntheripper-1.7.2 476
 SHA256 1f98f59d509b03c8a18445cdf030bb234507f090938041a3e6c7433b8cb80149 files/digest-johntheripper-1.7.2 476
diff --git a/app-crypt/johntheripper/files/clk_tck.patch b/app-crypt/johntheripper/files/clk_tck.patch
deleted file mode 100644
index 42767756a63c..000000000000
--- a/app-crypt/johntheripper/files/clk_tck.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ruN john-1.6.40-before/src/bench.c john-1.6.40/src/bench.c
---- john-1.6.40-before/src/bench.c	2004-11-09 14:13:03.000000000 +0100
-+++ john-1.6.40/src/bench.c	2006-03-13 23:15:56.000000000 +0100
-@@ -127,7 +127,7 @@
- 	it.it_value.tv_sec = BENCHMARK_TIME;
- 	if (setitimer(ITIMER_REAL, &it, NULL)) pexit("setitimer");
- #else
--	sig_timer_emu_init(BENCHMARK_TIME * CLK_TCK);
-+	sig_timer_emu_init(BENCHMARK_TIME * CLOCKS_PER_SEC);
- #endif
- 
- 	start_real = times(&buf);
-@@ -174,7 +174,7 @@
- 	int64 tmp;
- 
- 	tmp.lo = count; tmp.hi = 0;
--	mul64by32(&tmp, CLK_TCK);
-+	mul64by32(&tmp, CLOCKS_PER_SEC);
- 	cps_hi = div64by32lo(&tmp, time);
- 
- 	if (cps_hi >= 1000000)
-diff -ruN john-1.6.40-before/src/idle.c john-1.6.40/src/idle.c
---- john-1.6.40-before/src/idle.c	2001-07-26 16:56:25.000000000 +0200
-+++ john-1.6.40/src/idle.c	2006-03-13 23:16:09.000000000 +0100
-@@ -68,7 +68,7 @@
- 	current = times(&buf);
- 	if (!last_adj) last_adj = current;
- 
--	if (current - last_adj >= CLK_TCK) {
-+	if (current - last_adj >= CLOCKS_PER_SEC) {
- 		calls_per_tick = calls_since_adj / (current - last_adj);
- 		calls_since_adj = 0;
- 		last_adj = current;
-@@ -79,6 +79,6 @@
- 		last_check = current;
- 		sched_yield();
- 		current = times(&buf);
--	} while (current - last_check > 1 && current - last_adj < CLK_TCK);
-+	} while (current - last_check > 1 && current - last_adj < CLOCKS_PER_SEC);
- #endif
- }
-diff -ruN john-1.6.40-before/src/status.c john-1.6.40/src/status.c
---- john-1.6.40-before/src/status.c	2004-11-09 13:54:21.000000000 +0100
-+++ john-1.6.40/src/status.c	2006-03-13 23:16:20.000000000 +0100
-@@ -58,9 +58,9 @@
- 	if (status.crypts.hi != saved_hi) {
- 		ticks = get_time() - status.start_time;
- 		if (ticks > ((clock_t)1 << (sizeof(clock_t) * 8 - 2))) {
--			time = ticks / CLK_TCK;
-+			time = ticks / CLOCKS_PER_SEC;
- 			status_restored_time += time;
--			status.start_time += (clock_t)time * CLK_TCK;
-+			status.start_time += (clock_t)time * CLOCKS_PER_SEC;
- 		}
- 	}
- }
-@@ -68,7 +68,7 @@
- unsigned int status_get_time(void)
- {
- 	return status_restored_time +
--		(get_time() - status.start_time) / CLK_TCK;
-+		(get_time() - status.start_time) / CLOCKS_PER_SEC;
- }
- 
- static char *status_get_cps(char *buffer)
-@@ -85,11 +85,11 @@
- 	if (use_ticks)
- 		time = ticks;
- 	else
--		time = status_restored_time + ticks / CLK_TCK;
-+		time = status_restored_time + ticks / CLOCKS_PER_SEC;
- 	if (!time) time = 1;
- 
- 	cps = status.crypts;
--	if (use_ticks) mul64by32(&cps, CLK_TCK);
-+	if (use_ticks) mul64by32(&cps, CLOCKS_PER_SEC);
- 	div64by32(&cps, time);
- 
- 	if (cps.hi || cps.lo >= 1000000000)
-@@ -102,7 +102,7 @@
- 		sprintf(buffer, "%u", cps.lo);
- 	else {
- 		tmp = status.crypts;
--		if (use_ticks) mul64by32(&tmp, CLK_TCK);
-+		if (use_ticks) mul64by32(&tmp, CLOCKS_PER_SEC);
- 		mul64by32(&tmp, 100);
- 		cps_100 = div64by32lo(&tmp, time) % 100;
- 		sprintf(buffer, "%u.%02u", cps.lo, cps_100);
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6 b/app-crypt/johntheripper/files/digest-johntheripper-1.6
deleted file mode 100644
index c8f420367960..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
-RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 john-1.6.tar.gz 497341
-SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5 john-1.6.tar.gz 497341
-MD5 ec0b4fed7c81d370e85544deab48d03c john_1.6-17.diff.gz 11451
-RMD160 52a13303fdfa35b11095c2f8259ed50e45e0bd27 john_1.6-17.diff.gz 11451
-SHA256 d50103a722a44c446abb122d1bf1285ae5474bf21f0fd3b5de3b604873d8971e john_1.6-17.diff.gz 11451
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
deleted file mode 100644
index 32b67f173631..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 17f827dd86f7c7254fceb48f31390c24 john-1.6-gentoo.patch 156681
-RMD160 3d0711fc443e58b157dc8303d8cbcefa34876141 john-1.6-gentoo.patch 156681
-SHA256 d49c1dc6c338dacef5d7235baf13701b9493e1beae7d5fb926b5f1e500bb5914 john-1.6-gentoo.patch 156681
-MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
-RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 john-1.6.tar.gz 497341
-SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5 john-1.6.tar.gz 497341
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.40 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
deleted file mode 100644
index 6e185b564fdb..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e707f3708e5741bb470b2dc8129cb901 john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
-RMD160 119079dc28a3140394ada0b456c5cd80e7a028ef john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
-SHA256 d291bfb57deafa4baa753cbd8108e341f589e16d7129c84fd4d41aa6ac230f03 john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
-MD5 507916220812c5834136d378a13e48a0 john-1.6.40.tar.gz 797220
-RMD160 b54e41eec65a9c185731b2e137fb155ae2eb348b john-1.6.40.tar.gz 797220
-SHA256 087fc7b4651dab0d57d6a6f8c0715b1f65646ccaeaf5a9698cb0b635ac219b6d john-1.6.40.tar.gz 797220
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2
deleted file mode 100644
index c6c32fdd9305..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4429722ba242a5a33ca8ebf45fd42797 john-1.7-all-4.diff.gz 50311
-RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 john-1.7-all-4.diff.gz 50311
-SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909 john-1.7-all-4.diff.gz 50311
-MD5 084fa03f265491ef7e32c05e9fb027db john-1.7.0.2.tar.gz 802354
-RMD160 f4e7fead92d0b14ad088c8331d1b5c5ca941b85b john-1.7.0.2.tar.gz 802354
-SHA256 b53633941ad52083d7143499ea06c60d918881a85d9685cd3f1917de7b0e61df john-1.7.0.2.tar.gz 802354
diff --git a/app-crypt/johntheripper/files/john-ntlm.skey.patch b/app-crypt/johntheripper/files/john-ntlm.skey.patch
deleted file mode 100644
index 19bd8e28aa33..000000000000
--- a/app-crypt/johntheripper/files/john-ntlm.skey.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- john-ntlm.diff	2004-05-17 22:05:37.286395208 -0400
-+++ john-ntlm.diff2	2004-05-17 22:04:48.162863120 -0400
-@@ -1,10 +1,11 @@
- diff -u clean-src/Makefile src/Makefile
- --- clean-src/Makefile	Mon Oct 22 13:00:23 2001
- +++ src/Makefile	Mon Jun 10 15:34:36 2002
--@@ -37,6 +37,8 @@
-+@@ -37,7 +37,9 @@
-  	BF_fmt.o BF_std.o \
-  	AFS_fmt.o \
-  	LM_fmt.o \
-+	SKEY_fmt.o \
- +	NT_fmt.o \
- +	md4.o smbencrypt.o \
-  	batch.o bench.o charset.o common.o compiler.o config.o cracker.o \
-@@ -13,19 +14,21 @@
- diff -u clean-src/john.c src/john.c
- --- clean-src/john.c	Tue May  8 02:59:28 2001
- +++ src/john.c	Mon Jun 10 15:34:36 2002
--@@ -36,7 +36,7 @@
-+@@ -36,8 +36,8 @@
-  #endif
-  
-  extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
- -extern struct fmt_main fmt_AFS, fmt_LM;
- +extern struct fmt_main fmt_AFS, fmt_LM, fmt_NT;
-+ extern struct fmt_main fmt_SKEY;
-  
-  extern int unshadow(int argc, char **argv);
-  extern int unafs(int argc, char **argv);
--@@ -63,6 +63,7 @@
-+@@ -64,7 +64,8 @@
-  	john_register_one(&fmt_BF);
-  	john_register_one(&fmt_AFS);
-  	john_register_one(&fmt_LM);
-+	john_register_one(&fmt_SKEY);
- +	john_register_one(&fmt_NT);
-  
-  	if (!fmt_list) {
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S b/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S
deleted file mode 100644
index 96b46e6effc3..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef __ELF__
-.section .note.GNU-stack,"",@progbits
-#endif
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
deleted file mode 100644
index 44fc1c23a2a7..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild,v 1.13 2007/07/13 21:47:34 mr_bones_ Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/theripper/}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-SRC_URI="http://www.openwall.com/john/dl/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-gentoo.patch"
-
-#
-# john-{$PV}-gentoo.patch is a heavly hacked combination of:
-#        mirror://debian/pool/main/j/john/${DEBPATCH}.gz
-#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-ntlm-patch-v02.tgz
-#        http://www.monkey.org/~dugsong/john-1.6.krb4.patch-3
-#        http://www.monkey.org/~dugsong/john-1.6.skey.patch-1
-#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6-mysql-1.diff
-#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.31-eggpatch-8.diff.gz
-#
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="kerberos mmx mysql ntlm skey"
-
-RDEPEND="virtual/libc
-	skey? ( app-admin/skey )
-	kerberos? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/binutils
-	sys-devel/gcc
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${DISTDIR}/${MY_P}-gentoo.patch"
-	cd ${S}/src
-	for file in  alpha.S  sparc.S  x86.S; do
-		cat <<EOF >> ${file}
-#ifdef __ELF__
-.section .note.GNU-stack,"",@progbits
-#endif
-EOF
-
-	done
-}
-
-src_compile() {
-	cd src
-	sed -i -e "s:-march=i486::" -e "s:-O2:${CFLAGS}:" \
-		Makefile
-	local OPTIONS="OPT_NORMAL= OPT_INLINE=  EGG=true"
-	#local OPTIONS="EGG=true"
-	use kerberos && OPTIONS="${OPTIONS} KERBEROS=true"
-	use ntlm && OPTIONS="${OPTIONS} NTLM=true"
-	use skey && OPTIONS="${OPTIONS} SKEY=true"
-	if use mysql;
-	then
-		OPTIONS="${OPTIONS} MYSQL=true LIBS=-lm"
-		# bug #106652
-	fi
-
-	if use x86 ; then
-		if use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx-elf || die "Make failed"
-		elif is-flag "-march=k6-3" || is-flag "-march=k6-2" \
-				|| is-flag "-march=k6"; then
-			emake ${OPTIONS} linux-x86-k6-elf || die "Make failed"
-		else
-			emake ${OPTIONS} generic || die "Make failed"
-		fi
-	elif use alpha ; then
-		emake ${OPTIONS} linux-alpha || die "Make failed"
-	elif use sparc; then
-		emake ${OPTIONS} linux-sparc  || die "Make failed"
-	else
-		emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-}
-src_test() {
-	cd run
-	if  [[ -f /etc/john.ini  ]]
-	then
-		./john --test || die 'self test failed'
-	else
-		ewarn "selftest requires /etc/john.ini"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins run/john.ini debian/john-mail.msg debian/john-mail.conf
-	insinto /usr/share/${PN/theripper/}
-	doins run/{all.chr,alpha.chr,digits.chr,lanman.chr,password.lst} \
-		debian/john-dailyscript
-	doman debian/*.1
-	dosbin run/john debian/mailer debian/john-cronjob
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# for EGG only
-	dosym john /usr/sbin/undrop
-
-	dodoc debian/{CONFIG.mailer,copyright} doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.6.40.ebuild b/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
deleted file mode 100644
index 1f0c4537099c..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.40.ebuild,v 1.8 2007/07/13 21:47:34 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PBASE=${P/theripper/}
-S=${WORKDIR}/${MY_PBASE}
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/ http://www.banquise.net/misc/patch-john.html"
-SRC_URI="http://www.openwall.com/john/c/${MY_PBASE}.tar.gz
-		mirror://gentoo/${MY_PBASE}-banquise-to-bigpatch-17.patch.bz2"
-
-# 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 sse2 altivec"
-
-RDEPEND="virtual/libc"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${MY_PBASE}-banquise-to-bigpatch-17.patch
-	epatch ${FILESDIR}/clk_tck.patch
-	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
-		-e 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' "${MY_PBASE}"/src/Makefile
-}
-
-src_compile() {
-	cd src
-	# Note this program uses AS and LD incorrectly
-	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1"
-
-	if use x86 ; then
-		if use sse2 ; then
-			emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
-		elif use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-any || die "Make failed"
-		fi
-	elif use alpha ; then
-		emake ${OPTIONS} linux-alpha || die "Make failed"
-	elif use sparc; then
-		emake ${OPTIONS} linux-sparc  || die "Make failed"
-	elif use amd64; then
-		if use mmx; then
-			emake ${OPTIONS} linux-x86-64-mmx  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-64  || die "Make failed"
-		fi
-	elif use ppc-macos; then
-		if use altivec; then
-			emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
-		else
-			emake ${OPTIONS} macosx-ppc32 || die "Make failed"
-		fi
-		# for Tiger this can be macosx-ppc64
-	elif use ppc64; then
-		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			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
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-ppc32 || die "Make failed"
-		fi
-	else
-		emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-	# currently broken
-	#emake bench || die "make failed"
-}
-
-src_test() {
-	cd run
-	if  [[ -f /etc/john/john.conf || -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
-	ewarn "WPA PSK failes on MMX and SSE2 - see"
-	ewarn "http://www.banquise.net/misc/patch-john.html"
-}
-
-src_install() {
-	# config files
-	insinto /etc/john
-	doins run/john.conf
-	sed -i -e 's:$JOHN:/usr/share/john:g' "${D}/etc/john/john.conf"
-
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	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
-
-	# share
-	insinto /usr/share/john/
-	doins run/*.chr run/password.lst
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.6.ebuild b/app-crypt/johntheripper/johntheripper-1.6.ebuild
deleted file mode 100644
index 3467f4d83792..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.ebuild,v 1.25 2006/01/07 23:19:34 dragonheart Exp $
-
-inherit eutils
-
-MY_P=${P/theripper/}
-S=${WORKDIR}/${MY_P}
-DEBPATCH=${MY_P/-/_}-17.diff
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/${PN/theripper/}/"
-SRC_URI="http://www.openwall.com/john/dl/${MY_P}.tar.gz
-	 mirror://debian/pool/main/j/john/${DEBPATCH}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc alpha ~mips hppa"
-IUSE="mmx"
-
-DEPEND=">=sys-devel/binutils-2.8.1.0.15
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${DEBPATCH}
-	cd ${S}/src
-	for file in  alpha.S  sparc.S  x86.S; do
-		cat <<EOF >> ${file}
-#ifdef __ELF__
-.section .note.GNU-stack,"",@progbits
-#endif
-EOF
-	done
-}
-
-src_compile() {
-	cd src
-	sed -i -e "s:-m486::" -e "s:-Wall -O2:${CFLAGS}:" \
-		Makefile
-	if use mmx ; then
-		emake linux-x86-mmx-elf || die
-	else
-		emake generic || die
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins run/john.ini debian/john-mail.msg debian/john-mail.conf
-	insinto /usr/share/${PN/theripper/}
-	doins run/{all.chr,alpha.chr,digits.chr,lanman.chr,password.lst} \
-		debian/john-dailyscript
-	doman debian/*.1
-	dosbin run/john debian/mailer debian/john-cronjob
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	dodoc debian/{CONFIG.mailer,copyright} doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild
deleted file mode 100644
index 092dc24ecf76..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild,v 1.6 2007/07/13 21:47:34 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-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
-		http://www.openwall.com/john/contrib/${MY_PNBASE}-1.7-all-4.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"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.7"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${DISTDIR}/${MY_PNBASE}-1.7-all-4.diff.gz
-	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
-		-e 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' "${S}"/src/Makefile
-	sed -i -e 's+$JOHN/john\.\(conf\|ini\)+/etc/john/john\.\1+' \
-		"${S}"/src/params.h
-	for file in src/*.S
-	do
-		einfo "adding stack to file ${file}"
-		cat "${FILESDIR}/${P}-stackdef.S" >> "${file}"
-	done
-}
-
-src_compile() {
-	cd src
-	# Note this program uses AS and LD incorrectly
-	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1
-		CFG_FULL_NAME=/etc/john/john.conf
-		CFG_ALT_NAME=/etc/john/john.ini"
-
-	if use x86 ; then
-		if use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-any || die "Make failed"
-		fi
-	elif use alpha ; then
-		emake ${OPTIONS} linux-alpha || die "Make failed"
-	elif use sparc; then
-		emake ${OPTIONS} linux-sparc  || die "Make failed"
-	elif use amd64; then
-		if use mmx; then
-			emake ${OPTIONS} linux-x86-64-mmx  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-64  || die "Make failed"
-		fi
-	elif use ppc-macos; then
-		if use altivec; then
-			emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
-		else
-			emake ${OPTIONS} macosx-ppc32 || die "Make failed"
-		fi
-		# for Tiger this can be macosx-ppc64
-	elif use ppc64; then
-		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			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
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-ppc32 || die "Make failed"
-		fi
-	else
-		emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-	# currently broken
-	#emake bench || die "make failed"
-}
-
-src_test() {
-	cd run
-	if  [[ -f /etc/john/john.conf || -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() {
-	# config files
-	insinto /etc/john
-	doins run/john.conf
-	sed -i -e 's:$JOHN:/usr/share/john:g' "${D}/etc/john/john.conf"
-
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	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
-
-	# share
-	insinto /usr/share/john/
-	doins run/*.chr run/password.lst
-
-	# documentation
-	dodoc doc/*
-}