*/*: Switch proxy-maint to cmake.eclass

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

52 files changed, 175 insertions, 175 deletions

diff --git a/app-editors/neovim/neovim-0.3.8.ebuild b/app-editors/neovim/neovim-0.3.8.ebuild
index b22a6a5ca7c1..52b26cd51f4b 100644
--- a/app-editors/neovim/neovim-0.3.8.ebuild
+++ b/app-editors/neovim/neovim-0.3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
@@ -62,7 +62,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
 		-DENABLE_JEMALLOC=$(usex jemalloc)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild
index cf111db0b07c..525ec586a27f 100644
--- a/app-editors/neovim/neovim-0.4.2.ebuild
+++ b/app-editors/neovim/neovim-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index d59da9730374..6f27a67c108e 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 97f2f678904d..6647b38da751 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -59,7 +59,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -67,11 +67,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
index 5bed8dd43ffc..a80f72b52c90 100644
--- a/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
+++ b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Shared library to be used by the Laretz sync server and its clients
 HOMEPAGE="https://leechcraft.org"
 SRC_URI="https://github.com/0xd34df00d/${PN#lib}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-inherit cmake-utils
+inherit cmake
 
 LICENSE="Boost-1.0"
 SLOT="0"
diff --git a/app-misc/vcontrold/vcontrold-0.98.8.ebuild b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
index 67b70f6ed21c..2e6f68c2c7ed 100644
--- a/app-misc/vcontrold/vcontrold-0.98.8.ebuild
+++ b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
 HOMEPAGE="https://github.com/openv/vcontrold/"
@@ -22,7 +22,7 @@ src_prepare() {
 	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
 		> "src/version.h" || die "Setting version failed"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -32,11 +32,11 @@ src_configure() {
 		-DVSIM="$(usex vsim)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doinitd "${FILESDIR}/vcontrold"
 	insinto /etc/vcontrold/
 	doins -r xml
diff --git a/app-mobilephone/gammu/gammu-1.40.0.ebuild b/app-mobilephone/gammu/gammu-1.40.0.ebuild
index 24180c0286c6..d91ec569eed8 100644
--- a/app-mobilephone/gammu/gammu-1.40.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.40.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to handle your cellular phone"
 HOMEPAGE="https://wammu.eu/gammu/"
@@ -47,18 +47,17 @@ src_configure() {
 		-DWITH_ODBC=$(usex odbc)
 		-DWITH_Postgres=$(usex postgres)
 		-DWITH_USB=$(usex usb)
-		-DBUILD_SHARED_LIBS=ON
 		-DINSTALL_DOC_DIR="share/doc/${PF}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	addwrite "/run/lock/LCK..bar"
-	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	docompress -x /usr/share/doc/${PF}/examples/
 }
diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.41.0.ebuild
index 8be8100b03e1..2af395f25322 100644
--- a/app-mobilephone/gammu/gammu-1.41.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.41.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to handle your cellular phone"
 HOMEPAGE="https://wammu.eu/gammu/"
@@ -45,18 +45,17 @@ src_configure() {
 		-DWITH_ODBC=$(usex odbc)
 		-DWITH_Postgres=$(usex postgres)
 		-DWITH_USB=$(usex usb)
-		-DBUILD_SHARED_LIBS=ON
 		-DINSTALL_DOC_DIR="share/doc/${PF}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	addwrite "/run/lock/LCK..bar"
-	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	docompress -x /usr/share/doc/${PF}/examples/
 }
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild
index 98d67d92032c..ea624a4fe89b 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 MY_PV=1.10.x
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
index 771468eb8b67..b610bde2ba4b 100644
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -38,7 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -54,7 +54,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 9a6cb10a49fd..a5860df6cada 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
 
+CMAKE_ECLASS=cmake
 GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655
-
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 2fdd8d6bb364..2224f1eedf49 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -42,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
 		googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -58,7 +59,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
index 2ca76ece9d82..9e800bfb475a 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="Hot backup utility for MySQL based servers"
 HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
@@ -40,7 +40,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# remove bundled libedit, libevent, zlib
 	# just to be safe...
@@ -65,7 +65,7 @@ src_configure() {
 	)
 
 	local CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
index af0018e27b3c..3776aa32ffd3 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 BOOST_VER="1_69_0"
 MY_PV="$(ver_rs 2 '-')"
@@ -50,7 +50,7 @@ src_configure() {
 		-DWITH_SYSTEM_LIBS=ON
 	)
 	local CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild
index 27a2a9ae8b05..e0b34016c621 100644
--- a/dev-libs/criterion/criterion-2.3.3.ebuild
+++ b/dev-libs/criterion/criterion-2.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Cross platform unit testing framework for C and C++"
 HOMEPAGE="https://github.com/Snaipe/Criterion"
@@ -30,19 +30,19 @@ src_configure() {
 		-DCTESTS="$(usex test ON OFF)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use test; then
-		cmake-utils_src_make criterion_tests
+		cmake_build criterion_tests
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then
 		mkdir -p "${D}/usr/$(get_libdir)" || die
diff --git a/dev-lua/luv/luv-1.32.0.0.ebuild b/dev-lua/luv/luv-1.32.0.0.ebuild
index 41098ce6bbc4..3d5ee15c180b 100644
--- a/dev-lua/luv/luv-1.32.0.0.ebuild
+++ b/dev-lua/luv/luv-1.32.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils unpacker
+inherit cmake unpacker
 
 # e.g. MY_PV = a.b.c-d
 MY_PV="$(ver_rs 3 -)"
@@ -38,7 +38,7 @@ src_prepare() {
 	# Fix libdir
 	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
 	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -50,7 +50,7 @@ src_configure() {
 		-DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua)
 		-DWITH_SHARED_LIBUV=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild
index 30beb3bfeb10..018526a2e715 100644
--- a/games-action/minetest/minetest-5.1.0-r1.ebuild
+++ b/games-action/minetest/minetest-5.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
 HOMEPAGE="https://www.minetest.net"
@@ -58,7 +58,7 @@ BDEPEND="
 PATCHES="${FILESDIR}/${PV}-FindJson.patch"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# set paths
 	sed \
 		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
@@ -98,20 +98,20 @@ src_configure() {
 		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc ; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use server ; then
 		keepdir /var/log/minetest
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index d31cad3370ad..11e3f7bd7c96 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake-utils multilib wxwidgets
+inherit cmake multilib wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -77,11 +77,11 @@ src_configure() {
 	)
 
 	WX_GTK_VER="3.0" setup-wxwidgets
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
 	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c0a277f41a05..f5e4931ead16 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -83,7 +83,7 @@ src_configure() {
 	)
 
 	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
@@ -92,5 +92,5 @@ src_install() {
 	#  https://github.com/PCSX2/pcsx2/issues/3077
 	QA_EXECSTACK="usr/bin/PCSX2"
 	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/games-engines/odamex/odamex-0.8.1-r1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild
index c823dedd980d..43af64e77527 100644
--- a/games-engines/odamex/odamex-0.8.1-r1.ebuild
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake-utils desktop prefix wxwidgets xdg
+inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
@@ -44,7 +44,7 @@ src_prepare() {
 
 	use odalaunch && setup-wxwidgets
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -57,11 +57,11 @@ src_configure() {
 		-DUSE_MINIUPNP=$(usex upnp)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# Build odamex.wad
 	cd wad || die "cd failed"
@@ -79,5 +79,5 @@ src_install() {
 		fi
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
index da843dc71ad1..f6844ab0cf13 100644
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
@@ -42,7 +42,7 @@ src_prepare() {
 		rm -rf wadsrc_bm wadsrc_extra || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -59,13 +59,13 @@ src_configure() {
 		-DNO_OPENMP="$(usex !openmp)"
 		-DBUILD_NONFREE="$(usex nonfree)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	newicon src/posix/zdoom.xpm "${PN}.xpm"
 	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
diff --git a/media-gfx/qimgv/qimgv-0.8.5.ebuild b/media-gfx/qimgv/qimgv-0.8.5.ebuild
index 81ac18fca861..71f3879d1181 100644
--- a/media-gfx/qimgv/qimgv-0.8.5.ebuild
+++ b/media-gfx/qimgv/qimgv-0.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
 HOMEPAGE="https://github.com/easymodo/qimgv"
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# respect make.conf CXXFLAGS
 	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
 }
@@ -42,7 +42,7 @@ src_configure() {
 		-DKDE_SUPPORT=$(usex kde)
 		-DVIDEO_SUPPORT=$(usex video)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/qimgv/qimgv-0.8.8.ebuild b/media-gfx/qimgv/qimgv-0.8.8.ebuild
index e605fa5db2f8..b5ebae292347 100644
--- a/media-gfx/qimgv/qimgv-0.8.8.ebuild
+++ b/media-gfx/qimgv/qimgv-0.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
 HOMEPAGE="https://github.com/easymodo/qimgv"
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# respect make.conf CXXFLAGS
 	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
 }
@@ -42,7 +42,7 @@ src_configure() {
 		-DKDE_SUPPORT=$(usex kde)
 		-DVIDEO_SUPPORT=$(usex video)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 4fe5e0457742..4cbf036f9660 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A library for storing voxel data"
 HOMEPAGE="http://opensource.imageworks.com/?p=field3d"
@@ -29,7 +29,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_DOCS=OFF # Docs are not finished yet.
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-		$(cmake-utils_use_find_package mpi MPI)
+		$(cmake_use_find_package mpi MPI)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
index c5326986b7a6..190989d2cc9e 100644
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ b/media-libs/osl/osl-1.10.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs
 
 # check this on updates
 LLVM_MAX_SLOT=8
@@ -73,7 +73,6 @@ src_configure() {
 	local gcc=$(tc-getCC)
 	# LLVM needs CPP11. Do not disable.
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DENABLERTTI=OFF
 		-DINSTALL_DOCS=$(usex doc)
 		-DLLVM_STATIC=ON
@@ -84,5 +83,5 @@ src_configure() {
 		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 84a164057290..b582c0e424cf 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index 1b109fd6da7f..5404d30fd501 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc Doxygen)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index 48580481fd2b..20e552cd3441 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
 HOMEPAGE="http://ptex.us/"
@@ -27,7 +27,7 @@ src_prepare() {
 	cat <<-EOF > version || die
 	${PV}
 	EOF
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
 		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
index 745430f452c0..190a657b9151 100644
--- a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
+++ b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Morse-code tutor using the Koch method"
 HOMEPAGE="https://github.com/hmatuschek/kochmorse"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/kochmorse-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# Upstream uses a non-standard category in release 3.4.0. I submitted
 	# a fix which has been accepted, but not yet released.
 	sed -i -e 's/Teaching;/X-Teaching;/' shared/kochmorse.desktop || die
diff --git a/media-video/qmplay2/qmplay2-19.12.19.ebuild b/media-video/qmplay2/qmplay2-19.12.19.ebuild
index 4d0ece7c31c7..d77ba82ead27 100644
--- a/media-video/qmplay2/qmplay2-19.12.19.ebuild
+++ b/media-video/qmplay2/qmplay2-19.12.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
 HOMEPAGE="https://github.com/zaps166/QMPlay2"
@@ -73,7 +73,7 @@ src_prepare() {
 		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
 		-i src/gui/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -125,7 +125,7 @@ src_configure() {
 		mycmakeargs+=( USE_GIT_VERSION=OFF )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 4d0ece7c31c7..d77ba82ead27 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
 HOMEPAGE="https://github.com/zaps166/QMPlay2"
@@ -73,7 +73,7 @@ src_prepare() {
 		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
 		-i src/gui/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -125,7 +125,7 @@ src_configure() {
 		mycmakeargs+=( USE_GIT_VERSION=OFF )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
index e25b35dcf374..373269e6e349 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -65,5 +65,5 @@ src_configure() {
 		-DWITH_IPv6=$(usex ipv6 ON OFF)
 		-DWITH_SASL=$(usex sasl ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
index cedaa4a52fe6..9661224c2a15 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -69,5 +69,5 @@ src_configure() {
 		-DWITH_IPv6=$(usex ipv6 ON OFF)
 		-DWITH_SASL=$(usex sasl ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
index 3085ee7a3745..e56ca1cc2f44 100644
--- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
 HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
@@ -40,7 +40,7 @@ src_prepare() {
 	sed -e "/qxmpptransfermanager/d" \
 		-i tests/CMakeLists.txt || die "failed to drop single test"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -54,5 +54,5 @@ src_configure() {
 		-DWITH_VPX=$(usex vpx)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-misc/seafile-client/seafile-client-6.2.11.ebuild b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
index 311ec1fd77c6..77928c949098 100644
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -40,7 +40,7 @@ src_configure() {
 		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/seafile-client/seafile-client-7.0.2.ebuild b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
index 972e54b95f82..fa31e1e217d9 100644
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -41,7 +41,7 @@ src_configure() {
 		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/seafile-client/seafile-client-7.0.4.ebuild b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
index 972e54b95f82..fa31e1e217d9 100644
--- a/net-misc/seafile-client/seafile-client-7.0.4.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -41,7 +41,7 @@ src_configure() {
 		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild
index e394deff72a0..012870955efa 100644
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/${PN}"
@@ -32,16 +32,15 @@ src_configure() {
 		-DENABLE_MYSQL=$(usex mysql)
 		-DSYSTEMD_SERVICE=ON
 		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-	cmake-utils_src_test -j1
+	cmake_src_test -j1
 }
diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.13.0.ebuild
index 64ae38797920..b1e471124857 100644
--- a/net-proxy/trojan/trojan-1.13.0.ebuild
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/trojan"
@@ -33,16 +33,15 @@ src_configure() {
 		-DENABLE_MYSQL=$(usex mysql)
 		-DSYSTEMD_SERVICE=ON
 		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-	cmake-utils_src_test -j1
+	cmake_src_test -j1
 }
diff --git a/net-vpn/i2pd/i2pd-2.27.0.ebuild b/net-vpn/i2pd/i2pd-2.27.0.ebuild
index 099b9151f166..a24bc8dd650f 100644
--- a/net-vpn/i2pd/i2pd-2.27.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.27.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# config
 	insinto /etc/i2pd
diff --git a/net-vpn/i2pd/i2pd-2.28.0.ebuild b/net-vpn/i2pd/i2pd-2.28.0.ebuild
index 099b9151f166..a24bc8dd650f 100644
--- a/net-vpn/i2pd/i2pd-2.28.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.28.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# config
 	insinto /etc/i2pd
diff --git a/net-vpn/i2pd/i2pd-2.29.0.ebuild b/net-vpn/i2pd/i2pd-2.29.0.ebuild
index 5982e199dbce..06d8abe7e506 100644
--- a/net-vpn/i2pd/i2pd-2.29.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -65,11 +65,11 @@ src_configure() {
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# config
 	insinto /etc/i2pd
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
index b92483ba721f..585f02e1660a 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
index 0f091fe6412e..fb2e982ebfd8 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -55,11 +55,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -90,7 +90,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index ffc8e7dc8743..9c27c2d98efa 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
index ccda066630dd..1ef3af47246f 100644
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 16c08cfb9320..66433421fc47 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 8443bf3f67a9..675c07b071b1 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -56,11 +56,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -73,7 +73,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
index a1d2016e4d4d..96a4641a9fb3 100644
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils linux-info
+inherit cmake linux-info
 
 DESCRIPTION="Thunderbolt(TM) user-space components"
 HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
@@ -30,11 +30,11 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	cmake_comment_add_subdirectory docs
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman tbtadm.1
 }
diff --git a/x11-apps/copyq/copyq-3.8.0.ebuild b/x11-apps/copyq/copyq-3.8.0.ebuild
index 7139966cb746..9f5c1deeaa86 100644
--- a/x11-apps/copyq/copyq-3.8.0.ebuild
+++ b/x11-apps/copyq/copyq-3.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake gnome2-utils
 
 MY_P=CopyQ-${PV}
 
@@ -46,7 +46,7 @@ src_configure() {
 		-DWITH_WEBKIT=$(usex webkit)
 		-DCMAKE_INSTALL_MANDIR="share/man"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index 90a64046885d..15a2ad641c5e 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
 			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	multilib_parallel_foreach_abi abi_configure
 }
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
index baca3aa94532..b1f2ed56343a 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
 			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	multilib_parallel_foreach_abi abi_configure
 }