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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 24 insertions, 20 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/Manifest b/sci-chemistry/gromacs/Manifest
index 8f542ccb937c..a508b21b9c8c 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -14,14 +14,18 @@ DIST gromacs-manual-4.6-beta1.pdf 5527287 SHA256 788a424720b149d905d236d3c792d72
 DIST gromacs-manual-4.6.pdf 5537288 SHA256 e2381a0196dd6babc051bcbe2fc83a953cafbd782111f21abb3f1aa3a802ab8e SHA512 4a9070a52f6777776ed958e678623ddbb5c1290b542a1b539826390d0603ec6d2fad0908fd9f125093ea9c1f7ce1db64ca474405868458770180f7a581767baa WHIRLPOOL cefeaaeee6fe75cc863ff604bdf742843d00d60bce6b8b1a2e2cfeed96fb5e33ce6b7a73c22f1ea145b895727587a7f99fadda9cac4a6741503aa52f1f86c95b
 DIST regressiontests-4.6.tar.gz 43570117 SHA256 517d75855e9e6e43954dbc1c54e581ca8844fbf9c1f85cf810c93d9340b15d03 SHA512 14b337ea1ad39c550a431d9cd3e5f1cd16ab4f19ff392ec2332cb4e4180ba78db73c09fe1596c06798f4c40d6282ffcbb9ace7935d243d9c5354abe85f5f1af3 WHIRLPOOL fa72afc791652a74677d831f2400ac080f40fb28fca9a63df0b81d201422109578ab7445107143767df1a0b604f3ebe91be265a8f300201a5c80409f8e4cad04
 EBUILD gromacs-4.5.5-r1.ebuild 7808 SHA256 ffedeea7d72e555a7ee13232b252c536d917ea9f428558386e72ccc010779b01 SHA512 1c21a6b55611c7aff88bf67a5519e5926cb9277bba44db36eebdf4e22f9fcc733a157ae2e2643123f1e38f998fd8d1524a5440b20de5c041d832567e12976497 WHIRLPOOL 7a2664e943bbd2eac9e095a37946794a32f843ec90dcc3c05209a77c454a17c61ea19ed5105bd81ccc1014f500ac434f4a2e73802decbbed0041a298f1c7dc54
