[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

[Matt Turner]

commit:     375e6e590ac979643f27c4974ba9bc048d918e69
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 14 03:20:48 2026 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 14 03:26:23 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375e6e59

media-libs/mesa: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/Manifest           |   7 -
 media-libs/mesa/mesa-25.1.9.ebuild | 511 -------------------------------------
 media-libs/mesa/mesa-25.2.5.ebuild | 469 ----------------------------------
 media-libs/mesa/mesa-25.2.6.ebuild | 469 ----------------------------------
 media-libs/mesa/mesa-25.2.7.ebuild | 469 ----------------------------------
 media-libs/mesa/mesa-25.3.0.ebuild | 451 --------------------------------
 media-libs/mesa/mesa-25.3.1.ebuild | 451 --------------------------------
 media-libs/mesa/mesa-25.3.2.ebuild | 429 -------------------------------
 8 files changed, 3256 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3d7e3e10f45c..d525feb057e2 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,6 @@
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B 
b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d
 SHA512 
890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
 DIST mesa-25.0.7.tar.xz 46849080 BLAKE2B 
d5f4f8f8ff0ad934c23ba3202bfed9f35097db779a239ac531e2b0e2b22de54639d594863a1403ad205ffc2af2990d48c31808f479a4075b819cedc219a82e68
 SHA512 
825bbd8bc5507de147488519786c0200afacf97dae621c80ead24b2c5dd55c5a442757ac8452698ae611e9344025465080795cf8f2dc4eb7ce07b5cc521b2b5c
-DIST mesa-25.1.9.tar.xz 47219748 BLAKE2B 
df326ae261fb417022af48b6edc1a5dc512c46a728cf1d7320d78aba0275fee8636a6396ad9e02fe39f958c7d33c7da966b3e180e239112112c3f9ebc7738eb6
 SHA512 
27d7202968f5639dda590d3647d72c6857cac74031e273edd651fc8ed7f04bda335bccd8a65a961cec368d45d6fe20d004b5375f095266459074f4bc74f5ed98
-DIST mesa-25.2.5.tar.xz 43723176 BLAKE2B 
375237d23918e09b7dab4f4abd2c3b24a046521d6e247043c5fbeb7d8a33d71471b23572d254f0ad489a2533094568ef6f067a57977a7ccc1805aa735c3f8b7d
 SHA512 
29e61b5ecb467a706e3279c0e79ddd8d55109c08f7856d35c4042f518a70622fb19cdd208a82317654e0396835cb3117b756a96d9a0693bfa33730a50bbbd1d0
-DIST mesa-25.2.6.tar.xz 43752752 BLAKE2B 
40ce74df4049787ed56fc1605f9e2c9e77d0f157b006381493e11f518db977a7d02c33c7d1dc50c9700fe02478877ca240b526cdddea24a8602c0ae88081e087
 SHA512 
c34f55132ee9097a7c4961745bf07a08fc612bf0f7c570c023fedb16c8eafbefdc1cc022f722c345780bb14ec4ce25d9a206a9196d9d51c97b389db5160de9cc
-DIST mesa-25.2.7.tar.xz 43783492 BLAKE2B 
7e834275fc23760e76c944cd83440e26bbc6286bb4bad75d7344a62934dc472e9f9f24a756e3b7488a617c2934dbdefd91bf79847ea09b5767ea3ccc2fdf5173
 SHA512 
87dd815e0d11d6ec0eb969ee93d3f376103bb899d90599e0b7902394e41c58139384df79f89633e132ca969348d3320f55308a74651d409b454d51f1bcda27bc
 DIST mesa-25.2.8.tar.xz 43813260 BLAKE2B 
953b87f36d8bffc1bc5a5eef3f14da8ec8735bc0b7916e0bd9b7766bf71a574cc7c17054f6bb638f769d122356713c7617c661599c41cfb37144e66a8dcdd92f
 SHA512 
a238965ee235bd9178d26b210fc3996b77927dab31964b76cd1e1e72cfffbefbd96e4a57ec4f5018205a58354cd41d6cf99bbc712b275a7518710a34511dfb13
-DIST mesa-25.3.0.tar.xz 43281808 BLAKE2B 
54cd99f9a4f14bf070f5525a91a776f0b7042ce7c056bf8db388baa5c98e0065799cdc376c0c42205b08eff18f252b6e7be5987e44fb628b97a360a7e89c300f
 SHA512 
46df9e5e27f9a36cf893a68ad4a465fcc6efe1bcb46ad8d4b015699ad1a11e582b8d41f4157326556af603fe454b2ff34ecc17a0c742b5fd9ce5f0097106fec5
-DIST mesa-25.3.1.tar.xz 43316044 BLAKE2B 
1c2927a04eeac787a583a31167ae1d40cb839fc45fcd3c0bad0e0b3842694444bd3f950d106f692ceb47b9881c9d101be995bcf7385a4fb992c54a23d56ffd1e
 SHA512 
7e2f7295f1f4df129935b60d75c890f6ae585ecc511f69f55a61826df5f2434ffdb4109c632af9842a986bf9beed430a0404d377e8335b71fa36682bd10533ba
-DIST mesa-25.3.2.tar.xz 43373712 BLAKE2B 
f584ce53e1062657d2776e872a8fc9fc83cd209e6a700b0b0e4aff3a6c72c184452dde05dd84bdffe7011a5aecd812c7e454591b55a3c3832d8dcaa0a3aaf59a
 SHA512 
499cb0aa254b5a706fb6c2414c23b9d5d03d9397475f7ad16744b982303a2a2bf643ef7adc64870645ee4355b5f95695becd6caff7d7f7caf698e6269589aa13
 DIST mesa-25.3.3.tar.xz 43385312 BLAKE2B 
1f380c2fbd7c267a68757fc0d32272daddc4c376a65afda7df4e7a24a9597558ba8e93678f7163499e38d724063eb4446820ac43983a390ac34b15870c83009b
 SHA512 
232b39f5035f8a65c8f815c8b524e3570f229673a85cd3591fbab9136c80b4ab922dc959f51a9d0a11e91cc66f8cf7f30cd9b846bb9e1607e3a6c820d5c8045a
 DIST mesa-25.3.4.tar.xz 43415708 BLAKE2B 
9fd20df3011526301f3700dfeaa84b14fb3b6aa897d5361584c82048a0b2bb3fb6430d6e1be574a6768aeaf50dce35528bf058c396d743338ad4172d4212817e
 SHA512 
3043bebebebc90ba443bbc96d71fbae41c76504d54ff6a44a48ad7c3a132db09e3ad1ae607c49f1d58b724a8b6e4263b68ee5722f8b98328481eb2e82164ac3a
 DIST mesa-25.3.5.tar.xz 43473072 BLAKE2B 
284bc47b27cdf4a8dac247b02ed8d0950009d8a2b72247bea1c938fc9ea7fa184c3acd2c077d8908a5445452d8eec2bbf02b704a0b30c5d3723a71f3fb64e2d5
 SHA512 
3db3d3c98bf476a5827705b82733d9964ec511b30882ec7e9edaddc65a5dea5e6bfb33bdcd4f97752d7a3ae9e306e8703982686cbd869567b4194decdb2f5a89

diff --git a/media-libs/mesa/mesa-25.1.9.ebuild 
b/media-libs/mesa/mesa-25.1.9.ebuild
deleted file mode 100644
index 3bc7149275cc..000000000000
--- a/media-libs/mesa/mesa-25.1.9.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..20} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-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="~alpha amd64 arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~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}
-       asahi 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 +proprietary-codecs
-       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}]
-       >=virtual/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}] )
-       vulkan? ( virtual/libudev:= )
-       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.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.0
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.0
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! 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 asahi, 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
-}
-
-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
-}
-
-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_asahi asahi
-       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_asahi asahi
-               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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.2.5.ebuild 
b/media-libs/mesa/mesa-25.2.5.ebuild
deleted file mode 100644
index ca273d0abc72..000000000000
--- a/media-libs/mesa/mesa-25.2.5.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..20} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~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}
-       asahi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vdpau vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       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 )
-"
-
-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}]
-       >=virtual/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}] )
-       vulkan? ( virtual/libudev:= )
-       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.8[${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}
-       sysprof? ( >=dev-util/sysprof-capture-3.38.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! 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 asahi, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       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_asahi asahi
-               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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.2.6.ebuild 
b/media-libs/mesa/mesa-25.2.6.ebuild
deleted file mode 100644
index ca273d0abc72..000000000000
--- a/media-libs/mesa/mesa-25.2.6.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..20} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~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}
-       asahi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vdpau vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       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 )
-"
-
-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}]
-       >=virtual/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}] )
-       vulkan? ( virtual/libudev:= )
-       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.8[${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}
-       sysprof? ( >=dev-util/sysprof-capture-3.38.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! 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 asahi, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       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_asahi asahi
-               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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.2.7.ebuild 
b/media-libs/mesa/mesa-25.2.7.ebuild
deleted file mode 100644
index e50130299b1c..000000000000
--- a/media-libs/mesa/mesa-25.2.7.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..20} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-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="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~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}
-       asahi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vdpau vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       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 )
-"
-
-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}]
-       >=virtual/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}] )
-       vulkan? ( virtual/libudev:= )
-       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.8[${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}
-       sysprof? ( >=dev-util/sysprof-capture-3.38.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! 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 asahi, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       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_asahi asahi
-               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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.3.0.ebuild 
b/media-libs/mesa/mesa-25.3.0.ebuild
deleted file mode 100644
index c46f826238bc..000000000000
--- a/media-libs/mesa/mesa-25.3.0.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..21} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~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"
-
-VIDEO_CARDS="
-       asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-       panfrost r300 r600 radeon radeonsi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       video_cards_i915? ( llvm )
-       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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-       ${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-       >=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}]
-       >=virtual/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}]
-       )
-       video_cards_i915? (
-               ${LIBDRM_DEPSTRING}[video_cards_intel]
-       )
-       video_cards_radeonsi? (
-               ${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-               virtual/libelf:0=[${MULTILIB_USEDEP}]
-       )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       vulkan? (
-               media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-               virtual/libudev:=
-       )
-       wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.8[${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}] )
-"
-
-DEPEND="${RDEPEND}
-       sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.618.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_imagination &&
-                  ! 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 asahi, d3d12, freedreno, imagination, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_i915 i915
-       gallium_enable video_cards_intel crocus 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_asahi asahi
-               vulkan_enable video_cards_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_imagination imagination
-               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=anti-lag,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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature vulkan display-info)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.3.1.ebuild 
b/media-libs/mesa/mesa-25.3.1.ebuild
deleted file mode 100644
index c46f826238bc..000000000000
--- a/media-libs/mesa/mesa-25.3.1.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..21} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~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"
-
-VIDEO_CARDS="
-       asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-       panfrost r300 r600 radeon radeonsi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       video_cards_i915? ( llvm )
-       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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-       ${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-       >=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}]
-       >=virtual/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}]
-       )
-       video_cards_i915? (
-               ${LIBDRM_DEPSTRING}[video_cards_intel]
-       )
-       video_cards_radeonsi? (
-               ${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-               virtual/libelf:0=[${MULTILIB_USEDEP}]
-       )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       vulkan? (
-               media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-               virtual/libudev:=
-       )
-       wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.8[${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}] )
-"
-
-DEPEND="${RDEPEND}
-       sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.618.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_imagination &&
-                  ! 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 asahi, d3d12, freedreno, imagination, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_i915 i915
-       gallium_enable video_cards_intel crocus 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_asahi asahi
-               vulkan_enable video_cards_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_imagination imagination
-               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=anti-lag,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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature vulkan display-info)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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-25.3.2.ebuild 
b/media-libs/mesa/mesa-25.3.2.ebuild
deleted file mode 100644
index 21888cc886a1..000000000000
--- a/media-libs/mesa/mesa-25.3.2.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..21} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-       paste@1.0.14
-       proc-macro2@1.0.86
-       quote@1.0.35
-       rustc-hash@2.1.1
-       syn@2.0.87
-       unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~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"
-
-VIDEO_CARDS="
-       asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-       panfrost r300 r600 radeon radeonsi 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 debug +llvm
-       lm-sensors opencl +opengl +proprietary-codecs
-       sysprof test unwind vaapi valgrind vulkan
-       wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       video_cards_i915? ( llvm )
-       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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-       ${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-       >=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}]
-       >=virtual/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}]
-       )
-       video_cards_i915? (
-               ${LIBDRM_DEPSTRING}[video_cards_intel]
-       )
-       video_cards_radeonsi? (
-               ${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-               virtual/libelf:0=[${MULTILIB_USEDEP}]
-       )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       vulkan? (
-               media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-               virtual/libudev:=
-       )
-       wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.8[${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}] )
-"
-
-DEPEND="${RDEPEND}
-       sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.618.1[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.41 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-
-CLC_DEPSTRING="
-       ~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-       llvm-core/libclc[spirv(-)]
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-util/bindgen-0.71.1
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.7.0
-       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_asahi? ( ${CLC_DEPSTRING} )
-       video_cards_intel? ( ${CLC_DEPSTRING} )
-       video_cards_panfrost? ( ${CLC_DEPSTRING} )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.71.1
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-                       ${CLC_DEPSTRING}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       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_asahi &&
-                  ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_imagination &&
-                  ! 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 asahi, d3d12, freedreno, imagination, 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 llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain 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
-}
-
-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_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
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_asahi asahi
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_i915 i915
-       gallium_enable video_cards_intel crocus 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_asahi asahi
-               vulkan_enable video_cards_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_imagination imagination
-               vulkan_enable video_cards_intel intel intel_hasvk
-               vulkan_enable video_cards_lavapipe swrast
-               vulkan_enable video_cards_nvk nouveau
-               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
-               emesonargs+=(-Dvulkan-layers=anti-lag,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
-
-       if use video_cards_asahi ||
-          use video_cards_intel ||
-          use video_cards_nvk ||
-          use video_cards_panfrost; then
-          emesonargs+=(-Dmesa-clc=system)
-       fi
-
-       if use video_cards_asahi ||
-          use video_cards_panfrost; then
-           emesonargs+=(-Dprecomp-compiler=system)
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -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_feature unwind libunwind)
-               $(meson_feature vulkan display-info)
-               $(meson_feature zstd)
-               $(meson_use llvm amd-use-llvm)
-               $(meson_use sysprof)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -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
-}
-
-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
-}