commit:     f3b1330087081ff29d391aeb71d97527317fa877
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 21:06:25 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 21:09:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b13300

media-libs/mesa: Drop old versions

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

 media-libs/mesa/Manifest           |   4 -
 media-libs/mesa/mesa-19.1.8.ebuild | 540 ------------------------------------
 media-libs/mesa/mesa-19.2.7.ebuild | 548 -------------------------------------
 media-libs/mesa/mesa-19.3.0.ebuild | 546 ------------------------------------
 media-libs/mesa/mesa-19.3.1.ebuild | 546 ------------------------------------
 media-libs/mesa/metadata.xml       |   1 -
 6 files changed, 2185 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 74342211991..274410df5b5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,2 @@
-DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B 
df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0
 SHA512 
3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74
-DIST mesa-19.2.7.tar.xz 11460812 BLAKE2B 
27408d28d24ea397a0e60d1e4dc56ebe11c269720c31285794e611f41db6f2691c914892910b468210bb43f2111e5caf210e0dac287fb28a24825ad54e5643cc
 SHA512 
87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
 DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B 
c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155
 SHA512 
9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43
-DIST mesa-19.3.0.tar.xz 11831372 BLAKE2B 
97584bd68558e37d20d6e719610066ca2e3df83a26034e2f9b78022d5e5e7b97d12c70e05d8dd2f542f6db5311c4213a1f72afaea1ace4a2bf4ff561bcda2fe6
 SHA512 
69c4519540118fb3d50d718d92f443051c149633cf4291a07706c6d45cd6ad1f6f3b91446de2d31a9082efe9e3b4ce35b7472830e152ba655d83a91c2ed3c042
-DIST mesa-19.3.1.tar.xz 11831968 BLAKE2B 
f4e70543bc48efa6888559606c660a837df25ceeabf4bf2141d7470f37f90e19a9d85da7c3b4f8d1b4c86d02245dbc8d58401caf9ab099609a501fc86b391987
 SHA512 
338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568
 DIST mesa-19.3.2.tar.xz 11834324 BLAKE2B 
114912816a08424da1d55c65d8ff4fb97d58022f5968d37938055e0b0fcdfeeebdbdca3c28d187fd85aaf6385d3a1bfbfe3f011f410e9a991519d34cb81697b5
 SHA512 
fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28

diff --git a/media-libs/mesa/mesa-19.1.8.ebuild 
b/media-libs/mesa/mesa-19.1.8.ebuild
deleted file mode 100644
index 23c21e2eeae..00000000000
--- a/media-libs/mesa/mesa-19.1.8.ebuild
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils 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";
-       EXPERIMENTAL="true"
-       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 ~sh 
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 nouveau 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 pax_kernel pic selinux test unwind vaapi 
valgrind
-       vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-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_i965 video_cards_iris 
video_cards_radeonsi )
-                         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_nouveau? ( || ( classic 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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-       !app-eselect/eselect-mesa
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=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}]
-       libglvnd? (
-               media-libs/libglvnd[${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? (
-                                       
dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-                                       dev-libs/libclc
-                                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                               )
-               vaapi? (
-                       >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-                       video_cards_nouveau? ( 
!<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-               )
-               vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-               xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${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}] )
-"
-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:7[${MULTILIB_USEDEP}]
-       )
-       sys-devel/llvm:=[${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 )
-       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? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.0.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.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 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 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=x11,surfaceless$(use wayland && echo 
",wayland")$(use gbm && echo ",drm") )
-
-       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_vc4 ||
-                  use video_cards_vivante; then
-                       gallium_enable -- kmsro
-               fi
-
-               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
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               emesonargs+=( -Dasm=false )
-       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=dri
-               -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)
-               -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
-
-       use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-       einstalldocs
-}
-
-multilib_src_test() {
-       meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.2.7.ebuild 
b/media-libs/mesa/mesa-19.2.7.ebuild
deleted file mode 100644
index c548c3393ad..00000000000
--- a/media-libs/mesa/mesa-19.2.7.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils 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 
~sh ~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 pax_kernel selinux test unwind vaapi valgrind
-       vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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_i965 video_cards_iris 
video_cards_radeonsi )
-                         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.99"
-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[${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? (
-                                       
dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-                                       dev-libs/libclc
-                                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                               )
-               vaapi? (
-                       >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-                       video_cards_nouveau? ( 
!<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-               )
-               vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-               xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${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}]
-       )
-"
-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:7[${MULTILIB_USEDEP}]
-       )
-       sys-devel/llvm:=[${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 )
-       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 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 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=surfaceless$(use X && echo ",x11")$(use 
wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-       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
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-       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)
-               -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
-
-       use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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-19.3.0.ebuild 
b/media-libs/mesa/mesa-19.3.0.ebuild
deleted file mode 100644
index 1e41fad57ba..00000000000
--- a/media-libs/mesa/mesa-19.3.0.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils 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 
~sh ~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 pax_kernel selinux test unwind vaapi valgrind
-       vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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_i965 video_cards_iris 
video_cards_radeonsi )
-                         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[${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? (
-                                       
dev-libs/ocl-icd[khronos-headers,${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}] )
-       )
-       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}]
-       )
-"
-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:=[${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 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 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=surfaceless$(use X && echo ",x11")$(use 
wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-       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
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-       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)
-               -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
-
-       use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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-19.3.1.ebuild 
b/media-libs/mesa/mesa-19.3.1.ebuild
deleted file mode 100644
index 1e41fad57ba..00000000000
--- a/media-libs/mesa/mesa-19.3.1.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils 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 
~sh ~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 pax_kernel selinux test unwind vaapi valgrind
-       vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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_i965 video_cards_iris 
video_cards_radeonsi )
-                         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[${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? (
-                                       
dev-libs/ocl-icd[khronos-headers,${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}] )
-       )
-       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}]
-       )
-"
-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:=[${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 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 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=surfaceless$(use X && echo ",x11")$(use 
wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-       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
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-       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)
-               -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
-
-       use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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/metadata.xml b/media-libs/mesa/metadata.xml
index 73e827967ce..9e9a04a53e2 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,7 +19,6 @@
                <flag name="opencl">Enable the Clover Gallium OpenCL state 
tracker.</flag>
                <flag name="osmesa">Build the Mesa library for off-screen 
rendering.</flag>
                <flag name="pax_kernel">Enable if the user plans to run the 
package under a pax enabled hardened kernel</flag>
-               <flag name="pic">disable optimized assembly code that is not 
PIC friendly</flag>
                <flag name="valgrind">Compile in valgrind memory hints</flag>
                <flag name="vdpau">Enable the VDPAU acceleration interface for 
the Gallium3D Video Layer.</flag>
                <flag name="vulkan">Enable Vulkan drivers</flag>

Reply via email to