media-sound/cava: Update, bump (fixes #2)

5 files changed, 142 insertions, 49 deletions

diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index d897073..88da334 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1 +1 @@
-DIST cava-0.6.1.tar.gz 42285 BLAKE2B 223ff999331590059019682a5f73b18c6bafea1345e745d9992dd5426b3e196bb55e7bbbb3d866c66365bc05750aa661852525c435cc1467ea6bdaf778ed33f9 SHA512 fb8a685f5c758ca1d95d3bbafadd4dbbf109592b6c3052b0821c2f69f3423e0af7657de4c3c1cdbd1523748bf56a09cbf706afa404051a6fba8139ca128ebecb
+DIST cava-0.7.2.tar.gz 53093 BLAKE2B 4f230c9145a9f6c62b05c5834865f227a614b0259d1dc483b8e5998517e397d37677c42451608a1a9392c2ff1383c42db36fcc449365f8a1181169c22cae7bbe SHA512 f1bc3af88fa167bdd966331f34ac7bd87063c5f2ba0bc440665a2fbadb0b8d1004775ce2511709d2e3c9d1c854d3acffe1c0fa6d951a8005d9dd56c0636568a5
diff --git a/media-sound/cava/cava-0.6.1-r1.ebuild b/media-sound/cava/cava-0.6.1-r1.ebuild
deleted file mode 100644
index 573cf1e..0000000
--- a/media-sound/cava/cava-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info eutils autotools
-
-DESCRIPTION="Console-based audio visualizer for Alsa (MPD and Pulseaudio)"
-HOMEPAGE="https://github.com/karlstav/cava"
-SRC_URI="https://github.com/karlstav/cava/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/iniparser:0
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-DOCS="README.md"
-
-CONFIG_CHECK=(
-	SND_ALOOP
-)
-
-src_prepare() {
-	rm --recursive --force iniparser/src || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug ) \
-		--enable-legacy_iniparser \
-		--docdir="${EREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	emake SYSTEM_LIBINIPARSER=1 VERSION=${PV}
-}
-
-src_install() {
-	einstalldocs
-	emake DESTDIR="${D}" PREFIX=/usr SYSTEM_LIBINIPARSER=1 install
-}
diff --git a/media-sound/cava/cava-0.7.2.ebuild b/media-sound/cava/cava-0.7.2.ebuild
new file mode 100644
index 0000000..5c6fbd6
--- /dev/null
+++ b/media-sound/cava/cava-0.7.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/karlstav/cava.git"
+fi
+
+inherit linux-info eutils autotools ${SCM}
+
+DESCRIPTION="Console-based audio visualizer for ALSA"
+HOMEPAGE="https://github.com/karlstav/cava"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/karlstav/cava/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa debug portaudio pulseaudio 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 )
+"
+BDEPEND=""
+
+DOCS="README.md"
+
+CONFIG_CHECK=(
+	SND_ALOOP
+)
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable alsa input-alsa) \
+		$(use_enable pulseaudio input-pulse) \
+		$(use_enable portaudio input-portaudio) \
+		$(use_enable system-iniparser) \
+		--docdir="${EREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	einstalldocs
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/media-sound/cava/cava-9999.ebuild b/media-sound/cava/cava-9999.ebuild
new file mode 100644
index 0000000..5c6fbd6
--- /dev/null
+++ b/media-sound/cava/cava-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/karlstav/cava.git"
+fi
+
+inherit linux-info eutils autotools ${SCM}
+
+DESCRIPTION="Console-based audio visualizer for ALSA"
+HOMEPAGE="https://github.com/karlstav/cava"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/karlstav/cava/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa debug portaudio pulseaudio 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 )
+"
+BDEPEND=""
+
+DOCS="README.md"
+
+CONFIG_CHECK=(
+	SND_ALOOP
+)
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable alsa input-alsa) \
+		$(use_enable pulseaudio input-pulse) \
+		$(use_enable portaudio input-portaudio) \
+		$(use_enable system-iniparser) \
+		--docdir="${EREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	einstalldocs
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/media-sound/cava/metadata.xml b/media-sound/cava/metadata.xml
index 7869e07..c09d05c 100644
--- a/media-sound/cava/metadata.xml
+++ b/media-sound/cava/metadata.xml
@@ -5,4 +5,9 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
+	<use>
+		<flag name="system-iniparser">
+			Use the system-wide dev-libs/iniparser instead of bundled.
+		</flag>
+	</use>
 </pkgmetadata>