Switch to CPU_FLAGS_X86.

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

4 files changed, 25 insertions, 19 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 34a01155ead1..b132bfaa510c 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.163 2014/11/02 18:02:05 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.164 2015/01/29 18:52:33 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  jack-audio-connection-kit-0.121.3-r1.ebuild,
+  jack-audio-connection-kit-0.121.3.ebuild,
+  jack-audio-connection-kit-0.124.1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *jack-audio-connection-kit-0.124.1 (02 Nov 2014)
 
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 973c80429dd0..54711f7d6bfd 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild,v 1.12 2014/08/23 15:33:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild,v 1.13 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -43,7 +43,7 @@ multilib_src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use mmx && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -56,10 +56,10 @@ multilib_src_configure() {
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
index 245fbed38ed1..42c4d43b3a1e 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.16 2013/05/13 03:40:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.17 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
@@ -36,7 +36,7 @@ src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use mmx && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -49,10 +49,10 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
index fea3c3d1758b..475629a5eb9e 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild,v 1.1 2014/11/02 18:02:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild,v 1.2 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse cpudetection pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -43,7 +43,7 @@ multilib_src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -58,7 +58,7 @@ multilib_src_configure() {
 		$(use_enable debug) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \