[gentoo-commits] repo/gentoo:master commit in: app-emulation/faudio/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     c9a875a5033ae3bf563c9136d0dd120f9c696e2e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 11:19:44 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 17:02:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a875a5

app-emulation/faudio: Switch to cmake.eclass

Drop superfluous COMMON_DEPEND
Drop superfluous CMAKE_INSTALL_PREFIX, set by cmake.eclass

Use of CMAKE_INSTALL_<dir> variables looks like a workaround of wrong upstream
usage of GNUInstallDirs but should be fixed upstream.

Closes: https://bugs.gentoo.org/770532
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-emulation/faudio/faudio-21.01.ebuild | 15 ++++++---------
 app-emulation/faudio/faudio-9999.ebuild  | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app-emulation/faudio/faudio-21.01.ebuild b/app-emulation/faudio/faudio-21.01.ebuild
index 52c652a5959..51ecd606fc2 100644
--- a/app-emulation/faudio/faudio-21.01.ebuild
+++ b/app-emulation/faudio/faudio-21.01.ebuild
@@ -4,6 +4,7 @@
 # shellcheck disable=SC2034
 EAPI=7
 
+CMAKE_ECLASS=cmake
 CMAKE_MAKEFILE_GENERATOR="emake"
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
@@ -31,24 +32,20 @@ IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
-COMMON_DEPEND="
+DEPEND="
 	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 	)
 "
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -57,7 +54,7 @@ multilib_src_configure() {
 		"-DGSTREAMER=$(usex gstreamer ON OFF)"
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_configure() {
@@ -65,13 +62,13 @@ src_configure() {
 }
 
 multilib_src_compile() {
-	cmake-utils_src_make
+	cmake_build
 	emake -C "${BUILD_DIR}" all
 }
 
 multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
-	cmake-utils_src_install
+	cmake_src_install
 
 	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
 		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \

diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index 52c652a5959..51ecd606fc2 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -4,6 +4,7 @@
 # shellcheck disable=SC2034
 EAPI=7
 
+CMAKE_ECLASS=cmake
 CMAKE_MAKEFILE_GENERATOR="emake"
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
@@ -31,24 +32,20 @@ IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
-COMMON_DEPEND="
+DEPEND="
 	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 	)
 "
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -57,7 +54,7 @@ multilib_src_configure() {
 		"-DGSTREAMER=$(usex gstreamer ON OFF)"
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_configure() {
@@ -65,13 +62,13 @@ src_configure() {
 }
 
 multilib_src_compile() {
-	cmake-utils_src_make
+	cmake_build
 	emake -C "${BUILD_DIR}" all
 }
 
 multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
-	cmake-utils_src_install
+	cmake_src_install
 
 	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
 		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \