gentoo resync : 06.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-06 18:23:20 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-06 18:23:20 +0000
commit: d37b97a25b8b10f748eead6574b01f893f140b01 (patch)
tree: 13e2a142a31cd193a39c63042a64cab29a1f7ae9 /media-libs
parent: a833e3f4a431b8eea751b7420e127787f9c92117 (diff)
21 files changed, 380 insertions, 1646 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4e27f17e5ee1..fc0ac6eb96af 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 2f3966eac088..a43f71025d53 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -3,6 +3,7 @@ AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 BLAKE2B bd601e99324c3861ef3da76
 AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 BLAKE2B 11fb013522cdeaa06bef97c421763d3b4d0900181667b7dd5688c0fc0a666a68ab50cccdce7105f20802df5e7ce58f67bc48e16f9447fe0fbe27efb60ed52f0b SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493
 AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45
 AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e3909670c59fb6b73d91222911cc4caac07025cfadba39af39d60d42d133ed209f1464bf97aa5a5bd7da233e673a4557ef4451999ab7f3 SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23
+AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
 AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b99219a8ca018f74a330050e15f6a62f73fd534327bdbd75831121931c54f69c067dfba125ce18b84fc6a7355d27abb22 SHA512 cec86ffddbe6ce1fd4b6bcf5b7550b538b4967ce409034153ea8712ae59f52471c653ed9b28b4821cc8ddc8b6bfd54775ca17db8c65718712ee6205803050bfd
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 AUX gegl-0.3.14-g_log_domain.patch 1228 BLAKE2B 4728e0c337fd2ff06be337405b896e3d3d60b2a7f2e81ab8593d138a02b4f0fd85ae5af09cf31cfee9db739f769e472cba74ab77c71b4214efd6354d988478c3 SHA512 49f84367730918d36d198ac250c928bffc6ad08df0423b052f93e33a51f76ee92d918c7bc64cd0ee0ee3c3ce14236facd11b883da48c6506d432056ca515e831
@@ -14,10 +15,11 @@ DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc
 DIST gegl-0.3.10.tar.bz2 5905157 SHA256 26b4d6d0a8edb358ca2fbc097f9f97eec9d74e0ffe42f89fa1aff201728023d9 SHA512 54df7e0cb26be2f2664eb9373fc2e1dff809df505007c95e72c896f3e2829e2159df7b9701c31b4dc20953a9476de69d603e8d5c1c42078284edfa6cf05dccd7 WHIRLPOOL c307bcb65287489c98e3cae50a57c6215e29eeef315b7d581c3c5239c8156ddd69b30edd83e35549d4c6b840e6ed15a778a5145f939a7a2e20a70d6b64551439
 DIST gegl-0.3.12.tar.bz2 6037107 SHA256 62eb08d7dd6ac046953a0bf606a71f9d14c9016ffef4ef7273b07b598f14bec7 SHA512 a8c9d1d21b042d2c848a540f69f58c2224c6617e21a6e25b47eb885a0388242195569a81101242041eba2b7c486dbbc47f516fae8d7ab35f4d67ab5f5c2b0fe4 WHIRLPOOL 2f7846f80238d525cf160ad07b5dc96d52f081a35a5ac2455c1c7eab65cd09d9acb048ed361ec99a033f16562ac505943e845a5f4e7e1f363840f7721fd99a93
 DIST gegl-0.3.14.tar.bz2 5985306 SHA256 09f5e2e6899697641d4660e3e274aed696f5bacc96ba389ac77674ee1156590a SHA512 8d03bb15433777af3baae20bb987587cef2ae80315116e7e8a3197278c3ca2ff2814aa533ebe2ad4c2cca58a618a8a24b0b6faff0d0ce1194e3d31cfe85beaf9 WHIRLPOOL 1be1914cae5760bb2b35fc495c409cb927783f303cff393f0cdc43a875b42b380829cec9c8907d19c1f78cb57bed5d639759f09bb434c48436d1bc59750ab33d
-DIST gegl-0.3.20.tar.bz2 5816967 SHA256 821568d17dc92a46f6105644c4f4d497daea2be794006140a016ed34e05eb084 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7 WHIRLPOOL 77ffffcce3d8e517b982918974df50e751469e56c58d6c4321f85b295444edd11ae5b7feabdd618fbd82ad7a3546dd550d06ff738f6ca97ffa5e114987bf6604
+DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B 4d1dea5b479dc56599d884c43dd8042f6c1c836fe3b5acdadc9b1a909ab4c4be549322767293cfbc065a5f9386b22a579c9c9d78fbad58a4eb6771eccf3a3b45 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
 DIST gegl-0.3.4.tar.bz2 5328192 SHA256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec SHA512 7fe14c1534d61cfc253bce54cc707f93882ad96302068fe672e6cdcb613430e835ee5d39a5398537f845a6d101eed6fd3d1ff7e4204d51bc9ab5a59c9e09d2ec WHIRLPOOL 046af673b5a21a050555fabf5e52532b5de7af289922991f0c15cc39a09d32302a6a98483bd4ff2cee3a37356d0cf0e267c87f524f3b6678eb61fcaab6d6735c
 DIST gegl-0.3.8.tar.bz2 5876259 SHA256 06ca9e67a59da026eb941b9d323269d7c19a922f1e478acdd3791a0eef8b229b SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb WHIRLPOOL 97e3521e2c95e2b370c8a6ac2724b57212ebfbbf3c1eeccc3cfaa4de6b993c56b32ead9e5baa23dcbcb8272f7ec29ce7a2acc3afcc5fcc062d0adc72899293b8
 EBUILD gegl-0.2.0-r2.ebuild 4773 BLAKE2B 96ebed2bdbbf5fb54852c538c709be32b1d8eecbc4851f36357451d72b7fb17602c4241d96c5439cf5ff4e508b4d746acad3e9c52117b49a72c7ff72917a1dfc SHA512 ef0a88fc1832095d55233e42b241688498a010cd0bf9c4f91f50e3f735c376961255c7d1c4bd81f943ed597fc405da5e5c2b0d4c92c870551bfbc14372159c37
+EBUILD gegl-0.2.0-r4.ebuild 4859 BLAKE2B 39dbefd387c9332c16e31c6f12b797d25ef13b6cde1b9710c577ea5d3f760c9ede0a9f4722fde544cd658d217c731028ae988ed5ef662c3f12f8539f65fe986a SHA512 add5c588549be5fa2a8fc1575609ed2fa49f5a9b4dcafc3bc753142c780713d10d3450a41bda0ebc680b2a7adc76108c3659547efc1224b749534b93d2407ecb
 EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
 EBUILD gegl-0.3.10.ebuild 5230 BLAKE2B 21f8d7b5979ae97399c9894026f28e8ac8bf7b5522cb877a883f305e0b2239e5c7a9018981344fd753a0779dd3330d6df4b1a8377afd73939049c337807568e4 SHA512 51bebabfea37e751015910c25290230905607261000b6f6ba33695f0de3fe8cbde03962783cdfc3cc968e1e4ad4944f00277045ac6912d13006b7d1ca4934b04
 EBUILD gegl-0.3.12.ebuild 5230 BLAKE2B e9d9e7ba4953f8dd8a324ea67ccad4c46dc552d182addbd7987799462d2d3cd8e846f5de6aacc3a9ea5f2e0cf8f9ed7b27f116f9f31206b9b99cb9f6bc7c936e SHA512 3aad727f1fa9111c57f87e689bae8234a3efd3a614317d2bc6004618d2d826e99048303c69f7cccfc672bf35e49c2508e3a1f1e253303cbef7397411a941ec44
diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
new file mode 100644
index 000000000000..ec1227039554
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
@@ -0,0 +1,48 @@
+From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 4 Dec 2017 21:18:56 +0100
+Subject: [PATCH] Support (and require) libopenraw 0.1.0+
+
+---
+ configure.ac                  | 4 ++--
+ operations/external/openraw.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 30d306e..febdddb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5])
+ m4_define([librsvg_required_version], [2.14.0])
+ m4_define([lua_required_version], [5.1.0])
+ m4_define([openexr_required_version], [0.0.0])
+-m4_define([openraw_required_version], [0.0.5])
++m4_define([openraw_required_version], [0.1.0])
+ m4_define([pango_required_version], [0.0.0])
+ m4_define([pangocairo_required_version], [0.0.0])
+ m4_define([png_required_version], [0.0.0])
+@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [  --without-libopenraw    build without openraw support
+ 
+ have_libopenraw="no"
+ if test "x$with_libopenraw" != "xno"; then
+-  PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version,
++  PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version,
+     have_libopenraw="yes",
+     have_libopenraw="no  (openraw library not found)")
+ fi
+diff --git a/operations/external/openraw.c b/operations/external/openraw.c
+index 9fc1e95..b4b4a13 100644
+--- a/operations/external/openraw.c
++++ b/operations/external/openraw.c
+@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation)
+       goto clean_file;
+     }
+ 
+-  if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA)
++  if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW)
+     {
+       goto clean_file;
+     }
+-- 
+2.15.0
+
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild
new file mode 100644
index 000000000000..2d8d8728da89
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+	>=media-libs/babl-0.1.10
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gdk-pixbuf-2.18:2
+	x11-libs/pango
+	sys-libs/zlib
+	cairo? ( x11-libs/cairo )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng:0= )
+	raw? ( >=media-libs/libopenraw-0.1:0= )
+	sdl? ( media-libs/libsdl )
+	svg? ( >=gnome-base/librsvg-2.14:2 )
+	umfpack? ( sci-libs/umfpack )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+#	>=media-libs/babl-0.1.10[introspection?]
+#	introspection? ( >=dev-libs/gobject-introspection-0.10
+#			>=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.1
+	dev-lang/perl
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+"
+#	vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=442016
+	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=416587
+	epatch "${FILESDIR}/${P}-introspection-version.patch"
+
+	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=605216
+	# https://bugs.gentoo.org/show_bug.cgi?id=617430
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
+
+	eapply_user
+	eautoreconf
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=468248
+	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+	[[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+#	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-silent-rules \
+		--disable-profile \
+		--without-libspiro \
+		--disable-docs --disable-workshop \
+		--with-pango --with-gdk-pixbuf \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		--without-exiv2 \
+		$(use_with ffmpeg libavformat) \
+		--without-graphviz \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k jasper) \
+		--without-lua \
+		$(use_with openexr) \
+		$(use_with png libpng) \
+		$(use_with raw libopenraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with umfpack) \
+		--without-libv4l \
+		$(use_with lensfun) \
+		--disable-introspection \
+		--without-vala
+#		$(use_enable introspection) \
+#		$(use_with vala)
+}
+
+src_test() {
+	gnome2_environment_reset  # sandbox issues
+	default
+}
+
+src_compile() {
+	gnome2_environment_reset  # sandbox issues (bug #396687)
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 14cb410d2320..41ae30e94ee6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,13 +2,15 @@ DIST harfbuzz-1.4.5.tar.bz2 1474461 SHA256 d0e05438165884f21658154c709075feaf98c
 DIST harfbuzz-1.4.6.tar.bz2 1475086 SHA256 21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096 WHIRLPOOL 0ac9d9856f1ff145eaf993a01834198b5b7a07666b7cf995d60c10ee36715cf0055c42b9b0484091a6c89dfa561f674c0ec721d35ed382548d06011b30ee7877
 DIST harfbuzz-1.4.8.tar.bz2 1587622 SHA256 ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131 SHA512 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152 WHIRLPOOL c5b17719b0a362d775cbebf081bb6bd946c3a3401a7ed292ae0bc021abe2b4a18a5fab3adc8e65793ead45d665b2b45b04ffaf8ea2924c4325b6fd39d1b1abf6
 DIST harfbuzz-1.5.1.tar.bz2 1615704 SHA256 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51 SHA512 e5235c9fe4524059128f97e2773056533803b40db70c18b43c8dc6e27a970efc40d9ce6e8754ae7075c245cf8f4386b33e922a6edb3b6a722a596cb7759b8b36 WHIRLPOOL 8cf092ffcf42b5744041b3e2d40ce720a2a089964bb5d8d6a3ed5ccb846df8f3f44e6182744cb7b8c132e2fbfcc93c13fd974c2faa0adcf66961fc3b9863563d
-DIST harfbuzz-1.6.3.tar.bz2 1643142 SHA256 e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a SHA512 37d1a161d9074e9898d9ef6cca6dffffc725005828d700744553b0145373b69bcd3b08f507d49f4c2e05850d9275a54f15983356c547c86e5e3c202cc7cbfbe8 WHIRLPOOL 60da1d7c30e08704d8eed14b9b5f7fb4d68915627dece5a9802f5cc46309ea15e250f351d8e273f2710dbac93d3f7b7574ebd9c167446b6195c7a74f458e952b
-DIST harfbuzz-1.7.1.tar.bz2 1662385 SHA256 9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e SHA512 e78c96a4debfc4761075aca50de111acf394bb966c038b8cebc26fd01a113d53492946709cf54dcc30d87bb6b5d920509181b5a0fc9ea0a010a399e94ad090b7 WHIRLPOOL 5cabbf0a274341cac7b6f174493eaff12aa0b250551723608ede22a28b3e550142a8f485e1c63f14d57241f8aa4060fd3ef6d385210a61ff664ce179608f7baf
+DIST harfbuzz-1.6.3.tar.bz2 1643142 BLAKE2B cf0f1737cd1bd0b2b606d797c1067dc0ba61fd132afca81fba62316e728febabc957151c4696dc19aa2304a87e55a81e18584031dbce62c5958356f8338503a1 SHA512 37d1a161d9074e9898d9ef6cca6dffffc725005828d700744553b0145373b69bcd3b08f507d49f4c2e05850d9275a54f15983356c547c86e5e3c202cc7cbfbe8
+DIST harfbuzz-1.7.1.tar.bz2 1662385 BLAKE2B 131c6618168e69a74548661375e04c323f529b8fc9b0aed2de41ac42ace585fc4c305a4b46c87c2befe7738a61fc74383bb54c0f02d1442be01dadae110b1474 SHA512 e78c96a4debfc4761075aca50de111acf394bb966c038b8cebc26fd01a113d53492946709cf54dcc30d87bb6b5d920509181b5a0fc9ea0a010a399e94ad090b7
+DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
 EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
 EBUILD harfbuzz-1.4.6-r2.ebuild 3168 BLAKE2B 75af613d4d940aa3666825a6a5124785c8bd69fd29b465a0ba93ade43c603239aba07cd1c7c6d9c13a8044dbd57c51e8bfa5095025fdb72a2ee6ddefc55a5ab7 SHA512 713d5114cb344c9b31d61f75f14e1a6a10fe0e578d61ca03af1ad4ffd0af7a2192943ff930ff621b4fcf041ca3a7787af1b4aa5094a21a2bb1cedd4fc19ed433
 EBUILD harfbuzz-1.4.8.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-1.5.1.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-1.6.3.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-1.7.1.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
+EBUILD harfbuzz-1.7.2.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
new file mode 100644
index 000000000000..da388e5fba70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 9fad62947eed..a1cd7b35bff1 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,8 +1,8 @@
 DIST libbluray-0.9.3.tar.bz2 722686 SHA256 a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0 SHA512 1e308b85c51d43b23b186fdd2631f963d4c25de8aff29f335e131b32a175434ee21460a7aa470c508ad13662cf9052649bb4eb974dbd709eb9e6797fb84e0823 WHIRLPOOL b121e75b68738c057ea3e5240523ca2c427c60436e3f12b5ed0817a673ec26573ea45d5d788e464f234eaa254fadcd583b81c2d30970131e2b5eb46b4c279632
-DIST libbluray-1.0.0.tar.bz2 713973 SHA256 f7e3add335c7bbef45824fcd2249a9bf293868598c13f8479352c44ec95374cc SHA512 fcf2193c3b76f3436bc88ce8853cac16f29c3bb6c66447109c14202a41ea938cb6814502a8f724fb1b31add6bd36b42d3aed3eb4a8010c123537e073bd7a0be1 WHIRLPOOL 333d100a8a7214277f07f763b2e41df0289cec4e3f7a713c562e225328b0379996fa5acb716b8e5d365f842a065b9a010ec617dc72c1a018556ff9d06ab65dca
+DIST libbluray-1.0.0.tar.bz2 713973 BLAKE2B 9a95a138a25a97ee08ddf91aff2d267c3608de7a672f5626536841b453d215808936fe7cc0213489e0907f65364f7cc69462e01a76061acdfc3a3a12762ccb3a SHA512 fcf2193c3b76f3436bc88ce8853cac16f29c3bb6c66447109c14202a41ea938cb6814502a8f724fb1b31add6bd36b42d3aed3eb4a8010c123537e073bd7a0be1
 DIST libbluray-1.0.1.tar.bz2 719157 SHA256 0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a SHA512 798d38cc95af87599af5838e5c288f2536a73b33191db8ff3774cf7eb5b835006bea83693f016d47dff551001b98527d8b1f14051f673fb3b28073b820e325d7 WHIRLPOOL 209b3e61b48af5350f952ee595ad6644d36205e9a8fa671c31bddc847f68e6969e3aaff96cc51752c9f54e5dacedf0b1ab1daa5fa508bda8bb85b2e66527878f
 EBUILD libbluray-0.9.3.ebuild 2180 BLAKE2B 2da69d8d7828efa6bf7e39378bf96edfc5cf21a0a610ef83338cbfa65c1932e8af5f96717691cc68a9c68b5d5f91c7287da0941cf87c4bfd0d8853bebb33a3f4 SHA512 19861d642051abbe6ea654eb49586ab852b2393429646783e78d5205f181b783b6fa034adfe11d31c65c6bb154b427dab4a66b62001bb2a9ac72ec92f5989bf2
 EBUILD libbluray-1.0.0.ebuild 2188 BLAKE2B ec15f8547d2a38f7992693580391aba0675eefba92f6bb7e0f6b58f6a34e03017c520f9f315db1b183c8023ed89555ad3a93f5f138092b0d07bbdad4bf85e16c SHA512 592ad7ca5f60d9524956bc5b7994c4eeaeaf06fd1b3c45e1f2b7785c8899e4903b37334c2ac1f36146be5aafb00b938889b98a586a05281558b20d1313807554
-EBUILD libbluray-1.0.1.ebuild 2173 BLAKE2B 121dc09d63d56f69b7df48113a758f7bf4c153ec5b62ba0927783776ba4db4ed56a784a4928bff64149ad26801ca663c4fa554cf15af1cb25825a6eb9b68d769 SHA512 bbe2f4616cc3384bc3e2c6c7d91c08db2d0a0ff5e52ca1e2cc7e217014a5e603621f05850bdd5cf77808a45f3888feb61f27b4f6290475cd30c49f4dde08d2dc
+EBUILD libbluray-1.0.1.ebuild 2196 BLAKE2B c7d8c5d1355673f05790a72953859b0b578a4f76a81c7265fef814fe4365b86f193b98a7570de1eed49b3fe60960662665711440b4b10aab1f50574fd8794931 SHA512 79a9c391889d440dcc376ec2d4ee75a57f289de9ee00f008526e430fbbfaf41b27eba467afc53fe024e7655268c16407035851fff08c76f4f2bb9e0e9bd1b62e
 EBUILD libbluray-9999.ebuild 2195 BLAKE2B d09a8ce8255c03fd56f83a5d9c531994e50f608aa71865a754a2437eecac355ede0d0cdeefa47733ac5490e5872845281782a87d47c2d9947ad63b82367a7162 SHA512 f2540db0815f4973942928b5f64d36d1eab34d07cd143eb2b4421e3a81c9be20068dbba1a178f7fd5e16ff371ba3075915be43421ccf306b36ffa65647aed5ce
 MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/libbluray-1.0.1.ebuild b/media-libs/libbluray/libbluray-1.0.1.ebuild
index 55324a3f826d..0692e8ef45eb 100644
--- a/media-libs/libbluray/libbluray-1.0.1.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.1.ebuild
@@ -44,7 +44,7 @@ DOCS=( ChangeLog README.txt )
 
 src_prepare() {
 	default
-
+	unset JDK_HOME #621992
 	if use java ; then
 		export JDK_HOME="$(java-config -g JAVA_HOME)"
 
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 31b52b6dce12..89b9c8bba6e5 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,4 +1,5 @@
-DIST libde265-1.0.2.tar.gz 381737 SHA256 c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 WHIRLPOOL 39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a
-EBUILD libde265-1.0.2.ebuild 1098 BLAKE2B 84a8b0c4e82413bd92860d18dec011b3844857b530ab9a5d13c6de7dd12dad5ba85aced8a81b173364ce6adc0eca7e2f3ec28c984622c35dc611be794c8e2384 SHA512 0509b0a2c7d41d48b681123b07e66d82fe11458a761220bb6a7ae95d768abd6d39f3ab965563d9a342d5ef5cfdfba7bd2d15cfab97ebb168391333c808a182b4
-EBUILD libde265-9999.ebuild 951 BLAKE2B 7bd796f4ffdd2d39e3bd9ffa20074ade6a8eefbfe91010acbe9ed6ae805f2cf72a65eebc9ca622250ffebe7e5069723d75f8e98d7623c24770a2b36ca494a900 SHA512 081400525be8e5600d90adecbfaf4df5e21ca469d191fb1f63614a9450774f2523a1329feec06aad393bf0667c32bedd0fcd2396916db4e93e97a0a0e6dc9e6c
+AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
+DIST libde265-1.0.2.tar.gz 381737 BLAKE2B cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
+EBUILD libde265-1.0.2.ebuild 1145 BLAKE2B 409cf24b55254fd24ea1412d4213c8e1273451b5edea43e5f76ed2ef3b9bffca7bc6962e2567c27b025a7b9daa0c1f76438205d6bb15b3191b0e4b4d64a9ce12 SHA512 0e272b944534f0f6cbd0c32849b90ba41122dbab3881927bb4b7f4e440a894acd8f85e6acef281b94834c4460b888ffff553b0bc340815fe07683912951e4cda
+EBUILD libde265-9999.ebuild 1005 BLAKE2B 0a7e866206e91c1bf13dd1d22259fd95b7cfc495eaf9f611a88b0859bd33256bf346e4c7d9848f49d900c1ab95f3b515a58632f5aa3938aad3e8f3044fbef690 SHA512 7d29c80398f718490dcc2183af73484e96896afcc962c84f3ad3b7af10f2ab6cf166adeab3cd5d464d77bd88fc076811f8ba98ce7c447685771e8675c40240ad
 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
diff --git a/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch b/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch
new file mode 100644
index 000000000000..e73d43b52744
--- /dev/null
+++ b/media-libs/libde265/files/libde265-1.0.2-qtbindir.patch
@@ -0,0 +1,47 @@
+From 88924722c0e25566953276c52df7ef5040714cc5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 5 Dec 2017 01:19:53 +0100
+Subject: [PATCH] Fix Qt5 moc detection, throw away Qt4
+
+---
+ configure.ac | 24 ++++++------------------
+ 1 file changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6580963..eb4ccec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,24 +325,12 @@ if eval "test $enable_sherlock265 = yes" && eval "test $have_videogfx != yes" &&
+ fi
+ 
+ if eval "test $enable_sherlock265 = yes" ; then
+-  PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets], [found_qt=5], [found_qt=no])
+-  if eval "test $found_qt = no" ; then
+-    PKG_CHECK_MODULES([QT], [QtCore QtGui], [found_qt=4])
+-  fi
+-  AC_PATH_PROGS([QTCHOOSER],[qtchooser])
+-  if eval "test x$QTCHOOSER = x" ; then
+-    AC_PATH_PROGS([QTMOC],[moc-qt$found_qt moc])
+-    if eval "test x$QTMOC = x" ; then
+-      AC_MSG_ERROR([Need the "moc" commandline tool which is required to generate the Qt files required for sherlock265.])
+-    fi
+-  else
+-    QTMOC="$QTCHOOSER -run-tool=moc -qt=$found_qt"
+-  fi
+-  AC_MSG_CHECKING([for version of $QTMOC])
+-  QTMOC_VERSION=`$QTMOC -v 2>&1 | $GREP -o '[[0-9]]\+.[[0-9]]\+.[[0-9]]\+'`
+-  AC_MSG_RESULT([$QTMOC_VERSION])
+-  AX_COMPARE_VERSION([$QTMOC_VERSION], [lt], [$found_qt],
+-      [AC_MSG_ERROR([Please install "moc" for Qt$found_qt (found $QTMOC_VERSION).])])
++  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Gui Qt5Widgets], [
++    QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )"
++    AC_PATH_PROGS([QTMOC], [moc-qt5 moc], [moc], [$QT_PATH])
++  ], [
++    AC_MSG_ERROR([Qt5 moc not found, which is required to generate the Qt files for sherlock265.])
++  ])
+   AC_SUBST(QTMOC)
+ fi
+ 
+-- 
+2.15.1
+
diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild
index 59318a1ef2cd..a4b6724cc51f 100644
--- a/media-libs/libde265/libde265-1.0.2.ebuild
+++ b/media-libs/libde265/libde265-1.0.2.ebuild
@@ -27,6 +27,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
 src_prepare() {
 	sed -ri 's/(PIX_FMT_)/AV_\1/g' sherlock265/VideoDecoder.cc || die
 	autotools-multilib_src_prepare
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 6fd9decdd8cc..5fd5bc2676da 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -27,6 +27,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable cpu_flags_x86_sse sse)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 9b908610f02a..8180d72dd93d 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,18 +1,11 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
-AUX mesa-13-clover-Work-around-build-failure-with-AltiVec.patch 2317 BLAKE2B e2186d0aa5857d6edcd731444c7a98ecc9668ec16d917fca057b12f94b888d4eeb818af9d501672d60d15e3a558845fc4c72ca84e5d72c3150b1e3785b4b4341 SHA512 6b3cd038c0a61b4d64ec0b645086d7cf2c74b97bd0febe5229c88d78e8dc3a4cbd2876a06ca2394f819dd04b0397722fc76c4ce5939c5c58f40ef0d2e2bcbe84
-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
-EBUILD mesa-13.0.5.ebuild 13605 BLAKE2B 31f0f37632ef1a0e11ca1dfb7f084ab0070e0f7780e9aae5bd3e9c857dfac0c81f1af28ec36a18d3b0c919df8c23b43efadb378c9c4855fc25d8c562629d185c SHA512 95793611d72d699e14747c52b73d98510518d05055ff893c171f79413a00c9ae9a055dd9e240b134771c01070d48691e2e7e9942e19b77474af56ae93bd89d9a
-EBUILD mesa-13.0.6.ebuild 13553 BLAKE2B 30614f1f5201caf6c4a701e08a70809a2f0ccb405a63d386c62f5999ae6df379020d3ef138fa72512e65d8bcd2ff4b228b2a603b2b84197ed0399472620ffbe2 SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c
 EBUILD mesa-17.0.6.ebuild 13560 BLAKE2B fd2dbce008cadca8141e16dd7f2cc8660aa4a167c888d7728c9061021fe4c090d9d71ca701d8c43715f29c6412aa098312c974ffe5a10d7539d961e043bf71cd SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334
