Use correct targets when xop and avx instructions sets are enabled (bugs #405927 and 405941, patch by Rick Farina).

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 35 insertions, 13 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index b22257417f1a..8c04eecf545f 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.134 2012/02/23 10:04:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.135 2012/03/05 22:19:51 radhermit Exp $
+
+  05 Mar 2012; Tim Harder <radhermit@gentoo.org> johntheripper-1.7.9.ebuild:
+  Use correct targets when xop and avx instructions sets are enabled (bugs
+  #405927 and 405941, patch by Rick Farina).
 
 *johntheripper-1.7.9 (23 Feb 2012)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index bc985707a038..b1ddd3a837ee 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -11,17 +11,17 @@ DIST john-1.7.9-jumbo-5.diff.gz 622881 RMD160 f4f0fa05558f75ec9100832b26a7ca2b25
 DIST john-1.7.9.tar.bz2 717505 RMD160 6b8bf7423d8e138c5bfa30bfd348363887e7a4c6 SHA1 8f77bdd42b7cf94ec176f55ea69c4da9b2b8fe3b SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199
 EBUILD johntheripper-1.7.6-r1.ebuild 4773 RMD160 49686c605cd08ebc7ebdc10b9de211f30825575f SHA1 1e89a9fb51753c16a029d08b317c6226bad6add1 SHA256 6639c9f5b273c7504b3eef7744cad58047df148840757f17909157cc9e247063
 EBUILD johntheripper-1.7.8.ebuild 4688 RMD160 ec42f7e2900594c7673265856d26e5275de3804a SHA1 66e637cbe447a241b39084698b3a4dc144c7a200 SHA256 5397bc5e67adab50f13a7603cd173bd7bba32f1a9b0a065323751679dda86510
-EBUILD johntheripper-1.7.9.ebuild 4569 RMD160 01593a88bdd55c38001a23127f17e507021ee692 SHA1 a0f61d7ad8514dda9dc75e04a25cc7bab7bd34cc SHA256 6d2cc4875aa43185da8cbaf2136de7e991c0c55780203e7e6c6410e6d6045664
-MISC ChangeLog 22330 RMD160 54f29bf9584e707275b01f344f42fada92fd896b SHA1 729ae3ce464e2b4c26ed0eb1cfe16be70931f6b8 SHA256 23c059b4dccce1af5e666020f74a8ae968a8ce7d10ff6fc795fffc756ebf5f9e
+EBUILD johntheripper-1.7.9.ebuild 4934 RMD160 de23bd9b187315da48a38dd1589b7ad197e12980 SHA1 157db460c71c299a15fd07d35fd53581fb60df75 SHA256 6fab450542b1216925fcebf22b06a757d4626dd63b66fdaae13d38aef4a36737
+MISC ChangeLog 22528 RMD160 8d3c72ad88e6e6783c773cbd583957612c3e1852 SHA1 aeef6e1e6fbcbddb946ec3feb42c48d133544039 SHA256 5a69df3f3f2989916b48e811769b21fd4549e8038f5fa18121e622574616c919
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPRg8yAAoJEEqz6FtPBkyjfs0H/1cHtls5hJfMvnTXh4OCLXv2
-dByMBC+Tb4IumCSnp3JHI0smeZ0CcVEAEp7fS7O2jG/n0frLYIVuEh28nFpxXb3S
-HrGYgJ+QVoVUWob4bHsKacI96CHgFSsep1IQsN1mNqEwRIOC0aTxsXYmgbA/fP4q
-Qf6rBvsIiXl6zolOzFXMWTF6iZgp8YzZ0G1gTB2klNsDQWBBGGtT0UBQvFQ3sL/p
-Eg9w16cb6LAdSu8PuEiIlf9cUP4bara3jpUiwpUTcWhtG99fI0FphgQTewlHlGHa
-lHjc1DfWkoWaSARcu0jnRc5Rc8HBJ/HyO2aTI8RIqW2Nbkg0RMmiUZVPUbj4ckQ=
-=IXby
+iQEcBAEBCgAGBQJPVTwlAAoJEEqz6FtPBkyjPKEIAIMHrjxDjpCvTZrKzLYS/jGb
+D2U/XXMAEb09C54eFBJ60gjQhilDK4n5iN/59oDw3cfaRTev9wkYZBXjS9uMzRk1
+c3Q9RnKH3/HHW7qGzAMr3R4EOUAnqC86egSgJc+viSE59pXRR93mEm5iyusmZUCN
+M4sQbf8MpnKPK5cc9bgF6tS4NqAbguScHAggY8ZT5/NoaXuSIg6IGdpxbfQNHt3w
+bFVB4kVZYWtH1yKUJg8VFehm0NoUAr4nDJUtA906mHvrCoe1hHc6xBkaBLaisJZj
+iH/ptQwK4MmiiJZ0+aEry37UOZrmXx8XaScNRGKqlHehsVwIex4rG+yWeznxNKM=
+=jhY5
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
index b9be3eb34aad..2106cdf4e6a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.1 2012/02/23 10:04:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9.ebuild,v 1.2 2012/03/05 22:19:51 radhermit Exp $
 
 EAPI="4"
 
@@ -36,11 +36,25 @@ DEPEND="${RDEPEND}"
 
 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
-		echo "linux-x86-64"
+		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"
@@ -58,7 +72,11 @@ get_target() {
 	elif use sparc; then
 		echo "linux-sparc"
 	elif use x86; then
-		if use sse2; 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"