gentoo auto-resync : 29:09:2024 - 01:25:46

8 files changed, 11 insertions, 906 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index be086b3134dc..4af051d8cc72 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,14 +1,7 @@
 AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad357093bc08a5c1767edb1c81c9099fd27aadbf0525ab0666a560a3c728983f425864f1f513693801a8fa50edde5d32a3703 SHA512 f578e5ab1852705cfad4bf8b4a8aa36fb34637f3b26b83a9821716d08fc1152d7ea18daea623f540c860cd7a7566c4b8902b2cac2ae6d541e36e7bd15363d58a
 AUX libsdl2-2.28.5-fix-libdecor-0.2.patch 1195 BLAKE2B cd07f864e8091796d20ade4f4fd9c62bd61d684da62e1639260b4737bf083f0828bcba116dc45f2db81dc3117853660e8fcaf143ffb192b6b30f41099d3aa256 SHA512 4291d5f8ca2370698ddb795c77673b110f802ab9c8c19213064b5e1268b5a92262b4cd065cf96c277a28ff319e8562ba6b7e74f5c53f0a60e22502d1b1b8fb03
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
-DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca
-DIST SDL2-2.30.3.tar.gz 7425677 BLAKE2B 9918723bc3a0bc3abfc6d47b4fc7eeabcafdc9925ee93e4f31b3637e843a5b060ae61aef9b93743340a9df914248cff510e5d38e758e032b5ed4df9eed587746 SHA512 75ddea9ac3c2130e9f6036b4718dbe3d9d1b40dab3cd48d3d488d5a397dd0c226c0573bf18d82eb41498800accf045e259d2ae305f069fad7b34e47a017f2372
-DIST SDL2-2.30.6.tar.gz 7524883 BLAKE2B 9e253d107c2af7ff0f7f67968be2cffc2358fbabd26d4ec46454a11ac53b64ac24a620947601901e43e470ad6b2bb89e273d04c9c2de12c6ab1dd6a4f78733ff SHA512 c73fd0b52e77d248a5dc2808a660ded9e708b87f68f677970da71e9b4a25ec60cf52f319b8b014ced7c9363560f2360262c04551a895f0f83ee62c3feeafba47
 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
