Taking maintainership. Version bump. Fixing #132844 (thanks Alex Efros <powerman-asdf at yandex.ru>), #136719 (thanks to jakub), #140468 (thanks to Max Dilay <max.dilay at gmail.com>).

Package-Manager: portage-2.1.1_pre4-r2

9 files changed, 322 insertions, 11 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 9894cd76a37d..fb6e13f9e24c 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.40 2006/06/15 15:12:07 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.41 2006/08/04 07:49:09 phreak Exp $
+
+*johntheripper-1.7.2 (04 Aug 2006)
+
+  04 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +files/johntheripper-1.7.2-params.h.patch,
+  +files/johntheripper-1.7.2-sha1-memset.patch,
+  +files/johntheripper-1.7.2-stackdef.S.patch,
+  +files/johntheripper-1.7.2-stripping.patch, metadata.xml,
+  +johntheripper-1.7.2.ebuild:
+  Taking maintainership. Version bump. Fixing #132844 (thanks Alex Efros
+  <powerman-asdf at yandex.ru>), #136719 (thanks to jakub), #140468 (thanks to
+  Max Dilay <max.dilay at gmail.com>).
 
   15 Jun 2006; Pieter Van den Abeele <pvdabeel@gentoo.org>
   Typo in this one too.
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index f2c2f33d44bb..3b4b5b855604 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -10,12 +13,29 @@ AUX johntheripper-1.7.0.2-stackdef.S 60 RMD160 a310190a3f103441dc9c3a12d4285f9a8
 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
+SHA256 fc050acd68ce5f7f79312c0dc54a110c92f074c908ec32394baaf0b172b7d611 files/johntheripper-1.7.2-params.h.patch 526
+AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e95391596280d01b3601 SHA1 ec901d34075b32d515993a1918089e29084d234f SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028
+MD5 5eb08526a004d3bfd5d389e6b7fba0db files/johntheripper-1.7.2-sha1-memset.patch 388
+RMD160 71190df1e84e543eef49e95391596280d01b3601 files/johntheripper-1.7.2-sha1-memset.patch 388
+SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028 files/johntheripper-1.7.2-sha1-memset.patch 388
+AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f
+MD5 f16cd90d979617fc93b45bfbacccca6a files/johntheripper-1.7.2-stackdef.S.patch 1845
+RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 files/johntheripper-1.7.2-stackdef.S.patch 1845
+SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f files/johntheripper-1.7.2-stackdef.S.patch 1845
+AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 SHA1 e60f41af985f12a431b9c272e3964d166d552782 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8
+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.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 3017 RMD160 06eecffd51dd76708dd99882719bfe4b27932d05 SHA1 7846d6542bb53483ad8fcced994a229312f95988 SHA256 a4ad767c85699d599463cbad8b9656dacf78d31753d1fe0aec5ebd5d84b7ab14
 MD5 c2397a54695976b1b2071df0701986a6 johntheripper-1.6-r3.ebuild 3017
@@ -33,14 +53,18 @@ EBUILD johntheripper-1.7.0.2.ebuild 3457 RMD160 f091dd3a33b8cdac3b1183412464908f
 MD5 4cecaddac9d7ddc1da62223e68f64c33 johntheripper-1.7.0.2.ebuild 3457
 RMD160 f091dd3a33b8cdac3b1183412464908f316634ea johntheripper-1.7.0.2.ebuild 3457
 SHA256 107a79e752d897dc78082483cd18ad97bc017fde0e93c0af1431573cab4cbae1 johntheripper-1.7.0.2.ebuild 3457
