From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75D1F158232 for ; Tue, 10 Dec 2024 16:19:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE107E0801; Tue, 10 Dec 2024 16:19:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FC3CE0801 for ; Tue, 10 Dec 2024 16:19:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1621343077 for ; Tue, 10 Dec 2024 16:19:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A092AED for ; Tue, 10 Dec 2024 16:19:42 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1733847578.d6cd065661beb82495f60504b83d6b5ea506cdde.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gromacs/, sci-chemistry/gromacs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/gromacs/files/gromacs-2025.0-beta-fix-man-build.patch sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild X-VCS-Directories: sci-chemistry/gromacs/ sci-chemistry/gromacs/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: d6cd065661beb82495f60504b83d6b5ea506cdde X-VCS-Branch: master Date: Tue, 10 Dec 2024 16:19:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92d3a5b8-624b-44d9-9691-be37f5cac776 X-Archives-Hash: ca45e55876673c2ee544f9a7096c7c90 commit: d6cd065661beb82495f60504b83d6b5ea506cdde Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Dec 10 16:19:07 2024 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Dec 10 16:19:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6cd0656 sci-chemistry/gromacs: Fix man build with upstream patch Signed-off-by: Alexey Shvetsov gentoo.org> .../files/gromacs-2025.0-beta-fix-man-build.patch | 41 ++++++++++++++++++++++ sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild | 11 +++--- 2 files changed, 48 insertions(+), 4 deletions(-) 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 new file mode 100644 index 000000000000..2eb2d45035a2 --- /dev/null +++ b/sci-chemistry/gromacs/files/gromacs-2025.0-beta-fix-man-build.patch @@ -0,0 +1,41 @@ +From 5c9a86c6c6ae3e9202e2feb0e1d33df40818c251 Mon Sep 17 00:00:00 2001 +From: Andrey Alekseenko +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/gromacs-2025.0_beta.ebuild b/sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild index 972995fab90d..275d0db9a29b 100644 --- a/sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild +++ b/sci-chemistry/gromacs/gromacs-2025.0_beta.ebuild @@ -94,7 +94,10 @@ DOCS=( AUTHORS README ) RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}/${PN}-gcc-15.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-gcc-15.patch" + "${FILESDIR}/${PN}-2025.0-beta-fix-man-build.patch" +) if [[ ${PV} != *9999 ]]; then S="${WORKDIR}/${PN}-${PV/_/-}" @@ -241,7 +244,7 @@ src_configure() { -DGMX_USE_HDF5=off -DGMX_HWLOC=$(usex hwloc) -DGMX_DEFAULT_SUFFIX=off - #-DGMX_BUILD_HELP=on + -DGMX_BUILD_HELP=on -DGMX_SIMD="$acce" -DGMX_NNPOT="$nnpot" -DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/" @@ -286,8 +289,8 @@ src_compile() { einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ cmake_src_compile - #BUILD_DIR="${WORKDIR}/${P}_${x}"\ - # cmake_src_compile man + BUILD_DIR="${WORKDIR}/${P}_${x}"\ + cmake_src_compile man if use python; then BUILD_DIR="${WORKDIR}/${P}_${x}"\ cmake_src_compile python_packaging/all