Switch to CPU_FLAGS_X86.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

13 files changed, 105 insertions, 96 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 5bde8f5490d1..897980588198 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.165 2014/09/17 12:54:50 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.166 2015/01/28 19:13:24 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> johntheripper-1.7.6-r1.ebuild,
+  johntheripper-1.7.8.ebuild, johntheripper-1.7.9-r1.ebuild,
+  johntheripper-1.7.9-r2.ebuild, johntheripper-1.7.9-r3.ebuild,
+  johntheripper-1.7.9-r4.ebuild, johntheripper-1.7.9-r5.ebuild,
+  johntheripper-1.7.9-r6.ebuild, johntheripper-1.7.9-r7.ebuild,
+  johntheripper-1.7.9-r8.ebuild, johntheripper-1.7.9-r9.ebuild,
+  johntheripper-1.7.9.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   17 Sep 2014; Justin Lecher <jlec@gentoo.org> johntheripper-1.7.9-r9.ebuild:
   Drop gpu specific compiler flags
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
index 6b8cffc3b3c4..763c8cb6f811 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-2012 Gentoo Foundation
+# Copyright 1999-2015 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.14 2012/04/07 06:38:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.15 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ 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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal mmx openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_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"
@@ -58,9 +58,9 @@ get_target() {
 	elif use sparc; then
 		echo "linux-sparc"
 	elif use x86; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -74,7 +74,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
index 81f11d2420fe..9c82f8dea00d 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.8.ebuild,v 1.3 2012/04/07 06:38:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.8.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal mmx openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
 #IUSE="altivec custom-cflags -minimal mmx openmp sse2"
@@ -59,9 +59,9 @@ get_target() {
 	elif use sparc; then
 		echo "linux-sparc"
 	elif use x86; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -75,7 +75,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -83,9 +83,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
index 59ac427c9f1c..9482e58f567b 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r1.ebuild,v 1.6 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild,v 1.7 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal mmx mpi openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )"
 
@@ -72,9 +72,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -88,7 +88,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -96,9 +96,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
index 2334a3d92331..c78c12f0ab3e 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r2.ebuild,v 1.3 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal mmx mpi openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )"
 
@@ -72,9 +72,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -88,7 +88,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -96,9 +96,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
index 2c6618de0e2d..4c3091917f74 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r3.ebuild,v 1.3 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r3.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="custom-cflags -minimal mmx mpi openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx mpi openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )"
 
@@ -72,9 +72,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -88,7 +88,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -96,9 +96,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
index adc97386282b..67bd77ed07b7 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r4.ebuild,v 1.3 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ 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 ~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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -76,9 +76,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -92,7 +92,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -100,9 +100,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
index aa93304094ae..2b66c6608f5b 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r5.ebuild,v 1.5 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.6 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -75,9 +75,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -91,7 +91,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -99,9 +99,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index 97ae458ff13a..9ece4a5ada65 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r6.ebuild,v 1.13 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.14 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ 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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -75,9 +75,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -91,7 +91,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -99,9 +99,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
index 32be34c09889..b177c18102d0 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.3 2013/07/02 02:11:48 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r7.ebuild,v 1.4 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ 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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -76,9 +76,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -92,7 +92,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -100,9 +100,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild
index 3f7518832b01..f378ee82b902 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r8.ebuild,v 1.4 2013/09/19 19:44:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild,v 1.5 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ 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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -76,9 +76,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -92,7 +92,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -100,9 +100,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
index d99d5d87bab2..c8e3b1a6c260 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r9.ebuild,v 1.2 2014/09/17 12:54:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild,v 1.3 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ 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 mozilla mpi opencl openmp sse2"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mozilla mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -78,9 +78,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -94,7 +94,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -102,9 +102,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
index 7f98edbea21c..78f8e12dbb41 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
+# Copyright 1999-2015 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.4 2012/04/07 06:44:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9.ebuild,v 1.5 2015/01/28 19:13:24 mgorny Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="custom-cflags -minimal mmx openmp sse2"
+IUSE="custom-cflags -minimal cpu_flags_x86_mmx openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
 #IUSE="altivec custom-cflags -minimal mmx openmp sse2"
@@ -76,9 +76,9 @@ get_target() {
 			echo "linux-x86-xop"
 		elif has_avx; then
 			echo "linux-x86-avx"
-		elif use sse2; then
+		elif use cpu_flags_x86_sse2; then
 			echo "linux-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "linux-x86-mmx"
 		else
 			echo "linux-x86-any"
@@ -92,7 +92,7 @@ get_target() {
 	#	fi
 		# for Tiger this can be macosx-ppc64
 	elif use x86-macos; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "macosx-x86-sse2"
 		else
 			echo "macosx-x86"
@@ -100,9 +100,9 @@ get_target() {
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
-		if use sse2; then
+		if use cpu_flags_x86_sse2; then
 			echo "freebsd-x86-sse2"
-		elif use mmx; then
+		elif use cpu_flags_x86_mmx; then
 			echo "freebsd-x86-mmx"
 		else
 			echo "freebsd-x86-any"