media-sound/cava: Bump version

Add a new sndio backend and fix autotool usage

Package-Manager: Portage-3.0.18, Repoman-3.0.3

4 files changed, 44 insertions, 33 deletions

diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index 88da334..33010d2 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1 +1 @@
-DIST cava-0.7.2.tar.gz 53093 BLAKE2B 4f230c9145a9f6c62b05c5834865f227a614b0259d1dc483b8e5998517e397d37677c42451608a1a9392c2ff1383c42db36fcc449365f8a1181169c22cae7bbe SHA512 f1bc3af88fa167bdd966331f34ac7bd87063c5f2ba0bc440665a2fbadb0b8d1004775ce2511709d2e3c9d1c854d3acffe1c0fa6d951a8005d9dd56c0636568a5
+DIST cava-0.7.4.tar.gz 101847 BLAKE2B a207d339e5e16ddeecc3100328006f9b082040f0085f4658125d901d03a6b66fbaa01493ed7efccf8f015f024fbad5ae0a5736270acfee4e1a8415b968d42a7a SHA512 7ab230a479f1643e034ad472b1007589d20cc7d977dec067831321c6a9204c2a7ccc174d77035ace4e8a714a660c2f8d93b3a64ed87fe36d364dc5aff1e45756
diff --git a/media-sound/cava/cava-0.7.2-r1.ebuild b/media-sound/cava/cava-0.7.4.ebuild
index 97cd474..7203355 100644
--- a/media-sound/cava/cava-0.7.2-r1.ebuild
+++ b/media-sound/cava/cava-0.7.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/karlstav/cava.git"
 fi
 
-inherit linux-info eutils autotools ${SCM}
+inherit autotools ${SCM}
 
 DESCRIPTION="Console-based audio visualizer for ALSA"
 HOMEPAGE="https://github.com/karlstav/cava"
@@ -23,28 +23,28 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="alsa debug portaudio pulseaudio system-iniparser"
+IUSE="alsa debug portaudio pulseaudio sndio system-iniparser"
 
 DEPEND="
-	sci-libs/fftw:3.0
-	sys-libs/ncurses
-	system-iniparser? ( dev-libs/iniparser:4 )
-"
-RDEPEND="${DEPEND}
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
 	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndio? ( media-sound/sndio )
+	system-iniparser? ( dev-libs/iniparser:4 )
+	sys-libs/ncurses
+	sci-libs/fftw:3.0
 "
+RDEPEND="${DEPEND}"
 BDEPEND=""
 
-DOCS=( README.md example_files/ )
-
-CONFIG_CHECK=(
-	SND_ALOOP
+DOCS=(
+	README.md
+	example_files/
 )
 
 src_prepare() {
-	eapply_user
+	default
+
 	eautoreconf
 }
 
@@ -52,10 +52,12 @@ src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable alsa input-alsa) \
-		$(use_enable pulseaudio input-pulse) \
 		$(use_enable portaudio input-portaudio) \
+		$(use_enable pulseaudio input-pulse) \
+		$(use_enable sndio input-sndio) \
 		$(use_enable system-iniparser) \
-		--docdir="${EREFIX}/usr/share/doc/${PF}"
+		--prefix="${EPREFIX}/usr" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
 src_compile() {
@@ -63,6 +65,8 @@ src_compile() {
 }
 
 src_install() {
+	emake install \
+		DESTDIR="${D}"
+
 	einstalldocs
-	emake DESTDIR="${D}" PREFIX=/usr install
 }
diff --git a/media-sound/cava/cava-9999.ebuild b/media-sound/cava/cava-9999.ebuild
index 97cd474..7203355 100644
--- a/media-sound/cava/cava-9999.ebuild
+++ b/media-sound/cava/cava-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/karlstav/cava.git"
 fi
 
-inherit linux-info eutils autotools ${SCM}
+inherit autotools ${SCM}
 
 DESCRIPTION="Console-based audio visualizer for ALSA"
 HOMEPAGE="https://github.com/karlstav/cava"
@@ -23,28 +23,28 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="alsa debug portaudio pulseaudio system-iniparser"
+IUSE="alsa debug portaudio pulseaudio sndio system-iniparser"
 
 DEPEND="
-	sci-libs/fftw:3.0
-	sys-libs/ncurses
-	system-iniparser? ( dev-libs/iniparser:4 )
-"
-RDEPEND="${DEPEND}
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
 	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndio? ( media-sound/sndio )
+	system-iniparser? ( dev-libs/iniparser:4 )
+	sys-libs/ncurses
+	sci-libs/fftw:3.0
 "
+RDEPEND="${DEPEND}"
 BDEPEND=""
 
-DOCS=( README.md example_files/ )
-
-CONFIG_CHECK=(
-	SND_ALOOP
+DOCS=(
+	README.md
+	example_files/
 )
 
 src_prepare() {
-	eapply_user
+	default
+
 	eautoreconf
 }
 
@@ -52,10 +52,12 @@ src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable alsa input-alsa) \
-		$(use_enable pulseaudio input-pulse) \
 		$(use_enable portaudio input-portaudio) \
+		$(use_enable pulseaudio input-pulse) \
+		$(use_enable sndio input-sndio) \
 		$(use_enable system-iniparser) \
-		--docdir="${EREFIX}/usr/share/doc/${PF}"
+		--prefix="${EPREFIX}/usr" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
 src_compile() {
@@ -63,6 +65,8 @@ src_compile() {
 }
 
 src_install() {
+	emake install \
+		DESTDIR="${D}"
+
 	einstalldocs
-	emake DESTDIR="${D}" PREFIX=/usr install
 }
diff --git a/media-sound/cava/metadata.xml b/media-sound/cava/metadata.xml
index c09d05c..979c962 100644
--- a/media-sound/cava/metadata.xml
+++ b/media-sound/cava/metadata.xml
@@ -6,6 +6,9 @@
 		<name>azahi</name>
 	</maintainer>
 	<use>
+		<flag name="sndio">
+			Enable support for the media-sound/sndio backend.
+		</flag>
 		<flag name="system-iniparser">
 			Use the system-wide dev-libs/iniparser instead of bundled.
 		</flag>