commit: 06f462555fe7acf69ec61ed98a437cc74530e203 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Nov 15 22:00:12 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Nov 15 22:24:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f46255
media-sound/cava: add bounds for broken autoconf-archive Was trying to bump this and had kind of forgot this still was neither fixed nor masked downstream, so limit the version (and allow the next one by assuming that this will be fixed so that this will not need further attention/revbump). Closes: https://bugs.gentoo.org/941845 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-sound/cava/cava-0.10.2.ebuild | 12 +++++++++++- media-sound/cava/cava-0.10.3.ebuild | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) 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 index 92919781923f..dd7afa40f2d0 100644 --- a/media-sound/cava/cava-0.10.3.ebuild +++ b/media-sound/cava/cava-0.10.3.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() { @@ -49,6 +55,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 + # respect both ESYSROOT+slotting (can't use CPPFLAGS, comes before) sed -i "s|/usr/include/iniparser|${ESYSROOT}&${inip} |" configure.ac || die
