gentoo auto-resync : 20:02:2025 - 00:15:26

24 files changed, 512 insertions, 2708 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6c74bcb1e115..e7129d49c948 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 17f5a3ff0cd4..ef2d2d11d863 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,9 +1,12 @@
 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
+AUX libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch 1666 BLAKE2B a5a0fb30cf97cf9b2e47bdcad0aad7d177ad9e49a4df17f8b729fa1555ca03e305a4f1421fde3a3fd854aa4718ffdff05c4dfb14d06ec254c25ac3fac46ca0dc SHA512 babcf26c109ffe5e8b4be1c31bb91805b3124feaf8562bc4fd6dfb73a1865592843c17f31538855336dda4b7baea2d48021df8ce172d2c4dfddff2413d4f7b0c
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 DIST SDL2-2.30.11.tar.gz 7585207 BLAKE2B e6038cbf79bec299fae9cfdc4b84ff3e28343abe782942af17e052d7da93111ea04a2ae15b063bfa0ad0d13a1810890dd29d895189f7f417f1bccce715badde1 SHA512 cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550
 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
+DIST SDL2-2.32.0.tar.gz 7625288 BLAKE2B 491796e2b222a49eaead76e60bb6e58bed881667cc61d0ba81ed0e083134b6b13089ca2c4658f6576b2924ddeaffcc9ff5c7532841e7b0797c6bd1769ad74a53 SHA512 a91b8105125f06118e8bfce2a5553fe053f7158dd02f06a36cfc535f09c401eb7da11072e576c6bf6e41fa2e02b08483b9cc4e11c658578b762e1b6c326a45bb
 EBUILD libsdl2-2.28.5-r3.ebuild 7506 BLAKE2B 06e0b8e280cb2c4da429e9e06751b8da6022a41d795ee71fdd6c01a7da33e4c3de78a3a53f416e57cf045b9a0695b4693ad0983f55ea02b98463a289773976f1 SHA512 bffadfe4c58b2df3b6f3bb31192a04b83061cf7899299388281525690f6cc0897ce10f5c20f2059223b8f3e4829ec0c044a7c3deba87fbae76204f9f57f2a58d
 EBUILD libsdl2-2.30.11.ebuild 5818 BLAKE2B abbc67c1bc5cbb868556ede44d62c8d22c99630d76c9bee8b635e2344e1b49ff45b0a20a055977300d9befaa447f8e55d0af85505d629e137117b7b7b6fb6f65 SHA512 1872c5da27f2a255d8b0c0ec26a0030c4742cf3864303d8a551aa9bf09b7dab65e813c6b3de3be31999433434cd164ab759fcfbbd9987f18e685a8b0759be369
 EBUILD libsdl2-2.30.7-r1.ebuild 5811 BLAKE2B 509a377438a52b19c86b9a5cba987346aad542f3acd13d14b8f95d36d267634161ce3410c4a4baadd55765bac43b2934f6cc7dd104cc0b09494d282ad23c7233 SHA512 9cecce56d7e7bfc0d052cc49c3e932b95334455d83a0b049dff2511cdcfb93885c428a4c59cdb3a7bec34e7bc66867bc911d99e55cb6ce45b3f90e9441473896
+EBUILD libsdl2-2.32.0.ebuild 5917 BLAKE2B 9b52e9ce5a68ef4d508eb0d7c15eb29d957d4bc6e13f31dbee6dad1a59e252b06639115628a0a0a431f55f0d124b228d5f48003a5e84559f0ba47fd555aaa671 SHA512 991ec781b76ca3b9b2342619ec4a0645bb91c7fae5561300bab6c0869e14bb7dce4133b64015dfa9b2ccae57e5a079505883e0f8e5695026950cebcc888b2d98
 MISC metadata.xml 1942 BLAKE2B 89c75b0790ba1e8c489c4d4d9fca4451a863068a4f75e5b97b408d7aba35fd9ba6ec5a855465588f5c143f09380835b89b637b8fb1e09c6b2391a79ed69144b9 SHA512 9e37d24a408b748fef53884442fe5ac5db548657675e23571705680b157cadcb584a059d7f066765fb68e80bf2ba247b2a01cfa095a465aa9dbf03db0e1c4334
diff --git a/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch b/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch
new file mode 100644
index 000000000000..21ea1e342671
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch
@@ -0,0 +1,40 @@
+From 22b304a0f30fa6d95dff5363d8d9e10b4eddd826 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 19 Feb 2025 15:30:01 +0200
+Subject: [PATCH] Build vulkan and opengles tests only if its enabled in the
+ build
+
+Bug: https://bugs.gentoo.org/932644
+Bug: https://bugs.gentoo.org/949387
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -139,12 +139,14 @@ add_sdl_test_executable(testgamecontroller NEEDS_RESOURCES testgamecontroller.c
+ add_sdl_test_executable(testgeometry testgeometry.c testutils.c)
+ add_sdl_test_executable(testgesture testgesture.c)
+ add_sdl_test_executable(testgl2 testgl2.c)
++if(SDL_OPENGLES)
+ add_sdl_test_executable(testgles testgles.c)
+ add_sdl_test_executable(testgles2 testgles2.c)
+ add_sdl_test_executable(testgles2_sdf NEEDS_RESOURCES testgles2_sdf.c testutils.c)
+ if(APPLE)
+     set_property(TARGET testgles testgles2 testgles2_sdf APPEND PROPERTY COMPILE_DEFINITIONS "GLES_SILENCE_DEPRECATION")
+ endif()
++endif()
+ add_sdl_test_executable(testhaptic testhaptic.c)
+ add_sdl_test_executable(testhotplug testhotplug.c)
+ add_sdl_test_executable(testrumble testrumble.c)
+@@ -211,7 +213,9 @@ add_sdl_test_executable(testqsort NONINTERACTIVE testqsort.c)
+ add_sdl_test_executable(testbounds testbounds.c)
+ add_sdl_test_executable(testcustomcursor testcustomcursor.c)
+ add_sdl_test_executable(controllermap NEEDS_RESOURCES controllermap.c testutils.c)
+-add_sdl_test_executable(testvulkan testvulkan.c)
++if(SDL_VULKAN)
++    add_sdl_test_executable(testvulkan testvulkan.c)
++endif()
+ add_sdl_test_executable(testoffscreen testoffscreen.c)
+ 
+ if(N3DS)
+-- 
+2.48.1
+
diff --git a/media-libs/libsdl2/libsdl2-2.32.0.ebuild b/media-libs/libsdl2/libsdl2-2.32.0.ebuild
new file mode 100644
index 000000000000..ed73f48b7f42
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.32.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2025 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 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 )
+	fcitx? ( 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}
+	fcitx? ( app-i18n/fcitx:* )
+	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
+)
+
+PATCHES=(
+	"${FILESDIR}"/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch
+)
+
+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_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 all SDL_* variables as they cause issues for tests.
+	unset "${!SDL_@}"
+	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/mesa/Manifest b/media-libs/mesa/Manifest
index 96c5d4c0cd6e..f23262a01983 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,11 +1,6 @@
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
-DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f8a02412738404386bfb962052923b40c1412198bd29f2ab6cf11654f8c63d4c14a400b89d99229680bc96eaae SHA512 3aa1051a72e1428e42f9537d8f6a26f2ebddc78894e0f71d2cdcc9ed555ea4d6489ad8e74d4c59b8cdf7ea1c629fa725ac2fe1e385db5d3a582d8fe8186392d6
-DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8
-DIST mesa-24.3.2.tar.xz 30640276 BLAKE2B d5973506983a23a95c360801a591e13945695e9a0c6f9f3bbb953865aa39ccfabaae624f4cd1edc8ecf479710856f5cc08e4f6374b107a06870906e934ecc5b8 SHA512 ea1065f7b466f1b2b3570c87585d6de15e3784a60d920c9f991c22720197d5947b598ac2c76773bed8150c91360ee5bbc77f3b48780a19502a8c4224baa728b9
-DIST mesa-24.3.3.tar.xz 30657916 BLAKE2B b973227885b3fd5fa6267c150a5e174f5e8a1c6378cf9326845ba75332084d7c914917c8e3b6d7b89f49ede0f5a5b453eb1ce42591e98b0cbad3f85bd3040035 SHA512 280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f
 DIST mesa-24.3.4.tar.xz 30691532 BLAKE2B a5cf1f49c6d809d19510793f5d1dcec1a3842495d3b4166e303d7f2d4744d179811697d264c5c9b39f2819ebc64a76357195b3eae6b1d2a83128de141354e3c2 SHA512 9c23cd86fda4cf0289c5a78b08ceea8b01e5b141d86ee3e659fa46e62ff9586ff92a4984d2a340b5bf209c4c7f3414bf99f3ced19feee8fb39ef99fe572dbd55
-DIST mesa-25.0.0-rc2.tar.xz 46570616 BLAKE2B bd85d30d1d3e674dae38c476ef1df774df1699963d1c105b336da77f5c271d8ab823d24af9763e5a85643e4794fa4dd041de16b27359799fad3aac7c99b94077 SHA512 67eec93fbe24cb3fa26b062539453326b3237bd8c6ac111061142dae69b81fe7da000728d9bc2c0e2ec46f122011cbde9b99141f6333828016efb3eaa87b27f7
-DIST mesa-25.0.0-rc3.tar.xz 46584588 BLAKE2B 5da789412c797b13e99c73f09493473a6ab1bc495d675069b7181f8da7230941834165e470359c53abc3f422ef031398a67e897fa1caa715429c9aa38681e36d SHA512 4ece5a2804c58396d7a6e09877ab52cc5086290e9e96a61a27b78706b83bd955a57097fe37c5cb5002e9522c49c2b444ea12373038fbc902a29dc52ebec6015c
+DIST mesa-25.0.0.tar.xz 46643728 BLAKE2B 9aca2416ea4e304d46fda648cb9b8e04caa053458b91893fb874e9a30d8293722c3bed1098c2720b04b0c7278eba3b0387900b56e13b6133a23c0f6be705025c SHA512 7f5b6674c40b6c8dcab7934512ff754b40a6a8a466422c90236f614d322033d4d465307ddcd983f9f3afb1310e132ec3186a085d261c95493a0c460b2ec59ce8
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
@@ -14,12 +9,7 @@ DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2df
 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 EBUILD mesa-24.1.7-r1.ebuild 13769 BLAKE2B cbdd0130cb55c039d1d81d67eeb2b0b8493fe25db50f938f08e2e437b3e0b0a9d50d2c6250bee66f081b7a3577da3ffab810ba636e8ebfe450a7e7c7b8dc8a7b SHA512 dd1de43ecd26536b96d753a479d509667382243ed536edd3c181207bd4b7fc1528d7ab53a3d491659a0866d4b9d4c90f06e5c5a61f4e3353a0f3fbb4ec81d90e
-EBUILD mesa-24.2.8.ebuild 13854 BLAKE2B f375b50f7d2329f70302f08d9c96ee24ae60d782766a3dcad6075a15ff32112108c06fbc2a28ae8f326b8cbc02922a04d2ad8da5fc66510c25a15343fedfaa1a SHA512 4ab9675c68238b7524ee77bfed94716baea6a35530b696128c0a537f1fddb8427f3cb93bc3b6662afa057736202fb5bbceb80f97d62932cc57cfdfe95b07d959
-EBUILD mesa-24.3.1.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b
-EBUILD mesa-24.3.2.ebuild 13685 BLAKE2B 6a5cce38e17ecf21830cd3883e6d6fe7e961cd43c4068a9442aaedfc858eb8e41d4570b1b51f588dc0740aa36a8668e606f7c903c884de38a42f9db7aa746c4e SHA512 da93c1d1a944f70dc761da029c0301aa3314cedc39d5ba59346de492be4d319197e4e13bfe028c4e87c3d65cbe514ab834a5ea995a311d8e7c4e0dce6d188078
-EBUILD mesa-24.3.3.ebuild 13729 BLAKE2B d77a5bbbaaa625c3189c383c97f2c3d1751bd64a364ada1f7968c126fdbea632a3af41c8c13b5525e08e5a8647f356d8b1c37f27a8808bade18b35d2489d69d8 SHA512 0b655780b02637d6fddd2984fcf9c137ea5dac67ef8584bb04f0d53a8a91698eda154cb459cb9d4196646931adaa3286471aee8a1c383b02903b8f8f890bda38
-EBUILD mesa-24.3.4-r1.ebuild 13762 BLAKE2B 3aa39c93d72d80d191ba6850e8a40ebff1676b361f1d6c080526b15a8617e69f2d6a25def9511fcadf437ef447f455105080500de381e14d11643a9c4b395697 SHA512 c15f3a14ca577f753ebd8bd0c6d484799c37fed2b63222810fb678f1b5cb15739676ad54cc74c785dfba8306c359bf4669cc9bf07bd920c9c6d14abf85eba3d3
-EBUILD mesa-25.0.0_rc2.ebuild 13758 BLAKE2B f590cfc8e5a3ca7403e2fa10f2598b9ddc73673e0df6ebf74add31eba52de2518932711eb4ead43fcf62857ec4812594544dee33935e76d8820ab0a41eb74909 SHA512 5e5afed4ab3e90bac5ae6b30aa0132ccff2e3f972d751a4b4a034217e569102192a1d20b69586ec0ee89e7ccac131e75e7b8025e7714cc21e2a42c6042f5feba
-EBUILD mesa-25.0.0_rc3.ebuild 13758 BLAKE2B f590cfc8e5a3ca7403e2fa10f2598b9ddc73673e0df6ebf74add31eba52de2518932711eb4ead43fcf62857ec4812594544dee33935e76d8820ab0a41eb74909 SHA512 5e5afed4ab3e90bac5ae6b30aa0132ccff2e3f972d751a4b4a034217e569102192a1d20b69586ec0ee89e7ccac131e75e7b8025e7714cc21e2a42c6042f5feba
+EBUILD mesa-24.3.4-r1.ebuild 13759 BLAKE2B 3b331a6b0b6533d1ed32678445bbe5faa88e8d2dc029f00884c2f4e5fb93d35a52075dd70cd9ab69766585322375f67c686a6adb19e05684ef5bd23945155cda SHA512 f957cc0aa810a306e6a292583d38de41bdaee5107a3bd982fb85eed0413c32fd5853601e393276b52b1f215a1b622e41acf8fa5657ff989257b84316d476e0f4
+EBUILD mesa-25.0.0.ebuild 13758 BLAKE2B f590cfc8e5a3ca7403e2fa10f2598b9ddc73673e0df6ebf74add31eba52de2518932711eb4ead43fcf62857ec4812594544dee33935e76d8820ab0a41eb74909 SHA512 5e5afed4ab3e90bac5ae6b30aa0132ccff2e3f972d751a4b4a034217e569102192a1d20b69586ec0ee89e7ccac131e75e7b8025e7714cc21e2a42c6042f5feba
 EBUILD mesa-9999.ebuild 13783 BLAKE2B 4814e40fcc71ecba6abb88531bedb71691dec5081a976886aa6ef098eeb70f399c1394882d896160693893252db669c43cbe6ebc76e08c2601bd2ce040a0480e SHA512 3236a27fedc49f63087ebe1ea524d73eb75b9367a28a2b94754036928a3240d5a5e4d8f593891fc21f5503b0143fa38fa235178209f82cac5132f333fd23bdd1
 MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598
diff --git a/media-libs/mesa/mesa-24.2.8.ebuild b/media-libs/mesa/mesa-24.2.8.ebuild
deleted file mode 100644
index 4e9ede781732..000000000000
--- a/media-libs/mesa/mesa-24.2.8.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-	syn@2.0.68
-	proc-macro2@1.0.86
-	quote@1.0.33
-	unicode-ident@1.0.12
-	paste@1.0.14
-"
-
-RUST_MIN_VER="1.74.1"
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-	vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug +llvm
-	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	d3d9? (
-		|| (
-			video_cards_freedreno
-			video_cards_intel
-			video_cards_nouveau
-			video_cards_panfrost
-			video_cards_r300
-			video_cards_r600
-			video_cards_radeonsi
-			video_cards_vmware
-			video_cards_zink
-		)
-	)
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	vulkan-overlay? ( vulkan )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-	vdpau? ( X )
-	xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-core/libclc[spirv(-)]
-		>=dev-util/spirv-tools-1.3.231.0
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.34 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		${RUST_DEPEND}
-		>=dev-util/bindgen-0.58.0
-	)
-	>=dev-build/meson-1.4.1
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_intel? (
-		~dev-util/intel_clc-${PV}
-		llvm-core/libclc[spirv(-)]
-		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-	)
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.68.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libglapi.so.0.0.0
-	usr/lib/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-	if use llvm && use vulkan && use video_cards_intel && use amd64; then
-		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel || # crocus i915 iris
-	   use video_cards_nouveau ||
-	   use video_cards_panfrost ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_vmware || # svga
-	   use video_cards_zink; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		if use video_cards_nvk; then
-			vulkan_enable video_cards_nvk nouveau
-			if ! multilib_is_native_abi; then
-				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-				emesonargs+=(
-					--native-file "${T}"/rust_fix.ini
-				)
-			fi
-		fi
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dintel-clc=$(usex video_cards_intel system auto)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-
-	if ! multilib_is_native_abi && use video_cards_nvk; then
-		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
-	fi
-}
-
-multilib_src_compile() {
-	if [[ ${ABI} == x86 ]]; then
-		# Bug 939803
-		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-	else
-		meson_src_compile
-	fi
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-24.3.1.ebuild b/media-libs/mesa/mesa-24.3.1.ebuild
deleted file mode 100644
index 23476336a9f6..000000000000
--- a/media-libs/mesa/mesa-24.3.1.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-	syn@2.0.68
-	proc-macro2@1.0.86
-	quote@1.0.33
-	unicode-ident@1.0.12
-	paste@1.0.14
-"
-
-RUST_MIN_VER="1.74.1"
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-	vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug +llvm
-	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	d3d9? (
-		|| (
-			video_cards_freedreno
-			video_cards_intel
-			video_cards_nouveau
-			video_cards_panfrost
-			video_cards_r300
-			video_cards_r600
-			video_cards_radeonsi
-			video_cards_vmware
-			video_cards_zink
-		)
-	)
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-	vdpau? ( X )
-	xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-core/libclc[spirv(-)]
-		>=dev-util/spirv-tools-1.3.231.0
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.38 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		${RUST_DEPEND}
-		>=dev-util/bindgen-0.58.0
-	)
-	>=dev-build/meson-1.4.1
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_intel? (
-		~dev-util/intel_clc-${PV}
-		llvm-core/libclc[spirv(-)]
-		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-	)
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.68.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libglapi.so.0.0.0
-	usr/lib/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-	if use llvm && use vulkan && use video_cards_intel && use amd64; then
-		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel || # crocus i915 iris
-	   use video_cards_nouveau ||
-	   use video_cards_panfrost ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_vmware || # svga
-	   use video_cards_zink; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		if use video_cards_nvk; then
-			vulkan_enable video_cards_nvk nouveau
-			if ! multilib_is_native_abi; then
-				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-				emesonargs+=(
-					--native-file "${T}"/rust_fix.ini
-				)
-			fi
-		fi
-
-		emesonargs+=(-Dvulkan-layers=device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dshared-glapi=enabled
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dintel-clc=$(usex video_cards_intel system auto)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-
-	if ! multilib_is_native_abi && use video_cards_nvk; then
-		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
-	fi
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-24.3.2.ebuild b/media-libs/mesa/mesa-24.3.2.ebuild
deleted file mode 100644
index 7846e415a4f5..000000000000
--- a/media-libs/mesa/mesa-24.3.2.ebuild
+++ /dev/null
@@ -1,501 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-	syn@2.0.68
-	proc-macro2@1.0.86
-	quote@1.0.33
-	unicode-ident@1.0.12
-	paste@1.0.14
-"
-
-RUST_MIN_VER="1.74.1"
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-	vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug +llvm
-	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	d3d9? (
-		|| (
-			video_cards_freedreno
-			video_cards_intel
-			video_cards_nouveau
-			video_cards_panfrost
-			video_cards_r300
-			video_cards_r600
-			video_cards_radeonsi
-			video_cards_vmware
-			video_cards_zink
-		)
-	)
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-	vdpau? ( X )
-	xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-core/libclc[spirv(-)]
-		>=dev-util/spirv-tools-1.3.231.0
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.38 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		${RUST_DEPEND}
-		>=dev-util/bindgen-0.58.0
-	)
-	>=dev-build/meson-1.4.1
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_intel? (
-		~dev-util/intel_clc-${PV}
-		llvm-core/libclc[spirv(-)]
-		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-	)
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.68.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libglapi.so.0.0.0
-	usr/lib/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-	if use llvm && use vulkan && use video_cards_intel && use amd64; then
-		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel || # crocus i915 iris
-	   use video_cards_nouveau ||
-	   use video_cards_panfrost ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_vmware || # svga
-	   use video_cards_zink; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		if use video_cards_nvk; then
-			vulkan_enable video_cards_nvk nouveau
-			if ! multilib_is_native_abi; then
-				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-				emesonargs+=(
-					--native-file "${T}"/rust_fix.ini
-				)
-			fi
-		fi
-
-		emesonargs+=(-Dvulkan-layers=device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dshared-glapi=enabled
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dintel-clc=$(usex video_cards_intel system auto)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-
-	if ! multilib_is_native_abi && use video_cards_nvk; then
-		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
-	fi
-}
-
-multilib_src_compile() {
-	if [[ ${ABI} == x86 ]]; then
-		# Bug 939803
-		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-	else
-		meson_src_compile
-	fi
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-24.3.3.ebuild b/media-libs/mesa/mesa-24.3.3.ebuild
deleted file mode 100644
index 94823cb3517c..000000000000
--- a/media-libs/mesa/mesa-24.3.3.ebuild
+++ /dev/null
@@ -1,502 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-	syn@2.0.68
-	proc-macro2@1.0.86
-	quote@1.0.33
-	unicode-ident@1.0.12
-	paste@1.0.14
-"
-
-RUST_MIN_VER="1.74.1"
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-	vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug +llvm
-	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	d3d9? (
-		|| (
-			video_cards_freedreno
-			video_cards_intel
-			video_cards_nouveau
-			video_cards_panfrost
-			video_cards_r300
-			video_cards_r600
-			video_cards_radeonsi
-			video_cards_vmware
-			video_cards_zink
-		)
-	)
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-	vdpau? ( X )
-	xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-core/libclc[spirv(-)]
-		>=dev-util/spirv-tools-1.3.231.0
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.38 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		${RUST_DEPEND}
-		>=dev-util/bindgen-0.58.0
-	)
-	>=dev-build/meson-1.4.1
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_intel? (
-		~dev-util/intel_clc-${PV}
-		llvm-core/libclc[spirv(-)]
-		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-	)
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.68.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libglapi.so.0.0.0
-	usr/lib/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-	if use llvm && use vulkan && use video_cards_intel && use amd64; then
-		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel || # crocus i915 iris
-	   use video_cards_nouveau ||
-	   use video_cards_panfrost ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_vmware || # svga
-	   use video_cards_zink; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		if use video_cards_nvk; then
-			vulkan_enable video_cards_nvk nouveau
-			if ! multilib_is_native_abi; then
-				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-				emesonargs+=(
-					--native-file "${T}"/rust_fix.ini
-				)
-			fi
-		fi
-
-		emesonargs+=(-Dvulkan-layers=device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dshared-glapi=enabled
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dintel-clc=$(usex video_cards_intel system auto)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-
-	if ! multilib_is_native_abi && use video_cards_nvk; then
-		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
-	fi
-}
-
-multilib_src_compile() {
-	if [[ ${ABI} == x86 ]]; then
-		# Bug 939803
-		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-	else
-		meson_src_compile
-	fi
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-24.3.4-r1.ebuild b/media-libs/mesa/mesa-24.3.4-r1.ebuild
index 8cbcc6393fc1..bb028f65bbfe 100644
--- a/media-libs/mesa/mesa-24.3.4-r1.ebuild
+++ b/media-libs/mesa/mesa-24.3.4-r1.ebuild
@@ -36,7 +36,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.0.0_rc2.ebuild b/media-libs/mesa/mesa-25.0.0.ebuild
index f9f6f3778ffd..f9f6f3778ffd 100644
--- a/media-libs/mesa/mesa-25.0.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-25.0.0.ebuild
diff --git a/media-libs/mesa/mesa-25.0.0_rc3.ebuild b/media-libs/mesa/mesa-25.0.0_rc3.ebuild
deleted file mode 100644
index f9f6f3778ffd..000000000000
--- a/media-libs/mesa/mesa-25.0.0_rc3.ebuild
+++ /dev/null
@@ -1,504 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-	syn@2.0.68
-	proc-macro2@1.0.86
-	quote@1.0.33
-	unicode-ident@1.0.12
-	paste@1.0.14
-"
-
-RUST_MIN_VER="1.78.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-	vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug +llvm
-	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	d3d9? (
-		|| (
-			video_cards_freedreno
-			video_cards_intel
-			video_cards_nouveau
-			video_cards_panfrost
-			video_cards_r300
-			video_cards_r600
-			video_cards_radeonsi
-			video_cards_vmware
-			video_cards_zink
-		)
-	)
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-	vdpau? ( X )
-	xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-core/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.38 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		${RUST_DEPEND}
-		>=dev-util/bindgen-0.58.0
-	)
-	>=dev-build/meson-1.4.1
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_intel? (
-		~dev-util/mesa_clc-${PV}
-		llvm-core/libclc[spirv(-)]
-		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-	)
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.68.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-	if use llvm && use vulkan && use video_cards_intel && use amd64; then
-		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel || # crocus i915 iris
-	   use video_cards_nouveau ||
-	   use video_cards_panfrost ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_vmware || # svga
-	   use video_cards_zink; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_intel ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		if use video_cards_nvk; then
-			vulkan_enable video_cards_nvk nouveau
-			if ! multilib_is_native_abi; then
-				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-				emesonargs+=(
-					--native-file "${T}"/rust_fix.ini
-				)
-			fi
-		fi
-
-		emesonargs+=(-Dvulkan-layers=device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dshared-glapi=enabled
-		-Dlegacy-x11=dri2
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dmesa-clc=$(usex video_cards_intel system auto)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-
-	if ! multilib_is_native_abi && use video_cards_nvk; then
-		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
-	fi
-}
-
-multilib_src_compile() {
-	if [[ ${ABI} == x86 ]]; then
-		# Bug 939803
-		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-	else
-		meson_src_compile
-	fi
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index bea6ed4155df..3386a5f49070 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -2,6 +2,6 @@ AUX opencolorio-2.2.1-adjust-python-installation.patch 864 BLAKE2B e4e68ec13d476
 AUX opencolorio-2.3.2-include-cstdint.patch 730 BLAKE2B 35df68ae92e99373f47a0aeba7425e27df851d63205af0c6343cfddeeb36331eab7a9b4a2eedafc13f52301232733160ba0fe0c338553bf0aae069b91c73a6fb SHA512 072c3ebc9d155c1ff389884871d098695dedcfcf3c339088f4b1888df83b0c6bbc8ea0e1bdd18f9e3d7d4d7f1d554ad72be6022552a57879e6c03badb7397e2d
 DIST opencolorio-2.3.2.tar.gz 11443450 BLAKE2B 2573d2f229ba0349574d83883cd6534853164dc6a5866b203b65d4c0acbc54fc0aaf6ff4ecbec5506c6adafe48d57fb80a8b47c45b7b16e0c4ac94f5fbaffea3 SHA512 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133
 DIST opencolorio-2.4.1.tar.gz 11386201 BLAKE2B b56df7d708dbd8e0b46e9e56ea779614b99412d052372d29b9e2b4c8188bc303f19f3f04ba3e40249fff08e1aa1d5924003757b2944cad3cc7c8b18ba33f8f98 SHA512 dfa616e79da13016d7c0f007a4ad77f793241a7eac18baf65272b5edf8c61f49423a8e0f9f29be170b396014f6b9f4f2789330a5a7608c7c78e858eab622fd4c
-EBUILD opencolorio-2.3.2.ebuild 4876 BLAKE2B ba39476309537862701e5cc96d4a62ee2b4a02e42165fbe9865aabd94ef24b6de174e9b55f0b313e13757ba6f79fa63aefbdb785effc3daf8001c8d8680255c6 SHA512 fdbcd63ad2e0185a0b430c193b73b27df8b5ecc4628d939244d2e386afbc77121da1ffa274a71d06f19af8c74bb2df061607eb170e05eda36b5d44da4bffde83
-EBUILD opencolorio-2.4.1.ebuild 4876 BLAKE2B 28c24411c89cd7b2348493925ff3b45ff859265e67ccf2aaf05b80678db7eddbe955949899352c913ec48834b9ffb1917060f671b71e3e02e18d7191888b5564 SHA512 1e77b2a60a02f9a6c5e8b5b3b9e2acf2ce3363d09474550e5daa3d5ddc9e486aaaee5bbfbfb9cce25f3a3e6c0916882efa69bb5d93fd788f9f5a72d2d3b3b94c
+EBUILD opencolorio-2.3.2.ebuild 4876 BLAKE2B dbdabfff0a67073371552fa6eb0481fc546f84da42d29413dfecee2356cfb2caa66df01c68ed1577e9db276eb7488a06f8e554f828b83fe3118b82644819c69a SHA512 724660bdd20f81698e1caea711f5fc9f9764a059fe6f4b8b392ed79b8cdc5bdf05eed5d8e9e17b6c2831c1be48e42f32a08a778b9d95c7dab85c11ff9758628b
+EBUILD opencolorio-2.4.1.ebuild 4876 BLAKE2B 2c148ac9a87b8a72d7382952b3de10860a2d265f6ec06abd4c36fac1c7d12a5cc8f7d7b2aae837f3500b8b5dca2f7c732d8c7f32420fbc9d37e45f139fa038b4 SHA512 4def6aa05c3c55d1c4ff44d06f020fba4ed10bc46c1ec91098faeca1002ad5c77692c3b458db5f7beb603396210c47254d2169c8fac1979207575bd4735a29de
 MISC metadata.xml 792 BLAKE2B 6b94c1223e756ef3179ab3442c134bf7881400434332691bc693a36c8bceb4db609dd143afb6a18192c7bfaa9ccb72015c215e08b3bd65fbdb3ccc2fb3ff713d SHA512 c1b3d44b5ce24813b3e07074ba2fe40c3af89033dfbe5a372b130be26fcfeba9fa9c2a0d9e6a695972dc402979aa732df27fd3c6128a8f3a51fe926ecb73cb25
diff --git a/media-libs/opencolorio/opencolorio-2.3.2.ebuild b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
index a9aa47ecd117..9ac083f1aa0d 100644
--- a/media-libs/opencolorio/opencolorio-2.3.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit cmake python-single-r1 virtualx
 
diff --git a/media-libs/opencolorio/opencolorio-2.4.1.ebuild b/media-libs/opencolorio/opencolorio-2.4.1.ebuild
index 1eb4b6561afa..2ddb0d20af67 100644
--- a/media-libs/opencolorio/opencolorio-2.4.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit cmake python-single-r1 virtualx
 
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 732ded85faad..b096a61b24d8 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,8 +1,8 @@
-DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
 DIST SDL2_image-2.6.3.tar.gz 9816720 BLAKE2B 24662637e4f621af83d9a66d1cca954549030be97fa47f4b8fc711b2a941eaa409cf99ede137eb91d25999af253791dcfb2d9229080d30ede84cc32d5c5ae997 SHA512 11f1d041a052829708560b6211a2a00b3a1ce26a6f23cb389f57fa5254372027e97d3a6ffe551134a77bc33718c3acea3df21fe8426e93a2b1955176c47c7647
 DIST SDL2_image-2.8.2.tar.gz 11362515 BLAKE2B 8bc8967eed7203ddbd23062e257ae8768eeb28e8efa57bac86db0224a7cdc94dfbb10c6da77dab9c1847f216ec761fae5b7bd5d8ed25c6b3c69ad972dc93ddf5 SHA512 0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454
-EBUILD sdl2-image-2.0.5_p20210328-r1.ebuild 1759 BLAKE2B 5258f7b8c423b2414cdfb4217773bc7fbc2de1fe5c81e47c0f474872393da2a38846fa82903bb640bfe0c0b34174ba4a11882d040e2ffe3b6a1d68404812c867 SHA512 16fc0227ca0c984330853451ee115c6da0921e7cc1390100dc5d80786d598da4137b7dbb5b30cbee0d071957c2b6296971db3365e91601849e0a9122961f0495
+DIST SDL2_image-2.8.5.tar.gz 6874736 BLAKE2B 3907daa3531fc6188c1991ecd6710634b9dfe5567cf73fbb3e84ec79a74b821fdabdf7c716da84d4f25dcb64a44bf2961063f069f57420f4dc94cae724caab49 SHA512 593f881aeaab0920df5767e77c1f7ae6daa5ea7682810f1b649645761c00ceff0533a887bdcfe2c5b226e838b19ffa7fb12df8c904746c318bd4bface96dac43
 EBUILD sdl2-image-2.6.3-r1.ebuild 1941 BLAKE2B 7a62c49b1aae533616fa9dfab092e9513c5fefd1ea2495917e645df05071842f35cc795f898e1e1cec0e9383d8a89d2b54d1f834481650407ba227b99e69cd0e SHA512 e3906f4bccdea0a485b8956ba249a431a7baeaadfad92152038274127617f98c3ea941adc28d88799a5a5943fe5e331979cdb7a345bfd8a7846b75f317b1ef33
 EBUILD sdl2-image-2.6.3.ebuild 1814 BLAKE2B 884b22844c80f1d7f8e0b4360616f04904bb711a8730ee7962a8f76af2fc048276e18333bc2f582f5afa75dc2bb913ef0b869021d7dd3e38073005a4ed044fe3 SHA512 60291c3eb4500e3937676c6d3b34963b50d17500ef6008259bc3eb02adb8c2e4dae03f578db22bf9176778fe2031f3d57a5e0ab39acfc050c5b585aa2d21f773
 EBUILD sdl2-image-2.8.2.ebuild 2042 BLAKE2B 032e8a8fe1e419b38299171bee124d6c70d01c511f4257f60e0845382d3d87c4d27088deb2287bd2d78b15e3f95c7478e6ff4a86cfa492cc4122ccd3caf5b00e SHA512 75513a544d6ddc4c5b9cd372c418648cd698960f11f524cceaa846605e33eaaa577488b1793630a3d99d1bd887454970bb25b02a0ecbdac253fa0cc3be60f6ab
-MISC metadata.xml 407 BLAKE2B 122a2c297d075149603d7459f0e871213c975e19ddbcf4769cbba637c1de3b6758723e0e251c3f40b11b6d9cbc479cd3f6af6825d4f04ee35f7322d52ab187e9 SHA512 ee9a456a63a91542e2a9c635bc1c69e2a93c1f80eb525b898359e8b735b79e1e927f6a8b23ed55a99497e2459480b746252dd5dc295a4e6c421becaf9ebe62eb
+EBUILD sdl2-image-2.8.5.ebuild 3990 BLAKE2B b824ae2b8268c7143df2fd5776bfefb5114630004f8fd07163e4a30135fe671baf1c660a1719a0e1016dcb3c88995f646d931377d303b4816e8eab746a098a7c SHA512 eaa7dec8f4f11bc6e53bd75233815c08e19efae1f9273db3f125549e18d46a8ad7202e28989c341abc71de6a87cb2c9e0e1382fb3efb9d3352d007548b38bec1
+MISC metadata.xml 476 BLAKE2B be2ea088e9507cbfcb75c8d9a932056adf8e1d7390dbae3ca66270beb2d1e74a4ef19c190c6093c33536a3675c5ed2f9b9c6043a455b8b2ebbc766647aa714b3 SHA512 1df88195badb12ca5896678ef4a5431d1badf90f032bcb03430efc0d22537c3b15d99834f14733b85527eb3b081c726d46dad3aa83edabb2e78ee1ecea1e8800
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index ba95051be881..7bc0ccaf0f65 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -5,6 +5,9 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="samples">Install sample programs</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">libsdl-org/SDL_image</remote-id>
 		<bugs-to>https://github.com/libsdl-org/SDL_image/issues</bugs-to>
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild
deleted file mode 100644
index 7d4fd801f434..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal toolchain-funcs
-
-MY_P="SDL2_image-${PV}"
-MY_COMMIT="f36684864e82538da2d2cf57fa3db077a3be42c7"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
-SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/SDL_image-${MY_COMMIT}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake OBJC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
new file mode 100644
index 000000000000..f0c42e91997c
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib multibuild
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
+SRC_URI="https://github.com/libsdl-org/SDL_image/releases/download/release-${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="avif gif jpeg jpegxl png samples static-libs test tiff webp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( jpeg png )"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	avif? ( >=media-libs/libavif-1.0.0:=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared-libs $(usev static-libs) )
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 1. Install non standard license installation
+	# 2/3. Add suffixes to sample programs
+	sed -i \
+		-e '/install(FILES "LICENSE.txt"/,/\s)$/d' \
+		-e 's/\(\W\)showanim\(\W\)/\1showanim2\2/' \
+		-e 's/\(\W\)showimage\(\W\)/\1showimage2\2/' \
+		CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	# hack because because of layered multibuilds
+	if [[ -n ${is_shared} ]]; then
+		mycmakeargs+=( -DSDL2IMAGE_SAMPLES=$(multilib_native_usex samples) )
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DSDL2IMAGE_AVIF=$(usex avif)
+			-DSDL2IMAGE_BMP=ON
+			-DSDL2IMAGE_GIF=$(usex gif)
+			-DSDL2IMAGE_JPG=$(usex jpeg)
+			-DSDL2IMAGE_JXL=$(usex jpegxl)
+			-DSDL2IMAGE_LBM=ON
+			-DSDL2IMAGE_PCX=ON
+			-DSDL2IMAGE_PNG=$(usex png)
+			-DSDL2IMAGE_PNM=ON
+			-DSDL2IMAGE_QOI=ON
+			-DSDL2IMAGE_SVG=ON
+			-DSDL2IMAGE_TGA=ON
+			-DSDL2IMAGE_TIF=$(usex tiff)
+			-DSDL2IMAGE_WEBP=$(usex webp)
+			-DSDL2IMAGE_XCF=ON
+			-DSDL2IMAGE_XPM=ON
+			-DSDL2IMAGE_XV=ON
+
+			# change?
+			-DSDL2IMAGE_BACKEND_STB=OFF
+			-DSDL2IMAGE_DEPS_SHARED=OFF
+			-DSDL2IMAGE_SAMPLES_INSTALL=ON
+			-DSDL2IMAGE_TESTS=$(usex test)
+			-DSDL2IMAGE_TESTS_INSTALL=OFF
+			-DSDL2IMAGE_VENDORED=OFF
+		)
+		if [[ "${MULTIBUILD_VARIANT}" == "shared-libs" ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+			local is_shared=1
+		else
+			mycmakeargs+=(
+				-DBUILD_SHARED_LIBS=OFF
+				-DSDL2IMAGE_SAMPLES=OFF
+			)
+		fi
+
+		cmake-multilib_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-multilib_src_compile
+}
+
+src_test() {
+	# https://github.com/libsdl-org/SDL_image/tree/main/test#asserting-format-support
+	# Match same order as src_configure. The intent is to catch build system
+	# bugs, so it may need updating sometimes for legitimate changes in
+	# sdl2-image support.
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_AVIF=$(usex avif 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_BMP=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_GIF=$(usex gif 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_JPG=$(usex jpeg 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_JXL=$(usex jpegxl 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_LBM=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_PCX=1
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_PNG=$(usex png 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_QOI=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_SVG=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_TGA=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_TIF=$(usex tiff 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_WEBP=$(usex webp 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XCF=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XPM=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XV=1
+
+	multibuild_foreach_variant cmake-multilib_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-multilib_src_install
+}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 5521069e35c1..412a6204cb42 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,7 +1,7 @@
-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
 DIST SDL2_mixer-2.8.0.tar.gz 10874471 BLAKE2B 701ed21416e7a3ceda313f3e9ad47f98687f357712fb90f6c3c2ac065c96a4ded04a907c563f3b9b7bf42f192b6c442d025abb0a5cfbb745bd8719c49e29ff61 SHA512 5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad
-EBUILD sdl2-mixer-2.6.2-r1.ebuild 2967 BLAKE2B 346072e77db0dc766de79cae5ebfe22a096e3d5ba9a9afe18d1ff670c849a9cbf7cd55c3d7a2e256593ae398b9e16675fed8aeba93c291e415ac8d8208b5340d SHA512 835214d5a8c545d9952694ac3c3140ebf0bad9c15955e707a9e9c84e0b6bcdb71f93a045294dc80617a5a7946ac6d2790521eea7458411655524b9b7fdce0f06
+DIST SDL2_mixer-2.8.1.tar.gz 5996239 BLAKE2B e03fc3f2aee9e8ed5c2b2fabc54cd319adc57f88e3b965e7c8a26339808cf9d68bac83b53369e172f175896d90f1bd026125fe1356ec73ee88b369402706f455 SHA512 6148591404b2113bcdb54391821658548acfe380a9cba660113e55e6f2fb7da2a5a59a99fefe51a0d7f8b91160648f11f72750353da88d285a962e3a410aecd7
 EBUILD sdl2-mixer-2.6.3-r1.ebuild 3000 BLAKE2B fbcd9cd8458114a589bc95b8577b1bf1cdccf19f05e88241590af1baebc1f3d0cfd5e047a58b2b752757c6d6b32cb2565a400a2a88edfaa427928b29ae058f4b SHA512 aa82a7e7633ee34d5e9ce7a18d664d5e4708c158369cba0e73aca79b89a4db30e6d41cc10956b7eefded1337674ef45d6fbdf38313a3ebd9357c865f130d1e80
 EBUILD sdl2-mixer-2.8.0.ebuild 2790 BLAKE2B e2c6d4cd59f1878c0ada3cb86662d93d9599e5c677508b823cd0371c27cf87f03baa4a37cde23fadf41e2dd5945f95c668a8d7cccaaae4f1fd1e5112a4ede5c4 SHA512 f8597f8f7d0486103f514583d12b1a8e7a0cf84d7c047b84f577434ba7a2d2bf0d062eda12caef6af8c602d32e8e203cbb160e0b48f30c1bf2c3a4b9ea851a45
+EBUILD sdl2-mixer-2.8.1.ebuild 2790 BLAKE2B e2c6d4cd59f1878c0ada3cb86662d93d9599e5c677508b823cd0371c27cf87f03baa4a37cde23fadf41e2dd5945f95c668a8d7cccaaae4f1fd1e5112a4ede5c4 SHA512 f8597f8f7d0486103f514583d12b1a8e7a0cf84d7c047b84f577434ba7a2d2bf0d062eda12caef6af8c602d32e8e203cbb160e0b48f30c1bf2c3a4b9ea851a45
 MISC metadata.xml 1496 BLAKE2B 05f497210171797d550f073fcd1901374103a55d7658868646cdf55017a0d0889c9444b3de45c9da390ae6ed025ad2b2079183eb170b7f560e266921f9d0a7eb SHA512 2bc4dbaebe3c89d716c1a82940203a524fb0e06a451ad4003224745d0f48fd68234d0a151451f72b883a338efa1c875b6d412e7c798a596a4324cf736c21c780
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
deleted file mode 100644
index 8d0c97b24f43..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="SDL2_mixer-${PV}"
-inherit multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://github.com/libsdl-org/SDL_mixer"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="flac fluidsynth midi mod mp3 opus playtools static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	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? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	mp3? ( 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}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	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 mod music-mod-modplug)
-		--disable-music-mod-modplug-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)
-		$(usex vorbis \
-			$(use_enable !tremor music-ogg-vorbis) \
-			--disable-music-ogg-vorbis)
-		--disable-music-ogg-vorbis-shared
-		$(use_enable tremor music-ogg-tremor)
-		--disable-music-ogg-tremor-shared
-		$(use_enable flac music-flac)
-		$(use_enable flac music-flac-libflac)
-		--disable-music-flac-libflac-shared
-		$(use_enable mp3 music-mp3)
-		$(use_enable mp3 music-mp3-mpg123)
-		--disable-music-mp3-mpg123-shared
-		$(use_enable opus music-opus)
-		--disable-music-opus-shared
-	)
-
-	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
-	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.8.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1.ebuild
new file mode 100644
index 000000000000..f336653b1b09
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="SDL2_mixer-${PV}"
+inherit cmake-multilib
+
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://github.com/libsdl-org/SDL_mixer"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="flac fluidsynth gme midi mod modplug mp3 opus playtools stb timidity tremor vorbis +wav wavpack xmp"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+
+	vorbis? ( ?? ( stb tremor ) )
+	stb? ( vorbis )
+	tremor? ( vorbis )
+
+	mod? ( || ( modplug xmp ) )
+	modplug? ( mod )
+	xmp? ( mod )
+"
+
+RDEPEND="
+	media-libs/libsdl2[${MULTILIB_USEDEP}]
+	flac? ( media-libs/flac:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( media-sound/fluidsynth:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+		xmp? ( media-libs/libxmp )
+	)
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opusfile )
+	vorbis? (
+		stb? ( dev-libs/stb )
+		tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )
+		!stb? ( !tremor? ( media-libs/libvorbis[${MULTILIB_USEDEP}] ) )
+	)
+	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )
+	wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSDL2MIXER_CMD=yes
+		-DSDL2MIXER_WAVE=$(usex wav)
+		-DSDL2MIXER_MOD=$(usex mod)
+		-DSDL2MIXER_MOD_MODPLUG=$(usex modplug)
+		-DSDL2MIXER_MOD_XMP=$(usex xmp)
+		-DSDL2MIXER_MIDI=$(usex midi)
+		-DSDL2MIXER_MIDI_TIMIDITY=$(usex timidity)
+		-DSDL2MIXER_MIDI_FLUIDSYNTH=$(usex fluidsynth)
+		-DSDL2MIXER_VORBIS=$(usex vorbis $(usex stb STB $(usex tremor TREMOR VORBISFILE) ) no )
+		-DSDL2MIXER_FLAC=$(usex flac)
+		-DSDL2MIXER_FLAC_LIBFLAC=$(usex flac)
+		-DSDL2MIXER_MP3=$(usex mp3)
+		-DSDL2MIXER_MP3_MPG123=$(usex mp3)
+		-DSDL2MIXER_OPUS=$(usex opus)
+		-DSDL2MIXER_GME=$(usex gme)
+		-DSDL2MIXER_WAVPACK=$(usex wavpack)
+		-DSDL2MIXER_SAMPLES=$(usex playtools)
+		-DSDL2MIXER_SAMPLES_INSTALL=$(usex playtools)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	# bug #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-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 17ebae01beeb..5ee5f92c03aa 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,7 +1,7 @@
-DIST SDL2_ttf-2.20.0.tar.gz 13156472 BLAKE2B f31b1193beaaab0e2aaab6f56c82f4931db79ab81526398e20176c9fb121409d4f9f56109aa721d645496f6c228450cb95bda48c40037f1a3f904154e0e21fee SHA512 14c78cfa04b938f0bd141d841a9473a1678bb04d01a96391cfa37ae3e7e316c90f175aff7d052499f7d982f59b823813e4cfdd367631a44b08b85f9b60d09c8c
 DIST SDL2_ttf-2.20.2.tar.gz 13161592 BLAKE2B d94a68d817c0824d7292f51ec3e20148a87235cb72daa68015af16cef7434bdc095c68a9c6efd130fc50f58996c2801cf29e4b90545b47ad2f90d7c77e238474 SHA512 b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c
 DIST SDL2_ttf-2.22.0.tar.gz 14314901 BLAKE2B b1d6505f316f1289f7ef95466da8f4a085898072c3eeb84084aa1f82ed8033bbc1931a11b74d54db18a8424541864a6e35b02dbc514f447e7e1582742e78f9a7 SHA512 34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912
-EBUILD sdl2-ttf-2.20.0.ebuild 1064 BLAKE2B f1083768ce718075630622576d090c1481fb8bc44cf7528df6fde6c8432b4fe2e3188d3f400c8a9cef42d9f687509d30ddf97940d09dee86cf44fb234ac0df15 SHA512 38012fc4d203faa36a2aceb235a672c2d322ac75db8386961817cfb7c434ac526810ebef065b3db0b8c29af1e1a75752a656eb0e5b0880faafec0e1d23670875
+DIST SDL2_ttf-2.24.0.tar.gz 13335900 BLAKE2B a80506226415ffde07dbb7c2317a902f57d718918d12011bfd3b82a9a629ee0db27088dad74d61b8375503fb5e87d4e9e4df7e52119fde0eaf3c709f605abfec SHA512 a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885
 EBUILD sdl2-ttf-2.20.2.ebuild 1115 BLAKE2B 77cca88cbb4f123a978a0d80f5f9443e6dc5a69bca1d1266b70892e6b74e8fde8bc9342cbc9091d6375eb59fa9bf825d959d67f3de3460ee9549138227b9d18f SHA512 5841f79c930955677b7c9edad1303f0982c6e5cd52ec6f6b71a5e5e3f862ec7deea5269c8ffa5922e947eb0c7f8a338a214b33e64438b407d0100f575e36f17a
 EBUILD sdl2-ttf-2.22.0.ebuild 1118 BLAKE2B 54fb37c8b9bc01e8175ce77a8968af0279a6c11a707902fbee0aeced61a507e42ffe85bf6531066182d6dbd28174c38c57d6677ef56ef48dad36a05bf0fb2492 SHA512 9478d7b4c5a056c4fb7585f42f41f4e5cf34fb5a7b16545633c02c403e7753d5803746b0584c6ece977aa6046dd684aecf05a1d68259862a1b015f51464d41eb
+EBUILD sdl2-ttf-2.24.0.ebuild 1124 BLAKE2B 5c040fc94e7974c442f2863fe95efb86fc80d9ed0a740b748ae344383e34fde4a8951998ea2bdc52cdff030b3239a9725f4596f18781c741efbf4b6199f85a93 SHA512 a15d103c8a01111d7b3463b0923576b4052ba6f78cdf4a0e4cbd86c70c1e17fc99491bba624bb28f224a253f3936517f011bbe52f85f0c9737fe3620d80f9ff0
 MISC metadata.xml 694 BLAKE2B def65e69533279b6f10d380901d78f004e3524413598d9ecd2661262eb2ae5f6331f1a0fa2729084b2b5fea05e0811057098686a4fa4f65d6a92a0cdb667310a SHA512 f5d6cb83fe8ff6db7f3c6c171a435e7682470299738cbe4a90a7132dc5bd0083f0abd052754c037e10b23a94dc57e57a938bf489334191ed9c144e4493d28232
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild
index 21ba64b494b1..8468c1fe4f18 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,15 +13,17 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+harfbuzz static-libs X"
 
 # On bumps, check external/ for versions of bundled freetype + harfbuzz
 # to crank up the dep bounds.
-RDEPEND=">=media-libs/libsdl2-2.0.12[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.10.4[harfbuzz?,${MULTILIB_USEDEP}]
+RDEPEND="
+	>=media-libs/libsdl2-2.0.12[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13.2[harfbuzz?,${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]
-	harfbuzz? ( >=media-libs/harfbuzz-2.8.0:=[${MULTILIB_USEDEP}] )"
+	harfbuzz? ( >=media-libs/harfbuzz-8.1.1:=[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
@@ -35,4 +37,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	dodoc {CHANGES,README}.txt
+
+	rm -rf "${ED}"/usr/share/licenses/ || die
 }