commit:     24e4ada5d073e1ff58f5a74779cbb306c6b7e4e4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 14:24:56 2025 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 14:27:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e4ada5

media-libs/mesa: Drop old versions

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

 media-libs/mesa/Manifest                           |   5 -
 .../files/mesa_egl_fix_sw_fallback_rejection.patch |  54 ---
 media-libs/mesa/mesa-25.0.5.ebuild                 | 509 --------------------
 media-libs/mesa/mesa-25.0.6.ebuild                 | 505 --------------------
 media-libs/mesa/mesa-25.1.0.ebuild                 | 511 ---------------------
 media-libs/mesa/mesa-25.1.1.ebuild                 | 511 ---------------------
 media-libs/mesa/mesa-25.1.2.ebuild                 | 511 ---------------------
 7 files changed, 2606 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d6c46896b8c9..17d826de0fd5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,5 @@
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B 
b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d
 SHA512 
890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
-DIST mesa-25.0.5.tar.xz 46793824 BLAKE2B 
f17f8c2a733fd3c37f346b9304241dc1d13e01df9c8c723b73b10279dd3c2ebed062ec1f15cdbc8b9936bae840a087b23ac38cae7d8982228d582d468ab8c9c9
 SHA512 
d65e027829e3bef60bc0e3e71160e6b3721e797e2157c71dbeef0cd6e202f8f8098b3cd41159cd0e96e520eaf92ea49c2c9bb1af1a54867b6a7c551c2197c068
-DIST mesa-25.0.6.tar.xz 46824244 BLAKE2B 
c713cd547c8a1ddb68a329b15e8f94f99442e18e1658e0c1ce6e1089bddf80d26396225eb97140bd9c9824880af2fa9e0833e6b8988e1d9c61c21fd0f7eed2dc
 SHA512 
6a0abc8a5bbbb8ffdad7286fc5642f643b1f4183794425ba689c2c9f5c73a4131c8685074241deb1022631b4c1f1c505dbd848190ec60d5d6931e90dd9316e05
 DIST mesa-25.0.7.tar.xz 46849080 BLAKE2B 
d5f4f8f8ff0ad934c23ba3202bfed9f35097db779a239ac531e2b0e2b22de54639d594863a1403ad205ffc2af2990d48c31808f479a4075b819cedc219a82e68
 SHA512 
825bbd8bc5507de147488519786c0200afacf97dae621c80ead24b2c5dd55c5a442757ac8452698ae611e9344025465080795cf8f2dc4eb7ce07b5cc521b2b5c
-DIST mesa-25.1.0.tar.xz 46937848 BLAKE2B 
5057c6664ca135177d0ccf9cc0c6e0c6ea7efa4cff7ee626050bec1682c9e864dc684c5579eff6a9df77ac0f7280bf10e6e93474d0369de250ccf38c9dc7d104
 SHA512 
40298370727fa1ad6d59be8692dfef01c42e41780816e9b951a05f779c7acca127162d2d3cedfccb7bfe3834b9e917c2b9bc6cb76887488d919cb61741a1da1a
-DIST mesa-25.1.1.tar.xz 46974340 BLAKE2B 
73618405dee247f7e3141f817ab66e5bbb6256d116cc1bb3eb86ed8c9511194891d3e68b3d7d36cdc3a68fab25a231da58e3bba2da7914e8c7d55ea861d50952
 SHA512 
8000fec61da3b7c0355b74458c52f8faeb562398a1882d68cd31a253848edd3333072521ec52f8c5c1a62d909afd6667803d43cb54027d0af3d944f1add27aae
-DIST mesa-25.1.2.tar.xz 47001872 BLAKE2B 
2c92a5fb09353034936951f75848fbc1da113a1c78391d781cecc61a8b2aed6e579f0c5e2cf95b213af0f8b8823c73dc48659cb51f124c3e1ee266bfed408189
 SHA512 
60ac5c5aea8460d5281558491838ef0af9d7ba9ab7fd71fa58b6914da154d171a6b3c8a1a6daeb6cc27ced63056c3a784b5172d33429600a3d89c2849f260114
 DIST mesa-25.1.3.tar.xz 47013904 BLAKE2B 
a61698b51b769aea6926192f9a42459449a14f4d732717866814e6917a8db262ca00a0de3cd12fb6d3d6be897d2e7df34d011f29a54774efd431e987dda399e1
 SHA512 
20b72ac4e39e559e36be07f003707cf5e25c5ebac22746d71438edecb9d911f5341373b1632ff08c00b57ac15fc880ce5a203ab9165e5e71057816be31344fd7
 DIST paste-1.0.14.crate 18157 BLAKE2B 
35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c
 SHA512 
3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B 
fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c
 SHA512 
ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f

diff --git a/media-libs/mesa/files/mesa_egl_fix_sw_fallback_rejection.patch 
b/media-libs/mesa/files/mesa_egl_fix_sw_fallback_rejection.patch
deleted file mode 100644
index b68c01b4dca6..000000000000
--- a/media-libs/mesa/files/mesa_egl_fix_sw_fallback_rejection.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34609
-
-From a7cee8cdab8b36344e5621a8a8b5035c42e3e253 Mon Sep 17 00:00:00 2001
-From: Mike Blumenkrantz <michael.blumenkra...@gmail.com>
-Date: Fri, 18 Apr 2025 09:33:46 -0400
-Subject: [PATCH] egl: fix sw fallback rejection in non-sw EGL_PLATFORM=device
-
-previously progress could still be made during sw fallback here,
-which would lead to unpredictable results with driver loading e.g., crashing
-
-cc: mesa-stable
----
- src/egl/drivers/dri2/platform_device.c | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/src/egl/drivers/dri2/platform_device.c 
b/src/egl/drivers/dri2/platform_device.c
-index 0394b7c2a8fe1..bcd5b69aff31c 100644
---- a/src/egl/drivers/dri2/platform_device.c
-+++ b/src/egl/drivers/dri2/platform_device.c
-@@ -282,16 +282,21 @@ device_probe_device(_EGLDisplay *disp)
-    if (!dri2_dpy->driver_name)
-       goto err_name;
- 
--   /* When doing software rendering, some times user still want to explicitly
--    * choose the render node device since cross node import doesn't work 
between
--    * vgem/virtio_gpu yet. It would be nice to have a new EXTENSION for this.
--    * For now, just fallback to kms_swrast. */
--   if (disp->Options.ForceSoftware && !request_software &&
--       (strcmp(dri2_dpy->driver_name, "vgem") == 0 ||
--        strcmp(dri2_dpy->driver_name, "virtio_gpu") == 0)) {
--      free(dri2_dpy->driver_name);
--      _eglLog(_EGL_WARNING, "NEEDS EXTENSION: falling back to kms_swrast");
--      dri2_dpy->driver_name = strdup("kms_swrast");
-+   /* this is software fallback */
-+   if (disp->Options.ForceSoftware && !request_software) {
-+      /* When doing software rendering, some times user still want to 
explicitly
-+      * choose the render node device since cross node import doesn't work 
between
-+      * vgem/virtio_gpu yet. It would be nice to have a new EXTENSION for 
this.
-+      * For now, just fallback to kms_swrast. */
-+      if (strcmp(dri2_dpy->driver_name, "vgem") == 0 ||
-+          strcmp(dri2_dpy->driver_name, "virtio_gpu") == 0) {
-+         free(dri2_dpy->driver_name);
-+         _eglLog(_EGL_WARNING, "NEEDS EXTENSION: falling back to kms_swrast");
-+         dri2_dpy->driver_name = strdup("kms_swrast");
-+      } else if (strcmp(dri2_dpy->driver_name, "vmwgfx")) {
-+         /* this is software fallback; deny progress since a hardware device 
was requested */
-+         return false;
-+      }
-    }
- 
-    dri2_detect_swrast(disp);
--- 
-GitLab
-

diff --git a/media-libs/mesa/mesa-25.0.5.ebuild 
b/media-libs/mesa/mesa-25.0.5.ebuild
deleted file mode 100644
index 5f8a952e3638..000000000000
--- a/media-libs/mesa/mesa-25.0.5.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..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 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap 
files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-       ${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-       d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-       vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug +llvm
-       lm-sensors opencl +opengl osmesa +proprietary-codecs
-       test unwind vaapi valgrind vdpau vulkan
-       wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       d3d9? (
-               || (
-                       video_cards_freedreno
-                       video_cards_intel
-                       video_cards_nouveau
-                       video_cards_panfrost
-                       video_cards_r300
-                       video_cards_r600
-                       video_cards_radeonsi
-                       video_cards_vmware
-                       video_cards_zink
-               )
-       )
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       video_cards_lavapipe? ( llvm vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_zink? ( vulkan opengl )
-       video_cards_nvk? ( vulkan video_cards_nouveau )
-       vdpau? ( X )
-       xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-       >=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               $(llvm_gen_dep "
-                       
llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                       opencl? (
-                               dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-                               
llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                               =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-                       )
-               ")
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-               >=virtual/opencl-3
-               llvm-core/libclc[spirv(-)]
-               virtual/libelf:0=
-       )
-       vaapi? (
-               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       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.38 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-build/meson-1.7.0
-               >=dev-util/bindgen-0.71.0
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.4.1
-       app-alternatives/yacc
-       app-alternatives/lex
-       virtual/pkgconfig
-       $(python_gen_any_dep "
-               >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-               dev-python/packaging[\${PYTHON_USEDEP}]
-               dev-python/pyyaml[\${PYTHON_USEDEP}]
-       ")
-       video_cards_intel? (
-               ~dev-util/mesa_clc-${PV}
-               llvm-core/libclc[spirv(-)]
-               $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-       )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-build/meson-1.7.0
-                       >=dev-util/bindgen-0.71.0
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       usr/lib/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-PATCHES=(
-       "${FILESDIR}/${PN}_egl_fix_sw_fallback_rejection.patch"
-)
-
-src_unpack() {
-       if [[ ${PV} == 9999 ]]; then
-               git-r3_src_unpack
-       else
-               unpack ${MY_P}.tar.xz
-       fi
-
-       # We need this because we cannot tell meson to use DISTDIR yet
-       pushd "${DISTDIR}" >/dev/null || die
-       mkdir -p "${S}"/subprojects/packagecache || die
-       local i
-       for i in *.crate; do
-               ln -s "${PWD}/${i}" 
"${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-       done
-       popd >/dev/null || die
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_lavapipe &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_nvk &&
-                  ! use video_cards_panfrost &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, 
radeonsi, v3d, or virgl"
-               fi
-       fi
-
-       # VA
-       if use vaapi; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, intel, nouveau, or vmware"
-               fi
-       fi
-
-       if ! use llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain llvm"
-       fi
-
-       if use osmesa && ! use llvm; then
-               ewarn "OSMesa will be slow without enabling USE=llvm"
-       fi
-}
-
-python_check_deps() {
-       python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-       python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-       python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-       if use llvm && use vulkan && use video_cards_intel && use amd64; then
-               python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || 
return 1
-       fi
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version llvm-core/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
llvm-core/llvm"
-               ewarn "detected! This can cause problems. For details, see bug 
459306."
-       fi
-
-       if use video_cards_intel ||
-          use video_cards_radeonsi; then
-               if kernel_is -ge 5 11 3; then
-                       CONFIG_CHECK="~KCMP"
-               elif kernel_is -ge 5 11; then
-                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
-               elif kernel_is -ge 5 10 20; then
-                       CONFIG_CHECK="~KCMP"
-               else
-                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
-               fi
-               linux-info_pkg_setup
-       fi
-
-       use llvm && llvm-r1_pkg_setup
-       python-any-r1_pkg_setup
-
-       if use opencl || (use vulkan && use video_cards_nvk); then
-               rust_pkg_setup
-       fi
-}
-
-src_prepare() {
-       default
-       sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-               bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       # bug #932591 and 
https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-       filter-lto
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_freedreno ||
-          use video_cards_intel || # crocus i915 iris
-          use video_cards_nouveau ||
-          use video_cards_panfrost ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_vmware || # svga
-          use video_cards_zink; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vaapi gallium-va))
-               use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-       else
-               emesonargs+=(-Dgallium-va=disabled)
-       fi
-
-       if use video_cards_d3d12; then
-               emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_intel ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_feature xa gallium-xa))
-       else
-               emesonargs+=(-Dgallium-xa=disabled)
-       fi
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_intel crocus i915 iris
-       gallium_enable video_cards_lima lima
-       gallium_enable video_cards_nouveau nouveau
-       gallium_enable video_cards_panfrost panfrost
-       gallium_enable video_cards_v3d v3d
-       gallium_enable video_cards_vc4 vc4
-       gallium_enable video_cards_virgl virgl
-       gallium_enable video_cards_vivante etnaviv
-       gallium_enable video_cards_vmware svga
-       gallium_enable video_cards_zink zink
-
-       gallium_enable video_cards_r300 r300
-       gallium_enable video_cards_r600 r600
-       gallium_enable video_cards_radeonsi radeonsi
-       if ! use video_cards_r300 &&
-          ! use video_cards_r600; then
-               gallium_enable video_cards_radeon r300 r600
-       fi
-
-       if use llvm && use opencl; then
-               PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-               # See 
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-               emesonargs+=(
-                       $(meson_native_true gallium-rusticl)
-                       -Drust_std=2021
-               )
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel intel_hasvk
-               vulkan_enable video_cards_lavapipe swrast
-               vulkan_enable video_cards_panfrost panfrost
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-               vulkan_enable video_cards_vc4 broadcom
-               vulkan_enable video_cards_virgl virtio
-               if use video_cards_nvk; then
-                       vulkan_enable video_cards_nvk nouveau
-                       if ! multilib_is_native_abi; then
-                               echo -e "[binaries]\nrust = ['rustc', 
'--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-                               emesonargs+=(
-                                       --native-file "${T}"/rust_fix.ini
-                               )
-                       fi
-               fi
-
-               emesonargs+=(-Dvulkan-layers=device-select,overlay)
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       if use opengl && use X; then
-               emesonargs+=(-Dglx=dri)
-       else
-               emesonargs+=(-Dglx=disabled)
-       fi
-
-       if [[ "${ABI}" == amd64 ]]; then
-               emesonargs+=($(meson_feature video_cards_intel intel-rt))
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dshared-glapi=enabled
-               -Dlegacy-x11=dri2
-               -Dexpat=enabled
-               $(meson_use opengl)
-               $(meson_feature opengl gbm)
-               $(meson_feature opengl gles1)
-               $(meson_feature opengl gles2)
-               $(meson_feature opengl glvnd)
-               $(meson_feature opengl egl)
-               $(meson_feature llvm)
-               $(meson_feature lm-sensors lmsensors)
-               $(meson_use osmesa)
-               $(meson_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dmesa-clc=$(usex video_cards_intel system auto)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-
-       if ! multilib_is_native_abi && use video_cards_nvk; then
-               sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = 
rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' 
build.ninja || die
-       fi
-}
-
-multilib_src_compile() {
-       if [[ ${ABI} == x86 ]]; then
-               # Bug 939803
-               BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-       else
-               meson_src_compile
-       fi
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               GALLIUM_DRIVERS+=("$@")
-       fi
-}
-
-vulkan_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               VULKAN_DRIVERS+=("$@")
-       fi
-}

diff --git a/media-libs/mesa/mesa-25.0.6.ebuild 
b/media-libs/mesa/mesa-25.0.6.ebuild
deleted file mode 100644
index 21a948252f8b..000000000000
--- a/media-libs/mesa/mesa-25.0.6.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..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 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap 
files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-       ${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-       d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
-       vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug +llvm
-       lm-sensors opencl +opengl osmesa +proprietary-codecs
-       test unwind vaapi valgrind vdpau vulkan
-       wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       d3d9? (
-               || (
-                       video_cards_freedreno
-                       video_cards_intel
-                       video_cards_nouveau
-                       video_cards_panfrost
-                       video_cards_r300
-                       video_cards_r600
-                       video_cards_radeonsi
-                       video_cards_vmware
-                       video_cards_zink
-               )
-       )
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       video_cards_lavapipe? ( llvm vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_zink? ( vulkan opengl )
-       video_cards_nvk? ( vulkan video_cards_nouveau )
-       vdpau? ( X )
-       xa? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-       >=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               $(llvm_gen_dep "
-                       
llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                       opencl? (
-                               dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-                               
llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                               =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-                       )
-               ")
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-               >=virtual/opencl-3
-               llvm-core/libclc[spirv(-)]
-               virtual/libelf:0=
-       )
-       vaapi? (
-               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       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.38 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=dev-build/meson-1.7.0
-               >=dev-util/bindgen-0.71.0
-               ${RUST_DEPEND}
-       )
-       >=dev-build/meson-1.4.1
-       app-alternatives/yacc
-       app-alternatives/lex
-       virtual/pkgconfig
-       $(python_gen_any_dep "
-               >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-               dev-python/packaging[\${PYTHON_USEDEP}]
-               dev-python/pyyaml[\${PYTHON_USEDEP}]
-       ")
-       video_cards_intel? (
-               ~dev-util/mesa_clc-${PV}
-               llvm-core/libclc[spirv(-)]
-               $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-       )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-build/meson-1.7.0
-                       >=dev-util/bindgen-0.71.0
-                       >=dev-util/cbindgen-0.26.0
-                       ${RUST_DEPEND}
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-       usr/lib/libgallium-*.so
-       usr/lib/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-       if [[ ${PV} == 9999 ]]; then
-               git-r3_src_unpack
-       else
-               unpack ${MY_P}.tar.xz
-       fi
-
-       # We need this because we cannot tell meson to use DISTDIR yet
-       pushd "${DISTDIR}" >/dev/null || die
-       mkdir -p "${S}"/subprojects/packagecache || die
-       local i
-       for i in *.crate; do
-               ln -s "${PWD}/${i}" 
"${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-       done
-       popd >/dev/null || die
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_lavapipe &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_nvk &&
-                  ! use video_cards_panfrost &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, 
radeonsi, v3d, or virgl"
-               fi
-       fi
-
-       # VA
-       if use vaapi; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, intel, nouveau, or vmware"
-               fi
-       fi
-
-       if ! use llvm; then
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain llvm"
-       fi
-
-       if use osmesa && ! use llvm; then
-               ewarn "OSMesa will be slow without enabling USE=llvm"
-       fi
-}
-
-python_check_deps() {
-       python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-       python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-       python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-       if use llvm && use vulkan && use video_cards_intel && use amd64; then
-               python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || 
return 1
-       fi
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version llvm-core/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
llvm-core/llvm"
-               ewarn "detected! This can cause problems. For details, see bug 
459306."
-       fi
-
-       if use video_cards_intel ||
-          use video_cards_radeonsi; then
-               if kernel_is -ge 5 11 3; then
-                       CONFIG_CHECK="~KCMP"
-               elif kernel_is -ge 5 11; then
-                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
-               elif kernel_is -ge 5 10 20; then
-                       CONFIG_CHECK="~KCMP"
-               else
-                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
-               fi
-               linux-info_pkg_setup
-       fi
-
-       use llvm && llvm-r1_pkg_setup
-       python-any-r1_pkg_setup
-
-       if use opencl || (use vulkan && use video_cards_nvk); then
-               rust_pkg_setup
-       fi
-}
-
-src_prepare() {
-       default
-       sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-               bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       # bug #932591 and 
https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-       filter-lto
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_freedreno ||
-          use video_cards_intel || # crocus i915 iris
-          use video_cards_nouveau ||
-          use video_cards_panfrost ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_vmware || # svga
-          use video_cards_zink; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vaapi gallium-va))
-               use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-       else
-               emesonargs+=(-Dgallium-va=disabled)
-       fi
-
-       if use video_cards_d3d12; then
-               emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_intel ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_feature xa gallium-xa))
-       else
-               emesonargs+=(-Dgallium-xa=disabled)
-       fi
-
-       gallium_enable !llvm softpipe
-       gallium_enable llvm llvmpipe
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_intel crocus i915 iris
-       gallium_enable video_cards_lima lima
-       gallium_enable video_cards_nouveau nouveau
-       gallium_enable video_cards_panfrost panfrost
-       gallium_enable video_cards_v3d v3d
-       gallium_enable video_cards_vc4 vc4
-       gallium_enable video_cards_virgl virgl
-       gallium_enable video_cards_vivante etnaviv
-       gallium_enable video_cards_vmware svga
-       gallium_enable video_cards_zink zink
-
-       gallium_enable video_cards_r300 r300
-       gallium_enable video_cards_r600 r600
-       gallium_enable video_cards_radeonsi radeonsi
-       if ! use video_cards_r300 &&
-          ! use video_cards_r600; then
-               gallium_enable video_cards_radeon r300 r600
-       fi
-
-       if use llvm && use opencl; then
-               PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-               # See 
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-               emesonargs+=(
-                       $(meson_native_true gallium-rusticl)
-                       -Drust_std=2021
-               )
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel intel_hasvk
-               vulkan_enable video_cards_lavapipe swrast
-               vulkan_enable video_cards_panfrost panfrost
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-               vulkan_enable video_cards_vc4 broadcom
-               vulkan_enable video_cards_virgl virtio
-               if use video_cards_nvk; then
-                       vulkan_enable video_cards_nvk nouveau
-                       if ! multilib_is_native_abi; then
-                               echo -e "[binaries]\nrust = ['rustc', 
'--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-                               emesonargs+=(
-                                       --native-file "${T}"/rust_fix.ini
-                               )
-                       fi
-               fi
-
-               emesonargs+=(-Dvulkan-layers=device-select,overlay)
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       if use opengl && use X; then
-               emesonargs+=(-Dglx=dri)
-       else
-               emesonargs+=(-Dglx=disabled)
-       fi
-
-       if [[ "${ABI}" == amd64 ]]; then
-               emesonargs+=($(meson_feature video_cards_intel intel-rt))
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dshared-glapi=enabled
-               -Dlegacy-x11=dri2
-               -Dexpat=enabled
-               $(meson_use opengl)
-               $(meson_feature opengl gbm)
-               $(meson_feature opengl gles1)
-               $(meson_feature opengl gles2)
-               $(meson_feature opengl glvnd)
-               $(meson_feature opengl egl)
-               $(meson_feature llvm)
-               $(meson_feature lm-sensors lmsensors)
-               $(meson_use osmesa)
-               $(meson_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dmesa-clc=$(usex video_cards_intel system auto)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-
-       if ! multilib_is_native_abi && use video_cards_nvk; then
-               sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = 
rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' 
build.ninja || die
-       fi
-}
-
-multilib_src_compile() {
-       if [[ ${ABI} == x86 ]]; then
-               # Bug 939803
-               BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
-       else
-               meson_src_compile
-       fi
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               GALLIUM_DRIVERS+=("$@")
-       fi
-}
-
-vulkan_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               VULKAN_DRIVERS+=("$@")
-       fi
-}

