*/*: Switch kde proj packages to cmake.eclass

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

7 files changed, 36 insertions, 36 deletions

diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
index f5cd867cd909..d3f38a652bb6 100644
--- a/dev-util/clazy/clazy-1.5-r1.ebuild
+++ b/dev-util/clazy/clazy-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -39,11 +39,11 @@ src_configure() {
 	# bug #681568
 	local clang_version=$(best_version sys-devel/clang)
 	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }
diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.5.ebuild
index 7bf24b0ba071..ba0428212c7a 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 62c8b00e4ae6..529cc0a350ef 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -135,7 +135,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 83e33d005103..ee04242b9117 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -134,7 +134,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/cmake/cmake-3.16.2-r1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild
index e7600adaecc4..f2216b9a5c2d 100644
--- a/dev-util/cmake/cmake-3.16.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.16.2-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
+CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg cmake-utils
+	toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -125,7 +125,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -164,15 +164,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -181,7 +181,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
index 8467cba14272..f4738aa67429 100644
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index bf0964314b2a..adcfcea9c50d 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -40,7 +40,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
+		$(cmake_use_find_package callgraph KGraphViewerPart)
 	)
 	kde5_src_configure
 }