app-crypt/johntheripper remove altivec use flag wrt bug 353969. Mark ppc/ppc64 stable. Drop old version/patches.

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

4 files changed, 23 insertions, 229 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 39027c605c4e..38d93c055a42 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.130 2011/02/08 15:12:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.131 2011/02/09 18:44:09 c1pher Exp $
+
+  09 Feb 2011; Dane Smith <c1pher@gentoo.org>
+  -files/johntheripper-1.7.3.1-cflags.patch, -johntheripper-1.7.3.4.ebuild,
+  johntheripper-1.7.6-r1.ebuild:
+  *Remove altivec use flag wrt bug 353969.
+  *Mark ppc/ppc64 as stable in 1.7.6-r1 with permission from ssuominen now
+  that
+  the altivec issues are resolved.
+  *Drop old version and old patch.
 
   08 Feb 2011; Jeroen Roovers <jer@gentoo.org> johntheripper-1.7.6-r1.ebuild:
   Stable for HPPA (bug #350730).
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch
deleted file mode 100644
index 8c3bc0f49128..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-* this is an incomplete patch, adding CFLAGS to some targets that we use
-  without this patch, one can't configure john via defines
-
---- src/Makefile
-+++ src/Makefile
-@@ -597,7 +597,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		CC=cc \
--		CFLAGS="-c -qunroll=2 -qarch=ppc -qchars=signed" \
-+		CFLAGS="$(CFLAGS) -c -qunroll=2 -qarch=ppc -qchars=signed" \
- 		LDFLAGS="-s -lbsd" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3 -Q=99 -w"
-@@ -626,7 +626,7 @@
- 	$(LN) ppc32alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
--		CFLAGS="-c -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
- 
-@@ -637,7 +637,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		CC=cc \
--		CFLAGS="-c -traditional-cpp" \
-+		CFLAGS="$(CFLAGS) -c -traditional-cpp" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3"
- 
-@@ -646,7 +646,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3 -finline-limit=4000"
-@@ -656,7 +656,7 @@
- 	$(LN) ppc64alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
--		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -664,7 +664,7 @@
- macosx-ppc64:
- 	$(LN) ppc64.h arch.h
- 	$(MAKE) $(PROJ) \
--		CFLAGS="-c -Wall -fomit-frame-pointer -m64" \
-+		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer -m64" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -698,7 +698,7 @@
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
deleted file mode 100644
index 6ca6c01b2dac..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 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.4.ebuild,v 1.9 2011/01/05 19:13:54 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-1"
-#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 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
-	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-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
index 24f7a7fe804a..68d221353135 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10 2011/02/08 15:12:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.11 2011/02/09 18:44:09 c1pher Exp $
 
 EAPI="2"
 
@@ -22,8 +22,10 @@ SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.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"
-IUSE="altivec custom-cflags -minimal mmx openmp sse2"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="custom-cflags -minimal mmx openmp sse2"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
 #IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
 
 # Seems a bit fussy with other MPI implementations.
@@ -50,19 +52,19 @@ get_target() {
 	elif use amd64; then
 		echo "linux-x86-64"
 	elif use ppc64; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
 			echo "linux-ppc64"
-		fi
+		#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
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
 			echo "linux-ppc32"
-		fi
+		#fi
 	else
 		echo "generic"
 	fi