[gentoo-commits] repo/gentoo:master commit in: kde-apps/ktp-text-ui/, kde-frameworks/sonnet/, dev-libs/libdbusmenu-qt/, ...

[Andreas Sturmlechner]

commit:     ce86df7eb9cdd27b8da28b84541ed0894fac4b53
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 11:09:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 13:03:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce86df7e

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

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

 app-crypt/qca/qca-2.2.1.ebuild                     |  8 +++----
 app-editors/okteta/okteta-0.26.2.ebuild            |  2 +-
 app-office/calligraplan/calligraplan-3.2.1.ebuild  |  8 +++----
 app-office/calligraplan/calligraplan-3.2.2.ebuild  |  8 +++----
 app-office/kexi/kexi-3.2.0-r1.ebuild               |  8 +++----
 app-office/kmymoney/kmymoney-5.0.7.ebuild          | 12 +++++-----
 app-office/libalkimia/libalkimia-7.0.2-r1.ebuild   |  4 ++--
 app-office/skrooge/skrooge-2.20.0.ebuild           |  6 ++---
 app-text/kbibtex/kbibtex-0.9.1.ebuild              |  2 +-
 app-text/poppler/poppler-0.82.0.ebuild             | 10 ++++-----
 app-text/poppler/poppler-0.83.0.ebuild             | 10 ++++-----
 app-text/poppler/poppler-0.84.0.ebuild             | 10 ++++-----
 app-text/poppler/poppler-9999.ebuild               | 10 ++++-----
 dev-cpp/rttr/rttr-0.9.6.ebuild                     |  4 ++--
 dev-db/kdb/kdb-3.2.0.ebuild                        |  6 ++---
 .../freecell-solver/freecell-solver-5.14.0.ebuild  |  6 ++---
 dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild     |  4 ++--
 dev-libs/grantlee/grantlee-5.2.0.ebuild            | 12 +++++-----
 dev-libs/kreport/kreport-3.2.0.ebuild              |  4 ++--
 .../libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild     |  4 ++--
 dev-libs/libzip/libzip-1.5.2-r2.ebuild             | 10 ++++-----
 dev-libs/sink/sink-0.8.0-r1.ebuild                 |  4 ++--
 dev-util/clazy/clazy-1.5-r1.ebuild                 |  8 +++----
 dev-util/clazy/clazy-1.5.ebuild                    |  6 ++---
 dev-util/cmake/cmake-3.13.5.ebuild                 | 14 ++++++------
 dev-util/cmake/cmake-3.14.6.ebuild                 | 14 ++++++------
 dev-util/cmake/cmake-3.16.2-r1.ebuild              | 14 ++++++------
 dev-util/kdevelop/kdevelop-5.4.5.ebuild            | 14 ++++++------
 .../massif-visualizer-0.7.0-r1.ebuild              |  2 +-
 kde-apps/akonadi/akonadi-19.08.3.ebuild            |  2 +-
 kde-apps/analitza/analitza-19.08.3.ebuild          |  2 +-
 kde-apps/ark/ark-19.08.3.ebuild                    |  6 ++---
 kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild    |  4 ++--
 kde-apps/cantor/cantor-19.08.3.ebuild              | 16 ++++++-------
 kde-apps/dolphin/dolphin-19.08.3.ebuild            |  8 +++----
 kde-apps/gwenview/gwenview-19.08.3.ebuild          | 12 +++++-----
 kde-apps/k3b/k3b-19.08.3.ebuild                    |  2 +-
 kde-apps/kalarm/kalarm-19.08.3.ebuild              |  4 ++--
 kde-apps/kalgebra/kalgebra-19.08.3.ebuild          |  2 +-
 kde-apps/kalzium/kalzium-19.08.3.ebuild            | 10 ++++-----
 kde-apps/kanagram/kanagram-19.08.3.ebuild          |  2 +-
 kde-apps/kate/kate-19.08.3.ebuild                  |  2 +-
 kde-apps/kdenlive/kdenlive-19.08.3.ebuild          |  8 +++----
 .../kdepim-addons/kdepim-addons-19.08.3.ebuild     |  4 ++--
 kde-apps/kdialog/kdialog-19.08.3.ebuild            |  2 +-
 kde-apps/kget/kget-19.08.3.ebuild                  | 10 ++++-----
 kde-apps/kio-extras/kio-extras-19.08.3.ebuild      | 16 ++++++-------
 kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild  |  8 +++----
 kde-apps/kitinerary/kitinerary-19.08.3.ebuild      |  4 ++--
 kde-apps/kmag/kmag-19.08.3.ebuild                  |  2 +-
 kde-apps/kmix/kmix-19.08.3.ebuild                  |  6 ++---
 kde-apps/knotes/knotes-19.08.3.ebuild              |  4 ++--
 kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild    |  2 +-
 kde-apps/konqueror/konqueror-19.08.3.ebuild        |  8 +++----
 kde-apps/konsole/konsole-19.08.3.ebuild            |  2 +-
 kde-apps/korganizer/korganizer-19.08.3.ebuild      |  2 +-
 kde-apps/krdc/krdc-19.08.3.ebuild                  |  2 +-
 kde-apps/krfb/krfb-19.08.3.ebuild                  |  2 +-
 kde-apps/kruler/kruler-19.08.3.ebuild              |  2 +-
 kde-apps/ksudoku/ksudoku-19.08.3.ebuild            |  2 +-
 kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild      |  2 +-
 kde-apps/ktouch/ktouch-19.08.3.ebuild              |  4 ++--
 .../ktp-common-internals-19.08.3.ebuild            |  8 +++----
 kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild    |  2 +-
 kde-apps/libkcddb/libkcddb-19.08.3.ebuild          |  2 +-
 .../libkcompactdisc/libkcompactdisc-19.08.3.ebuild |  2 +-
 kde-apps/libkleo/libkleo-19.08.3.ebuild            |  2 +-
 kde-apps/libksane/libksane-19.08.3.ebuild          |  2 +-
 kde-apps/marble/marble-19.08.3-r1.ebuild           | 10 ++++-----
 kde-apps/marble/marble-19.12.0.ebuild              |  2 +-
 kde-apps/okular/okular-19.08.3.ebuild              | 26 +++++++++++-----------
 kde-apps/spectacle/spectacle-19.08.3.ebuild        |  4 ++--
 kde-apps/step/step-19.08.3.ebuild                  |  4 ++--
 kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild  |  4 ++--
 kde-apps/yakuake/yakuake-19.08.3.ebuild            |  4 ++--
 .../breeze-icons-rcc-5.64.0.ebuild                 |  6 ++---
 .../breeze-icons-rcc-5.65.0.ebuild                 |  6 ++---
 .../breeze-icons/breeze-icons-5.64.0.ebuild        |  6 ++---
 .../breeze-icons/breeze-icons-5.65.0.ebuild        |  6 ++---
 .../extra-cmake-modules-5.64.0.ebuild              |  8 +++----
 .../extra-cmake-modules-5.65.0.ebuild              |  8 +++----
 .../frameworkintegration-5.64.0.ebuild             |  6 ++---
 kde-frameworks/kapidox/kapidox-5.64.0.ebuild       |  2 +-
 kde-frameworks/kapidox/kapidox-5.65.0.ebuild       |  2 +-
 kde-frameworks/karchive/karchive-5.64.0.ebuild     |  4 ++--
 kde-frameworks/kauth/kauth-5.64.0.ebuild           |  2 +-
 .../kconfigwidgets/kconfigwidgets-5.64.0.ebuild    |  2 +-
 .../kcoreaddons/kcoreaddons-5.64.0.ebuild          |  2 +-
 .../kdbusaddons/kdbusaddons-5.64.0.ebuild          |  2 +-
 kde-frameworks/kded/kded-5.64.0.ebuild             |  2 +-
 .../kdelibs4support/kdelibs4support-5.64.0.ebuild  |  2 +-
 kde-frameworks/kdesu/kdesu-5.64.0.ebuild           |  2 +-
 kde-frameworks/kdnssd/kdnssd-5.64.0.ebuild         |  2 +-
 kde-frameworks/kdoctools/kdoctools-5.64.0.ebuild   |  2 +-
 .../kfilemetadata/kfilemetadata-5.64.0.ebuild      | 12 +++++-----
 kde-frameworks/khtml/khtml-5.64.0.ebuild           |  2 +-
 kde-frameworks/kidletime/kidletime-5.64.0.ebuild   |  4 ++--
 .../kimageformats/kimageformats-5.64.0.ebuild      |  4 ++--
 kde-frameworks/kinit/kinit-5.64.0.ebuild           |  8 +++----
 kde-frameworks/kio/kio-5.64.0.ebuild               | 10 ++++-----
 .../kjobwidgets/kjobwidgets-5.64.0.ebuild          |  2 +-
 .../knotifications/knotifications-5.64.0.ebuild    |  8 +++----
 kde-frameworks/kpackage/kpackage-5.64.0.ebuild     |  2 +-
 kde-frameworks/kservice/kservice-5.64.0.ebuild     |  2 +-
 .../ktexteditor/ktexteditor-5.64.0.ebuild          |  4 ++--
 .../ktextwidgets/ktextwidgets-5.64.0.ebuild        |  2 +-
 kde-frameworks/kwallet/kwallet-5.64.0.ebuild       |  4 ++--
 .../kwindowsystem/kwindowsystem-5.64.0.ebuild      |  2 +-
 kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild       |  2 +-
 .../oxygen-icons/oxygen-icons-5.64.0.ebuild        |  4 ++--
 .../oxygen-icons/oxygen-icons-5.65.0.ebuild        |  4 ++--
 kde-frameworks/plasma/plasma-5.64.0.ebuild         | 10 ++++-----
 kde-frameworks/prison/prison-5.64.0.ebuild         |  2 +-
 kde-frameworks/sonnet/sonnet-5.64.0.ebuild         |  4 ++--
 kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild        |  4 ++--
 kde-misc/kshutdown/kshutdown-5.1_beta.ebuild       |  6 ++---
 kde-misc/tellico/tellico-3.2.3.ebuild              | 16 ++++++-------
 .../breeze-plymouth/breeze-plymouth-5.17.4.ebuild  |  4 ++--
 kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild   |  2 +-
 .../plasma-workspace-wallpapers-5.17.4.ebuild      |  2 +-
 .../xembed-sni-proxy-5.17.4.ebuild                 |  4 ++--
 mail-client/kube/kube-0.7.0-r1.ebuild              |  4 ++--
 mail-client/trojita/trojita-9999.ebuild            |  8 +++----
 media-gfx/digikam/digikam-6.3.0-r1.ebuild          | 26 +++++++++++-----------
 media-gfx/digikam/digikam-6.4.0.ebuild             |  2 +-
 media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild       |  6 ++---
 media-gfx/krita/krita-4.2.7.1.ebuild               | 24 ++++++++++----------
 media-gfx/krita/krita-4.2.8.2.ebuild               | 24 ++++++++++----------
 media-gfx/synnefo/synnefo-1.1.0.ebuild             |  2 +-
 .../liblastfm/liblastfm-1.1.0_pre20150206.ebuild   |  4 ++--
 .../qimageblitz/qimageblitz-0.0.6_p20131029.ebuild |  4 ++--
 .../qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild      |  4 ++--
 .../taglib-extras/taglib-extras-1.0.1-r1.ebuild    |  2 +-
 media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild        |  2 +-
 media-sound/cantata/cantata-2.3.3-r1.ebuild        |  6 ++---
 media-sound/drumstick/drumstick-1.1.2.ebuild       | 14 ++++++------
 media-sound/drumstick/drumstick-1.1.3.ebuild       | 14 ++++++------
 media-sound/kid3/kid3-3.7.1.ebuild                 |  6 ++---
 media-sound/kid3/kid3-3.8.1.ebuild                 |  6 ++---
 media-sound/kmetronome/kmetronome-1.0.1.ebuild     |  4 ++--
 .../plasma-mediacenter-5.7.5.ebuild                |  2 +-
 .../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 10 ++++-----
 net-im/choqok/choqok-1.6.0_p20190726.ebuild        |  8 +++----
 net-irc/konversation/konversation-1.7.5-r1.ebuild  |  2 +-
 net-libs/jreen/jreen-1.3.0-r1.ebuild               |  4 ++--
 net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild    |  6 ++---
 net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild          |  2 +-
 sci-astronomy/kstars/kstars-3.2.3.ebuild           | 10 ++++-----
 sci-astronomy/kstars/kstars-3.3.8-r2.ebuild        | 10 ++++-----
 sci-libs/indilib/indilib-1.8.2-r1.ebuild           |  8 +++----
 sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild        |  4 ++--
 www-client/falkon/falkon-3.1.0-r1.ebuild           |  4 ++--
 x11-misc/sddm/sddm-0.18.1-r1.ebuild                |  8 +++----
 x11-themes/qtcurve/qtcurve-9999.ebuild             |  4 ++--
 154 files changed, 453 insertions(+), 453 deletions(-)

diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index bacd8da8b96..d2bfa334dc7 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
@@ -64,16 +64,16 @@ src_configure() {
 		$(qca_plugin_use ssl ossl)
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc; then
 		pushd "${BUILD_DIR}" >/dev/null || die

diff --git a/app-editors/okteta/okteta-0.26.2.ebuild b/app-editors/okteta/okteta-0.26.2.ebuild
index df4a8bac55d..4e9dc984c24 100644
--- a/app-editors/okteta/okteta-0.26.2.ebuild
+++ b/app-editors/okteta/okteta-0.26.2.ebuild
@@ -52,7 +52,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)
 		-DBUILD_DESIGNERPLUGIN=$(usex designer)
 	)
 

diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild b/app-office/calligraplan/calligraplan-3.2.1.ebuild
index fa152b86599..c610d97f9c2 100644
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -77,10 +77,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-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index 090d943589f..45620a30fd0 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -77,10 +77,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-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
index fcd7857e501..127b6156bd9 100644
--- a/app-office/kexi/kexi-3.2.0-r1.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -75,10 +75,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.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7.ebuild
index dcb9282ee91..75cc141e722 100644
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.7.ebuild
@@ -102,17 +102,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/libalkimia/libalkimia-7.0.2-r1.ebuild b/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
index b0dbf45ff89..4a61fccbf5c 100644
--- a/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
+++ b/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
@@ -31,8 +31,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package !gmp MPIR)
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package !gmp MPIR)
 	)
 	kde5_src_configure
 }

diff --git a/app-office/skrooge/skrooge-2.20.0.ebuild b/app-office/skrooge/skrooge-2.20.0.ebuild
index 8ec5d4ff916..7d87ce4cec4 100644
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ b/app-office/skrooge/skrooge-2.20.0.ebuild
@@ -84,9 +84,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-0.9.1.ebuild b/app-text/kbibtex/kbibtex-0.9.1.ebuild
index e01569d3b7f..2f8ac5f786c 100644
--- a/app-text/kbibtex/kbibtex-0.9.1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.1.ebuild
@@ -68,7 +68,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
+		$(cmake_use_find_package zotero Qca-qt5)
 	)
 
 	ecm_src_configure

diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index 8386256fc10..1ad433185f4 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then

diff --git a/app-text/poppler/poppler-0.83.0.ebuild b/app-text/poppler/poppler-0.83.0.ebuild
index 33ffc42f9ca..4e79ad3d70d 100644
--- a/app-text/poppler/poppler-0.83.0.ebuild
+++ b/app-text/poppler/poppler-0.83.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then

diff --git a/app-text/poppler/poppler-0.84.0.ebuild b/app-text/poppler/poppler-0.84.0.ebuild
index 12fe62839eb..dc4ab8ebb00 100644
--- a/app-text/poppler/poppler-0.84.0.ebuild
+++ b/app-text/poppler/poppler-0.84.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 12fe62839eb..dc4ab8ebb00 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then

diff --git a/dev-cpp/rttr/rttr-0.9.6.ebuild b/dev-cpp/rttr/rttr-0.9.6.ebuild
index 68f6af176d7..b85d69e5d1f 100644
--- a/dev-cpp/rttr/rttr-0.9.6.ebuild
+++ b/dev-cpp/rttr/rttr-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Run Time Type Reflection - library adding reflection to C++"
 HOMEPAGE="https://www.rttr.org/"
@@ -28,7 +28,7 @@ src_configure() {
 		-DBUILD_DOCUMENTATION=off #broken
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {

diff --git a/dev-db/kdb/kdb-3.2.0.ebuild b/dev-db/kdb/kdb-3.2.0.ebuild
index cc81d3aad20..ede80bfcaf1 100644
--- a/dev-db/kdb/kdb-3.2.0.ebuild
+++ b/dev-db/kdb/kdb-3.2.0.ebuild
@@ -43,9 +43,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)
 	)
 
 	kde5_src_configure

diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
index b74bce4f433..f3f63a5b417 100644
--- a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
 HOMEPAGE="https://fc-solve.shlomifish.org/"
@@ -37,7 +37,7 @@ src_prepare() {
 
 	python_fix_shebang board_gen
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,5 +48,5 @@ src_configure() {
 		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
index aa501d3ba73..9f8719c337c 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Memory efficient serialization library"
 HOMEPAGE="https://google.github.io/flatbuffers/"
@@ -26,5 +26,5 @@ src_configure() {
 
 	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 9d5b5a2b958..5f7dff2d6d2 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VIRTUALX_REQUIRED="test"
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="C++ string template engine based on the Django template system"
 HOMEPAGE="https://github.com/steveire/grantlee"
@@ -40,21 +40,21 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
-	use doc && cmake-utils_src_compile docs
+	use doc && cmake_src_compile docs
 }
 
 src_test() {
-	virtx cmake-utils_src_test
+	virtx cmake_src_test
 }
 
 src_install() {
 	use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/")
 
-	cmake-utils_src_install
+	cmake_src_install
 }

diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild
index 97555f85693..952f116009a 100644
--- a/dev-libs/kreport/kreport-3.2.0.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0.ebuild
@@ -42,8 +42,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)
 	)
 	kde5_src_configure

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
index 91e13fae705..ce7c7056728 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_PV=${PV/_pre/+16.04.}
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
@@ -28,7 +28,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	cmake_comment_add_subdirectory tools
 	# tests fail due to missing connection to dbus

diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
index f1c84d5ed7b..bb7b5e5421b 100644
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multibuild
+inherit cmake multibuild
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="https://nih.at/libzip/"
@@ -90,20 +90,20 @@ src_configure() {
 				-DENABLE_OPENSSL=OFF
 			)
 		fi
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	multibuild_foreach_variant cmake_src_compile
 }
 
 src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
 }
 
 src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	multibuild_foreach_variant cmake_src_install
 }

diff --git a/dev-libs/sink/sink-0.8.0-r1.ebuild b/dev-libs/sink/sink-0.8.0-r1.ebuild
index b578e12e668..439b04419d7 100644
--- a/dev-libs/sink/sink-0.8.0-r1.ebuild
+++ b/dev-libs/sink/sink-0.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Data access layer handling synchronization, caching and indexing"
 HOMEPAGE="https://kube-project.com"
@@ -50,5 +50,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
index f5cd867cd90..d3f38a652bb 100644
--- a/dev-util/clazy/clazy-1.5-r1.ebuild
+++ b/dev-util/clazy/clazy-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -39,11 +39,11 @@ src_configure() {
 	# bug #681568
 	local clang_version=$(best_version sys-devel/clang)
 	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }

diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.5.ebuild
index 7bf24b0ba07..ba0428212c7 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }

diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 62c8b00e4ae..529cc0a350e 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -135,7 +135,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc

diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 83e33d00510..ee04242b911 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -134,7 +134,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc

diff --git a/dev-util/cmake/cmake-3.16.2-r1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild
index e7600adaecc..f2216b9a5c2 100644
--- a/dev-util/cmake/cmake-3.16.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.16.2-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
+CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg cmake-utils
+	toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -125,7 +125,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -164,15 +164,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -181,7 +181,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc

diff --git a/dev-util/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
index 8467cba1427..f4738aa6742 100644
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )

diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index bf0964314b2..adcfcea9c50 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -40,7 +40,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
+		$(cmake_use_find_package callgraph KGraphViewerPart)
 	)
 	kde5_src_configure
 }

diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
index 0c1c41e1a9b..6f92902e7f1 100644
--- a/kde-apps/akonadi/akonadi-19.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
+		$(cmake_use_find_package xml LibXml2)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/analitza/analitza-19.08.3.ebuild b/kde-apps/analitza/analitza-19.08.3.ebuild
index 0030c9a8bf7..7df385e57cf 100644
--- a/kde-apps/analitza/analitza-19.08.3.ebuild
+++ b/kde-apps/analitza/analitza-19.08.3.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
+		$(cmake_use_find_package eigen Eigen3)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/ark/ark-19.08.3.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
index fa158209aa3..18ae6f375bf 100644
--- a/kde-apps/ark/ark-19.08.3.ebuild
+++ b/kde-apps/ark/ark-19.08.3.ebuild
@@ -55,9 +55,9 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
+		$(cmake_use_find_package bzip2 BZip2)
+		$(cmake_use_find_package lzma LibLZMA)
+		$(cmake_use_find_package zip LibZip)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
index 319f0bacb4c..82666c26133 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
@@ -39,8 +39,8 @@ PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
+		$(cmake_use_find_package flac FLAC)
+		$(cmake_use_find_package vorbis OggVorbis)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/cantor/cantor-19.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index e246fa0117a..33ced1b63d6 100644
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -96,14 +96,14 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs3)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
+		$(cmake_use_find_package analitza Analitza5)
+		$(cmake_use_find_package julia Julia)
+		$(cmake_use_find_package lua LuaJIT)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package python PythonLibs3)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package R R)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/dolphin/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.08.3.ebuild
index f73a18c7931..8a4b107a6fa 100644
--- a/kde-apps/dolphin/dolphin-19.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-19.08.3.ebuild
@@ -64,10 +64,10 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/gwenview/gwenview-19.08.3.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
index bf329063690..c5b0e928a0b 100644
--- a/kde-apps/gwenview/gwenview-19.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.3.ebuild
@@ -86,12 +86,12 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package X X11)
 	)
 
 	if use semantic-desktop; then

diff --git a/kde-apps/k3b/k3b-19.08.3.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
index 584b48bf6dc..7f12742964b 100644
--- a/kde-apps/k3b/k3b-19.08.3.ebuild
+++ b/kde-apps/k3b/k3b-19.08.3.ebuild
@@ -103,7 +103,7 @@ src_configure() {
 		-DK3B_ENABLE_TAGLIB=$(usex taglib)
 		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
 		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kalarm/kalarm-19.08.3.ebuild b/kde-apps/kalarm/kalarm-19.08.3.ebuild
index b7c746cc5a5..4cd97f1b701 100644
--- a/kde-apps/kalarm/kalarm-19.08.3.ebuild
+++ b/kde-apps/kalarm/kalarm-19.08.3.ebuild
@@ -77,8 +77,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
index 3ee55b2ddf7..24c67991adb 100644
--- a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
+		$(cmake_use_find_package readline Readline)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kalzium/kalzium-19.08.3.ebuild b/kde-apps/kalzium/kalzium-19.08.3.ebuild
index 61202b251f3..d449184bd04 100644
--- a/kde-apps/kalzium/kalzium-19.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-19.08.3.ebuild
@@ -52,11 +52,11 @@ src_configure(){
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
+		$(cmake_use_find_package editor Eigen3)
+		$(cmake_use_find_package editor AvogadroLibs)
+		$(cmake_use_find_package editor OpenBabel2)
+		$(cmake_use_find_package solver OCaml)
+		$(cmake_use_find_package solver Libfacile)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kanagram/kanagram-19.08.3.ebuild b/kde-apps/kanagram/kanagram-19.08.3.ebuild
index 44774001c87..feb5be3ba80 100644
--- a/kde-apps/kanagram/kanagram-19.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-19.08.3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kate/kate-19.08.3.ebuild b/kde-apps/kate/kate-19.08.3.ebuild
index 50f033411a0..b84ab5c9545 100644
--- a/kde-apps/kate/kate-19.08.3.ebuild
+++ b/kde-apps/kate/kate-19.08.3.ebuild
@@ -69,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_addons=$(usex addons)
 		-DBUILD_kwrite=FALSE
 	)

diff --git a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
index e32cf708c94..1b49405064c 100644
--- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
@@ -72,10 +72,10 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package v4l LibV4L2)
+		$(cmake_use_find_package freesound Qt5WebKitWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package v4l LibV4L2)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
index 102e1ad40f5..ae559f328b4 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
@@ -76,8 +76,8 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kdialog/kdialog-19.08.3.ebuild b/kde-apps/kdialog/kdialog-19.08.3.ebuild
index 60c1cdb8a55..18487f6d525 100644
--- a/kde-apps/kdialog/kdialog-19.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-19.08.3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/kget/kget-19.08.3.ebuild b/kde-apps/kget/kget-19.08.3.ebuild
index d9e229bf368..04358de4be2 100644
--- a/kde-apps/kget/kget-19.08.3.ebuild
+++ b/kde-apps/kget/kget-19.08.3.ebuild
@@ -58,11 +58,11 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package kde LibKWorkspace)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
+		$(cmake_use_find_package bittorrent KF5Torrent)
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package kde LibKWorkspace)
+		$(cmake_use_find_package mms LibMms)
+		$(cmake_use_find_package sqlite Sqlite)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
index a56211843ed..94dd97550a5 100644
--- a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
@@ -69,14 +69,14 @@ PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp libssh)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
index 42f68be2437..774b2986a74 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
@@ -45,10 +45,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		$(cmake-utils_use_find_package remotestorage KF5KIO)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		$(cmake_use_find_package flashexport KF5Archive)
+		$(cmake_use_find_package mediawiki KF5MediaWiki)
+		$(cmake_use_find_package remotestorage KF5KIO)
+		$(cmake_use_find_package vkontakte KF5Vkontakte)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
index 976c60aad07..bf9e81d344d 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
@@ -37,8 +37,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package barcode ZXing)
-		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake_use_find_package barcode ZXing)
+		$(cmake_use_find_package pdf Poppler)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/kmag/kmag-19.08.3.ebuild b/kde-apps/kmag/kmag-19.08.3.ebuild
index d0416181a0d..9f71e566a72 100644
--- a/kde-apps/kmag/kmag-19.08.3.ebuild
+++ b/kde-apps/kmag/kmag-19.08.3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kmix/kmix-19.08.3.ebuild b/kde-apps/kmix/kmix-19.08.3.ebuild
index ac41d89c361..06539e35dd3 100644
--- a/kde-apps/kmix/kmix-19.08.3.ebuild
+++ b/kde-apps/kmix/kmix-19.08.3.ebuild
@@ -48,9 +48,9 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/knotes/knotes-19.08.3.ebuild b/kde-apps/knotes/knotes-19.08.3.ebuild
index f4ed9fedf66..88db4c65a6c 100644
--- a/kde-apps/knotes/knotes-19.08.3.ebuild
+++ b/kde-apps/knotes/knotes-19.08.3.ebuild
@@ -68,8 +68,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 # 	local mycmakeargs=(
 # 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
