gentoo resync : 15.01.2020

3 files changed, 14 insertions, 14 deletions

diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index b1a48ae79853..7af3df08b809 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,6 +1,6 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
-EBUILD libopenshot-0.2.2.ebuild 2207 BLAKE2B 31c03e9f5cb7e596930bf01efc6c1897b586a355dd1bd516e37872b0b2a37259ed83a4a1b1155e65b620554d1842ea7c71cc1ba223a542dc622c54d2c4ade00b SHA512 fa3c05436c0bbd2949ac11d8e35e763a96693dbb48d352264f5abd71d24ddaadf099b9035b2236471e07418b8533d3ff3bcbea7034660875e0f740b9bb141c69
-EBUILD libopenshot-0.2.4_pre20190609.ebuild 2555 BLAKE2B e2825eb7f984ec6bf15dd7d8b98958c4780593706fdbf911d5c8c74a845ee55531b34b6c13b96cbb0f02ae79113fd5252da15f40deb2fcf1fdd10c5506630e11 SHA512 d350d81af3d099e194c4a70d9e45c6709fc8368fecba0095fc17c035dc19512d0189cf80adb7585b07fbc2ff26e7c91e2cfc44cf6c0d4626f784714f1fa9e6ed
+EBUILD libopenshot-0.2.2.ebuild 2203 BLAKE2B 5df8e0074314e938d24c187b1caa311571e7941db450556363550a42f858eb994e2fcc259f98dbcda49360aa6a244b4e3963a5ae5fad1ee206efb6b727dac6bc SHA512 aa0645ebedd9d4d7e1b81300c9ad39cfcf39277cd7ff9a215204ab0c95e6acd6c9469a4531a3dbb461407e1579941a39248a32c47f3fca01c95ede448494c4ab
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2499 BLAKE2B 197e14dd027fe8b98ed18824e6fdc7b3684327c39a4e9275566e3c569e99415313bd87af1662653f6e7b3394f40846e1a6c04175c1121dec56cfeb4dfa370d19 SHA512 2edc3a1df921921f434aefb3edebc355eb1d54433acef15d8605a77cdd257a5c6977cc565b2137fe944947f5c4044f35ab13717d77ec9d437d912188ad22f296
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index e559f5c2384f..f011d7adca61 100644
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1 toolchain-funcs versionator
 
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
index e0d560596b94..0905430c03b8 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 COMMIT="0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997"
 
@@ -64,7 +64,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# https://github.com/OpenShot/libopenshot/issues/17
 	use test || cmake_comment_add_subdirectory tests
 }
@@ -73,23 +73,23 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RUBY=OFF # TODO: add ruby support
 		-DENABLE_PYTHON=$(usex python)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package imagemagick ImageMagick)
 	)
 	use python && mycmakeargs+=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
+	cmake_src_compile
+	use doc && cmake_build doc
 }
 
 src_test() {
-	cmake-utils_src_make os_test
+	cmake_build os_test
 }
 
 src_install() {
@@ -97,6 +97,6 @@ src_install() {
 	use examples && DOCS+=( src/examples/ )
 	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 }