[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gromacs/, sci-chemistry/gromacs/files/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     a27e7d816cec5df52e648e8982b4099821fee127
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 20:35:43 2017 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 20:50:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27e7d81

sci-chemistry/gromacs: Version bump

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sci-chemistry/gromacs/Manifest                     |  4 +-
 .../gromacs/files/gromacs-2018-fix-build.patch     | 71 ----------------------
 ...2018_beta1.ebuild => gromacs-2018_beta2.ebuild} |  4 --
 3 files changed, 2 insertions(+), 77 deletions(-)

diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index e0a72f51eb9..4b81bd12d93 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -3,7 +3,7 @@ DIST gromacs-2016.2.tar.gz 27339623 BLAKE2B c3548f4abdc4c1b09a79a3da99d7ca8060da
 DIST gromacs-2016.3.tar.gz 27342692 BLAKE2B 3bea357cb672f41dda68c0d4291c06e2ab8bbc91629e25c9e56741223911be7994be10b2427fb1ca1cd41e511d23323851ba3211ee8590f152e23a64b2253095 SHA512 16593df0a52620766fb86cfeb16328793503f860cb07cdbbd503ba7f41e6430efb4848389b7179ca3907b57311162666d05224b454e1afb1b74b220f38498d86
 DIST gromacs-2016.4.tar.gz 27368706 BLAKE2B 2a176812fe2a097d72c7148ff5ed4ed7209279cf439af6a969c3aba81157c59a4d9af34d19c7b1da088b0a4ab981b489b84446afbcaf64b20724bda1dc3560ff SHA512 69661d2a7a8a5259be277de35e2baa4b688d1f7bef225fc7d733a9b00c6ee135dcbad517c7c9f751121647c2fbd085f2c9cdf22dbd941c7ebc5d3b09e7e08f1f
 DIST gromacs-2016.tar.gz 27321561 BLAKE2B cdcf0aa5ac36981e736fd2ecc2f641e99f40146d829c88e5ff973c7b7c3c1ab920f7822c336e9eea87a8605362e723d7477dd07f9154c8a38476a3f6c391d6aa SHA512 756771baaa85a1d16e7d5b8e4c96bbd1c04c7acdc536a253886cff186316330f06d60d206a0159efb15f47f161c779d3757dc5dbceab8c097241c1382d376201
-DIST gromacs-2018-beta1.tar.gz 29857800 BLAKE2B 221ed414c1dc73b59df27dfb6dd22ef094152bba7a8346cd0d0164e9a0aa5463a7d836dfb13e98ac8cdbef2ae4a0503763a5c445a5e1c73815b3592d8b8f97fe SHA512 6e827b7b33589ccc7ef1d237c4e8ce06749a2c47f59956d383fdb59439a34874a9e0e3a3cca1d209425353a7dcf0f963de035dd0281d4c8aad0c921e6bbc7b93
+DIST gromacs-2018-beta2.tar.gz 29867327 BLAKE2B 6cf2e0c8889e0db7cc1d261cab7176481cf8ac9d79fb0cd0defb4c5f9474b91d694b9d4c6ef556dd7bf8505259bab1c1efca0a4bbdb7338a243383306da2c0a6 SHA512 a276de608e123aa350f9d5c2884e40edaed29541946dddc305b0a94cedf3301185f3ab916d579a043478bb18c54d357d439cd79151c78176373ddeb3665f873e
 DIST gromacs-5.0.4.tar.gz 26342095 BLAKE2B 27a2483e23533ad627114c0005fa0d49a311b359c31aed6378bdd768c9dda03c3b19f11d961f0bd3b82a1711737d4b7dce13cad5fc56d058dd0110fe21421ee3 SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee
 DIST gromacs-5.1.3.tar.gz 27095702 BLAKE2B b7fd8fa10e8c4f4368ac551338c59374dc35f85c9fdae5d64eec62929b8f04ea724a084959b3618cd8a151bf3e0a0c84c8f75de953722effca82a4928941ce73 SHA512 9ab26e1b2268f8d567b89b2d99d0b75b937b28edceaec56d17ca3243c76faa31255ffc0c45d762c7c693fe500b00e36ad43b80572d1d7f92dc87f9d2d98c0ba6
 DIST regressiontests-2016.1.tar.gz 67094518 BLAKE2B 3ae0132e246f2abcf77495bff69adb32bfe98063a824cc408279fb43022ca5e8e07afaee08f3a255657b8cdfd21ba2ff4cc428c2c3d21958ba5149ce745d436c SHA512 fc01c802d81400373a147171881f3b7b9309402e8ffb08287ba393aefbb701ba93bbe0b9549ff6fa264a8befbba445c2d2c7450633063a724f78ec8ca81ae8c9
@@ -11,6 +11,6 @@ DIST regressiontests-2016.2.tar.gz 67095329 BLAKE2B fec8a663845ad67374c8a230d159
 DIST regressiontests-2016.3.tar.gz 67093968 BLAKE2B a644bbd2a0398c1d84f61809a9f4f1cb89d307b0e9952f414e28d18464799e5f49fe810e342768a7b15f1d63b10bf1facb148c1d04ad670c613022302f04ea9d SHA512 ee87df9f339954da0e1f1b4c8b8d4deb574f3b73d174010a295a7a0e8bc462ead7691090ea7cf8ac3d984a6cd70f1cd22c3592fa161b2967061ae5ba2796286b
 DIST regressiontests-2016.4.tar.gz 67643648 BLAKE2B 767c3b0ca1002e6ca68fc3346b7164cca3beaa52f9b1c70672b64cf80427cab045e4d924d0b67a4fe4c76e3a1c0a803964e278d2a9b14b87a555f98dd78525d3 SHA512 367438b897a05e1cc0dcd1d3872fb6a0e9ff6b1146e9448d941d6517dce789f0c478d20cf0a4f3565070f132dc88872441aadb8b499f59efa0e1e4a6dd6a7135
 DIST regressiontests-2016.tar.gz 66908712 BLAKE2B 3039b5b46bf99dc2e34a61ed0f47f7355087c260bd1accc119f9ed99bb03c4645d05df41e301cfc6a6de6a9a369b2bf4e01a54852100577e40605e091bbe24e8 SHA512 59902c1973c33ea8f003f21a737dc7cc64da3258112322eedc9834b53628134a6817d5ee5b3950c9bfd97a3a0580aef88ddef0609ef2c58693c96c7575651e01
-DIST regressiontests-2018-beta1.tar.gz 67870909 BLAKE2B e9aff43331394c4a50cbc626d0327498f1571cf457e6b924f0cfe8eb688a9cd8d2b66c13c900da8737b124861fb567f9129aff840a294e92233b9a2214ff20d7 SHA512 509175cbbb8528d9bb1394c726c6e89291c2077880a3c4bf99a330ff457ca233ae74e771b8a753b0c94bba8de02840b1e5460b7c226e177742b1dee289833c0f
+DIST regressiontests-2018-beta2.tar.gz 67867984 BLAKE2B d5a68dd30c92d1ccfd08b7074b41771c08e94be9556524bf5c13517711cc74ec945aa8bb167cdc4f954b12ac214f9c24a2935ceed6a92c6ecd2a0d1cc860fb63 SHA512 2dcacf52220972b0eae03da7e917e2e2bc85acc4cc2adcddefbe5d6176d5a5200eb77aeb55df06942fa88078f25f623c7b3c586fde852d6045b9caa0337d802a
 DIST regressiontests-5.0.4.tar.gz 65193251 BLAKE2B c5e5f23adcc2639fe652bc252533307c7fda44453d506603242968bd8588c7394028b2c3c7a9252f807a050d40e8f78735e904dfe517d3db8ae962051f4826c1 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65
 DIST regressiontests-5.1.3.tar.gz 66994083 BLAKE2B 7009f65ad0138664ac84e57f8bc7cce5d18a59f99943e56b6642583120bfce279e005ac0bacd2db8904ea477a48e2b938c64de46a65fa5d08fce6009d53583c3 SHA512 486e86eb3b75bae822abe82dac4e1098aa13723bd04214021f835a2f0b847303f015a9ececc33aa5ae63d31a2eeae07e512f22464b6c0e26d1286b0781578022

diff --git a/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch b/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch
deleted file mode 100644
index 2ed6a19f31b..00000000000
--- a/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 81e68584512b21ec572d2561c25a1b19982aa0be Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
-Date: Fri, 1 Dec 2017 17:12:36 +0300
-Subject: [PATCH] Fix build with cmake 3.10 on Linux
-
-Without this fix cmake will fail with
-
--- Detecting CXX compiler ABI info - done
--- Detecting CXX compile features
--- Detecting CXX compile features - done
-CMake Error at cmake/gmxCTestUtilities.cmake:56 (file):
-  file STRINGS file
-  "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/DartConfiguration.tcl"
-  cannot be read.
-Call Stack (most recent call first):
-  CMakeLists.txt:89 (gmx_ctest_init)
-
--- Performing Test CXXFLAG_STD_CXX0X
--- Performing Test CXXFLAG_STD_CXX0X - Success
--- Performing Test CXX11_SUPPORTED
--- Performing Test CXX11_SUPPORTED - Success
-....
-....
-....
--- Looking for inttypes.h
--- Looking for inttypes.h - found
--- <<< Gentoo configuration >>>
-Build type      Gentoo
-Install path    /usr
-Compiler flags:
-C                -march=core-avx2   -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2
-C++              -march=core-avx2   -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2 -std=c++11
-Linker flags:
-Executable        -Wl,-O1 -Wl,--as-needed
-Module          -Wl,-O1 -Wl,--as-needed
-Shared            -Wl,-O1 -Wl,--as-needed
-
--- Configuring incomplete, errors occurred!
-See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeOutput.log".
-See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeError.log".
-
-Change-Id: Ie04c2e5f5884f05c3648fed7289157e73fd8d81f
-Signed-off-by: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
----
- cmake/gmxCTestUtilities.cmake | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/gmxCTestUtilities.cmake b/cmake/gmxCTestUtilities.cmake
-index 89715f910..3685df648 100644
---- a/cmake/gmxCTestUtilities.cmake
-+++ b/cmake/gmxCTestUtilities.cmake
-@@ -50,10 +50,12 @@ macro (gmx_ctest_init)
-         set(MEMORYCHECK_TYPE "AddressSanitizer")
-     endif()
-     include(CTest)
--    # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest
--    # does not work without this...
--    set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl")
--    file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ")
-+    if(APPLE)
-+	    # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest
-+	    # does not work without this...
-+	    set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl")
-+	    file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ")
-+    endif()
-     if (NOT _existing)
-         file(APPEND ${_ctest_config_file} "\nCMakeCommand: ${CMAKE_COMMAND}\n")
-     endif()
--- 
-2.15.0
-

diff --git a/sci-chemistry/gromacs/gromacs-2018_beta1.ebuild b/sci-chemistry/gromacs/gromacs-2018_beta2.ebuild
similarity index 99%
rename from sci-chemistry/gromacs/gromacs-2018_beta1.ebuild
rename to sci-chemistry/gromacs/gromacs-2018_beta2.ebuild
index 3e0dd9b80bc..315835fdc60 100644
--- a/sci-chemistry/gromacs/gromacs-2018_beta1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018_beta2.ebuild
@@ -66,10 +66,6 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS README )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2018-fix-build.patch"
-	)
-
 if [[ ${PV} != *9999 ]]; then
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi