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

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

46 files changed, 118 insertions, 118 deletions

diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
index 0c1c41e1a9b5..6f92902e7f16 100644
--- a/kde-apps/akonadi/akonadi-19.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
+		$(cmake_use_find_package xml LibXml2)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/analitza/analitza-19.08.3.ebuild b/kde-apps/analitza/analitza-19.08.3.ebuild
index 0030c9a8bf75..7df385e57cf5 100644
--- a/kde-apps/analitza/analitza-19.08.3.ebuild
+++ b/kde-apps/analitza/analitza-19.08.3.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
+		$(cmake_use_find_package eigen Eigen3)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/ark/ark-19.08.3.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
index fa158209aa3e..18ae6f375bf2 100644
--- a/kde-apps/ark/ark-19.08.3.ebuild
+++ b/kde-apps/ark/ark-19.08.3.ebuild
@@ -55,9 +55,9 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
+		$(cmake_use_find_package bzip2 BZip2)
+		$(cmake_use_find_package lzma LibLZMA)
+		$(cmake_use_find_package zip LibZip)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
index 319f0bacb4c6..82666c261330 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
@@ -39,8 +39,8 @@ PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
+		$(cmake_use_find_package flac FLAC)
+		$(cmake_use_find_package vorbis OggVorbis)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/cantor/cantor-19.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index e246fa0117a6..33ced1b63d6d 100644
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -96,14 +96,14 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs3)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
+		$(cmake_use_find_package analitza Analitza5)
+		$(cmake_use_find_package julia Julia)
+		$(cmake_use_find_package lua LuaJIT)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package python PythonLibs3)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package R R)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/dolphin/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.08.3.ebuild
index f73a18c7931b..8a4b107a6fa6 100644
--- a/kde-apps/dolphin/dolphin-19.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-19.08.3.ebuild
@@ -64,10 +64,10 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/gwenview/gwenview-19.08.3.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
index bf3290636902..c5b0e928a0b1 100644
--- a/kde-apps/gwenview/gwenview-19.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.3.ebuild
@@ -86,12 +86,12 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package X X11)
 	)
 
 	if use semantic-desktop; then
