[gentoo-commits] dev/c1pher:master commit in: app-crypt/johntheripper/

[gentoo-commits] dev/c1pher:master commit in: app-crypt/johntheripper/

[Dane Smith]

commit:     8f2caf7f7c16b97e185e7d330b9154f7502396ad
Author:     Dane Smith <smithdanea <AT> gmail <DOT> com>
AuthorDate: Wed Feb  9 15:10:59 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 15:10:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=8f2caf7f

New testing john

---
 app-crypt/johntheripper/Manifest                   |    2 +-
 .../johntheripper/johntheripper-1.7.6-r1.ebuild    |   26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 04a7665..dbb5d90 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -10,5 +10,5 @@ AUX johntheripper-1.7.3.1-stackdef.S.patch 2112 RMD160 bbf978098ff017700f05d0240
 AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9ba8d24146 SHA1 f2cb76ef4ba742d7fb02c4a1fca1717a932bf93c SHA256 0490311893ec85b4ca9fed1cce39341378959fed307b012f29adf11789a444ae
 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
-EBUILD johntheripper-1.7.6-r1.ebuild 4131 RMD160 79e3290e0372990720a3944dbb23f15a5f55ae6d SHA1 e53f8347f06ab169fac69b5188b387fc12df6395 SHA256 21f45b42d048780610b7610f9bfba9f1027f7cac8db8bb3d817cfa0613d6d2cf
+EBUILD johntheripper-1.7.6-r1.ebuild 4291 RMD160 754d38b9c80ea953edb8b615a3ac4d70908e5988 SHA1 1814f2c1a48a97de2ef066f1051364c69836df4d SHA256 b9526a5cd474e32937dc37586bf14a505ff30a31e5770a9875de3431e8122503
 MISC ChangeLog 276 RMD160 ce3f67053996601285e51dfb86b7c0649b340a81 SHA1 b5722e6d35fb890517a0485011deb9b67d3b8ad5 SHA256 7d185414dc56671e2b13521c98d49a46960950e6b0a9b9862f040318bbfafdf6

diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
index 2597e91..14573cd 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.8 2011/02/08 12:50:10 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.9 2011/02/08 13:34:07 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=""
-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
@@ -102,7 +104,7 @@ src_compile() {
 
 	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/\
+	emake -C src/ \
 		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
 		CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
 		LDFLAGS="${LDFLAGS}" \