Switch to CPU_FLAGS_X86.

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

3 files changed, 18 insertions, 14 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index e125fa4b260d..18019488e965 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypy-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.30 2014/12/24 07:21:52 alicef Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.31 2015/01/28 19:46:12 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> pypy-bin-2.3.1-r2.ebuild,
+  pypy-bin-2.4.0.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   24 Dec 2014; Alice Ferrazzi <alicef@gentoo.org> metadata.xml:
   Update email and removed proxy-maintainers herd
diff --git a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
index 3165c37af4fe..6717042ff28f 100644
--- a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.3.1-r2.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/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild,v 1.3 2014/11/05 21:18:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild,v 1.4 2015/01/28 19:46:12 mgorny Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 		) )
 	)
 	x86? (
-		sse2? (
+		cpu_flags_x86_sse2? (
 			jit? ( shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
 					-> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
@@ -41,7 +41,7 @@ SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 					-> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
 			) )
 		)
-		!sse2? (
+		!cpu_flags_x86_sse2? (
 			!jit? ( !shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
 					-> ${P}-r1-x86+bzip2+ncurses.tar.xz
@@ -51,12 +51,12 @@ SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 
 # Supported variants
 REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !sse2? ( !jit !shadowstack ) )"
+	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
 
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
+IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 9ed64d7931ed..1cef64039a8e 100644
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.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/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.7 2014/11/09 08:33:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.8 2015/01/28 19:46:12 mgorny Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 		) )
 	)
 	x86? (
-		sse2? (
+		cpu_flags_x86_sse2? (
 			jit? ( shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
 			) )
@@ -35,7 +35,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
 			) )
 		)
-		!sse2? (
+		!cpu_flags_x86_sse2? (
 			!jit? ( !shadowstack? (
 				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
 			) )
@@ -44,12 +44,12 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 
 # Supported variants
 REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !sse2? ( !jit !shadowstack ) )"
+	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
 
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
+IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="