diff --git a/kde-apps/k3b/k3b-19.08.3.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
index 584b48bf6dc8..7f12742964b4 100644
--- a/kde-apps/k3b/k3b-19.08.3.ebuild
+++ b/kde-apps/k3b/k3b-19.08.3.ebuild
@@ -103,7 +103,7 @@ src_configure() {
 		-DK3B_ENABLE_TAGLIB=$(usex taglib)
 		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
 		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kalarm/kalarm-19.08.3.ebuild b/kde-apps/kalarm/kalarm-19.08.3.ebuild
index b7c746cc5a51..4cd97f1b701a 100644
--- a/kde-apps/kalarm/kalarm-19.08.3.ebuild
+++ b/kde-apps/kalarm/kalarm-19.08.3.ebuild
@@ -77,8 +77,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
index 3ee55b2ddf7e..24c67991adbb 100644
--- a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
+		$(cmake_use_find_package readline Readline)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kalzium/kalzium-19.08.3.ebuild b/kde-apps/kalzium/kalzium-19.08.3.ebuild
index 61202b251f36..d449184bd049 100644
--- a/kde-apps/kalzium/kalzium-19.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-19.08.3.ebuild
@@ -52,11 +52,11 @@ src_configure(){
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
+		$(cmake_use_find_package editor Eigen3)
+		$(cmake_use_find_package editor AvogadroLibs)
+		$(cmake_use_find_package editor OpenBabel2)
+		$(cmake_use_find_package solver OCaml)
+		$(cmake_use_find_package solver Libfacile)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kanagram/kanagram-19.08.3.ebuild b/kde-apps/kanagram/kanagram-19.08.3.ebuild
index 44774001c87f..feb5be3ba804 100644
--- a/kde-apps/kanagram/kanagram-19.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-19.08.3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kate/kate-19.08.3.ebuild b/kde-apps/kate/kate-19.08.3.ebuild
index 50f033411a0a..b84ab5c95456 100644
--- a/kde-apps/kate/kate-19.08.3.ebuild
+++ b/kde-apps/kate/kate-19.08.3.ebuild
@@ -69,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_addons=$(usex addons)
 		-DBUILD_kwrite=FALSE
 	)
diff --git a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
index e32cf708c943..1b49405064c9 100644
--- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
@@ -72,10 +72,10 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package v4l LibV4L2)
+		$(cmake_use_find_package freesound Qt5WebKitWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package v4l LibV4L2)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
index 102e1ad40f50..ae559f328b45 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
@@ -76,8 +76,8 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kdialog/kdialog-19.08.3.ebuild b/kde-apps/kdialog/kdialog-19.08.3.ebuild
index 60c1cdb8a556..18487f6d525a 100644
--- a/kde-apps/kdialog/kdialog-19.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-19.08.3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/kget/kget-19.08.3.ebuild b/kde-apps/kget/kget-19.08.3.ebuild
index d9e229bf3684..04358de4be21 100644
--- a/kde-apps/kget/kget-19.08.3.ebuild
+++ b/kde-apps/kget/kget-19.08.3.ebuild
@@ -58,11 +58,11 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package kde LibKWorkspace)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
+		$(cmake_use_find_package bittorrent KF5Torrent)
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package kde LibKWorkspace)
+		$(cmake_use_find_package mms LibMms)
+		$(cmake_use_find_package sqlite Sqlite)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
index a56211843edf..94dd97550a52 100644
--- a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
@@ -69,14 +69,14 @@ PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp libssh)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
index 42f68be24379..774b2986a741 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
@@ -45,10 +45,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		$(cmake-utils_use_find_package remotestorage KF5KIO)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		$(cmake_use_find_package flashexport KF5Archive)
+		$(cmake_use_find_package mediawiki KF5MediaWiki)
+		$(cmake_use_find_package remotestorage KF5KIO)
+		$(cmake_use_find_package vkontakte KF5Vkontakte)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
index 976c60aad071..bf9e81d344db 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
@@ -37,8 +37,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package barcode ZXing)
-		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake_use_find_package barcode ZXing)
+		$(cmake_use_find_package pdf Poppler)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/kmag/kmag-19.08.3.ebuild b/kde-apps/kmag/kmag-19.08.3.ebuild
index d0416181a0db..9f71e566a721 100644
--- a/kde-apps/kmag/kmag-19.08.3.ebuild
+++ b/kde-apps/kmag/kmag-19.08.3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kmix/kmix-19.08.3.ebuild b/kde-apps/kmix/kmix-19.08.3.ebuild
index ac41d89c361f..06539e35dd32 100644
--- a/kde-apps/kmix/kmix-19.08.3.ebuild
+++ b/kde-apps/kmix/kmix-19.08.3.ebuild
@@ -48,9 +48,9 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/knotes/knotes-19.08.3.ebuild b/kde-apps/knotes/knotes-19.08.3.ebuild
index f4ed9fedf665..88db4c65a6c6 100644
--- a/kde-apps/knotes/knotes-19.08.3.ebuild
+++ b/kde-apps/knotes/knotes-19.08.3.ebuild
@@ -68,8 +68,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 # 	local mycmakeargs=(
 # 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
+# 		$(cmake_use_find_package X Qt5X11Extras)
+# 		$(cmake_use_find_package X X11)
 # 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
