gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /media-libs
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
78 files changed, 568 insertions, 6266 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 54f9f593c1ba..582eccd23496 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 8c7106491185..fc5ec5cf0876 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,9 +1,11 @@
 AUX gcc7.patch 2152 BLAKE2B b8d68f607ddf38a172b6ef82df5aa72b2df578fa46b87a587bbfb32e6925843554e91a992c9a43232d2b9d3002103ab7af9a01ff9f76f7e7170b9df0d74860c5 SHA512 a8e4403a3759417e305bc88dbababbb146ef74a2eda61d8f2fc169ce808e8b3e940a00bf305e88586fa97f3afc0be9e6def9662cd310f846a91211bfe20f8fd1
 AUX multilib.patch 754 BLAKE2B 93d64ca87890d3e5dc93bee4a73334d1d0682107368ba824ccf82d1d65e3cec549b9d105d1dd05614fa5d24d9f6645fdc83e1a35500209a667f1eb297e8b6ef9 SHA512 96c91da5b6de0945477089777fe8aabdab778fe49fba93d71ebf24934f060d9eaaaeaf229cdfd2a20179dc0ee869d81d65c7ca73f4c42aee133c0297248d8c95
-DIST greatest-1.2.1.tar.gz 19792 SHA256 e3c1211ec5dfea61092833bca56c6a14620ac23aa0d53940d99943587cbe1677 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 WHIRLPOOL b4e01659539e02224d5396609ba73715eca1391e9da165ac22cf28f25c13cf89a9c4059cfe3f88e1d88d06e35153f7d1d3e012433b9b4f4deaa2a464e6d6b7ca
-DIST kvazaar-1.0.0.tar.gz 473495 SHA256 40eb7b4b23897299e99050f0c011e9380cf898b25615dd143f018b278b972a46 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340 WHIRLPOOL ed0c6332c5a1efa88b569845f2cb5436881c3866e381369d770a3393d61e37605ad5c114dcbdae424035f451ceea5ab1ee0787769c9bf44fc44bbd2815e87ed7
-DIST kvazaar-1.1.0.tar.gz 484601 SHA256 8e382738a51004bfcfca4c832e8b41fe6a17f889f3c39151dc1c1a37261a3a6d SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9 WHIRLPOOL c37df11389c237af2c31cfcdbb6244c7e87f4d95f5550ee46e5f27c6eca39dd0328aaa81fbef3d555fc869072ac2226efb71566b7ca7ddda11bab3508d1f2caf
+DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
+DIST kvazaar-1.0.0.tar.gz 473495 BLAKE2B 7460dda4b791bd1d2a046350e8d88ce0ba3ef30861f63c7b1bdae709f8c5ac39b4e6db535790e1d371e8b46fd14c3cb60f4dfa3f424a8216ed75a939f6cca9d9 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340
+DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
+DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.0.0.ebuild 1452 BLAKE2B 35fad1c8f4de6d0d2501884ac9f4fbf82b803f2ce0a147f852366236e8fc9dd66edb9ba2877f278661940dcc8808c117e52340a119f437b768870ebcfc628adf SHA512 ab038716fe616b6ab9297b5629762c0800940876ec9ce338a59b8b61a2b8e5a4c350c8bd9e6bbf2e586fc5f5a2acb2c8798befc2e72556e25b1e2360304216d1
 EBUILD kvazaar-1.1.0.ebuild 1507 BLAKE2B 0f3c9394a2464b231f2287aa87dc52ecbd64f1118bf162942ac6fede03dcd19e16f058e15078ce31afdc72185531e2eea6c70ab2e1abf35a02310209c1dc2e19 SHA512 f43f5b1d47f87dd81e83eef5a106ef10faa9304ae0acb01251683e6ed6f62d95beee626f79f42d08a4a510791c668a91f98f70e3055786275547ba4a0afbe80b
-EBUILD kvazaar-9999.ebuild 1475 BLAKE2B 703b8714ffc6792755e75cfac6b642cb87cb6e757cb0fcbd61dc4b6a0d8f18e5e06bd6864e721275c511d4768fca29e4fdc08fa085d4a7fc2fb0f361b7288f0b SHA512 e689c70a837c71a24d483df59c828984b9039be75a8f144d72b308358afcc2228d31fa9d78b93c052acbb9afe66bb9fc20548b9b7444a86d48b706b1c44cc1ee
+EBUILD kvazaar-1.2.0.ebuild 1575 BLAKE2B 94a121eda6db1010030dfd331eaae047fdc068f0e5fbbd387b54ac506f915b83ddb9f896843ef46b68e6305754e0334b744c5784886e778e8d15aeaa1b08e191 SHA512 4b67098e1a756008a83c645972392b0ea8cf102274b5f95fcc083ed6f11818d0ad1b5fe2401d9240a253c9bffd2679b16b142b3c32f459f79f7f64e8c55258f5
+EBUILD kvazaar-9999.ebuild 1575 BLAKE2B 94a121eda6db1010030dfd331eaae047fdc068f0e5fbbd387b54ac506f915b83ddb9f896843ef46b68e6305754e0334b744c5784886e778e8d15aeaa1b08e191 SHA512 4b67098e1a756008a83c645972392b0ea8cf102274b5f95fcc083ed6f11818d0ad1b5fe2401d9240a253c9bffd2679b16b142b3c32f459f79f7f64e8c55258f5
 MISC metadata.xml 314 BLAKE2B 59244096c1566e9c0ea7eb52c8eb8eb63cc188febd8c1fba49006c31185669340c7f8d83e9b5d745dde96b43abefdb117c2c7d3b3c9177174aaf796b5f4ab9fb SHA512 3cf0527dc69a26ad9b7f33b2d5df536712fb19df9bac7cc0f067eac31d2b420ddf22dd744d643bf053caf27615f133478c1fd0d601e553546e73a0bd5e5897f2
diff --git a/media-libs/kvazaar/kvazaar-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild
new file mode 100644
index 000000000000..17d2a2b7ecaf
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-1.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+
+GREATEST_PV="1.2.1"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+# subslot = libkvazaar major
+SLOT="0/4"
+IUSE="static-libs test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+REQUIRED_USE="test? ( static-libs )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+	eautoreconf
+	if use test && [ "${PV#9999}" = "${PV}" ]; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=595932
+		rmdir "${S}/greatest" || die
+		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+	fi
+	# Some m4 macros append Werror, we do not want that.
+	append-flags "-Wno-error"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+			--disable-werror \
+			--docdir "/usr/share/doc/${PF}" \
+			$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index f3331d04cace..17d2a2b7ecaf 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -12,7 +12,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
 fi
 
-inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
+inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM}
 
 DESCRIPTION="An open-source HEVC encoder"
 HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
@@ -20,12 +20,12 @@ HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
 # subslot = libkvazaar major
-SLOT="0/3"
+SLOT="0/4"
 IUSE="static-libs test"
 
 DEPEND=""
