6 files changed, 10 insertions, 154 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index df69ecf65155..e3788ed758d2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index 6a5745020a8d..ab528afa0351 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,8 +1,4 @@
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
-DIST cava-0.8.3.tar.gz 104797 BLAKE2B 0617273669fbd8d1c122e6b19975d54d42b5779339de89613b4fe5d6087bcf0ff93afe6234af238e489d6b72c3eca481140105000951ef007cc864b77ef49b65 SHA512 cd176428ff293572325d21769fd4fdb666b6301e0fe5c7a2c53af2399a26b3fd10e83647f9c9cc318f4c69cc28835323fb949cd76340c14670df8b544bffa0f0
-DIST cava-0.9.0.tar.gz 119267 BLAKE2B 6e409695fcc893892a1206b3d131fb091fcfac26db7f948d8d7b047e6e2a22bf05c613ff13b00b9a32c4eba6990a54755e1b2e816fe2db0e9f6140f688c2dd3a SHA512 ed5cd222565324553b598c01740c1178dcaf41f8fe715e301906f122e605e55ec080e3254e23459cab01d03ce5204bee1cc8821c871a5cb95181704522cec76d
 DIST cava-0.9.1.tar.gz 119287 BLAKE2B e6342ff8867747a2c15197c965b713e8ea1c5bd579725538e0e1745797280460ea6a7d6c5cca2776934eef24378d9661bcef5cfd5280a93de16b41201558c49d SHA512 21af220b53a2f45c8c43dfd2ba47c1c96a8fcccdbd11ca1ac59eea7a4f32c0e27c7d2056281d0293fd17d4d635b1c568c953567d6f0301c800b4a387332d2a7a
-EBUILD cava-0.8.3.ebuild 1429 BLAKE2B d68709ff51c6bd35aa418dad1a4682ad7e594f7a70cac02603e8f30b314406ddac11aee0f0343799265eba00cad2dacb51ca9d0ad47867c95f0354b4a31ae315 SHA512 7d3355742b32c92e3035eb1890e0dc9664fe650bc2fa0890b2be23664eb0209130a36aad88db5f1822b84d364343325b3e36e4d9d89a54683d4431b55b80acdc
-EBUILD cava-0.9.0.ebuild 2195 BLAKE2B c0901b7e6b64c8fb1a22c195e64070ddc26a5db1363155a516b819b0f45ec75a261d9df495ce29e70c13e8ddf6d8ca069360110e90be121ccaec6f51e1bde560 SHA512 db4a89c8d2401f7df93c4f3c373c58cacfcea9fc667df286bcd33247efc0363441c9df2f02f52e3efbc7c2e191664f45d3fb1f66e01fab1b49f11918d0ecfb76
 EBUILD cava-0.9.1.ebuild 2193 BLAKE2B 9f9b4405fd5a6474907775a3a95e255a71f0106e9a5e08e2484b0931b08b8f6f85506efff67d344745dea445b7c7f325a6c5280a6e6675abdfcdcda726cd3e5d SHA512 2b3286f9bde3148da1bd573467375f04d7ac1507699d66ee594f180230c6827bbb27173b804f954f97943221d59e7c4869c5681c8a3d7dd32765f1b2b45271b3
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.8.3.ebuild b/media-sound/cava/cava-0.8.3.ebuild
deleted file mode 100644
index ed077f42a0f1..000000000000
--- a/media-sound/cava/cava-0.8.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-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"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa +ncurses portaudio pulseaudio sdl sndio"
-
-RDEPEND="
-	dev-libs/iniparser:4
-	sci-libs/fftw:3.0=
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2[opengl,video] )
-	sndio? ( media-sound/sndio:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > version || die
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable alsa input-alsa)
-		$(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)
-
-		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
-	)
-
-	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/cava-0.9.0.ebuild b/media-sound/cava/cava-0.9.0.ebuild
deleted file mode 100644
index 88134f272ff1..000000000000
--- a/media-sound/cava/cava-0.9.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2022-2023 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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +ncurses pipewire portaudio pulseaudio sdl sndio"
-
-RDEPEND="
-	dev-libs/iniparser:4
-	sci-libs/fftw:3.0=
-	alsa? ( media-libs/alsa-lib )
-	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}"
-BDEPEND="
-	virtual/pkgconfig
-	sdl? ( sys-devel/autoconf-archive )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > version || die
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable alsa input-alsa)
-		$(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)
-
-		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
-	)
-
-	# 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."
-	elif ver_test ${REPLACING_VERSIONS##* } -lt 0.9; then
-		elog "If used, the noise_reduction config option in ~/.config/cava/config needs"
-		elog "to be updated from taking a float to integer (e.g. replace 0.77 with 77)."
-	fi
-}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 3441775efea3..f1f34b299180 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
 EBUILD jack2-1.9.22.ebuild 2569 BLAKE2B a311750d35f22f0e294d60207aa3384aeb2074f0c2c358ad41595ab94710ebab63d067a693065014cb63c7a19ea6203e1a26d49339867746016bc861cd52813c SHA512 6c0382d8776efb70bb11134a0db0dad0c08a2b21d5ac9bc755dbe7013435b0b4433b7fb9794a7118543ff395172930c1b28ed42905b5ebeb373888df2f6cb892
-EBUILD jack2-9999.ebuild 2575 BLAKE2B 79fe3564746ce8bb349bc1f0d7addd4bf03cf746250f2140b31e73a5463546dc713f761e67bc019dff2d02668d055340740432180884c20e9d8db060e4f4bf4f SHA512 228742ca5683228d7c9a725cc9b375339bab279cefb19eac0acab476efd8a40341d516b668367cd519ec75641538200c84b47c97c30148e499a8ac65e839ddbe
+EBUILD jack2-9999.ebuild 2580 BLAKE2B 95cee4f46fa25805a003d15e8c7685a52e0e620fa3903c77a0b4a0f0fb6fa39cd4b5945a6aa72afe53df2fa863112bf3cc97b59f49dcdd6b695da5307414efac SHA512 1d8bf54f6e2565976463f4ee3602499014a972916d2606a122eb5b81cc8b8d8c57c5d44fa36282003eebe90081136e0dee2a703fb76f1749dcbcf78879a970ed
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 8fa6ca5113f5..5b6b8a0a95b6 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
@@ -23,7 +23,8 @@ SLOT="2"
 IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
+	|| ( classic dbus )
+"
 
 DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -35,7 +36,8 @@ DEPEND="
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
-	systemd? ( classic? ( sys-apps/systemd:= ) )"
+	systemd? ( classic? ( sys-apps/systemd:= ) )
+"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -46,11 +48,13 @@ RDEPEND="
 	)
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit
-	!media-video/pipewire[jack-sdk(-)]"
+	!media-video/pipewire[jack-sdk(-)]
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 # tools were formerly provided here, pull to maintain expectations
 PDEPEND="tools? ( media-sound/jack-example-tools )"