diff --git a/media-libs/mesa/mesa-25.1.0.ebuild 
b/media-libs/mesa/mesa-25.1.0.ebuild
deleted file mode 100644
index d3f458d0f4b8..000000000000
--- a/media-libs/mesa/mesa-25.1.0.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..13} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain
-
-MY_P="${P/_/-}"
-
-CRATES="
-       syn@2.0.68
-       proc-macro2@1.0.86
-       quote@1.0.33
-       unicode-ident@1.0.12
-       paste@1.0.14
-"
-
-RUST_MIN_VER="1.78.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-       inherit git-r3
-else
-       SRC_URI="
-               https://archive.mesa3d.org/${MY_P}.tar.xz
-       "
-       KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap 
files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-       ${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-       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}]
-       >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               $(llvm_gen_dep "
-                       
llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                       opencl? (
-                               dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-                               
llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                               =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-                       )
-               ")
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-               >=virtual/opencl-3
-               llvm-core/libclc[spirv(-)]
-               virtual/libelf:0=
-       )
-       vaapi? (
-               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       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.1.1.ebuild 
b/media-libs/mesa/mesa-25.1.1.ebuild
deleted file mode 100644
index 3ad875acb26a..000000000000
--- a/media-libs/mesa/mesa-25.1.1.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 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap 
files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-       ${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-       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}]
-       >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               $(llvm_gen_dep "
-                       
llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                       opencl? (
-                               dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-                               
llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                               =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-                       )
-               ")
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-               >=virtual/opencl-3
-               llvm-core/libclc[spirv(-)]
-               virtual/libelf:0=
-       )
-       vaapi? (
-               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       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.1.2.ebuild 
b/media-libs/mesa/mesa-25.1.2.ebuild
deleted file mode 100644
index 3ad875acb26a..000000000000
--- a/media-libs/mesa/mesa-25.1.2.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 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap 
files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-       ${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS}
-       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}]
-       >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               $(llvm_gen_dep "
-                       
llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                       opencl? (
-                               dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-                               
llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-                               =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
-                       )
-               ")
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-               >=virtual/opencl-3
-               llvm-core/libclc[spirv(-)]
-               virtual/libelf:0=
-       )
-       vaapi? (
-               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-       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
-}

Reply via email to