new rev for subslot dep operations

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 278 insertions, 2 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index ed3912887866..96320886fc6e 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.157 2013/02/06 19:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.158 2013/04/20 16:11:24 zerochaos Exp $
+
+*johntheripper-1.7.9-r7 (20 Apr 2013)
+
+  20 Apr 2013; Rick Farina <zerochaos@gentoo.org>
+  +johntheripper-1.7.9-r7.ebuild:
+  new rev for subslot dep operations
 
   06 Feb 2013; Agostino Sarubbo <ago@gentoo.org> johntheripper-1.7.9-r6.ebuild:
   Stable for sparc, wrt bug #450180
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 008a76e2b399..598deda65178 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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
@@ -18,6 +21,24 @@ EBUILD johntheripper-1.7.9-r3.ebuild 5280 SHA256 c5132eba337f0bfd7b6b3e51bef38e5
 EBUILD johntheripper-1.7.9-r4.ebuild 6129 SHA256 83858e9f54b2b376f7ef0c50742c15a854e7c75f4ad2761229886cb7d48910fe SHA512 422afe0e045c41ff28246843b262340b737e7bc88b82ab11caf80acfeeaed6b20b21e77103248abab62e17d318265e18c9efc622a9832550109c285d9f3306be WHIRLPOOL ad6ca8bbb2393a5666fbef8785d47cf200c1deb46c4079124e14fdf505ac70973ca9be01f5ba9131b6ea8f4f2a53b2c389680f1ae1238f919504b4144c91dc2a
 EBUILD johntheripper-1.7.9-r5.ebuild 5779 SHA256 bf31917ff280dc5be753f1eee4b38c9e785d6ab23cd549397760c7bc0c94e040 SHA512 563d8551add61b31c0927b2a9afec0686f9468a3573647be6e7185154b61440141f4beba7deb6b5d92a1b78795226569c116bd5065d65fbb0deebc516206cb74 WHIRLPOOL 370d635ec702c4ed767bb1fb6b5115ea49c4fdd06a62512f638bf02001f0926fc0c40670d7f18415b0f61cbd8be2976fa53a832a4a15a153b1b0f3d1a9f2c5dc
 EBUILD johntheripper-1.7.9-r6.ebuild 6020 SHA256 0d24af11810ed521d59bbea555159f021456205c552afc4df740f2b10870793f SHA512 61485703085127a19f83e141157876fe636f429040e3c22693ee0f41e077f60df0d30c02f8e3444235432aca4409d928a747c45ec6a11336d7926cfe7181a454 WHIRLPOOL dfcb218a2e48c8decf90e3ee7bcbd234b5169bdab5aac13c0035358b59215e6086b3cdb666a65293d8fb321b9d029f0f097f7ba1c96f0997c8cff960d9439fe4
+EBUILD johntheripper-1.7.9-r7.ebuild 6036 SHA256 8dc757d3d2ec124215d041241da3c4c48644453da997563c5f1a70055dafb104 SHA512 af04ed032e7f5c6610cf72064b1760da75522840d188f95bfc8be0e3618e309dde09e96082d41f9287384d110a01a5be5fad7181e08538adb17d87962e3b6b9c WHIRLPOOL 499068415c42c8bc23aa2e0fad373cf1346953a80abc558c3ee1b90a9b23d18dece744265ab046b482264d71638742836979ef629a3f566b87f7e7dde352485d
 EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
-MISC ChangeLog 25896 SHA256 99c777a4ed9b161d6caf912d9b84fab289866e544deb1754fe056fbd0b8bf172 SHA512 ca6943afdf52145b982eb234115d7df972b31d42bd6c2d5a41418635ef0b00b2075e6ebf1671dbb5cf86608e7baa0387765207f61c143e548a9c5984a4e84cd1 WHIRLPOOL 7a9403f4b5ce1fc8ab4a3d4d22e624c2679982b7e1a28dcdd0a0bfafc72fbf71edf54c4405c8534b43d5575a7842e7248e67b1ab72328521081b94ad8dad20da
+MISC ChangeLog 26063 SHA256 032fc434803aadc9d337e34f169d35737ef1ba0b950341abfd1be0c55ab01d88 SHA512 43eaa5efe749c5103dd20e00dd2bc844db9eb2c4fe8f61f989873030363bc27fe24f6a3a7665b1ff2a2430db47acaa7f60302443ab13ec10fe0aa5e8ae656331 WHIRLPOOL b29f6e91de68b1b6795a04f639c7b1d88aa1a9436d26bf27dbee489adc4cc1055572d89b4c571a085c7873b400820634c2c9142076696c0ee5ac86c5bb850cb2
 MISC metadata.xml 531 SHA256 bb4c0e9b5d1434c7873905469d1fa40f42db99babc475a08cf68d5d23d49d583 SHA512 357b9ab90cf72fb443cf98b0905f80adbd920d21c5b696c68a91f4936c7f8ced9895f1daeb74d813ddcc53d26c05cc82a9e83644c1f80afb8aad76bb1a7dd540 WHIRLPOOL e5497c9fbb9a8313d652b113a7d4090c4aadc45fb7b2ee87a7eca493a11b87b16194e094b956ac7142d94b58ddd9f72b90f405db4c9e5bc909c61be8698a4916
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJRcr7UAAoJEKXdFCfdEflKs1EQAJN7n2kXPJrMBm+34PGk8Pen
+6Cqgz/wB/Zo8No/fL0zU+ZSRjKGxtoRqUQtbVz0F6g78Zv5RxZ1g4jaWqGqmgOKC
+4aAN3nrNKNRtibvFXVpV5cDA2EsV3stJQtBvCNInNwfzcSR5G05u3OdKGHNG2DpL
+4R5NrtQAxFMogSPFMvfUoTyeqTbTHVPyyotmnCI6ZJ6Wh3edTgzrSLKKb09DtCjP
+/peDCqTtm5hOY/3Fsd5/QL933NoiW9U5Gs/jatxeQKxhbGDjz74lx9QXCCo0LVlf
+kAzGRgO5HhvW7NDc0ZvxiIaZk+UG3QogEnd8Va8jfbU1E+/G75sh7l1kG1ZJac8R
+hjowOcZ/AyQ4mhxzZMblQ1FMUw9Q7EPxPby+kwg4C8AdcKXndVQlnoBc6VsPMM8z
+Xb5ywqpsrP2I4P+Hm4RP5/SdlWhUTOoT+eODux/lENNAiF/YyeYZ2VWXMHP9HOkL
+2LLMO3UF8OyMLv3ADsRkvf7Y9GKJC2f7cIQsaJKinEgAQgbn8m3UsUkJ8ueg0Up9
+mKSzlNOX8BuhJUlb3i1TohYeQhXbn6dFyOo57cJdG4pDJeKDiHf9nen/ZEr2rBuj
+AZSF4+Ze0cSQRK7yfCE6867o8jf8Et5rOFrYHP97Vnl/GJHulk8sjXrg3fkog2oc
+ljIbRlQFclEnfuHz0qXJ
+=Z9mR
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
new file mode 100644
index 000000000000..acebeee9bfee
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2013 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-r7.ebuild,v 1.1 2013/04/20 16:11:24 zerochaos Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~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="cuda custom-cflags -minimal mmx mpi opencl openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )"
+
+DEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers
+		dev-util/nvidia-cuda-toolkit:= )
+	opencl? ( virtual/opencl )"
+RDEPEND="${DEPEND}"
+
+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
+}
+
+get_john_objs() {
+	echo -n '${JOHN_COMMON_OBJS} '
+	if use opencl; then
+		echo -n '${OCL_OBJS} '
+	fi
+	if use cuda; then
+		echo -n '${CUDA_OBJS}'
+	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
+		# fix compile on ppc (only needed for jumbo-7)
+		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+	fi
+
+	cd src
+	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+	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"
+		sed -i 's#/usr/local#/opt#g' Makefile || die
+	fi
+	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+}
+
+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
+
+	#this stuff was all stolen from the Makefile, if build breaks, check this first
+	if use opencl; then
+		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+	fi
+	if use cuda; then
+		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+	fi
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		JOHN_OBJS="$(get_john_objs)" \
+		$(get_target)
+}
+
+src_test() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${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
+		for s in \
+			keychain2john keepass2john pwsafe2john hccap2john \
+			racf2john zip2john rar2john pdf2john ssh2john undrop \
+			; do
+			dosym john /usr/sbin/$s
+		done
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/raw2dyna
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+		if use opencl; then
+			doins src/opencl/*.cl
+			doins src/opencl_*.h
+		fi
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}