gentoo auto-resync : 23:09:2023 - 23:21:08

6 files changed, 2 insertions, 366 deletions

diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index af43b81430c8..2d166fcb107e 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,10 +1,5 @@
-AUX sdl2-mixer-2.0.4-fluidsynth.patch 1457 BLAKE2B 9b8914065ade05bcf70c3783ae22f732e5a401f74cdc39272865d5c6f0fa31c0ee89b16f642a5b5f69b77ecd9dc96cb7313d4dd6c55303efd5d128679f1cb6f3 SHA512 e268a5bf327f2203a7f48ed0cdc05f89fea778eac706555f21ee2b3cab761600988f385195c3078917c422bc70c7b96fff650a1a213370469fe07340dc7d7852
-AUX sdl2-mixer-2.0.4-slibtool.patch 3794 BLAKE2B 5e6f316a32a7c58abdbf764ada81c85e9db6509f99b3a7054de08ea90f1bf54d12bad6f177e7d76181d76f6b0d218acd1f44e8d50e91f7b3ef74056ddf3acd0b SHA512 da520853a59036ea413cc24964798fe40414c072612e2fa0bf79373be669b76d6b07a3853123317f25eb82db1a4dbd105b23469e6da14bb0596242fc1a9060d7
-DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 DIST SDL2_mixer-2.6.2.tar.gz 9934376 BLAKE2B 9cf378d03046389b3625b90ca7a4c34d9b80e0908bccef454adedc21f16f24d99acc0fc3522ba981be89d8c58c7a6e877e7d98c798b157529e2cb26141faec8c SHA512 16baa9d8b345bf0224538cbfb2ae9fc5d3deea2b454f41a98006c938fe7a65d5a8c84e28a76f98a4dd971c4fe5cf0219d8bf73331cf11f2702e01600eb197658
 DIST SDL2_mixer-2.6.3.tar.gz 9935069 BLAKE2B 9908bdc549300af05b4fbcbb6c0533913ae62bfa2f761118983e0da58a4bcd68c2d008fa5bbcd94b0141241e54f1cd507e275e2d4b637214b803dabdbc5b0250 SHA512 2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740
-EBUILD sdl2-mixer-2.0.4-r2.ebuild 3495 BLAKE2B e60946ff082f2e56017b3c2ff569fc1d414c9bf78e484e43f628e1ac8bba37216cc20197ab056306295defb303680a42a22769fb6d85f4b908f97fa60f679648 SHA512 f887456d210183651b46a502a001e3d8656c88aa85896d045b76311014a523e5c3c027c17d61591f8342ed63f54d0748635c3af0e2b9415e6d4a90ef19ac210d
-EBUILD sdl2-mixer-2.0.4-r3.ebuild 3547 BLAKE2B d87698586e5254f68a101bf6512fca733fadddba9188fe0e125d2d74194e9c14fb0c876df32c2f957a80e14c7a91bf2b01b9a9c392950563de472ffd67471663 SHA512 c52bf308bab225a1a17a0d40c7ed09843a9c95c06cef6379995a73f43ee33db0d10932f862e4144890fa3361906b5412482ffe59ebaa8ade19c7fcfbe68c40b3
 EBUILD sdl2-mixer-2.6.2-r1.ebuild 2973 BLAKE2B 6daaa2e74f6c627bdd7fd9305611c6b52d23d5ad306b3469739515b35e3d81c1c3fe74fad0639d371eba6026e41ebd7223b3cda5ec3fc4b2cc489f0492a824f9 SHA512 db80b931100d35ceb44a77a7172bf3dfd9311d412e60f859455905a1c8650350572901c2d9e322742bdc17fd2573297027ef3d78525e00a5240c07ec352901f0
