commit:     2325d586e70e8155250f0e436f49216c51a46ae0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 20:03:22 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:03:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2325d586

media-libs/mesa: Drop old versions

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

 media-libs/mesa/Manifest               |   4 -
 media-libs/mesa/mesa-20.0.5.ebuild     | 549 --------------------------------
 media-libs/mesa/mesa-20.0.6.ebuild     | 550 ---------------------------------
 media-libs/mesa/mesa-20.1.0_rc2.ebuild | 550 ---------------------------------
 media-libs/mesa/mesa-20.1.0_rc3.ebuild | 550 ---------------------------------
 5 files changed, 2203 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ce5145ff30e..2e430f896b1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,4 @@
 DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B 
a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c
 SHA512 
413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
 DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B 
a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f
 SHA512 
17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
-DIST mesa-20.0.5.tar.xz 12257484 BLAKE2B 
12d2530fa77dffadea74908e0b8e52f19023f0e2d012c607d7d5fc8b1380efad13dee50eee99a453b751340a3633b6260a3f1c82e5b16c03051df2fca6947740
 SHA512 
6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08
-DIST mesa-20.0.6.tar.xz 12275708 BLAKE2B 
9f6d9ae9c260e396670a3980ba83914ad0c1b7dc5f08471a78e4ab76e6ce3c18b96152fefc3846d89840be971180a2f4c176d40beb2c4b1f572011cb4b913f58
 SHA512 
a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90
 DIST mesa-20.0.7.tar.xz 12308160 BLAKE2B 
fac8dffd08ada27080ee4c6f1e0dce69218c8f15b97ca59d9a1dc84098b7d376cea6ccdf05957690beb47a7c2ecfd75497bfa150c7c46a0c509ba37abb0e5359
 SHA512 
00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685
-DIST mesa-20.1.0-rc2.tar.xz 12577196 BLAKE2B 
8dc88b2546fd85874fad03258b8b8c7d1dbe681f568e5947e1d758234a8f6559b60810142c125bb56142be6926c50a8c20aebf45271f0e8270ff057dbce472aa
 SHA512 
b912b1af69d9c33f1d0855887d4e5c1ea3dc10e7ed875d3285ca13b62314647b56470149484f270e8c8ff0ce4818fafd1537a71b59852957aab26f36e53edfbd
-DIST mesa-20.1.0-rc3.tar.xz 12585796 BLAKE2B 
7b1b79d790541b29d25cc03900acf0bef517baf67db2c600a5fe3207ba05ff5d9cf332a97e994625ef6626e84202665c3531bada693f2956ab6b8f213df64545
 SHA512 
20ec0dbace5eb7b8ed7a9f2deab9621fa2ed9d485fb884af95caf0ce5ae14de25d89d9d7c374f0dc891cb5644096dc8576bfbecfaf1604954176891345884175
 DIST mesa-20.1.0-rc4.tar.xz 12601932 BLAKE2B 
a7d02e7f8f155ae1591df8c07aad642109cabfc64c0d015605bc0baa10233830b423e5aa57be23e450628f5ffc6f8655ce3962aecea08504574e54d7b2e1aa01
 SHA512 
31358470a330294fa4842997cd2e6f00c4ee6cac10d6c264aa673a10d82c29051fea2e83629e2a638b659df4cb17f4e2b9d0fff1c6f6259d07d9db4dbfa10824

