*/*: cmake-utils_use_find_package -> cmake_use_find_package

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

249 files changed, 673 insertions, 673 deletions

diff --git a/app-editors/kile/kile-9999.ebuild b/app-editors/kile/kile-9999.ebuild
index 438cf9a5b4..10a1e26760 100644
--- a/app-editors/kile/kile-9999.ebuild
+++ b/app-editors/kile/kile-9999.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake_use_find_package pdf Poppler)
 	)
 	ecm_src_configure
 }
diff --git a/app-editors/okteta/okteta-9999.ebuild b/app-editors/okteta/okteta-9999.ebuild
index ab15b79c44..a7c643faad 100644
--- a/app-editors/okteta/okteta-9999.ebuild
+++ b/app-editors/okteta/okteta-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DOMIT_EXAMPLES=ON
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 	)
 
 	ecm_src_configure
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index fb1ef19c30..ee18f07ab8 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -167,12 +167,12 @@ src_configure() {
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
 		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package charts KChart)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake-utils_use_find_package gemini Libgit2)
-		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+		$(cmake_use_find_package gemini Libgit2)
+		$(cmake_use_find_package gemini Qt5QuickWidgets)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)
 		-DWITH_LibOdfGen=$(usex import-filter)
@@ -181,7 +181,7 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package phonon Phonon4Qt5)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
diff --git a/app-office/calligraplan/calligraplan-3.1.90.ebuild b/app-office/calligraplan/calligraplan-3.1.90.ebuild
index 3236423b3a..a2c5e55fc9 100644
--- a/app-office/calligraplan/calligraplan-3.1.90.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.90.ebuild
@@ -78,10 +78,10 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package holidays KF5Holidays)
+		$(cmake_use_find_package kwallet Qca-qt5)
+		$(cmake_use_find_package kwallet KF5Wallet)
 	)
 	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
 
diff --git a/app-office/calligraplan/calligraplan-9999.ebuild b/app-office/calligraplan/calligraplan-9999.ebuild
index 3236423b3a..a2c5e55fc9 100644
--- a/app-office/calligraplan/calligraplan-9999.ebuild
+++ b/app-office/calligraplan/calligraplan-9999.ebuild
@@ -78,10 +78,10 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package holidays KF5Holidays)
+		$(cmake_use_find_package kwallet Qca-qt5)
+		$(cmake_use_find_package kwallet KF5Wallet)
 	)
 	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
 
diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild
index 47ade34fac..95a7f15874 100644
--- a/app-office/kexi/kexi-9999.ebuild
+++ b/app-office/kexi/kexi-9999.ebuild
@@ -79,10 +79,10 @@ src_configure() {
 		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
 		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
 		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
-		$(cmake-utils_use_find_package marble KexiMarble)
-		$(cmake-utils_use_find_package mdb GLIB2)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
+		$(cmake_use_find_package marble KexiMarble)
+		$(cmake_use_find_package mdb GLIB2)
+		$(cmake_use_find_package mysql MySQL)
+		$(cmake_use_find_package postgres PostgreSQL)
 	)
 	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
 
diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
index 75e4c613a1..775c959e97 100644
--- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
@@ -104,17 +104,17 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package addressbook KF5Akonadi)
-		$(cmake-utils_use_find_package addressbook KF5Contacts)
-		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
 		-DENABLE_LIBICAL=$(usex calendar)
 		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
+		$(cmake_use_find_package holidays KF5Holidays)
 		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=$(usex !webkit)
 		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
+		$(cmake_use_find_package weboob PythonLibs)
 	)
 	ecm_src_configure
 }
diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index 7c0b96b91a..781d5dc952 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -103,17 +103,17 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package addressbook KF5Akonadi)
-		$(cmake-utils_use_find_package addressbook KF5Contacts)
-		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
 		-DENABLE_LIBICAL=$(usex calendar)
 		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
+		$(cmake_use_find_package holidays KF5Holidays)
 		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=$(usex !webkit)
 		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
+		$(cmake_use_find_package weboob PythonLibs)
 	)
 	ecm_src_configure
 }
diff --git a/app-office/kraft/kraft-9999.ebuild b/app-office/kraft/kraft-9999.ebuild
index c566080fff..a7002ad4c7 100644
--- a/app-office/kraft/kraft-9999.ebuild
+++ b/app-office/kraft/kraft-9999.ebuild
@@ -44,8 +44,8 @@ DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package pim KF5Akonadi)
-		$(cmake-utils_use_find_package pim KF5AkonadiContact)
+		$(cmake_use_find_package pim KF5Akonadi)
+		$(cmake_use_find_package pim KF5AkonadiContact)
 	)
 
 	ecm_src_configure
diff --git a/app-office/libalkimia/libalkimia-8.0.2.ebuild b/app-office/libalkimia/libalkimia-8.0.2.ebuild
index c9c6034890..449de9b71a 100644
--- a/app-office/libalkimia/libalkimia-8.0.2.ebuild
+++ b/app-office/libalkimia/libalkimia-8.0.2.ebuild
@@ -57,7 +57,7 @@ PATCHES=( "${FILESDIR}/${PN}-8.0.1-cmake.patch" )
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOXYGEN_DOCS=$(usex doc)
-		$(cmake-utils_use_find_package !gmp MPIR)
+		$(cmake_use_find_package !gmp MPIR)
 		-DBUILD_APPLETS=$(usex plasma)
 	)
 	ecm_src_configure
diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild
index b3ca92988e..429b7c2bad 100644
--- a/app-office/libalkimia/libalkimia-9999.ebuild
+++ b/app-office/libalkimia/libalkimia-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOXYGEN_DOCS=$(usex doc)
-		$(cmake-utils_use_find_package !gmp MPIR)
+		$(cmake_use_find_package !gmp MPIR)
 		-DBUILD_APPLETS=$(usex plasma)
 	)
 	ecm_src_configure
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index b7264f9642..913f2d0c35 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -88,9 +88,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
 		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
 		-DSKG_WEBENGINE=$(usex !webkit)
 	)
 
diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild
index 60ff8baeea..37707c5d8e 100644
--- a/app-text/kbibtex/kbibtex-9999.ebuild
+++ b/app-text/kbibtex/kbibtex-9999.ebuild
@@ -62,7 +62,7 @@ S="${WORKDIR}/${P/_/-}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 	)
 
 	ecm_src_configure
diff --git a/dev-db/kdb/kdb-9999.ebuild b/dev-db/kdb/kdb-9999.ebuild
index 7e60c65962..ab1784be3d 100644
--- a/dev-db/kdb/kdb-9999.ebuild
+++ b/dev-db/kdb/kdb-9999.ebuild
@@ -47,9 +47,9 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DKDB_DEBUG_GUI=$(usex debug)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-		$(cmake-utils_use_find_package sqlite Sqlite)
+		$(cmake_use_find_package mysql MySQL)
+		$(cmake_use_find_package postgres PostgreSQL)
+		$(cmake_use_find_package sqlite Sqlite)
 	)
 
 	ecm_src_configure
diff --git a/dev-libs/kreport/kreport-9999.ebuild b/dev-libs/kreport/kreport-9999.ebuild
index 04d2245ae0..2877698d04 100644
--- a/dev-libs/kreport/kreport-9999.ebuild
+++ b/dev-libs/kreport/kreport-9999.ebuild
@@ -47,8 +47,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package marble Marble)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 		-DKREPORT_SCRIPTING=$(usex scripting)
 	)
 	ecm_src_configure
diff --git a/dev-util/kdevelop/kdevelop-5.4.9999.ebuild b/dev-util/kdevelop/kdevelop-5.4.9999.ebuild
index 8467cba142..f4738aa674 100644
--- a/dev-util/kdevelop/kdevelop-5.4.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.9999.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/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 2e500b0905..cc2442847c 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.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-9999.ebuild b/dev-util/massif-visualizer/massif-visualizer-9999.ebuild
index a0787565f8..d82ecb9174 100644
--- a/dev-util/massif-visualizer/massif-visualizer-9999.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
+		$(cmake_use_find_package callgraph KGraphViewerPart)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/akonadi/akonadi-19.11.80.ebuild b/kde-apps/akonadi/akonadi-19.11.80.ebuild
index 765eceb318..886147b825 100644
--- a/kde-apps/akonadi/akonadi-19.11.80.ebuild
+++ b/kde-apps/akonadi/akonadi-19.11.80.ebuild
@@ -101,11 +101,11 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts AccountsQt5)
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
 		-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/akonadi/akonadi-19.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
index 1130c4a8f4..0b331053c3 100644
--- a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
@@ -101,11 +101,11 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts AccountsQt5)
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
 		-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/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 1130c4a8f4..0b331053c3 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -101,11 +101,11 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts AccountsQt5)
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
 		-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.11.80.ebuild b/kde-apps/analitza/analitza-19.11.80.ebuild
index 9c436bc899..8839f1d0f8 100644
--- a/kde-apps/analitza/analitza-19.11.80.ebuild
+++ b/kde-apps/analitza/analitza-19.11.80.ebuild
@@ -41,7 +41,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/analitza/analitza-19.12.49.9999.ebuild b/kde-apps/analitza/analitza-19.12.49.9999.ebuild
index 8deed95347..cae53f050f 100644
--- a/kde-apps/analitza/analitza-19.12.49.9999.ebuild
+++ b/kde-apps/analitza/analitza-19.12.49.9999.ebuild
@@ -41,7 +41,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/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-9999.ebuild
index 8deed95347..cae53f050f 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-9999.ebuild
@@ -41,7 +41,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.11.80.ebuild b/kde-apps/ark/ark-19.11.80.ebuild
index 438afb49af..1c677a7ea9 100644
--- a/kde-apps/ark/ark-19.11.80.ebuild
+++ b/kde-apps/ark/ark-19.11.80.ebuild
@@ -56,9 +56,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/ark/ark-19.12.49.9999.ebuild b/kde-apps/ark/ark-19.12.49.9999.ebuild
index c40062f950..60ade3739b 100644
--- a/kde-apps/ark/ark-19.12.49.9999.ebuild
+++ b/kde-apps/ark/ark-19.12.49.9999.ebuild
@@ -56,9 +56,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/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
index c40062f950..60ade3739b 100644
--- a/kde-apps/ark/ark-9999.ebuild
+++ b/kde-apps/ark/ark-9999.ebuild
@@ -56,9 +56,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.11.80.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.11.80.ebuild
index 1bcab421cc..ed2d17284d 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.11.80.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.11.80.ebuild
@@ -40,8 +40,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/audiocd-kio/audiocd-kio-19.12.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.12.49.9999.ebuild
index 143bbae968..0a82b489f0 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.12.49.9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.12.49.9999.ebuild
@@ -40,8 +40,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/audiocd-kio/audiocd-kio-9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
index 143bbae968..0a82b489f0 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
@@ -40,8 +40,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.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild
index fc86ce1e01..c42d6a84d8 100644
--- a/kde-apps/cantor/cantor-19.11.80.ebuild
+++ b/kde-apps/cantor/cantor-19.11.80.ebuild
@@ -98,14 +98,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/cantor/cantor-19.12.49.9999.ebuild b/kde-apps/cantor/cantor-19.12.49.9999.ebuild
index 365aee8b9e..28e2827ebb 100644
--- a/kde-apps/cantor/cantor-19.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.12.49.9999.ebuild
@@ -98,14 +98,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/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 365aee8b9e..28e2827ebb 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -98,14 +98,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.11.80.ebuild b/kde-apps/dolphin/dolphin-19.11.80.ebuild
index b0b700d313..fcaf127a47 100644
--- a/kde-apps/dolphin/dolphin-19.11.80.ebuild
+++ b/kde-apps/dolphin/dolphin-19.11.80.ebuild
@@ -66,10 +66,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/dolphin/dolphin-19.12.49.9999.ebuild b/kde-apps/dolphin/dolphin-19.12.49.9999.ebuild
index 562251b382..2d6703d857 100644
--- a/kde-apps/dolphin/dolphin-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.49.9999.ebuild
@@ -66,10 +66,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/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
index 562251b382..2d6703d857 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -66,10 +66,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.11.80.ebuild b/kde-apps/gwenview/gwenview-19.11.80.ebuild
index 598db9e814..3a7238a59e 100644
--- a/kde-apps/gwenview/gwenview-19.11.80.ebuild
+++ b/kde-apps/gwenview/gwenview-19.11.80.ebuild
@@ -84,12 +84,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/gwenview/gwenview-19.12.49.9999.ebuild b/kde-apps/gwenview/gwenview-19.12.49.9999.ebuild
index 2c633ddefd..751eca03a6 100644
--- a/kde-apps/gwenview/gwenview-19.12.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-19.12.49.9999.ebuild
@@ -84,12 +84,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/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 2c633ddefd..751eca03a6 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -84,12 +84,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.11.80.ebuild b/kde-apps/k3b/k3b-19.11.80.ebuild
index 9e149dc2f4..7c186a8a0d 100644
--- a/kde-apps/k3b/k3b-19.11.80.ebuild
+++ b/kde-apps/k3b/k3b-19.11.80.ebuild
@@ -104,7 +104,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/k3b/k3b-19.12.49.9999.ebuild b/kde-apps/k3b/k3b-19.12.49.9999.ebuild
index e62657fc86..237b67c913 100644
--- a/kde-apps/k3b/k3b-19.12.49.9999.ebuild
+++ b/kde-apps/k3b/k3b-19.12.49.9999.ebuild
@@ -104,7 +104,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/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
index e62657fc86..237b67c913 100644
--- a/kde-apps/k3b/k3b-9999.ebuild
+++ b/kde-apps/k3b/k3b-9999.ebuild
@@ -104,7 +104,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/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
index 2b36d52745..56434cf58a 100644
--- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
+++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
@@ -40,8 +40,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KF5GAPI)
-		$(cmake-utils_use_find_package google Qt5WebKitWidgets)
+		$(cmake_use_find_package google KF5GAPI)
+		$(cmake_use_find_package google Qt5WebKitWidgets)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kalarm/kalarm-19.11.80.ebuild b/kde-apps/kalarm/kalarm-19.11.80.ebuild
index c5d5ac0576..628eddb564 100644
--- a/kde-apps/kalarm/kalarm-19.11.80.ebuild
+++ b/kde-apps/kalarm/kalarm-19.11.80.ebuild
@@ -78,8 +78,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/kalarm/kalarm-19.12.49.9999.ebuild b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
index 19c25eefca..327cbb98d6 100644
--- a/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
@@ -78,8 +78,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/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
index 19c25eefca..327cbb98d6 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -78,8 +78,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.11.80.ebuild b/kde-apps/kalgebra/kalgebra-19.11.80.ebuild
index 95738b6f0a..1fc078c7a8 100644
--- a/kde-apps/kalgebra/kalgebra-19.11.80.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.11.80.ebuild
@@ -41,7 +41,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/kalgebra/kalgebra-19.12.49.9999.ebuild b/kde-apps/kalgebra/kalgebra-19.12.49.9999.ebuild
index b997a6ef6e..ea32d25e8b 100644
--- a/kde-apps/kalgebra/kalgebra-19.12.49.9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.12.49.9999.ebuild
@@ -41,7 +41,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/kalgebra/kalgebra-9999.ebuild b/kde-apps/kalgebra/kalgebra-9999.ebuild
index b997a6ef6e..ea32d25e8b 100644
--- a/kde-apps/kalgebra/kalgebra-9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-9999.ebuild
@@ -41,7 +41,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.11.80.ebuild b/kde-apps/kalzium/kalzium-19.11.80.ebuild
index 2816eb648f..c081e0d6a7 100644
--- a/kde-apps/kalzium/kalzium-19.11.80.ebuild
+++ b/kde-apps/kalzium/kalzium-19.11.80.ebuild
@@ -53,11 +53,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/kalzium/kalzium-19.12.49.9999.ebuild b/kde-apps/kalzium/kalzium-19.12.49.9999.ebuild
index 6c673fc51e..dab3111e09 100644
--- a/kde-apps/kalzium/kalzium-19.12.49.9999.ebuild
+++ b/kde-apps/kalzium/kalzium-19.12.49.9999.ebuild
@@ -53,11 +53,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/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 6c673fc51e..dab3111e09 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -53,11 +53,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.11.80.ebuild b/kde-apps/kanagram/kanagram-19.11.80.ebuild
index a5d0f87729..a1a4f5088d 100644
--- a/kde-apps/kanagram/kanagram-19.11.80.ebuild
+++ b/kde-apps/kanagram/kanagram-19.11.80.ebuild
@@ -44,7 +44,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/kanagram/kanagram-19.12.49.9999.ebuild b/kde-apps/kanagram/kanagram-19.12.49.9999.ebuild
index 93ea704754..a035516150 100644
--- a/kde-apps/kanagram/kanagram-19.12.49.9999.ebuild
+++ b/kde-apps/kanagram/kanagram-19.12.49.9999.ebuild
@@ -44,7 +44,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/kanagram/kanagram-9999.ebuild b/kde-apps/kanagram/kanagram-9999.ebuild
index 93ea704754..a035516150 100644
--- a/kde-apps/kanagram/kanagram-9999.ebuild
+++ b/kde-apps/kanagram/kanagram-9999.ebuild
@@ -44,7 +44,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.11.80.ebuild b/kde-apps/kate/kate-19.11.80.ebuild
index 2ca18ef81b..568126824f 100644
--- a/kde-apps/kate/kate-19.11.80.ebuild
+++ b/kde-apps/kate/kate-19.11.80.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
 		-DBUILD_sessionapplet=$(usex plasma)
diff --git a/kde-apps/kate/kate-19.12.49.9999.ebuild b/kde-apps/kate/kate-19.12.49.9999.ebuild
index 9258d0d75d..9058d7d462 100644
--- a/kde-apps/kate/kate-19.12.49.9999.ebuild
+++ b/kde-apps/kate/kate-19.12.49.9999.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
 		-DBUILD_sessionapplet=$(usex plasma)
diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index 9258d0d75d..9058d7d462 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
 		-DBUILD_sessionapplet=$(usex plasma)
diff --git a/kde-apps/kdenlive/kdenlive-19.11.80.ebuild b/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
index 6a596dff2e..1725cb5a55 100644
--- a/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.11.80.ebuild
@@ -68,10 +68,10 @@ RDEPEND="${DEPEND}
 
 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/kdenlive/kdenlive-19.12.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-19.12.49.9999.ebuild
index 5180e200af..8dc13b23ca 100644
--- a/kde-apps/kdenlive/kdenlive-19.12.49.9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.12.49.9999.ebuild
@@ -68,10 +68,10 @@ RDEPEND="${DEPEND}
 
 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/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
index 5180e200af..8dc13b23ca 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-9999.ebuild
@@ -68,10 +68,10 @@ RDEPEND="${DEPEND}
 
 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.11.80.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.11.80.ebuild
index e3a5152344..8379da96fd 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.11.80.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.11.80.ebuild
@@ -78,8 +78,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/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
index 4b821ef555..cbe2e1fc39 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
@@ -78,8 +78,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/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index 4b821ef555..cbe2e1fc39 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -78,8 +78,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.11.80.ebuild b/kde-apps/kdialog/kdialog-19.11.80.ebuild
index ce8f960c4e..3fa1eafb05 100644
--- a/kde-apps/kdialog/kdialog-19.11.80.ebuild
+++ b/kde-apps/kdialog/kdialog-19.11.80.ebuild
@@ -36,7 +36,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/kdialog/kdialog-19.12.49.9999.ebuild b/kde-apps/kdialog/kdialog-19.12.49.9999.ebuild
index 4a65750a6f..7f00efcff5 100644
--- a/kde-apps/kdialog/kdialog-19.12.49.9999.ebuild
+++ b/kde-apps/kdialog/kdialog-19.12.49.9999.ebuild
@@ -36,7 +36,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/kdialog/kdialog-9999.ebuild b/kde-apps/kdialog/kdialog-9999.ebuild
index 4a65750a6f..7f00efcff5 100644
--- a/kde-apps/kdialog/kdialog-9999.ebuild
+++ b/kde-apps/kdialog/kdialog-9999.ebuild
@@ -36,7 +36,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.11.80.ebuild b/kde-apps/kget/kget-19.11.80.ebuild
index d0bab6a05a..5b13bf487f 100644
--- a/kde-apps/kget/kget-19.11.80.ebuild
+++ b/kde-apps/kget/kget-19.11.80.ebuild
@@ -59,11 +59,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/kget/kget-19.12.49.9999.ebuild b/kde-apps/kget/kget-19.12.49.9999.ebuild
index dba2df3d49..1629dabc92 100644
--- a/kde-apps/kget/kget-19.12.49.9999.ebuild
+++ b/kde-apps/kget/kget-19.12.49.9999.ebuild
@@ -59,11 +59,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/kget/kget-9999.ebuild b/kde-apps/kget/kget-9999.ebuild
index dba2df3d49..1629dabc92 100644
--- a/kde-apps/kget/kget-9999.ebuild
+++ b/kde-apps/kget/kget-9999.ebuild
@@ -59,11 +59,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/kig/kig-19.11.80.ebuild b/kde-apps/kig/kig-19.11.80.ebuild
index f957079560..c11c582da7 100644
--- a/kde-apps/kig/kig-19.11.80.ebuild
+++ b/kde-apps/kig/kig-19.11.80.ebuild
@@ -60,8 +60,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kig/kig-19.12.49.9999.ebuild b/kde-apps/kig/kig-19.12.49.9999.ebuild
index 854a7ec127..8e72ad5984 100644
--- a/kde-apps/kig/kig-19.12.49.9999.ebuild
+++ b/kde-apps/kig/kig-19.12.49.9999.ebuild
@@ -60,8 +60,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-9999.ebuild
index 854a7ec127..8e72ad5984 100644
--- a/kde-apps/kig/kig-9999.ebuild
+++ b/kde-apps/kig/kig-9999.ebuild
@@ -60,8 +60,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kio-extras/kio-extras-19.11.80.ebuild b/kde-apps/kio-extras/kio-extras-19.11.80.ebuild
index 06ad520c12..8df8a8a4d9 100644
--- a/kde-apps/kio-extras/kio-extras-19.11.80.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.11.80.ebuild
@@ -67,15 +67,15 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package activities KF5ActivitiesStats)
-		$(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 activities KF5ActivitiesStats)
+		$(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/kio-extras/kio-extras-19.12.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-19.12.49.9999.ebuild
index 48525bfbb4..6b35a85fc6 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.49.9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.12.49.9999.ebuild
@@ -67,15 +67,15 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package activities KF5ActivitiesStats)
-		$(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 activities KF5ActivitiesStats)
+		$(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/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
index 48525bfbb4..6b35a85fc6 100644
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
@@ -67,15 +67,15 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package activities KF5ActivitiesStats)
-		$(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 activities KF5ActivitiesStats)
+		$(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.11.80.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.11.80.ebuild
index d40be52895..35fffb4c82 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.11.80.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.11.80.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/kipi-plugins/kipi-plugins-19.12.49.9999.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.12.49.9999.ebuild
index 6812f1b981..63104abace 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.12.49.9999.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.12.49.9999.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/kipi-plugins/kipi-plugins-9999.ebuild b/kde-apps/kipi-plugins/kipi-plugins-9999.ebuild
index 6812f1b981..63104abace 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-9999.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.11.80.ebuild b/kde-apps/kitinerary/kitinerary-19.11.80.ebuild
index 44251c365f..3128df98ef 100644
--- a/kde-apps/kitinerary/kitinerary-19.11.80.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.11.80.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/kitinerary/kitinerary-19.12.49.9999.ebuild b/kde-apps/kitinerary/kitinerary-19.12.49.9999.ebuild
index 3185bd81d2..0c054d4852 100644
--- a/kde-apps/kitinerary/kitinerary-19.12.49.9999.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.12.49.9999.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/kitinerary/kitinerary-9999.ebuild b/kde-apps/kitinerary/kitinerary-9999.ebuild
index 3185bd81d2..0c054d4852 100644
--- a/kde-apps/kitinerary/kitinerary-9999.ebuild
+++ b/kde-apps/kitinerary/kitinerary-9999.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.11.80.ebuild b/kde-apps/kmag/kmag-19.11.80.ebuild
index 85d0cec9ae..b1a403e4f1 100644
--- a/kde-apps/kmag/kmag-19.11.80.ebuild
+++ b/kde-apps/kmag/kmag-19.11.80.ebuild
@@ -33,7 +33,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/kmag/kmag-19.12.49.9999.ebuild b/kde-apps/kmag/kmag-19.12.49.9999.ebuild
index fc1429c3c4..6ba10418c8 100644
--- a/kde-apps/kmag/kmag-19.12.49.9999.ebuild
+++ b/kde-apps/kmag/kmag-19.12.49.9999.ebuild
@@ -33,7 +33,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/kmag/kmag-9999.ebuild b/kde-apps/kmag/kmag-9999.ebuild
index fc1429c3c4..6ba10418c8 100644
--- a/kde-apps/kmag/kmag-9999.ebuild
+++ b/kde-apps/kmag/kmag-9999.ebuild
@@ -33,7 +33,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.11.80.ebuild b/kde-apps/kmix/kmix-19.11.80.ebuild
index f4d02222c5..ce308c8bf7 100644
--- a/kde-apps/kmix/kmix-19.11.80.ebuild
+++ b/kde-apps/kmix/kmix-19.11.80.ebuild
@@ -48,10 +48,10 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kmix/kmix-19.12.49.9999.ebuild b/kde-apps/kmix/kmix-19.12.49.9999.ebuild
index 15eda0a27c..f392cb47b5 100644
--- a/kde-apps/kmix/kmix-19.12.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-19.12.49.9999.ebuild
@@ -48,10 +48,10 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
index 15eda0a27c..f392cb47b5 100644
--- a/kde-apps/kmix/kmix-9999.ebuild
+++ b/kde-apps/kmix/kmix-9999.ebuild
@@ -48,10 +48,10 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/knotes/knotes-19.11.80.ebuild b/kde-apps/knotes/knotes-19.11.80.ebuild
index 837553179a..196c6f314a 100644
--- a/kde-apps/knotes/knotes-19.11.80.ebuild
+++ b/kde-apps/knotes/knotes-19.11.80.ebuild
@@ -69,8 +69,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/knotes/knotes-19.12.49.9999.ebuild b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
index c1a7b6df41..c82e6ec9f6 100644
--- a/kde-apps/knotes/knotes-19.12.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
@@ -69,8 +69,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/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
index c1a7b6df41..c82e6ec9f6 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -69,8 +69,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.11.80.ebuild b/kde-apps/kolourpaint/kolourpaint-19.11.80.ebuild
index fd006f5808..1c557d134b 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.11.80.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.11.80.ebuild
@@ -39,7 +39,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/kolourpaint/kolourpaint-19.12.49.9999.ebuild b/kde-apps/kolourpaint/kolourpaint-19.12.49.9999.ebuild
index a274f27668..fb1744f6c1 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.12.49.9999.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.12.49.9999.ebuild
@@ -39,7 +39,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/kolourpaint/kolourpaint-9999.ebuild b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
index a274f27668..fb1744f6c1 100644
--- a/kde-apps/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
@@ -39,7 +39,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.11.80.ebuild b/kde-apps/konqueror/konqueror-19.11.80.ebuild
index 49316c8e31..5c5b4e8551 100644
--- a/kde-apps/konqueror/konqueror-19.11.80.ebuild
+++ b/kde-apps/konqueror/konqueror-19.11.80.ebuild
@@ -81,10 +81,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/konqueror/konqueror-19.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild
index 3f5cd76081..1d1bbe296a 100644
--- a/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild
@@ -81,10 +81,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/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 3f5cd76081..1d1bbe296a 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -81,10 +81,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.11.80.ebuild b/kde-apps/konsole/konsole-19.11.80.ebuild
index ababd40da7..893e8382e6 100644
--- a/kde-apps/konsole/konsole-19.11.80.ebuild
+++ b/kde-apps/konsole/konsole-19.11.80.ebuild
@@ -55,7 +55,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/konsole/konsole-19.12.49.9999.ebuild b/kde-apps/konsole/konsole-19.12.49.9999.ebuild
index 4784a5e8dd..effa9d9053 100644
--- a/kde-apps/konsole/konsole-19.12.49.9999.ebuild
+++ b/kde-apps/konsole/konsole-19.12.49.9999.ebuild
@@ -55,7 +55,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/konsole/konsole-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild
index 4784a5e8dd..effa9d9053 100644
--- a/kde-apps/konsole/konsole-9999.ebuild
+++ b/kde-apps/konsole/konsole-9999.ebuild
@@ -55,7 +55,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/kopete/kopete-19.11.80.ebuild b/kde-apps/kopete/kopete-19.11.80.ebuild
index c9586933d9..47cfeec26e 100644
--- a/kde-apps/kopete/kopete-19.11.80.ebuild
+++ b/kde-apps/kopete/kopete-19.11.80.ebuild
@@ -144,9 +144,9 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
+		$(cmake_use_find_package jingle LiboRTP)
+		$(cmake_use_find_package jingle Mediastreamer)
+		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
diff --git a/kde-apps/kopete/kopete-19.12.49.9999.ebuild b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
index 9120d5be6f..4efd83c910 100644
--- a/kde-apps/kopete/kopete-19.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
@@ -144,9 +144,9 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
+		$(cmake_use_find_package jingle LiboRTP)
+		$(cmake_use_find_package jingle Mediastreamer)
+		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 9120d5be6f..4efd83c910 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -144,9 +144,9 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
+		$(cmake_use_find_package jingle LiboRTP)
+		$(cmake_use_find_package jingle Mediastreamer)
+		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
diff --git a/kde-apps/korganizer/korganizer-19.11.80.ebuild b/kde-apps/korganizer/korganizer-19.11.80.ebuild
index 4afb973a90..f468538cce 100644
--- a/kde-apps/korganizer/korganizer-19.11.80.ebuild
+++ b/kde-apps/korganizer/korganizer-19.11.80.ebuild
@@ -90,7 +90,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/korganizer/korganizer-19.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
index 7211ad5309..637f1189d7 100644
--- a/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
@@ -90,7 +90,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/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index 7211ad5309..637f1189d7 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -90,7 +90,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.11.80.ebuild b/kde-apps/krdc/krdc-19.11.80.ebuild
index aa4f3d69c5..a88b6829c5 100644
--- a/kde-apps/krdc/krdc-19.11.80.ebuild
+++ b/kde-apps/krdc/krdc-19.11.80.ebuild
@@ -45,7 +45,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/krdc/krdc-19.12.49.9999.ebuild b/kde-apps/krdc/krdc-19.12.49.9999.ebuild
index d71cda5a4b..2f54782fdc 100644
--- a/kde-apps/krdc/krdc-19.12.49.9999.ebuild
+++ b/kde-apps/krdc/krdc-19.12.49.9999.ebuild
@@ -45,7 +45,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/krdc/krdc-9999.ebuild b/kde-apps/krdc/krdc-9999.ebuild
index d71cda5a4b..2f54782fdc 100644
--- a/kde-apps/krdc/krdc-9999.ebuild
+++ b/kde-apps/krdc/krdc-9999.ebuild
@@ -45,7 +45,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.11.80.ebuild b/kde-apps/krfb/krfb-19.11.80.ebuild
index 707edee72e..2500ae4ba7 100644
--- a/kde-apps/krfb/krfb-19.11.80.ebuild
+++ b/kde-apps/krfb/krfb-19.11.80.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${DEPEND}
 
 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/krfb/krfb-19.12.49.9999.ebuild b/kde-apps/krfb/krfb-19.12.49.9999.ebuild
index 522ccb7b7a..24520393cc 100644
--- a/kde-apps/krfb/krfb-19.12.49.9999.ebuild
+++ b/kde-apps/krfb/krfb-19.12.49.9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${DEPEND}
 
 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/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild
index 522ccb7b7a..24520393cc 100644
--- a/kde-apps/krfb/krfb-9999.ebuild
+++ b/kde-apps/krfb/krfb-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${DEPEND}
 
 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.11.80.ebuild b/kde-apps/kruler/kruler-19.11.80.ebuild
index f1e0c279c5..2b6cc09da8 100644
--- a/kde-apps/kruler/kruler-19.11.80.ebuild
+++ b/kde-apps/kruler/kruler-19.11.80.ebuild
@@ -36,7 +36,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/kruler/kruler-19.12.49.9999.ebuild b/kde-apps/kruler/kruler-19.12.49.9999.ebuild
index d32d99857a..87bb1b0c0f 100644
--- a/kde-apps/kruler/kruler-19.12.49.9999.ebuild
+++ b/kde-apps/kruler/kruler-19.12.49.9999.ebuild
@@ -36,7 +36,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/kruler/kruler-9999.ebuild b/kde-apps/kruler/kruler-9999.ebuild
index d32d99857a..87bb1b0c0f 100644
--- a/kde-apps/kruler/kruler-9999.ebuild
+++ b/kde-apps/kruler/kruler-9999.ebuild
@@ -36,7 +36,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/ksudoku/ksudoku-19.11.80.ebuild b/kde-apps/ksudoku/ksudoku-19.11.80.ebuild
index b1a4eee7f1..7e170b6290 100644
--- a/kde-apps/ksudoku/ksudoku-19.11.80.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.11.80.ebuild
@@ -46,7 +46,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/ksudoku/ksudoku-19.12.49.9999.ebuild b/kde-apps/ksudoku/ksudoku-19.12.49.9999.ebuild
index 394df68c81..ae3e21769a 100644
--- a/kde-apps/ksudoku/ksudoku-19.12.49.9999.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.12.49.9999.ebuild
@@ -46,7 +46,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/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild
index 394df68c81..ae3e21769a 100644
--- a/kde-apps/ksudoku/ksudoku-9999.ebuild
+++ b/kde-apps/ksudoku/ksudoku-9999.ebuild
@@ -46,7 +46,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.11.80.ebuild b/kde-apps/ksystemlog/ksystemlog-19.11.80.ebuild
index 343ba56cc8..3ecf0122a7 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.11.80.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.11.80.ebuild
@@ -60,7 +60,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/ksystemlog/ksystemlog-19.12.49.9999.ebuild b/kde-apps/ksystemlog/ksystemlog-19.12.49.9999.ebuild
index fa5a605a5c..e84f8d40c5 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.12.49.9999.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.12.49.9999.ebuild
@@ -60,7 +60,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/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
index fa5a605a5c..e84f8d40c5 100644
--- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
@@ -60,7 +60,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.11.80.ebuild b/kde-apps/ktouch/ktouch-19.11.80.ebuild
index 759c9caf50..ae683a1376 100644
--- a/kde-apps/ktouch/ktouch-19.11.80.ebuild
+++ b/kde-apps/ktouch/ktouch-19.11.80.ebuild
@@ -58,8 +58,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/ktouch/ktouch-19.12.49.9999.ebuild b/kde-apps/ktouch/ktouch-19.12.49.9999.ebuild
index ef85d10986..250fcd347d 100644
--- a/kde-apps/ktouch/ktouch-19.12.49.9999.ebuild
+++ b/kde-apps/ktouch/ktouch-19.12.49.9999.ebuild
@@ -58,8 +58,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/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild
index ef85d10986..250fcd347d 100644
--- a/kde-apps/ktouch/ktouch-9999.ebuild
+++ b/kde-apps/ktouch/ktouch-9999.ebuild
@@ -58,8 +58,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.11.80.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.11.80.ebuild
index 1bd73ca70b..e144961314 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.11.80.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.11.80.ebuild
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 
 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-common-internals/ktp-common-internals-19.12.49.9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.49.9999.ebuild
index f017b4998a..c8a49b5d05 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.49.9999.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.49.9999.ebuild
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 
 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-common-internals/ktp-common-internals-9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
index f017b4998a..c8a49b5d05 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 
 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.11.80.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.11.80.ebuild
index ffdb9e8dab..60e81a319c 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.11.80.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.11.80.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/ktp-text-ui/ktp-text-ui-19.12.49.9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.49.9999.ebuild
index c7cf69c63a..85115b9722 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.12.49.9999.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.49.9999.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/ktp-text-ui/ktp-text-ui-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
index c7cf69c63a..85115b9722 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-9999.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/kwrite/kwrite-19.11.80.ebuild b/kde-apps/kwrite/kwrite-19.11.80.ebuild
index a52c8c8522..0862c397eb 100644
--- a/kde-apps/kwrite/kwrite-19.11.80.ebuild
+++ b/kde-apps/kwrite/kwrite-19.11.80.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_addons=FALSE
 		-DBUILD_kate=FALSE
 	)
diff --git a/kde-apps/kwrite/kwrite-19.12.49.9999.ebuild b/kde-apps/kwrite/kwrite-19.12.49.9999.ebuild
index 415a72c179..b3d81fca55 100644
--- a/kde-apps/kwrite/kwrite-19.12.49.9999.ebuild
+++ b/kde-apps/kwrite/kwrite-19.12.49.9999.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_addons=FALSE
 		-DBUILD_kate=FALSE
 	)
diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild
index 415a72c179..b3d81fca55 100644
--- a/kde-apps/kwrite/kwrite-9999.ebuild
+++ b/kde-apps/kwrite/kwrite-9999.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_addons=FALSE
 		-DBUILD_kate=FALSE
 	)
diff --git a/kde-apps/libkcddb/libkcddb-19.11.80.ebuild b/kde-apps/libkcddb/libkcddb-19.11.80.ebuild
index 85df52c92e..0c1219553b 100644
--- a/kde-apps/libkcddb/libkcddb-19.11.80.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.11.80.ebuild
@@ -47,7 +47,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/libkcddb/libkcddb-19.12.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-19.12.49.9999.ebuild
index 1b41affc38..b340886cc0 100644
--- a/kde-apps/libkcddb/libkcddb-19.12.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.12.49.9999.ebuild
@@ -47,7 +47,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/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 1b41affc38..b340886cc0 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -47,7 +47,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.11.80.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.11.80.ebuild
index 539666114c..5e0aaa85ed 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.11.80.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.11.80.ebuild
@@ -26,7 +26,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/libkcompactdisc/libkcompactdisc-19.12.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.49.9999.ebuild
index de2b82eacf..1359c6684f 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.12.49.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.49.9999.ebuild
@@ -26,7 +26,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/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index de2b82eacf..1359c6684f 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -26,7 +26,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.11.80.ebuild b/kde-apps/libkleo/libkleo-19.11.80.ebuild
index 6b9e092f79..8d6efd0726 100644
--- a/kde-apps/libkleo/libkleo-19.11.80.ebuild
+++ b/kde-apps/libkleo/libkleo-19.11.80.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
 	)
 
 	cmake-utils_src_configure
diff --git a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
index fcd8b3c01d..629eb7f4ed 100644
--- a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
+++ b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
 	)
 
 	cmake-utils_src_configure
diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild
index fcd8b3c01d..629eb7f4ed 100644
--- a/kde-apps/libkleo/libkleo-9999.ebuild
+++ b/kde-apps/libkleo/libkleo-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
 	)
 
 	cmake-utils_src_configure
diff --git a/kde-apps/libksane/libksane-19.11.80.ebuild b/kde-apps/libksane/libksane-19.11.80.ebuild
index 82bf868468..735e0e7e88 100644
--- a/kde-apps/libksane/libksane-19.11.80.ebuild
+++ b/kde-apps/libksane/libksane-19.11.80.ebuild
@@ -27,7 +27,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/libksane/libksane-19.12.49.9999.ebuild b/kde-apps/libksane/libksane-19.12.49.9999.ebuild
index 8b3a013369..47ffeab435 100644
--- a/kde-apps/libksane/libksane-19.12.49.9999.ebuild
+++ b/kde-apps/libksane/libksane-19.12.49.9999.ebuild
@@ -27,7 +27,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/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild
index 8b3a013369..47ffeab435 100644
--- a/kde-apps/libksane/libksane-9999.ebuild
+++ b/kde-apps/libksane/libksane-9999.ebuild
@@ -27,7 +27,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.11.80.ebuild b/kde-apps/marble/marble-19.11.80.ebuild
index a5a3f4c0ac..da6668a7e8 100644
--- a/kde-apps/marble/marble-19.11.80.ebuild
+++ b/kde-apps/marble/marble-19.11.80.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"
diff --git a/kde-apps/marble/marble-19.12.49.9999.ebuild b/kde-apps/marble/marble-19.12.49.9999.ebuild
index 0dfe132cb9..7b6beffb75 100644
--- a/kde-apps/marble/marble-19.12.49.9999.ebuild
+++ b/kde-apps/marble/marble-19.12.49.9999.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"
diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index 0dfe132cb9..7b6beffb75 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.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"
diff --git a/kde-apps/okular/okular-19.11.80.ebuild b/kde-apps/okular/okular-19.11.80.ebuild
index 54a525ea26..c4bf77aa9c 100644
--- a/kde-apps/okular/okular-19.11.80.ebuild
+++ b/kde-apps/okular/okular-19.11.80.ebuild
@@ -83,19 +83,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/okular/okular-19.12.49.9999.ebuild b/kde-apps/okular/okular-19.12.49.9999.ebuild
index 7e527dfd80..805a923329 100644
--- a/kde-apps/okular/okular-19.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-19.12.49.9999.ebuild
@@ -83,19 +83,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/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 7e527dfd80..805a923329 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -83,19 +83,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.11.80.ebuild b/kde-apps/spectacle/spectacle-19.11.80.ebuild
index bf9c5ce405..d625a8158e 100644
--- a/kde-apps/spectacle/spectacle-19.11.80.ebuild
+++ b/kde-apps/spectacle/spectacle-19.11.80.ebuild
@@ -51,8 +51,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/spectacle/spectacle-19.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-19.12.49.9999.ebuild
index 2ea59172ac..895c380889 100644
--- a/kde-apps/spectacle/spectacle-19.12.49.9999.ebuild
+++ b/kde-apps/spectacle/spectacle-19.12.49.9999.ebuild
@@ -51,8 +51,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/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild
index 2ea59172ac..895c380889 100644
--- a/kde-apps/spectacle/spectacle-9999.ebuild
+++ b/kde-apps/spectacle/spectacle-9999.ebuild
@@ -51,8 +51,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.11.80.ebuild b/kde-apps/step/step-19.11.80.ebuild
index eac3cac72e..72b0da08fe 100644
--- a/kde-apps/step/step-19.11.80.ebuild
+++ b/kde-apps/step/step-19.11.80.ebuild
@@ -58,8 +58,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/step/step-19.12.49.9999.ebuild b/kde-apps/step/step-19.12.49.9999.ebuild
index 6157404f10..9fe316ad04 100644
--- a/kde-apps/step/step-19.12.49.9999.ebuild
+++ b/kde-apps/step/step-19.12.49.9999.ebuild
@@ -58,8 +58,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/step/step-9999.ebuild b/kde-apps/step/step-9999.ebuild
index 6157404f10..9fe316ad04 100644
--- a/kde-apps/step/step-9999.ebuild
+++ b/kde-apps/step/step-9999.ebuild
@@ -58,8 +58,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.11.80.ebuild b/kde-apps/thumbnailers/thumbnailers-19.11.80.ebuild
index 3d7af01b9e..580410f92a 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.11.80.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.11.80.ebuild
@@ -29,8 +29,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/thumbnailers/thumbnailers-19.12.49.9999.ebuild b/kde-apps/thumbnailers/thumbnailers-19.12.49.9999.ebuild
index c1d5178a35..eb831c5802 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.12.49.9999.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.12.49.9999.ebuild
@@ -29,8 +29,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/thumbnailers/thumbnailers-9999.ebuild b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
index c1d5178a35..eb831c5802 100644
--- a/kde-apps/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
@@ -29,8 +29,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.11.80.ebuild b/kde-apps/yakuake/yakuake-19.11.80.ebuild
index c372724de4..b3195f489a 100644
--- a/kde-apps/yakuake/yakuake-19.11.80.ebuild
+++ b/kde-apps/yakuake/yakuake-19.11.80.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
diff --git a/kde-apps/yakuake/yakuake-19.12.49.9999.ebuild b/kde-apps/yakuake/yakuake-19.12.49.9999.ebuild
index 0414236b93..bfe120b26d 100644
--- a/kde-apps/yakuake/yakuake-19.12.49.9999.ebuild
+++ b/kde-apps/yakuake/yakuake-19.12.49.9999.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
diff --git a/kde-apps/yakuake/yakuake-9999.ebuild b/kde-apps/yakuake/yakuake-9999.ebuild
index 0414236b93..bfe120b26d 100644
--- a/kde-apps/yakuake/yakuake-9999.ebuild
+++ b/kde-apps/yakuake/yakuake-9999.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
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index b5801ca000..f02ccb678b 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package appstream packagekitqt5)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package appstream packagekitqt5)
+		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/karchive/karchive-9999.ebuild b/kde-frameworks/karchive/karchive-9999.ebuild
index 92296f3d7b..77e09ff76c 100644
--- a/kde-frameworks/karchive/karchive-9999.ebuild
+++ b/kde-frameworks/karchive/karchive-9999.ebuild
@@ -19,8 +19,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake_use_find_package bzip2 BZip2)
+		$(cmake_use_find_package lzma LibLZMA)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kauth/kauth-9999.ebuild b/kde-frameworks/kauth/kauth-9999.ebuild
index 8b5dddf69b..407a0035d1 100644
--- a/kde-frameworks/kauth/kauth-9999.ebuild
+++ b/kde-frameworks/kauth/kauth-9999.ebuild
@@ -28,7 +28,7 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+		$(cmake_use_find_package policykit PolkitQt5-1)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
index 08d76577eb..ed921451a7 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
index 7c386b6a36..17bee9ef07 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
+		$(cmake_use_find_package fam FAM)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
index d024381c9a..599ba3d812 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kded/kded-9999.ebuild b/kde-frameworks/kded/kded-9999.ebuild
index 65fd0cb9ef..74d60b89c1 100644
--- a/kde-frameworks/kded/kded-9999.ebuild
+++ b/kde-frameworks/kded/kded-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 873bb4581e..5b5d8faa89 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kdesu/kdesu-9999.ebuild b/kde-frameworks/kdesu/kdesu-9999.ebuild
index b7008c0d92..ad5aac77a7 100644
--- a/kde-frameworks/kdesu/kdesu-9999.ebuild
+++ b/kde-frameworks/kdesu/kdesu-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kdnssd/kdnssd-9999.ebuild b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
index c5407108e1..a194a6b0c1 100644
--- a/kde-frameworks/kdnssd/kdnssd-9999.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake-utils_use_find_package zeroconf Avahi)
+		$(cmake_use_find_package zeroconf Avahi)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kdoctools/kdoctools-9999.ebuild b/kde-frameworks/kdoctools/kdoctools-9999.ebuild
index 41bf4c9458..15f40b473f 100644
--- a/kde-frameworks/kdoctools/kdoctools-9999.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-9999.ebuild
@@ -31,7 +31,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package nls KF5I18n)
+		$(cmake_use_find_package nls KF5I18n)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index 69d180092e..3a23565500 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -43,12 +43,12 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif LibExiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild
index 83a28f6d6e..ff1bda4adf 100644
--- a/kde-frameworks/khtml/khtml-9999.ebuild
+++ b/kde-frameworks/khtml/khtml-9999.ebuild
@@ -65,7 +65,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kidletime/kidletime-9999.ebuild b/kde-frameworks/kidletime/kidletime-9999.ebuild
index 35e2f491f6..91ea64b104 100644
--- a/kde-frameworks/kidletime/kidletime-9999.ebuild
+++ b/kde-frameworks/kidletime/kidletime-9999.ebuild
@@ -39,8 +39,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
index 95dad24205..6a10caea40 100644
--- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
@@ -29,8 +29,8 @@ DOCS=( src/imageformats/AUTHORS )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package eps Qt5PrintSupport)
+		$(cmake_use_find_package openexr OpenEXR)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kinit/kinit-9999.ebuild b/kde-frameworks/kinit/kinit-9999.ebuild
index c6030685aa..6e739405ce 100644
--- a/kde-frameworks/kinit/kinit-9999.ebuild
+++ b/kde-frameworks/kinit/kinit-9999.ebuild
@@ -39,10 +39,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-		$(cmake-utils_use_find_package man KF5DocTools)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index a927a86938..5e8fc32b56 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -72,11 +72,11 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
index cc826a2698..b585e074d1 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package qml Qt5Qml)
+		$(cmake_use_find_package qml Qt5Qml)
 	)
 	ecm_src_configure
 }
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
index 06e2b7cd81..203fec0251 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/knotifications/knotifications-9999.ebuild b/kde-frameworks/knotifications/knotifications-9999.ebuild
index ba48de689c..4809b7c395 100644
--- a/kde-frameworks/knotifications/knotifications-9999.ebuild
+++ b/kde-frameworks/knotifications/knotifications-9999.ebuild
@@ -40,10 +40,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package !phonon Canberra)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package !phonon Canberra)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kpackage/kpackage-9999.ebuild b/kde-frameworks/kpackage/kpackage-9999.ebuild
index 3462cb6816..9636049254 100644
--- a/kde-frameworks/kpackage/kpackage-9999.ebuild
+++ b/kde-frameworks/kpackage/kpackage-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild
index c8dbc71368..810487fe06 100644
--- a/kde-frameworks/kservice/kservice-9999.ebuild
+++ b/kde-frameworks/kservice/kservice-9999.ebuild
@@ -36,7 +36,7 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
index 337c2b364f..fdab9c6fbb 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
@@ -50,8 +50,8 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
+		$(cmake_use_find_package editorconfig EditorConfig)
+		$(cmake_use_find_package git LibGit2)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
index 67ab356629..56d36a36b8 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
@@ -33,7 +33,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-frameworks/kwallet/kwallet-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild
index bc839a1bb5..d82232c973 100644
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
@@ -35,8 +35,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
index 4f648a23c6..933e5f755a 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
@@ -36,7 +36,7 @@ DOCS=( docs/README.kstartupinfo )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
index f0134f8014..f42c446a84 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
+		$(cmake_use_find_package attica KF5Attica)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild
index aa2428d7a0..6027397c90 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -63,11 +63,11 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package !gles2 OpenGL)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package !gles2 OpenGL)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/prison/prison-9999.ebuild b/kde-frameworks/prison/prison-9999.ebuild
index f9671a6980..9c47b1d7f5 100644
--- a/kde-frameworks/prison/prison-9999.ebuild
+++ b/kde-frameworks/prison/prison-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package qml Qt5Quick)
+		$(cmake_use_find_package qml Qt5Quick)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild
index ef6702aa29..6f4795f2b7 100644
--- a/kde-frameworks/purpose/purpose-9999.ebuild
+++ b/kde-frameworks/purpose/purpose-9999.ebuild
@@ -35,7 +35,7 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts KAccounts)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/sonnet/sonnet-9999.ebuild b/kde-frameworks/sonnet/sonnet-9999.ebuild
index 61c74789ac..adcad96d3e 100644
--- a/kde-frameworks/sonnet/sonnet-9999.ebuild
+++ b/kde-frameworks/sonnet/sonnet-9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell ASPELL)
-		$(cmake-utils_use_find_package hunspell HUNSPELL)
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
 	)
 
 	ecm_src_configure
diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index 40ca7d9d79..6d6d23bbdf 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -71,12 +71,12 @@ src_configure() {
 	local mycmakeargs=(
 		-DEXPERIMENTALAPP_ENABLED=$(usex app)
 		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package mousepad LibFakeKey)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pulseaudio KF5PulseAudioQt)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package mousepad LibFakeKey)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
 		-DSMSAPP_ENABLED=$(usex sms)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 
 	ecm_src_configure
diff --git a/kde-misc/kimtoy/kimtoy-9999.ebuild b/kde-misc/kimtoy/kimtoy-9999.ebuild
index 8c28415c5c..bb6b0021c9 100644
--- a/kde-misc/kimtoy/kimtoy-9999.ebuild
+++ b/kde-misc/kimtoy/kimtoy-9999.ebuild
@@ -61,9 +61,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package scim DBusCXX)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package scim DBusCXX)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
 
 	ecm_src_configure
diff --git a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
index c6605a101a..63c98e069f 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
@@ -41,7 +41,7 @@ DOCS=( README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts KAccounts)
 	)
 	ecm_src_configure
 }
diff --git a/kde-misc/krename/krename-9999.ebuild b/kde-misc/krename/krename-9999.ebuild
index 43357aa582..4be72a5bfc 100644
--- a/kde-misc/krename/krename-9999.ebuild
+++ b/kde-misc/krename/krename-9999.ebuild
@@ -45,11 +45,11 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf PoDoFo)
-		$(cmake-utils_use_find_package taglib Taglib)
-		$(cmake-utils_use_find_package truetype Freetype)
+		$(cmake_use_find_package exif Exiv2)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf PoDoFo)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package truetype Freetype)
 	)
 
 	ecm_src_configure
diff --git a/kde-misc/tellico/tellico-9999.ebuild b/kde-misc/tellico/tellico-9999.ebuild
index 5070732abf..e7f810df4d 100644
--- a/kde-misc/tellico/tellico-9999.ebuild
+++ b/kde-misc/tellico/tellico-9999.ebuild
@@ -74,15 +74,15 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package cddb KF5Cddb)
+		$(cmake_use_find_package discid CDIO)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package taglib Taglib)
 		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/breeze/breeze-5.17.49.9999.ebuild b/kde-plasma/breeze/breeze-5.17.49.9999.ebuild
index 395224882f..e5be67721f 100644
--- a/kde-plasma/breeze/breeze-5.17.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.17.49.9999.ebuild
@@ -48,8 +48,8 @@ PDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X XCB)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
index fcc9f29c3b..31849053fc 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -49,8 +49,8 @@ PDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X XCB)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 07239913c6..ef752c9673 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
 		-DBUILD_FlatpakBackend=OFF
-		$(cmake-utils_use_find_package feedback KUserFeedback)
+		$(cmake_use_find_package feedback KUserFeedback)
 		-DBUILD_FwupdBackend=$(usex firmware)
 	)
 
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.49.9999.ebuild
index 46f7a7b90c..ceff09232c 100644
--- a/kde-plasma/drkonqi/drkonqi-5.17.49.9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.17.49.9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index e6d2a2b1a1..8f94f9f4c4 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.49.9999.ebuild
index 14833f450b..1a6f4039be 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.49.9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.49.9999.ebuild
@@ -56,8 +56,8 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index e0217e06bc..8505740ffe 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -57,8 +57,8 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.49.9999.ebuild
index 81f045100c..71d0dec72d 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.49.9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.49.9999.ebuild
@@ -53,8 +53,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 08da299a4d..2949fc094b 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -54,8 +54,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
index f105e60520..00218fc34f 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
@@ -64,16 +64,16 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 
 	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+		mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
 	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
 	fi
 
 	ecm_src_configure
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index e36732344e..c034fafb6a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -65,16 +65,16 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 
 	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+		mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
 	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
 	fi
 
 	ecm_src_configure
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.49.9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.49.9999.ebuild
index 5482fc34bf..8577edbe54 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.17.49.9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.17.49.9999.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+		$(cmake_use_find_package hotkeys KHotKeysDBusInterface)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
index 44df56bc92..9bd48f3142 100644
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+		$(cmake_use_find_package hotkeys KHotKeysDBusInterface)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.49.9999.ebuild
index e97a238ccd..e9221a29e5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.49.9999.ebuild
@@ -78,10 +78,10 @@ src_test() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package consolekit loginctl)
+		$(cmake_use_find_package consolekit loginctl)
 		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
+		$(cmake_use_find_package pam PAM)
+		$(cmake_use_find_package seccomp Seccomp)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index 57401bec0b..9fbd39c1e4 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -79,10 +79,10 @@ src_test() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package consolekit loginctl)
+		$(cmake_use_find_package consolekit loginctl)
 		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
+		$(cmake_use_find_package pam PAM)
+		$(cmake_use_find_package seccomp Seccomp)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.49.9999.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.49.9999.ebuild
index ee598a8cdf..025ea2a66a 100644
--- a/kde-plasma/ksysguard/ksysguard-5.17.49.9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.17.49.9999.ebuild
@@ -47,8 +47,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps libpcap)
-		$(cmake-utils_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package caps libpcap)
+		$(cmake_use_find_package lm-sensors Sensors)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index eb5c38e573..482bb47849 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -47,8 +47,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps libpcap)
-		$(cmake-utils_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package caps libpcap)
+		$(cmake_use_find_package lm-sensors Sensors)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kwin/kwin-5.17.49.9999.ebuild b/kde-plasma/kwin/kwin-5.17.49.9999.ebuild
index 8072d53d22..7af1f04614 100644
--- a/kde-plasma/kwin/kwin-5.17.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.17.49.9999.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake_use_find_package caps Libcap)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index f46a10187a..66605b10e8 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -103,7 +103,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake_use_find_package caps Libcap)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.49.9999.ebuild
index 234e772937..e61321f3d4 100644
--- a/kde-plasma/libksysguard/libksysguard-5.17.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.17.49.9999.ebuild
@@ -47,9 +47,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package !minimal KF5Plasma)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index fa8cff15eb..297c53d7d7 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -47,9 +47,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package !minimal KF5Plasma)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/oxygen/oxygen-5.17.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.17.49.9999.ebuild
index 52877ac647..8fdaef0b2d 100644
--- a/kde-plasma/oxygen/oxygen-5.17.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.17.49.9999.ebuild
@@ -47,7 +47,7 @@ PDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
index d91aff65da..06c6083acd 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -48,7 +48,7 @@ PDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.49.9999.ebuild
index 25ad857d73..5be3a1cba9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.49.9999.ebuild
@@ -117,13 +117,13 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package mouse Evdev)
+		$(cmake_use_find_package mouse XorgLibinput)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package touchpad Synaptics)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index c5ab77ca13..19dc8c7fc2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -118,13 +118,13 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package mouse Evdev)
+		$(cmake_use_find_package mouse XorgLibinput)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package touchpad Synaptics)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.49.9999.ebuild
index 761d6aa466..2b4cd62127 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.49.9999.ebuild
@@ -60,8 +60,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_use_find_package openconnect OpenConnect)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index 26378e3f0f..a59e5adbb1 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -61,8 +61,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_use_find_package openconnect OpenConnect)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.49.9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.49.9999.ebuild
index fca5ad4d96..ad2c59ca60 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.49.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
index c5985281fd..1f3659208d 100644
--- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
index 067f98d509..88f5a6d01f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
@@ -148,15 +148,15 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package qrcode KF5Prison)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package qrcode KF5Prison)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+	use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
 
 	ecm_src_configure
 }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 50cf5b65b4..36645faf8e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -145,16 +145,16 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package feedback KUserFeedback)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package qrcode KF5Prison)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package feedback KUserFeedback)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package qrcode KF5Prison)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+	use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
 
 	ecm_src_configure
 }
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.49.9999.ebuild
index 730262459a..7a99aa6b3d 100644
--- a/kde-plasma/powerdevil/powerdevil-5.17.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.17.49.9999.ebuild
@@ -58,8 +58,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index fa1781a5b6..d697c1d856 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -59,8 +59,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.49.9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.49.9999.ebuild
index e0cb5e0cca..d7b134821b 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.49.9999.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.49.9999.ebuild
@@ -40,9 +40,9 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package screencast PipeWire)
-		$(cmake-utils_use_find_package screencast GBM)
-		$(cmake-utils_use_find_package screencast Epoxy)
+		$(cmake_use_find_package screencast PipeWire)
+		$(cmake_use_find_package screencast GBM)
+		$(cmake_use_find_package screencast Epoxy)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
index a42421d69e..0d3db94ffb 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
@@ -45,9 +45,9 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package screencast PipeWire)
-		$(cmake-utils_use_find_package screencast GBM)
-		$(cmake-utils_use_find_package screencast Epoxy)
+		$(cmake_use_find_package screencast PipeWire)
+		$(cmake_use_find_package screencast GBM)
+		$(cmake_use_find_package screencast Epoxy)
 	)
 	ecm_src_configure
 }
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 4323ddcfbc..8ee402c197 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -126,23 +126,23 @@ src_configure() {
 		-DENABLE_APPSTYLES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package calendar KF5CalendarCore)
 		-DENABLE_FACESENGINE_DNN=$(usex dnn)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
 		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
+		$(cmake_use_find_package mediaplayer QtAV)
 		-DENABLE_MYSQLSUPPORT=$(usex mysql)
 		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF5ThreadWeaver)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package vkontakte KF5Vkontakte)
 		-DENABLE_QWEBENGINE=$(usex !webkit)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
index 48d162604f..1361c8c233 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
@@ -57,10 +57,10 @@ DOCS=( ChangeLog README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package map KF5KGeoMap)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package map KF5KGeoMap)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
 	)
 
 	ecm_src_configure
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index fd93648acb..70cf75cfdc 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -96,18 +96,18 @@ src_configure() {
 	addpredict /dev/dri
 
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
 	)
 
 	ecm_src_configure
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index fba9826e01..6eafe15644 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -94,11 +94,11 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
 		-DWITH_MYSQL_EMBEDDED=OFF
 		-DWITH_IPOD=$(usex ipod)
-		$(cmake-utils_use_find_package lastfm LibLastFm)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package ofa LibOFA)
-		$(cmake-utils_use_find_package podcast Mygpo-qt5)
-		$(cmake-utils_use_find_package wikipedia Qt5WebEngine)
+		$(cmake_use_find_package lastfm LibLastFm)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package ofa LibOFA)
+		$(cmake_use_find_package podcast Mygpo-qt5)
+		$(cmake_use_find_package wikipedia Qt5WebEngine)
 	)
 
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
diff --git a/media-sound/elisa/elisa-19.11.80.ebuild b/media-sound/elisa/elisa-19.11.80.ebuild
index e6c01aeaf6..2b4cc81229 100644
--- a/media-sound/elisa/elisa-19.11.80.ebuild
+++ b/media-sound/elisa/elisa-19.11.80.ebuild
@@ -54,9 +54,9 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package vlc LIBVLC)
+		$(cmake_use_find_package mpris KF5DBusAddons)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package vlc LIBVLC)
 	)
 
 	ecm_src_configure
diff --git a/media-sound/elisa/elisa-9999.ebuild b/media-sound/elisa/elisa-9999.ebuild
index 8d2e7a87e9..a95595fe9f 100644
--- a/media-sound/elisa/elisa-9999.ebuild
+++ b/media-sound/elisa/elisa-9999.ebuild
@@ -53,9 +53,9 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package vlc LIBVLC)
+		$(cmake_use_find_package mpris KF5DBusAddons)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package vlc LIBVLC)
 	)
 
 	ecm_src_configure
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index fbaf70989a..2265459f08 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 	# tools working on $HOME directory for a local git checkout
 	local mycmakeargs=(
 		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
+		$(cmake_use_find_package dvb Libdvbv5)
 	)
 
 	ecm_src_configure
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-9999.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-9999.ebuild
index 16e09dc861..af88c0dac8 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-9999.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 
 	ecm_src_configure
diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
index c71b4676b9..c21a01d7c3 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
@@ -57,11 +57,11 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-		$(cmake-utils_use_find_package gstreamer GStreamer)
-		$(cmake-utils_use_find_package mpv MPV)
-		$(cmake-utils_use_find_package unicode ICU)
-		$(cmake-utils_use_find_package xine Xine)
-		$(cmake-utils_use_find_package xine X11)
+		$(cmake_use_find_package gstreamer GStreamer)
+		$(cmake_use_find_package mpv MPV)
+		$(cmake_use_find_package unicode ICU)
+		$(cmake_use_find_package xine Xine)
+		$(cmake_use_find_package xine X11)
 	)
 
 	ecm_src_configure
diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild
index 3a63d8b166..2868eced77 100644
--- a/net-im/choqok/choqok-9999.ebuild
+++ b/net-im/choqok/choqok-9999.ebuild
@@ -60,10 +60,10 @@ DOCS=( AUTHORS README TODO changelog )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-		$(cmake-utils_use_find_package konqueror KF5Parts)
-		$(cmake-utils_use_find_package konqueror KF5WebKit)
-		$(cmake-utils_use_find_package telepathy TelepathyQt5)
+		$(cmake_use_find_package attica KF5Attica)
+		$(cmake_use_find_package konqueror KF5Parts)
+		$(cmake_use_find_package konqueror KF5WebKit)
+		$(cmake_use_find_package telepathy TelepathyQt5)
 	)
 
 	ecm_src_configure
diff --git a/net-irc/konversation/konversation-2.9999.ebuild b/net-irc/konversation/konversation-2.9999.ebuild
index 1aeb2078e9..7b38bab6e1 100644
--- a/net-irc/konversation/konversation-2.9999.ebuild
+++ b/net-irc/konversation/konversation-2.9999.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 	)
 
 	ecm_src_configure
diff --git a/net-irc/konversation/konversation-9999.ebuild b/net-irc/konversation/konversation-9999.ebuild
index 61055170de..51eacfafd0 100644
--- a/net-irc/konversation/konversation-9999.ebuild
+++ b/net-irc/konversation/konversation-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 	)
 
 	ecm_src_configure
diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild
index d20671d1a0..cabbf7edae 100644
--- a/net-p2p/ktorrent/ktorrent-9999.ebuild
+++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
@@ -90,7 +90,7 @@ src_configure() {
 		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
 		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake-utils_use_find_package rss KF5Syndication)
+		$(cmake_use_find_package rss KF5Syndication)
 		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
 		-DENABLE_SEARCH_PLUGIN=$(usex search)
 		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
diff --git a/sci-astronomy/kstars/kstars-9999.ebuild b/sci-astronomy/kstars/kstars-9999.ebuild
index 32ceb4a34a..5f83cad39e 100644
--- a/sci-astronomy/kstars/kstars-9999.ebuild
+++ b/sci-astronomy/kstars/kstars-9999.ebuild
@@ -71,11 +71,11 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
 	)
 
 	ecm_src_configure
diff --git a/www-client/falkon/falkon-9999.ebuild b/www-client/falkon/falkon-9999.ebuild
index ac245bef15..fbbe8fdc58 100644
--- a/www-client/falkon/falkon-9999.ebuild
+++ b/www-client/falkon/falkon-9999.ebuild
@@ -63,8 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake-utils_use_find_package kde KF5Wallet)
-		$(cmake-utils_use_find_package kde KF5KIO)
+		$(cmake_use_find_package kde KF5Wallet)
+		$(cmake_use_find_package kde KF5KIO)
 		-DNO_X11=$(usex !X)
 	)
 	ecm_src_configure