gentoo resync : 15.01.2020

3 files changed, 14 insertions, 14 deletions

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index fb487b504620..0cb97bb6e00a 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-plugins-2.7.3.ebuild 4351 BLAKE2B 04bdb03c46a5856ff9ba97d71f89c1d6c1caa7387696875169124420e69cb93538791e6249d8e9362f1f84a04d9600e947f430f736bac0bf6889357528d64cc4 SHA512 1b1e071e03002acf313dabfde1da4a367b78892a215ec98f7d8b27e1259870e3ca40748bd7b45c0b51333b3fbe8f1956f77158ca298b5e49542f0f65d11e6edd
-EBUILD avidemux-plugins-2.7.4.ebuild 4267 BLAKE2B 8575dac5383482f1560e627cdef936d1ce34411103adc74b45ae80826bcab3aab782f2540e6f7d1b0571207cbb9c9715f80561abba7a36148c02bf70218eb6f6 SHA512 04c83316ac5252303ff346c150eb3935c753b7827c3d084c0725f3710e1ad0dc22aa2f7a82f54cbf8d88f77083d296c2445bcfc2770729fa81cbeaef8614cfcb
+EBUILD avidemux-plugins-2.7.3.ebuild 4315 BLAKE2B f99b4475f1da295309a43fefb329d2905df5fd1fb77664f6222170eaa7031a2b94ee99df739f10ef6c4b82504614ad1299aee56b01bdbe9b22bd5101f18af08c SHA512 d5c5b70242f63b267c137573388ece2876bbc59dd8024083542b60684c16175feeac6aedb831f2d6abe2d763cd784f6225c75c3f4bc22f29617d5687ab926271
+EBUILD avidemux-plugins-2.7.4.ebuild 4231 BLAKE2B b320b836d0cd9ff80cb622e3f03363a92e8ece3b4cfbdb33fd164b2f04d4c9741729ce6e1d9a1865e84f0152aaed81d6e31e1a6d332f57c8795f5ac5c4faea6d SHA512 ac2b70f9970b557c7d155cb016dc32756d1112575fe6d4b8714e11c9ed38d82f5a1bb7a4fe4ad98f3b9ff3a567746a1895162e9ecb4425a6063d6a4180fcf465
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
index 7345ea0cb705..0650e3a9f4d8 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python{2_7,3_6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	# Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
@@ -91,7 +91,7 @@ src_prepare() {
 	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 }
 
@@ -146,20 +146,20 @@ src_configure() {
 			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 		fi
 
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 }
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
index 2a7b0e7ee510..cad08c9330b6 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python{2_7,3_6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	# Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
@@ -91,7 +91,7 @@ src_prepare() {
 	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 }
 
@@ -142,20 +142,20 @@ src_configure() {
 		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
 		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 }