update to jumbo6, marking self as maintainer

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

4 files changed, 255 insertions, 21 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index fa717babff03..ad38c2b5435b 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.141 2012/04/08 05:19:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.142 2012/07/04 18:15:42 zerochaos Exp $
+
+*johntheripper-1.7.9-r3 (04 Jul 2012)
+
+  04 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  +johntheripper-1.7.9-r3.ebuild, metadata.xml:
+  update to jumbo6, marking self as maintainer
 
 *johntheripper-1.7.9-r2 (08 Apr 2012)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 79c59fedddda..4fd35e9ffb09 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,30 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0
-AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 4dc1565b43af8bca1afa4c711f855df274124554 SHA1 78dda9b2bd97e7171bfd1f6d5e9aedbac8236b55 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f
-AUX johntheripper-1.7.9-jumbo-5-NT-performance-02.patch 1300 RMD160 836afc69d1c84a0363abf0b378946121456aa819 SHA1 06abdaaca4ceb50c89e34d6f28d1e5e8eebb6174 SHA256 27ab9ee6cd7b83aa94dbe3c66fb507432f230fde4818a9a754eeb93388f01513
+AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4 WHIRLPOOL 470ef8046765f009f367adeb217eb1300f99e517d07e3ff01aa4b38d2a529b39a2ca9a8d7dea45956c2f209b3acf5d0aa3d442cab5c148d05be893a0646e33e3
+AUX johntheripper-1.7.6-cflags.patch 2927 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732 WHIRLPOOL 9e209861eef8276515fdc46573a5ed2ba9dda658aebc6c767481cbdd0ccb1c30d35a8b1463b973a81c957dcb76455697814a8461f790415a7c07730bfdfba155
+AUX johntheripper-1.7.9-jumbo-5-NT-performance-02.patch 1300 SHA256 27ab9ee6cd7b83aa94dbe3c66fb507432f230fde4818a9a754eeb93388f01513 SHA512 1bedce39dd17f492a9897f1d6caed77959022f50c03fe5dc0d4860c7478025e2899fb552de054fb47ed9ff9c2fb2f1fec260766c12e0ce2fde7d49305f4461d3 WHIRLPOOL 79396d44d98869aeb936d49deabe787ae8a4a60aaf1a98564054e73d85f7b02545e51a979d3db12412e3edcee9e1697eb4c68ec10a7b20d19398bb8b221924b7
 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
 DIST john-1.7.8-jumbo-2.diff.gz 402639 RMD160 50c57c5811e218b4513d1453c83ea2bb4f277e4c SHA1 478a3388f33828bdf8cc1c2c3bb282e147d95abd SHA256 fb1b83f1a5db8f42de25d65f78b605e44d1d0dfefb87161ed38c5216a75039a6
 DIST john-1.7.8.tar.gz 849810 RMD160 622fa45548b97edc5bf5b56322a083b3a2b63e40 SHA1 0f51495fb188955d0fede609810a60b10e6f208f SHA256 12f4307602b9a8f0d3f82daf28e0f59de21aa82c9dcccd16819b288ec83ab559
