Remove old ebuilds and patches.

(Portage version: 2.2.0_alpha4/cvs/Linux i686)

15 files changed, 16 insertions, 1219 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/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
-}