[gentoo-commits] proj/sci:master commit in: sci-libs/fftw/

["Justin Lecher" <jlec@gentoo.org>]

commit:     c555a18358d85d307fae9f4f0b13ef2d9b8376b5
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Feb  1 12:28:19 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb  1 12:28:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c555a183

sci-libs/fftw: Convert to CPU_FLAGS_X86

---
 sci-libs/fftw/ChangeLog        |  6 +++++-
 sci-libs/fftw/fftw-9999.ebuild | 14 +++++++-------
 sci-libs/fftw/metadata.xml     |  2 --
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index cedc57e..cae3ff9 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2015; Marius Brehler <marbre@linux.sungazer.de> fftw-9999.ebuild,
+  metadata.xml:
+  Convert to CPU_FLAGS_X86 (adopted from tree)
+
   04 Jul 2014; Justin Lecher <jlec@gentoo.org> fftw-9999.ebuild:
   Drop reference to app-emulation/emul-linux-x86-soundlibs
 

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 1b02b62..78a157e 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3.0"
-IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
@@ -95,7 +95,7 @@ src_configure() {
 		fi
 
 		myeconfargs=(
-			$(use_enable fma)
+			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 			$(use_enable fortran)
 			$(use_enable zbus mips-zbus-timer)
 			$(use_enable threads)
@@ -106,15 +106,15 @@ src_configure() {
 			myeconfargs+=(
 				--enable-single
 				$(use_enable altivec)
-				$(use_enable avx)
-				$(use_enable sse)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse sse)
 				${enable_mpi}
 				$(use_enable neon)
 			)
 		elif [[ $x == double ]]; then
 			myeconfargs+=(
-				$(use_enable avx)
-				$(use_enable sse2)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse2 sse2)
 				${enable_mpi}
 			)
 		elif [[ $x == longdouble ]]; then

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 50e74c1..c6b1bd0 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -12,8 +12,6 @@
   publicly available FFT software.
 </longdescription>
   <use>
-    <flag name="avx">Adds support for Advanced Vector Extensions</flag>
-    <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag>
     <flag name="quad">Build quadruple precision lib</flag>
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>