commit:     ae3ae70fcb2026cd98e14b0737f3655532fd30ba
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 01:16:31 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 01:16:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3ae70f

media-libs/mesa: Drop old versions

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-libs/mesa/Manifest                           |   3 -
 ...er-Work-around-build-failure-with-AltiVec.patch |  70 ---
 media-libs/mesa/mesa-13.0.5.ebuild                 | 510 ---------------------
 media-libs/mesa/mesa-13.0.6.ebuild                 | 508 --------------------
 media-libs/mesa/mesa-17.1.8.ebuild                 | 503 --------------------
 media-libs/mesa/metadata.xml                       |   4 -
 6 files changed, 1598 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6afca3e88be..33a30520b27 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,7 +1,4 @@
-DIST mesa-13.0.5.tar.xz 9171480 SHA256 
bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 
db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1
 WHIRLPOOL 
164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
-DIST mesa-13.0.6.tar.xz 9179236 SHA256 
29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 
2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441
 WHIRLPOOL 
1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
 DIST mesa-17.0.6.tar.xz 9494872 BLAKE2B 
1e83b0d40bb911c26880f25b281ba6e065dbf47555812c53e7d6fbccbc36a11a80531b8887eef6fbcb58e91d1eb5425151fdc03588d4ea36c2f268e5a6fcb604
 SHA512 
537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf
 DIST mesa-17.1.10.tar.xz 9872168 SHA256 
cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb SHA512 
728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
 WHIRLPOOL 
d33cc0b7620e01822ce6ca2708f01eccc6c7796c1ed19f3642dab733521d17d794658dbc47bcca7d71f94f99c81637a28738dc6c45c4d1ccc7e2855f07a5f961
-DIST mesa-17.1.8.tar.xz 9902800 SHA256 
75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 
d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b
 WHIRLPOOL 
8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f
 DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 
43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12
 SHA512 
739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202
 DIST mesa-17.3.0-rc5.tar.xz 10663464 BLAKE2B 
0706e3175358f43ce70707e9f18c22df60c387d1260c4dfae13a55f9278a266d9885483c6e794d913c8ad5f4b9dd3d852f309e0ef3f042b9ae62b371d9dfba84
 SHA512 
b53e40f39850067e97dcf9d1eb10d1f5d3a8729933057bacf3648b86ef55c43d7b2f2f5444ae8c6f1b8677c2c3fd12f7484ee08139bd388dc4cebd8dbaf28c83

diff --git 
a/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
 
b/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
deleted file mode 100644
index 0d2c65ac56e..00000000000
--- 
a/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 71a2b2e8a580d2c0bee84b898d8531b27f3c7811 Mon Sep 17 00:00:00 2001
-From: Matt Turner <matts...@gmail.com>
-Date: Thu, 2 Mar 2017 04:43:21 +0000
-Subject: [PATCH] clover: Work around build failure with AltiVec.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=587210
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68504
-Acked-by: Francisco Jerez <curroje...@riseup.net>
-(cherry picked from commit 7d1195c1e4d071fe796bf5f210c468ea1cc86225)
----
- configure.ac                                  | 14 ++++++++++++++
- src/gallium/state_trackers/clover/Makefile.am |  3 +++
- 2 files changed, 17 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index fd78fbb..3646e45 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1974,6 +1974,20 @@ if test "x$enable_opencl" = xyes; then
-     if test "x$have_libelf" != xyes; then
-        AC_MSG_ERROR([Clover requires libelf])
-     fi
-+
-+    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
-+        altivec_enabled=no
-+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+        #if !defined(__VEC__) || !defined(__ALTIVEC__)
-+        #error "AltiVec not enabled"
-+        #endif
-+        ])], altivec_enabled=yes)
-+
-+        if test "$altivec_enabled" = yes; then
-+            CLOVER_STD_OVERRIDE="-std=gnu++11"
-+        fi
-+        AC_SUBST([CLOVER_STD_OVERRIDE])
-+    fi
- fi
- AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
- AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
-diff --git a/src/gallium/state_trackers/clover/Makefile.am 
b/src/gallium/state_trackers/clover/Makefile.am
-index 8abcfec..edf1e26 100644
---- a/src/gallium/state_trackers/clover/Makefile.am
-+++ b/src/gallium/state_trackers/clover/Makefile.am
-@@ -33,6 +33,7 @@ noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
- 
- libcltgsi_la_CXXFLAGS = \
-       -std=c++11 \
-+      $(CLOVER_STD_OVERRIDE) \
-       $(VISIBILITY_CXXFLAGS)
- 
- libcltgsi_la_SOURCES = $(TGSI_SOURCES)
-@@ -41,6 +42,7 @@ libclllvm_la_CXXFLAGS = \
-       -std=c++11 \
-       $(VISIBILITY_CXXFLAGS) \
-       $(LLVM_CXXFLAGS) \
-+      $(CLOVER_STD_OVERRIDE) \
-       $(DEFINES) \
-       $(LIBELF_CFLAGS) \
-       -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
-@@ -51,6 +53,7 @@ libclllvm_la_SOURCES = $(LLVM_SOURCES)
- 
- libclover_la_CXXFLAGS = \
-       -std=c++11 \
-+      $(CLOVER_STD_OVERRIDE) \
-       $(VISIBILITY_CXXFLAGS)
- 
- libclover_la_LIBADD = \
--- 
-2.10.2
-

diff --git a/media-libs/mesa/mesa-13.0.5.ebuild 
b/media-libs/mesa/mesa-13.0.5.ebuild
deleted file mode 100644
index 594c283ec9b..00000000000
--- a/media-libs/mesa/mesa-13.0.5.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${FOLDER}/${MY_P}.tar.xz";
-       KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
-       libressl +llvm +nettle +nptl opencl osmesa pax_kernel openmax openssl 
pic
-       selinux vaapi valgrind vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       || ( gcrypt libressl nettle openssl )
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( video_cards_i965 )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       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_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.72"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${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.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${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}]
-               )
-               >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
-       )
-       nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
-       !nettle? (
-               gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-               !gcrypt? (
-                       libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-                       !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-               )
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${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.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       epatch 
"${FILESDIR}"/${PN}-13-clover-Work-around-build-failure-with-AltiVec.patch
-
-       eautoreconf
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm gallium-llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               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
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-
-               # radv is disabled due to dependence on >=llvm-3.9, bug 607660
-               #vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               --disable-shader-cache \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt 
libcrypto)) \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       prune_libtool_files --all
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-
-       # Mesa should not install these
-       if use vulkan; then
-               rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
-       fi
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-13.0.6.ebuild 
b/media-libs/mesa/mesa-13.0.6.ebuild
deleted file mode 100644
index c18e6d30eba..00000000000
--- a/media-libs/mesa/mesa-13.0.6.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${FOLDER}/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
-       libressl +llvm +nettle +nptl opencl osmesa pax_kernel openmax openssl 
pic
-       selinux vaapi valgrind vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       || ( gcrypt libressl nettle openssl )
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( video_cards_i965 )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       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_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.72"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${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.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${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}]
-               )
-               >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
-       )
-       nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
-       !nettle? (
-               gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-               !gcrypt? (
-                       libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-                       !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-               )
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${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.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm gallium-llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               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
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-
-               # radv is disabled due to dependence on >=llvm-3.9, bug 607660
-               #vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               --disable-shader-cache \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt 
libcrypto)) \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       prune_libtool_files --all
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-
-       # Mesa should not install these
-       if use vulkan; then
-               rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
-       fi
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.8.ebuild 
b/media-libs/mesa/mesa-17.1.8.ebuild
deleted file mode 100644
index 935abcb79a1..00000000000
--- a/media-libs/mesa/mesa-17.1.8.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-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-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( 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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=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.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${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}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${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.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       [[ ${PV} == 9999 ]] && eautoreconf
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               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
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index b7a97ca0928..8e1144c23b4 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -12,16 +12,12 @@
                <flag name="dri3">Enable DRI3 support.</flag>
                <flag name="egl">Enable EGL support.</flag>
                <flag name="gallium">Build drivers based on Gallium3D, the new 
architecture for 3D graphics drivers.</flag>
-               <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low 
level sha1 utility functions.</flag>
                <flag name="gbm">Enable the Graphics Buffer Manager for EGL on 
KMS.</flag>
                <flag name="gles1">Enable GLESv1 support.</flag>
                <flag name="gles2">Enable GLESv2 support.</flag>
-               <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for low 
level sha1 utility functions.</flag>
                <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
-               <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for low 
level sha1 utility functions.</flag>
                <flag name="opencl">Enable the Clover Gallium OpenCL state 
tracker.</flag>
                <flag name="openmax">Enable OpenMAX video decode/encode 
acceleration for Gallium3D.</flag>
-               <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low 
level sha1 utility functions. May cause issues with games from Steam.</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>

Reply via email to