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

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

11 files changed, 42 insertions, 43 deletions

diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
index 8184eff54ffc..de8b8d6c52df 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Fast and light music player"
 HOMEPAGE="https://gogglesmm.github.io"
@@ -41,5 +41,5 @@ src_configure() {
 		-DWITH_NLS="$(usex nls)"
 		-DWITH_CFOX=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
index f2fac2cf6422..3d5f9f04861d 100644
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="FastTracker 2 inspired music tracker"
 HOMEPAGE="https://milkytracker.titandemo.org/"
@@ -31,15 +31,14 @@ S="${WORKDIR}/MilkyTracker-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package jack JACK)
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package jack JACK)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newicon resources/pictures/carton.png ${PN}.png
 	make_desktop_entry ${PN} MilkyTracker ${PN} \
diff --git a/media-sound/musescore/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
index 3055267da6e9..cd4bca0639e6 100644
--- a/media-sound/musescore/musescore-3.3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -59,7 +59,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +81,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index 3055267da6e9..cd4bca0639e6 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -59,7 +59,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +81,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
index 0533ecb9ffba..f697f3706776 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -59,7 +59,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +81,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f55fab5973b2..6b06e3b852c2 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake-utils xdg check-reqs
+inherit git-r3 cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -62,7 +62,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -84,11 +84,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index ba1cd14b3f13..f3bc7b03bda3 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -104,7 +104,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -156,7 +156,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
index 88c814b238e9..b403c47023bc 100644
--- a/media-sound/qmmp/qmmp-1.3.4.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -103,7 +103,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -155,7 +155,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qmmp/qmmp-1.3.5.ebuild b/media-sound/qmmp/qmmp-1.3.5.ebuild
index 88c814b238e9..b403c47023bc 100644
--- a/media-sound/qmmp/qmmp-1.3.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -103,7 +103,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -155,7 +155,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 88c814b238e9..b403c47023bc 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -103,7 +103,7 @@ src_prepare() {
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -155,7 +155,7 @@ src_configure() {
 		-DUSE_WAVPACK="$(usex wavpack)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
index 4acbf0c9ea5c..442d7fa96369 100644
--- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
 HOMEPAGE="https://yoshimi.github.io/"
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
 DOCS=( Changelog README.txt )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# respect doc dir
 	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
 }
@@ -47,5 +47,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DLV2Plugin=$(usex lv2)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }