gentoo resync : 29.12.2022

4 files changed, 15 insertions, 42 deletions

diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index c6cd9878359a..4843e9030ab1 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -3,7 +3,7 @@ AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
 DIST libopenshot-0.2.6.tar.gz 22472140 BLAKE2B 7ad35cfb927e637c4ded38de751f3f484ab6f051a2eea15153dcf4a66a378023883e76ffde361725a2285018741765fece01a60443421d95a8a772065d9de199 SHA512 13706733280e8c70638a02ad220e6a84f3d26a5a35f5f8f1b820408236aeda8bd8683e19a85a0d466007a1d711ca31bb436f8d4ca4fb6ffbfe169b2976dea525
 DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
-EBUILD libopenshot-0.2.5-r1.ebuild 2358 BLAKE2B 15048bc7befc3b2a4136af3b87ca1a59fc93f334ac1911c23ca054f523f90cc1fe0e21ec4db0d360f499e1b2b1fbad37345067a4bd1f97b52f75ba9ec5844d99 SHA512 ac7ad11b69bdbef10dc337a3a42a35ba119c289dd54b6a8c906db39cebd5c5458d18a3482e0945d6fa734ebe023a781b578e4ef8065c2f609409bd855dc0e4bf
-EBUILD libopenshot-0.2.6.ebuild 2477 BLAKE2B f2f81ec6736311d9b2e341d5322482cd6809105284cd225efed5fdf370f6afbdb35b771f66be239d13dd4c5e28a8e4c5fdd22e525ff551163ce9a01d0fdab4fb SHA512 2730faadf66448b29c8d999a478d22e5a6607a12d7cc355f0b18103d94f2c55ca678da5c40e7d95e4892403481241adc7d0607f0949c3209373c04123ce26207
-EBUILD libopenshot-0.2.7.ebuild 2477 BLAKE2B 6b4230fa798bfa36133b991138a6abf2dacb8eda02b188a3caac28ec7700954509bd73dafa160afcfae1ec7020091ea8572c5e2deed7782977749402d4e01159 SHA512 39fcaf9394c74b7341ece8ac7d6b158dc65d62eb731903793995990820eebf8b06941b08b862ee27be22828c6d6c05588ccb799250acf1bdc0eab774bf3626bb
+EBUILD libopenshot-0.2.5-r1.ebuild 2093 BLAKE2B ea194e811e7695bb0693dc4d596855b94b31154fa10a262eeb06c09a417dbb6f79485238f2582f0393344aa2c75fa8fa32c15517b6f6b22b9090bbe0ce5d15e4 SHA512 f070385aa981d298dba10ca14a6678c0013661a3033cd263531d8c5d951b57e98fb47e40a2a61b9e703e7fe51bcb198f89a2f3f8556989d152264478aacc38d2
+EBUILD libopenshot-0.2.6.ebuild 2214 BLAKE2B 694dfe6befa9af5cf0be420982e9512cf2f62a024471cd642c33a99082b06aca9e3c7a9a0cfdd37867a9076f2416d1e1f0992d42028c31488a492f68f35ea3f7 SHA512 26518253ebcc9e49eca4fc8f46174470d45cca9e0c86c80c31dd956b3a10c31eff7e96cabc920223e7328eae7af5b7885a599989b6990df55ce603cf40048951
+EBUILD libopenshot-0.2.7.ebuild 2212 BLAKE2B 75671d6c25e690021d655917092217ba6d360302be59b46562c3c389d421db499606497588d42e2f4f9aee046602d788077db752fab813a2a9d3f8b304739073 SHA512 4988fa428973f79badd09b1f86393611765bf2690d97a1c154bbac075542cb8034c0477cfefe7abbb0e0a675eeae7619029f60c5be737f2a5b8515a510b7ad9c
 MISC metadata.xml 616 BLAKE2B de66c4287ffe372cf76e3b48be340b0c981595f2381f8b248de88586cf9cad05b0a9cfc6465b55832db2bc76a5755ad5692494f5f2dc1dc9ee8a569887d50b34 SHA512 b2569b3545ef8a08ae3bc4b1307ee4414c82d488dea41efd4c3c977f2bcde65df273dc8f9aa44ba09abfc3a2fc19c8d83a3dd61faabddabe07bdb8c37f963c46
diff --git a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
index 0ce3d1ebb499..d641166cc5e0 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5-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
@@ -43,21 +43,12 @@ PATCHES=(
 	"${FILESDIR}/${P}-no-hwaccel-testfix.patch"
 )
 
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
 pkg_pretend() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
 
 pkg_setup() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/media-libs/libopenshot/libopenshot-0.2.6.ebuild b/media-libs/libopenshot/libopenshot-0.2.6.ebuild
index af6f8eedbf89..87a124ff09ae 100644
--- a/media-libs/libopenshot/libopenshot-0.2.6.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1 toolchain-funcs
 
@@ -38,21 +38,12 @@ BDEPEND="doc? ( app-doc/doxygen )
 		dev-libs/unittest++
 	)"
 
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
 pkg_pretend() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
 
 pkg_setup() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
index 45cad1c947ad..bd3a3381e83f 100644
--- a/media-libs/libopenshot/libopenshot-0.2.7.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1 toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/21"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples +imagemagick +opencv +python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -38,21 +38,12 @@ BDEPEND="doc? ( app-doc/doxygen )
 		dev-libs/unittest++
 	)"
 
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
 pkg_pretend() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
 
 pkg_setup() {
-	check_compiler
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 	use python && python-single-r1_pkg_setup
 }