-EBUILD libsdl2-2.28.5-r1.ebuild 7379 BLAKE2B bee43fbb9ad9c3c6f6e00b3fd6a676752a15bf26ab048a8ccd19f3e748fe2d4d81e45221e6aae22393619b4635bdf740da4320ece30c08b65c78d792aa4cbf89 SHA512 bd9a7071534a6d26444881b7def89475cfe61da16478b5da866729d8307ee8866b21c4e9f05ebcb1ef3a9ec5b15fd04c952eaf27a89678102c8435999ef334a2
-EBUILD libsdl2-2.28.5-r2.ebuild 7510 BLAKE2B 15ac19b073daea2b2d53160bbdfa2e8878645068fd86d348d615780235e45f954b108d110ace545c2afc95f50c96a02cbe785dd2c9e4411aeae09d1439a5393f SHA512 7749ffd5d9ff05adcc75f7d014dc7dd831719c2959af02a2594f487adb62e728ece3be7135dca24d5a2cf1ecbade7fc9e2551625878af472564b954267bf4540
-EBUILD libsdl2-2.30.2-r1.ebuild 5727 BLAKE2B a2ce997a892fd0367f0cf071482812eed493bf28ba9d60371bef81530953f92664b03a808d2ce18d9467b37683f3f3ddd280fb158474f0c29f805122e1f1cc12 SHA512 a01760065e8c8cd14716712e112f4858c97bf2ffdf1d483940fe4aef393344788157e6fa36e66539e87075d4332a5d0e7b68dfeadb1746e0f7ec8b4155cd876d
-EBUILD libsdl2-2.30.3.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c
-EBUILD libsdl2-2.30.6.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c
-EBUILD libsdl2-2.30.7.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c
-MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df
+EBUILD libsdl2-2.28.5-r3.ebuild 7506 BLAKE2B 06e0b8e280cb2c4da429e9e06751b8da6022a41d795ee71fdd6c01a7da33e4c3de78a3a53f416e57cf045b9a0695b4693ad0983f55ea02b98463a289773976f1 SHA512 bffadfe4c58b2df3b6f3bb31192a04b83061cf7899299388281525690f6cc0897ce10f5c20f2059223b8f3e4829ec0c044a7c3deba87fbae76204f9f57f2a58d
+EBUILD libsdl2-2.30.7-r1.ebuild 5818 BLAKE2B 8f3b184fcc680e666f8fba3334edcc0fe2043e3ee837bd6d6f1ac72ac126465ac76fddbe876101a3350a95c70983e110bdcdefe2422ef281fd5a4a1385f36ff4 SHA512 4bd2b5a925e6f8a0f4fb5f8c3a6ebb8d4dbbecf0855f1d19d841683e101b6be139aca0c908fbc79cc581ffe6a8c36d7c350c582b897f4a5482e6837c68364209
+MISC metadata.xml 1942 BLAKE2B 89c75b0790ba1e8c489c4d4d9fca4451a863068a4f75e5b97b408d7aba35fd9ba6ec5a855465588f5c143f09380835b89b637b8fb1e09c6b2391a79ed69144b9 SHA512 9e37d24a408b748fef53884442fe5ac5db548657675e23571705680b157cadcb584a059d7f066765fb68e80bf2ba247b2a01cfa095a465aa9dbf03db0e1c4334
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
deleted file mode 100644
index b69885b0dec7..000000000000
--- a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )
-"
-
-COMMON_DEPEND="
-	virtual/libiconv[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
-	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2(+)] )
-	ibus? ( app-i18n/ibus )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	wayland? ( >=dev-util/wayland-scanner-1.20 )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
-)
-
-src_prepare() {
-	default
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-	if ! use vulkan
-	then
-		sed -i '/testvulkan$(EXE) \\/d' "test/Makefile.in" || die
-	fi
-
-	# SDL seems to customize SDL_config.h.in to remove macros like
-	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
-	# being reintroduced.
-	# https://bugs.gentoo.org/764959
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \
-		eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	if use ibus; then
-		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
-	fi
-
-	# sorted by `./configure --help`
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--enable-system-iconv
-		--enable-atomic
-		$(use_enable sound audio)
-		$(use_enable video)
-		--enable-render
-		--enable-events
-		$(use_enable joystick)
-		$(use_enable haptic)
-		--enable-power
-		--enable-filesystem
-		$(use_enable threads pthreads)
-		--enable-timers
-		--enable-file
-		--enable-loadso
-		--enable-cpuinfo
-		--enable-assembly
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_sse ssemath)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable oss)
-		$(use_enable alsa)
-		--disable-alsa-shared
-		$(use_enable jack)
-		--disable-jack-shared
-		--disable-esd
-		$(use_enable pipewire)
-		--disable-pipewire-shared
-		$(use_enable pulseaudio)
-		--disable-pulseaudio-shared
-		--disable-arts
-		$(use_enable libsamplerate)
-		--disable-libsamplerate-shared
-		--disable-werror
-		$(use_enable nas)
-		--disable-nas-shared
-		$(use_enable sndio)
-		--disable-sndio-shared
-		$(use_enable sound diskaudio)
-		$(use_enable sound dummyaudio)
-		$(use_enable wayland video-wayland)
-		--disable-wayland-shared
-		--disable-libdecor
-		$(use_enable video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable X video-x11-xfixes)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		$(use_enable gles1 video-opengles1)
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
-		$(use_enable ibus)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-		ac_cv_header_libunwind_h=no
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use test; then
-		# Most of these workarounds courtesy Debian
-		# https://salsa.debian.org/sdl-team/libsdl2/-/blob/debian/latest/debian/rules
-		local mytestargs=(
-			--x-includes="/usr/include"
-			--x-libraries="/usr/$(get_libdir)"
-			SDL_CFLAGS="-I${S}/include"
-			SDL_LIBS="-L${BUILD_DIR}/build/.libs -lSDL2"
-			ac_cv_lib_SDL2_ttf_TTF_Init=no
-			CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-		)
-
-		mkdir "${BUILD_DIR}/test" || die
-		cd "${BUILD_DIR}/test" || die
-		ECONF_SOURCE="${S}/test" econf "${mytestargs[@]}"
-	fi
-}
-
-multilib_src_compile() {
-	emake all V=1
-	use test && emake -C test all V=1
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/build/.libs" emake -C test check V=1
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild
index 23b8259aee87..3f7518518e08 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild
@@ -15,11 +15,11 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	alsa? ( sound )
-	fcitx4? ( dbus )
+	fcitx? ( dbus )
 	gles1? ( video )
 	gles2? ( video )
 	haptic? ( joystick )
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	virtual/libiconv[${MULTILIB_USEDEP}]
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fcitx4? ( app-i18n/fcitx:4 )
+	fcitx? ( app-i18n/fcitx:* )
 	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
 	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2(+)] )
 	ibus? ( app-i18n/ibus )
@@ -206,7 +206,7 @@ multilib_src_configure() {
 		$(use_enable vulkan video-vulkan)
 		$(use_enable udev libudev)
 		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
+		$(use_enable fcitx fcitx)
 		$(use_enable ibus)
 		--disable-directx
 		--disable-rpath
diff --git a/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild b/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild
deleted file mode 100644
index 8ed1fef4584e..000000000000
--- a/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	test? ( static-libs )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )
-"
-
-COMMON_DEPEND="
-	virtual/libiconv[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	ibus? ( app-i18n/ibus )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
-	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	gles1? ( media-libs/libglvnd )
-	gles2? ( media-libs/libglvnd )
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	wayland? ( >=dev-util/wayland-scanner-1.20 )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-
-	local mycmakeargs=(
-		-DSDL_STATIC=$(usex static-libs)
-		-DSDL_SYSTEM_ICONV=ON
-		-DSDL_GCC_ATOMICS=ON
-		-DSDL_AUDIO=$(usex sound)
-		-DSDL_VIDEO=$(usex video)
-		-DSDL_JOYSTICK=$(usex joystick)
-		-DSDL_HAPTIC=$(usex haptic)
-		-DSDL_POWER=ON
-		-DSDL_FILESYSTEM=ON
-		-DSDL_PTHREADS=$(usex threads)
-		-DSDL_TIMERS=ON
-		-DSDL_FILE=ON
-		-DSDL_LOADSO=ON
-		-DSDL_ASSEMBLY=ON
-		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DSDL_SSEMATH=$(usex cpu_flags_x86_sse)
-		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
-		-DSDL_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DSDL_SSE=$(usex cpu_flags_x86_sse)
-		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
-		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
-		-DSDL_OSS=$(usex oss)
-		-DSDL_ALSA=$(usex alsa)
-		-DSDL_ALSA_SHARED=OFF
-		-DSDL_JACK=$(usex jack)
-		-DSDL_JACK_SHARED=OFF
-		-DSDL_ESD=OFF
-		-DSDL_PIPEWIRE=$(usex pipewire)
-		-DSDL_PIPEWIRE_SHARED=OFF
-		-DSDL_PULSEAUDIO=$(usex pulseaudio)
-		-DSDL_PULSEAUDIO_SHARED=OFF
-		-DSDL_ARTS=OFF
-		-DSDL_LIBSAMPLERATE=$(usex libsamplerate)
-		-DSDL_LIBSAMPLERATE_SHARED=OFF
-		-DSDL_WERROR=OFF
-		-DSDL_NAS=$(usex nas)
-		-DSDL_NAS_SHARED=OFF
-		-DSDL_SNDIO=$(usex sndio)
-		-DSDL_SNDIO_SHARED=OFF
-		-DSDL_DISKAUDIO=$(usex sound)
-		-DSDL_DUMMYAUDIO=$(usex sound)
-		-DSDL_WAYLAND=$(usex wayland)
-		-DSDL_WAYLAND_SHARED=OFF
-		-DSDL_RPI=OFF
-		-DSDL_X11=$(usex X)
-		-DSDL_X11_SHARED=OFF
-		-DSDL_X11_XSCRNSAVER=$(usex xscreensaver)
-		-DSDL_COCOA=$(usex aqua)
-		-DSDL_DIRECTFB=OFF
-		-DSDL_FUSIONSOUND=OFF
-		-DSDL_KMSDRM=$(usex kms)
-		-DSDL_KMSDRM_SHARED=OFF
-		-DSDL_DUMMYVIDEO=$(usex video)
-		-DSDL_OPENGL=$(usex opengl)
-		-DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF)
-		-DSDL_VULKAN=$(usex vulkan)
-		-DSDL_LIBUDEV=$(usex udev)
-		-DSDL_DBUS=$(usex dbus)
-		-DSDL_IBUS=$(usex ibus)
-		-DSDL_DIRECTX=OFF
-		-DSDL_RPATH=OFF
-		-DSDL_VIDEO_RENDER_D3D=OFF
-		-DSDL_TESTS=$(usex test)
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-src_test() {
-	unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS
-	cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
-	rm -r "${ED}"/usr/share/licenses/ || die
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.30.3.ebuild b/media-libs/libsdl2/libsdl2-2.30.3.ebuild
deleted file mode 100644
index a3648ce7571c..000000000000
--- a/media-libs/libsdl2/libsdl2-2.30.3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	test? ( static-libs )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )
-"
-
-COMMON_DEPEND="
-	virtual/libiconv[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	ibus? ( app-i18n/ibus )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		gui-libs/libdecor[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
-	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	gles1? ( media-libs/libglvnd )
-	gles2? ( media-libs/libglvnd )
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	wayland? ( >=dev-util/wayland-scanner-1.20 )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-
-	local mycmakeargs=(
-		-DSDL_STATIC=$(usex static-libs)
-		-DSDL_SYSTEM_ICONV=ON
-		-DSDL_GCC_ATOMICS=ON
-		-DSDL_AUDIO=$(usex sound)
-		-DSDL_VIDEO=$(usex video)
-		-DSDL_JOYSTICK=$(usex joystick)
-		-DSDL_HAPTIC=$(usex haptic)
-		-DSDL_POWER=ON
-		-DSDL_FILESYSTEM=ON
-		-DSDL_PTHREADS=$(usex threads)
-		-DSDL_TIMERS=ON
-		-DSDL_FILE=ON
-		-DSDL_LOADSO=ON
-		-DSDL_ASSEMBLY=ON
-		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DSDL_SSEMATH=$(usex cpu_flags_x86_sse)
-		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
-		-DSDL_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DSDL_SSE=$(usex cpu_flags_x86_sse)
-		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
-		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
-		-DSDL_OSS=$(usex oss)
-		-DSDL_ALSA=$(usex alsa)
-		-DSDL_ALSA_SHARED=OFF
-		-DSDL_JACK=$(usex jack)
-		-DSDL_JACK_SHARED=OFF
-		-DSDL_ESD=OFF
-		-DSDL_PIPEWIRE=$(usex pipewire)
-		-DSDL_PIPEWIRE_SHARED=OFF
-		-DSDL_PULSEAUDIO=$(usex pulseaudio)
-		-DSDL_PULSEAUDIO_SHARED=OFF
-		-DSDL_ARTS=OFF
-		-DSDL_LIBSAMPLERATE=$(usex libsamplerate)
-		-DSDL_LIBSAMPLERATE_SHARED=OFF
-		-DSDL_WERROR=OFF
-		-DSDL_NAS=$(usex nas)
-		-DSDL_NAS_SHARED=OFF
-		-DSDL_SNDIO=$(usex sndio)
-		-DSDL_SNDIO_SHARED=OFF
-		-DSDL_DISKAUDIO=$(usex sound)
-		-DSDL_DUMMYAUDIO=$(usex sound)
-		-DSDL_WAYLAND=$(usex wayland)
-		-DSDL_WAYLAND_SHARED=OFF
-		-DSDL_WAYLAND_LIBDECOR=$(usex wayland)
-		-DSDL_WAYLAND_LIBDECOR_SHARED=OFF
-		-DSDL_RPI=OFF
-		-DSDL_X11=$(usex X)
-		-DSDL_X11_SHARED=OFF
-		-DSDL_X11_XSCRNSAVER=$(usex xscreensaver)
-		-DSDL_COCOA=$(usex aqua)
-		-DSDL_DIRECTFB=OFF
-		-DSDL_FUSIONSOUND=OFF
-		-DSDL_KMSDRM=$(usex kms)
-		-DSDL_KMSDRM_SHARED=OFF
-		-DSDL_DUMMYVIDEO=$(usex video)
-		-DSDL_OPENGL=$(usex opengl)
-		-DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF)
-		-DSDL_VULKAN=$(usex vulkan)
-		-DSDL_LIBUDEV=$(usex udev)
-		-DSDL_DBUS=$(usex dbus)
-		-DSDL_IBUS=$(usex ibus)
-		-DSDL_CCACHE=OFF
-		-DSDL_DIRECTX=OFF
-		-DSDL_RPATH=OFF
-		-DSDL_VIDEO_RENDER_D3D=OFF
-		-DSDL_TESTS=$(usex test)
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-src_test() {
-	unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS
-	cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
-	rm -r "${ED}"/usr/share/licenses/ || die
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.30.6.ebuild b/media-libs/libsdl2/libsdl2-2.30.6.ebuild
deleted file mode 100644
index a3648ce7571c..000000000000
--- a/media-libs/libsdl2/libsdl2-2.30.6.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	test? ( static-libs )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )
-"
-
-COMMON_DEPEND="
-	virtual/libiconv[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	ibus? ( app-i18n/ibus )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		gui-libs/libdecor[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
-	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	gles1? ( media-libs/libglvnd )
-	gles2? ( media-libs/libglvnd )
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	wayland? ( >=dev-util/wayland-scanner-1.20 )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-
-	local mycmakeargs=(
-		-DSDL_STATIC=$(usex static-libs)
-		-DSDL_SYSTEM_ICONV=ON
-		-DSDL_GCC_ATOMICS=ON
-		-DSDL_AUDIO=$(usex sound)
-		-DSDL_VIDEO=$(usex video)
-		-DSDL_JOYSTICK=$(usex joystick)
-		-DSDL_HAPTIC=$(usex haptic)
-		-DSDL_POWER=ON
-		-DSDL_FILESYSTEM=ON
-		-DSDL_PTHREADS=$(usex threads)
-		-DSDL_TIMERS=ON
-		-DSDL_FILE=ON
-		-DSDL_LOADSO=ON
-		-DSDL_ASSEMBLY=ON
-		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DSDL_SSEMATH=$(usex cpu_flags_x86_sse)
-		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
-		-DSDL_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DSDL_SSE=$(usex cpu_flags_x86_sse)
-		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
-		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
-		-DSDL_OSS=$(usex oss)
-		-DSDL_ALSA=$(usex alsa)
-		-DSDL_ALSA_SHARED=OFF
-		-DSDL_JACK=$(usex jack)
-		-DSDL_JACK_SHARED=OFF
-		-DSDL_ESD=OFF
-		-DSDL_PIPEWIRE=$(usex pipewire)
-		-DSDL_PIPEWIRE_SHARED=OFF
-		-DSDL_PULSEAUDIO=$(usex pulseaudio)
-		-DSDL_PULSEAUDIO_SHARED=OFF
-		-DSDL_ARTS=OFF
-		-DSDL_LIBSAMPLERATE=$(usex libsamplerate)
-		-DSDL_LIBSAMPLERATE_SHARED=OFF
-		-DSDL_WERROR=OFF
-		-DSDL_NAS=$(usex nas)
-		-DSDL_NAS_SHARED=OFF
-		-DSDL_SNDIO=$(usex sndio)
-		-DSDL_SNDIO_SHARED=OFF
-		-DSDL_DISKAUDIO=$(usex sound)
-		-DSDL_DUMMYAUDIO=$(usex sound)
-		-DSDL_WAYLAND=$(usex wayland)
-		-DSDL_WAYLAND_SHARED=OFF
-		-DSDL_WAYLAND_LIBDECOR=$(usex wayland)
-		-DSDL_WAYLAND_LIBDECOR_SHARED=OFF
-		-DSDL_RPI=OFF
-		-DSDL_X11=$(usex X)
-		-DSDL_X11_SHARED=OFF
-		-DSDL_X11_XSCRNSAVER=$(usex xscreensaver)
-		-DSDL_COCOA=$(usex aqua)
-		-DSDL_DIRECTFB=OFF
-		-DSDL_FUSIONSOUND=OFF
-		-DSDL_KMSDRM=$(usex kms)
-		-DSDL_KMSDRM_SHARED=OFF
-		-DSDL_DUMMYVIDEO=$(usex video)
-		-DSDL_OPENGL=$(usex opengl)
-		-DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF)
-		-DSDL_VULKAN=$(usex vulkan)
-		-DSDL_LIBUDEV=$(usex udev)
-		-DSDL_DBUS=$(usex dbus)
-		-DSDL_IBUS=$(usex ibus)
-		-DSDL_CCACHE=OFF
-		-DSDL_DIRECTX=OFF
-		-DSDL_RPATH=OFF
-		-DSDL_VIDEO_RENDER_D3D=OFF
-		-DSDL_TESTS=$(usex test)
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-src_test() {
-	unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS
-	cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
-	rm -r "${ED}"/usr/share/licenses/ || die
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.30.7.ebuild b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild
index a3648ce7571c..2cc534369294 100644
--- a/media-libs/libsdl2/libsdl2-2.30.7.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild
@@ -15,11 +15,11 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test udev +video vulkan wayland X xscreensaver"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	alsa? ( sound )
-	fcitx4? ( dbus )
+	fcitx? ( dbus )
 	gles1? ( video )
 	gles2? ( video )
 	haptic? ( joystick )
@@ -76,7 +76,7 @@ COMMON_DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	fcitx4? ( app-i18n/fcitx:4 )
+	fcitx? ( app-i18n/fcitx:* )
 	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
 	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
 	vulkan? ( media-libs/vulkan-loader )
@@ -127,7 +127,6 @@ src_configure() {
 		-DSDL_HAPTIC=$(usex haptic)
 		-DSDL_POWER=ON
 		-DSDL_FILESYSTEM=ON
-		-DSDL_PTHREADS=$(usex threads)
 		-DSDL_TIMERS=ON
 		-DSDL_FILE=ON
 		-DSDL_LOADSO=ON
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index a96219c59be3..5388257b6225 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,7 +24,7 @@
 		Perl, PHP, Pike, Python, and Ruby.
 	</longdescription>
 	<use>
-		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
+		<flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag>
 		<flag name="gles1">include OpenGL ES 1.0 support</flag>
 		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
 		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>