-EBUILD mesa-17.1.10.ebuild 13436 BLAKE2B 33d0bdb9de92460a682ca5089df1842a0c6ea485724cf684e778993cc0cc47e751fa042f68fb4b47c0aa6d0d952e163cc04806d130c4cd20e65014a82eef66a2 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170
-EBUILD mesa-17.1.8.ebuild 13428 BLAKE2B a532f672adae2e3d84ca72ff5d05fb7fa7b2a8b614b145093c02788fee49cb82274186bd522006d53797c60510adcd4cbce0d67372368f29b2973d1a67a7b51e SHA512 e804fb805f3ed7b7580eceae0cddbeaad478aa3266d529616c185d9d4c90b44f629a974bdc9564f62057038991c82a9b7a6478855dfc973b73bd1b6d06685d0b
+EBUILD mesa-17.1.10.ebuild 13427 BLAKE2B 584c9d7c4954623b346c6884d3870131a338ec6ab1f6b6976447a94014fa6fcb7a8c349898e44a0716a844dd6d4943175b6d2c4f213c37879f7973317009a9c9 SHA512 cdd0a580b7051e39a2a1fe1e0f8ca4671420ae69670c71b252057080d0384a74d3228ccafd40ea44b4be3057ff6d33977119bfbf8c4e3780bce8f1017db03645
 EBUILD mesa-17.2.6.ebuild 15006 BLAKE2B afff4eb4640402b2fd36d86cbae220e956c4a09917d6081c304779124ba86a4373ca37cbbe8610396ee7c2a0a24659432689e70fde79b4a355c122b61b4d2caa SHA512 9d1e62aca188b73dbfc63434934f1202060945320e35805f519bc85c22f7765057d594b095874f12f04f0f9ebe3be0705a92392c7deb52711dc232c2ca93739f
 EBUILD mesa-17.3.0_rc5.ebuild 14892 BLAKE2B e3fb731721a648981bc901a4b96a0d76d6e0a1d9393d515bff62c808c700626052983a5d0ec29b2f584da70246fb53eba99abb9403eccb62fd74e289b9113d11 SHA512 57ac595432a400c8435ba4e60d4a64e2333e33cd5f2c0ad8292a30677fbcd85ebe60c913f8d47b66cb79ed06b42f4da3e288675514ecefaed8c74d1f98553087
 EBUILD mesa-9999.ebuild 14910 BLAKE2B ff2479202876410dcf8404adff9a68732c65f72346395e912a0c90efb61ce7bb33f91e48e8b373902678f8627a2424f64d1152397b20e08f665f68688fbf7996 SHA512 1103851cbfef5e489213c0513f562759f3232d193cd72319bca65f5ea84e2cf04c9b9cd56288b07607648c0939e6cb9a5c5a7b2bece108309fe318bdac774da1
-MISC metadata.xml 2536 BLAKE2B a30728ec6658664e099b04732e8058058822df20c381918057d4daadbc548806ef5d117b8e5dc8e3f2005c9abbaaa121e8364daff7ceb66b0c5295f45a0471af SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666
+MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
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 0d2c65ac56e9..000000000000
--- 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 <mattst88@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 <currojerez@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 594c283ec9b6..000000000000
--- 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 c18e6d30ebab..000000000000
--- 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.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
index e331fde780d2..935abcb79a17 100644
--- a/media-libs/mesa/mesa-17.1.10.ebuild
+++ b/media-libs/mesa/mesa-17.1.10.ebuild
@@ -25,7 +25,7 @@ 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"
+	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"
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 87dfd2135cd6..000000000000
--- 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 b7a97ca09281..8e1144c23b4f 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>
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index 132ecc4081ab..5a30a7711d92 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,4 +1,3 @@
-AUX virglrenderer-0.2.0-libdrm.patch 760 BLAKE2B 5c0619282871a9dccf5ac73395c44b2f2f4d8c600f0be2be648213bdfc5e7c1ecd8bfadd55cb86810cbc3c534a1de7c103692110e1b6b7cafdcd965f361a2a4d SHA512 845c425f24803b751c99eeb13a84cbb450d759794e608fb847e5ae57f90b8a7b66721ae37122cee9ec59ff073d9a3fd4c417fcd4e42cae531cffb94dfddf4183
 AUX virglrenderer-0.6.0-libdrm.patch 391 BLAKE2B 471d68831129f1c01bdeddfb8748cb71fc30cced692f73493ed6ad07c519e15b8412a4dc4f533833181b8aa3a04566c160f7f08bccee7b1fb1adc4ee58c9a61c SHA512 935a3cd1aa7c947a472c8fe5f1880e1897311451f42da26ab941af91152c60e2b66930446b6ff370cc29831a345fa73f9374fc82ad22ced445e448f520b07853
 DIST virglrenderer-0.6.0.tar.xz 222536 SHA256 2900b106dcf831b2e6eb28db934740bb183a4cee01bab8ed07deed5e82d99cc4 SHA512 23d5f8c582f02303e3b4b59a6ca66e7859367a0bb931b884521f615bf9e25290f1ad2a32a92c127df1ec0f48503e20f557f6e910973ca2c7620b75801d5f3401 WHIRLPOOL f281fc6c9a9f83d9a4cb17b0da25a71d5cfb2634396ab0b4f4e86ab9e72b8af76d061f4553ee58a4734767944ebd4d7a45741c7e3e738ef0091513a47ed9dbd0
 EBUILD virglrenderer-0.6.0.ebuild 1028 BLAKE2B 42e5c4047e7b441c1dd7e087aafa6f4871b7a940085509cf310b311dcba87a83724e5721e394e76019c265050566cae8aa8e5edbee4a4623268b102aac041701 SHA512 b3c83ffcc486142b54c2d795ccca3b1b9c17b2f23855bd201b23bba2c8a232eea92cca2bf9131760d18276a86f66f23ec788a49cbe98d5385134e60583813162
diff --git a/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch b/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch
deleted file mode 100644
index f1916728b408..000000000000
--- a/media-libs/virglrenderer/files/virglrenderer-0.2.0-libdrm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/571124
-
-patch sent upstream
-
-From c78953320cae8b39869a8eae41fdec5c4ead30ae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 17 Jan 2016 23:50:21 -0500
-Subject: [PATCH] link libvirglrenderer against libdrm
-
-The library uses it (via drmPrimeHandleToFD) so link it in.
-
-URL: https://bugs.gentoo.org/571124
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 61cf879..09be3e9 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,6 @@
- SUBDIRS := gallium/auxiliary
- AM_LDFLAGS = -lgbm -lm -ldl -I./gallium/include \
-+	$(LIBDRM_LIBS) \
- 	$(EPOXY_LIBS) \
- 	$(CODE_COVERAGE_LDFLAGS)
- 
--- 
-2.6.2
-
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-06 18:23:20 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-06 18:23:20 +0000
commit	d37b97a25b8b10f748eead6574b01f893f140b01 (patch)
tree	13e2a142a31cd193a39c63042a64cab29a1f7ae9 /media-libs
parent	a833e3f4a431b8eea751b7420e127787f9c92117 (diff)