[gentoo-commits] repo/gentoo:master commit in: media-sound/cava/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     7cb90741458039de6b1f96bc3c447c60d70bac44
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 02:10:32 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 05:18:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb90741

media-sound/cava: update for unslotted iniparser

Technically should work with iniparser-3 as well (has compatibility
code), but add a lower bound anyway to ensure does not attempt to use
4.1-r1 (3 is due for removal either way).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../cava/{cava-0.10.3.ebuild => cava-0.10.3-r1.ebuild}  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/media-sound/cava/cava-0.10.3.ebuild b/media-sound/cava/cava-0.10.3-r1.ebuild
similarity index 81%
rename from media-sound/cava/cava-0.10.3.ebuild
rename to media-sound/cava/cava-0.10.3-r1.ebuild
index a84de68609b1..d889ed577fb5 100644
--- a/media-sound/cava/cava-0.10.3.ebuild
+++ b/media-sound/cava/cava-0.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
 
 RDEPEND="
-	dev-libs/iniparser:4
+	>=dev-libs/iniparser-4.1-r2:=
 	sci-libs/fftw:3.0=
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
@@ -45,22 +45,15 @@ BDEPEND="
 "
 
 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
+	# respect ESYSROOT for iniparser (can't use CPPFLAGS, comes before),
+	# ideally upstream could try pkg-config first (only in >=iniparser-4.2)
+	[[ -z ${ESYSROOT} ]] || sed -i "s|/usr|${ESYSROOT}&|" configure.ac || die
 
 	echo ${PV} > version || die
 	eautoreconf