diff --git a/media-libs/mesa/mesa-20.0.5.ebuild 
b/media-libs/mesa/mesa-20.0.5.ebuild
deleted file mode 100644
index b5ed3341ee9..00000000000
--- a/media-libs/mesa/mesa-20.0.5.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-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://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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} freedreno i915 i965 intel iris lima nouveau 
panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vulkan? ( dri3
-                         video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       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_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-       !app-eselect/eselect-mesa
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       libglvnd? (
-               >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-               !app-eselect/eselect-opengl
-       )
-       !libglvnd? (
-               >=app-eselect/eselect-opengl-1.3.0
-       )
-       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.15.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/libXdamage-1.1.4-r1:=[${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}]
-       )
-       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="9"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:9[${MULTILIB_USEDEP}]
-               sys-devel/llvm:8[${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
-       sys-devel/gettext
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-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
-       libglvnd? ( 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_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain i965, iris, or radeonsi"
-               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
-}
-
-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 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
-
-       emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo 
"wayland,")$(use gbm && echo "drm,")surfaceless )
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_use llvm)
-                       $(meson_use lm-sensors lmsensors)
-                       $(meson_use 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_use vaapi gallium-va))
-                       use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-               else
-                       emesonargs+=(-Dgallium-va=false)
-               fi
-
-               if use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-
-               # 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_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_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-       fi
-
-       if use gallium; then
-               gallium_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-       else
-               dri_driver_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=true
-               $(meson_use dri3)
-               $(meson_use egl)
-               $(meson_use gbm)
-               $(meson_use gles1)
-               $(meson_use gles2)
-               $(meson_use libglvnd glvnd)
-               $(meson_use selinux)
-               $(meson_use zstd)
-               -Dvalgrind=$(usex valgrind auto false)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               $(meson_use vulkan-overlay vulkan-overlay-layer)
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_install() {
-       meson_src_install
-}
-
-multilib_src_install_all() {
-       einstalldocs
-}
-
-multilib_src_test() {
-       meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-       if ! use libglvnd; then
-               # Switch to the xorg implementation.
-               echo
-               eselect opengl set --use-old ${OPENGL_DIR}
-       fi
-}
-
-# $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-20.0.6.ebuild 
b/media-libs/mesa/mesa-20.0.6.ebuild
deleted file mode 100644
index 03083871b14..00000000000
--- a/media-libs/mesa/mesa-20.0.6.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-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://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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} freedreno i915 i965 intel iris lima nouveau 
panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vulkan? ( dri3
-                         video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       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_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-       !app-eselect/eselect-mesa
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       libglvnd? (
-               >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-               !app-eselect/eselect-opengl
-       )
-       !libglvnd? (
-               >=app-eselect/eselect-opengl-1.3.0
-       )
-       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.15.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/libXdamage-1.1.4-r1:=[${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}]
-       )
-       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="10"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:10[${MULTILIB_USEDEP}]
-               sys-devel/llvm:9[${MULTILIB_USEDEP}]
-               sys-devel/llvm:8[${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
-       sys-devel/gettext
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-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
-       libglvnd? ( 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_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain i965, iris, or radeonsi"
-               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
-}
-
-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 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
-
-       emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo 
"wayland,")$(use gbm && echo "drm,")surfaceless )
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_use llvm)
-                       $(meson_use lm-sensors lmsensors)
-                       $(meson_use 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_use vaapi gallium-va))
-                       use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-               else
-                       emesonargs+=(-Dgallium-va=false)
-               fi
-
-               if use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-
-               # 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_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_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-       fi
-
-       if use gallium; then
-               gallium_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-       else
-               dri_driver_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=true
-               $(meson_use dri3)
-               $(meson_use egl)
-               $(meson_use gbm)
-               $(meson_use gles1)
-               $(meson_use gles2)
-               $(meson_use libglvnd glvnd)
-               $(meson_use selinux)
-               $(meson_use zstd)
-               -Dvalgrind=$(usex valgrind auto false)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               $(meson_use vulkan-overlay vulkan-overlay-layer)
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_install() {
-       meson_src_install
-}
-
-multilib_src_install_all() {
-       einstalldocs
-}
-
-multilib_src_test() {
-       meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-       if ! use libglvnd; then
-               # Switch to the xorg implementation.
-               echo
-               eselect opengl set --use-old ${OPENGL_DIR}
-       fi
-}
-
-# $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-20.1.0_rc2.ebuild 
b/media-libs/mesa/mesa-20.1.0_rc2.ebuild
deleted file mode 100644
index 03083871b14..00000000000
--- a/media-libs/mesa/mesa-20.1.0_rc2.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-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://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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} freedreno i915 i965 intel iris lima nouveau 
panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vulkan? ( dri3
-                         video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       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_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-       !app-eselect/eselect-mesa
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       libglvnd? (
-               >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-               !app-eselect/eselect-opengl
-       )
-       !libglvnd? (
-               >=app-eselect/eselect-opengl-1.3.0
-       )
-       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.15.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/libXdamage-1.1.4-r1:=[${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}]
-       )
-       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="10"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:10[${MULTILIB_USEDEP}]
-               sys-devel/llvm:9[${MULTILIB_USEDEP}]
-               sys-devel/llvm:8[${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
-       sys-devel/gettext
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-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
-       libglvnd? ( 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_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain i965, iris, or radeonsi"
-               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
-}
-
-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 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
-
-       emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo 
"wayland,")$(use gbm && echo "drm,")surfaceless )
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_use llvm)
-                       $(meson_use lm-sensors lmsensors)
-                       $(meson_use 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_use vaapi gallium-va))
-                       use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-               else
-                       emesonargs+=(-Dgallium-va=false)
-               fi
-
-               if use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-
-               # 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_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_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-       fi
-
-       if use gallium; then
-               gallium_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-       else
-               dri_driver_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=true
-               $(meson_use dri3)
-               $(meson_use egl)
-               $(meson_use gbm)
-               $(meson_use gles1)
-               $(meson_use gles2)
-               $(meson_use libglvnd glvnd)
-               $(meson_use selinux)
-               $(meson_use zstd)
-               -Dvalgrind=$(usex valgrind auto false)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               $(meson_use vulkan-overlay vulkan-overlay-layer)
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_install() {
-       meson_src_install
-}
-
-multilib_src_install_all() {
-       einstalldocs
-}
-
-multilib_src_test() {
-       meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-       if ! use libglvnd; then
-               # Switch to the xorg implementation.
-               echo
-               eselect opengl set --use-old ${OPENGL_DIR}
-       fi
-}
-
-# $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-20.1.0_rc3.ebuild 
b/media-libs/mesa/mesa-20.1.0_rc3.ebuild
deleted file mode 100644
index 03083871b14..00000000000
--- a/media-libs/mesa/mesa-20.1.0_rc3.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-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://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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} freedreno i915 i965 intel iris lima nouveau 
panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd 
+llvm
-       lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vulkan? ( dri3
-                         video_cards_radeonsi? ( llvm ) )
-       vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
-       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_vc4? ( gallium )
-       video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-       xa? ( X )
-       xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-       !app-eselect/eselect-mesa
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       libglvnd? (
-               >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-               !app-eselect/eselect-opengl
-       )
-       !libglvnd? (
-               >=app-eselect/eselect-opengl-1.3.0
-       )
-       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.15.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/libXdamage-1.1.4-r1:=[${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}]
-       )
-       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="10"
-LLVM_DEPSTR="
-       || (
-               sys-devel/llvm:10[${MULTILIB_USEDEP}]
-               sys-devel/llvm:9[${MULTILIB_USEDEP}]
-               sys-devel/llvm:8[${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
-       sys-devel/gettext
-       virtual/pkgconfig
-       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-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
-       libglvnd? ( 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_i965 &&
-                  ! use video_cards_iris &&
-                  ! use video_cards_radeonsi; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain i965, iris, or radeonsi"
-               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
-}
-
-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 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
-
-       emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo 
"wayland,")$(use gbm && echo "drm,")surfaceless )
-
-       if use gallium; then
-               emesonargs+=(
-                       $(meson_use llvm)
-                       $(meson_use lm-sensors lmsensors)
-                       $(meson_use 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_use vaapi gallium-va))
-                       use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-               else
-                       emesonargs+=(-Dgallium-va=false)
-               fi
-
-               if use video_cards_r300 ||
-                  use video_cards_r600 ||
-                  use video_cards_radeonsi ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use vdpau gallium-vdpau))
-               else
-                       emesonargs+=(-Dgallium-vdpau=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_nouveau ||
-                  use video_cards_vmware; then
-                       emesonargs+=($(meson_use xa gallium-xa))
-               else
-                       emesonargs+=(-Dgallium-xa=false)
-               fi
-
-               if use video_cards_r600 ||
-                  use video_cards_nouveau; then
-                       emesonargs+=($(meson_use xvmc gallium-xvmc))
-               else
-                       emesonargs+=(-Dgallium-xvmc=false)
-               fi
-
-               if use video_cards_freedreno ||
-                  use video_cards_lima ||
-                  use video_cards_panfrost ||
-                  use video_cards_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               gallium_enable video_cards_lima lima
-               gallium_enable video_cards_panfrost panfrost
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-
-               # 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_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_i965 intel
-               vulkan_enable video_cards_iris intel
-               vulkan_enable video_cards_radeonsi amd
-       fi
-
-       if use gallium; then
-               gallium_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-       else
-               dri_driver_enable -- swrast
-               emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-       fi
-
-       driver_list() {
-               local drivers="$(sort -u <<< "${1// /$'\n'}")"
-               echo "${drivers//$'\n'/,}"
-       }
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dglx=$(usex X dri disabled)
-               -Dshared-glapi=true
-               $(meson_use dri3)
-               $(meson_use egl)
-               $(meson_use gbm)
-               $(meson_use gles1)
-               $(meson_use gles2)
-               $(meson_use libglvnd glvnd)
-               $(meson_use selinux)
-               $(meson_use zstd)
-               -Dvalgrind=$(usex valgrind auto false)
-               -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-               $(meson_use vulkan-overlay vulkan-overlay-layer)
-               --buildtype $(usex debug debug plain)
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-}
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_install() {
-       meson_src_install
-}
-
-multilib_src_install_all() {
-       einstalldocs
-}
-
-multilib_src_test() {
-       meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-       if ! use libglvnd; then
-               # Switch to the xorg implementation.
-               echo
-               eselect opengl set --use-old ${OPENGL_DIR}
-       fi
-}
-
-# $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
-}

Reply via email to