sse41 -> sse4_1 (bug #456886) + ninja has missing keywords

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

4 files changed, 13 insertions, 13 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index def02a3446d2..b12fe733590b 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gromacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.119 2013/02/09 18:02:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.120 2013/02/12 04:11:10 ottxor Exp $
+
+  12 Feb 2013; Christoph Junghans <ottxor@gentoo.org> gromacs-4.6.ebuild,
+  gromacs-4.6_beta3-r1.ebuild, metadata.xml:
+  sse41 -> sse4_1 (bug #456886) + ninja has missing keywords
 
   09 Feb 2013; Pacho Ramos <pacho@gentoo.org> gromacs-4.6.ebuild:
   Use readme.gentoo.eclass for elog message (#456068)
diff --git a/sci-chemistry/gromacs/gromacs-4.6.ebuild b/sci-chemistry/gromacs/gromacs-4.6.ebuild
index 3a695d3c53a6..cbf14cd62ed1 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.ebuild,v 1.3 2013/02/09 18:02:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.ebuild,v 1.4 2013/02/12 04:11:10 ottxor Exp $
 
 EAPI=5
 
 TEST_PV="4.6"
 MANUAL_PV="4.6"
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
 inherit bash-completion-r1 cmake-utils eutils multilib readme.gentoo toolchain-funcs
 
 if [[ $PV = *9999* ]]; then
@@ -25,7 +23,7 @@ else
 		test? ( http://${PN}.googlecode.com/files/regressiontests-${TEST_PV}.tar.gz )"
 fi
 
-ACCE_IUSE="sse2 sse41 avx128fma avx256"
+ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -93,7 +91,7 @@ src_configure() {
 	#go from slowest to fastest acceleration
 	local acce="None"
 	use sse2 && acce="SSE2"
-	use sse41 && acce="SSE4.1"
+	use sse4_1 && acce="SSE4.1"
 	use avx128fma && acce="AVX_128_FMA"
 	use avx256 && acce="AVX_256"
 
diff --git a/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild b/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild
index 5133aa045037..fe224cb808d4 100644
--- a/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild,v 1.2 2012/12/29 23:00:35 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6_beta3-r1.ebuild,v 1.3 2013/02/12 04:11:10 ottxor Exp $
 
 EAPI=5
 
 TEST_PV="4.0.4"
 MANUAL_PV="4.6-beta1"
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
 inherit bash-completion-r1 cmake-utils eutils multilib toolchain-funcs
 
 SRC_URI="test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz )"
@@ -27,7 +25,7 @@ else
 		doc? (  ftp://ftp.gromacs.org/pub/manual/${PN}-manual-${MANUAL_PV}.pdf )"
 fi
 
-ACCE_IUSE="sse2 sse41 avx128fma avx256"
+ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
 
 DESCRIPTION="The ultimate molecular dynamics simulation package"
 HOMEPAGE="http://www.gromacs.org/"
@@ -95,7 +93,7 @@ src_configure() {
 	#go from slowest to fastest acceleration
 	local acce="None"
 	use sse2 && acce="SSE2"
-	use sse41 && acce="SSE4.1"
+	use sse4_1 && acce="SSE4.1"
 	use avx128fma && acce="AVX_128_FMA"
 	use avx256 && acce="AVX_256"
 
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index 1360fcbfd3d6..8a88d53da511 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -12,7 +12,7 @@
 		<flag name="single-precision">Single precision version of gromacs (default)</flag>
 		<!-- acceleration optimization flags -->
 		<flag name="fkernels">Enable building of Fortran Kernels for platforms that dont have assembly loops</flag>
-		<flag name="sse41">Enable sse4.1 acceleration</flag>
+		<flag name="sse4_1">Enable sse4.1 acceleration</flag>
 		<flag name="avx128fma">Enable 128bit avx with fma (e.g. AMD BullDozer)</flag>
 		<flag name="avx256">Enable 256bit avx (e.g. Intel Sandy Bridge)</flag>
 		<flag name="offensive">Enable gromacs partly offensive quotes</flag>