-EBUILD gromacs-4.6.ebuild 7019 SHA256 c0d829f7d963df57ba7cde8358b7a400298f07ded180ea165604f559fac1d3fb SHA512 291343b1e5d05d3b257eaa5934ad905e6c03888a2b5f459767f1eaabd83ff5a21f2273afa8e2460b295ee1ba2963245042edb56b63752d6eeb1e64f14629fac5 WHIRLPOOL cbb1afe356da6f65a68f673838ec4b0e3d2f9d8bf9604299950bfe46ee36c0c39c1b38ec53230d9ad820d5eb95f2adb8db095bf531572ef842410dc9bf2f63fa
-EBUILD gromacs-4.6_beta3-r1.ebuild 7357 SHA256 cc726e720163aefcfa0daf2005072ccb2ac2bb5796ea03f1d24ea3cd26b32a97 SHA512 dc44cd7157bb3a2bf3cf877dd5e4db5532f5fdf3d141c94b569b6b9fb69363a3880326541509d0e927d7ec43708ca8fd1d4733762745a26e152f5ec0e0af68fe WHIRLPOOL 110d35b00861417fa75e2b012bca1b5975157af6146761b99940e55adc54a6ad69f2988da37cec88a56e4853faef03ba513faa309de7228ba5b763b6b396e987
-MISC ChangeLog 19835 SHA256 652642b3e8cf51af5d036bd152eabf52823b736da3ef63e1067f8ecb754e8b65 SHA512 c1f720d82091ec98d4bdb8d2a12af0fdf6fec843f510a0dae29148f2c7f2c97fe06b724e41e98490100e6befbd3968fce533550daf9e51d814f401f20c72303c WHIRLPOOL b02cd06ab9e6b55c2095402cd8378bbbc2d9961e34363ca93171897c035544b81b235f64d803c9ac0eca003da1e202ec49a53ac57fcb6e94b75199fbe20a7fc3
-MISC metadata.xml 1110 SHA256 816a9baa47b63fab420ffa1c6dce9891c6af14245d8ed21fc702fffe2dc32ca4 SHA512 361377fc02ceba7137ae1f53f92d35868e468716597c6cefbab109555089f76ce4943ecd618a09f60673fac532a11ac1db3023814cd085c443b17551b64bcc95 WHIRLPOOL 51f8ee400c771a4f84dee95afa5554edf37990ebc3eeb6b325375073b97fbf80099242e41f33843e2bd8243cd41afd3a5b5b4eb38c3e6dc02e4cda9545f74704
+EBUILD gromacs-4.6.ebuild 6988 SHA256 7881d210eaca44cdd6cbaedf1e79ce3d84cea5f36f91d9b3b81ca97a63a684b1 SHA512 060a6385ac582dc44057af8a6326eb90ca3ec10b21d108f183e2ca65fccac63c47e238c17ef703468f779d164110e9ccf5d53c258367a913ca0fba80563260ec WHIRLPOOL 05e2d1306f2f0fb38d5029bcf5f2faa7b24c9a83856fc4f5a23d61014a38b6c094a16eacf49a693b8e7379803e3f7557dae5462b7d014907a2c37f034ad96d38
+EBUILD gromacs-4.6_beta3-r1.ebuild 7325 SHA256 3beb9a6b4cc3f998524faa18c0f7d1c0d3b44318f5d2ddc7cecd0c2cbb5dd59d SHA512 6c9b339b58298c3fac3486877b925e199bf5608992cc9c05c9aaac2a7a135437f6feede2ba7c2f440c2f12851352f1f7be6f1ff8c379554d44fe464b8648977b WHIRLPOOL aaa08660d54626c8ffac58b3f1bb5a3cb4d43cad1d6813091052af4e58c5bd210ad2d481a7731970b52569684b8d71ae87495a9d51ea2bbbd1f57869e4101291
+MISC ChangeLog 20017 SHA256 0a9b1514a1936894fbded176bfb084ace2d8f40e22e482d318a7b28d7cb11426 SHA512 ff2ac851ae48d269f888c1d2af532a6a4bf504235bc95bfa0545379944ef4dabb891fc8368de2905edcb082e95398e93a24ed2457ffed3d0774ba86694103351 WHIRLPOOL 80fdd78caaa7ea57f78e4ddf82afabc1c5888960690f1a32b3acc55a2258f6bfbd6bdc598a61b290ca96971d4299d89d0e58c94e40ad90251da12854e518d720
+MISC metadata.xml 1111 SHA256 9ac7c2d8dc6b9e6523565bb9d2ba681cd784ce508bbc948f108c54ac554b3d15 SHA512 43365c5266138f79136937fe38d00161b0ac808b2fef1af6bf260ef3043b2d9504e35b83f4ae4564f212b7393e65743e73b123b7c15e989b880a5b266005225e WHIRLPOOL ba60f8ae78266b140b89eab018235475401ae8a9dd7b9333b3fee720081be047db6f5f3f81c63b5289e8a50089ae480883dbc18e1f70bdda4751d51df70f01b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEWj0YACgkQCaWpQKGI+9Q+3QCfb9QxrNC4FD8WUqChnkd1jmlo
-06wAn0z+5QuMAjH7tLCz6yVB7x6RGOJP
-=MeTu
+iQEcBAEBCAAGBQJRGcDfAAoJEOeBhlrCAAWG73kH/1PnKdH7T83uknxpz4WHd0CT
+PpT6BNpknJpiAw8AOjr4KMYIE/IPBUc9g6Mzr/1wF0acDUnrfeOCLyFC6wDfPA4F
+yjE6sGCxGc3rK321K2Zsi7SHWLclymmI7pCFQDpmPIlmPv0YDjo4v116vW0Bh8gf
+nOmRXJwdmFkg391H9pknsSxonphhNdaq9v3DdB54gQ3Wip/YicU7H4WW7iUYQ79W
+2Fug0cFz9cw/7pcF1BAOTMdA6uDIMbDL3qv0E7FBD4teZkn6KBOz/NLYzs36/YUs
+YGw/pJvvvCohjnKC6P5FPCYYOFWP2QMHgguuYJF0QESDmlPdTmynNjTofHcCSf0=
+=TkMl
 -----END PGP SIGNATURE-----
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>