Switch to CPU_FLAGS_X86 (bug #538268)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586)

10 files changed, 69 insertions, 69 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index fffe303bf669..4f0f80a01b80 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/gromacs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.149 2014/12/21 23:12:47 ottxor Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.150 2015/01/31 20:23:56 ottxor Exp $
+
+  31 Jan 2015; Christoph Junghans <ottxor@gentoo.org> gromacs-4.6.5.ebuild,
+  gromacs-4.6.6.ebuild, gromacs-4.6.7.ebuild, gromacs-5.0.1.ebuild,
+  gromacs-5.0.2-r1.ebuild, gromacs-5.0.2.ebuild, gromacs-5.0.4.ebuild,
+  gromacs-5.0.ebuild, metadata.xml:
+  Switch to CPU_FLAGS_X86 (bug #538268)
 
 *gromacs-5.0.4 (21 Dec 2014)
 
diff --git a/sci-chemistry/gromacs/gromacs-4.6.5.ebuild b/sci-chemistry/gromacs/gromacs-4.6.5.ebuild
index 505ee9ae0009..9fed1cd07c29 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.5.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/sci-chemistry/gromacs/gromacs-4.6.5.ebuild,v 1.5 2014/03/26 21:42:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.5.ebuild,v 1.6 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -31,7 +31,7 @@ else
 	LIVE_DEPEND=""
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -128,10 +128,10 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx128fma && acce="AVX_128_FMA"
-	use avx256 && acce="AVX_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-4.6.6.ebuild b/sci-chemistry/gromacs/gromacs-4.6.6.ebuild
index 51f1411701b7..65e796123a07 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.6.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/sci-chemistry/gromacs/gromacs-4.6.6.ebuild,v 1.1 2014/07/07 17:51:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.6.ebuild,v 1.2 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -131,10 +131,10 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx128fma && acce="AVX_128_FMA"
-	use avx256 && acce="AVX_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-4.6.7.ebuild b/sci-chemistry/gromacs/gromacs-4.6.7.ebuild
index ed2bff6cfdc2..8811c0ce09ed 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.7.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/sci-chemistry/gromacs/gromacs-4.6.7.ebuild,v 1.1 2014/08/29 19:29:11 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.7.ebuild,v 1.2 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -131,10 +131,10 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx128fma && acce="AVX_128_FMA"
-	use avx256 && acce="AVX_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-5.0.1.ebuild b/sci-chemistry/gromacs/gromacs-5.0.1.ebuild
index 8177c8c8fdbd..c2b748bd257b 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.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/sci-chemistry/gromacs/gromacs-5.0.1.ebuild,v 1.2 2014/11/25 16:04:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.1.ebuild,v 1.3 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -116,11 +116,11 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx_128_fma && acce="AVX_128_FMA"
-	use avx_256 && acce="AVX_256"
-	use avx2_256 && acce="AVX2_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-5.0.2-r1.ebuild b/sci-chemistry/gromacs/gromacs-5.0.2-r1.ebuild
index d8e419165d4b..9bc9dcee939a 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.2-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.2-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/sci-chemistry/gromacs/gromacs-5.0.2-r1.ebuild,v 1.2 2014/11/25 16:04:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.2-r1.ebuild,v 1.3 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -116,11 +116,11 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx_128_fma && acce="AVX_128_FMA"
-	use avx_256 && acce="AVX_256"
-	use avx2_256 && acce="AVX2_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-5.0.2.ebuild b/sci-chemistry/gromacs/gromacs-5.0.2.ebuild
index 8bcfcdf66733..d63bd4903e4e 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.2.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/sci-chemistry/gromacs/gromacs-5.0.2.ebuild,v 1.2 2014/11/25 16:04:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.2.ebuild,v 1.3 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -116,11 +116,11 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx_128_fma && acce="AVX_128_FMA"
-	use avx_256 && acce="AVX_256"
-	use avx2_256 && acce="AVX2_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild b/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
index d6dc5eb19b7a..a2ce83b05bb9 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.0.4.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/sci-chemistry/gromacs/gromacs-5.0.4.ebuild,v 1.1 2014/12/21 23:12:47 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.4.ebuild,v 1.2 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -116,11 +116,11 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx_128_fma && acce="AVX_128_FMA"
-	use avx_256 && acce="AVX_256"
-	use avx2_256 && acce="AVX2_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/gromacs-5.0.ebuild b/sci-chemistry/gromacs/gromacs-5.0.ebuild
index 12b6deeb3629..8f5dfac11044 100644
--- a/sci-chemistry/gromacs/gromacs-5.0.ebuild
+++ b/sci-chemistry/gromacs/gromacs-5.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/sci-chemistry/gromacs/gromacs-5.0.ebuild,v 1.3 2014/11/25 16:04:38 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-5.0.ebuild,v 1.4 2015/01/31 20:23:56 ottxor Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )"
 fi
 
-ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -117,11 +117,11 @@ src_configure() {
 
 	#go from slowest to fastest acceleration
 	local acce="None"
-	use sse2 && acce="SSE2"
-	use sse4_1 && acce="SSE4.1"
-	use avx_128_fma && acce="AVX_128_FMA"
-	use avx_256 && acce="AVX_256"
-	use avx2_256 && acce="AVX2_256"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index 87e0f0a6ab9f..8a5c7453f0ad 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -14,12 +14,6 @@
 	<flag name="tng">Enable new trajectory format - tng</flag>
 	<flag name="make-symlinks">Create symbolic links for pre-5.0 binary names</flag>
     <!-- acceleration optimization flags -->
-    <flag name="sse4_1">Enable sse4.1 acceleration</flag>
-	<flag name="avx128fma">Enable 128bit avx with fma (e.g. AMD BullDozer)</flag>
-	<flag name="avx_128_fma">Enable 128bit avx with fma (e.g. AMD BullDozer)</flag>
-	<flag name="avx256">Enable 256bit avx (e.g. Intel Sandy Bridge)</flag>
-	<flag name="avx_256">Enable 256bit avx (e.g. Intel Sandy Bridge)</flag>
-	<flag name="avx2_256">Enable 256bit avx2 (e.g. Intel Haswell)</flag>
     <flag name="offensive">Enable gromacs partly offensive quotes</flag>
     <flag name="openmm">Add acceleration through <pkg>sci-libs/openmm</pkg></flag>
     <flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for fft, blas, lapack routines</flag>