gentoo resync : 29.12.2022

4 files changed, 23 insertions, 10 deletions

diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 0bf09530fe11..b62415d9c3a9 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,7 +1,7 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.8.10.tar.gz 5086191 BLAKE2B b40de665718dc1cee8a7246ccfb9b8496bdfa0754408f0260421352f1b4776133047ed1a5e8e0f044bdc15dde63a9f7d9ea1721773f36ecdccce3a8575493772 SHA512 8755011b1305b571d6bef7b6200e01bb56dbadce3f67de022fae0ef42c69c095b1f7cd2a2a432282098277ee39aa17caeffda15c806b28a6060a737930d5b82c
 DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c
-EBUILD normaliz-3.1.3-r1.ebuild 1662 BLAKE2B d819f3709adb1af4b60efaab9c122158e49a3b6dffc418ab2a2d35655b95bf3a6e0421bdc57ec8ad9a957a59ef3a217dab725bfb8441ec46a71c2a8d4720b382 SHA512 4f19213464518951abec233ba53ac2f5a60d683ffa59a7fc81bdeece1361182f2d7cd0f517ec259c3b130776eb9acdd200d01fe8de9b59fc4945bec75e319ed5
-EBUILD normaliz-3.8.10-r1.ebuild 1129 BLAKE2B c10dec79da1c8199c49ca50ce4bb23c2c3c9460fbc412da1aca8055e79a4931787d8511a71c27c39beb1b4b9504a116ffc55790f6b0eac84b37c4a6335df5f2d SHA512 92e2cab1733ff1a5d7d301ed488b8fa4b92cf4a5ecb5c6cc1cda0dad3f1a0ddd1e867e615f1b781e7782fb549acb9e44dc75ceda70636e05731f455921d5ffba
-EBUILD normaliz-3.9.3.ebuild 1485 BLAKE2B 86345d201f397916cc0e6afebc84a2dd64b283e5fcb7b3ef4e9217a20331217c684674f630b6ac5499d484c2c998dbb95e995ebd92c14ddcf66777cdc84d1f7a SHA512 96368f73fe01b8969550d5d8f2eb296a68c78cf317a16decc3539a085710cbdfdfc386de04950213c664cd566e48de8001b01f697b4950286043bdd627b0ce82
+EBUILD normaliz-3.1.3-r1.ebuild 1711 BLAKE2B 8f7159ac11a2f308a4cd2a28d6b3df243c8676be084990eff73a5ffbb149d0b8de60f39e7c2b75a5de6bf64ae3de23dcade8d4ce90386ff439896697f2e8cdd7 SHA512 3be22fee4b36bfa98dd5e62ee65961465cec62f245524edfb73eeba7faa5d3fc988523058de8ad282987c42439dcc9df1d0a65728cb7c51cb5da7a9c94ee7793
+EBUILD normaliz-3.8.10-r1.ebuild 1245 BLAKE2B 2cb18e96f5eb8090883093469462bcd56edd5bdeedce9b09cdd81ce28841e60207529876af8876ea4656016f556c35f9a438fde98b5d0c0af49b2ed61d23f238 SHA512 e517bdb1d7feaa45182a0fa8738518214632d400b71d9bc1b50b81731ac8b866d44f7867879b7d58ccb73221e5e96266761042ed20b7d789074f658c8a61f3de
+EBUILD normaliz-3.9.3.ebuild 1601 BLAKE2B 27883f7806c170852b3d7bd61f09849820ab57a76e352dbf2a357bc6c9e352aff2b1585c35cec8866d54dc68d6c66011df3b822931c16bcb98dec787fb7db217 SHA512 0aff7c4a86a9b41f4267e0d854388bb8c82b5b08ad60ee103bb4ae3a8675c810627cc9bb480e2f82084e0fe55b0d17002dcef69723db0a09a98023b344d5d52b
 MISC metadata.xml 823 BLAKE2B e6ac647e395713b5589b2dd6655bdde020fdb4113067f83d503497e0e5ec916b04d2742227ea16f1dda4551c1275b2d0e684e3dab4cb331fc4d42597ea2bc004 SHA512 3f242ea780a29900dfda6b7a0372a87d38ebd11184e1eed976653bc3712e54c2cf5897f07c7f2d0aa50a1af6364fb797c2c4e78cb9c3fa4344370cab4dbe4abb
diff --git a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
index bc18fd6a3868..a2d3890c2854 100644
--- a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,15 +26,20 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MYP}
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	./bootstrap.sh || die
 	default
 }
 
 src_configure() {
-	if use openmp && ! tc-has-openmp ; then
-		die "You requested openmp, but your toolchain does not support it."
-	fi
 	econf $(use_enable openmp)
 }
 
diff --git a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
index 74f541639c16..d696ca7b9817 100644
--- a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,12 @@ DEPEND="
 "
 # Only a boost header is needed -> not RDEPEND
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
index 7b7436eeb4e9..9fa89e9d001b 100644
--- a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
@@ -24,8 +24,12 @@ DEPEND="
 "
 # Only a boost header is needed -> not RDEPEND
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {