diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 535e95ff6..2a13ceb51 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -3,7 +3,6 @@ AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9
 DIST john-1.7.6-fullmpi8-after-jumbo3.diff.gz 13877 RMD160 336fbf62313eeb2fd0fc9b98f0d0ebba8acd5e20 SHA1 daae576031e43cb84144af4fbdb5eee679ad0ad6 SHA256 db7fc9e05f904d0220bf7729c264dfd1761faa77015d3c618d3ec032c1c147bb
 DIST john-1.7.6-jumbo-12.diff.gz 226416 RMD160 52c316d91b47be6b8cb8b4801f6c65386a5bdded SHA1 77d0a1824d3b8e8754f39f4f8738b6af48de61e3 SHA256 0f8515ee436a8896ad12a6e0f79df358f6c8d3f87b66754d424d0b10dced8c9f
 DIST john-1.7.6-jumbo-9-mscash2-1.diff.gz 7341 RMD160 b03d402de6974176a1953ea6a91b86e4aff3e585 SHA1 440d3b0dc18303079f8147562529b615efa2e5ab SHA256 7e167adb88225f68194c332f9251c746ac2c617c572ecdff8333fe74e7bd97e8
-DIST john-1.7.6-jumbo-9-mscash2-v1-1.diff.gz 7719 RMD160 2fe89170502a8d8f31e857b46c41b3355816d29d SHA1 9db0755b141fa7b075bf68fbdec0fe5194de4fe1 SHA256 2d3d572f8448b0823cae945d7cdcf0ee9db79d6e5d3a5401a8cb43f5c37e892c
 DIST john-1.7.6-jumbo-9.diff.gz 218658 RMD160 c6d5a0771d5de0d35802d85319146ee95c4ebdf4 SHA1 1d046ec8c016e2497653487917a3594222031f49 SHA256 ee37cb3dc341348a573f6c3c2f43b136c0e6a173430863bd3b6527e6b1143368
 DIST john-1.7.6-omp-des-7.diff.gz 7956 RMD160 b0f665e66b3e26221cdf7d33a0c9ac0aa73c4b84 SHA1 2f08f94ba5edba53f6989c3fad814a55238dca93 SHA256 ccc8a10dc8e2e1e8e3a4ea55f92baf214606547ebf2725b1908d726e016cea0c
 DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
@@ -11,7 +10,6 @@ DIST john-1.7.8-jumbo-7.diff.gz 531197 RMD160 762bfd1d83dd1a59b9ae80e742747cea0d
 DIST john-1.7.8-jumbo-8.diff.gz 591879 RMD160 cbc921566be4b3829cf8729d96a00fc35e6b181e SHA1 f64456ff12b722cb13849833f5cc7cdcc82aea38 SHA256 1e8a1bf3629123b4a624a32fcd619dbc1fdfbb53545ff0cdf96b98ddd1419a2f
 DIST john-1.7.8.tar.gz 849810 RMD160 622fa45548b97edc5bf5b56322a083b3a2b63e40 SHA1 0f51495fb188955d0fede609810a60b10e6f208f SHA256 12f4307602b9a8f0d3f82daf28e0f59de21aa82c9dcccd16819b288ec83ab559
 EBUILD johntheripper-1.7.6-r2.ebuild 4793 RMD160 9c558bb77b61c9cc2f7dd2fcd17d6295f4a6099f SHA1 488954cee99c3b8fbebf053ad43a61de1038f3a0 SHA256 5279cf0175613ca47190609402ed1fdd9db91fef3e63933ad527a961600628c2
-EBUILD johntheripper-1.7.6-r4.ebuild 4836 RMD160 d5d44c0aa5a8cf0896dc741d10354fc32aeed0a3 SHA1 ebeb3f6568dee22b07321d343f98680f82d36954 SHA256 cf20967fe7d28550ae441f6a30900b119298f3e1bff502be1ca48d762d65ee2f
 EBUILD johntheripper-1.7.6-r5.ebuild 4652 RMD160 6370c468a2ec16fafbb81b88b5db4c28c7271610 SHA1 0827ded477278cc009e71947ac0fae165c8a8adf SHA256 d3c6fc55d6e3a2343be26ebdb585d4ac15a856dd6e5e59351aa627db821827ea
 EBUILD johntheripper-1.7.8-r1.ebuild 5079 RMD160 b8219170a9484a32a5a8843530e408fd1e0994dc SHA1 b48eec23ce53ca9dbfb412fecc031fd307434155 SHA256 6478cd1b3f5252771975202d03d948a25764a3e5276277cb9411830a7ef36da3