-EBUILD sdl2-mixer-2.6.3.ebuild 2987 BLAKE2B c02cac736902fc910599f5d3fb5bcdcaaca76fca832dc347dcfd585936cfa6e6773092853e1eb99956d29e7ef16efc8d0972fffa1bde8f7f7ae98b956238b48f SHA512 0e4b1655778ec4a5af9e5fb4286e7a794f643f329f1a1f4e498b0e877c076cc909ce171f25eefe3a0eb921d6ff49954466ff511140f0652418c72a7cddb59f84
+EBUILD sdl2-mixer-2.6.3-r1.ebuild 3013 BLAKE2B 78aeae55c544cc870a53092089e36d369003e11ed6fa18da9b41509b3b8ba1df475aa914cbdab955872fc5abfcf7b8a25c7c98f10d9c45563a1dcd2fc5e354a8 SHA512 c177ef76182d1ddd0cef8b58b76f02935f70fbc8665546ab6b99e80e200fe6ddbc4d1001e18666f65cd40eb7380f8f0221b36c8a9d6466e8058b08bc32591033
 MISC metadata.xml 758 BLAKE2B 1f95dea5a9ad3e40050cb55bf829e89bc51d7c03525b5f91e3239d30ab6131390c0af595ca52ffb2257d11a11efe3c617291028dddd2a9fce76a815a74aa4389 SHA512 94bbb6ea83a1e975a701f7d885f83b56d8511eb69e8121126f46755377a3e966c89f3a3745530f5780d6bf81bb0a47b3b93dceb63ce44bcbe459718aebcf672d
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
deleted file mode 100644
index cd740ac85c11..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-fluidsynth.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6160668079f91d57a5d7bf0b40ffdd843be70daf Mon Sep 17 00:00:00 2001
-From: Sam Lantinga <slouken@libsdl.org>
-Date: Wed, 20 Jan 2021 10:17:10 -0800
-Subject: [PATCH] Fixed use-after-free in music_fluidsynth.c
-
-Tom M.
-
-There is a dangerous use-after-free in FLUIDSYNTH_Delete(): the settings object is deleted **before** the synth. Since the settings have been created first to initialize the synth, you must first delete the synth and then delete the settings. This currently crashes all applications that use fluidsynth 2.1.6 and SDL2_mixer. Please apply the attached patch and release a bug fix release.
-
-Originally reported at https://github.com/FluidSynth/fluidsynth/issues/748
----
- src/codecs/music_fluidsynth.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
-index 8667f0d9..a47247f4 100644
---- a/music_fluidsynth.c
-+++ b/music_fluidsynth.c
-@@ -285,9 +285,10 @@ static void FLUIDSYNTH_Stop(void *context)
- static void FLUIDSYNTH_Delete(void *context)
- {
-     FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
-+    fluid_settings_t *settings = fluidsynth.fluid_synth_get_settings(music->synth);
-     fluidsynth.delete_fluid_player(music->player);
--    fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(music->synth));
-     fluidsynth.delete_fluid_synth(music->synth);
-+    fluidsynth.delete_fluid_settings(settings);
-     SDL_free(music);
- }
- 
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch
deleted file mode 100644
index 374e1441fcd7..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.4-slibtool.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/777420
-
-commit 174dfd47e6da498dbaf057579a15235c077b71d0
-Author: orbea <orbea@riseup.net>
-Date:   Wed Mar 24 15:56:27 2021 -0700
-
-    fix build failure with slibtool and parallel make (#bug 5494)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2ff24b2..6774663 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46,7 +46,7 @@ LT_RELEASE  = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
--all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
-+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
- 
- $(srcdir)/configure: $(srcdir)/configure.in
- 	@echo "Warning, configure.in is out of date"
-@@ -56,8 +56,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
- Makefile: $(srcdir)/Makefile.in
- 	$(SHELL) config.status $@
- 
--$(objects):
--	$(SHELL) $(auxdir)/mkinstalldirs $@
-+$(objects)/.created:
-+	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
-+	touch $@
- 
- .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
- 
-diff --git a/configure.in b/configure.in
-index 240a322..557f640 100644
---- a/configure.in
-+++ b/configure.in
-@@ -695,14 +695,14 @@ OBJECTS=`echo $SOURCES`
- DEPENDS=`echo $SOURCES`
- OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c\\ \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- 
- OBJECTS_CXX=`echo $SOURCES_CXX`
- DEPENDS_CXX=`echo $SOURCES_CXX`
- OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
- DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
--$(objects)/\2.lo: \1/\2.cpp\\
-+$(objects)/\2.lo: \1/\2.cpp\\ \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- OBJECTS="$OBJECTS $OBJECTS_CXX"
- DEPENDS="$DEPENDS $DEPENDS_CXX"
-@@ -712,7 +712,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
- VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\
--$(objects)/\2.o: \1/\2.rc\\
-+$(objects)/\2.o: \1/\2.rc\\ \$(objects)/.created\\
- 	\$(WINDRES) \$< \$@,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
-@@ -721,7 +721,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES`
- PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES`
- PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c\\ \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
-@@ -730,7 +730,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES`
- PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES`
- PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c\\ \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild
deleted file mode 100644
index 284b373f782f..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="SDL2_mixer-${PV}"
-inherit autotools multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		!mad? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
-	)
-	opus? ( >=media-libs/opusfile-0.2 )
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.4-slibtool.patch"
-)
-
-src_prepare() {
-	default
-
-	# for slibtool patch in 2.0.4, can drop in future with eautoreconf
-	rm aclocal.m4 || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-music-cmd
-		$(use_enable wav music-wave)
-		$(use_enable mod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		--disable-music-mod-modplug-shared
-		$(use_enable mikmod music-mod-mikmod)
-		--disable-music-mod-mikmod-shared
-		$(use_enable midi music-midi)
-		$(use_enable timidity music-midi-timidity)
-		$(use_enable fluidsynth music-midi-fluidsynth)
-		--disable-music-midi-fluidsynth-shared
-		$(use_enable vorbis music-ogg)
-		$(use_enable tremor music-ogg-tremor)
-		--disable-music-ogg-shared
-		$(use_enable flac music-flac)
-		--disable-music-flac-shared
-		$(use_enable mp3 music-mp3)
-		$(use_enable !mad music-mp3-mpg123)
-		--disable-music-mp3-mpg123-shared
-		$(use_enable mad music-mp3-mad-gpl)
-		$(use_enable opus music-opus)
-		--disable-music-opus-shared
-		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools ; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi && use fluidsynth; then
-		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-		ewarn "environment variable to the location of a SoundFont file"
-		ewarn "unless the game or application happens to do this for you."
-		if use timidity; then
-			ewarn "Failing to do so will result in Timidity being used instead."
-		else
-			ewarn "Failing to do so will result in silence."
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild
deleted file mode 100644
index 5c41abfd3b64..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="SDL2_mixer-${PV}"
-inherit autotools multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		!mad? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
-	)
-	opus? ( >=media-libs/opusfile-0.2 )
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.4-slibtool.patch"
-	"${FILESDIR}/${PN}-2.0.4-fluidsynth.patch"
-)
-
-src_prepare() {
-	default
-
-	# for slibtool patch in 2.0.4, can drop in future with eautoreconf
-	rm aclocal.m4 || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-music-cmd
-		$(use_enable wav music-wave)
-		$(use_enable mod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		--disable-music-mod-modplug-shared
-		$(use_enable mikmod music-mod-mikmod)
-		--disable-music-mod-mikmod-shared
-		$(use_enable midi music-midi)
-		$(use_enable timidity music-midi-timidity)
-		$(use_enable fluidsynth music-midi-fluidsynth)
-		--disable-music-midi-fluidsynth-shared
-		$(use_enable vorbis music-ogg)
-		$(use_enable tremor music-ogg-tremor)
-		--disable-music-ogg-shared
-		$(use_enable flac music-flac)
-		--disable-music-flac-shared
-		$(use_enable mp3 music-mp3)
-		$(use_enable !mad music-mp3-mpg123)
-		--disable-music-mp3-mpg123-shared
-		$(use_enable mad music-mp3-mad-gpl)
-		$(use_enable opus music-opus)
-		--disable-music-opus-shared
-		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools ; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi && use fluidsynth; then
-		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-		ewarn "environment variable to the location of a SoundFont file"
-		ewarn "unless the game or application happens to do this for you."
-		if use timidity; then
-			ewarn "Failing to do so will result in Timidity being used instead."
-		else
-			ewarn "Failing to do so will result in silence."
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.3.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild
index 419bf0b80394..e6a2ad3f0a24 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.3.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild
@@ -59,6 +59,7 @@ multilib_src_configure() {
 		$(use_enable fluidsynth music-midi-fluidsynth)
 		--disable-music-midi-fluidsynth-shared
 		$(use_enable vorbis music-ogg)
+		--disable-music-ogg-stb
 		$(usex vorbis \
 			$(use_enable !tremor music-ogg-vorbis) \
 			--disable-music-ogg-vorbis)