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

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

20 files changed, 55 insertions, 54 deletions

diff --git a/app-arch/innoextract/innoextract-1.8.ebuild b/app-arch/innoextract/innoextract-1.8.ebuild
index b5df9fba5b81..5c58d878b0ff 100644
--- a/app-arch/innoextract/innoextract-1.8.ebuild
+++ b/app-arch/innoextract/innoextract-1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to unpack installers created by Inno Setup"
 HOMEPAGE="https://constexpr.org/innoextract/"
@@ -29,5 +29,5 @@ src_configure() {
 		-DWITH_CONV=$(usex iconv iconv builtin)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
index 9413734574c6..6ef9399da250 100644
--- a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="DataStax C/C++ Driver for Cassandra"
 HOMEPAGE="https://datastax.github.io/cpp-driver/"
@@ -24,5 +24,5 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=( -DCASS_USE_OPENSSL=$(usex ssl) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index 8cecb0a904af..ec3fa0a718e4 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 DESCRIPTION="High-performance regular expression matching library"
 HOMEPAGE="https://01.org/hyperscan"
@@ -33,5 +33,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
 		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
index 6e6970b8c429..f21c9535c2df 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1 flag-o-matic
+inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 src_prepare() {
 	# upstream workaround
 	append-cxxflags -Wno-redundant-move
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
 		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
index 6e6970b8c429..f21c9535c2df 100644
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1 flag-o-matic
+inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 src_prepare() {
 	# upstream workaround
 	append-cxxflags -Wno-redundant-move
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
 		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
index c5dadbd7bf7f..bb8d77db7914 100644
--- a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -47,5 +47,5 @@ src_prepare() {
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
index 12fcafb7f2c3..21c906d48591 100644
--- a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -45,5 +45,5 @@ src_prepare() {
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index b6517f3c57f3..6ff5cb3e1c08 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -38,12 +38,12 @@ src_prepare() {
 	if ! use graphviz; then
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_JUMBO=$(usex jumbo-build)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index b8d2337eeb5e..f430b5be2790 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index b8d2337eeb5e..f430b5be2790 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild
index c428effd2fe4..dea0ef8dd703 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles
+inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -42,7 +42,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
 		|| die "sed CMakeLists.txt failed"
@@ -63,15 +63,15 @@ src_configure() {
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newconfd "${FILESDIR}"/rspamd.conf rspamd
 	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 3a11c07504fe..c99c087f76d1 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles
+inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -42,7 +42,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
@@ -61,15 +61,15 @@ src_configure() {
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newconfd "${FILESDIR}"/rspamd.conf rspamd
 	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
index 33ece577af32..3ea88b323db1 100644
--- a/media-libs/libsoundio/libsoundio-2.0.0.ebuild
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="C library for cross-platform real-time audio input and output"
@@ -30,5 +31,5 @@ multilib_src_configure() {
 		-DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
 		-DBUILD_TESTS=no
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
index 725c5aaa0a45..ee2ac482713c 100644
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
 		"${S}"/scanner/inputaudio/input.c
 }
@@ -59,7 +59,7 @@ src_configure() {
 		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
 		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
index 4c6bb45b8be9..0608e103196a 100644
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -38,7 +38,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
 		"${S}"/scanner/inputaudio/input.c
 }
@@ -57,7 +57,7 @@ src_configure() {
 		-DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
 		-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
index fc1c8f6ae91c..4a5341b2b8bb 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
index e56f24c04c63..b14bcd42a76d 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3 multilib cmake-utils
+inherit git-r3 cmake
 
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild
index 11d676ea6137..d8e4d1d2a74b 100644
--- a/net-libs/tox/tox-0.2.10.ebuild
+++ b/net-libs/tox/tox-0.2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -38,7 +38,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	#remove faulty tests
 	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -81,11 +81,11 @@ src_configure() {
 		einfo "Logging disabled"
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild
index 5307394b1288..a6e9875d9fcb 100644
--- a/net-libs/tox/tox-0.2.9-r1.ebuild
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	#remove faulty tests
 	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -74,11 +74,11 @@ src_configure() {
 		einfo "Logging disabled"
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index 02c534562822..151001dd8ee2 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 systemd
+inherit cmake git-r3 systemd
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	#remove faulty tests
 	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -74,11 +74,11 @@ src_configure() {
 		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
 		einfo "Logging Disabled"
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use daemon; then
 		newinitd "${FILESDIR}"/initd tox-dht-daemon