gentoo resync : 29.12.2022

4 files changed, 11 insertions, 23 deletions

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index b4691cbc22b5..91e54a22fe57 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -2,7 +2,7 @@ AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
 DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0 SHA512 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
 DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633 SHA512 db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2
-EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a
-EBUILD ceres-solver-2.0.0.ebuild 2523 BLAKE2B 612e60be06848882934d58436bb24e1724da33d5ab37e8cd4a84368d7d98b5bff771118ca0074953630c48ea16614e29d712c2241d045129504b92578c45693f SHA512 78e483b58fb4c50415d493c73bfcf7f985f529be1a6af42fdff80b2f1d1d5a4d97d172486adb6200dcca5a6f2097bcf4d790e4e3b65c708689b22e9df96cf94d
-EBUILD ceres-solver-2.1.0.ebuild 2514 BLAKE2B 061072dda3c15e4805fb89894f3ba646e585c207985a2bfcc807a3bf9a981a75cc08a8b8c10e366fff8ac20f5e1b60d60b535179661c162b2c09c531c7878e79 SHA512 a2a2bd7026b2bace2841347d1aa211a2b4e56c6e9a21c85f208a9db34944d43bebeb2fa576a177f9fb26d069d4a16e19c2e0fd3f8e67a12e363cd0c58ce57286
+EBUILD ceres-solver-1.14.0.ebuild 2300 BLAKE2B 7b66db1e8ce10a0ffc54be552a17339f25b288e38def04063433fa0b754e23986fec29772ff90e0995d0dcfee33f32f9ccdef7c440b191d356222e48d7ec1751 SHA512 b05c82fcc33211187f507c10dec920bdcf89708227eeed3527457d186fae733c62e731bafc45c362f4b6d93449464724e9768766f20b29e1c6f6b1a2fc57ed72
+EBUILD ceres-solver-2.0.0.ebuild 2433 BLAKE2B 206bccb082e0fe7b7e9d184d3ec9db640b5d1c1444e1878e1df6f9beab5632d46dc04a27f682e971abb7fa6f7b2c7302b71cf4d1d5cb0778382043bf929884ed SHA512 050ea90c7031b9b652960f9c52693e0b93d280732309ad5b8801aa031b31d174e523e2117ea4da3fb25d3530ee31ea390cb6edd47fe52bdf909907752f9cec3c
+EBUILD ceres-solver-2.1.0.ebuild 2424 BLAKE2B 2922f15b0e58ad23bdb9e0b49cc88c97dd93d04d1e4b4a58c05eb5d48c803abdffc885c589e065fe62e3fb9f74149557b6a559873b764176120984566a0828ec SHA512 c1b506b60bf16063e66ee1117345459bca8450e2ad856c4130f34ccceb37624aeeb5388303be01fa43cdf1bd185afffd6da82221a5d593e2266f13e1e5957c86
 MISC metadata.xml 1452 BLAKE2B d754f2990a415da369d9e41a0a1b6f7634b3bb51629d8169d74fd9122030b1ceebfc4a69cdc015ba7a4ef2565f6c36ec218fd5df4c5a45c25fe8802c5c17fc3c SHA512 ebe2f54e01d3a1230e2ed3ca59502571b0d596349126e9b69d06787f85465d66a989b7a430b22c62d5176bb197151e3c59c22b22fb55d87dd3daa53a6a420cbd
diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 4bd35e1b7fc8..67f410873961 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.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
@@ -48,15 +48,11 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md VERSION )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
index 8ed07b8f792e..66ffb261da7c 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.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
@@ -48,15 +48,11 @@ DOCS=( README.md VERSION )
 PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
index 92fefb044a1a..fa2a76ca48ac 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -48,15 +48,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }