gentoo auto-resync : 07:06:2024 - 00:08:01

4 files changed, 3 insertions, 89 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a7348e120159..5a359ac5ba8b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index 8daaa9683ca3..c8f0bcb6fbdd 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,6 +1,4 @@
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
-DIST cava-0.10.1.tar.gz 129520 BLAKE2B 181a511feb8b9a6806316264c27e963fe7827802d8e333c39d59a0e3f67dd57bea967b05aeb869455992b905afd9c6e3f568debb84155068cbef03621047da6b SHA512 8a71628bae6621ef925f5fed94659b07d9220e142c17514bed79e1105a9160494bf3978267c9de3ab6cd2126ece50419fb4245ccf190f3a299fc0cfb111be354
 DIST cava-0.10.2.tar.gz 130036 BLAKE2B 155a0152571a6b1b847340fe438389f58b963af047d4136595a8b2933a4ac5b1fff87600110765c7c1500072ebd8b730d971918b8701598526052d137465ac81 SHA512 c28ef5a89668b8f90a3b4cbf71b208dd067268d5ed9eca35ff3881bfab0fd7bf72efe2164f29af47ca7972637d8f1d6a86ff2b2e0c9c9221a1856d8dfa960065
-EBUILD cava-0.10.1.ebuild 2264 BLAKE2B bffc698aadcfe96c2f4c170f3cc8dabbb31a78c854598d64dc2bca802cc5485cce48e395cda33eb689f2f08874ef8240c55a7fd1dd9553cef578513940c02167 SHA512 0aa8b4795200daefd052dfe145e1052609b3880eeec09254ebd9e234610097672ecc893f17d6c672645654da216f02ed966cdd51ba0da15f9edd1945e3fbd44e
-EBUILD cava-0.10.2.ebuild 2370 BLAKE2B 341396683022860812ccaaaf4b9bfa9f5a678594063883cbc067107a6008a6ae9e31dcf91af3eda82a29b58834d4673a31249672690385a522b0366322aab447 SHA512 0d480e38323b9f775f4839370ad13bf7e09aef75e474b16d6155a7042734100debcea56785e53aac042efda3e106cf6635e32c9e3c505be4d8caf5f3d6cfe4d9
+EBUILD cava-0.10.2.ebuild 2449 BLAKE2B 1068495efcd9d045bb3fe3661b2446f826b6ec120f9fa5b06e7a4a2ed11362d737099b38815209f007bae25161a346280f0ca68dd9180e1bf4d9f9f395e5d313 SHA512 866aed05f57cab0e91d65238805f782b0e31f1f4901ddb4e3fce4c422e154ef60d35d3a4eb4928c26ec0a5e05d76c510dc60fe8240ead0d1058eefe475780f8a
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.10.1.ebuild b/media-sound/cava/cava-0.10.1.ebuild
deleted file mode 100644
index 7251e5fe1301..000000000000
--- a/media-sound/cava/cava-0.10.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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}"
-BDEPEND="
-	virtual/pkgconfig
-	sdl? ( dev-build/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 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)
-
-		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/cava/cava-0.10.2.ebuild b/media-sound/cava/cava-0.10.2.ebuild
index cd7b175c4340..799f0d561c41 100644
--- a/media-sound/cava/cava-0.10.2.ebuild
+++ b/media-sound/cava/cava-0.10.2.ebuild
@@ -39,7 +39,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	# TODO: depend on >=4.2.2 and drop the patch when it is stable
+	# TODO: depend on >=4.2.2 and remove after 4.2.2 is stable unless bug
+	# #933610 reintroduces slotting hacks (also drop GENTOO_SYSROOT below)
 	has_version '<dev-libs/iniparser-4.2.2:4' &&
 		eapply "${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch