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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08BB8158091 for ; Sat, 14 May 2022 21:30:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F756E0963; Sat, 14 May 2022 21:30:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id D948CE095E for ; Sat, 14 May 2022 21:30:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 363AF341B92 for ; Sat, 14 May 2022 21:30:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6108448C for ; Sat, 14 May 2022 21:30:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1652563819.2761842aa02a4b9f086aa967463d1112f50c2a26.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gromacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild sci-chemistry/gromacs/gromacs-2020.7.ebuild sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild sci-chemistry/gromacs/gromacs-2021.5.ebuild sci-chemistry/gromacs/gromacs-2021.9999.ebuild sci-chemistry/gromacs/gromacs-2022.1.ebuild sci-chemistry/gromacs/gromacs-2022.9999.ebuild sci-chemistry/gromacs/gromacs-2022.ebuild sci-chemistry/gromacs/gromacs-9999.ebuild X-VCS-Directories: sci-chemistry/gromacs/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 2761842aa02a4b9f086aa967463d1112f50c2a26 X-VCS-Branch: master Date: Sat, 14 May 2022 21:30:37 +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: 20c98e8b-5a3b-499a-b49a-73a679c921cb X-Archives-Hash: 528b21adfd0942b8cf1e23d02d54d562 commit: 2761842aa02a4b9f086aa967463d1112f50c2a26 Author: David Seifert gentoo org> AuthorDate: Sat May 14 21:30:19 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 14 21:30:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2761842a sci-chemistry/gromacs: [QA] tc-has-openmp → tc-check-openmp Signed-off-by: David Seifert gentoo.org> sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild | 8 +++++--- sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild | 8 +++++--- sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild | 8 +++++--- sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2020.7.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2021.5.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2021.9999.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2022.1.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2022.9999.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-2022.ebuild | 5 ++--- sci-chemistry/gromacs/gromacs-9999.ebuild | 5 ++--- 12 files changed, 33 insertions(+), 36 deletions(-) diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild index 4423a8eed2ad..fb79ed729b5a 100644 --- a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild @@ -58,9 +58,11 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${PN}-${PV/_/-}" pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild index cacbc3eef174..b04308aaa907 100644 --- a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild @@ -61,9 +61,11 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${PN}-${PV/_/-}" pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild index b01b57f54196..71a5399a8a70 100644 --- a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild +++ b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild @@ -63,9 +63,11 @@ S="${WORKDIR}/${PN}-${PV/_/-}" PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { diff --git a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild index cd8f59f82ed7..3d38fc4523bb 100644 --- a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild @@ -90,12 +90,11 @@ fi PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" ) pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild index b5211f6374ac..2e38306eb66f 100644 --- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.7.ebuild @@ -90,12 +90,11 @@ fi PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" ) pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild index 9ebdeb01146c..1ea7d0f255b7 100644 --- a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild @@ -90,12 +90,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2021.5.ebuild b/sci-chemistry/gromacs/gromacs-2021.5.ebuild index abf5ed8ec5ef..b797cea596be 100644 --- a/sci-chemistry/gromacs/gromacs-2021.5.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.5.ebuild @@ -90,12 +90,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild index d9c7e8a5269e..8e32fc1644e1 100644 --- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild @@ -88,12 +88,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2022.1.ebuild b/sci-chemistry/gromacs/gromacs-2022.1.ebuild index 338c03cc2a11..80afa36142da 100644 --- a/sci-chemistry/gromacs/gromacs-2022.1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2022.1.ebuild @@ -87,12 +87,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild index 655c647a73dd..101a76d94cf9 100644 --- a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild @@ -85,12 +85,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-2022.ebuild b/sci-chemistry/gromacs/gromacs-2022.ebuild index 338c03cc2a11..80afa36142da 100644 --- a/sci-chemistry/gromacs/gromacs-2022.ebuild +++ b/sci-chemistry/gromacs/gromacs-2022.ebuild @@ -87,12 +87,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup } diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index 655c647a73dd..101a76d94cf9 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -85,12 +85,11 @@ if [[ ${PV} != *9999 ]]; then fi pkg_pretend() { - [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" - use openmp && ! tc-has-openmp && \ - die "Please switch to an openmp compatible compiler" + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup }