gentoo resync : 29.12.2022

3 files changed, 22 insertions, 6 deletions

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 3093e4ecc25b..508086d2a0b8 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,6 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r2.ebuild 1732 BLAKE2B d464058bd7678c19da8178af53658ac15eab6f7ee3252b761d49c9586cd25171216ed03cb3d63a1d4047fd744e6e857bf550c7a65a7d6d9647b0410cacdff8a0 SHA512 02f5db2360eb8b48c96f2fd9b5ad5280a117c613071fd8c94ac9ab5914f736df8928c3c24ea5dd258e3fcdf2d8c2c41039cc84ef9ff022957666d2ba1ada9d44
-EBUILD vidstab-9999.ebuild 1488 BLAKE2B b565db3fd850dc761e78713c5b04cfe9d762f81567f9026b4e6a91c695b007432c5a28c030eecbe0128a2924d28a69e059c36dce3daf83af2cc1ef27b5c51187 SHA512 8e4211783d88cbc004babce13cbd41e71ec1105b1151eff03189eab336a3f7406481d19540dee08bd71324adca1e84efbbc3f77591c22de3f2ed4000808119f7
+EBUILD vidstab-1.1.0-r2.ebuild 1866 BLAKE2B 54729dbe330533f432076a764851917aa96d7603f923ec06585b091d5f2b2e5670c39b996c832ddc45ecf9a1007f32b4238a9703a31090de147d61d5366d74d9 SHA512 e8d2e7372a74fa51b6ef70af42df70a567c7148284a681871b0daed6360690564aa71a80b7ab312ff3ef9bd156fbc5a86b230f0b78dd53b5db9b7165fbf4d9cc
+EBUILD vidstab-9999.ebuild 1622 BLAKE2B cd7eef31d047d909afe539bfb5d4addc1023eaff0af40114076b01d47099908d5767850f179f31e5e5632c0f21a8e642728f19f6e5965778e5f859760ea8f799 SHA512 ca8753e33dd9a37c9d7fdbb23ac9d7425fdb68ca694204bda1323b16f064936832b32651b759b8f4a212f8ce48f09d664a2323099fc7e4f1a2cd1ec4408215d9
 MISC metadata.xml 615 BLAKE2B 9260db65c08e6d6284fff960a229259d5d62672b5014697e0503a39f7e48b82955396fec6f608611306b2c586a39532fc61ebde8fe06ad0e9fb8c150f6d914f7 SHA512 8ffb575f589d09954230457a7d7b100a6f5fa9886a0a99bfb6813c0174c74817a3670957b09afedeaf9afe74451e8dd8da55bd1eb6d6fce36c655bce14fb21ac
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index c4c32a5b0db5..10d1d124b60d 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,15 @@ PATCHES=(
 	"${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch"
 	"${FILESDIR}/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch"
 )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead
 	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
@@ -39,7 +48,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use openmp && tc-check-openmp
 	local mycmakeargs=(
 		-DUSE_OMP="$(usex openmp)"
 		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index 780a2a4598a4..09028637d1da 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,15 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="openmp cpu_flags_x86_sse2"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead
 	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
@@ -34,7 +43,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use openmp && tc-check-openmp
 	local mycmakeargs=(
 		-DUSE_OMP="$(usex openmp)"
 		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"