commit: 106c4d022efb51015baff60873f5d02149b1e363
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 11:04:11 2025 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 06:36:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106c4d02
sci-chemistry/gromacs: add 2025_rc, drop 2025.0_beta
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
sci-chemistry/gromacs/Manifest | 6 ++--
.../files/gromacs-2025.0-beta-fix-man-build.patch | 41 ----------------------
sci-chemistry/gromacs/files/gromacs-gcc-15.patch | 36 -------------------
...s-2025.0_beta.ebuild => gromacs-2025_rc.ebuild} | 7 +---
4 files changed, 4 insertions(+), 86 deletions(-)
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 24d9338ef70f..2b30108401c1 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,12 +1,12 @@
DIST gromacs-2023.5.tar.gz 42079310 BLAKE2B
e50dbe76396230f4a886280bdebcf7b131506679240e77d2a2263c3b5dbfe7ef754c4265fc04e9acad7932c7691de7f694cc23140a25d0d5be649a4120f45b0c
SHA512
f3a34cf0d379d6d4964d7494af6c6617c0c092293ea38a3a248af2dd2a90cae04696d52e68126176065efc480977942b00efa441028e526e1555c7e84551fc0c
DIST gromacs-2024.3.tar.gz 42373103 BLAKE2B
f45af72ecdf119b423d98b84818eaca1aa2e3f43eaf1aff7435de2a5891079a880f19a654627ee2f43e3a38c9dcfa0638bc6eb6da201b3c9ce89b2dc32fc683b
SHA512
13f23e581c2b63f6262e8359e7bed6a1a5f3164047ea38d2b6a44bcd2b20b61332705167435fe2ad30fe6f24f8ab49b982388550cdecb49167e4156e36286d3d
DIST gromacs-2024.4.tar.gz 42356162 BLAKE2B
3a1019128a2cfd47fb3ab23962a6fcd5bac3b5519d4bfa1239956740226468986ba93e645eb3bc20117968c024823e948fd819a603315399d573275c91c6e51b
SHA512
32a08e9417d4d36a29bdfde4e0448bc136bd3db79b5d5c84fa99d9f022ffca6a94b7bd1c7e7a335430fb6bdcf0181e3cbabeb46d13978c0f87b5d88787ea8d63
-DIST gromacs-2025.0-beta.tar.gz 45067499 BLAKE2B
661607007af6d1f697f5aec72a88cefec5546dee2c0facaf2776354665f56fd71b1a7a2ea92185b4d64e764cd0ac10e865b740dda6d7438318acbbadd1bd7fd0
SHA512
831b4ba2631f5dd65c1b48d4ba0455af0b101af22d8cc78c246e7b36f4ce3c8f33f1cb8d94e42559741dbe1585c75a6e05a2538708d7e57c86ac2174aca302b9
+DIST gromacs-2025-rc.tar.gz 44424653 BLAKE2B
24f3d9ab02320604bb4e99a2bfe409061de92069684cec987355490eeeefd0cee2d665d7d1d4277904bf5025f6c59f0b3de36e6bf61b33f780c2ed2c758f6995
SHA512
0c40ea9b34b3f577ebe3843a65d5d384961224dd179434b98725a4f58190e9d0177b63407d276266a838e39b8d846f461672099787e683d7c8f4ad189cbc5571
DIST manual-2023.5.pdf 13579081 BLAKE2B
42f687ebcdb79bfc77aabac4fd382940c23ba27da380b8eff342c2e9255a58fc11a0458220d1f71f3c13ab1cf6fdabad00ac1bad741781d0b787899165bea2cc
SHA512
0661f166f7a8dc24b4244c0139f366832ddfc1298129df2a6e29800b5d1567318781ab547bc7e9ee54de7a62abba4996f8e3010c91d6917c248117e5711d7dbb
DIST manual-2024.3.pdf 13676383 BLAKE2B
fa5b310ee8977c525781492c70a18d40f8842f5fa43831ad0283c033f39968ba98e74ea618a4a9c25d88c3ed694071327220617b17f316ba2f29777c3edc95ca
SHA512
8dd09913b89213a6673a5f5e3462fb963d1f30d68e0d58b846b7e2cf2f73baacb14fabab6591b680849607f4ca617cf288899729939b2c32021b4ee5ba06835f
DIST manual-2024.4.pdf 13690684 BLAKE2B
7fac46df0da9d4cf7584599c7a71c4e1d11f75fc20a7a19ecc8069fdc2e9e35f0292e389f9c40d69dc96bdfea8d4ee370a54279b5531c0fb37c4cbd76caf7800
SHA512
5c4662527554171774adde5a3de220d775723154914838fd7fc3e40c981e1fccac0fd0def1acc500635cd39269d3bcc2edab5ec7aa85a7ea78350969d72ee13c
-DIST manual-2025.0-beta.pdf 13788093 BLAKE2B
40652f32f35d73964dfb8146b916c0249d8b7044595114986108f209e98e3a0a402ead18842822ce12c9cdd24a224bb95f80fbe5eec908f013b1eddc14d2a2fd
SHA512
eafc1fd060f4a5dd5e7317f0f0fa45cfd5ccc20518a9d67b9055a87c324893d92573dfd416fcbf0fc9b7a932a47e3a592fbc38837bccdd237466bb62cd3ad9ed
+DIST manual-2025-rc.pdf 13789080 BLAKE2B
e60b7199c3b97989210480b5efe1a8c339c2875cb8257d9a9898dd82282a43c9efb0fd6bc0be065df315590d0fe61fbb0869b85e526020795b6e10c6b5eff659
SHA512
20774686f02f2b2eb2e24b11d22c9d17bfe6f41be43474948285ee75778c456429316da1a9bc3bb727555295eeea4963ea49bb968e25df020ba830d304c3e6bb
DIST regressiontests-2023.5.tar.gz 48619605 BLAKE2B
f2549a34750c6866f054614a00a3360a09b82306e6bd5e5b848e18cdd3a3fabaac6203c5ca734901019403225dd47e0d662838abe9a1db7d07662f1c745b8e4f
SHA512
3ccaf9db7dfba641a5e98ebff3d735cae3f679926aba443ffedec20dd6c85e67f0e9711ebad5dfa8105122d5411f5de6ded1802a7da4ddf0599657832c8c597a
DIST regressiontests-2024.3.tar.gz 32776961 BLAKE2B
6a74977a396f8e82f7aba7a384cc840275b86d470597a4bbb93e97f1c13cd8fcf6d86ab26bdd4a89464b863954c9ed7dbd49af095e821573845f7bda43c2b90b
SHA512
1c4afbbca82c9b9ad371713ef5e7e093ca766f25f6fbda55c79ea1aecb2f0a06bdb042d3c8a86e3d9bf9e8b8091244827dbff544f66037ffa56b0bcb341a9d2c
DIST regressiontests-2024.4.tar.gz 32777006 BLAKE2B
41623de750b89410fa0a52037ea28d99a688b602b286cff732a6e8100b2b72072f579fc4f72bfe7c246ca086b6c6c1c10adb89874db6e1c9276494572e408a9f
SHA512
dfbe8ee1b7c5b534842203f2295ea08875df6af3fb94798138b92ab8bc816719e3357db2935d2de4fd798d104ad7cb44860cd65887da7bb2438db422f35e6848
-DIST regressiontests-2025.0-beta.tar.gz 32653220 BLAKE2B
9f7388d7dfc59d89e719d693733f7ff2b3085e9c6b526238f62dc89ba9c30f9c778d99952ca170bf0ffc1d09fff6e4cd1bf1f0dc77c5b45e8613229043ebe409
SHA512
f3786ef08a54cc4a525a8af4ca7276dc6dfb624f13a82b9a9f168253729dd2e7161cecc5540b805bdfdaface8e272cea430bb561d0694970f5a394a718cdd8c3
+DIST regressiontests-2025-rc.tar.gz 32653300 BLAKE2B
6078855a0a2958732338f402fcce7e0cf0d117916930491977f894aa856ae40d968810f94e2f26f658201a8e00d2df782c27b942adab5d84063e4d2ed9dbfd07
SHA512
b9cfceef1495f43aaebc33d612c5c584c60418b2dab15d0ac78c8d5a52258221db7adce708f78bda70c3f9c48b6527777aceee32fafa603a4eca2d99ab166059
diff --git
a/sci-chemistry/gromacs/files/gromacs-2025.0-beta-fix-man-build.patch
b/sci-chemistry/gromacs/files/gromacs-2025.0-beta-fix-man-build.patch
deleted file mode 100644
index 2eb2d45035a2..000000000000
--- a/sci-chemistry/gromacs/files/gromacs-2025.0-beta-fix-man-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5c9a86c6c6ae3e9202e2feb0e1d33df40818c251 Mon Sep 17 00:00:00 2001
-From: Andrey Alekseenko <al42...@gmail.com>
-Date: Tue, 10 Dec 2024 16:21:55 +0100
-Subject: [PATCH] Don't require GMXAPI for building man pages
-
-Refs #4767
-Fixes #5241
----
- docs/conf.cmakein.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/docs/conf.cmakein.py b/docs/conf.cmakein.py
-index 577bcba9bd8..46986adbc07 100644
---- a/docs/conf.cmakein.py
-+++ b/docs/conf.cmakein.py
-@@ -55,7 +55,12 @@ gmxapi_staging_path = "@GMXAPI_PYTHON_STAGING_DIR@"
- if gmxapi_staging_path and os.path.isdir(gmxapi_staging_path):
- sys.path.append(gmxapi_staging_path)
-
--import gmxapi
-+try:
-+ import gmxapi
-+except ImportError:
-+ gmxapi_version_string = "N/A"
-+else:
-+ gmxapi_version_string = gmxapi.__version__
-
- gmx_admin_scripts_path = "@GMX_ADMIN_DIR@"
- gmx_containers_path = "@GMX_ADMIN_DIR@/containers"
-@@ -277,7 +282,7 @@ rst_epilog += """
- .. |thisyear| replace:: {thisyear_string}
- """.format(
- gmx_version_string=gmx_version_string,
-- gmxapi_version_string=gmxapi.__version__,
-+ gmxapi_version_string=gmxapi_version_string,
- regressiontest_version=regressiontest_version,
- thisyear_string=thisyear_string,
- )
---
-GitLab
-
diff --git a/sci-chemistry/gromacs/files/gromacs-gcc-15.patch
b/sci-chemistry/gromacs/files/gromacs-gcc-15.patch
deleted file mode 100644
index 45ac82493bec..000000000000
--- a/sci-chemistry/gromacs/files/gromacs-gcc-15.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9dfaba553cb5aa0c0d689de1555a3bb45ae7dd3a Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexx...@gmail.com>
-Date: Thu, 21 Nov 2024 10:56:17 +0300
-Subject: [PATCH] Fix build with gcc-15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Error is
-energyhistory.h:89:5: error: ‘int64_t’ does not name a type
- 89 | int64_t nsteps; //! The number of steps in the
history
- | ^~~~~~~
-
-Ref: https://bugs.gentoo.org/939006
-
-Signed-off-by: Alexey Shvetsov <alexx...@gmail.com>
----
- src/gromacs/mdtypes/energyhistory.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gromacs/mdtypes/energyhistory.h
b/src/gromacs/mdtypes/energyhistory.h
-index 0c8fecfae7..f80d4c56b9 100644
---- a/src/gromacs/mdtypes/energyhistory.h
-+++ b/src/gromacs/mdtypes/energyhistory.h
-@@ -47,6 +47,8 @@
- #ifndef GMX_MDLIB_ENERGYHISTORY_H
- #define GMX_MDLIB_ENERGYHISTORY_H
-
-+#include <cstdint>
-+
- #include <memory>
- #include <vector>
-
---
-2.45.2
-
diff --git a/sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild
b/sci-chemistry/gromacs/gromacs-2025_rc.ebuild
similarity index 98%
rename from sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild
rename to sci-chemistry/gromacs/gromacs-2025_rc.ebuild
index b3605cdfa525..d0af77e59df9 100644
--- a/sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025_rc.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -103,11 +103,6 @@ DOCS=( AUTHORS README )
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/${PN}-gcc-15.patch"
- "${FILESDIR}/${PN}-2025.0-beta-fix-man-build.patch"
-)
-
if [[ ${PV} != *9999 ]]; then
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