-DIST john-1.7.9-jumbo-5.diff.gz 622881 RMD160 f4f0fa05558f75ec9100832b26a7ca2b25d9c3b0 SHA1 b1b49dcb17a8edde5931664cd8baf77c4d4cf4aa SHA256 9a0ff6b912723a393122fa969b9af8efd9f47b154917870053141a372d5963bd
-DIST john-1.7.9.tar.bz2 717505 RMD160 6b8bf7423d8e138c5bfa30bfd348363887e7a4c6 SHA1 8f77bdd42b7cf94ec176f55ea69c4da9b2b8fe3b SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199
-EBUILD johntheripper-1.7.6-r1.ebuild 4780 RMD160 de8ba3a80271098a95b7b83d33151f58aaf8d5e2 SHA1 8eaad231cd9a107c63ffedf584bfad7c3c325ff2 SHA256 cbccc9675f4246e568ad5e6da1e666b965db42c2d50aa3ad8b25d14bf6faba25
-EBUILD johntheripper-1.7.8.ebuild 4911 RMD160 1d08ad9b245c6fe437f228f575ed4c70b26a65eb SHA1 96d5c1b88f1ab34d5bde718c3248dcf777de9af8 SHA256 f20d5efe90d076625aa12cf056504cb9969d0d5e46895368fdc75eb7a3011c76
-EBUILD johntheripper-1.7.9-r1.ebuild 5207 RMD160 c464882ff065482157e1d4f82620219c4c7c73cb SHA1 0288a6a207f083c6ef21051addef698799101923 SHA256 e6edc0814d6a35c4b7e7feddfd06bf4f6152aa73bc2451b7dbc509a326afc2ca
-EBUILD johntheripper-1.7.9-r2.ebuild 5344 RMD160 53187202542c1feeffb80aae61c17b8b593a4031 SHA1 6d12dcbf9e8fd41e55c407ff81458a52439ecfb4 SHA256 39e87b2ddd7f8c4d5aa2603761c2783a64d1b216d0021af53b81d503dc4e061d
-EBUILD johntheripper-1.7.9.ebuild 5154 RMD160 217f4295ec12d174b77072b36644bcbbcff33468 SHA1 0197343811218b1f963fc828995cd814762d7560 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9
-MISC ChangeLog 23591 RMD160 26fe0ecea4376ba7f055332ad1e61e7b233f2100 SHA1 1fa4bda76b42d78483746b95daa0b534159c48e2 SHA256 9a1161dab36e10d7a81af650d997f1e541f1096ea4270c1d55480b26ea90cc53
-MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
+DIST john-1.7.9-jumbo-5.diff.gz 622881 SHA256 9a0ff6b912723a393122fa969b9af8efd9f47b154917870053141a372d5963bd SHA512 06b49db26c2a4794d657a4e2869b67abdbd4e93555f752a1b2aae62bd05cbf4604c997b55ba3e0c1afd6747d6f22d0fe634aa84dc97a646fa8a8983e0469eab4 WHIRLPOOL 262082d460538c11e151b32107609d5ca7cf67aae1c3ab59032569048c16e197020c055b068a2939d32e41082b865440e30ed79de5cc6e0b4862c59ed7393c77
+DIST john-1.7.9-jumbo-6.diff.gz 1016874 SHA256 1f314caef8d4c6b98b24a74d28c89ee92c07456b8d7c6386a280f9b529073ac6 SHA512 ea7ed1733d25a7958e6fb27465a08ebb84b2cd2e6e2518f64d7764c641949a87fe616eaa895c9795e9c57cffda4b6eaad017ac03ed874ffe28450bc9909308f3 WHIRLPOOL 75dccfe58d0558c99ce1d043f8c6118c8d0e74bf4749b438823468eb6111d688625595ea05c5f9e133d2556573b19ebb8c70b1786b0216bd66a25e96b78d0b6c
+DIST john-1.7.9.tar.bz2 717505 SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b WHIRLPOOL e217d3ae3bafaa0d2465402a1c98f05018da9a95ce61effc7f2f20af4aa9ef9a54a636fc7025dfc283e815f5ebd07fafd64e4b01564739fe97053dbeafbd2b13
+EBUILD johntheripper-1.7.6-r1.ebuild 4780 SHA256 cbccc9675f4246e568ad5e6da1e666b965db42c2d50aa3ad8b25d14bf6faba25 SHA512 c4e9feafa347a656ee5a8a2a16d6df1703ac98e31c841c97dd0bae92fc9553ac355f00150b248c2f010ba6b61668f89af3bf89532646c5779d56ee7314db055a WHIRLPOOL bbd4354c6b2a7c622bc5c842ce52591a94216ce4ef552ee03da9d1ab23bb2e76d87a085fb42ddfa90882029cdfbba0a1ae4830ee5ae88bf64aeb77859e0f2961
+EBUILD johntheripper-1.7.8.ebuild 4911 SHA256 f20d5efe90d076625aa12cf056504cb9969d0d5e46895368fdc75eb7a3011c76 SHA512 ae1084ef785dec44708e5406b82578ec10a80c12341ee956ea5fc92678340601eb98b722665bc5f16a4926bec52a7b355e5b906bacbd34304b98f6abf2194b26 WHIRLPOOL 45663454232d2d79bf2d022772121aeb8f8d0c35f848bc5197ad9a337a873ca773633f23fb76c7b67addaf673a63e4d36fe4b536d3aa0cf3759c2ebe155ebc6d
+EBUILD johntheripper-1.7.9-r1.ebuild 5207 SHA256 e6edc0814d6a35c4b7e7feddfd06bf4f6152aa73bc2451b7dbc509a326afc2ca SHA512 6d8dd5f92c604fd295b4b0a8839859990872be75401cf9362e3316d73b842a55b2daeeed6c3c89dd98357c7fc22b3f1a8289c6268ecb2cac1d7bdf5287b12e8e WHIRLPOOL 96ce6f48a2bb2bdacd19811bc274c34a9ecd3bd0546dabd59766de786be53e2fdd2d18ed4b4fcc1ee5f16b5df2d2681f259fa6b9864ee39a2ac630bba8ef930b
+EBUILD johntheripper-1.7.9-r2.ebuild 5344 SHA256 39e87b2ddd7f8c4d5aa2603761c2783a64d1b216d0021af53b81d503dc4e061d SHA512 cc4204dde8e6ccdec7476479a36ae5fb1df842972e0557052e08402c62d20b68efc045d917b39f6c437f583ef2a4a3e46585790062dd8a7c4441f491abd1b2f2 WHIRLPOOL 5f331813603a042be01034385f7433812546e915da8da219a72f814ce0bce7ee9850cd11facbc8fe9599e2c835fd2cae997b12a632e4733a12b043be28113c23
+EBUILD johntheripper-1.7.9-r3.ebuild 5280 SHA256 c5132eba337f0bfd7b6b3e51bef38e5383f38522e04622246b429bf3028aa6f5 SHA512 765cdcd244a8e042540db4f267bde0348de35eeccd70c5f8451a6fb1bf406fc3eea3837d3f7502d6163716664daae53d57cb2d10b6404d6ff9d07ca644d1ed1e WHIRLPOOL 4c3881962f691a3f96d88bee94778ca73d25eb742e530dcd25b6599139ef8043459350479a1c17e95a870b78a11337fa853af8ed3a73e5b65239eb557306566d
+EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
+MISC ChangeLog 23776 SHA256 1a97f7623e11fbbc50b86afa429ec11d743ad9648c9fcd20d357624300becf8f SHA512 e7ce455d13b91407417caabc4bb53e315e21f7d1401a063d83022573b0d4f67eeac2d738086afbb21cde864827bab400d6a68a09f64f2426fb2e4bc89737df5f WHIRLPOOL 752e89c41595a320fdb401a7081647388f8de4e05a7f38916666f410c2663c6f9d92dfbc125a56b807d3893c366296e18fde8bde7ab2dff19d16275f8c9dea15
+MISC metadata.xml 312 SHA256 0c8a1062884e324f58ac6d380f087408ae4d747c50bc03e8417799953b39ad26 SHA512 ba716992bd48fb6501322c6bed9517e7026f8986962d7e877e797af1e21ca6319874eb25a55299c809d3d6736532af651ea2b1fea744e4e0678c5525b8d46017 WHIRLPOOL 46e44ec10d0c48a870e669cc5763bab1e75d14042f9c4f484a650717c764a8a7c1493410b6675007229e11b9e1418b605bf52676e1734785abb3eb35393d7d5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPgR/YAAoJEEqz6FtPBkyjIe4IALOBdfH5TJKqxC5I26M4JrIE
-LwYsvNv+/Bx3nLLsIVLF0PochDjddIBLUME/hmuqGD6k8IfIWSCw3E56YUdTFhYT
-9WKDkza558SaZTKMcmh2EAki0FPRkckLOwv6JVHRTYtWvz3WnDWjrpJKHGT4PKvT
-3DMC8IwI8m26YIKa0jYc0UCBysqQ1ymPfed6i1Y4v6hL+2bNFfnUOekR5PkCjdlN
-mQIwjhGFEM+I4E7erX/hAEi59qG0whHmMNRnETtWSTXJzcdE0DEi31QPTdrnZyt2
-BTwdVzCU0yq5xuCd4aGTVQfPSsNJ5tuXQhLpdaiTNZpJs5FmIESl5/o8bPQSP5g=
-=IbM0
+iQIcBAEBAgAGBQJP9IhpAAoJEKXdFCfdEflKxacP/jFLxDq5s2ZzoUJTWQJzHf5C
+7IAvBmP/JOx/b3NFy7j20cNHLrJK/qf/GQ3OkY4vGrbNWbDQk5OwFNds2+8pkFmp
+9i9VYfioigxNiMEI5x8eDaaFLMWxTSbU28L71Csy32g69KL4m5JFdBLSsE19DJwf
+LnT0fKMc/4GsMHHJMwAg1+U7V5BLJNen4PmOIcM1wLbyw73U31APSKKiUNpcn4jQ
+9GFqUKGqrzYPYNtDF6nQo8Hz5ZBIEoqtjhgXI0b2ix03GGuz3IzkIuikq0Ir8X9D
+096RwzJ33lf3uhE4g+cBgxGfu/WMCS6VfujaFCNzbQ0zIAcWplxlF+rbj4VsbHaN
+45+dxFQ3Bm1AE9L2ZKbDv76lYFePvh7P2Ub7ZHBNLyDVoC+tSIg9Mp1VQ2FScFAf
+WNFhE4757CHvPzmLlgnq5cJuHbmo+C9RHreu8jJBCNmGcgeDNR8zpBiDZM2JcaRW
+VYv5HLutw43dy2Djac5GTq+xZHRQsZhor+UrQP5oXB9I/mjx2DvnuQJVQsHEy3hQ
+aq2SSDh4MC37Mao9LP66XniKjDOWpQF92TLMkfQ91JS9OX6cr+HZqjXoF8vWpnOW
+BMaeuUC3Xpmod1C8gpXOYwIzaJ4PHJsY0KHB3933GZtmP2oVoe/AhhO2yVC/i3Vi
+JrQXx0/FmoTWrIIwLw/N
+=FS6o
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
new file mode 100644
index 000000000000..6cf5130dcfe1
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild,v 1.1 2012/07/04 18:15:42 zerochaos Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-6"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="custom-cflags -minimal mmx mpi openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )"
+
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if has_xop; then
+			echo "linux-x86-64-xop"
+		elif has_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc32"
+		#fi
+	elif use ppc64; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc64"
+		#fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if has_xop; then
+			echo "linux-x86-xop"
+		elif has_avx; then
+			echo "linux-x86-avx"
+		elif use sse2; then
+			echo "linux-x86-sse2"
+		elif use mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+	# force AltiVec, the non-altivec profile contains ancient compiler cruft
+	#	if use altivec; then
+			echo "macosx-ppc32-altivec"
+	#	else
+	#		echo "macosx-ppc32"
+	#	fi
+		# for Tiger this can be macosx-ppc64
+	elif use x86-macos; then
+		if use sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use sse2; then
+			echo "freebsd-x86-sse2"
+		elif use mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+		if use mpi ; then
+			sed -e "s/^#CC = mpicc/CC = mpicc/" \
+				-e "s/^#MPIOBJ =/MPIOBJ =/" \
+				-i src/Makefile || die
+		fi
+
+		# fix typo in jumbo patch
+		sed -i 's:All15:All5:' run/john.conf || die
+	fi
+
+	local PATCHLIST="1.7.6-cflags 1.7.3.1-mkdir-sandbox"
+
+	cd src
+	for p in ${PATCHLIST}; do
+		epatch "${FILESDIR}/${PN}-${p}.patch"
+	done
+
+	if ! use minimal; then
+		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+			-i Makefile || die "sed Makefile failed"
+	fi
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+	append-flags -fPIC -fPIE
+	gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP}" \
+		LDFLAGS="${LDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		$(get_target)
+}
+
+src_test() {
+	cd run
+	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
+		# This requires that MPI is actually 100% online on your system, which might not
+		# be the case, depending on which MPI implementation you are using.
+		#if use mpi; then
+		#	mpirun -np 2 ./john --test || die "self test failed"
+		#else
+
+		./john --test || die 'self test failed'
+	else
+		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -m "${ED}usr/sbin/john" || die
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# jumbo-patch additions
+	if ! use minimal; then
+		dosym john /usr/sbin/undrop
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index b02ffbb5d348..db290c89909d 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+		<description>Any and all help appreciated</description>
+	</maintainer>
 </pkgmetadata>