@@ -44,6 +44,8 @@ src_prepare() {
 		rmdir "${S}/greatest" || die
 		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
 	fi
+	# Some m4 macros append Werror, we do not want that.
+	append-flags "-Wno-error"
 }
 
 multilib_src_configure() {
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 7baaaa25fdd3..7a6fa76f91ef 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -4,5 +4,5 @@ DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281e
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
 EBUILD lcms-2.8-r1.ebuild 1421 BLAKE2B 71c0a348942e30f91bdafc433c889ebec7f429e8103cca8d11f9b7f3a0ced1130a4490ef1c4c9e8db8b70ef0898512b53809a49c00b07cc26ff92ab5ecec662d SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd
 EBUILD lcms-2.8-r2.ebuild 1278 BLAKE2B c80246b9fd43f4a9bcded6bf934bd359dde5cc4a4abcf3f5fdca6c80fd8b9d030e2120dac65d12454a6317fee49e99b8b082684b5ed66dca4bac4166f8068bd8 SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c
-EBUILD lcms-2.9.ebuild 1261 BLAKE2B ea3ec770139f070bee9475c54700d81c23caf38362a4dfad31a339543396f15664197541f2c1163e0facf281ff63eb86ca58e3a5cf1c4c605e5b946872bb94f6 SHA512 9238459631712211cc29dc4cd6e46a029043f6cae948bb04b4798a3678d3b4ff7869ea7514cc432d4aa9bb8d76abb941f8661ecca03d521fe205ae8a3bc2a3e6
+EBUILD lcms-2.9.ebuild 1260 BLAKE2B cd19d63519995caff4973cf3d89e11eab65866897368078dfc0e0222e08e9f5f228bfef08d9398f5ec69ebb25c1ee948f97f0f6880f3e2e20357ad1fe5693c2e SHA512 4c90a4ef2684f95f14c49499d434e6ddae37ccf5672478a2184e96fe55c504fa55a116daecea87e80da3326f511b7762d68b87b9ea950026cabceaf19a2e9860
 MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 1a170522d787..4cb53d0da271 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 6848bf7a5dfb..8fc0cdd2f58a 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -5,4 +5,4 @@ AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db1406202
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458 SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4 WHIRLPOOL 27ee6236ba9b84bb736c9caeabedf0f872fc4223d198f20c530d804d5ace1b91e2f5c26e2015a547899f1cea482a7ea5fcc91e84123ee7390eb38caa3460dd5b
 EBUILD libafterimage-1.20-r2.ebuild 2688 BLAKE2B 911ddb4a55182cdc805939ac18b75f883182c2022e0084df667ecdcf3b297f6076e100d91af581666d6345dc5d0869a8a2fc79539c59c821642295aa8add94db SHA512 e5be4a1c881d3a2abba70b29d109a9e78ae9325d868a812c335e781e4356ea09eef33494492f3d9242e40ff413be042b086f68af61d19a62f6bc7d1ba3a15df5
-MISC metadata.xml 1083 BLAKE2B 26e342a4f79f0b009968071fa5324fa045006513e5bece5a0c3f3c60379c3ef470b9c79af46e960c347742c6a52e7ef20e75d683146b630d2500f17b780ee292 SHA512 dd947905f857f506c4482455b249fd0c98eae17b6c3a5dab2d7c3890b545667eed1e261202f2a3ce47b4b3dce53dc903d86df3eac6c4eac5a97868b1c8278e4b
+MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
index 2366daca2db9..fe1ce7f70cdc 100644
--- a/media-libs/libafterimage/metadata.xml
+++ b/media-libs/libafterimage/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-physics@gentoo.org</email>
-	<name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  libAfterImage is a generic image manipulation library.
-  It was initially implemented to address AfterStep Window Manager's needs for
-  image handling, but it evolved into software suitable for project
-  that has needs for handling images. Most of the popular image formats are
-  supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO,
-  TGA and GIF being supported internally. PNG, JPEG and TIFF formats are
-  supported via standard libraries. Text rendering capabilities
-  included, providing support for TrueType fonts using FreeType library,
-  and anti-aliasing of standard fonts from X window system.
-</longdescription>
-<use>
-	<flag name="shaping">Use MIT shaped X windows extention.</flag>
-	<flag name="shm">Use MIT shared memory extention for X image transfer.</flag>
-</use>
+	<maintainer type="project">
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		libAfterImage is a generic image manipulation library.
+		It was initially implemented to address AfterStep Window Manager's needs for
+		image handling, but it evolved into software suitable for project
+		that has needs for handling images. Most of the popular image formats are
+		supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO,
+		TGA and GIF being supported internally. PNG, JPEG and TIFF formats are
+		supported via standard libraries. Text rendering capabilities
+		included, providing support for TrueType fonts using FreeType library,
+		and anti-aliasing of standard fonts from X window system.
+	</longdescription>
+	<use>
+		<flag name="shaping">Use MIT shaped X windows extention.</flag>
+		<flag name="shm">Use MIT shared memory extention for X image transfer.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 94ee86d4a55e..9fad62947eed 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,4 +5,4 @@ EBUILD libbluray-0.9.3.ebuild 2180 BLAKE2B 2da69d8d7828efa6bf7e39378bf96edfc5cf2
 EBUILD libbluray-1.0.0.ebuild 2188 BLAKE2B ec15f8547d2a38f7992693580391aba0675eefba92f6bb7e0f6b58f6a34e03017c520f9f315db1b183c8023ed89555ad3a93f5f138092b0d07bbdad4bf85e16c SHA512 592ad7ca5f60d9524956bc5b7994c4eeaeaf06fd1b3c45e1f2b7785c8899e4903b37334c2ac1f36146be5aafb00b938889b98a586a05281558b20d1313807554
 EBUILD libbluray-1.0.1.ebuild 2173 BLAKE2B 121dc09d63d56f69b7df48113a758f7bf4c153ec5b62ba0927783776ba4db4ed56a784a4928bff64149ad26801ca663c4fa554cf15af1cb25825a6eb9b68d769 SHA512 bbe2f4616cc3384bc3e2c6c7d91c08db2d0a0ff5e52ca1e2cc7e217014a5e603621f05850bdd5cf77808a45f3888feb61f27b4f6290475cd30c49f4dde08d2dc
 EBUILD libbluray-9999.ebuild 2195 BLAKE2B d09a8ce8255c03fd56f83a5d9c531994e50f608aa71865a754a2437eecac355ede0d0cdeefa47733ac5490e5872845281782a87d47c2d9947ad63b82367a7162 SHA512 f2540db0815f4973942928b5f64d36d1eab34d07cd143eb2b4421e3a81c9be20068dbba1a178f7fd5e16ff371ba3075915be43421ccf306b36ffa65647aed5ce
-MISC metadata.xml 621 BLAKE2B a7cd2136bff2f2fa4b51c7de9419ea0e2eb737c233561a7348fc09705d1087bf862861a7838b56e272019f4816df4dd59e2f8cc48679e62e4028480addef4742 SHA512 815b2bdc883bb9e7d9d380d70ebc66f47fde686f9dc466ba2a4a19296f70df52323239bcece1f64dbc98f261c1bb27be7d7066754a253afba037f89c3147f9f5
+MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index e47b6ecc6bef..e690f3a3310d 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-  <use>
-    <flag name="aacs">Add support for decryption of AACS</flag>
-    <flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
-    <flag name="java">Add support for BD-J</flag>
-	<flag name="udf">Add UDF (Universal Disk Format) support</flag>
-    <flag name="utils">Install command-line utilities and examples</flag>
-  </use>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="aacs">Add support for decryption of AACS</flag>
+		<flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
+		<flag name="java">Add support for BD-J</flag>
+		<flag name="udf">Add UDF (Universal Disk Format) support</flag>
+		<flag name="utils">Install command-line utilities and examples</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index b3f64ef0005d..d5b4b59b090c 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,10 +1,10 @@
-DIST libdvdcss-1.2.13.tar.bz2 338588 SHA256 84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c SHA512 b7d912ef87854bca052c2f38709d49eeb72be9148b6598a7f71f9ccb1ad7f43a521f9533821fbd8d7ef16e2c36fe140209c9183f5ca91e8f806150cc16645717 WHIRLPOOL d3278f9fa3eda884e14ab3e6ce52b9dfdb20910b884a91b2b7201fee70a1e6cfba7bc3f5a1a51123bc9eb2b3126a38c45dbccfa8c500d9074825c4e35bf5b146
-DIST libdvdcss-1.3.0.tar.bz2 355417 SHA256 7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395 SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d WHIRLPOOL 0086f2410597d3b9e22a5c30f70bbc6cd0178a57d0e32960bfbc34d51ba8880e18dbfbbe0ca8f38cdf712a5c7768e872978e33ddb8650847450400518438f42e
-DIST libdvdcss-1.3.99.tar.bz2 377167 SHA256 08b0fab9171b338cbbe07b3a4ea227d991d5f1665717780df5030abbbd9b5c5d SHA512 d81ac96d81181dae4e6d63a11fa56fd4ff1ce1ee58c49a1354c10315eb5f9e743475d7e3896bac4dc7ea3ed35e52a964dd337a9b3f32f9ff9e37d11fcd4292b1 WHIRLPOOL 1c78f085e4658471585e3f0161a36143355206fa9eb6f0f774905649bd5fa2416a00a10dfb22239b538f3e7a5fa14fbd401c1e6b3e96090527f9b2cd2db46e99
-DIST libdvdcss-1.4.0.tar.bz2 364373 SHA256 2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b WHIRLPOOL b8c93fed004a17dda06d6930296413589aee1c5568a58ef57740024d1f4b67a48019b3637367d66fce94c2f626fa3a1e4ab53c8eab6e04508fb0f6f2dee74038
+DIST libdvdcss-1.2.13.tar.bz2 338588 BLAKE2B 325fefaa44b5a7d516c856ab2288eaa949d49ac8e66691dc385ec91392a4242bc90f59ee1285e931c804c7405c5187cbf13d396ae4abcf8efc849691d5d85633 SHA512 b7d912ef87854bca052c2f38709d49eeb72be9148b6598a7f71f9ccb1ad7f43a521f9533821fbd8d7ef16e2c36fe140209c9183f5ca91e8f806150cc16645717
+DIST libdvdcss-1.3.0.tar.bz2 355417 BLAKE2B 33fa609f8131f7b53d579805fcfcd4aa821f9d9d434f4f34720a4b9a8421bf64206609801da1ca6e36aed63db6c97103cf2303e4b83fbd4a563bf8bbe13147bf SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d
+DIST libdvdcss-1.3.99.tar.bz2 377167 BLAKE2B 9032bb6ba2595143079fb80bc8dce4197f80a45ba6f1d34b42a09db8f244cd22d4b9b41edb899a927be93a632dc9597dd49ba5b26d6c981091b091cf4a38ecda SHA512 d81ac96d81181dae4e6d63a11fa56fd4ff1ce1ee58c49a1354c10315eb5f9e743475d7e3896bac4dc7ea3ed35e52a964dd337a9b3f32f9ff9e37d11fcd4292b1
+DIST libdvdcss-1.4.0.tar.bz2 364373 BLAKE2B bad4bfaa17df33ff665684000d54b91c37b5d924b4b707a47756a2ef9b468256eff966379ab30f0c4d7650c0cd5617f70413a8508fa2279485a14b6b44c38680 SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b
 EBUILD libdvdcss-1.2.13-r1.ebuild 794 BLAKE2B 9e44cfc697086f34c212efe3be50ec7b107fbce3972368e2be2040f3c29126f9a9e9eb380f76c42e0d0636e32ab06562377d48ad0624f8710ec87f90a2d3e86d SHA512 439e310da620326af25c283720aad7d4e7c57001db2603ba10e087045118ec2677b1b87d66562bc59a65f81c53551650df4dcafdd61df7c589ccbc6af0493ddb
 EBUILD libdvdcss-1.2.13.ebuild 787 BLAKE2B 6802487fec64da5d236383a1cfd7aa78701b746d3e8acb00ed127cc6d08cff615b8fc163d6f9e893a0e5564060c3736f95a6db599970497ec003da3585e7275b SHA512 82ac2f952650e72c7500eed8959d6f64739e198db2cb2fa8026ae3850f80ee15359ba5072717b662528de18ba70c8b0e31a723fe2a70f643cfa4f391c3039019
 EBUILD libdvdcss-1.3.0.ebuild 794 BLAKE2B 46db374a514eb9214a2ad51cea5e5f5e4ff7adf8adc7fadee4542c84eecb24027a360b3f843982f23acbc09a39265607b19b56d584febeac28ffa793cbd6ecb9 SHA512 4e690afd9b49df8d4f79214acff82b00a40b137d0c36e4889ed3c7cba3b81d50521db13916d47836cd8d0588be81a56e49a1673685d13c87352332ac80752498
 EBUILD libdvdcss-1.3.99.ebuild 808 BLAKE2B daae1a065e245d3ed91ce42f35fcc77a326abdc994122c7940a8536e9cef224e2a75e4061ed57cf8029e77cde643ad9bddc2e336577e7a71dbcef7322766a5b9 SHA512 4f1d3de58cc7b20affcd2ab383dc01e0c638b41bd68a445a9642270fb6190da71201241846d572b46029549340edbb925a4318ceeea9ea9031c218f10bf8c37d
-EBUILD libdvdcss-1.4.0.ebuild 810 BLAKE2B f90eb0ede7a4633326d768bca3846b3e73c0eaf15dbfcc0e7f5eab6a1af5b6be1238388cce6d28826480092d55b6c293f385ece65a7bf71e49cbed1ce572e6e3 SHA512 c1257b1f505927431578e542199bbdc6c0af1134bc5210bb436935d476de83636b32a4eb6a405454522425ad6c7171806b4066cf284b240621160df55b3b376e
+EBUILD libdvdcss-1.4.0.ebuild 809 BLAKE2B 176d9562c52261563c14a6d0f8e94fff5abca7ad7d1cffa6746f3083b81a5d9e44f7d918717246843bc99d04a99934048ee30040e9734cdbbccdac5f29d139b7 SHA512 62967a8f03b58cee3ebac30fced2da26c9218baad8f3695f4846ab03b5c2d06eb6dfc617ff3043192f231748b23160cf4c4cea7c0c837dc2185c00cefc778c68
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild
index 22f31a894f79..cf2628737151 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmpris2client/Manifest b/media-libs/libmpris2client/Manifest
index 2a87dadbbd9d..6efc8575ea9b 100644
--- a/media-libs/libmpris2client/Manifest
+++ b/media-libs/libmpris2client/Manifest
@@ -1,3 +1,4 @@
 DIST libmpris2client-0.1.0.tar.bz2 287862 SHA256 2f4abd8f1cedb687574bcf1a98c34bf4476b87b088dc0741ca8239f84494e0dd SHA512 29926a60c2da71c78b38154ff39e310785e089abac756a5e1adea71f9f33975028a3110473a07c2cf56271fa978400d1249e5cab44c4bdd440f48ef37775ca44 WHIRLPOOL 9dc3ef783ad36ffdb2ee6a97b66890a3e2c96349494c842d969153367cb0e8cfdf2742bed713849b322e501f2574d5a2b17cd0530ab7a0d2058f68d99a626aa2
+EBUILD libmpris2client-0.1.0-r1.ebuild 684 BLAKE2B 5c8e520f25d99d9698cef72c7be309da576ff18cef1452c17ca95b29daafecc57098c9e74ffd546321db59f96dfed8e225b32e70c48c37f88cfbc3800b17b355 SHA512 6a2e351835f1784cf5fd1790078825afe5916b64a0f60066f42c2c75ed2f353eaf188792fea84c53c65268fb0995d1c0ce93a3da3568fa059bc46f289bd3c45b
 EBUILD libmpris2client-0.1.0.ebuild 706 BLAKE2B f9b6bda980119605a27dbb78fd1f6135b7721792dc8800fe661eb4067e3ef9b3cbcb0ce93ef5c095ee914fb1480fbc54197d772a52e35fd0c1a8f999dfd6e9e0 SHA512 7de56ef5053237436fb47591ed02e3c2deee117fb2f9509eda0d75b7cfd3376d29f43d06b14a7512419ca77843a72cd8742b8a85b4427d488107c3d24ca8ffb6
 MISC metadata.xml 346 BLAKE2B f27dc0e8f01c8c2810e8920a46e87c98484cbeb0137faef98c9ece3907df3c5881ee8603a68c258b9fa6ba9b23bc18e0b29610d83c065803849b4f268f01630a SHA512 3e491f998b2ca58209ab5eb0913637b2ae55360d0f356a3fbd054ce0243e361c2852185c1ed0e5b835c7661fc2102bd0831d016320da8686d8573aa8c0b872cf
diff --git a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..0a29d009a666
--- /dev/null
+++ b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="A library to control MPRIS2 compatible players"
+HOMEPAGE="https://github.com/matiasdelellis/libmpris2client"
+SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/V${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index af4b6b48989c..084f0f72a03e 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
-DIST libqaccessibilityclient-0.2.0.tar.xz 103280 SHA256 d5e8f4dc91bc1b56029e12328a9e02d5c310939b01998f030202203c5edb2e61 SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34 WHIRLPOOL 3e83f93ba0e85ddade24e50a6ef6863303a2f5391a8126ca3854a81a6c0cbd1b4564e38d117ba0dcac9371c1059c5700910ea416cb88f30065ad948f03f8579a
-EBUILD libqaccessibilityclient-0.2.0.ebuild 678 BLAKE2B 9b513d31bbbec8f5ae8931db223bdc2ad7252a2c6e76b7ca22a8292e69a280e40825b3f7480efa5e6e8298136e26e1d24c1fab946aa70876ce365ae8eee247c8 SHA512 5f00efc1f3c69ea768dc3f32eb862bc1d3e4379a5ff0e8b65f45ad092f5d986d5cd1c90a41d322c7044b61e1ab14c1adcc62b5149212bc572653257f86687fd1
+DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34
+EBUILD libqaccessibilityclient-0.2.0.ebuild 676 BLAKE2B 8d9b808bb4f5a3d67f5109b504a17646ee3dacbb76bd37a03a2594b60bd7dda1f7c054c774bfd76079e694e3ff3f10f487408fc975c3643ce6169910754b2ad2 SHA512 a5f306c068318b08b2da0faa5efcf3bfd46d40a3226a17c8cf54baa649d26ca59f3bd51b2a745593c8e355f3ab953afb0410276b6c6880c86eca51acebf1656a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
index ac31a9699d48..f01a0f3a3c8c 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityc
 SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 9fe052703fb4..fbe6e4771088 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -8,4 +8,4 @@ AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc WHIRLPOOL 21b9aadb7b00002a6f3760902cd40aeb1b145228348b887049b40a435c2b9a1a3679a83100421e9634178b9da32d524371d6912c190a75e83ef3170ad45bc159
 EBUILD libsdl-1.2.15-r9.ebuild 4386 BLAKE2B 6c141995b02d9b25b23cfc60f7f6b314387e90686559136cf1272a823eeedc3e46823cd966d4dcd06d8f83929cc4c646867fb2a1f5530a191ad6bc5b46a133b6 SHA512 94285ca796ab2bc75424ce8496ed3d200cf6af7f5edd6e0da81298feb9581266bfb468f27f557e61239ca7bb6f47d20fc6ba9a43abe89bcae8d22980c5e41602
-MISC metadata.xml 1400 BLAKE2B 767231a62a6e251a4188c5bdcfd844e7f372e19b6c6b99f96c8a7de4e80351e60c99ceb177906925cd53f661d4a593960b92707391ffbcf2e518f25219ec3ed4 SHA512 6e10ca7d9a9a0b0d0dbf2de3077c67f80bf54e667424a9267109773fdafdfe4377f34cfbf2d4468d0293efa53d61b1c1e67a0004b9c3264e68c3018d826f357f
+MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index aede63475a7b..eef34652c6d4 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Simple DirectMedia Layer is a cross-platform multimedia library designed 
-to provide low level access to audio, keyboard, mouse, joystick, 3D 
-hardware via OpenGL, and 2D video framebuffer. It is used by MPEG 
-playback software, emulators, and many popular games, including the 
-award winning Linux port of "Civilization: Call To Power."
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		Simple DirectMedia Layer is a cross-platform multimedia library designed
+		to provide low level access to audio, keyboard, mouse, joystick, 3D
+		hardware via OpenGL, and 2D video framebuffer. It is used by MPEG
+		playback software, emulators, and many popular games, including the
+		award winning Linux port of "Civilization: Call To Power."
 
-Simple DirectMedia Layer supports Linux, Windows, BeOS, MacOS Classic, 
-MacOS X, FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. There is also 
-code, but no official support, for Windows CE, AmigaOS, Dreamcast, 
-Atari, NetBSD, AIX, OSF/Tru64, RISC OS, and SymbianOS.
+		Simple DirectMedia Layer supports Linux, Windows, BeOS, MacOS Classic,
+		MacOS X, FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. There is also
+		code, but no official support, for Windows CE, AmigaOS, Dreamcast,
+		Atari, NetBSD, AIX, OSF/Tru64, RISC OS, and SymbianOS.
 
-SDL is written in C, but works with C++ natively, and has bindings to 
-several other languages, including Ada, Eiffel, Java, Lua, ML, Perl, 
-PHP, Pike, Python, and Ruby.
-</longdescription>
-  <use>
-	<flag name="joystick">Control joystick support (disable at your own risk)</flag>
-	<flag name="sound">Control audio support (disable at your own risk)</flag>
-	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
-	<flag name="video">Control video support (disable at your own risk)</flag>
-  </use>
+		SDL is written in C, but works with C++ natively, and has bindings to
+		several other languages, including Ada, Eiffel, Java, Lua, ML, Perl,
+		PHP, Pike, Python, and Ruby.
+	</longdescription>
+	<use>
+		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
+		<flag name="sound">Control audio support (disable at your own risk)</flag>
+		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+		<flag name="video">Control video support (disable at your own risk)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 2d07776106ad..7d26e35d9aac 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -11,4 +11,4 @@ EBUILD libsdl2-2.0.5-r1.ebuild 4850 BLAKE2B 4430546a662303558a981390d661c646e519
 EBUILD libsdl2-2.0.5.ebuild 4791 BLAKE2B 36a92c0bef222103e1f105ac9c5473061af64b0d2904029a3a2fffb47c1cd532489e372a113aba725f0f286688aefd4ba2ea722bd47fef634ffe0fb3e10b0780 SHA512 a7ee500df710579bd4be766935984871a0311307b78f35d42cb7459c25d298fe66b00283d044e8ab7353722b30ab5f52327840e87cc08d9ff6fa23e4b4f84e66
 EBUILD libsdl2-2.0.6.ebuild 4888 BLAKE2B ae738bd98e07756f7d2638b22936d7caaea4e797991f58091d53f74b455775129d0b1cca0a4286eb88ba65e9aeedd34834c5e24a0a0de4279046795f758f8a25 SHA512 c97bde608c8adfaf056ac6e667d6727c889c6f64f93a579a84404618fc01561eb62fb81e0f3e08ba02fc90ab764cd73bd2d3b8382b1ee53fb88ca7f8db35d8bc
 EBUILD libsdl2-2.0.7.ebuild 4888 BLAKE2B ae738bd98e07756f7d2638b22936d7caaea4e797991f58091d53f74b455775129d0b1cca0a4286eb88ba65e9aeedd34834c5e24a0a0de4279046795f758f8a25 SHA512 c97bde608c8adfaf056ac6e667d6727c889c6f64f93a579a84404618fc01561eb62fb81e0f3e08ba02fc90ab764cd73bd2d3b8382b1ee53fb88ca7f8db35d8bc
-MISC metadata.xml 1626 BLAKE2B 0e7f9dab4443b098339c7d91be9ee62cf022a717ae084d99689218b073609ee5156e93ac2693bfc623f423eac54b52bd16cd651e330eceb3f4a882fe408b3923 SHA512 bca03557793cab7fe23ff7073add8bc112f4046326dae99cda4079b3adccd56b9179c871b04e97174c178d90b1b82b3f6ff5f42f53a705d4a22c9732e57787de
+MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 04b7e237bb79..d72b5fdb4d5c 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -26,15 +26,10 @@
 	<use>
 		<flag name="fusionsound">use FusionSound audio driver</flag>
 		<flag name="gles">include OpenGL ES support</flag>
-		<flag name="haptic">Enable the haptic (force feedback) subsystem
-		</flag>
-		<flag name="joystick">Control joystick support
-			  (disable at your own risk)</flag>
-		<flag name="sound">Control audio support (disable at your own risk)
-		</flag>
-		<flag name="tslib">Build with tslib support for touchscreen devices
-		</flag>
-		<flag name="video">Control video support (disable at your own risk)
-		</flag>
+		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
+		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
+		<flag name="sound">Control audio support (disable at your own risk)</flag>
+		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+		<flag name="video">Control video support (disable at your own risk)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 451f982672d4..b002d467c3e7 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -5,9 +5,9 @@ AUX libsidplay-2.1.1-fbsd.patch 333 BLAKE2B b55f14ba3aa8e73fd107a768991bc81aca78
 AUX libsidplay-2.1.1-gcc41.patch 1063 BLAKE2B 464044df0215d8b4af5ec688b275a0841ae2aacf7db43996a46f3999e820fbfbad36c7215efe93b9026791462cff7caa9b7d65e3b4f32bdaed94fb222ab95731 SHA512 f27ec81273af62271903102f87f904c8031e1b7fef963714e8a4479ac4227ea9b881843782ced003b80461ec3e07d9be3f2d0e2ecb5ab38c73a8a2bd4e8cda72
 AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec554696898767f20fd4fb01d1e8dff56a52f1ba699c103c9949db4e8da2b12a9920e3dfd0e53d82d3776c5609f0de9f79f82924dde SHA512 77078813d4862628372bf1293747c38d55811cc4c68ef3001252a520a89d83a91e1ba102f861825bb534039c4811bb8bbbea2e47609b5762ad2353477561d9ce
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
-DIST libsidplay-1.36.59.tgz 390097 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410 WHIRLPOOL 121e985c861454c8755c4c6fe8066936bc0149c89ca9197ee23d03657f4e87b48e8f1e2c9e26202b04a1291746782be62cff86f16384ce9a9a50f885af9f4279
-DIST sidplay-libs-2.1.1.tar.gz 1900252 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3 WHIRLPOOL 53b4bd66bbac0bfc29514981f34e19fac41bae356d06e727f3a0f2ad2bedcb1cd815d22656bcf06460e9d908a91433bbdea029805af43b1cd97310f230f1c89c
+DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
+DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r1.ebuild 828 BLAKE2B 5b12c8f42573463ce0144c6cacf7479f6b137b8e84c93e763084477d927768bd80cd344b533431d92aae3b56bbd7e6b053a890d88683a1208b52192100c97d25 SHA512 c26f2a40f0de6918e22c90682484cac1e08c03b764859596f4d05fb0df63eeb7c6a1e9415d70e7fe219cbe43ecbc2d50374741292c290852caaa626f32dae315
-EBUILD libsidplay-1.36.59-r2.ebuild 771 BLAKE2B 5bdfe32575ac8c3a63fadd6c7bbba6fc62333ddb2cd4be2c3255e5de642f0e9543f8143c92e3a5e03bcb2cdbf81e4b259500bb6dc8d7593f167970e3cc2682c6 SHA512 f3e23d27d732a8a2ce5af832f84e5a46b2963d2b07d3b75cc74221f14f8599653119c425f80279933ec75db5c6b71a9d1232c2609fb5af1f7ee53c2e3e4c8937
+EBUILD libsidplay-1.36.59-r2.ebuild 770 BLAKE2B ba5d15c00092847295463d75ea6c1e28e2642a5e067255e9e7517a63f84864c793a87431121c4b6d9f8c6cd9eeb2a7590e89a935d10a542302fb66d8155c18a9 SHA512 0ad5501296881267ef3ee2d4c8cacf18921da61b5c6a29111203b580044bb16c6b9ecf7a224945a52426b4bead42c6f475ee373d791ebf3a528660950ea42a56
 EBUILD libsidplay-2.1.1-r4.ebuild 1306 BLAKE2B 989a5d2d63dd582ecb11699327a959bc696ae62bb6600bbc7e5cc1fecf94fe45dfc752649a16b60b61a83e90fe5d18ba3378a9b610a4cafdc8adc6b8bb76d4ca SHA512 c6eda0b230c217b3dc300810f974cb12804f6dc2785243dad68993b2e2ea094c0cf329f7be70d8abf3af6f2d6d493b1b2d6404095382480ab1f9a38fa8b43478
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 3f64cb26126d..823b92a87bc5 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 059770e79c63..6c65b28075f3 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -5,4 +5,4 @@ EBUILD libyami-1.0.1.ebuild 2050 BLAKE2B b666dbb77df924c06b73feb8da4591906946063
 EBUILD libyami-1.1.0.ebuild 2076 BLAKE2B 08bee3c7949783a42b9202911c9fec39b3765b721447223188791bc964a0e95b75637f0a3dea18819d40b64bf0f90d99cc482c5bf3317cdd390d4932e3198f54 SHA512 fe3b20beaa845d3edc83ff20330a9c2a486e5cb662fa6add675ccf87f8e2f73fa92b297aae232375b8e443464d1d337751de8bd0692c0ca91d5e26508d1e6356
 EBUILD libyami-1.2.0.ebuild 2110 BLAKE2B 5949d871b479b23dfe0636ac2e196c43e2686b60950e16b2ee0c435337f6bf142d3e0e266c12cd306c2de8feb851353f4b40bfe47f95b8665db33f72039ace85 SHA512 ba8452590a7ed51d79b0112d84432a11d7df43b7bdc7319e2d21f724488bbf61e66fd3cbdc91f2ac34718c15b6cca3677b9bf584f1b8657767c5eb7c147c78c1
 EBUILD libyami-9999.ebuild 2110 BLAKE2B 5949d871b479b23dfe0636ac2e196c43e2686b60950e16b2ee0c435337f6bf142d3e0e266c12cd306c2de8feb851353f4b40bfe47f95b8665db33f72039ace85 SHA512 ba8452590a7ed51d79b0112d84432a11d7df43b7bdc7319e2d21f724488bbf61e66fd3cbdc91f2ac34718c15b6cca3677b9bf584f1b8657767c5eb7c147c78c1
-MISC metadata.xml 579 BLAKE2B 8cf3286a956bb1722c1c6a1f5a8dbf6124ff67e429a380a6cdd318bc2c030cd9361ff5d1df5f5e5673a81c5e38d752225acd3cc24724f241b1ad178f96f1c011 SHA512 11cfa826e63e99ab080c3f2fd698d081fc2cdddb42c24f563b63e006426b23c9814dc5521216d5ed1630465bd4d1dc109666e2308d3b2b0d4f46440cfcd4afe5
+MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index 77b1337f051d..96b2eb2fb1e3 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-	<flag name="egl">Enable EGL support.</flag>
-    <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
-    <flag name="md5">Add support for generating md5 sums for each frame.</flag>
-    <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">01org/libyami</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="egl">Enable EGL support.</flag>
+		<flag name="v4l">Add support for V4L2 hardware codecs.</flag>
+		<flag name="md5">Add support for generating md5 sums for each frame.</flag>
+		<flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">01org/libyami</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 057aaa48e784..05809e1d1a37 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -4,4 +4,4 @@ DIST lilv-0.24.2.tar.bz2 244764 SHA256 f7ec65b1c1f1734ded3a6c051bbaf50f996a0b8b7
 EBUILD lilv-0.20.0.ebuild 1202 BLAKE2B 73f7f0d02206706482f197c4ae9e55f0b6ad6019d5f9e6926c1f66b18d308cfa324d25683b7eea179a9ef8dc6da279884b817033d1574dbe3765442e51e5cb46 SHA512 b9c60ff6903eb6cbadb2eccff179790294102eb1744cc964c985c1dcd6edb5a9eb9b1015997052d114fc6f5a84324aa4bcf43d2fb8c5fd2aec104d70240b78ab
 EBUILD lilv-0.24.0.ebuild 1213 BLAKE2B 26052c38835583e6d91e25cc1a08d90ad579d6310fa31e63dd5feb870ec2e5f0a58db9a2c68536915ad639ac75106c019fc1de484745c2fc5eb6fcb9832db517 SHA512 38d0463ed4841f97a6ec291507a84b97e698c404d985c275ddbe5bd41446d5cb76f8821b753fdead34063121a945a452b705b86262e8501735b65f7b2bcf189b
 EBUILD lilv-0.24.2.ebuild 1219 BLAKE2B fc2801c4b2a283c016db5f2f9fe1e3174b7fac13f8fe7a109db2fef5a5c40a4e5bf18a9476ddd6bbac4e36a291bf49ec75ecefd1d08a2d2b4d84e33a297c8909 SHA512 fcdd8470935eccdb8c09025f33ddc94b7c16ec3369debeef51a78b654f82264fc73259aafda25f74ccebcda1b36a0d19ec65d700e83628396c658545e3eda36a
-MISC metadata.xml 629 BLAKE2B 72c93ac62a77031116c1e4d248fc8c732d98afc4df824f7be2714fc1b68984717ab4eb0964f92414654763e093bff90f53556678cdd55a028e9db2cd1e756435 SHA512 f6ec2c5792b413a490a4742efc5fb255172c50e48dcc4a09292139ed50b92f897ae1c06756b4ce8e3894814993f6a4c1774b659b19263982692242f314e22af2
+MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/metadata.xml b/media-libs/lilv/metadata.xml
index 1cf20fcf37e5..bbdf882cf303 100644
--- a/media-libs/lilv/metadata.xml
+++ b/media-libs/lilv/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-<longdescription lang="en">
-	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
-</longdescription>
-  <use>
-    <flag name="dyn-manifest">Add LV2 Dynamic Manifest support. See http://lv2plug.in/ns/ext/dynmanifest/</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Lilv is a library to make the use of LV2 plugins as simple as possible for applications.
+		Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
+	</longdescription>
+	<use>
+		<flag name="dyn-manifest">Add LV2 Dynamic Manifest support. See http://lv2plug.in/ns/ext/dynmanifest/</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ecc310561979..d3f85766d65a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,34 +5,14 @@ DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd
 DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
 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.1.9.tar.xz 9908296 SHA256 5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a SHA512 359da171deaba0a1a5ce7112d49d7b48be38d24d0211264fcdcc3218f1f35be9419e5be1d08d56b6ca15654d3f93107b1706ff18a5e31d3746f7a3191b808cdf WHIRLPOOL a4b76204005ed15cee799a0e7e590d5e9f5078f65d83fccec26f00ab397c4144f70ff6eac652f13197af3bbdf4c4096c531329766297caa9875aee47bc3e4d67
-DIST mesa-17.2.0.tar.xz 10335284 SHA256 3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 SHA512 6ac39274fcf86a26ea5fe51aed486ba3d45b75e0d2f7cc17e1e71d4cf9a85420a832fe559a2ac7b215eda615fab99a2bd290c8388a48c52e13737e7e4ef8d4fd WHIRLPOOL 3fec3810c23aa12f49c0fe561b6dbdbd5724a3bff513b21c273d5796c85eebdd889fb405a03f7cc0fe926a8289794e1872a0d04799c31122061a268faceacf36
-DIST mesa-17.2.1.tar.xz 10414776 SHA256 77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e SHA512 19a7d6c2e2d439b1c73199bffd4154b42017bccc138be954a893c3b70e885f07988de84dc8aa2aff36e06295e91f0181d5b95372152f6f0f80b7afe4b3846b6a WHIRLPOOL b9048aa4d512307c3f558a925afb39949ea84b7e52ca52e2ba39cf6fba38c284ef527b25fdbfa7ec22ca6c9e17a8628ce41fc8916bfaafc7f5142c3476750b6d
-DIST mesa-17.2.2.tar.xz 10359156 SHA256 cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 SHA512 641342c68989b8d801c37e668b012d3b7c4ad43d8ca01b74f8cbb3a1ec25b7390f69fe7ebc84b29dab1c6a4ac01c882ec9fd4a6b331505629461bdbbe6aa3f7e WHIRLPOOL 74271721fb38a0c62f6f35d84ba9196e000f2fe2a32e75120288e77649a87e225464572d347fc149190b573d22c32dfee3e174d6a2578b3c649c4b72375a94ec
-DIST mesa-17.2.3.tar.xz 10344180 SHA256 a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837 SHA512 749a0a46b772974633e405804ace7f509afb79f47811dbbdd390333721d744f2ac64f985ff1fd6c5aa3019b700be70bc1f75f60745ed9f4c5b08a9a8f77dfc76 WHIRLPOOL 333bdb9dd15726a4a19fa7a87d2044aba6ebaea2eb83dd436f916020221a8bc46d667e8710a701c52930217292ecdfd468b654a7846357aa8881356987f394c0
-DIST mesa-17.2.4.tar.xz 10381984 SHA256 5ba408fecd6e1132e5490eec1a2f04466214e4c65c8b89b331be844768c2e550 SHA512 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085 WHIRLPOOL 29750c50a496cb27e0b4466bf0d1496434330a96259616dd7c368adc3d9478aa6ba1facf11ec4ff231a244f890781c12637327b1675c423786693c40f787945d
-DIST mesa-17.2.5.tar.xz 10386312 BLAKE2B b7391bc00b0570f7e4a4e00f5fa645c8ed6e6ccb72ba757ef56f3ba21004f1904a6a3891e7ddfd8e46797ddc747f21f726b4c70c26ac3415b4353c821ad8819f SHA512 c4b0f7f48b0b57fdf610de3d61e127774f8223e755acfde6cf2649818eec985e8f925abf8a15d530ecdb882cb8d7268fd01e5d94c8ac6934551b8a74272353c7
 DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202
-DIST mesa-17.3.0-rc2.tar.xz 10658696 SHA256 13b2c085a54836465a3b6814ad4bc2dae0a502f43405e75ced67789d5afc18cd SHA512 749cca3e0875dbff7b6fab4d646974ecbcc7659ec82ad025bc386372d6e0e050d84d5e05fb68c5099e685557d85daf55c6a5db7bd89a7323778ae7e87e01215e WHIRLPOOL 4007e6641de55145b9bf8bf7aa567c284d3a4b29ea6b83fb5ba3324abf757cf72cf1f1bc0cd3011e58b3d0c6cc6fa7f7c03b1affb7f0ba7c4a5e7ade398bf2f3
-DIST mesa-17.3.0-rc3.tar.xz 10664384 BLAKE2B 16644892293a197bd69126876f047411989ebecd4336a8b3883f416429ab51aa54e843cf5ca428fa73a8a6695b79458311e6070e390ce4ffae6f352caa4c7d5b SHA512 403da79ac87325f2f0962e9be406edf4d009b6f5d479c2943be5bc1a26ad201d96072461a0d041b5a59abe327829eeba0dfb44abce217074079c47811729b058
-DIST mesa-17.3.0-rc4.tar.xz 10662396 BLAKE2B 6b2455a7aeef476d30ddb77a1a01fa6125dfb1b703a5fbd89e7ac9b8a5681101b7b97f9c15d5f1b1c7c8418e72ad3efc0eaf307594d8d88934b1d981ec727445 SHA512 410a43852944899fbc9d7ab887510dffda3cb98330d7acd5d529cb01abafe1886b353d050c918cd63ecb1b7afb9350e5ceddf8eabf6e8fd6bd4e6f87343f68cb
 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 13430 BLAKE2B b2b44aff78c4fbf62628dd36df03b9a812e9fde09e00777398c56f57c68a966ef1eae89bb0059c192311435346f6193d5535f6c3ead9103079f7604e23d13ea8 SHA512 5c60f50fea2ba5c4aea96dd8d3a2eeb47b1bae500ba609006978c7d71841a2eb32abeb1c363e4d84ba3d6f8ebb044870830a984ae18a39db5181457e73d4a178
-EBUILD mesa-17.1.9.ebuild 13436 BLAKE2B 33d0bdb9de92460a682ca5089df1842a0c6ea485724cf684e778993cc0cc47e751fa042f68fb4b47c0aa6d0d952e163cc04806d130c4cd20e65014a82eef66a2 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170
-EBUILD mesa-17.2.0.ebuild 13466 BLAKE2B 5cde443405c80f03f0146db16e275500b4a86e9862072b0132dfcf9c15c0f59f383e26ca5370c525958809608034cc4f886b7f00fcd37363b43cbb277d1e8d50 SHA512 27302424779fdd5a173f9ba07a0aa75c3efff98314741f9510cce3b6a157baa597d624ce35912abc1faac1b22d14d8cced08300c586be309193d4e22a69ff6b5
-EBUILD mesa-17.2.1.ebuild 14923 BLAKE2B e96fda08149386a46df21b90225c0d2a395d0a536f6bf60e87021e4bfe07c827ca58032ec8b62c0ce78a40cfe33e1ee91316a6d245aa16834a34f761061eb337 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e
-EBUILD mesa-17.2.2.ebuild 14923 BLAKE2B e96fda08149386a46df21b90225c0d2a395d0a536f6bf60e87021e4bfe07c827ca58032ec8b62c0ce78a40cfe33e1ee91316a6d245aa16834a34f761061eb337 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e
-EBUILD mesa-17.2.3.ebuild 15003 BLAKE2B 5038fbd6f7ab4aa3a94b28949036a6dc6d7f927cff0c0b13611b42aab7e0e7ba6765377a24cfde04b3466e3531f824e79e68f0ab87fb2ba9fe95eb7b8e5f89a5 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe
-EBUILD mesa-17.2.4.ebuild 15003 BLAKE2B 5038fbd6f7ab4aa3a94b28949036a6dc6d7f927cff0c0b13611b42aab7e0e7ba6765377a24cfde04b3466e3531f824e79e68f0ab87fb2ba9fe95eb7b8e5f89a5 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe
-EBUILD mesa-17.2.5.ebuild 15003 BLAKE2B 5038fbd6f7ab4aa3a94b28949036a6dc6d7f927cff0c0b13611b42aab7e0e7ba6765377a24cfde04b3466e3531f824e79e68f0ab87fb2ba9fe95eb7b8e5f89a5 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe
 EBUILD mesa-17.2.6.ebuild 15003 BLAKE2B 5038fbd6f7ab4aa3a94b28949036a6dc6d7f927cff0c0b13611b42aab7e0e7ba6765377a24cfde04b3466e3531f824e79e68f0ab87fb2ba9fe95eb7b8e5f89a5 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe
-EBUILD mesa-17.3.0_rc2.ebuild 15160 BLAKE2B f1e5b7cd02f800427d2e4bd5841295ff4b73158bff2895e1da5ee2410fb1f8260ff01551a89c0b4e434da5d3486085fbcdcb4c18cb259ee852cbe93d54b0c89e SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40
-EBUILD mesa-17.3.0_rc3.ebuild 15160 BLAKE2B f1e5b7cd02f800427d2e4bd5841295ff4b73158bff2895e1da5ee2410fb1f8260ff01551a89c0b4e434da5d3486085fbcdcb4c18cb259ee852cbe93d54b0c89e SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40
-EBUILD mesa-17.3.0_rc4.ebuild 15160 BLAKE2B f1e5b7cd02f800427d2e4bd5841295ff4b73158bff2895e1da5ee2410fb1f8260ff01551a89c0b4e434da5d3486085fbcdcb4c18cb259ee852cbe93d54b0c89e SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40
-EBUILD mesa-17.3.0_rc5.ebuild 15160 BLAKE2B f1e5b7cd02f800427d2e4bd5841295ff4b73158bff2895e1da5ee2410fb1f8260ff01551a89c0b4e434da5d3486085fbcdcb4c18cb259ee852cbe93d54b0c89e SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40
-EBUILD mesa-9999.ebuild 15160 BLAKE2B 5e6d0d1b6005f9a99ca24f69ce542658f35a0382954a51b0283f6dbe8eef44485034b12e09997f01a94a02adbe3374ce186977cfd86e865c67c90ad31ae24637 SHA512 00c5035ccf1132f48cb50b9d13c8a07ea004888a7fb610dbcac142d0a711ad9b3b547d5b090d3d88b8fffa8aecc56cfc7f68d4208abde574d1aaf503d55cbf7c
+EBUILD mesa-17.3.0_rc5.ebuild 14889 BLAKE2B d33d36a58695fab37981da32f0c1f0b4d5e218576972cb92c5ba603a0ec62efe0dbaa5f5f8e8010f2027dc9e0fac5536249a26317aff4103af91539dfac56e82 SHA512 2a1f092ca26281352d6394656301142b7e8790196fb840c8a7572207709d3a2a82f07839b5c536be426b5b383abaf91b23de050fd6ce931e83429e07bfa8c6b3
+EBUILD mesa-9999.ebuild 14910 BLAKE2B ff2479202876410dcf8404adff9a68732c65f72346395e912a0c90efb61ce7bb33f91e48e8b373902678f8627a2424f64d1152397b20e08f665f68688fbf7996 SHA512 1103851cbfef5e489213c0513f562759f3232d193cd72319bca65f5ea84e2cf04c9b9cd56288b07607648c0939e6cb9a5c5a7b2bece108309fe318bdac774da1
 MISC metadata.xml 2536 BLAKE2B a30728ec6658664e099b04732e8058058822df20c381918057d4daadbc548806ef5d117b8e5dc8e3f2005c9abbaaa121e8364daff7ceb66b0c5295f45a0471af SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666
diff --git a/media-libs/mesa/mesa-17.1.9.ebuild b/media-libs/mesa/mesa-17.1.9.ebuild
deleted file mode 100644
index e331fde780d2..000000000000
--- a/media-libs/mesa/mesa-17.1.9.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/mesa-17.2.0.ebuild b/media-libs/mesa/mesa-17.2.0.ebuild
deleted file mode 100644
index f54779f95727..000000000000
--- a/media-libs/mesa/mesa-17.2.0.ebuild
+++ /dev/null
@@ -1,504 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel 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.82"
-# 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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-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-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/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.2.1.ebuild
deleted file mode 100644
index 5183b0939382..000000000000
--- a/media-libs/mesa/mesa-17.2.1.ebuild
+++ /dev/null
@@ -1,579 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel 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.82"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="5"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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/mesa-17.2.2.ebuild b/media-libs/mesa/mesa-17.2.2.ebuild
deleted file mode 100644
index 5183b0939382..000000000000
--- a/media-libs/mesa/mesa-17.2.2.ebuild
+++ /dev/null
@@ -1,579 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel 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.82"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="5"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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/mesa-17.2.3.ebuild b/media-libs/mesa/mesa-17.2.3.ebuild
deleted file mode 100644
index 12be4d77969f..000000000000
--- a/media-libs/mesa/mesa-17.2.3.ebuild
+++ /dev/null
@@ -1,582 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="5"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.2.4.ebuild b/media-libs/mesa/mesa-17.2.4.ebuild
deleted file mode 100644
index 12be4d77969f..000000000000
--- a/media-libs/mesa/mesa-17.2.4.ebuild
+++ /dev/null
@@ -1,582 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="5"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.2.5.ebuild b/media-libs/mesa/mesa-17.2.5.ebuild
deleted file mode 100644
index 12be4d77969f..000000000000
--- a/media-libs/mesa/mesa-17.2.5.ebuild
+++ /dev/null
@@ -1,582 +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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="5"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.3.0_rc2.ebuild b/media-libs/mesa/mesa-17.3.0_rc2.ebuild
deleted file mode 100644
index 03a35c8a2c1c..000000000000
--- a/media-libs/mesa/mesa-17.3.0_rc2.ebuild
+++ /dev/null
@@ -1,585 +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/ https://mesa.freedesktop.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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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}]
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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-bellagio)
-			$(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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.3.0_rc3.ebuild b/media-libs/mesa/mesa-17.3.0_rc3.ebuild
deleted file mode 100644
index 03a35c8a2c1c..000000000000
--- a/media-libs/mesa/mesa-17.3.0_rc3.ebuild
+++ /dev/null
@@ -1,585 +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/ https://mesa.freedesktop.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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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}]
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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-bellagio)
-			$(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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.3.0_rc4.ebuild b/media-libs/mesa/mesa-17.3.0_rc4.ebuild
deleted file mode 100644
index 03a35c8a2c1c..000000000000
--- a/media-libs/mesa/mesa-17.3.0_rc4.ebuild
+++ /dev/null
@@ -1,585 +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/ https://mesa.freedesktop.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 )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl 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_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85"
-# 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}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf: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}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	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}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=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}]
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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-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-bellagio)
-			$(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
-
-		gallium_enable video_cards_virgl virgl
-	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/mesa-17.3.0_rc5.ebuild b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
index 03a35c8a2c1c..34d01959bac4 100644
--- a/media-libs/mesa/mesa-17.3.0_rc5.ebuild
+++ b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
@@ -146,9 +146,9 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 7.
 # 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
 LLVM_DEPSTR="
 	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
 		sys-devel/llvm:5[${MULTILIB_USEDEP}]
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
@@ -514,13 +514,8 @@ pkg_postinst() {
 	# 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."
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
 	fi
 }
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7a951da5d58f..282412f4fc38 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -514,13 +514,8 @@ pkg_postinst() {
 	# 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."
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
 	fi
 }
 
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index a0d67894af58..9265572a680c 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -2,4 +2,4 @@ AUX openctm-fix-makefiles.patch 6672 BLAKE2B 5cc7ad6b882bd4bb3cb05d112dd953807c0
 AUX openctm-no-strip.patch 1654 BLAKE2B e284556eb0d7866e527002bdbf291701654dd99a8353592c1dd5f93f6f74bbe4797da4bbc7960d4d7b875734fa4edbff68032c6835cbb26c0bb6f9cf0a471df3 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0
 DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 SHA256 b72bae806d65dcb4d55b88f17bb636c9908717871cbebff6c32024399f50a074 SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6 WHIRLPOOL 954ce30a418fba80649cd2f0eae604391c42a64e627a9d66171097da6fee55fba94229054350dc18cd311cc7d7fb0e1b5a6f9d7db0dce5d91451821df33da5f7
 EBUILD openctm-1.0.3.ebuild 911 BLAKE2B 2a002d68f7b87c93a42fdcfe59994736a66ed6a77f4f464795e11a8a6991f49d37a024fa7f667d461b0c178135d94d207dce6f53dd51b76c67428fc1f76f7ab6 SHA512 b8f66ebfa20633d197665ce44469e218121872694702f47ae7f6a1ca01b7dddda7b3f1efd79ba3b02cd2153069e0c5e1f75cd6dea9a0f23646cd2de0a21cd68a
-MISC metadata.xml 610 BLAKE2B b049155339369eaada1f0537877abff31c5231f4ff662a346692afe0d5d45aa0a9814a2640731a9427b3fc49afe9c20d905602007f7dbcdacf21e86a924b3c9a SHA512 bcc0db1bb45aa6377efa3bdedfe517782c9bb366c8ea107a1ef54bb1a436d5d299ff79dfcb3d659f1e380bdc35eeb798900927198086f52d9b6f20b28860a32c
+MISC metadata.xml 595 BLAKE2B 143f65cc923e4de9305139118c3ca3166c2efcb5b50c9420c0045566384bae0163fc600d2a1d6206afc0abb440e24e7edfc9d5bc6a5e6b080242357440edd3b8 SHA512 04911c1a3a676469a111a02a2a04c3a988e9f9a738f1b3933b5c4c7917f7e65d558d1fd714122127f791bb5998390e2f85794f673f257ed96a37b4d017662c5b
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 42ee0dd6eb0e..2dcfe570b108 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>amynka@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>3dprint@gentoo.org</email>
-    <name>Gentoo 3D print</name>
-  </maintainer>
-  <longdescription>
-	OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">openctm</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D print</name>
+	</maintainer>
+	<longdescription>
+		OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">openctm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b2ce4683a0bd..e814a922dfc5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,18 +17,16 @@ AUX opencv-3.2.0-fix_ussage_cpu_instructions.patch 1931 BLAKE2B 7a4764d8b0a6d5f5
 AUX opencv-3.2.0-gcc-6.0.patch 407 BLAKE2B 41f4f6416f1cf8418a397dd37ba489780ba9488365837a0cc3df945b0392b00ddf3295208d79a413d27ee76a846ffcea1e5f11bb1a46d46c05d2cffd78bd5ee9 SHA512 2615d79b237df196425628838bbfeead2a9410e3c05d83f134e2f5a1ed6d1225236ad7e2e5797e96d4a0d28743e2ac5a441e385461c3b872c726a6a37bedb4b1
 AUX opencv-3.2.0-vtk.patch 857 BLAKE2B 4fcf3ed98bbf1a566d1af1f16e7dd8eef7734ee9dcb33323ae6c1849313df6c7ad404f93bee7d53906ded46d35ac8d90e25297fc9a4abb361f8e9da52b41c09d SHA512 c4c1f232b1814e7bcd93980a886b9c40b84c3ed41864e102f3a13c2272ab45bda8e488f21f5b1e25137a70533c0c24c83a3cb6355285bab5234ee083ff412d5b
 AUX opencv-3.3.0-contrib-xfeatures2d.patch 1038 BLAKE2B 19b304148474a5baab14c23148ef28e7eccfccf524ef5649d6a03452d02647413b681e095d21dc4c010c3aac12f93e67aacf36a78705fecac47b0d9bf081dcbf SHA512 fbcd3fd68203d9bf865528c97aa69d69e41645d3549e6202d369047840d024aec1cf229f0dfb10e71d78b9433014611bf53673d6f36d60c02a643454955a9e8c
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 WHIRLPOOL fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d
+DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-2.4.13.zip 94319943 SHA256 fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b WHIRLPOOL 86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 DIST opencv-3.1.0.tar.gz 76135587 SHA256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f WHIRLPOOL b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a WHIRLPOOL 18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
 DIST opencv-3.2.0.tar.gz 78861546 SHA256 b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d WHIRLPOOL 092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
 DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a WHIRLPOOL eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
-DIST opencv-3.3.0.tar.gz 81238534 SHA256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb WHIRLPOOL 211496e559fa3a78b662329a5e21613fdc39b616155584311f82f3d7c733676bcb58d8e04ffda2d73658933240e16122212413fa1c2e6dfe764439c9460d7c41
-DIST opencv-3.3.0_contrib.tar.gz 54848519 SHA256 e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444 SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e WHIRLPOOL b186f673e276c4b8c4c5253fd17181f0e1b7bd4a0e0c74f15ab55ea5f2ee54a72fc295247c7bfcbfbedba1fc01b4c5e2a53a2a4eff79ab0480977a6eefc90c58
+DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
+DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 WHIRLPOOL 5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12
-EBUILD opencv-2.4.13-r3.ebuild 6008 BLAKE2B 41c8caeef80b0cc51776e11ecdc626683dac2e5945998c780dd6fa4029b2be19b18fd85747b96fb7a31a045775b3cb6849ebe4fd8bd39de761c18d0db5f72b90 SHA512 77b486f811a6af156448b8e0f65c5c01192b2454bf2f41009552b8772f6534b114bc5d29f8e8a39368c859a5efcbdbe35111b648c32712079e4ae9834c895607
-EBUILD opencv-2.4.13.ebuild 6146 BLAKE2B c982c9eeda731ff1263a0edef40e9fd81b4016dd73a0f6020fd0cb411297714c0bf3d83194dff56e02a45e67e0f5f2db900876a4fbec2af8c48b1adbc7880068 SHA512 0385fcc881ac6b98e845c0aaf53187e145ce4236f57fa20938599b9fe788ccb6eb3dfb6d436c537f2281408dda6e17325b03f1203f2ea4bd3cf8331490c2a16b
+EBUILD opencv-2.4.13-r3.ebuild 6007 BLAKE2B 1b78cbb84733a057876a8e0a942c753786ac0b836b4e1116b9225b46cb36c37deca4c53d5df78784b99ce628e15010bf60ee750691c657d935ffa75733f54cdf SHA512 eb633e9f6e19de369a8bfcc75ca644a47cb2ca2fb2ccc8a91703e1c964d952dbdbcbae635163014839d62a647b0fa9a6c6ad8ae20c9d72fa87b270de55a57a44
 EBUILD opencv-3.1.0-r8.ebuild 10666 BLAKE2B cb0777a26f6258df80001bedb0705bd1804d1bc3a01592eba66c9d52d0d93b1538697e41ceeef7ca90ef57c7d7e6a834450cfb463bdb5b0a4614dae1f662a0aa SHA512 a8c40927311623d1b40f96c4a49bf7f135c74e7956246ea0b8f817a49faeaf694216afae498786fb4d46bfefa9222bab25fc01e4f544f521fc4d19b1db14c3ff
 EBUILD opencv-3.2.0-r2.ebuild 10387 BLAKE2B d9b6b704e465ee03862a2b264af592025197b7b7a79b8ce61ca0e2535bd4b7d0930d53d5e4acefb44774a1135488c394424066ce3320560bc8f694358272628f SHA512 e065790498734f16ce6f5fa4446e44e776b7097467f4ce8dc9da39d65038f4c8a646ef0e286daa4c1a5070c41595cbfe7731cc6965206b7650969306385db8af
 EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0bfa948ce4b06ee9f80c91f2acceeefccc6fa4a03cbf05f609d1d51ebe58f9b192df071a016d157f921b738d00ef13 SHA512 b4dc53882ea13aeb90454dd54818d5d7ea3f0d00425c2f3eaea9ee493f84dd0956115bf2289e58b36b5de35dff455a86e24df0a804faf0f53db490030e99affb
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 34a5fe5bd589..9ff99bb067e2 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
deleted file mode 100644
index b267fe7783b7..000000000000
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( qt4 qt5 )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt4 )
-#	opengl? ( || ( gtk qt4 ) )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		opengl? ( x11-libs/gtkglext )
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff:0 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	vtk? ( sci-libs/vtk[rendering] )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java? ( >=virtual/jdk-1.6 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
-	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
-	 "${FILESDIR}/${PN}-3.0.0-gles.patch"
-	)
-
-#"${FILESDIR}/${P}-git-autodetect.patch
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		-DWITH_1394=$(usex ieee1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_VTK=$(usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_IMAGEIO=OFF
-		-DWITH_IPP=$(usex ipp)
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENNI=OFF
-		-DWITH_PNG=$(usex png)
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_WIN32UI=OFF
-		-DWITH_QUICKTIME=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF
-		-DWITH_XINE=$(usex xine)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(usex java)
-
-		# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_DOCS=OFF #too much dark magic in cmakelists
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(usex testprograms)
-
-		# install examples
-		-DINSTALL_C_EXAMPLES=$(usex examples)
-		-DINSTALL_TESTS=$(usex testprograms)
-
-		# build options
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_OMIT_FRAME_POINTER=OFF
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use qt4; then
-		mycmakeargs+=( -DWITH_QT=4 )
-	elif use qt5; then
-		mycmakeargs+=( -DWITH_QT=5 )
-	else
-		mycmakeargs+=( -DWITH_QT=OFF )
-	fi
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.8" ]]; then
-			# bug 577410
-			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
-			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( -DWITH_CUDA=OFF )
-			mycmakeargs+=( -DWITH_CUBLAS=OFF )
-			mycmakeargs+=( -DWITH_CUFFT=OFF )
-
-		else
-			mycmakeargs+=( -DWITH_CUDA=ON )
-			mycmakeargs+=( -DWITH_CUBLAS=ON )
-			mycmakeargs+=( -DWITH_CUFFT=ON )
-			mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
-		fi
-	else
-		mycmakeargs+=( -DWITH_CUDA=OFF )
-		mycmakeargs+=( -DWITH_CUBLAS=OFF )
-		mycmakeargs+=( -DWITH_CUFFT=OFF )
-	fi
-
-	if use examples && use python; then
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
-	else
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		-DOPENCV_BUILD_3RDPARTY_LIBS=OFF
-		-DBUILD_PACKAGE=OFF
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openglide/Manifest b/media-libs/openglide/Manifest
index 6321af16aefa..4f6598a0e615 100644
--- a/media-libs/openglide/Manifest
+++ b/media-libs/openglide/Manifest
@@ -1,4 +1,4 @@
 AUX OpenGLid.ini 605 BLAKE2B 5f51d0a6d15e253bffb0919ec078b2081005fc1f86f8058ec969820e32f3bea621b5dc941cec23a24595c01dd87f8f37db582b5307ada6a52a34d28f7c123f22 SHA512 dbd4ab26d5a556fcd9656f151c156dd29eaa1b815d1a5eaf841cc23f2c8aee5f385f085febfeabe900014b63c5cc2234aafc9388e1940fa72cb7a4aaab2cf14c
 DIST openglide-0.09_rc9_p20160913.tar.gz 450667 SHA256 136528469596e43595fd3e9a44e9b25b97e12617a3cee8469c8020b470a66cbd SHA512 4a64b74c2a96639d9fac732f72419ced652989b347b484f4abf7ac6a33d7b8d89ee56e6c04aaaf7475cae332b69a98ec0b7c58a9aac25a24d8acaad92392cb38 WHIRLPOOL 76e816031a01c700704bda1b7c6413ed8481412ca78f4b25852ca8a2bea3fb494ae14468b52de4ab499d8b2bf2e5c5ba85bdd3c30bdb956b22d95e5b2066e28e
 EBUILD openglide-0.09_rc9_p20160913.ebuild 1296 BLAKE2B 5f1aa78a76271e981f6bf68af287c40368e42ea36fa1a11a20dcb1c8a966e5cab372bc435691abbf3b929b2276257672e7148569c2f706f1960c25841975621b SHA512 58e0b5e7242456ababf772526a942595c768d9118cc396574e56e5c7154e5a3c9eb586d9ff7f513025112998e61e1e9d9a164526f541ac072a686acc2ee81761
-MISC metadata.xml 696 BLAKE2B fe893dfba3324a523c052ba8949720efe66297ef49ba683949d17b804bb973eb2e4b8c26fe9ca64099478754833051c618e5f238c7c17f8653f03cca4346eb45 SHA512 3f64cc43fdd2abc4217054017d7aaa6ed9f8cddfb2577cb289ea31ac9be682c7493651a4f20bd4bdb8548a7ba05560a15b8c885f0c486c84a1dcd1b3ed7a28e9
+MISC metadata.xml 693 BLAKE2B 92dde15413f18f0bc359c3ef821e8a62fd70bc621c4de1a3d5c85bfb88410c80d99111dea375509617d8d81eedad447b7422dba9b22fb206e12ec77a01fb13c3 SHA512 9d5f988dac6a2a3c0556718c3ce5e883931b68175d9c6bb6e3a9c5b5bcec10f144d8df9a6fc95a447ba6e6d5a5860d3c8456480273c3cab4a6914129e4ac102d
diff --git a/media-libs/openglide/metadata.xml b/media-libs/openglide/metadata.xml
index b14a9fd7bc1b..7ead02eb8d86 100644
--- a/media-libs/openglide/metadata.xml
+++ b/media-libs/openglide/metadata.xml
@@ -14,8 +14,8 @@
 		<remote-id type="sourceforge">openglide</remote-id>
 	</upstream>
 	<longdescription>
-	  OpenGLide is a Glide to OpenGL wrapper. It emulates a Voodoo
-	  board so you can run old DOS/Windows Glide games by translating
-	  Glide calls into OpenGL.
+		OpenGLide is a Glide to OpenGL wrapper. It emulates a Voodoo
+		board so you can run old DOS/Windows Glide games by translating
+		Glide calls into OpenGL.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 3eb5e9959285..4d8e7adf7563 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -10,4 +10,4 @@ DIST openh264-1.7.0.tar.gz 38681895 SHA256 9c07c38d7de00046c9c52b12c76a2af7648b7
 EBUILD openh264-1.4.0-r1.ebuild 2619 BLAKE2B b671ea8d2c6078ca7bd6054667fbd8c7f026c4408a0b8f5788fe256d84baaf6c9f209201c71f9aa76da27ebda00d307f9080573d6cb3538f64ad3c51aa3084e1 SHA512 1cdd4d436f1f83b8c42dfc0c313b41a765b2d3a77afaf0e9f6c5123f25364deb3e6f0eb1cf6b2c3140e14770cf40cbf55e1e5c4db730d9309d65333de0d2e682
 EBUILD openh264-1.5.0.ebuild 2689 BLAKE2B 39f4ead0d19f2502e02492eec5486091e8991465d0310ea814e75ccd55712e5fb3a88786b86fa75380202e248b29b91b0f948524282be35ad823e6589aeeae0b SHA512 14c727969ea3471a6038e65c323d62f2cda602e32da8d99196e7e333c4f5ffa328c7e287e1e98eb1255a855387ffd983f97ce138bcb0c0be60f6af749387a109
 EBUILD openh264-1.7.0.ebuild 2703 BLAKE2B 309c7dac407b9bb49a67153f4e4a7fd028f3dd4e4127fdb2d7b168d223a6ce3a07a04730c8fbec3820d20055311f3872751d24f7a38148a2379c8a09bd7ddb96 SHA512 67205997297e88013b810cf67f1bf0bcf9001c99671888be1c19559c5ac3faabdb4b5abaf25588efd745c6860808cdfacce2b371e4136c1c85bc1abd3fa542ac
-MISC metadata.xml 606 BLAKE2B 39e1a07860594aebaf8ad63cfd73dcb1f29cf4057a0fe00b672cece6a86be461003d66cf68d7b889a9a54c02ff67c7c204adefff991f98184a9786cc5ccd63af SHA512 f8def41480415ccfb8542eab5923d6ae56cc435ce599064c4104bf0a8da8b5efc1f6bc77dfff7db6b0bced7a81013e3b59f4cb1198c30a0d535b19be5c48ec10
+MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 13867b06c491..4971276ef942 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+	<maintainer type="person">
 		<email>axs@gentoo.org</email>
 		<name>Ian Stakenvicius</name>
 	</maintainer>
-    <maintainer type="project">
-      <email>media-video@gentoo.org</email>
-    </maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="plugin">Install the Gecko Media Plugin (GMP) for use with Mozilla packages</flag>
 		<flag name="utils">Install the CLI encoder and decoder utilities</flag>
diff --git a/media-libs/openicc/Manifest b/media-libs/openicc/Manifest
index bf10daa8e201..2415b333e9f8 100644
--- a/media-libs/openicc/Manifest
+++ b/media-libs/openicc/Manifest
@@ -1,4 +1,4 @@
 AUX openicc-0.1.0-buildsystem.patch 8257 BLAKE2B c979455e7136e47fa7d82f23f81e6b49373455fa03191f6eb2f2cb56d52bb403d4198df3739d29d6b74f841a0901ca4b1c4d7fd35354581f93176958ecc0ba6e SHA512 880b47966eb8350b245dd7f9124d715d2915b40d962bcf550c52defa832132e9d79c269bd31b58844cfe2b582d528d76bc7eca84a92acd75c5d2165117d4fefc
 DIST openicc-0.1.0.tar.gz 193974 SHA256 461e567bbb9913b0731914be5efe2992158e169b69783956513f35a0f931ec51 SHA512 81df4545694e920bea0b24535c1c8d06327f87dee465883c4e3209d7348ab2220f94b9e9785d9da68c5e023e9a59512d5e15b4ad8f82e256b63b7c28459fd029 WHIRLPOOL f2774afb9d51cb6d5ecbab816f2e01717c0f9eb69cc6de97604c51264cf6c3f3ac8d036b7da1591b7244fde3087a543ee6f137a1fba10940175d85f17cf05d11
 EBUILD openicc-0.1.0.ebuild 1059 BLAKE2B fa9d71c190ad52793a83f01efe55754e4c1dc30cec51d1df68dab97db841233bf4f58f6537b40fa622d1c6e2c89a37a2af77ecf342643c9c047983897cc5c31a SHA512 24a1e31b636d8a1da754ee3cb7c15c3d9842f5f3411aef862362ac3ce9339083ef4e71a237a745945c5ed8756f27e7d4e80bc0b0d9e4056ed2d9d1c400370538
-MISC metadata.xml 344 BLAKE2B 88122bb724bbd3b7fe19b5bb84b6a107df096502545dafa98dd886bab4f23a07cded595e9cb202043ddeea86ffb19c125c7647c967ce38225e20b8e8b82b4c22 SHA512 71a573f416421c69e88ee66408381a1e8ff7a0b51747385ba498784f69db0086b13b5d8dc5cddd6a3547b611abcbec419ad50085422d2c6c3df99f4c6e1c08aa
+MISC metadata.xml 332 BLAKE2B 37d73e61e45957551d87dc0737f0ce43f4087517129b65d3fd43af0f3d28f1ea831f63eb39b8ba0749dff1308123ab7b5de60916a34578a08c40f6815eb577be SHA512 1976c2a94f105bdcfec12732c170797877cde03acb4f102b167df60c0aa4587877e71c1e414f19bca608feb26521522fb65d31f2742c3d48985bc535c07226c5
diff --git a/media-libs/openicc/metadata.xml b/media-libs/openicc/metadata.xml
index 94db08dfa706..fb3005160158 100644
--- a/media-libs/openicc/metadata.xml
+++ b/media-libs/openicc/metadata.xml
@@ -5,7 +5,7 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-    <upstream>
-        <remote-id type="github">OpenICC/config</remote-id>
-    </upstream>
+	<upstream>
+		<remote-id type="github">OpenICC/config</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/qimageblitz/Manifest b/media-libs/qimageblitz/Manifest
index 6b1bb2145f0a..23c0cfeaff69 100644
--- a/media-libs/qimageblitz/Manifest
+++ b/media-libs/qimageblitz/Manifest
@@ -1,9 +1,4 @@
-AUX qimageblitz-0.0.6-cmake.patch 422 BLAKE2B 5a8c0ea0998ca3d343d46a0c1d4f6ebfc50441f0fd7d08f1fc44f70da3c72afb9eb7d9e3989263acdb092f012a09e770b460ff07a7384db1da7520b6519e8ddf SHA512 ca05b91e5c7b40b425cab5a4e2b33b11dc6d2cfde0c142d1985e700de8bc558e4bb4a8d81fb2d727e7700e314965f5451cc6983abeab9f4214473a5659933f49
-AUX qimageblitz-0.0.6-exec-stack.patch 319 BLAKE2B 3092faef9489bc35dba5d57342d746156382ddd8e447a31c1ea53b42e9c9ccc359151581392411ae459f3d8b0408a89c1189b20a352c5c10988bc58a9ed94b3b SHA512 51d61c9ae203216b932eaf80f4668b3d172d9f2133f76c8814d6d5de2c4660479d6d80efcd60f5dad2e2d526fb3f7fc39223399eacf400e4c3f7e197a79d43fb
-AUX qimageblitz-0.0.6-gcc.patch 670 BLAKE2B ad38646bdff9a7a3e2d84f0a6bbeff7f140d8ecafb5298a3c199659cf374ce69afed54c27c06474d17e03c99192e59d463f68f5d73a1fcaf3f00916f0a3f3119 SHA512 7158c4680c76e176c193e0b8c67066689d06939456636c5699772180af6508398d2a33bd56d43f20c94da16748f64311f06bddc6faa1e51cbfd13c22096dd89f
 AUX qimageblitz-0.0.6_p20131029-gcc.patch 693 BLAKE2B 73f99f9160db49fb9946c409c5e05b1559f391ad264b219b87a3efebc1edd3995ca8f8edd31d9d52bd3391ffc40c8d22964d6b76a152fe0364b472b5ddcec0ee SHA512 a189c0e44d09fb0b0fbd4c46e7fd4fb98a2af485174af2a8bbd176ccd4d4abd55f364236b6113b6ef32681d30131ff4c698b098f3c13fcac2544ef1a123f641e
-DIST qimageblitz-0.0.6.tar.bz2 57617 SHA256 9f102269dec50641440e23a449df215a0db9efef9a3969939d618c5e78a5010f SHA512 dbd506c01622824efdec69640eb95e737d7848fa15d33351084a6499ca2321d7bc08e080d1e443f8ab9015cd2967c10d9b5aa2f3c6eaa7558153821c46133af9 WHIRLPOOL e13f5c11e2094296af558de4e9054d3c5a162be5e40a0418c5a505e222fe749c8dac319defc25bc2a2b6a5238e5d1fefb966fd64198d43b6b8af99d608362b45
 DIST qimageblitz-0.0.6_p20131029.tar.xz 43428 SHA256 256e7b4d7cfb6f061c6957ebdc6066e3a7fbf1d62b9ced35dc9c5467e5551622 SHA512 2a32105aed52ea33fbd46702a2b7cdd9671efef9bb52209ede534abc95ac40dd9ae2bd22cf09b30a309337653c4a754c50ef3fe4ad0aad7d4ffd0b5994a85981 WHIRLPOOL fd1593c7f77a334be4189bc6c3bdf365dd54363023318f3e25b0dd1aa53231b8d915582352ca29da35dd8a0d30958d120dd67cd4aaf2c81af79eb0e8388776cd
-EBUILD qimageblitz-0.0.6-r2.ebuild 1126 BLAKE2B d22b3c0d587e323fa717e99eeb8b96705fca9154d7a9c54c321fc26d364b2b123a73519bef753abe777464545599aa59deaa2babcfde103261cd01134fdf2707 SHA512 20d0ff8efa5e3880956b56d3cf535fffb15e5a3584faf60d4e68c85cd159b288da323b325cc176e275e9e54e55c130684469a32875a6f0c50ef665dd47e88965
-EBUILD qimageblitz-0.0.6_p20131029.ebuild 1078 BLAKE2B 3a626505196b7ce3919063f5736aefaad6743e464c3186ddd09843cdaa370dd29813ac2c37d3b4931d370d5ab851b41945a39fe1329b76637bf5ac82e01170fd SHA512 99c3f2c70e4ff5ca60cfa33233b13d3fe8e935b115d14aa4d949cbed87b7cb79d60a2e502ee6846be81c7a200d0e2d69989f50b35b3067f5cdab5f1f91e1673c
+EBUILD qimageblitz-0.0.6_p20131029.ebuild 1004 BLAKE2B 28718632f4d1bb357536b84ec936ac3c1146ec979cf178a672a2441edd0690142e789fbe269c4ee6e7f21856511f58457a98899aec8422ba72eedf6ad5386912 SHA512 50da125c7ec8bb2a7ddd103dc985df29e07870888724a6f3d0839fd0a55b0c0ac99acc726975cc3a85a3ff19538e0d7746c34bb2bdf6c324a4c8cbfd334d8438
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
deleted file mode 100644
index adb183de8f75..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt	(revision 1209280)
-+++ b/CMakeLists.txt	(revision 1209281)
-@@ -1,5 +1,7 @@
- project(blitz)
- 
-+cmake_minimum_required(VERSION 2.6.4)
-+
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
- find_package(Qt4 REQUIRED)
- # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
deleted file mode 100644
index 170bd709aa11..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: blitz/asm_scale.S
-===================================================================
---- a/blitz/asm_scale.S	(revision 1204247)
-+++ b/blitz/asm_scale.S	(revision 1204248)
-@@ -1,3 +1,4 @@
-+.section .note.GNU-stack,"",%progbits
- 
- #if defined(__EMX__)
- /* Due to strange behaviour of as.exe we use this macros */
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
deleted file mode 100644
index b956d2dfd595..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/blitz/CMakeLists.txt
-+++ b/blitz/CMakeLists.txt
-@@ -31,12 +31,8 @@
- 
- if(HAVE_MMX)
-     if(NOT APPLE AND NOT WIN32)
-+	enable_language(ASM)
-         set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
--        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
--            COMMAND gcc -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
--            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
--        set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
--        set(HAVE_EXTERNAL_ASM TRUE)
-     endif(NOT APPLE AND NOT WIN32)
- endif(HAVE_MMX)
- configure_file (config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-processor.h )
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
deleted file mode 100644
index 6351794a4d11..000000000000
--- a/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Graphical effect and filter library by KDE"
-HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exec-stack.patch"
-	"${FILESDIR}/${P}-gcc.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 581824: use system find module for Qt4
-	rm -f cmake/modules/FindQt4.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_ALTIVEC=$(usex altivec)
-		-DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DHAVE_MMX=$(usex cpu_flags_x86_mmx)
-		-DHAVE_SSE=$(usex cpu_flags_x86_sse)
-		-DHAVE_SSE2=$(usex cpu_flags_x86_sse2)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
index 77f2455adfc0..90763d078ddc 100644
--- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -12,18 +12,12 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug qt5"
+IUSE="altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug"
 
 DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
 
@@ -31,7 +25,7 @@ PATCHES=( "${FILESDIR}/${P}-gcc.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT4_BUILD=$(usex !qt5)
+		-DQT4_BUILD=OFF
 		-DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
 		-DHAVE_MMX=$(usex cpu_flags_x86_mmx)
 		-DHAVE_SSE=$(usex cpu_flags_x86_sse)
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index c72d2e924667..1690834437f7 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
-DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789
+DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
 EBUILD qt-gstreamer-1.2.0-r2.ebuild 1638 BLAKE2B b1c3f99593630d8ae642cbf96a86b5492b0b925de81df1965716422c987133849251c9b59f24624c8d06c07404d451e1ae322ba6d878f02e2d0eb4b4429e4322 SHA512 cdf77a2bc0f2ce039e3ce8572617e2079f4afc3658500dd63f2e0ac7bf2f94f7120d423f5af2fae5f39d27b30566c9faa70412de6c525962857bb3a4705a1f46
-EBUILD qt-gstreamer-1.2.0-r3.ebuild 1130 BLAKE2B de6eea3694aa169f392cbe907a3056bb3daf5e85333e9ce423560253cc6f5018b7efe5683c68d425317f2d204aaa86b902a88b47b96f775632e10426f10c9b30 SHA512 6162a6197513ac8f7ef9176bf6d5452dc6a4dea1e7a856902a3e5e924b8242c6730eed347e7102e117494105879dda516048aaebb6cd822357203d47e9e8d76e
+EBUILD qt-gstreamer-1.2.0-r3.ebuild 1129 BLAKE2B 1e1b733f1dcf620eb9cac457911b1654a1f6511b9054324c62fea8c531037d838d367c26efae62aa4755638d4696d270a828ef2576440293b596bcc9390ce429 SHA512 1c1102377ffc58b6b95ee81b58019fba3f61a11099a3b1b1db939b082c8e9829c4b96bd794a3e128b23fe92b6e0c792196d627385427777011bb0d90b190f676
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild
index 327799a3a48a..1b62240399df 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
 	inherit git-r3
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 1f3c8723d496..37fb3c03d3d7 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -2,4 +2,4 @@ DIST SDL_gfx-2.0.25.tar.gz 1760656 SHA256 556eedc06b6cf29eb495b6d27f2dcc51bf909a
 DIST SDL_gfx-2.0.26.tar.gz 1771164 SHA256 7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01 WHIRLPOOL 774cb98be5ed3b144cb843b6b6afaab7ad30ba20edfb3523be9ef03247ce2dd9e6de47a2e9615b4977920597468cdb95fdf79a6016467582697e5500a775a64f
 EBUILD sdl-gfx-2.0.25.ebuild 1141 BLAKE2B ac05c4fb48d1b9c72e12d22f8eb9e1e59349a67b996d5d86eb24b76975d4bc26afa4ae2132f9a01036b0584c790d67abf8b0aaa5a5e7f15edf68150b262b02a4 SHA512 b9c6f177340f2eddcf8b91620c1992d2bf804c6c721dd17acedf325ce5651f8ff3d52f388ff93517ca65e2318ebad2d9e2b2c0734fcc7b264d667e2cb050f39b
 EBUILD sdl-gfx-2.0.26.ebuild 1242 BLAKE2B 24313e26c2bda44dcd8d2796ffd58eb58338adce493c8fb06e104a88d6e033ebce875bde0b9b980c3433837298f7ec6f42979fbe8c582724d6b44e2cf34a0f77 SHA512 83259454884a8e4b352ca6b0a6f45f67b275502607c2b79a5c3ba8d735960a41e9c5e932fd411baa41f734e7f4879b89569761357c3ccd2c8aa38ab840927944
-MISC metadata.xml 905 BLAKE2B ca96b529ad753f388207dc63eec7317ab21832951575a33d2201904a7eee8a7d457a623b2d36d9b419a3f7f1068628897d98050f38efc1d313381e2743928fc4 SHA512 a20b750921aaf45863c50160e7ffece1b8b22f81a1aee9cc99fc3f60c71e54938dac533e6231689748e8eec97476db11e848f20e87060066c0158c022780f0ce
+MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/metadata.xml b/media-libs/sdl-gfx/metadata.xml
index a9c8ec3bb72b..10e8f7e5f947 100644
--- a/media-libs/sdl-gfx/metadata.xml
+++ b/media-libs/sdl-gfx/metadata.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-SDL graphics drawing primitives and other support functions
-The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing 
-routines such as lines, circles or polygons and SDL_rotozoom which implemented a 
-interpolating rotozoomer for SDL surfaces.
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		SDL graphics drawing primitives and other support functions
+		The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing
+		routines such as lines, circles or polygons and SDL_rotozoom which implemented a
+		interpolating rotozoomer for SDL surfaces.
 
-The current components of the SDL_gfx library are:
+		The current components of the SDL_gfx library are:
 
-    * Graphic Primitives (SDL_gfxPrimitves.h)
-    * Rotozoomer (SDL_rotozoom.h)
-    * Framerate control (SDL_framerate.h)
-    * MMX image filters (SDL_imageFilter.h) 
+		* Graphic Primitives (SDL_gfxPrimitves.h)
+		* Rotozoomer (SDL_rotozoom.h)
+		* Framerate control (SDL_framerate.h)
+		* MMX image filters (SDL_imageFilter.h)
 
-The library is backwards compatible to the above mentioned code. Its is written in plain C 
-and can be used in C++ code.
-</longdescription>
+		The library is backwards compatible to the above mentioned code. Its is written in plain C
+		and can be used in C++ code.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 8da22ad450f9..5e12f976fe80 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 SHA256 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136 WHIRLPOOL cde2ea45f8a55cec720d05bba450c98ad177fad826938119482f4988c5af6eaaeb53079b749f886329bd59411790f1cafe04d01fff90b44095fc626358578c51
 EBUILD sdl-image-1.2.12-r1.ebuild 1686 BLAKE2B 52f3d2e572b39fab9d879da70dc031f790da231c3d4353018c7e23a03ad6891787b7ba0a238ec01b1935ad327046c2fbecddc0434df3fa8815021ccfe66fdbb1 SHA512 5aa636493dca6e0fcaf4cdba0744dfc1b763a18194c8b935c57a401c7847189ac352cc92787c7bcd0f3fd4e09139737206c65080abae3f82d2f1f12adad0dd67
-MISC metadata.xml 319 BLAKE2B 0d6eebd790a97deabdecd6460c463e14c7eaaf520c79d367ca763328bfe55a0f992bc93f6e9895824c6f7f2b3ff6f72eb66319cfb46e30871bb08b166c7f756f SHA512 bebf756deb276f3ed4152f0a046c7eac12e8a9239519e85c9822a3b00974cfc44844ca37b5e17b7f577a685617434f547e31218361f10ba61b95c94a3b8672e4
+MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index be29660cd215..a92c1a1c50db 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	 <email>games@gentoo.org</email>
-	 <name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	 <flag name="webp">support loading WEBP images</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="webp">support loading WEBP images</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index d4224954704b..5be8f64d7a13 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -2,4 +2,4 @@ DIST SDL2_image-2.0.1.tar.gz 7797848 SHA256 3a3eafbceea5125c04be585373bfd8b3a18f
 DIST SDL2_image-2.0.2.tar.gz 8680980 SHA256 72df075aef91fc4585098ea7e0b072d416ec7599aa10473719fbe51e9b8f6ce8 SHA512 468f1a5aaee0b6920adb80df21aaaa41bfc5c642b4a00ac60244a90c5e9f27b092b73bcdd2c5520aa1de2759e8b174686b186a51f2d07e7e188ce2cd10519724 WHIRLPOOL 7ff628bd65b70663c42537d31877f8929ca317a8ab71c64c72522a92b86906a7774dcdc60e57ca4f5e67204fe4bf134c64fd9006366ea32c0ab481b0f9e5b9d7
 EBUILD sdl2-image-2.0.1.ebuild 1513 BLAKE2B 22829c449c686770ea9f7dff2dd32d50db973dc202598008eb83acd9c4c72cd12e8490e8ea4ddba0c996ddac5c127de54007226165fcbfc8fe497e4b25c0b814 SHA512 f3da0090838a632b6a6999671e1c89b907f601d80f7c9e09c98480ed117d7f8c5e210c3febb492cb0df9e47c5b5beae01d0bcee60aaef3e53a31588f959d5266
 EBUILD sdl2-image-2.0.2.ebuild 1526 BLAKE2B ef48f1bb77814177af8a4274b0e7af969077b5b167c4368475635e868b831e748347c0c7b68f27126b15981eab39c9ed789ced0fa3df065be73f81c4af792de9 SHA512 23bce8ebe254a12f4b10b71c8b1429d7b7c58225f5b59d8dd69e90be51d73ee9c8406066909601e0a802d4be14c0792d5ab6254f59def37da6f1d524fccfa8ea
-MISC metadata.xml 326 BLAKE2B 1aa0e964058bae7f6cf9660b0009e1140eb3cd53d0567fbfc11911c4863f38208c7dd85986ee4aedfd79b297175c6010b2fe3eb2b19e4ce7ef440038b346e7bd SHA512 144746a2179b9af1bc4adc7f08e2d6c798a4b9b3d4391719c899447e96f14cbdac47facdedf9e1ba9d81f650d647ab793d83a227f0a0321cafdb96ee5ec51d34
+MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index 3d3ba86206dd..a92c1a1c50db 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		 <email>games@gentoo.org</email>
-		 <name>Gentoo Games Project</name>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		 <flag name="webp">support loading WEBP images</flag>
+		<flag name="webp">support loading WEBP images</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index c99a079cbdf5..23614f5edfab 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -4,4 +4,4 @@ DIST spandsp-0.0.6pre21.tgz 3278758 SHA256 bd152152bf0b204661ab9439c5a649098bcb8
 EBUILD spandsp-0.0.6.ebuild 2037 BLAKE2B 30b6a7dfb2ac8acca26935854b3920595ddb06ad40810b65d764273959ccacfac7dcdd028ca3094df9ad060032c90fde228052be447db52dbe461820ed553ca9 SHA512 21ae0905cffe4a40351114c0292aef1847d6ed8db354319ef8a905399f96ee3dc8b1fb267e710d41994fbb9f482d870575689de657e301f4dec7eef12235e0e7
 EBUILD spandsp-0.0.6_pre12-r1.ebuild 1290 BLAKE2B 3c42b8fbd0f49a5aeb0cc7614e01e90701ac08d90715000a72ecd41f55b35e588128e9c80bc4d37a5c9f73762a44a49bbf669a79bb2940f5c29491a337f54d3c SHA512 9ab74ba79a7c814a427415b4b03430d8cbecb1b2e7fc766c4e3facbb783ba2bf321f868fc7ba293afa52db7764c176d762c34c24b75eaad50722cb608d5f6b78
 EBUILD spandsp-0.0.6_pre21.ebuild 1420 BLAKE2B a1a19a208b74ec67b14c391553e4afc6241cb7d40f6c786508785ef0ae375671b49085672c21db314e7bd3a628cc6e87c90eced3715b7e0755ecd56a765915c3 SHA512 7b7a36520e5f0f76d066078df5d3fd277540c1f7670a4beed8f3166e35f0be7eb67dace9e303586197919ba70ca00805eef0137dc3448f8b046d6b60d18f5099
-MISC metadata.xml 290 BLAKE2B 9e9900bbbdb5a22fbc74df7a4591a9f7f270fa0c341be7cf7788c7dd2b2cb14d8645ca0cf50a4ee1f9489719f78e94fde651723fd8f8266a44438c9eb8733765 SHA512 f08879963e8fb56d360f85585ebcd98abf958cf0f68d3fcb7c3185ef84c39831f0b39927cf93470dd4c851016a7d19f482e2c4642de473af8ee8de06f1f316ba
+MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff
diff --git a/media-libs/spandsp/metadata.xml b/media-libs/spandsp/metadata.xml
index 3a50b0af1588..747778779369 100644
--- a/media-libs/spandsp/metadata.xml
+++ b/media-libs/spandsp/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
-  <use>
-	<flag name="fixed-point">Enable fixed point support</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="fixed-point">Enable fixed point support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 7cab90bb268a..242ed2d39571 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -17,4 +17,4 @@ DIST tiff-4.0.9.tar.gz 2305681 SHA256 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e
 EBUILD tiff-3.9.7-r1.ebuild 2084 BLAKE2B 729f896f2bbb1b502ada459db539b03bd628ea4f183a55e87295b9aadb4aae44d34748a4fe44a7e27829b73902431176bd544cdaba1c6ad96933a8cd6fc320bd SHA512 9204dbe59144189fc74619eb9cc87e3cc13bdefb00ff569ab1b7986e8f0112a94283febbceba27ad61cf265977c7cffd653844a86ff59b23446a0fff4740677e
 EBUILD tiff-4.0.8.ebuild 2631 BLAKE2B 7f60433b851f5e6f97da5251f94791019641fe891507e7785dc862aae0cb8166595d87ec12a07e8fbd6d626c646e06731d17056ff3913eddae5a0fae12119f99 SHA512 0f751cb980e6375726e3d1cf3747c2d36e48f2a6321972d82f54a7732fc92a8d671f673d5b78ed865c3a99f1192890178c6a8891863dce5cbed04b9309ee09b0
 EBUILD tiff-4.0.9.ebuild 2498 BLAKE2B 60706b627aa7833637e824c90532898447856abc57b5f30868d5d9f065875f416cd76da254b5d1d191e3232c35881f0b050da88b35072326e37e0dde782eeaf2 SHA512 731e3f99dc2f938513d243a4c1c86e92ff4abce397c719daf4f1b3e6e95350c8751dc7e4d1e06049b326f1b2d6a3790c5d51498ef516981a30d649f76a242972
-MISC metadata.xml 550 BLAKE2B ab9c27c88f1c41676a849557bb87561467e94768e0ec878a5706438cf067446a8c1f802462ceebd8e7dc10e8c785cc0360ec87fb80c70123c94378d3101b69c8 SHA512 f57f42dda3a4300ad235f36115f9b431f8328308ced2bb2522f0d0031630abecab970ba4648630fc138d31d6d7c624b9028fdbabc97f2b1f9529457b2ca7f63b
+MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 1844a8c19073..815534de05d9 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-<longdescription>TIFF image library and tools, mostly for scanner and fax
- support, but also used by GIS and other imaging tools.</longdescription>
-<upstream>
-	<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
-	<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>
+		TIFF image library and tools, mostly for scanner and fax
+		support, but also used by GIS and other imaging tools.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
+		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index cc9353640646..973f8164c535 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -4,4 +4,4 @@ DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 68617de347eae7d4700a8f66cd59ce31d6c
 DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9
 EBUILD vigra-1.11.0.ebuild 3505 BLAKE2B c1c7ecc6e7844b6cd29b25e1668ab69775242415487490b5fddc5a0139738ddf637498bef9810269b77f8de8903083dcf949230e7438742ea2cffebd18681fec SHA512 80fc790c2284f9576905bb58b387483c2954183af071132efd37facd3d53666c4de7ba9d832434866cbffb8700f286cf1c17aec9663cca0b067fe1a57ba1d286
 EBUILD vigra-1.9.0.ebuild 2647 BLAKE2B 44d9d93f5f0d735b08e0bba27e455d3e3eaf6266d8e65a1ee10843db9667b0c39789f40f0e3226101ab075dbe683004e87b00df9496c3ea0ff8e2622d8e77861 SHA512 a1f995bca67859d072e666d16d7ddad87609dd857afde8fc2de4c56636cfbdc751b63acadd3ab06d230374da57edb49e9cc9f4bb896f6264005e54570fc96c0c
-MISC metadata.xml 416 BLAKE2B b98a994f4e4bd1181ae1328085cbffd8e4a0d1a1e74ea7198be10eb86403dff67188683cea0b73174b4c2e134e9acedf616360f8ec488d231007b1d837d28e8f SHA512 7178da1a6cf6488dba856d385772c3a2d29c93a51b8d7a5132094361f4693b33c1a0b206de2b66f5e8285a221876a0cc401566eba877786a6e5a9c97e3850194
+MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index aad87b83017b..ab7510955b87 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,10 +5,10 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
+	<use>
+		<flag name="valgrind">Enable valgrind in make check</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">ukoethe/vigra</remote-id>
 	</upstream>
-	<use>
-	    <flag name="valgrind">Enable valgrind in make check</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index eeced60f08c8..fa5da9c528b4 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -3,4 +3,4 @@ DIST x264-snapshot-20170701-2245.tar.bz2 750527 SHA256 6ca4863cda3c7c24923ebd2c0
 EBUILD x264-0.0.20160712.ebuild 1994 BLAKE2B 0e0f780364a68a65171e182542e3d979b95283669a706a0cd9274b7cfd04e0740bd3ffaacb485e9784b891d8ca44155d3a9c8b561324d20a7ed7c76398581278 SHA512 0ed5c74f6b098af45fd2d6b64a6fec93e9c4c240ab967f62d7921d6f48e9ff471d9236807ceff1ff3eb542417eba0fb455a3bb122f9289069eca500bfbceed1c
 EBUILD x264-0.0.20170701.ebuild 2002 BLAKE2B 91f686de9596bddff836b734d346e87d77f897938d4189c3481e4ecb4426c0af35441cc315ba9cadaf8b34fb27a29faf9d32fc55bf7da6c924f41f774a1c5ec4 SHA512 41240380abaa9bc93c500449c1bc2284addf18a536e878caeb52fc67d1722f18f3a34087c0bd036b4a162342abde2d21e63c8d18ee5ca366dba7d485f8653556
 EBUILD x264-9999.ebuild 2002 BLAKE2B 91f686de9596bddff836b734d346e87d77f897938d4189c3481e4ecb4426c0af35441cc315ba9cadaf8b34fb27a29faf9d32fc55bf7da6c924f41f774a1c5ec4 SHA512 41240380abaa9bc93c500449c1bc2284addf18a536e878caeb52fc67d1722f18f3a34087c0bd036b4a162342abde2d21e63c8d18ee5ca366dba7d485f8653556
-MISC metadata.xml 600 BLAKE2B 8ee2a635b25c9daeb1de1f29b673a1c18dddd433deffb3f86702ed59a5aca789864860dd42eed7c16cb3c4667ccd56388f91e30f3746ef6acc071ab8a276b83f SHA512 eeb9f40cfa12a66b5e56b653c611941c1a74837fe41f00d36c26ed9d2e6a3c1748d49431642536bfa509fdbe1503b2e85c91c65a3a41e12b1f413f42406bce5a
+MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 2088ea59fe46..1ab4b5f74437 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
-    <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
-	<flag name="opencl">Add support for OpenCL.</flag>
-    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-  </use>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
+		<flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+		<flag name="opencl">Add support for OpenCL.</flag>
+		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index c7e91606c876..1e841e15b073 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -2,12 +2,14 @@ AUX arm.patch 1188 BLAKE2B 886fd2b177c0e1bc1dbdcb6f6b14219eac807a26dd76e67d57727
 AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6
 AUX ppc64.patch 619 BLAKE2B 17ea28b03ee80af9e73222df7d999138a51d6c8836574d005981426465e328cffdde034753fcc510ae305ee061e2aa278fc1a37c3bf2bc439f7c6f21bf991c99 SHA512 7b23e9bdb3cc634206ffd42fc381bb3b7915b7b788b30567e01592d83b3d8aee8ba794a20587a31e5ead02c837deae9c8f3d9e82b2b05409892dbe6ff37fe822
 DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
-DIST x265_2.3.tar.gz 1215719 SHA256 47520ac3424790168ea5c2db4a3cf12ca4d55a1790720007916652f07af3e41f SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809 WHIRLPOOL c7fa65f74b342ae32ae7b89aed86e6270607ec22479c95b62bd6b3e2cb958635d459e3770fe73e7599e572b01b171d101f5fb50c161139c867bea1ddda217c10
-DIST x265_2.4.tar.gz 1242300 SHA256 9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729 SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe WHIRLPOOL 63ab1989856912e8922db66862901511e5f7e4f2bd429319b3f419f8267a442374e8f8626065ccf96766c3075750525755d91df6976352b7b59f229aab94ac86
-DIST x265_2.5.tar.gz 1256678 SHA256 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93 WHIRLPOOL a5abfbbb533f22b2f243ff2053ab569d758d72b2cd0ec4ffb264688d9c4666b1354b7933d8e2a9197766cb33cda3e25c6771439ad34ad979ffbde361c2ecf0d5
+DIST x265_2.3.tar.gz 1215719 BLAKE2B 8ef1fcce485dbd906ab21e344d95e2d800eaee2f492a130f23487b54fe4c168043d33bbe77ed69d6ddc9873144144db0a12119eb80165da2936a6be169ce49e5 SHA512 c863e4bd95323baf5c1ee388c2d9e460749940b947a795e0bce7bffab620258fb7aafbbf2956225491f4532f715392df3d40f19301964e00c3ac2971cd7d8809
+DIST x265_2.4.tar.gz 1242300 BLAKE2B da0dca829a20cd1f807a78152a5e2f03859c05846876a73d18ea588cf66c2c35e0d2dd4e46a96b4eda54159d998403bc3c8fd07d57b781f8325c7d4ecd15119a SHA512 40d0e57104839454226cdba928806c12e533eade391a89e9587e1f9c11b8fd70cc54d20136a09a1127784fe7799c80425617280076b29e1a1ffff7ce44f07dbe
+DIST x265_2.5.tar.gz 1256678 BLAKE2B e949bd503f03330b4c0426dbae2cad4a1600d60d92c840d1c2b9538fb37c841cecf4a0da4ce9c80b905d56c68ea07375e240e74dee32bb862fe4a81f8a1a18c4 SHA512 f39b0b06a9f6ab9ab19fcdc1cba1578ace433e22dc8ec3f549ec3e5eeaaf40d17de6c7d419c12c16717ae795c45d953ef34a2fc9376d7e83eb7e9e74ab19ec93
+DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
 EBUILD x265-2.2.ebuild 5669 BLAKE2B 9c274fe6e33b496be82a2271965139be05ca29dd269cf68b7cb444407b43f57e5534ceb4850344890acd6d8ba2c4841e792c551f88f337baa7d77eb451c8d944 SHA512 da130e2f5236993a10368c79355003d3761e8dea48df66649cf5d6adfc31b52a7fb7c4558221f6d8b6d934b38627d75a6e4aaa4678d7b9b3382cc2eb4bb72aa5
 EBUILD x265-2.3.ebuild 5676 BLAKE2B aa971dc3ad015390c967efe695b9f9e87ae76f68c78f1909574d91d04c96654a72f34d665198bb59e250195dd8787b98a4fd4dec104c1d3983c4ae1ac893942e SHA512 f7c88430a632db2b3bfd32f9537171f62fa422e8e8464556434ad11c6f5fc5a32eb9b0a74b861258589abaadc4f7f284710451d1b7703c5c136fa07f9faf70b1
 EBUILD x265-2.4.ebuild 5728 BLAKE2B c6b7db96bc01568f448a609d7742b75c963e74cdfcf8801edf50ae007f42b6ef151f918fd6fb1af8d54b67444a34f222e96ba2fb1e8926854df8730e03dc6cd3 SHA512 975f18079c0d18483319848722996c73492d9e26c2352429512319237f339f2b03bb884a8ca8c98708090578e12310a136f8d0930bc60d33fd9e6d3b3c5a44cd
 EBUILD x265-2.5.ebuild 5728 BLAKE2B 80aaf333a46456b0e4bd2fa6ac5caecce7477fd2ca2f4a5926509c05e99a6eaeab34f153d26243d4aafc3284225f87fe560cfe4b87f9c0d7ef52260019d435cb SHA512 a3d6d7d11df7c4982018edbab7869a5499e776286bdd117c2fe340a385872c410f76e47ddd8f79808680fa414b91ad9d2afc09d61cb657b7c84c84db5fb65f44
-EBUILD x265-9999.ebuild 5728 BLAKE2B 80aaf333a46456b0e4bd2fa6ac5caecce7477fd2ca2f4a5926509c05e99a6eaeab34f153d26243d4aafc3284225f87fe560cfe4b87f9c0d7ef52260019d435cb SHA512 a3d6d7d11df7c4982018edbab7869a5499e776286bdd117c2fe340a385872c410f76e47ddd8f79808680fa414b91ad9d2afc09d61cb657b7c84c84db5fb65f44
+EBUILD x265-2.6.ebuild 5661 BLAKE2B 0d33c9ea9a27f9a1b08b61013e8c33c887b2d1ab791e553c5f57afb13be9a64327c0db63f952562107f86c7c6a3aa8614a7a1f6e23c12166689622b3a1a00bc3 SHA512 7d6ee28d84c9c4291e00262b7839b85a6f9e4f74be490d8f91e58059591012f116d302cfd6da04a36211903a602affc5f35f09b6ab7ba1e9ca6100f49dfb8afc
+EBUILD x265-9999.ebuild 5661 BLAKE2B 0d33c9ea9a27f9a1b08b61013e8c33c887b2d1ab791e553c5f57afb13be9a64327c0db63f952562107f86c7c6a3aa8614a7a1f6e23c12166689622b3a1a00bc3 SHA512 7d6ee28d84c9c4291e00262b7839b85a6f9e4f74be490d8f91e58059591012f116d302cfd6da04a36211903a602affc5f35f09b6ab7ba1e9ca6100f49dfb8afc
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
new file mode 100644
index 000000000000..f9064b970c64
--- /dev/null
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/146"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/ppc64.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DCPU_POWER8=$(usex power8 ON OFF)
+		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9b814039f1c4..f9064b970c64 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -9,9 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		https://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -20,7 +18,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/130"
+SLOT="0/146"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index b5c604d07192..0b91625abe7d 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,6 +1,8 @@
-DIST zimg-2.5.1.tar.gz 213083 SHA256 deb85887081cab7fa9c492b588900d60d6466e61ee8ea51a84ca280688d93de9 SHA512 c16402ee7aff40b811cd8c69c1e5d5f13775e628f3d5300e82548b6cc97d17e5317fa58d498a0cb4f7699d4eb2d1f424c3f4d9858f4cfbdda36612d6693961a0 WHIRLPOOL 7dac4a8f305e471b10db50bd6f189d9591e2ca46ec008c7bec1e4d6f6b47f409dfeed575e5bc7a00678430e5a673196ab814c5c45b1afeb43145b33f8dcc63dc
-DIST zimg-2.5.tar.gz 213054 SHA256 50b2bcc49e51cd36011a0c363ff914a81b6f161aefdffeaa2bc4a4627c13784d SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938 WHIRLPOOL 38ec8b7c26b8b358551a8158372f0cf1d27fbb4a0666ec8b56c3b7227f18bda4267f252596eba5a26347463ef8426982c9befe2ccf9bb1384a17d393ff35390a
+DIST zimg-2.5.1.tar.gz 213083 BLAKE2B d0ea74d409fa19b6e9ed946c70d2c41d0ee35e38955b8c14eba9c9f769405db97fc4884043ab378c2e4c36540fae524ce97173ecd2e30f6ecde12bc579327a88 SHA512 c16402ee7aff40b811cd8c69c1e5d5f13775e628f3d5300e82548b6cc97d17e5317fa58d498a0cb4f7699d4eb2d1f424c3f4d9858f4cfbdda36612d6693961a0
+DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
+DIST zimg-2.6.3.tar.gz 238372 BLAKE2B 4651381c61b978bedd78871117fbe0b1be7e40e3b0d32b399ab47cab06d596befb61078a6f979f2a2ea962ba66046f776e18a2bbf304dee4a2428b303a3094a7 SHA512 497d3b5b0c004fe720c9be2460f251196789ed055a0081b774c78f8c311dc097c2b5d975cb0a7d41e819ca21527e961186b665b5791032787c3b30647011e7da
 EBUILD zimg-2.5.1.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
 EBUILD zimg-2.5.ebuild 817 BLAKE2B 12e093b0d9ead096626bf58f1973b0201f006b5e0c8d1d78ecbe9692a901126ebb46272f0e171fba2a5901a1d75fa0ff0e89d2c0d1702b27336c20d476dc654c SHA512 b54326754eb6589303a9e6157579cf4c49d3aa2b3d48527f065b5ccf487dc2337ba158103537d7a039aa391e2e33abe89e5394690cb6d58bde4c8e13a30dd040
-EBUILD zimg-9999.ebuild 825 BLAKE2B 842d41748f5b8d7f02cc582ad37cf550e1c7f86effc5c456eef492708f7afd4675f4955d216ca335ccd2f87beea51c486a62316566aa4e0abbca78171eed49a8 SHA512 dcb39a0cb0aa9beeaafed93f81981073c5c938a21265599117075e8c0a251480933d3f9f2b0d9d595f2488e9c8b5aefe91b17bca4ef03a191763b8981996ee87
+EBUILD zimg-2.6.3.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
+EBUILD zimg-9999.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.6.3.ebuild b/media-libs/zimg/zimg-2.6.3.ebuild
new file mode 100644
index 000000000000..efc3a2b24237
--- /dev/null
+++ b/media-libs/zimg/zimg-2.6.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	autotools-multilib_src_configure \
+		$(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index d9ebe7355623..efc3a2b24237 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /media-libs
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)