[gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/, media-libs/taglib/, net-libs/libssh/, x11-themes/oxygen-gtk/, ...

[Andreas Sturmlechner]

commit:     4204aed71ec2d1b2413df056e74191a61c393e53
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 12:57:48 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 13:03:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4204aed7

*/*: Switch kde proj packages using cmake-multilib.eclass to cmake

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmocka/cmocka-1.1.5.ebuild                 | 11 ++++++-----
 media-gfx/exiv2/exiv2-0.27.2.ebuild                 |  7 ++++---
 media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild |  5 +++--
 net-libs/libssh/libssh-0.9.0.ebuild                 | 11 ++++++-----
 net-libs/libssh/libssh-0.9.3.ebuild                 | 11 ++++++-----
 net-libs/libssh/libssh-9999.ebuild                  | 11 ++++++-----
 x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild    |  3 ++-
 x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild    |  3 ++-
 8 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index eecc4f26cc8..1d03a717691 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Unit testing framework for C"
@@ -24,16 +25,16 @@ multilib_src_configure() {
 		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_STATIC_LIB=$(usex static-libs)
 		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+		$(multilib_is_native_abi && cmake_use_find_package doc Doxygen \
 			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
@@ -41,5 +42,5 @@ multilib_src_install() {
 		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }

diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 3d6060c5535..b1ac0f0a6b3 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -11,6 +11,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit cmake-multilib python-any-r1
 
@@ -59,7 +60,7 @@ src_prepare() {
 	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
 	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
 }
@@ -79,11 +80,11 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi; then
 		use doc && eninja doc

diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index 5cac4484ce0..f6f6fbf93eb 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf
 inherit cmake-multilib
 
@@ -35,7 +36,7 @@ MULTILIB_CHOST_TOOLS=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
 		-i CMakeLists.txt \
@@ -48,5 +49,5 @@ multilib_src_configure() {
 		-DBUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index b13f672c484..759da6a2fc0 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -49,7 +50,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -88,16 +89,16 @@ multilib_src_configure() {
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	# compatibility symlink until all consumers have been updated

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild
index 3ead343c58f..c015fb647b0 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -88,16 +89,16 @@ multilib_src_configure() {
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	use static-libs && dolib.a src/libssh.a

diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index e86e51662ed..8ddb3caa00d 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
@@ -88,16 +89,16 @@ multilib_src_configure() {
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	use static-libs && dolib.a src/libssh.a

diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
index 803e8e61400..8f1e41d55b7 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 MY_PN=${PN}3
 MY_P=${MY_PN}-${PV}
 inherit cmake-multilib
@@ -44,7 +45,7 @@ multilib_src_configure() {
 			-DENABLE_DEMO=OFF
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {

diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
index 9b9e4ced8f7..deac2e20f0e 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 MY_PN=${PN}2
 MY_P=${MY_PN}-${PV}
 inherit cmake-multilib
@@ -47,7 +48,7 @@ multilib_src_configure() {
 			-DENABLE_DEMO=OFF
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {