5 files changed, 127 insertions, 2 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bf36079dd6b7..a56ae8476e9b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index c8f0bcb6fbdd..190fcea75ed4 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,4 +1,7 @@
+AUX cava-0.10.3-gentoo-iniparser4.patch 595 BLAKE2B f104814c900c35c6c841e2b6ee0844a23de0ad62d8b339f5cb6e25e45ee7238ddc8df7d7bf1d8da67bdc9fedfe2e06e61a7f95313ecd04813fb385f43aebb8cc SHA512 8e74219b51d7066e514d42400dfa94ba2438634238dcdbcc867ebc7216f38b91a5563e38cce6a0b59a1f2892be4e8d1b1a2c1901ecf975844fe7617958132830
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
 DIST cava-0.10.2.tar.gz 130036 BLAKE2B 155a0152571a6b1b847340fe438389f58b963af047d4136595a8b2933a4ac5b1fff87600110765c7c1500072ebd8b730d971918b8701598526052d137465ac81 SHA512 c28ef5a89668b8f90a3b4cbf71b208dd067268d5ed9eca35ff3881bfab0fd7bf72efe2164f29af47ca7972637d8f1d6a86ff2b2e0c9c9221a1856d8dfa960065
-EBUILD cava-0.10.2.ebuild 2449 BLAKE2B 1068495efcd9d045bb3fe3661b2446f826b6ec120f9fa5b06e7a4a2ed11362d737099b38815209f007bae25161a346280f0ca68dd9180e1bf4d9f9f395e5d313 SHA512 866aed05f57cab0e91d65238805f782b0e31f1f4901ddb4e3fce4c422e154ef60d35d3a4eb4928c26ec0a5e05d76c510dc60fe8240ead0d1058eefe475780f8a
+DIST cava-0.10.3.tar.gz 297550 BLAKE2B fbe4146aeeb07c99b37efd08a65e381e2cfc8800429fe3e144db76fc53c47f747f644d9d01146c7ec300d6b3d886492ab2cef44c1511691ec35b748f3fa188a2 SHA512 35ee4821e094c2ea567012329c21a8283450100eada4f7e33f7decd935db94adbefd2a2a41801e0ef49eea0dcd859c397c5b3dc7316f0640394d67e3b658876c
+EBUILD cava-0.10.2.ebuild 2759 BLAKE2B 35fe2f5bf2a8e30475742cc631a49245807893eab47c9cff13849e1abf2c15c0b430757f8461ada941b223f5b8f0307859c4f2cc765fa584bae2b857022bc6d3 SHA512 43b14d84e242a038d192ee22558b3a44fefd999562d9a5a7d40316126d5698632785153b6fed54234d5da28ce0baf8027bab2e2b20acae652fef9966c08a98db
+EBUILD cava-0.10.3.ebuild 2658 BLAKE2B bcc3a6901060f117e9393674214053f18c79b97d217c7db631f0ae3bd3d42b00e4ff8ab88628241a004a33827689614cb56ceaba10c9efa2345d995d29fd42d7 SHA512 d33734d3e126e6c9007bb8acbd751179444b20b82a974390625d5c24ccf5c81394c45476cb3e9559ad8153e4ef540c8e397b831830b2dc9853a28fd4871ff889
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.10.2.ebuild b/media-sound/cava/cava-0.10.2.ebuild
index 799f0d561c41..e3538ad7031b 100644
--- a/media-sound/cava/cava-0.10.2.ebuild
+++ b/media-sound/cava/cava-0.10.2.ebuild
@@ -33,9 +33,15 @@ RDEPEND="
 	sndio? ( media-sound/sndio:= )
 "
 DEPEND="${RDEPEND}"
+# bug #941845 wrt autoconf-archive bounds
 BDEPEND="
 	virtual/pkgconfig
-	sdl? ( dev-build/autoconf-archive )
+	sdl? (
+		|| (
+			>dev-build/autoconf-archive-2024.10.16
+			<dev-build/autoconf-archive-2024.10.16
+		)
+	)
 "
 
 src_prepare() {
@@ -46,6 +52,10 @@ src_prepare() {
 
 	default
 
+	# TODO: drop this when autoconf-archive is fixed (bug #941845), this is
+	# to handle the USE=-sdl case given it breaks it present
+	use sdl || sed -i 's/AX_CHECK_GL/&_DISABLED/' configure.ac || die
+
 	echo ${PV} > version || die
 	eautoreconf
 }
diff --git a/media-sound/cava/cava-0.10.3.ebuild b/media-sound/cava/cava-0.10.3.ebuild
new file mode 100644
index 000000000000..dd7afa40f2d0
--- /dev/null
+++ b/media-sound/cava/cava-0.10.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Console-based Audio Visualizer for Alsa"
+HOMEPAGE="https://github.com/karlstav/cava/"
+SRC_URI="
+	https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
+
+RDEPEND="
+	dev-libs/iniparser:4
+	sci-libs/fftw:3.0=
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ncurses? ( sys-libs/ncurses:= )
+	pipewire? ( media-video/pipewire:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libglvnd
+		media-libs/libsdl2[opengl,video]
+	)
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+# bug #941845 wrt autoconf-archive bounds
+BDEPEND="
+	virtual/pkgconfig
+	sdl? (
+		|| (
+			>dev-build/autoconf-archive-2024.10.16
+			<dev-build/autoconf-archive-2024.10.16
+		)
+	)
+"
+
+src_prepare() {
+	# TODO: depend on >=4.2.2 and remove after 4.2.2 is stable unless bug
+	# #933610 reintroduces slotting hacks (also drop ${inip} below)
+	local inip=
+	if has_version '<dev-libs/iniparser-4.2.2:4'; then
+		inip=4
+		eapply "${FILESDIR}"/${PN}-0.10.3-gentoo-iniparser4.patch
+	fi
+
+	default
+
+	# TODO: drop this when autoconf-archive is fixed (bug #941845), this is
+	# to handle the USE=-sdl case given it breaks it present
+	use sdl || sed -i 's/AX_CHECK_GL/&_DISABLED/' configure.ac || die
+
+	# respect both ESYSROOT+slotting (can't use CPPFLAGS, comes before)
+	sed -i "s|/usr/include/iniparser|${ESYSROOT}&${inip} |" configure.ac || die
+
+	echo ${PV} > version || die
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable alsa input-alsa)
+		$(use_enable jack input-jack)
+		$(use_enable pipewire input-pipewire)
+		$(use_enable portaudio input-portaudio)
+		$(use_enable pulseaudio input-pulse)
+		$(use_enable sndio input-sndio)
+
+		$(use_enable ncurses output-ncurses)
+		$(use_enable sdl output-sdl)
+		# note: not behind USE=opengl and sdl2[opengl?] given have not gotten
+		# normal output-sdl to work without USE=opengl on sdl either way
+		$(use_enable sdl output-sdl_glsl)
+	)
+
+	# autoconf-archive (currently) does not support -lOpenGL for libglvnd[-X]
+	use sdl && econfargs+=( GL_LIBS="$($(tc-getPKG_CONFIG) --libs opengl || die)" )
+
+	econf "${econfargs[@]}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS##* } ]]; then
+		elog "A default ~/.config/cava/config will be created after initial"
+		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
+		elog "for configuring audio input and more."
+	fi
+}
diff --git a/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch b/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch
new file mode 100644
index 000000000000..30b9d9dc4600
--- /dev/null
+++ b/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch
@@ -0,0 +1,15 @@
+Gentoo uses non-standard naming for slotted iniparser:4 and it
+does not have a pkg-config file (ideally should be unslotted).
+Cava can use iniparser:0 as well but <3.2 forces legacy mode.
+
+See also: https://bugs.gentoo.org/933610
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,5 +424,5 @@
+ 
+-AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
++AC_CHECK_LIB(iniparser4,iniparser_load, have_iniparser=yes, have_iniparser=no)
+     if [[ $have_iniparser = "yes" ]] ; then
+-    LIBS="$LIBS -liniparser"
++    LIBS="$LIBS -liniparser4"
+     if [[ $build_mac = "yes" ]] ; then