index 415c5dfa90ee..d36d2ed74b35 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package scanner KF5Sane)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3.ebuild
index 57da29eb84eb..fbf41c362937 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -82,10 +82,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tidy LibTidy)
+		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/konsole/konsole-19.08.3.ebuild b/kde-apps/konsole/konsole-19.08.3.ebuild
index 661c542361cf..4904b5fcf7f1 100644
--- a/kde-apps/konsole/konsole-19.08.3.ebuild
+++ b/kde-apps/konsole/konsole-19.08.3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/korganizer/korganizer-19.08.3.ebuild b/kde-apps/korganizer/korganizer-19.08.3.ebuild
index 00f2f319dcf1..4952e7c638c5 100644
--- a/kde-apps/korganizer/korganizer-19.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-19.08.3.ebuild
@@ -89,7 +89,7 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/krdc/krdc-19.08.3.ebuild b/kde-apps/krdc/krdc-19.08.3.ebuild
index dfa48267080a..4656d5e51080 100644
--- a/kde-apps/krdc/krdc-19.08.3.ebuild
+++ b/kde-apps/krdc/krdc-19.08.3.ebuild
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package vnc LibVNCServer)
+		$(cmake_use_find_package vnc LibVNCServer)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
index fb0eab568011..067909c47a66 100644
--- a/kde-apps/krfb/krfb-19.08.3.ebuild
+++ b/kde-apps/krfb/krfb-19.08.3.ebuild
@@ -49,7 +49,7 @@ PATCHES=( "${FILESDIR}/${P}-portal-support.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland PipeWire)
+		$(cmake_use_find_package wayland PipeWire)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild
index 3af08979d5f1..e5ba0376468b 100644
--- a/kde-apps/kruler/kruler-19.08.3.ebuild
+++ b/kde-apps/kruler/kruler-19.08.3.ebuild
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
index 26df9cdb5167..31a0ab8d2ca2 100644
--- a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake_use_find_package opengl OpenGL)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
index eda448fa7d9f..c87c2792a65d 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
+		$(cmake_use_find_package systemd Journald)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/ktouch/ktouch-19.08.3.ebuild b/kde-apps/ktouch/ktouch-19.08.3.ebuild
index 3b388fd9ed01..08d64688781d 100644
--- a/kde-apps/ktouch/ktouch-19.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-19.08.3.ebuild
@@ -57,8 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DCOMPILE_QML=OFF
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
index 868710153aa8..2893eaeb8bda 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
@@ -60,10 +60,10 @@ PATCHES=( "${FILESDIR}/${P}-telepathy-0.9.8.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
+		$(cmake_use_find_package sso KAccounts)
+		$(cmake_use_find_package sso AccountsQt5)
+		$(cmake_use_find_package otr Libgcrypt)
+		$(cmake_use_find_package otr LibOTR)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
index 12436c5228f8..d1422b7d58f1 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
index c12a1395c993..b2d82770ae26 100644
--- a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
index e8dd9b411f00..451bcb2f6dcd 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake_use_find_package alsa ALSA)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/libkleo/libkleo-19.08.3.ebuild b/kde-apps/libkleo/libkleo-19.08.3.ebuild
index 055a90284b92..dec3f5d07ca7 100644
--- a/kde-apps/libkleo/libkleo-19.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-19.08.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/libksane/libksane-19.08.3.ebuild b/kde-apps/libksane/libksane-19.08.3.ebuild
index a5063c070684..460ccddb20ba 100644
--- a/kde-apps/libksane/libksane-19.08.3.ebuild
+++ b/kde-apps/libksane/libksane-19.08.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package kwallet KF5Wallet)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/marble/marble-19.08.3-r1.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild
index 4932a8f01b41..6df0dd699d31 100644
--- a/kde-apps/marble/marble-19.08.3-r1.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -74,16 +74,16 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package geolocation Qt5Positioning)
+		$(cmake_use_find_package aprs Perl)
+		$(cmake_use_find_package geolocation Qt5Positioning)
 		-DBUILD_MARBLE_TESTS=$(usex test)
 		-DWITH_DESIGNER_PLUGIN=$(usex designer)
 		-DWITH_libgps=$(usex gps)
 		-DWITH_KF5=$(usex kde)
 		-DWITH_Phonon4Qt5=$(usex phonon)
 		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 		-DWITH_libwlocate=OFF
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
@@ -91,6 +91,6 @@ src_configure() {
 	if use kde; then
 		ecm_src_configure
 	else
-		cmake-utils_src_configure
+		cmake_src_configure
 	fi
 }
diff --git a/kde-apps/marble/marble-19.12.0.ebuild b/kde-apps/marble/marble-19.12.0.ebuild
index da6668a7e817..db0d75ca2e0a 100644
--- a/kde-apps/marble/marble-19.12.0.ebuild
+++ b/kde-apps/marble/marble-19.12.0.ebuild
@@ -91,6 +91,6 @@ src_configure() {
 	if use kde; then
 		ecm_src_configure
 	else
-		cmake-utils_src_configure
+		cmake_src_configure
 	fi
 }
diff --git a/kde-apps/okular/okular-19.08.3.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 8856309f0299..0e62728af08e 100644
--- a/kde-apps/okular/okular-19.08.3.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -82,19 +82,19 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package image-backend KF5KExiv2)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
index 4124e27822eb..dc4e3fcc1757 100644
--- a/kde-apps/spectacle/spectacle-19.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-19.08.3.ebuild
@@ -49,8 +49,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package share KF5Purpose)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/step/step-19.08.3.ebuild b/kde-apps/step/step-19.08.3.ebuild
index b2e34d926751..724db3cc44b4 100644
--- a/kde-apps/step/step-19.08.3.ebuild
+++ b/kde-apps/step/step-19.08.3.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package qalculate Qalculate)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
index db2d077bf3c0..7373230f606e 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
@@ -28,8 +28,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package raw KF5KExiv2)
+		$(cmake_use_find_package raw KF5KDcraw)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/yakuake/yakuake-19.08.3.ebuild b/kde-apps/yakuake/yakuake-19.08.3.ebuild
index 46e4d915997b..27032b5cab5c 100644
--- a/kde-apps/yakuake/yakuake-19.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-19.08.3.ebuild
@@ -50,8 +50,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package absolute-position KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package absolute-position KF5Wayland)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure