commit:     ef83ad2dbae68e7facf021c963ebfa4cf36e8d70
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 22:01:27 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 22:02:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef83ad2d

media-libs/mesa: Drop old versions

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

 media-libs/mesa/Manifest               |   4 -
 media-libs/mesa/mesa-21.3.5.ebuild     | 560 ---------------------------------
 media-libs/mesa/mesa-21.3.6.ebuild     | 560 ---------------------------------
 media-libs/mesa/mesa-22.0.0_rc1.ebuild | 463 ---------------------------
 media-libs/mesa/mesa-22.0.0_rc2.ebuild | 463 ---------------------------
 5 files changed, 2050 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 371fe59d5cb3..4992512ef57b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,2 @@
-DIST mesa-21.3.5.tar.xz 16521664 BLAKE2B 
4dcf2e40103233332724289434998149c41a86fdaef622c2fc92065d1708a0635ed5a179e5fc8e51d82efe794f4f99c7de734ed61a8804b5e94aecb071656795
 SHA512 
417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933
-DIST mesa-21.3.6.tar.xz 16544464 BLAKE2B 
2f87d62cb9386f3b84c6bb2a96d4b29a97153e5fd628c61ac996b200f0083cfa410ac42f5e80094fdfb00d266af2da8fe6543a62ae192c34e78434e3d159846a
 SHA512 
8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f
 DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 
7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6
 SHA512 
0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88
-DIST mesa-22.0.0-rc1.tar.xz 15509952 BLAKE2B 
06171bb1fcc67811cb27526b3ae3677315e8f581f4db23f3464aa8b1bb065304782e0234c2b86daf076803a92dd3066217fe1f1f21faf7c85e34c4eb7a6f0027
 SHA512 
6f8d961c7cde5cbd32bc40bc3dc3d8e9b0cea16dc668d8a2b078c61179b0e95725c719c0f0e8994c43591599724b754646050c68777fd4c97ad4ec5a0ee4a420
-DIST mesa-22.0.0-rc2.tar.xz 15517448 BLAKE2B 
abea8387807c9004ee106898518056083256bd726e75130d609617ee4d3378a429d9897ac1c765f1ae564abfb6717ad0a37211454f51d6fc6253a3c1db777683
 SHA512 
9e05355a31f1640df6e800ccdf3150720d1a54aa21d9eb748d567b2b64090b09b6bc54318f2f72644b48c8d08f9db0f7ab3d35c9e1b629ded932fd9ed2e87630
 DIST mesa-22.0.0.tar.xz 15565680 BLAKE2B 
65dd09e1864f353f07ab01cb21cb89f858a071d74043b1913b0abe3ee3b3a992ca3878d40ffe52cc45546770d5ad9e198c93a24a8564ffeb9c8a05da38af300c
 SHA512 
9faef66adbacba24d11dfe8e2d1a753295798883a10a7cc91e6df9d678c64a8286a12e60c0d8576d944a8cc76f00c30d27c3a71d3458bbe3dbcd66c88a454c3b

diff --git a/media-libs/mesa/mesa-21.3.5.ebuild 
b/media-libs/mesa/mesa-21.3.5.ebuild
deleted file mode 100644
index f94b6c9c9f55..000000000000
--- a/media-libs/mesa/mesa-21.3.5.ebuild
+++ /dev/null
@@ -1,560 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-       inherit git-r3
-else
-       SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz";
-       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-       !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima 
nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       osmesa? ( gallium )
-       vulkan? ( video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       video_cards_crocus? ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_iris?   ( gallium )
-       video_cards_lima?   ( gallium )
-       video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_panfrost? ( gallium )
-       video_cards_radeon? ( || ( classic gallium )
-                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
-       video_cards_r100?   ( classic )
-       video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r600?   ( gallium )
-       video_cards_radeonsi?   ( gallium llvm )
-       video_cards_v3d? ( gallium )
-       video_cards_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-       zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       gallium? (
-               unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-               llvm? (
-                       video_cards_radeonsi? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-                       video_cards_r600? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-                       video_cards_radeon? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-               )
-               lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-               opencl? (
-                                       >=virtual/opencl-3[${MULTILIB_USEDEP}]
-                                       dev-libs/libclc
-                                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                               )
-               vaapi? (
-                       >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-               )
-               vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-               xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       )
-       selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-       wayland? (
-               >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-               >=dev-libs/wayland-protocols-1.8
-       )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-       video_cards_intel? (
-               !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       )
-       video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       vulkan-overlay? ( dev-util/glslang:0=[${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.13:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       )
-       zink? ( media-libs/vulkan-loader:=[${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] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:13[${MULTILIB_USEDEP}]
-               sys-devel/llvm:12[${MULTILIB_USEDEP}]
-               sys-devel/llvm:11[${MULTILIB_USEDEP}]
-       )
-       <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-       gallium? (
-               llvm? (
-                       opencl? (
-                               video_cards_r600? (
-                                       ${CLANG_DEPSTR_AMDGPU}
-                               )
-                               !video_cards_r600? (
-                                       video_cards_radeonsi? (
-                                               ${CLANG_DEPSTR_AMDGPU}
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeonsi? (
-                                               video_cards_radeon? (
-                                                       ${CLANG_DEPSTR_AMDGPU}
-                                               )
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeon? (
-                                               !video_cards_radeonsi? (
-                                                       ${CLANG_DEPSTR}
-                                               )
-                                       )
-                               )
-                       )
-                       !opencl? (
-                               video_cards_r600? (
-                                       ${LLVM_DEPSTR_AMDGPU}
-                               )
-                               !video_cards_r600? (
-                                       video_cards_radeonsi? (
-                                               ${LLVM_DEPSTR_AMDGPU}
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeonsi? (
-                                               video_cards_radeon? (
-                                                       ${LLVM_DEPSTR_AMDGPU}
-                                               )
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeon? (
-                                               !video_cards_radeonsi? (
-                                                       ${LLVM_DEPSTR}
-                                               )
-                                       )
-                               )
-                       )
-               )
-       )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-       valgrind? ( dev-util/valgrind )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=sys-devel/gcc-4.6
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-       wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       usr/lib*/libglapi.so.0.0.0
-       usr/lib*/libGLESv1_CM.so.1.1.0
-       usr/lib*/libGLESv2.so.2.0.0
-       usr/lib*/libGL.so.1.2.0
-       usr/lib*/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-       local flags=${MULTILIB_USEDEP}
-       if use video_cards_r600 || use video_cards_radeon || use 
video_cards_radeonsi
-       then
-               flags+=",llvm_targets_AMDGPU(-)"
-       fi
-
-       if use opencl; then
-               has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-       fi
-       has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain freedreno, i965, iris, radeonsi, or v3d"
-               fi
-       fi
-
-       if use opencl; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=opencl     since VIDEO_CARDS does 
not contain r600 or radeonsi"
-               fi
-       fi
-
-       if use vaapi; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_r300 &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain r300, r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, nouveau, or vmware"
-               fi
-       fi
-
-       if use xvmc; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does 
not contain r600 or nouveau"
-               fi
-       fi
-
-       if ! use gallium; then
-               use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does 
not contain gallium"
-               use llvm       && ewarn "Ignoring USE=llvm       since USE does 
not contain gallium"
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain gallium"
-               use vaapi      && ewarn "Ignoring USE=vaapi      since USE does 
not contain gallium"
-               use vdpau      && ewarn "Ignoring USE=vdpau      since USE does 
not contain gallium"
-               use unwind     && ewarn "Ignoring USE=unwind     since USE does 
not contain gallium"
-               use xa         && ewarn "Ignoring USE=xa         since USE does 
not contain gallium"
-               use xvmc       && ewarn "Ignoring USE=xvmc       since USE does 
not contain gallium"
-       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() {
-       has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version sys-devel/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/llvm"
-               ewarn "detected! This can cause problems. For details, see bug 
459306."
-       fi
-
-       if use video_cards_i965 ||
-          use video_cards_iris ||
-          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
-
-       if use gallium && use llvm; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       if use classic; then
-               # Intel code
-               dri_driver_enable video_cards_i915 i915
-               dri_driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       dri_driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               dri_driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               dri_driver_enable video_cards_r100 r100
-               dri_driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                       ! use video_cards_r200; then
-                       dri_driver_enable video_cards_radeon r100 r200
-               fi
-       fi
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use X || use egl; then
-               emesonargs+=(-Dglvnd=true)
-       else
-               emesonargs+=(-Dglvnd=false)
-       fi
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_feature llvm)
-                       $(meson_feature lm-sensors lmsensors)
-                       $(meson_feature unwind libunwind)
-               )
-
-               if use video_cards_iris ||
-                  use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use d3d9 gallium-nine))
-               else
-                       emesonargs+=(-Dgallium-nine=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; 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_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_feature vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=disabled)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_feature xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=disabled)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_feature xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=disabled)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_v3d ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable -- swrast
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_v3d v3d
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable zink zink
-
-               # Only one i915 driver (classic vs gallium). Default to classic.
-               if ! use classic; then
-                       gallium_enable video_cards_i915 i915
-                       if ! use video_cards_i915 && \
-                               ! use video_cards_i965; then
-                               gallium_enable video_cards_intel i915
-                       fi
-               fi
-
-               gallium_enable video_cards_crocus crocus
-               gallium_enable video_cards_iris iris
-
-               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
-
-               gallium_enable video_cards_freedreno freedreno
-               gallium_enable video_cards_virgl virgl
-
-               # opencl stuff
-               emesonargs+=(
-                       -Dgallium-opencl="$(usex opencl icd disabled)"
-               )
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       local vulkan_layers
-       use vulkan && vulkan_layers+="device-select"
-       use vulkan-overlay && vulkan_layers+=",overlay"
-       emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               $(meson_feature egl)
-               $(meson_feature gbm)
-               $(meson_feature gles1)
-               $(meson_feature gles2)
-               $(meson_use osmesa)
-               $(meson_use selinux)
-               $(meson_feature zstd)
-               $(meson_use video_cards_crocus prefer-crocus)
-               $(meson_use video_cards_iris prefer-iris)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               DRI_DRIVERS+=("$@")
-       fi
-}
-
-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-21.3.6.ebuild 
b/media-libs/mesa/mesa-21.3.6.ebuild
deleted file mode 100644
index 80255df71dda..000000000000
--- a/media-libs/mesa/mesa-21.3.6.ebuild
+++ /dev/null
@@ -1,560 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-       inherit git-r3
-else
-       SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-       !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima 
nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       osmesa? ( gallium )
-       vulkan? ( video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       video_cards_crocus? ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_iris?   ( gallium )
-       video_cards_lima?   ( gallium )
-       video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_panfrost? ( gallium )
-       video_cards_radeon? ( || ( classic gallium )
-                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
-       video_cards_r100?   ( classic )
-       video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r600?   ( gallium )
-       video_cards_radeonsi?   ( gallium llvm )
-       video_cards_v3d? ( gallium )
-       video_cards_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-       zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       gallium? (
-               unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-               llvm? (
-                       video_cards_radeonsi? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-                       video_cards_r600? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-                       video_cards_radeon? (
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-               )
-               lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-               opencl? (
-                                       >=virtual/opencl-3[${MULTILIB_USEDEP}]
-                                       dev-libs/libclc
-                                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                               )
-               vaapi? (
-                       >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-               )
-               vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-               xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       )
-       selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-       wayland? (
-               >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-               >=dev-libs/wayland-protocols-1.8
-       )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-       video_cards_intel? (
-               !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       )
-       video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       vulkan-overlay? ( dev-util/glslang:0=[${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.13:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       )
-       zink? ( media-libs/vulkan-loader:=[${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] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:13[${MULTILIB_USEDEP}]
-               sys-devel/llvm:12[${MULTILIB_USEDEP}]
-               sys-devel/llvm:11[${MULTILIB_USEDEP}]
-       )
-       <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-       gallium? (
-               llvm? (
-                       opencl? (
-                               video_cards_r600? (
-                                       ${CLANG_DEPSTR_AMDGPU}
-                               )
-                               !video_cards_r600? (
-                                       video_cards_radeonsi? (
-                                               ${CLANG_DEPSTR_AMDGPU}
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeonsi? (
-                                               video_cards_radeon? (
-                                                       ${CLANG_DEPSTR_AMDGPU}
-                                               )
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeon? (
-                                               !video_cards_radeonsi? (
-                                                       ${CLANG_DEPSTR}
-                                               )
-                                       )
-                               )
-                       )
-                       !opencl? (
-                               video_cards_r600? (
-                                       ${LLVM_DEPSTR_AMDGPU}
-                               )
-                               !video_cards_r600? (
-                                       video_cards_radeonsi? (
-                                               ${LLVM_DEPSTR_AMDGPU}
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeonsi? (
-                                               video_cards_radeon? (
-                                                       ${LLVM_DEPSTR_AMDGPU}
-                                               )
-                                       )
-                               )
-                               !video_cards_r600? (
-                                       !video_cards_radeon? (
-                                               !video_cards_radeonsi? (
-                                                       ${LLVM_DEPSTR}
-                                               )
-                                       )
-                               )
-                       )
-               )
-       )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-       valgrind? ( dev-util/valgrind )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=sys-devel/gcc-4.6
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-       wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       usr/lib*/libglapi.so.0.0.0
-       usr/lib*/libGLESv1_CM.so.1.1.0
-       usr/lib*/libGLESv2.so.2.0.0
-       usr/lib*/libGL.so.1.2.0
-       usr/lib*/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-       local flags=${MULTILIB_USEDEP}
-       if use video_cards_r600 || use video_cards_radeon || use 
video_cards_radeonsi
-       then
-               flags+=",llvm_targets_AMDGPU(-)"
-       fi
-
-       if use opencl; then
-               has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-       fi
-       has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain freedreno, i965, iris, radeonsi, or v3d"
-               fi
-       fi
-
-       if use opencl; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=opencl     since VIDEO_CARDS does 
not contain r600 or radeonsi"
-               fi
-       fi
-
-       if use vaapi; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_r300 &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain r300, r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, nouveau, or vmware"
-               fi
-       fi
-
-       if use xvmc; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does 
not contain r600 or nouveau"
-               fi
-       fi
-
-       if ! use gallium; then
-               use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does 
not contain gallium"
-               use llvm       && ewarn "Ignoring USE=llvm       since USE does 
not contain gallium"
-               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain gallium"
-               use vaapi      && ewarn "Ignoring USE=vaapi      since USE does 
not contain gallium"
-               use vdpau      && ewarn "Ignoring USE=vdpau      since USE does 
not contain gallium"
-               use unwind     && ewarn "Ignoring USE=unwind     since USE does 
not contain gallium"
-               use xa         && ewarn "Ignoring USE=xa         since USE does 
not contain gallium"
-               use xvmc       && ewarn "Ignoring USE=xvmc       since USE does 
not contain gallium"
-       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() {
-       has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version sys-devel/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/llvm"
-               ewarn "detected! This can cause problems. For details, see bug 
459306."
-       fi
-
-       if use video_cards_i965 ||
-          use video_cards_iris ||
-          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
-
-       if use gallium && use llvm; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       if use classic; then
-               # Intel code
-               dri_driver_enable video_cards_i915 i915
-               dri_driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       dri_driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               dri_driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               dri_driver_enable video_cards_r100 r100
-               dri_driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                       ! use video_cards_r200; then
-                       dri_driver_enable video_cards_radeon r100 r200
-               fi
-       fi
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use X || use egl; then
-               emesonargs+=(-Dglvnd=true)
-       else
-               emesonargs+=(-Dglvnd=false)
-       fi
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_feature llvm)
-                       $(meson_feature lm-sensors lmsensors)
-                       $(meson_feature unwind libunwind)
-               )
-
-               if use video_cards_iris ||
-                  use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use d3d9 gallium-nine))
-               else
-                       emesonargs+=(-Dgallium-nine=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; 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_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_feature vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=disabled)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_feature xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=disabled)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_feature xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=disabled)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_v3d ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable -- swrast
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_v3d v3d
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable zink zink
-
-               # Only one i915 driver (classic vs gallium). Default to classic.
-               if ! use classic; then
-                       gallium_enable video_cards_i915 i915
-                       if ! use video_cards_i915 && \
-                               ! use video_cards_i965; then
-                               gallium_enable video_cards_intel i915
-                       fi
-               fi
-
-               gallium_enable video_cards_crocus crocus
-               gallium_enable video_cards_iris iris
-
-               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
-
-               gallium_enable video_cards_freedreno freedreno
-               gallium_enable video_cards_virgl virgl
-
-               # opencl stuff
-               emesonargs+=(
-                       -Dgallium-opencl="$(usex opencl icd disabled)"
-               )
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       local vulkan_layers
-       use vulkan && vulkan_layers+="device-select"
-       use vulkan-overlay && vulkan_layers+=",overlay"
-       emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               $(meson_feature egl)
-               $(meson_feature gbm)
-               $(meson_feature gles1)
-               $(meson_feature gles2)
-               $(meson_use osmesa)
-               $(meson_use selinux)
-               $(meson_feature zstd)
-               $(meson_use video_cards_crocus prefer-crocus)
-               $(meson_use video_cards_iris prefer-iris)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               DRI_DRIVERS+=("$@")
-       fi
-}
-
-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-22.0.0_rc1.ebuild 
b/media-libs/mesa/mesa-22.0.0_rc1.ebuild
deleted file mode 100644
index 15b5138f55fb..000000000000
--- a/media-libs/mesa/mesa-22.0.0_rc1.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-       inherit git-r3
-else
-       SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-       !test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 
virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       vulkan? ( video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_radeonsi?   ( llvm )
-       xa? ( X )
-       xvmc? ( X )
-       zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-                               >=virtual/opencl-3[${MULTILIB_USEDEP}]
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       vaapi? (
-               >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-       wayland? (
-               >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-       )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-       vulkan-overlay? ( dev-util/glslang:0=[${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.13:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       )
-       zink? ( media-libs/vulkan-loader:=[${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] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:13[${MULTILIB_USEDEP}]
-               sys-devel/llvm:12[${MULTILIB_USEDEP}]
-               sys-devel/llvm:11[${MULTILIB_USEDEP}]
-       )
-       <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-       llvm? (
-               opencl? (
-                       video_cards_r600? (
-                               ${CLANG_DEPSTR_AMDGPU}
-                       )
-                       !video_cards_r600? (
-                               video_cards_radeonsi? (
-                                       ${CLANG_DEPSTR_AMDGPU}
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeonsi? (
-                                       video_cards_radeon? (
-                                               ${CLANG_DEPSTR_AMDGPU}
-                                       )
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeon? (
-                                       !video_cards_radeonsi? (
-                                               ${CLANG_DEPSTR}
-                                       )
-                               )
-                       )
-               )
-               !opencl? (
-                       video_cards_r600? (
-                               ${LLVM_DEPSTR_AMDGPU}
-                       )
-                       !video_cards_r600? (
-                               video_cards_radeonsi? (
-                                       ${LLVM_DEPSTR_AMDGPU}
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeonsi? (
-                                       video_cards_radeon? (
-                                               ${LLVM_DEPSTR_AMDGPU}
-                                       )
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeon? (
-                                       !video_cards_radeonsi? (
-                                               ${LLVM_DEPSTR}
-                                       )
-                               )
-                       )
-               )
-       )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-       valgrind? ( dev-util/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.24 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=sys-devel/gcc-4.6
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-       wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       usr/lib*/libglapi.so.0.0.0
-       usr/lib*/libGLESv1_CM.so.1.1.0
-       usr/lib*/libGLESv2.so.2.0.0
-       usr/lib*/libGL.so.1.2.0
-       usr/lib*/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-       local flags=${MULTILIB_USEDEP}
-       if use video_cards_r600 || use video_cards_radeon || use 
video_cards_radeonsi
-       then
-               flags+=",llvm_targets_AMDGPU(-)"
-       fi
-
-       if use opencl; then
-               has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-       fi
-       has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain freedreno, intel, radeonsi, or v3d"
-               fi
-       fi
-
-       if use opencl; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=opencl     since VIDEO_CARDS does 
not contain r600 or radeonsi"
-               fi
-       fi
-
-       if use vaapi; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_r300 &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain r300, r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, nouveau, or vmware"
-               fi
-       fi
-
-       if use xvmc; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does 
not contain r600 or nouveau"
-               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() {
-       has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version sys-devel/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/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
-
-       if use llvm; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_intel ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau; 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_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_feature xa gallium-xa))
-       else
-               emesonargs+=(-Dgallium-xa=disabled)
-       fi
-
-       if use video_cards_r600 ||
-          use video_cards_nouveau; then
-               emesonargs+=($(meson_feature xvmc gallium-xvmc))
-       else
-               emesonargs+=(-Dgallium-xvmc=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_lima ||
-          use video_cards_panfrost ||
-          use video_cards_v3d ||
-          use video_cards_vc4 ||
-          use video_cards_vivante; then
-               gallium_enable -- kmsro
-       fi
-
-       gallium_enable -- swrast
-       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 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
-
-       # opencl stuff
-       emesonargs+=(
-               -Dgallium-opencl="$(usex opencl icd disabled)"
-       )
-
-       if use vulkan; then
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       local vulkan_layers
-       use vulkan && vulkan_layers+="device-select"
-       use vulkan-overlay && vulkan_layers+=",overlay"
-       emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               -Degl=enabled
-               -Dgbm=enabled
-               -Dglvnd=true
-               $(meson_feature gles1)
-               $(meson_feature gles2)
-               $(meson_feature llvm)
-               $(meson_feature lm-sensors lmsensors)
-               $(meson_use osmesa)
-               $(meson_use selinux)
-               $(meson_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               GALLIUM_DRIVERS+=("$@")
-       fi
-}
-
-vulkan_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               VULKAN_DRIVERS+=("$@")
-       fi
-}

diff --git a/media-libs/mesa/mesa-22.0.0_rc2.ebuild 
b/media-libs/mesa/mesa-22.0.0_rc2.ebuild
deleted file mode 100644
index 15b5138f55fb..000000000000
--- a/media-libs/mesa/mesa-22.0.0_rc2.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-       inherit git-r3
-else
-       SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-       !test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 
virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       vulkan? ( video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_radeonsi?   ( llvm )
-       xa? ( X )
-       xvmc? ( X )
-       zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-       )
-       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-       opencl? (
-                               >=virtual/opencl-3[${MULTILIB_USEDEP}]
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       vaapi? (
-               >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-       wayland? (
-               >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-       )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-       vulkan-overlay? ( dev-util/glslang:0=[${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.13:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       )
-       zink? ( media-libs/vulkan-loader:=[${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] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:13[${MULTILIB_USEDEP}]
-               sys-devel/llvm:12[${MULTILIB_USEDEP}]
-               sys-devel/llvm:11[${MULTILIB_USEDEP}]
-       )
-       <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-       llvm? (
-               opencl? (
-                       video_cards_r600? (
-                               ${CLANG_DEPSTR_AMDGPU}
-                       )
-                       !video_cards_r600? (
-                               video_cards_radeonsi? (
-                                       ${CLANG_DEPSTR_AMDGPU}
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeonsi? (
-                                       video_cards_radeon? (
-                                               ${CLANG_DEPSTR_AMDGPU}
-                                       )
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeon? (
-                                       !video_cards_radeonsi? (
-                                               ${CLANG_DEPSTR}
-                                       )
-                               )
-                       )
-               )
-               !opencl? (
-                       video_cards_r600? (
-                               ${LLVM_DEPSTR_AMDGPU}
-                       )
-                       !video_cards_r600? (
-                               video_cards_radeonsi? (
-                                       ${LLVM_DEPSTR_AMDGPU}
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeonsi? (
-                                       video_cards_radeon? (
-                                               ${LLVM_DEPSTR_AMDGPU}
-                                       )
-                               )
-                       )
-                       !video_cards_r600? (
-                               !video_cards_radeon? (
-                                       !video_cards_radeonsi? (
-                                               ${LLVM_DEPSTR}
-                                       )
-                               )
-                       )
-               )
-       )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-       valgrind? ( dev-util/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.24 )
-       X? (
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-base/xorg-proto
-       )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       opencl? (
-               >=sys-devel/gcc-4.6
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-       wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       usr/lib*/libglapi.so.0.0.0
-       usr/lib*/libGLESv1_CM.so.1.1.0
-       usr/lib*/libGLESv2.so.2.0.0
-       usr/lib*/libGL.so.1.2.0
-       usr/lib*/libOSMesa.so.8.0.0
-       usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-       local flags=${MULTILIB_USEDEP}
-       if use video_cards_r600 || use video_cards_radeon || use 
video_cards_radeonsi
-       then
-               flags+=",llvm_targets_AMDGPU(-)"
-       fi
-
-       if use opencl; then
-               has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-       fi
-       has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain freedreno, intel, radeonsi, or v3d"
-               fi
-       fi
-
-       if use opencl; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=opencl     since VIDEO_CARDS does 
not contain r600 or radeonsi"
-               fi
-       fi
-
-       if use vaapi; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_r300 &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain r300, r600, radeonsi, or nouveau"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, nouveau, or vmware"
-               fi
-       fi
-
-       if use xvmc; then
-               if ! use video_cards_r600 &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does 
not contain r600 or nouveau"
-               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() {
-       has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # warning message for bug 459306
-       if use llvm && has_version sys-devel/llvm[!debug=]; then
-               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/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
-
-       if use llvm; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_intel ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau; 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_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_nouveau; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_nouveau ||
-          use video_cards_vmware; then
-               emesonargs+=($(meson_feature xa gallium-xa))
-       else
-               emesonargs+=(-Dgallium-xa=disabled)
-       fi
-
-       if use video_cards_r600 ||
-          use video_cards_nouveau; then
-               emesonargs+=($(meson_feature xvmc gallium-xvmc))
-       else
-               emesonargs+=(-Dgallium-xvmc=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_lima ||
-          use video_cards_panfrost ||
-          use video_cards_v3d ||
-          use video_cards_vc4 ||
-          use video_cards_vivante; then
-               gallium_enable -- kmsro
-       fi
-
-       gallium_enable -- swrast
-       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 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
-
-       # opencl stuff
-       emesonargs+=(
-               -Dgallium-opencl="$(usex opencl icd disabled)"
-       )
-
-       if use vulkan; then
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       local vulkan_layers
-       use vulkan && vulkan_layers+="device-select"
-       use vulkan-overlay && vulkan_layers+=",overlay"
-       emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               -Degl=enabled
-               -Dgbm=enabled
-               -Dglvnd=true
-               $(meson_feature gles1)
-               $(meson_feature gles2)
-               $(meson_feature llvm)
-               $(meson_feature lm-sensors lmsensors)
-               $(meson_use osmesa)
-               $(meson_use selinux)
-               $(meson_feature unwind libunwind)
-               $(meson_feature zstd)
-               $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dvalgrind=$(usex valgrind auto disabled)
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_test() {
-       meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               GALLIUM_DRIVERS+=("$@")
-       fi
-}
-
-vulkan_enable() {
-       if [[ $1 == -- ]] || use $1; then
-               shift
-               VULKAN_DRIVERS+=("$@")
-       fi
-}

Reply via email to