-MISC ChangeLog 7888 RMD160 de4a3c45b3208d9dba2cc253e0e075b1e5eb3194 SHA1 e3a8c38c6c430dd2c5db1f76db17eea0ac5a6991 SHA256 ddbd356e0f8706a19fb7ea4dcd4e3ec2df174f5e3b85515f174b1e55eb66912d
-MD5 89ac3aa507c4e971cac165a9759d1836 ChangeLog 7888
-RMD160 de4a3c45b3208d9dba2cc253e0e075b1e5eb3194 ChangeLog 7888
-SHA256 ddbd356e0f8706a19fb7ea4dcd4e3ec2df174f5e3b85515f174b1e55eb66912d ChangeLog 7888
-MISC metadata.xml 259 RMD160 4812e9c62c33ad724e0c8b1efd02dbd7de6fe9d6 SHA1 a5ab516665145a7e87a512da719607d8390671ab SHA256 57fc5e4177fcff4246f112f412880daba075e4041251478551aa7f06f97686e8
-MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
-RMD160 4812e9c62c33ad724e0c8b1efd02dbd7de6fe9d6 metadata.xml 259
-SHA256 57fc5e4177fcff4246f112f412880daba075e4041251478551aa7f06f97686e8 metadata.xml 259
+EBUILD johntheripper-1.7.2.ebuild 3381 RMD160 67f774b9c15bba39eb9266d24573e0b4d5fa6a6f SHA1 fb36c96ce8d84e3b6b37a08456b936d62d415eb8 SHA256 df681981e41985921fd0926fae9d593e382d55fbb51ce4a377e7b384f542f9f1
+MD5 2f4a579e125a5e16cb7e354417047750 johntheripper-1.7.2.ebuild 3381
+RMD160 67f774b9c15bba39eb9266d24573e0b4d5fa6a6f johntheripper-1.7.2.ebuild 3381
+SHA256 df681981e41985921fd0926fae9d593e382d55fbb51ce4a377e7b384f542f9f1 johntheripper-1.7.2.ebuild 3381
+MISC ChangeLog 8395 RMD160 5533789056613ca2b84144eb08111a2452f75730 SHA1 a8d3e4a470b14a56822330d31380b1b416433ed4 SHA256 3e772742b2e0ae507f2ea2fab3ecdd2b7ae4faa2d012de92dfe5f272db679423
+MD5 8870d1a56143c71d27ebddbef5377ccf ChangeLog 8395
+RMD160 5533789056613ca2b84144eb08111a2452f75730 ChangeLog 8395
+SHA256 3e772742b2e0ae507f2ea2fab3ecdd2b7ae4faa2d012de92dfe5f272db679423 ChangeLog 8395
+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
@@ -53,3 +77,13 @@ SHA256 7ce5546f48a6e3746583d713f9781b46f6d23c9f8d30e6d46d042a9bd99c6db4 files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE0vwIyuNVb5qfaOYRAnK5AJ9/o/jV7fJ6CsAqX4+ItSE2+jUBdgCfWtMP
+x+2G4zvnVRpwiG+SiQ9RPKw=
+=FxDD
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
new file mode 100644
index 000000000000..a90f5138c57f
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
@@ -0,0 +1,6 @@
+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 78a0294fba77ebd63bdb39837df917c8 john-1.7.2.tar.gz 809308
+RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac john-1.7.2.tar.gz 809308
+SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb john-1.7.2.tar.gz 809308
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
new file mode 100644
index 000000000000..04d22015e8a8
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
@@ -0,0 +1,15 @@
+Index: john-1.7.2/src/params.h
+===================================================================
+--- john-1.7.2.orig/src/params.h
++++ john-1.7.2/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.2-sha1-memset.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
new file mode 100644
index 000000000000..a713deffffe5
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
@@ -0,0 +1,13 @@
+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.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
new file mode 100644
index 000000000000..e1ed5ae06812
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
@@ -0,0 +1,72 @@
+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.2-stripping.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
new file mode 100644
index 000000000000..8c1afb19eec9
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
@@ -0,0 +1,28 @@
+Index: john-1.7.2/src/Makefile
+===================================================================
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
+@@ -718,23 +718,18 @@ john.com: john.asm
+ 
+ ../run/john.exe: $(JOHN_OBJS)
+ 	$(LD) $(JOHN_OBJS) -lkernel32 -o ../run/john.exe
+-	strip ../run/john.exe
+ 
+ ../run/unshadow.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unshadow.exe
+-	strip ../run/unshadow.exe
+ 
+ ../run/unafs.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unafs.exe
+-	strip ../run/unafs.exe
+ 
+ ../run/undrop.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/undrop.exe
+-	strip ../run/undrop.exe
+ 
+ ../run/unique.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unique.exe
+-	strip ../run/unique.exe
+ 
+ # Inlining the S-boxes produces faster code, as long as they fit in the cache
+ # (that is, on RISC with at least 8 KB of L1 code cache).
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
new file mode 100644
index 000000000000..3aed4eb5a116
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
@@ -0,0 +1,131 @@
+# 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.7.2.ebuild,v 1.1 2006/08/04 07:49:09 phreak 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 ~ppc-macos ~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
+	epatch "${FILESDIR}"/${P}-*.patch
+
+	ebegin "Applying ${P}-Makefile.patch"
+	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
+		-e 's|^LDFLAGS.*|LDFLAGS= -lm|' "${S}"/src/Makefile
+	eend $?
+
+	ebegin "Applying ${P}-john.conf.patch"
+	sed -i -e 's:$JOHN:/usr/share/john:g' "${S}"/run/john.conf
+	eend $?
+}
+
+
+src_compile() {
+	cd "${S}"/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
+
+	# 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/metadata.xml b/app-crypt/johntheripper/metadata.xml
index 4b8964c8b919..99604958ee8f 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>crypto</herd>
 	<maintainer>
-		<email>dragonheart@gentoo.org</email>
-		<description></description>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
 	</maintainer>
 </pkgmetadata>