-EBUILD johntheripper-1.7.8-r2.ebuild 4995 RMD160 bf711d8579741016d48f3ed27bd8d31165d7a385 SHA1 0101ae10a36a0961b9251a35463d165f34154223 SHA256 118522596724f7ca68088a668541aec32ab7461bc48c27f54a712497acebf94f
+EBUILD johntheripper-1.7.8-r3.ebuild 4992 RMD160 148f7b7cbc690a47f1e53f90877a4e4eee23140f SHA1 9b028389b26d23bef6f70736bb32ed13a1827a1a SHA256 35240ef5a0d7150b84b93517acc1f2879ddd127c8e163fbd47326ea8a4267e8b
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r4.ebuild
deleted file mode 100644
index 37c04fb82..000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.6-r4.ebuild
+++ /dev/null
@@ -1,179 +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-r1.ebuild,v 1.1 2010/12/03 19:02:34 c1pher Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-12"
-MPI="mpi8"
-OMPV="des-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( http://download.openwall.net/pub/projects/john/contrib/${MY_P}-${JUMBO}.diff.gz )
-	mpi? ( http://openwall.info/wiki/_media/john/${MY_P}-full${MPI}-after-jumbo3.diff.gz )
-	mscache2? (	http://openwall.info/wiki/_media/john/${MY_P}-jumbo-9-mscash2-v1-1.diff.gz )
-	openmp? ( http://openwall.info/wiki/_media/john/${MY_P}-omp-${OMPV}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec custom-cflags -minimal mmx -mpi mscache2 openmp sse2"
-
-# Seems a bit fussy with other MPI implementations.
-RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
-	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}
-	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
-
-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() {
-	# It looks like the order of the patches is important, so be carefull if you
-	# gonna alter this section.
-
-	if use openmp && use sse2; then
-		epatch "${WORKDIR}/${MY_P}-omp-${OMPV}.diff"
-		sed -i '/JOHN_VERSION/ s/'${PV}-omp-${OMPV}'/'${PV}'/' "${S}/src/params.h"
-		append-flags -msse2
-	fi
-
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-		sed -i '/JOHN_VERSION/ s/'${PV}-${JUMBO}'/'${PV}'/' "${S}/src/params.h"
-	fi
-	
-	if use mscache2; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}-mscash2-1.diff"
-	fi
-	
-	if use mpi; then
-		sed -i '/JOHN_VERSION/ s/'${PV}-jumbo-3'/'${PV}'/' "${WORKDIR}/${MY_P}-full${MPI}-after-jumbo3.diff"
-		epatch "${WORKDIR}/${MY_P}-full${MPI}-after-jumbo3.diff"
-		sed -i '/JOHN_VERSION/ s/'${PV}-full${MPI}'/'${PV}'/' "${S}/src/params.h"
-	fi
-	
-	sed -i '/JOHN_VERSION/ s/'${PV}'/'${PV}-pentoo'/' "${S}/src/params.h"
-
-	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() {
-	local OMP=''
-
-	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
-	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 ${CFLAGS} ${OMP}" \
-		LDFLAGS="${LDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		$(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
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.8-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.8-r3.ebuild
similarity index 98%
rename from app-crypt/johntheripper/johntheripper-1.7.8-r2.ebuild
rename to app-crypt/johntheripper/johntheripper-1.7.8-r3.ebuild
index d7275350c..73eb92387 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.8-r2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.8-r3.ebuild
@@ -92,7 +92,6 @@ src_prepare() {
 	if use mpi; then
 		sed -i 's:^#CC = mpicc:CC = mpicc:' src/Makefile || die "sed Makefile failed"
 		sed -i 's:^#MPIOBJ =:MPIOBJ =:' src/Makefile || die "sed Makefile failed"
-		
 	fi
 #OpenMP DES patches fails with JUMBO
 #	http://openwall.info/wiki/john/parallelization
@@ -126,7 +125,7 @@ src_compile() {
 	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 -include "${S}"/config.gentoo
+	append-flags -fPIC -fPIE "-include ${S}/config.gentoo"
 	gcc-specs-pie && append-ldflags -nopie
 	use openmp && OMP="-fopenmp"