+# 		$(cmake_use_find_package X Qt5X11Extras)
+# 		$(cmake_use_find_package X X11)
 # 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
index 415c5dfa90e..d36d2ed74b3 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package scanner KF5Sane)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3.ebuild
index 57da29eb84e..fbf41c36293 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -82,10 +82,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tidy LibTidy)
+		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/konsole/konsole-19.08.3.ebuild b/kde-apps/konsole/konsole-19.08.3.ebuild
index 661c542361c..4904b5fcf7f 100644
--- a/kde-apps/konsole/konsole-19.08.3.ebuild
+++ b/kde-apps/konsole/konsole-19.08.3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/korganizer/korganizer-19.08.3.ebuild b/kde-apps/korganizer/korganizer-19.08.3.ebuild
index 00f2f319dcf..4952e7c638c 100644
--- a/kde-apps/korganizer/korganizer-19.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-19.08.3.ebuild
@@ -89,7 +89,7 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/krdc/krdc-19.08.3.ebuild b/kde-apps/krdc/krdc-19.08.3.ebuild
index dfa48267080..4656d5e5108 100644
--- a/kde-apps/krdc/krdc-19.08.3.ebuild
+++ b/kde-apps/krdc/krdc-19.08.3.ebuild
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package vnc LibVNCServer)
+		$(cmake_use_find_package vnc LibVNCServer)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
index fb0eab56801..067909c47a6 100644
--- a/kde-apps/krfb/krfb-19.08.3.ebuild
+++ b/kde-apps/krfb/krfb-19.08.3.ebuild
@@ -49,7 +49,7 @@ PATCHES=( "${FILESDIR}/${P}-portal-support.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland PipeWire)
+		$(cmake_use_find_package wayland PipeWire)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild
index 3af08979d5f..e5ba0376468 100644
--- a/kde-apps/kruler/kruler-19.08.3.ebuild
+++ b/kde-apps/kruler/kruler-19.08.3.ebuild
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
index 26df9cdb516..31a0ab8d2ca 100644
--- a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake_use_find_package opengl OpenGL)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
index eda448fa7d9..c87c2792a65 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
+		$(cmake_use_find_package systemd Journald)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/ktouch/ktouch-19.08.3.ebuild b/kde-apps/ktouch/ktouch-19.08.3.ebuild
index 3b388fd9ed0..08d64688781 100644
--- a/kde-apps/ktouch/ktouch-19.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-19.08.3.ebuild
@@ -57,8 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DCOMPILE_QML=OFF
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X Qt5X11Extras)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
index 868710153aa..2893eaeb8bd 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
@@ -60,10 +60,10 @@ PATCHES=( "${FILESDIR}/${P}-telepathy-0.9.8.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
+		$(cmake_use_find_package sso KAccounts)
+		$(cmake_use_find_package sso AccountsQt5)
+		$(cmake_use_find_package otr Libgcrypt)
+		$(cmake_use_find_package otr LibOTR)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
index 12436c5228f..d1422b7d58f 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
index c12a1395c99..b2d82770ae2 100644
--- a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
index e8dd9b411f0..451bcb2f6dc 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake_use_find_package alsa ALSA)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/libkleo/libkleo-19.08.3.ebuild b/kde-apps/libkleo/libkleo-19.08.3.ebuild
index 055a90284b9..dec3f5d07ca 100644
--- a/kde-apps/libkleo/libkleo-19.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-19.08.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/libksane/libksane-19.08.3.ebuild b/kde-apps/libksane/libksane-19.08.3.ebuild
index a5063c07068..460ccddb20b 100644
--- a/kde-apps/libksane/libksane-19.08.3.ebuild
+++ b/kde-apps/libksane/libksane-19.08.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package kwallet KF5Wallet)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/marble/marble-19.08.3-r1.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild
index 4932a8f01b4..6df0dd699d3 100644
--- a/kde-apps/marble/marble-19.08.3-r1.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -74,16 +74,16 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package geolocation Qt5Positioning)
+		$(cmake_use_find_package aprs Perl)
+		$(cmake_use_find_package geolocation Qt5Positioning)
 		-DBUILD_MARBLE_TESTS=$(usex test)
 		-DWITH_DESIGNER_PLUGIN=$(usex designer)
 		-DWITH_libgps=$(usex gps)
 		-DWITH_KF5=$(usex kde)
 		-DWITH_Phonon4Qt5=$(usex phonon)
 		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 		-DWITH_libwlocate=OFF
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
@@ -91,6 +91,6 @@ src_configure() {
 	if use kde; then
 		ecm_src_configure
 	else
-		cmake-utils_src_configure
+		cmake_src_configure
 	fi
 }

diff --git a/kde-apps/marble/marble-19.12.0.ebuild b/kde-apps/marble/marble-19.12.0.ebuild
index da6668a7e81..db0d75ca2e0 100644
--- a/kde-apps/marble/marble-19.12.0.ebuild
+++ b/kde-apps/marble/marble-19.12.0.ebuild
@@ -91,6 +91,6 @@ src_configure() {
 	if use kde; then
 		ecm_src_configure
 	else
-		cmake-utils_src_configure
+		cmake_src_configure
 	fi
 }

diff --git a/kde-apps/okular/okular-19.08.3.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 8856309f029..0e62728af08 100644
--- a/kde-apps/okular/okular-19.08.3.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -82,19 +82,19 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package image-backend KF5KExiv2)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
index 4124e27822e..dc4e3fcc175 100644
--- a/kde-apps/spectacle/spectacle-19.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-19.08.3.ebuild
@@ -49,8 +49,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package share KF5Purpose)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/step/step-19.08.3.ebuild b/kde-apps/step/step-19.08.3.ebuild
index b2e34d92675..724db3cc44b 100644
--- a/kde-apps/step/step-19.08.3.ebuild
+++ b/kde-apps/step/step-19.08.3.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package qalculate Qalculate)
 	)
 	ecm_src_configure
 }

diff --git a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
index db2d077bf3c..7373230f606 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
@@ -28,8 +28,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package raw KF5KExiv2)
+		$(cmake_use_find_package raw KF5KDcraw)
 	)
 
 	ecm_src_configure

diff --git a/kde-apps/yakuake/yakuake-19.08.3.ebuild b/kde-apps/yakuake/yakuake-19.08.3.ebuild
index 46e4d915997..27032b5cab5 100644
--- a/kde-apps/yakuake/yakuake-19.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-19.08.3.ebuild
@@ -50,8 +50,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package absolute-position KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package absolute-position KF5Wayland)
+		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure

diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.64.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.64.0.ebuild
index d1b0467d611..1f739c4be18 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.64.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.64.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_ORG_NAME="breeze-icons"
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
@@ -22,7 +22,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -31,5 +31,5 @@ src_configure() {
 		-DBINARY_ICONS_RESOURCE=ON
 		-DSKIP_INSTALL_ICONS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
index 224d82462d7..c2883745399 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_ORG_NAME="breeze-icons"
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
@@ -22,7 +22,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -31,5 +31,5 @@ src_configure() {
 		-DBINARY_ICONS_RESOURCE=ON
 		-DSKIP_INSTALL_ICONS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.64.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.64.0.ebuild
index cd68543e69d..8198eb0fc5a 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.64.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.64.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
@@ -21,7 +21,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -29,5 +29,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DBINARY_ICONS_RESOURCE=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
index 53e0bf3e9e9..5b06e76d157 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
@@ -21,7 +21,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -29,5 +29,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DBINARY_ICONS_RESOURCE=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
index 85906ba2af7..620ba795aed 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 QTMIN=5.12.3
-inherit cmake-utils kde.org python-any-r1
+inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
@@ -45,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# Requires PyQt5, bug #680256
 	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
 		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
@@ -60,7 +60,7 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -70,5 +70,5 @@ src_test() {
 		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
 	)
 
-	cmake-utils_src_test
+	cmake_src_test
 }

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
index e0702073663..9578cefaa02 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 QTMIN=5.12.3
-inherit cmake-utils kde.org python-any-r1
+inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
@@ -45,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# Requires PyQt5, bug #680256
 	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
 		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
@@ -60,7 +60,7 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -70,5 +70,5 @@ src_test() {
 		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
 	)
 
-	cmake-utils_src_test
+	cmake_src_test
 }

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
index 3ddc4945e82..d12e52dd57f 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.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/kapidox/kapidox-5.64.0.ebuild b/kde-frameworks/kapidox/kapidox-5.64.0.ebuild
index a0dffa9bbfc..b3690978c3c 100644
--- a/kde-frameworks/kapidox/kapidox-5.64.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.64.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils kde.org distutils-r1
+inherit cmake kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"

diff --git a/kde-frameworks/kapidox/kapidox-5.65.0.ebuild b/kde-frameworks/kapidox/kapidox-5.65.0.ebuild
index ea0ca77ae3e..1a77a685570 100644
--- a/kde-frameworks/kapidox/kapidox-5.65.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.65.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils kde.org distutils-r1
+inherit cmake kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"

diff --git a/kde-frameworks/karchive/karchive-5.64.0.ebuild b/kde-frameworks/karchive/karchive-5.64.0.ebuild
index 3251783c33d..de1cc4c198f 100644
--- a/kde-frameworks/karchive/karchive-5.64.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kauth/kauth-5.64.0.ebuild
index fbba76fa30d..3ed2c9c33f0 100644
--- a/kde-frameworks/kauth/kauth-5.64.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.64.0.ebuild
index dcc9b20d539..f8908e92d73 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.64.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.64.0.ebuild
index 4b4f210e073..683f6a50460 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.64.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.64.0.ebuild
index d7c18d4c5f2..87f6881057c 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.64.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kded/kded-5.64.0.ebuild
index d80304cf27c..6aa0176414b 100644
--- a/kde-frameworks/kded/kded-5.64.0.ebuild
+++ b/kde-frameworks/kded/kded-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
index 3440f2eda86..3881fcb428e 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kdesu/kdesu-5.64.0.ebuild
index a75d91720d0..2441d53b9ae 100644
--- a/kde-frameworks/kdesu/kdesu-5.64.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.64.0.ebuild
index 7bafdb2c649..f4c0272e364 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.64.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.64.0.ebuild
index 35d6d858925..fc88979f223 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.64.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
index 2b31c81bfb9..566ddc0a61f 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.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-5.64.0.ebuild b/kde-frameworks/khtml/khtml-5.64.0.ebuild
index 1d0b39c2bde..8a9c1f2857c 100644
--- a/kde-frameworks/khtml/khtml-5.64.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kidletime/kidletime-5.64.0.ebuild
index eab3e0c9bd5..bb27aa7fd85 100644
--- a/kde-frameworks/kidletime/kidletime-5.64.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.64.0.ebuild
index 6b9c334ca76..b91459e8fb2 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.64.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kinit/kinit-5.64.0.ebuild
index 54018f71740..5a833209f9a 100644
--- a/kde-frameworks/kinit/kinit-5.64.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kio/kio-5.64.0.ebuild
index f0c269e6910..34785618f4f 100644
--- a/kde-frameworks/kio/kio-5.64.0.ebuild
+++ b/kde-frameworks/kio/kio-5.64.0.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/kjobwidgets/kjobwidgets-5.64.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.64.0.ebuild
index 5d29bbb6e1a..92d2b3e8509 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.64.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.64.0.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-5.64.0.ebuild b/kde-frameworks/knotifications/knotifications-5.64.0.ebuild
index 5e19dd092f6..c195e260143 100644
--- a/kde-frameworks/knotifications/knotifications-5.64.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kpackage/kpackage-5.64.0.ebuild
index bc535752d8c..b9138694cf7 100644
--- a/kde-frameworks/kpackage/kpackage-5.64.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kservice/kservice-5.64.0.ebuild
index 613744fa287..f83627ab4a7 100644
--- a/kde-frameworks/kservice/kservice-5.64.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.64.0.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-5.64.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
index 498e30c6e64..f9065805ba3 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.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-5.64.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.64.0.ebuild
index d994f5e788a..d8770b9aecb 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.64.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kwallet/kwallet-5.64.0.ebuild
index 46130c8eb56..27eaf81c3fa 100644
--- a/kde-frameworks/kwallet/kwallet-5.64.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.64.0.ebuild
index a5db9730b1e..7d996b7b041 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.64.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.64.0.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-5.64.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
index d805564322c..8fb4be784bb 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.64.0.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/oxygen-icons/oxygen-icons-5.64.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.64.0.ebuild
index 85631fd3536..002a37c18a5 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.64.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.64.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 KDE_ORG_NAME="oxygen-icons5"
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
@@ -23,6 +23,6 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }

diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
index e821e17f2db..3dd7f64eecd 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 KDE_ORG_NAME="oxygen-icons5"
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
@@ -23,6 +23,6 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory autotests
 }

diff --git a/kde-frameworks/plasma/plasma-5.64.0.ebuild b/kde-frameworks/plasma/plasma-5.64.0.ebuild
index 0d3c7980ecd..41d92a57f3e 100644
--- a/kde-frameworks/plasma/plasma-5.64.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.64.0.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-5.64.0.ebuild b/kde-frameworks/prison/prison-5.64.0.ebuild
index 039dfd034ff..9f0a527b6bc 100644
--- a/kde-frameworks/prison/prison-5.64.0.ebuild
+++ b/kde-frameworks/prison/prison-5.64.0.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/sonnet/sonnet-5.64.0.ebuild b/kde-frameworks/sonnet/sonnet-5.64.0.ebuild
index 4d8eb524eed..507d5173165 100644
--- a/kde-frameworks/sonnet/sonnet-5.64.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.64.0.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-1.3.5.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
index 16d096057aa..719b921fb54 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
@@ -61,8 +61,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DEXPERIMENTALAPP_ENABLED=$(usex app)
 		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake-utils_use_find_package mousepad LibFakeKey)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package mousepad LibFakeKey)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 
 	kde5_src_configure

diff --git a/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild b/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild
index d5506fd01fd..ee3fa9dff69 100644
--- a/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org xdg
+inherit cmake kde.org xdg
 
 DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
 HOMEPAGE="https://kshutdown.sourceforge.io"
@@ -51,7 +51,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0-cmake-3.15.patch" )
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -59,5 +59,5 @@ src_configure() {
 		-DKS_PURE_QT=$(usex !kde)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-misc/tellico/tellico-3.2.3.ebuild b/kde-misc/tellico/tellico-3.2.3.ebuild
index 5070732abf4..e7f810df4dc 100644
--- a/kde-misc/tellico/tellico-3.2.3.ebuild
+++ b/kde-misc/tellico/tellico-3.2.3.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-plymouth/breeze-plymouth-5.17.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
index 93c70d79cfc..488078f2e1c 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
 
@@ -24,5 +24,5 @@ src_configure() {
 		-DDISTRO_VERSION=
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
index d7a631cf4e5..dbfeb6dfa53 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
@@ -20,6 +19,7 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
+BDEPEND=">=dev-util/cmake-3.14.3"
 COMMON_DEPEND="
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5

diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
index abee8f43a0c..58eff74a132 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Wallpapers for the Plasma workspace"
 

diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
index 7f4929f6181..f2088176430 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
@@ -7,7 +7,7 @@ KDE_ORG_NAME="plasma-workspace"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
@@ -37,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"

diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild
index 78e5b56d062..fa227d0bc5e 100644
--- a/mail-client/kube/kube-0.7.0-r1.ebuild
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Mail client based on KDE Frameworks"
 HOMEPAGE="https://kube-project.com"
@@ -47,7 +47,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/find_package.*Qt5/s/ Concurrent//" \
 		-i {extensions/api,framework}/src/CMakeLists.txt || die

diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index f6b3d85cf53..a6f81504d4e 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils virtualx xdg
+inherit cmake virtualx xdg
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/"
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 DOCS=( README LICENSE )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# the build system is taking a look at `git describe ... --dirty` and
 	# gentoo's modifications to CMakeLists.txt break these
@@ -72,9 +72,9 @@ src_configure() {
 		-DWITH_ZLIB=$(usex zlib)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	virtx cmake-utils_src_test
+	virtx cmake_src_test
 }

diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 8b30b380b54..7a9327fbcb3 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 inherit kde5 toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -23,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
+	>=dev-util/cmake-3.14.3
 	sys-devel/gettext
 	panorama? (
 		sys-devel/bison
@@ -134,23 +134,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)
 	)
 
 	kde5_src_configure

diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild
index c47f0fb32aa..9ee9030d8c6 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org toolchain-funcs
@@ -26,6 +25,7 @@ SLOT="5"
 IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
+	>=dev-util/cmake-3.14.3
 	sys-devel/gettext
 	panorama? (
 		sys-devel/bison

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index 2a3a8d42bf7..752ae5dc435 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -53,9 +53,9 @@ 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_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package map KF5KGeoMap)
+		$(cmake_use_find_package raw KF5KDcraw)
 	)
 
 	kde5_src_configure

diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
index 4f1797aa006..4c9525d74aa 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -98,18 +98,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)
 	)
 
 	kde5_src_configure

diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2.ebuild
index 8d45b1ca065..99703d1a212 100644
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2.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-gfx/synnefo/synnefo-1.1.0.ebuild b/media-gfx/synnefo/synnefo-1.1.0.ebuild
index 5605351edcd..eb126309b0b 100644
--- a/media-gfx/synnefo/synnefo-1.1.0.ebuild
+++ b/media-gfx/synnefo/synnefo-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git"
 	inherit git-r3

diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index 33eb7fb67ef..c539e6a7b1f 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
@@ -47,5 +47,5 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
index bbbf7fcfea3..c6a9d624180 100644
--- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Graphical effect and filter library by KDE"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
@@ -36,5 +36,5 @@ src_configure() {
 	)
 	use ppc && mycmakeargs+=( -DHAVE_ALTIVEC=$(usex altivec) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index 4adb838f82d..11c5d26ece1 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
@@ -50,5 +50,5 @@ src_configure() {
 		-DQTGSTREAMER_TESTS=$(usex test)
 		-DQT_VERSION=5
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index f63c5f1bc00..9c38a368dd0 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Unofficial taglib plugins maintained by the Amarok team"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/taglib-extras/"

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
index 1632e5bcc70..8a437d07071 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
 HOMEPAGE="https://github.com/nu-book/zxing-cpp"

diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
index 05ee35f5109..b29c21cf273 100644
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils l10n qmake-utils xdg
+inherit cmake l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata"
@@ -77,7 +77,7 @@ src_prepare() {
 		rm "translations/${PN}_${1}".ts || die
 	}
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Unbundle 3rd party libs
 	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
@@ -106,7 +106,7 @@ src_configure() {
 		-DENABLE_UDISKS2=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {

diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
index c76b6148043..cf6137ec098 100644
--- a/media-sound/drumstick/drumstick-1.1.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use fluidsynth ; then
 		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc ; then
 		dodoc -r "${BUILD_DIR}"/doc/html

diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
index f6de2bd3fcc..fbb7e14743e 100644
--- a/media-sound/drumstick/drumstick-1.1.3.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use fluidsynth ; then
 		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc ; then
 		dodoc -r "${BUILD_DIR}"/doc/html

diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
index 87343373f36..172085a01f3 100644
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ b/media-sound/kid3/kid3-3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	# overengineered upstream build system
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# applies broken python hacks, bug #614950
 	cmake_comment_add_subdirectory doc
 }
@@ -80,5 +80,5 @@ src_configure() {
 		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/media-sound/kid3/kid3-3.8.1.ebuild b/media-sound/kid3/kid3-3.8.1.ebuild
index 9b1848ffad5..5fdb3312307 100644
--- a/media-sound/kid3/kid3-3.8.1.ebuild
+++ b/media-sound/kid3/kid3-3.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -59,7 +59,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	# overengineered upstream build system
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# applies broken python hacks, bug #614950
 	cmake_comment_add_subdirectory doc
 }
@@ -81,5 +81,5 @@ src_configure() {
 		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/media-sound/kmetronome/kmetronome-1.0.1.ebuild b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
index 8adf01c87da..d690d480762 100644
--- a/media-sound/kmetronome/kmetronome-1.0.1.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
 HOMEPAGE="http://kmetronome.sourceforge.net/"
@@ -30,5 +30,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }

diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
index ad1eb0048ef..f2d6d2da99e 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 
 	kde5_src_configure

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index 58043f6d38e..4466c1784b9 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -59,11 +59,11 @@ S="${WORKDIR}/SubtitleComposer-${PV}"
 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)
 	)
 
 	kde5_src_configure

diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
index 4d597025108..96d27704336 100644
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
@@ -51,10 +51,10 @@ RDEPEND="${DEPEND}"
 
 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)
 	)
 
 	kde5_src_configure

diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
index 7b1f0f864bb..133d38ba0b7 100644
--- a/net-irc/konversation/konversation-1.7.5-r1.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -60,7 +60,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 	)
 
 	kde5_src_configure

diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild
index c004a9cffb9..b0175ce3222 100644
--- a/net-libs/jreen/jreen-1.3.0-r1.ebuild
+++ b/net-libs/jreen/jreen-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ else
 	EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
 fi
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit cmake ${GIT_ECLASS}
 
 DESCRIPTION="Qt XMPP library"
 HOMEPAGE="https://github.com/euroelessar/jreen"
@@ -33,5 +33,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DJREEN_FORCE_QT4=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 1f505982cf3..54ad156b963 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-any-r1 cmake-utils virtualx
+inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="https://telepathy.freedesktop.org/"
@@ -61,7 +61,7 @@ src_configure() {
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_EXAMPLES=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -70,6 +70,6 @@ src_test() {
 		-E "(BaseConnectionManager|BaseProtocol)"
 	)
 	pushd "${BUILD_DIR}" > /dev/null || die
-	virtx cmake-utils_src_test
+	virtx cmake_src_test
 	popd > /dev/null || die
 }

diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
index 443883b0dbc..fe3574adf3d 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
@@ -95,7 +95,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-3.2.3.ebuild b/sci-astronomy/kstars/kstars-3.2.3.ebuild
index 37fbdb6ba50..e0851ef4ce8 100644
--- a/sci-astronomy/kstars/kstars-3.2.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.3.ebuild
@@ -65,11 +65,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)
 	)
 
 	kde5_src_configure

diff --git a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
index bcc1c779389..11712ad2839 100644
--- a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
@@ -77,11 +77,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
 		-DBUILD_DOC=$(usex handbook)
-		$(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/sci-libs/indilib/indilib-1.8.2-r1.ebuild b/sci-libs/indilib/indilib-1.8.2-r1.ebuild
index d36b86d8d0f..f87a13da483 100644
--- a/sci-libs/indilib/indilib-1.8.2-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.8.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="https://www.indilib.org/"
@@ -44,13 +44,13 @@ src_configure() {
 		-DINDI_BUILD_QT5_CLIENT=OFF
 		-DINDI_BUILD_UNITTESTS=$(usex test)
 		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-		$(cmake-utils_use_find_package ogg OggTheora)
+		$(cmake_use_find_package ogg OggTheora)
 		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }

diff --git a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
index 6873d44cf9f..7e85ce613a8 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 KDE_ORG_NAME="polkit-qt-1"
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Qt wrapper around polkit-1 client libraries"
 HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
@@ -36,5 +36,5 @@ src_configure() {
 		-DBUILD_EXAMPLES=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index b304d003bf0..01a00bd0452 100644
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -73,8 +73,8 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
 		-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)
 	)
 	kde5_src_configure

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index bc72ee39cb8..f237ad81fa5 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
+inherit cmake l10n systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -56,7 +56,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	disable_locale() {
 		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
@@ -78,11 +78,11 @@ src_configure() {
 		-DBUILD_MAN_PAGES=ON
 		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
 	local confd="/usr/share/sddm/sddm.conf.d"

diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 47898ba5cf1..285a77b5348 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Widget styles for Qt and GTK2"
 HOMEPAGE="https://cgit.kde.org/qtcurve.git"
@@ -80,5 +80,5 @@ src_configure() {
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }