Convert to CPU_FLAGS_X86.

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

8 files changed, 31 insertions, 26 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 6e64e52a4bc7..b5baba028b40 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.138 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.139 2015/01/29 18:52:23 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> ardour-2.8.14-r1.ebuild,
+  ardour-2.8.16.ebuild, ardour-3.5.308-r1.ebuild, ardour-3.5.357.ebuild,
+  ardour-3.5.380.ebuild, ardour-3.5.403.ebuild, ardour-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   03 Jan 2015; Michał Górny <mgorny@gentoo.org> ardour-3.5.308-r1.ebuild,
   ardour-3.5.357.ebuild, ardour-3.5.380.ebuild, ardour-3.5.403.ebuild,
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
index b3f9822fda0b..cbb25a6d693e 100644
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ b/media-sound/ardour/ardour-2.8.14-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/media-sound/ardour/ardour-2.8.14-r1.ebuild,v 1.4 2013/03/18 12:34:30 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.14-r1.ebuild,v 1.5 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 sse"
+IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -61,7 +61,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
 	tc-export CC CXX
 	mkdir -p "${D}"
 
diff --git a/media-sound/ardour/ardour-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16.ebuild
index e166dcbe23bb..d00702af38f9 100644
--- a/media-sound/ardour/ardour-2.8.16.ebuild
+++ b/media-sound/ardour/ardour-2.8.16.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/ardour/ardour-2.8.16.ebuild,v 1.2 2013/03/18 12:34:30 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.16.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 sse"
+IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
 	tc-export CC CXX
 	mkdir -p "${D}"
 
diff --git a/media-sound/ardour/ardour-3.5.308-r1.ebuild b/media-sound/ardour/ardour-3.5.308-r1.ebuild
index ce31a727d0a4..4040e065897b 100644
--- a/media-sound/ardour/ardour-3.5.308-r1.ebuild
+++ b/media-sound/ardour/ardour-3.5.308-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308-r1.ebuild,v 1.2 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308-r1.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -103,7 +103,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.357.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
index 72566f6dd56c..430991578aae 100644
--- a/media-sound/ardour/ardour-3.5.357.ebuild
+++ b/media-sound/ardour/ardour-3.5.357.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.357.ebuild,v 1.2 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.357.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -103,7 +103,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.380.ebuild b/media-sound/ardour/ardour-3.5.380.ebuild
index ea65e59166b5..04445df13f78 100644
--- a/media-sound/ardour/ardour-3.5.380.ebuild
+++ b/media-sound/ardour/ardour-3.5.380.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.380.ebuild,v 1.4 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.380.ebuild,v 1.5 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -105,7 +105,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
index fa133a919c20..8f48210bef0f 100644
--- a/media-sound/ardour/ardour-3.5.403.ebuild
+++ b/media-sound/ardour/ardour-3.5.403.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.5 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.6 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec doc nls lv2 sse"
+IUSE="altivec doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -95,7 +95,7 @@ src_prepare(){
 }
 
 src_configure() {
-	if use sse; then
+	if use cpu_flags_x86_sse; then
 		MARCH=$(get-flag march)
 		for ARCHWOSSE in i686 i486; do
 			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
@@ -119,7 +119,7 @@ src_configure() {
 		--optimize \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 31ee68d2b18a..401e2722fce9 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.13 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.14 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -95,7 +95,7 @@ src_prepare(){
 }
 
 src_configure() {
-	if use sse; then
+	if use cpu_flags_x86_sse; then
 		MARCH=$(get-flag march)
 		for ARCHWOSSE in i686 i486; do
 			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
@@ -119,7 +119,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$({ use altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }