gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /media-libs
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
70 files changed, 218 insertions, 1651 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1474c15bc0d9..f95508e547c6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aften/Manifest b/media-libs/aften/Manifest
index 955c49f57b19..184d0280df6a 100644
--- a/media-libs/aften/Manifest
+++ b/media-libs/aften/Manifest
@@ -2,6 +2,6 @@ AUX aften-0.0.8-multilib.patch 576 BLAKE2B c049de0a7f99ec04a7edfff591ab320c61ad7
 AUX aften-0.0.8-no-static-aften.patch 684 BLAKE2B c0df8086a8b73d155ec3175767cee9c32ba9f835b0307e880dc985602ee901b43a5bd9458a288380ef0d99981f62092d7eb9758ee52281a4250f3e5bb9d24a57 SHA512 cfd2b151a031b64cb3f09b0bfa514e220fade4372dbe37bccbb58a158053ec25715617ffbcd5fd3b5e0a348488f28d13711db5a18bd62fc67058dbee540a36a5
 AUX aften-0.0.8-ppc.patch 4066 BLAKE2B 27285a58026f95b2974f8ceb09dfeaf38d53c019c19e96ef8e8da42a7a368432a59bde54b3b72bf80202da7ce7c3f3faa279b5b5801bca7a1237c269cf7d05e3 SHA512 5022529320ae0cefbbd4124c37bdf3d2451c4733b41007f77cfcb5a26ae32ca159716ce4782b6e75767309a2057c839e467e966c8d9ad159d074c53ffdaf4ef5
 DIST aften-0.0.8.tar.bz2 80865 BLAKE2B 8746ba1f061255a6ec79a1253aede9aca8fa9bbdcb3bcc38636a99ec2f83f882cb713183483143ba0dc3852bff821d00a9029e0812b67e67540b303fb67b26b7 SHA512 1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
-EBUILD aften-0.0.8-r2.ebuild 753 BLAKE2B 1e2aa4495ddd28989845f35f74bc40d9ba715b009542b1469054fed9d53d64986dbc7740b7d70a73394480bfea77d11dd6250dd71add23b804fb2eecdef4dd8f SHA512 78c4c2c0cc1b467e5eee3c92016c7b6328ffbd5649b3bfe8ff0160e208242d0555161e0486d4d281eac5f2c1dca841043a0d49496751a2a9d0a4e247acea2225
+EBUILD aften-0.0.8-r2.ebuild 751 BLAKE2B 5c89d01269c80fb77ecbab3be72cd7e849c7a24244fb46fe4e31c575f732e837e6f413851f875ee04275dc9251b8ff48ed0dc78cbdde174b8a16c1d6011387b3 SHA512 80cfb35bd2ffd6d0622c247f654b82f9d55a6671bc8adf839d15e38224a8d907a01f4aaf9fd4355031a9401909ae6b82dd5c039896dea88bddc214fbea7d7169
 EBUILD aften-0.0.8.ebuild 739 BLAKE2B 1bd159a956fcd25e4515a3b27775bb83b05b42e1a123fe86df4c8ce72adbbadde85c07f2c5945eb3289a51037b71d66e41025fe1dd1146cfc907a48c671e96d5 SHA512 002b86d193810c8696a3fd17e6f883201503d26f49fe2daa89abaadbc20f76a4968560eee07997490cbda2887c8794569b729c3ec50f2c025e2bd989a589f7c7
 MISC metadata.xml 602 BLAKE2B 87b43f5a24944d2583cc0b10dbb51babab9de77027aa6f19460e7a217e5370c7f8343610df5ada3f21827f267c2a1b84bb720afcb1221112fd112ff944001467 SHA512 6b78ecfd5eefe1ce29c875db4d487ed23fda5faf9a1bc97b75d6de9afad30be6aceffabd3031bf35badbfb8cabdb4bfa24fb2c7a3905d7a68b9ef9bc0bf0d458
diff --git a/media-libs/aften/aften-0.0.8-r2.ebuild b/media-libs/aften/aften-0.0.8-r2.ebuild
index 65594d77cbbd..a52cda27855c 100644
--- a/media-libs/aften/aften-0.0.8-r2.ebuild
+++ b/media-libs/aften/aften-0.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cxx"
 
 PATCHES=(
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 69adb3ffeaf0..ea2e57ac694a 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,3 +1,3 @@
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4.ebuild 620 BLAKE2B 48dce29d6f60a204e17691744375acce4fc5214c26bd3201325e6cc3108811c7300b5df1de17340a59fab3faec9a160caca98c2ba4fd613030d05cbca471fc96 SHA512 3701912187738433f839cf4d99fe99d4d4e17e9366bdd46b89ea71220991aab2ccb6228c0cdcef34094a8b4d808471bde1bc7915335434a0db7490c1955f03ab
+EBUILD bcg729-1.0.4.ebuild 619 BLAKE2B a983b94d38ac2e0b20b233d120c80c62cda702786cd58cffbd5f9e48150c6ff94e6aa3948612950ae39e3d65b39cc8b8b0bf979e81075e31c3fbebbcd54d002a SHA512 87ab1565f610d2701360fe57e9799d616f4772ccc70853c835675cb32529a002bc2ea3fd48824ebaef26aa540294ffe8edd5d0e3c530ff778be62e2b9c3bf3e7
 MISC metadata.xml 213 BLAKE2B be9f4b06d7567b80dc4d16cb47551ef3e825a84f13897115ef207911582b9062e23181c5d7583fbe1a8299e563eefc7cdeee4114d36ab911f685fd27b294d23e SHA512 b2ac78c6617cda0ce08982f7a56bbedd709df884c5ac51b5ae4fdbc36eee2690a177afa507206d8e3914c0e1b80d96291a329164a1883b7c76e5e4eae376b667
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index dff0967147ac..cd937c1470c1 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ia64 ~ppc64 x86"
 IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index aad55a4adb71..aa2e1c39d6bb 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,16 +1,7 @@
-AUX chromaprint-1.1-gtest.patch 3954 BLAKE2B cf94b85a97407f6efe1f6de75959506d3e50af685220df8ad7a454a46087029117de8c6b730172d69369e203856102771a3c234137fddcbf84511cba9cd83ddb SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3
-AUX chromaprint-1.2-ffmpeg29.patch 1573 BLAKE2B 8375d1ea02edbfaf1e39d8e5f33529296f3c80648ee8d534d5f289404f399830e28169109d9813aa844a1bfa42ec048f548e21f1d3c15ab540f3fb9d5f76834f SHA512 7366b9ebff706e67ebe3e0a57605607351076d071b62c9c1aa6e17f2721bbba315a0bde42b4a44f0a6d1921c410e224aac724017e8b4e33ec239b83675936579
 AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
-DIST chromaprint-1.2.tar.gz 529646 BLAKE2B a45b88edfe7e37bc09d960a385f8b7303705da9cc717c85f707b6ea3ed2f2f288589850461ab368ef5a9873239d058416757c5f7fd524d0e240b14145e3aa07e SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb
-DIST chromaprint-1.3.2.tar.gz 538395 BLAKE2B b08d6ff106c3728d91352e694d39722390500480bb5049298150de198593116def213445d5cd96772d3956508df80b92ce3b440c14606aeff8eeca934aa402de SHA512 7f89eb09f293a3691efcb01544da612cf674a00af1c188db3f1075db44fee0a8e0aeff3ca6eccd0731ae6bbff9eb0fd51b22128fa927fdbd21638e2832f76e95
-DIST chromaprint-1.4.1.tar.gz 611014 BLAKE2B 139a3d58392f442feab1d955b03accb5ec81df3cb3de43a9a1d53d7ce061cee94aaad4ce66a860326fa84f155eba39e50e34a7055522e0637cacee8c91e7f7e7 SHA512 9d414ba01be87f973df877afc600c761bf338292680d2626baa2a483f0bb681b506d02baa8f9de297489459ba1ebae9005202bfe7ba661b7bd4d60d4a2463ede
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.2-r1.ebuild 1131 BLAKE2B 4ef0cdb9dc37d917a1dab48f9d911b965e372fd7c75b8d56b1d70515df321892df4149b651aa5de80c2eee13306c58bbadfe60c92f4fa009b710366262866ddd SHA512 7aa5ffe126beb93e43af83fe34d853e86949a7fee2cdf95329b3c33ee4399db6fec4505604a1f6c8adf7cabfae5edd2b70b72c0b2dd153518f394e2d6596cca5
-EBUILD chromaprint-1.2.ebuild 1077 BLAKE2B 7c9097b038c87c0742331d664d885d57fedb544f41a9a9f2239057c3c3f35f06a7375a33508d7e87119011205ef2f5c90282dc8a3ac0b20d4f92e4771e8f98a3 SHA512 c11f6ccbf8b7c0186caf07455c97428a8793389757c44674f588e61171beeb489351daf2a4e01360f621371e3fdd19398a9444928395e36b5d1a508951723afd
-EBUILD chromaprint-1.3.2.ebuild 1099 BLAKE2B eae31032f7ff4149b15053850fe6ae3bf38f391a05a9df4a0f40da6a7f295aad1ef534b2d9942f74e4918d499911346c6d5e24356b206a56050e790ffe4fe4c9 SHA512 70de616dda26df13fe39cf64ec6686e73391774ac3439ed1fd9b9456f7551e909ba74e6aed81f12fd1d2abf8c18b86eb78e5413aac77730f81f3294efb456496
-EBUILD chromaprint-1.4.1.ebuild 1332 BLAKE2B 38f0c3f4fa222d6b9263e103a96b75cb1d86635e22da11cfed090864a02053a0649258d58d1e2866c2f7c4525f1356091a5e590870c69b80ae076fca5af71d2f SHA512 5b488ad56ab7de56531a7e9fce045463e91bc2c37202e1115836247b964ac04385376a2a067b3a6178148543d09c3d2c944981efa25d5cb814d0ef18a8c602d1
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
 EBUILD chromaprint-1.4.3.ebuild 1468 BLAKE2B a7aca368f640e533b391838aa2b865442310d6c210ef64a4872b8245417e4b19dba18cd20738ba7195d99dd66b31c038af01d6cf40b352e8cf9a2abf7ef69120 SHA512 7419ae2d36b6cb92a1d8aac11075eadd1775358768b890ba58a32a12b767a307eacafda9e88c7cc92909b213a16ff42d3b8babbf91f2cdc7ab66f1a6911ca344
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
deleted file mode 100644
index 81b0bbafac94..000000000000
--- a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild
deleted file mode 100644
index e6bff8e54792..000000000000
--- a/media-libs/chromaprint/chromaprint-1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( media-video/libav:0= )
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build tools EXAMPLES)
-		$(cmake-utils_use_build test TESTS)
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/media-libs/chromaprint/chromaprint-1.3.2.ebuild b/media-libs/chromaprint/chromaprint-1.3.2.ebuild
deleted file mode 100644
index dcff5eb696a9..000000000000
--- a/media-libs/chromaprint/chromaprint-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.4.1.ebuild b/media-libs/chromaprint/chromaprint-1.4.1.ebuild
deleted file mode 100644
index 102d01c254b0..000000000000
--- a/media-libs/chromaprint/chromaprint-1.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-GTEST_VERSION="1.8.0"
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
-	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
-	local mycmakeargs=(
-		"-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch b/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
deleted file mode 100644
index 8305ae7c1af0..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
+++ /dev/null
@@ -1,104 +0,0 @@
- cmake/modules/FindGTest.cmake | 82 -------------------------------------------
- tests/CMakeLists.txt          |  1 -
- 2 files changed, 83 deletions(-)
-
-diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
-deleted file mode 100644
-index 21dc2f5..0000000
---- a/cmake/modules/FindGTest.cmake
-+++ /dev/null
-@@ -1,82 +0,0 @@
--# Locate the Google C++ Testing Framework source directory.
--#
--# Defines the following variables:
--#
--#   GTEST_FOUND - Found the Google Testing framework sources
--#   GTEST_INCLUDE_DIRS - Include directories
--#   GTEST_SOURCE_DIR - Source code directory
--#   GTEST_LIBRARIES - libgtest
--#   GTEST_MAIN_LIBRARIES - libgtest-main
--#   GTEST_BOTH_LIBRARIES - libgtest & libgtest-main
--#
--# Accepts the following variables as input:
--#
--#   GTEST_ROOT - (as CMake or environment variable)
--#                The root directory of the gtest install prefix
--#
--# Example usage:
--#
--#    find_package(GTest REQUIRED)
--#    include_directories(${GTEST_INCLUDE_DIRS})
--#    add_subdirectory(${GTEST_SOURCE_DIR}
--#        ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
--#
--#    add_executable(foo foo.cc)
--#    target_link_libraries(foo ${GTEST_BOTH_LIBRARIES})
--#
--#    enable_testing(true)
--#    add_test(AllTestsInFoo foo)
--#
--# =========================================================
--#
--# Copyright (C) 2012 Lukas Lalinsky <lalinsky@gmail.com>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions are
--# met:
--#
--#  * Redistributions of source code must retain the above copyright notice,
--#    this list of conditions and the following disclaimer.
--#
--#  * Redistributions in binary form must reproduce the above copyright notice,
--#    this list of conditions and the following disclaimer in the documentation
--#    and/or other materials provided with the distribution.
--#
--#  * The names of Kitware, Inc., the Insight Consortium, or the names of
--#    any consortium members, or of any contributors, may not be used to
--#    endorse or promote products derived from this software without
--#    specific prior written permission.
--#
--# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
--# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
--# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
--# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
--# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
--# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--
--find_path(GTEST_SOURCE_DIR
--	NAMES src/gtest-all.cc CMakeLists.txt
--	HINTS $ENV{GTEST_ROOT} ${GTEST_ROOT} /usr/src/gtest
--)
--mark_as_advanced(GTEST_SOURCE_DIR)
--
--find_path(GTEST_INCLUDE_DIR
--	NAMES gtest/gtest.h
--	HINTS $ENV{GTEST_ROOT}/include ${GTEST_ROOT}/include
--)
--mark_as_advanced(GTEST_INCLUDE_DIR)
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR GTEST_INCLUDE_DIR)
--
--if(GTEST_FOUND)
--	set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
--	set(GTEST_LIBRARIES gtest)
--	set(GTEST_MAIN_LIBRARIES gtest_main)
--    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
--endif()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 791cd96..9115391 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -3,7 +3,6 @@ include_directories(
- 	${Boost_INCLUDE_DIRS}
- 	${CMAKE_CURRENT_SOURCE_DIR}/../src
- )
--add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
- 
- set(tests_SOURCES
- 	main.cpp
diff --git a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
deleted file mode 100644
index 6910f243b2e0..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 37092d380a28abcc63fa120499030a0f2b7df80f
-Author: Rodger Combs <rodger.combs@gmail.com>
-Date:   Fri Oct 2 14:48:01 2015 -0500
-
-    fpcalc: remove uses of deprecated lavc APIs
-
-Index: chromaprint-1.2/examples/fpcalc.c
-===================================================================
---- chromaprint-1.2.orig/examples/fpcalc.c
-+++ chromaprint-1.2/examples/fpcalc.c
-@@ -17,10 +17,6 @@
- #define MAX(a, b) ((a) > (b) ? (a) : (b))
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
- 
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
--#define avcodec_free_frame av_freep
--#endif
--
- int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
- {
- 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
-@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
- 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
- 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
- 
--	frame = avcodec_alloc_frame();
-+	frame = av_frame_alloc();
- 
- 	while (1) {
- 		if (av_read_frame(format_ctx, &packet) < 0) {
-@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
- 		}
- 
- 		if (packet.stream_index == stream_index) {
--			avcodec_get_frame_defaults(frame);
-+			av_frame_unref(frame);
- 
- 			got_frame = 0;
- 			consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
-@@ -196,7 +192,7 @@ finish:
- 
- done:
- 	if (frame) {
--		avcodec_free_frame(&frame);
-+		av_frame_free(&frame);
- 	}
- 	if (dst_data[0]) {
- 		av_freep(&dst_data[0]);
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 2e8cbe44e2ed..c1d086684043 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,9 +1,5 @@
-DIST Image-ExifTool-10.88.tar.gz 4379772 BLAKE2B d0d4c2fef52e314ef96d7bb117a5221f571004f3e1928db4f04ef1f43d9956915dc7b78550bb5a49508961de985600f728fdb4529bd0e5870b7369a4a4122628 SHA512 85ed7cf1564f92145673b08a6759c83576b40cfc5ec8f723fdbbf72375d0c9779fd90178db719664126e2cbb4b60208e1f8de9d3b94e814f53824d68ebb119dd
-DIST Image-ExifTool-10.93.tar.gz 4386567 BLAKE2B 1ce53e13b58deca4e898ffe069aebadddc2508589f878c12db9abaeefe426cdebd976801fb452819f7d33aefa50d7c55d74a5ef1ff76e3c6710efb5efde0f38a SHA512 047cd3bcd6c67736b85cec3edaccb6d7156dd2e63a86fe918a0e1e0b319f2cda8edc87fb356639a0a43fe4d37fb6ad9dcc91f1f00cb76ba6ac535297678eac39
-DIST Image-ExifTool-10.94.tar.gz 4387592 BLAKE2B 974408e7df2ebc742cfc2eaf5b4638f3af0cc8505a4aa3adfcd6d603866ecd87834409deb71e9f3e9af2a4a155d0035ecbad3d30edee8126d383a53d9673cdf8 SHA512 467c53bfef5f64fcec89f67da01a4d0dad612f2e2db890e7829a0805fa5b4f07598dfb2f690bf58e22415ced30df215834a5b2247ba29cfcb0afe78a6a5f0d39
 DIST Image-ExifTool-10.95.tar.gz 4393497 BLAKE2B 34591d8626366f41d316c18e7453b6d2b222820c19e3b6693ab0f2065c52a9e5121f1d9831baaeb09f67d96bbaa2ed3737651c4feaf43acf3a9132eaa92da7ec SHA512 925557772f6b9588f946e7889904166e66c4c1b40da499822908d99f5211e1cffc1e911d468226d7052fef1e9f61e8069fa86e2ab4fa49fbc6a31d3d82c5c308
-EBUILD exiftool-10.88.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
-EBUILD exiftool-10.93.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
-EBUILD exiftool-10.94.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
-EBUILD exiftool-10.95.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
+DIST Image-ExifTool-10.99.tar.gz 4400996 BLAKE2B eec9774493347d11c4d1ba00b167cb6f6ae10a3e0abf7139c5a8117a45a358831db6cd7e36d371eeda16c0a99aba621923c199c9b1512038cac1ab354490781a SHA512 d1f5347453ff8c3e724bd642ca8ac880e0d338d06dc25fa58674e3990c4e35752078c7ab7b8e05849420debf8eb3b770ec2100e6a975bb43abb3d57229c839ba
+EBUILD exiftool-10.95.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
+EBUILD exiftool-10.99.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.88.ebuild b/media-libs/exiftool/exiftool-10.88.ebuild
deleted file mode 100644
index faee03d12dff..000000000000
--- a/media-libs/exiftool/exiftool-10.88.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.94.ebuild b/media-libs/exiftool/exiftool-10.94.ebuild
deleted file mode 100644
index ec856d3619aa..000000000000
--- a/media-libs/exiftool/exiftool-10.94.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.95.ebuild b/media-libs/exiftool/exiftool-10.95.ebuild
index ec856d3619aa..faee03d12dff 100644
--- a/media-libs/exiftool/exiftool-10.95.ebuild
+++ b/media-libs/exiftool/exiftool-10.95.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.93.ebuild b/media-libs/exiftool/exiftool-10.99.ebuild
index ec856d3619aa..ec856d3619aa 100644
--- a/media-libs/exiftool/exiftool-10.93.ebuild
+++ b/media-libs/exiftool/exiftool-10.99.ebuild
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 777e8f081497..7ff8b25bb232 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,6 +5,6 @@ AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d
 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
-EBUILD fontconfig-2.12.6.ebuild 4926 BLAKE2B b8b83130b0f82d6f9981ecede285f65ceb902a8a200c4debb4b1a259b70f1b8038def66c09a294200b51d01bfdd5c5f54da2e0539ecfdf514609581caba3b0be SHA512 a97bbeebdc22f9ffc7f1f72429b1061465b7744e2d653717f0897c4fe97579641e3beab2b8854778f4c19bde3fd645280ed79008f19d8dddc0a5a01f03698d52
-EBUILD fontconfig-2.13.0-r4.ebuild 5136 BLAKE2B 066466bdbb4fea16505e7dd8f613556ad59ba7569c969d8071bde03cabdfba582335d43d2aa78395fb15b00c2abd0b6d223b352c820f5de05f903096c21c78fb SHA512 25180d5c66b1a0b033f7dd441ea15bb3a58a8f6f6ccbbeb22c085b5c66165aa9dce510f7d54d2dcb9e22f5f4c8a652161ecf7e8725b7221a551b96254390e543
+EBUILD fontconfig-2.12.6.ebuild 4925 BLAKE2B 3f5cb18e7af4f0b20020b52d6804b8410fee703164ba3f62dad2993dad51b17f3572af57e3b9229f0e420235481c0c018247dd5e19bad289ddebd8cd3490f5b6 SHA512 9fff043fb6ea1445198868f96dee0d626c1cda0948893cccd05e8ea002282e3a1bdf8e05d59ac96c047a203a6ad00e17d365396188da3557d8b583c26a4bf011
+EBUILD fontconfig-2.13.0-r4.ebuild 5140 BLAKE2B 4832e0b08fdde4aa5262b2b48ebeb5790fae18b0534e9d18ef09896807fb59035da20f5341595cbf8b80306d8c653039095c5b61c5b48f1e50969755a8dac304 SHA512 6178a6b767887fb47d469eccf86f79f0ba6080b50458bc9fcb534ee7e2c9310fd11fcdafecb7def6d8246c23ac8d3a3e74d348b8d624d95fcb95f558ca0c4e71
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index f912eab68233..c65b40a2d38f 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 2e0e7986dda0..6cce3f4bef03 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -20,7 +20,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
 	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-	elibc_Darwin? ( sys-libs/libuuid )
+	elibc_Darwin? ( sys-libs/native-uuid )
 	virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index aab9ebae3d94..4b10a2b8b3c6 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 934 BLAKE2B 7db1fe47fe9529f5131da6492f6bac37e7ac8135cf683975b5c623e43589e9f97247926a0c25efcc31ca945b51dec1b735da6c41f59ed4ffc041ce55f3564930 SHA512 0d446a7710e976d497a0b9e48134d86cbd9d902cff92b3e97c9522ffbef29aa2c2a71bea8cf89bdc57ded88af7b3e6b28e635769829538573de5ef86399feba2
-EBUILD glu-9999.ebuild 957 BLAKE2B 6d291485eb4d029da1d5a078fc490c11abc2c7acdf630e062275ea50e52831dda3dc80b510d7becf954e59e7562522ba726ef5f64341207dff2b7c927503cee2 SHA512 5dc2c93e480e2ad4f7d59fb248396b2130716ebcbb8cd6e26b9ce9be06a487f9710013c98acdf1a438aab749d62dd0c7f3d8c4edaf9b16f31d61e027007feeb9
+EBUILD glu-9.0.0-r1.ebuild 866 BLAKE2B 606c9f855435751dd58b9495d2afa9f7fb68186a9076ee12235b3444c3e35deec3b14730319faacf4b27028400d929180fc0acbb1be54c09cc605ec04b1ca544 SHA512 6bfeb606a727dcf359be4a073790eb6c32a39a59bcc06ca415a9cff8dfdf1d8c6d608682ab2dbc5260d161050cc8a940d5119ce5d23dc3be460f6d048845ee54
+EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 3f4f63eaf043..379b61d7c309 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-r1.ebuild
@@ -3,39 +3,34 @@
 
 EAPI=5
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
 inherit autotools-multilib multilib ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
 src_test() {
 	:;
 }
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index 684f3b54380a..b743ef44af75 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
-inherit autotools-multilib multilib ${GIT_ECLASS}
+inherit autotools multilib-minimal ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -32,9 +31,18 @@ DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	find "${D}" -name '*.la' -delete || die
 }
 
 src_test() {
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a366d1c93aa7..2ed8c17df8e9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,9 +1,9 @@
 AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f10b2c506e1f0c303f2b52302d1c32e7cb282a8a0544b91689da9fe1bfc6d07c2ab5d56698377af83752d4939f582536cd SHA512 87184db1f0a8e7bdf66fdabb1b556e2fdeb44c26ae7dc215e2a8a8808116274822e08d71f47c21fc3f027bae1bb15010404881ce36c053143e447fe252df9e40
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
-DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506f07dbecf04ca85fb96b2b3c4bba46245c2326c1414811ba5d312cc21ac21dd7efe595665f134812b719c24ee9e49 SHA512 c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
+DIST harfbuzz-1.8.0.tar.bz2 3793974 BLAKE2B d6f6a58e1fe2778f5007e73abc90ccd5bed3b170f27ef1a656fcad824a410b2f4d7f560ce01e5dc87ad97dea0bc926c7d49f2c9e87fec5b7c84cac6be4373afc SHA512 90cccdaa45bbd7b5a75c9600d49e15dea820f0db4f9e4eda2c451092000281657a2ecb281b574d339e84e72842e978f5cbf505845fa573e6b76382192d8dd4fb
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
-EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 EBUILD harfbuzz-1.7.6.ebuild 3254 BLAKE2B 9509b338dd156440ce72a45f39f35dae51690a69b86979eb766ee8f3925307fbf9a8f6218c5e0c9314a25280ae306bb2af2a2a69ca5c77d8e3143b9c144404ed SHA512 b9526d44a37d2783c1d1755e8ca5f0a04b7594a0381faf3f390014d53ffe4510bb9f496b7bbbe33225d07b1ffe7604229cb812b227e92312a0217eace53ec7ed
+EBUILD harfbuzz-1.8.0.ebuild 3215 BLAKE2B e3e8dd964ff7dd7cddd8f493be4f5d4a816e90c6ff64994e3f0cf77446c5cd3f85f97cde0cc8fe198f72574f8589e70d1123997afb0220ec50df4e78d8ea3f88 SHA512 2476547f182aa0138ec49cc61fd5af2dc06b9980a335f7a93c9698fa63b9e0e29765d774098f3a17ee6b9669a6de3cfef0de9ca359c0ea89028bcae3e431d191
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
index 81bf676d86a2..778525d28f8f 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -108,5 +108,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files --modules
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 6b9895335624..0464282eaa50 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
 EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 1999 BLAKE2B 61674ac6d4fcacf27289e09f9233ffd31557836d32cd3e750ce5300cab71706386d9e6028d05d57090f341a78916383f46018ec759f32f75787f57d7172e79e2 SHA512 80829a2063476bad79f367308206dcef8e3253ce4825e73a5f9d9a7dcc5a8d1254c5ff51d0d8d8ac85f2122b44926920d2e1f5cb810460b0e2f1640e4010fb8a
+EBUILD jpeg-9c.ebuild 1998 BLAKE2B ef1d626e18da1597331b4ebdf885008e28dc3d725e00aa9bba23877435a78a9a64bcf836cd53f4d4955fac205e2ef4ff788486d6edbefceb08926605a3b767d5 SHA512 00c596c65e6a1a9aaa0d4ec04cd63a7e7cf605f6ff895441ac3eb43e32104a487798a7170f2c1a94971cc68a97265765e37670a55ffbd85b5f5f713f56213b5f
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 8c78b2668aff..4bad071b5db0 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
index db46c63bb3f9..1256b0b9342b 100644
--- a/media-libs/libclthreads/Manifest
+++ b/media-libs/libclthreads/Manifest
@@ -1,9 +1,6 @@
 AUX libclthreads-1.0.2-makefile.patch 917 BLAKE2B c5a84695e1706ae23877de6b382477cc039768efc3bde862228d8dae33dc2a8c4227b796fb9c45cc4e4a4312ce749f18f37d97d83107e30e9a740272ef80a8ff SHA512 2a50e274c92103c8ea922174666f9aa69f88161ee4d6c52a34aa4b98d7d5fb1ef72326d627edf84e72b5fcab2b96c5335053e59ad428d0099c79bc2b52bd50b5
 AUX libclthreads-2.2.1-Makefile.patch 1462 BLAKE2B da80c7e3382cb5b5961ed4b3ccf4a47e8e4ca6652414dc85abce329ae906030c8bda18c94ba90659079f587fd68a7ea657588ce919dc589e3bc2fc2f9a318788 SHA512 f89d4746ed938f95ed12f04c01150c384c1c117808504f40a4399121a7a6e6bc32d4dd9e518a705842e7ac9a4f4547618000d76381c212a6042fe93dbba08cf5
 AUX libclthreads-2.4.0-Makefile.patch 1589 BLAKE2B 13640b1e9a449e87277c5a89fd1df71b8cda59976b0db0d8102593c84880131ff82002f64f1157838d7297b01cd4ffd66665712d503706131c91f330bd945d86 SHA512 3b58b701d46027d5c1fe7c540b100e1a62059db3d1c3b4c2201ab2e02557de5393a3b1eace0656fab4ea14089a35752e5676f1a52a2a3ed7c60f5fea89abae75
-DIST clthreads-2.2.1.tar.bz2 5968 BLAKE2B 4326f517fbcf24dad200edd93e79e0c067aae4b47b9f24c34d0737ab24ca3103cdc25522a360d9af3788bb0a4750031cdfc90c7f865b875b65eb02ae4d6d7f4d SHA512 0f0fe2d296a32ccaa4073629007ca762ed9f6c1d901d8cc8ac2aa65255c80cc6fee4ea353c914729b09be5e67012add794edbc92015e23d0e96da904dc2c3e14
 DIST clthreads-2.4.0.tar.bz2 14796 BLAKE2B 7c79608b8ebe29a8170a355069aa39496f785146a272edfe048e7dc61100302b56789ab5faa0aaad227cbe8b44eb660132f1ba22d34d304e417301d8582d5431 SHA512 c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
-EBUILD libclthreads-2.2.1.ebuild 774 BLAKE2B 4b044a79a7ccf4bd9a95d06882f4554a5c179adab4edf009d22462cb7fa5aeaf67d931186e46992d8aee33a1cc2423c0b97a517621966d12f28e49ea2bc0d2d5 SHA512 8fe28fbc5d0f63e1333ffb3eb2d017fc559629b6af358c2e5db1976eb68ff6d91587625b41ad354ab9c525f161f3e21fb8465cebe22646e0fe79cd429ab14260
 EBUILD libclthreads-2.4.0-r1.ebuild 739 BLAKE2B 8eb9711168dc0f54f2a662aad9f1595950e4c554fe016550532490dafadc2c137e67d1518e6346653df4e0f73aacb04a714022861f363023d164f688738ec807 SHA512 41cfe771ca41c61052cef3205a68864fd96e1ae93da38f22a30d72e0f1064fb95c55c122ebbdb88b97513b2e7feaa263dc5b01f9837c5c11e05420f43cca4714
-EBUILD libclthreads-2.4.0.ebuild 785 BLAKE2B 505c680937b077c927f197c17dd7c203be6927902ee8b6e55904de52cfbdaa647fab7d987f452a91435efe6422999182a180085b6b6c93ec87821ba00bc33150 SHA512 8dfca894957dd8a36d492266336417944b0bf8814bd451ebd5b0416c9b2d02e873df36515bbd21178176b357b3158bd3d2bf535aee006834a79662755f935cc2
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclthreads/libclthreads-2.2.1.ebuild b/media-libs/libclthreads/libclthreads-2.2.1.ebuild
deleted file mode 100644
index c44a78bd3a66..000000000000
--- a/media-libs/libclthreads/libclthreads-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclthreads/libclthreads-2.4.0.ebuild b/media-libs/libclthreads/libclthreads-2.4.0.ebuild
deleted file mode 100644
index 721f8011dc6b..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.2.1-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest
index dd15748cd3a8..5af51bad158c 100644
--- a/media-libs/libclxclient/Manifest
+++ b/media-libs/libclxclient/Manifest
@@ -3,12 +3,6 @@ AUX libclxclient-1.0.1-makefile.patch 1057 BLAKE2B fd8706fb93bcdae2f63ccd675a338
 AUX libclxclient-3.3.2-Makefile.patch 1278 BLAKE2B 727bda7d600ea0c04935b59b278e4792f5b7c4cd84b01545013b74457457247869a4f34834d9471dec481cf3a05a68c9c3ab1611e0760ef6ff8cc9bd588a84ff SHA512 dd362de3556b22390a520fa6ab3546d4c10c144e9176aabbdcb9b4ba1cf65eb494be6adcb190fa2c5a44ceab756313e2a56ca5da9b5f07cdf3288516c38957a9
 AUX libclxclient-3.6.1-Makefile.patch 1630 BLAKE2B d718974b4c1c92b1fdb642b2245332f13837d0f59467d1ccaba818daf740bde4dc0240d3d88164ead3fea7c2123d4d7160cb5de5c1aaa578143ad3ed7009abe7 SHA512 ce012a5b8f5065c9ab79d66419ece9503911aacb837436c67cdc9a8f354730d7829235d23446c7df4c3a6b98ba94bedc426d91dcd6d484c91b5f45f8adda9c1e
 AUX libclxclient-3.9.0-Makefile.patch 1738 BLAKE2B f80642596892693bb4c46a404173aff3c1663ef227f06ace9247d44a9e5c1dde60afcda8c97073fd1106b3d929b5a1a61832cbb101a7d64a3518d3cadc0efc66 SHA512 51f938f60ce442a92c47509e8c2f0fca6614863f2482afe7f7dd558d27dfb9162cb86f4b151dd0c03f25eac65353bf796aac93374b030c70c5ac8957a456f7a2
-DIST clxclient-1.0.1.tar.bz2 16499 BLAKE2B 977f4a67c47939255e026aaa18785f0d1a330d09fc3703396097f87781b1046192719c734c13476f3f008c05750807b31d7d2a03c862783cca755530340d1afe SHA512 2e5829349838d4eae3de4a5ebcf8357c005ca9c8884326ea9666ff1f03c6905202ab703d0ed2c1c6ffc4cd0a82484ed662de5cce25b12ba3cf57a9d67902f9e4
-DIST clxclient-3.3.2.tar.bz2 20835 BLAKE2B eb0334903c03b282ac753eb5d8f661e5803b4e3bd53fc48a87e2ccd63f4f5f47123d103afa7d6943e426a0ae92bf42e1773be4a44947fd5c10d5347e89c42282 SHA512 5888f4ca6fb72ba0fb7e822189b362dd8d0e113f32f5426235732359eab7756465e51bea64de597c06122cdc5bb8e9df86be8e02242e103e49af11491ee8a087
-DIST clxclient-3.6.1.tar.bz2 30089 BLAKE2B 29f47fc39cfe60992a341846514dd19543fdc59a364284ca894cd85add59ffc60074b88ca96ea314a0bd984d7321200164add0fc6181052b688b9e4af13839f7 SHA512 9f4592d8fa11b6dd0e27af73ca140591d0f8b2672e127e44e5dc58ced5eea9d6956c12990f84f7d6706cdbbf641f0611605c410ea8daa7ff565178c01298166e
 DIST clxclient-3.9.0.tar.bz2 30272 BLAKE2B 51d7dbbf6e474b849461aaedb859bc92da0cb56f368e631016cfcb7dae1e5b3dca7630f35bc2d608fe8851cb5e60be599933834bbe358e092f2b08ad97cdc659 SHA512 4bbd621ceeebf3dfc36f0a3d02c63ba1c0e818e691e5c9681e737710824f53a58c682fb2475a7a2bba4f2dfd520166b782977320ceb73de39448cf512e26c842
-EBUILD libclxclient-1.0.1.ebuild 835 BLAKE2B 5b864604fd2b086b9056ccfb2e997caf63c42729798c021f9010cf82a2b5752407c3e6d76cf290b53dc6ce7d839b68f6aa856f1b64fe944c3ae1aee288583f4e SHA512 e63480f50fc55ba1c30cdce436870e8226e94303707b4ba055f923a23298b5a3f9a62d7e79c8a65cfe11bb0f003c5e64db1abde528d8fdd2a47a8278fe4abcc3
-EBUILD libclxclient-3.3.2.ebuild 849 BLAKE2B f44b4e2ecc560838757ff4f22fd32243828d319299ebb299868ef7b34c032a6222a2a06a49ab54456ef002c6a4bb0008f07923aa4fc44bcd43548b29fe5673a7 SHA512 3c7b1700f1a06f2aead0dff8e3b12373c1be674e3fa78432ca6f2b5232e400f049dcd81142789d4cc9e1a10d24b777f035a9154ee2fc0359271c14b869ab1d43
-EBUILD libclxclient-3.6.1.ebuild 932 BLAKE2B 9a77380b38ede01845289273481823ae7bc69942326ce4bbd7ff6c5590cecc5997e1bda176a078e47ecf250a8c668919bfef7f32aff9fee03ec7bbc06b835efd SHA512 ea3b7f162aabef8214a51b3a8b468b13a0c33b9f3924f23d34a66220287ecda0820907199aaf8fa26ff6be9772077caca840fc8e0bb79c7e6ac0ebdca543ed47
 EBUILD libclxclient-3.9.0.ebuild 920 BLAKE2B d102a195e6d77d427f9f3a7234c7bc5e71c3134f4c3d65f583dca65ab51410494f049635c40c82cff63b69ab3a2d8b7baf9367d2c88d0ea0491b1ec0394c4e38 SHA512 2a74cc4ad9d10d61b0b7ce90f372ae7d0eb72f2c45b34279654e0a77406bde530cab66917127578d5c0e7deca9a1151733c0ece650656b0fb7b4cc6f29375ee5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclxclient/libclxclient-1.0.1.ebuild b/media-libs/libclxclient/libclxclient-1.0.1.ebuild
deleted file mode 100644
index 855bf5f6d6e6..000000000000
--- a/media-libs/libclxclient/libclxclient-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-inherit eutils multilib toolchain-funcs
-
-S="${WORKDIR}/clxclient-${PV}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://users.skynet.be/solaris/linuxaudio"
-SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND="x11-libs/libX11
-	>=media-libs/libclthreads-1.0.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	make CLXCLIENT_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/media-libs/libclxclient/libclxclient-3.3.2.ebuild b/media-libs/libclxclient/libclxclient-3.3.2.ebuild
deleted file mode 100644
index 69386949aa8e..000000000000
--- a/media-libs/libclxclient/libclxclient-3.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib/}
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	>=media-libs/libclthreads-2.2.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLXCLIENT_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclxclient/libclxclient-3.6.1.ebuild b/media-libs/libclxclient/libclxclient-3.6.1.ebuild
deleted file mode 100644
index 986123b25622..000000000000
--- a/media-libs/libclxclient/libclxclient-3.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib/}
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	>=media-libs/freetype-2
-	>=media-libs/libclthreads-2.4.0"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index cc5d3e9e2d0f..5ce09ae7bea6 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -5,6 +5,6 @@ DIST libepoxy-1.5.2.tar.gz 324905 BLAKE2B bbc1904b99e6674b03259bc2a5f4076f248d69
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.1.ebuild 1203 BLAKE2B dccf195c51e8a940a4e8d662069d86aaf933dc04bea426bdad78a49745b282edd392f4373f31a1863ace42e824476b88ddd177bb1ac8bfc13a777124d7e81524 SHA512 6ff58a8592e299ab63c3128428b0b817a1aee5f09cb2b112a14fe4edf7e96f5f180928ecce1be1e6a3e2e8caa141db4ac3951ad4fb944c9dc7ff8398f436ded6
-EBUILD libepoxy-1.5.2.ebuild 1241 BLAKE2B f6361dd6d472d8e68cbf5594438365126015593b0e4b5152aee0e79289b7fbd6bc07a9286e07a0dec5704f0c07ba781b3655de1eb7137e9a25ec3769e48fac4c SHA512 f78655ff92745ae8d36070a850932248291989828dcd9057436981eed97d7b937c7a3a9aba146fcb8a5fdc379851573854d24cb20bbd543be527c460e9de0ff8
+EBUILD libepoxy-1.5.2.ebuild 1253 BLAKE2B 764a6e010d232ffb04193ace7e1e2b209bba2acb667d06b570095df7b1ab68e80a414bd73360a2b0b2c49eb6c5132da87452d1b74f0fb0014784d0e4c448ece4 SHA512 42ef98f03c60a60cda685c8ec151195c307c908a6dd01e07172aca1755527425afeb2de3e705503594794b58f3b3cfbe0cdbbcf3551a68142e1be7bd2937e5fe
 EBUILD libepoxy-9999.ebuild 1253 BLAKE2B 764a6e010d232ffb04193ace7e1e2b209bba2acb667d06b570095df7b1ab68e80a414bd73360a2b0b2c49eb6c5132da87452d1b74f0fb0014784d0e4c448ece4 SHA512 42ef98f03c60a60cda685c8ec151195c307c908a6dd01e07172aca1755527425afeb2de3e705503594794b58f3b3cfbe0cdbbcf3551a68142e1be7bd2937e5fe
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.2.ebuild b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
index a814fceec62f..476702c15fb7 100644
--- a/media-libs/libepoxy/libepoxy-1.5.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/liblingoteach/Manifest b/media-libs/liblingoteach/Manifest
index 5bdb53dc4eba..eb0f35acb2c5 100644
--- a/media-libs/liblingoteach/Manifest
+++ b/media-libs/liblingoteach/Manifest
@@ -1,3 +1,3 @@
 DIST liblingoteach-0.2.3.tar.gz 341557 BLAKE2B 188cb5455f979225f909b88fecce34c510c6938f8b81f8949ae3d7a24209d86916d2ebcc561dc2f7332deee45a13674cdc05b892c46ee343398898daf4b36b68 SHA512 e29cd146750a8b913019c1eaff9eadceaaf9aa85ccd5e6a13174bc3e5cab548e5817fd87ada3a1820c3ad575e768caafde4d7a82ef238331b161d11c4f569c4e
-EBUILD liblingoteach-0.2.3.ebuild 730 BLAKE2B 205f2b6a5d5bafe0938b7890b4f8bac0ce54cbe43f331f69870b37fd1eb4c2d99bc00a2973e3e334622f5fe4b2230af9dd3482d1590b8dfcc1f9b166a3c611c4 SHA512 aab7e7906246c4f43e2ca56d1c3ee922c730c589466ac149ecc4099e1f2e496e08698a678cb4e29648c518eafd03e40e5291900a996daf379c66ebc196b2f511
+EBUILD liblingoteach-0.2.3.ebuild 549 BLAKE2B b4af4cca6848fd93d9dfc78e4667ec23be298d180e86e88af527dc22443b1a99322d6412c86ab8a9b58c50606db79e0dacf4de4c553a423325d536ac1c381c83 SHA512 120417c99f9895a6c25336e90a4f431e112df3504d27baf6c6e0ed01d243b190078d5ec263f549ae98357a88360645b2cb1f945fa20a615435b722e827f83e45
 MISC metadata.xml 343 BLAKE2B 8b665f4dcbb66dbefbafc7e563a4c8860f4b4e08dcea7f6a2b2f5aa254aa7be83dbdffc0d6491cfa0959dcd797245a04a80d806cf377a9b0fccf5a2a70927e28 SHA512 4494651c3fb84ad67bca867e5393c7960f7a8ee8de967558b3b02fc345ec947d612e62580176eeea2496993ebb870350cae0922512b3a0ce1bb3e511a6de166f
diff --git a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
index 054e996b92ca..cc1b3d3936b6 100644
--- a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
+++ b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="A library to support lingoteach-ui and for generic lesson development"
 HOMEPAGE="http://lingoteach.sourceforge.net"
@@ -18,13 +18,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	econf --disable-dependency-tracking \
+	econf \
 		$(use_enable zlib compression) \
 		$(use_enable debug)
 }
-
-src_install() {
-	emake HTML_DIR="/usr/share/doc/${PF}" DOC_MODULE="" \
-		DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 12d6ac179c5c..00e5a02cec2f 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_17.12.tar.xz 1612420 BLAKE2B 1e1bd62efe45783d4973bbe0ff264db1ed20b064dc18fe3ab4fa3614c1b41663fe6727e469ef1769b4736827f89940edd959b270ec1c673a190c9078a81f3955 SHA512 c425612ca84f4655c851332a4c13bdd75df094fa5468b2d61db512ff8431b41e94068d2f645b669dbee286ccae3979a38a5f4ebbb5cda8abdbadf0313df5680d
 DIST libmediainfo_18.03.tar.xz 1627584 BLAKE2B 02ee429fe22af753e8a62a621999b949541e2db4f83705eaf1ce90bda29062fffa76cb1e85e860c7b02d5892044fed5954635b0680965949864cb220868133aa SHA512 d903309fbf9ee78633e833372b13b9676dae2d3d0aa19e584d4972ca2c76cff5524a08201e73b2a6d97a84a0fd469c5bc136d09a27ce0363a7e743e889719c6d
-EBUILD libmediainfo-17.12.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
-EBUILD libmediainfo-18.03.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
+DIST libmediainfo_18.05.tar.xz 1630284 BLAKE2B 8fcf6a2ccbf1f0b9769e22501187d3563b991df0d274d3cc07b1fd02883dab23c0b446a7206e4dd2dd6e2944f99498b04721ed701ed4a60598b08466bd7f45ec SHA512 47d03380197f105bbd2e575558f4b4c1fade8c350af0f69a807c042abbf3aa02413fa88c047988f47cef77240e1106800a1dfd4ef1b41a1ceb019e3d52979901
+EBUILD libmediainfo-18.03.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
+EBUILD libmediainfo-18.05.ebuild 1836 BLAKE2B 0f6a3e335f681ad0c4831123e585b3e9a73212ab20f532d986ae8a0a599e60869582749abccca1f77b712e942b5f3bd15d7f06c56b8c8b06aa2f200f5d00c2ef SHA512 21955ea85241744206f86c931893686e914a215e410a018302d970989cc920bd39ea9f1e39ed2a52f5d4f7e458bcb1939c18696885d10c484838483d391a7091
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-18.03.ebuild b/media-libs/libmediainfo/libmediainfo-18.03.ebuild
index 7be3ed1e7919..c5d85f15c216 100644
--- a/media-libs/libmediainfo/libmediainfo-18.03.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-18.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmediainfo/libmediainfo-17.12.ebuild b/media-libs/libmediainfo/libmediainfo-18.05.ebuild
index c5d85f15c216..1de014e4ca3f 100644
--- a/media-libs/libmediainfo/libmediainfo-17.12.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-18.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest
index b9e29e289de2..7bd01dc80ae8 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
-AUX liboggz-1.1.1-destdir.patch 546 BLAKE2B 3fabdd42a8810172f5497c1ed55e8cb2fffcf334ddcc5866ab04f4571c21a54e067e0d9ffa61cd10224388cab4ebfc2ecba7f71eebf30d701e32bc088d54a86b SHA512 6afbb1a546571abf72fb71fdd8e23d5f1ca37fad66e2aebabb45abc7d43dd3b6c5faf53761bc73068b1b7aaa85126ebbf1f83840b0cfa3cf784e1d97f2f9f9bf
+AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 1042 BLAKE2B d5fa887622a49a3486ef420e8fee1ff7fa9acad416cc7faa65d52256549fa1985a476d15078d3a7994c1684e640c41167b44824a82410366f3a71010cf81c17c SHA512 ead2dd80b6236ca90dcc62fc358267bf77a47298ebfb3a36922108212de1fe01e44b283c4d344642390429b348114d5fb452cbdb438e489a5648d7c8e422fc3b
+EBUILD liboggz-1.1.1.ebuild 944 BLAKE2B ee1fa4ea416ab129f9bbdc9538d687dd6b0a620a3e742c8d2ab2df60cc1d04f37fa9bc75813c393643b2b0669c943eefbba83cddfa5f766c3f6fd959642164d0 SHA512 d4827c4991982c0752e374b6ba9fd20a0f795c44794453543308ee24c860f60d09c92f09c314ca2b6edb631e279b94998608fbd943fa765ccaefdde660b71efc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
index c58a0c960f75..54378b2d728b 100644
--- a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
+++ b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
@@ -1,5 +1,5 @@
---- src/tools/Makefile.am
-+++ src/tools/Makefile.am
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
 @@ -75,10 +75,7 @@
  # see http://lists.xiph.org/pipermail/ogg-dev/2008-July/001083.html
  install-exec-local:
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index fc5cf5c65a11..3897d7e78353 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="Oggz provides a simple programming interface for reading and writing Ogg files and streams"
 HOMEPAGE="http://www.xiph.org/oggz/"
@@ -19,8 +20,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( app-text/docbook-sgml-utils )"
 
+PATCHES=( "${FILESDIR}/${P}-destdir.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
+	default
 
 	if ! use doc; then
 		sed -i -e '/AC_CHECK_PROG/s:doxygen:dIsAbLe&:' configure.ac || die
@@ -31,13 +34,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-
-	find "${D}" -name '*.la' -delete
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 13a78082fc12..a088cec63a18 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1372 BLAKE2B eb8dd1b99ce17f4012954030c0f0a4b03a34192959662b5f44f437193d58add6489c9764245b64d8c9c70004d1b24023e32bd5e3deed58acf73ad12fbb2d05d5 SHA512 5f2d0bc6174bdb8f0737e6e3596b0d247b5bfa22f5ec304d690c7b8f9702f6a93ef54ed8dd90c80b2b57d285c1bf1936c4872568e32270b2c11475eebd5452b9
+EBUILD libpng-1.6.34.ebuild 1371 BLAKE2B 95fd73fd3cc816d70f5c67c7769cd04d02a651fd90263c67127f8a58048ba7f05a9032b1b2c808aefe7dec4c8e1f54846f6867f24fd1ae646092e5a5a9cab57c SHA512 57e3acb2e8ceef43c00a95c06ebb851afaece1d37f760623236eaa1670f21e62699661cc5f19e6143613954ba3ae7ff5b4d066d5baa7a7921ece775eef329933
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index f8f1a98b2e7b..29b9b0173685 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libprojectm-qt/Manifest b/media-libs/libprojectm-qt/Manifest
deleted file mode 100644
index 16a295254b88..000000000000
--- a/media-libs/libprojectm-qt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libprojectm-qt-2.1.0-multilib.patch 901 BLAKE2B 84a7c774c6a8b32015ad1c568ecc118b5ee308ba27b016619a9e7aa58b6ace8258eacb7e13ecbe867feee04cda84532b9ffeb0912317b54e9fca89f5bc129599 SHA512 b6d89fa0f5bb68db2a5dbd75a80705c5a379b920d155ddeb3b8d96aa6ed86a89af28677c73e798b0c73b48088d6d61e1fcc4189fecaeed4d7e7d804cbcf4cc42
-DIST projectM-qt-2.1.0-Source.tar.gz 100928 BLAKE2B bf6d835f361502daeef7656bfd041760bdec0e2e9f9c0fc9d27665f97604b61021fd570c9caa48e74d220a4aef23d069cff2a9fa0ef0a9d71fbb5ae8017133eb SHA512 fe3f88941da763086a20dbb8a32d25081361a39cb98a87467b06a98c87e3d3c05db555b357974c376ee1d0af01efcec4b1522405d8bd5b7c9860ccecdfb4a887
-EBUILD libprojectm-qt-2.1.0-r1.ebuild 611 BLAKE2B 0c15c85a6e55e1b9c733789dd6d20f45a9535499f485c021ad40ed518cb9b4f6646d353c0ba35ac288e18ff00d487a56fe0bd5ca80fa9f8c7c3d984d2df90f78 SHA512 d83ff18b8c46c1f86884cae90b937229a3548c957776caf37b23f0a2e22738f8b115bfc9716e326b65a0d19fa1afc93f88e77f8f64a687142ad2160f2163d708
-MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch b/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch
deleted file mode 100644
index 99c5b25068cf..000000000000
--- a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt
-index 750d1ed..ed14840 100644
---- a/src/projectM-qt/CMakeLists.txt
-+++ b/src/projectM-qt/CMakeLists.txt
-@@ -131,6 +131,6 @@ include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR
- target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
- 
- install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
--install(TARGETS projectM-qt DESTINATION lib)
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig)
-+install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- install(FILES "images/icons/prjm16-transparent.svg" DESTINATION	${CMAKE_INSTALL_PREFIX}/share/pixmaps)
-
diff --git a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild b/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild
deleted file mode 100644
index d73babdd2c3d..000000000000
--- a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib}
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=media-libs/libprojectm-2.1.0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
diff --git a/media-libs/libprojectm-qt/metadata.xml b/media-libs/libprojectm-qt/metadata.xml
deleted file mode 100644
index 4b7d1d427e51..000000000000
--- a/media-libs/libprojectm-qt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">projectm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e8ef68761ee6..15d2a2452d14 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,10 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
-DIST mesa-18.0.4.tar.xz 10939356 BLAKE2B 6bbf19f4e547be3be7385f6e8b094444fe78c0e1ac04d42f1e762ec92d83a53c06bae987b63a542553df4a8a1e17c0b3738e2db6faf356897f49b8d7efd5845c SHA512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c
-DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad
+DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d
 DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
-EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3
-EBUILD mesa-18.0.4.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb
-EBUILD mesa-18.1.0-r1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
-EBUILD mesa-18.1.0.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
-EBUILD mesa-18.1.1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
-EBUILD mesa-9999.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
+EBUILD mesa-17.3.9.ebuild 14421 BLAKE2B f60b36e7ef9f6a3631a9db2ae15375aefd3ab29d82cadf14908577aad0f1d1a208a8734207e84fc79b313014f3ccc5fed03cf82e51922fceaf8e966088954b60 SHA512 d5400d63c4c44630e80d0a5c4bbda0f2449208630907fd50fc362f3e724ec81003205642da5457ae246b5392728b27afaea621d3b5287e1fb70ce7ad3b5cf5ad
+EBUILD mesa-18.0.5.ebuild 14376 BLAKE2B 4631d39a37936ca8660bfbbbaeceb2c31fae34a84a8713f817b2bde87e438b43384bcd543c2a32a17ab95b88c87c843b0622bd256ff3882b638f400962a78cf6 SHA512 b2c612e863b37a3e8e056907fbd4aa0cd4fd20fc5cd9ce3fb21a1e84c40c58b3d5976c83f9c5585c9e1f1e3d20ff39ad40d07bf780b7b2f63185d500137e6157
+EBUILD mesa-18.1.1-r1.ebuild 13369 BLAKE2B fda4a58fe25d1c5fc16fa8710924095b3bd7b8b07f36aa1dcdd34fe3f2e76ba771ffddc40e7d21a61beca4932ac88b69e293c0eb25e298b3598cb9da452d5c8c SHA512 6aa45ea27f6a166f571e58a9ac3690ebae854092667636967771a4d622b457e91c7e6234d42bce7afebe1fdf0357efa828d0366bc98dc93dbe20bb849ec57a09
+EBUILD mesa-18.1.1.ebuild 13041 BLAKE2B 7b9578fae60728474e7a33776b59b78415772be46afcf2597c787c1ee489c85ce6a351fb94efd13ac267ed5e134df91ad1db120b90ed7065de4e648573170659 SHA512 b9ca1aa333646315dd419664c45ec71e9f9554b55d9ce14679e4489dcba9448bee7a5db50a4a341698f2dbda0d4ac878a590016f68775f732dad020692e323fe
+EBUILD mesa-9999.ebuild 12143 BLAKE2B 4900a624fb12f537f4a7dca0a22e9592a73176b637a0afddba827a6c6d6342fd211d3afc065051b51768a8db75ace58c27c365f2c42b73c856e40a199146bb7c SHA512 47ed0e058a7c9937fc3bddc0b53cccf9c34a128788d186a2ed2d9a58331ddadad5bfab04842d8df0b33fe23a8bbd6b2933fcf893c649d1a5c534224b0354dafe
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index 378c8541a722..6a26d1b522d9 100644
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
diff --git a/media-libs/mesa/mesa-18.0.4.ebuild b/media-libs/mesa/mesa-18.0.5.ebuild
index 944b89c49377..0f5fe7b791a0 100644
--- a/media-libs/mesa/mesa-18.0.4.ebuild
+++ b/media-libs/mesa/mesa-18.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
diff --git a/media-libs/mesa/mesa-18.1.0.ebuild b/media-libs/mesa/mesa-18.1.0.ebuild
deleted file mode 100644
index cf00b47b8bc8..000000000000
--- a/media-libs/mesa/mesa-18.1.0.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2018 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.91"
-RDEPEND="
-	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.13:=[${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}]
-		x11-misc/xdg-utils
-	)
-	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:7[${MULTILIB_USEDEP}]
-		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-base/xorg-proto
-	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() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-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 \
-		--disable-opencl-icd \
-		--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 /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	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-18.1.0-r1.ebuild b/media-libs/mesa/mesa-18.1.1-r1.ebuild
index 70702be097dc..616c90765a3b 100644
--- a/media-libs/mesa/mesa-18.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-18.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
@@ -115,7 +115,7 @@ RDEPEND="
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.8
 	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -401,6 +401,14 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake install DESTDIR="${D}"
 
+	if use wayland; then
+		# These files are now provided by >=dev-libs/wayland-1.15.0
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
+		rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
+	fi
+
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
 		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
diff --git a/media-libs/mesa/mesa-18.1.1.ebuild b/media-libs/mesa/mesa-18.1.1.ebuild
index 70702be097dc..5e8a02ef74dd 100644
--- a/media-libs/mesa/mesa-18.1.1.ebuild
+++ b/media-libs/mesa/mesa-18.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 70702be097dc..65c767803a3c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,16 +3,9 @@
 
 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}
+inherit llvm meson multilib-minimal pax-utils python-any-r1
 
 OPENGL_DIR="xorg-x11"
 
@@ -21,8 +14,10 @@ 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=""
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -30,7 +25,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
 VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
@@ -39,9 +37,9 @@ for card in ${VIDEO_CARDS}; do
 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"
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	lm_sensors +nptl opencl osmesa pax_kernel openmax pic selinux test unwind
+	vaapi valgrind vdpau vulkan wayland xvmc xa"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
@@ -88,37 +86,40 @@ RDEPEND="
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
 		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		lm_sensors? ( sys-apps/lm_sensors:= )
+		opencl? (
+					app-eselect/eselect-opencl
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		openmax? (
+			>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+			x11-misc/xdg-utils
 		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	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-1.15.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? (
@@ -215,17 +216,12 @@ DEPEND="${RDEPEND}
 	opencl? (
 		>=sys-devel/gcc-4.6
 	)
+	sys-devel/bison
+	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
 	x11-base/xorg-proto
-	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}]")
 "
 
@@ -236,7 +232,7 @@ QA_WX_LOAD="
 x86? (
 	!pic? (
 		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
 		usr/lib*/libGLESv2.so.2.0.0
 		usr/lib*/libGL.so.1.2.0
 		usr/lib*/libOSMesa.so.8.0.0
@@ -269,55 +265,46 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 multilib_src_configure() {
-	local myconf
+	local emesonargs=()
 
 	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
 		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
 		if ! use video_cards_i915 && \
 			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
+			dri_driver_enable video_cards_intel i915 i965
 		fi
 
 		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
+		dri_driver_enable video_cards_nouveau nouveau
 
 		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
 		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
 		fi
 	fi
 
 	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+		emesonargs+=( -Dplatforms=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
+		emesonargs+=(
+			$(meson_use d3d9 gallium-nine)
+			$(meson_use llvm)
+			-Dgallium-omx=$(usex openmax bellagio disabled)
+			$(meson_use vaapi gallium-vaapi)
+			$(meson_use vdpau gallium-vdpau)
+			$(meson_use xa gallium-xa)
+			$(meson_use xvmc gallium-xvmc)
+		)
+		use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
@@ -333,17 +320,16 @@ multilib_src_configure() {
 		gallium_enable video_cards_r600 r600
 		gallium_enable video_cards_radeonsi radeonsi
 		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
+			! 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"
-				"
+			emesonargs+=(
+				-Dgallium-opencl="$(usex opencl standalone disabled)"
+			)
 		fi
 
 		gallium_enable video_cards_virgl virgl
@@ -351,55 +337,59 @@ multilib_src_configure() {
 
 	if use vulkan; then
 		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
+		vulkan_enable video_cards_radeonsi amd
 	fi
 
 	# x86 hardened pax_kernel needs glx-rts, bug 240956
 	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
 	fi
 
 	# on abi_x86_32 hardened we need to have asm disable
 	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
+		emesonargs+=( -Dasm=false )
 	fi
 
 	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
+		GALLIUM_DRIVERS+="swrast "
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
 	else
-		myconf+=" $(use_enable osmesa)"
+		DRI_DRIVERS+="swrast "
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
 	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 \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
+	driver_list() {
+		arr=($(printf "%s\n" "$@" | sort -u | tr '\n' ','))
+		echo "${arr: : -1}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use !bindist texture-float)
+		$(meson_use d3d9 gallium-nine)
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use unwind libunwind)
+		$(meson_use lm_sensors lmsensors)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list ${DRI_DRIVERS})
+		-Dgallium-drivers=$(driver_list ${GALLIUM_DRIVERS})
+		-Dvulkan-drivers=$(driver_list ${VULKAN_DRIVERS})
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
 }
 
 multilib_src_install() {
-	emake install DESTDIR="${D}"
+	meson_src_install
 
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
@@ -424,7 +414,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
 	einstalldocs
 
 	if use !bindist; then
@@ -433,14 +422,7 @@ multilib_src_install_all() {
 }
 
 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
+	meson_src_test
 }
 
 pkg_postinst() {
@@ -478,54 +460,23 @@ pkg_prerm() {
 
 # $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
+dri_driver_enable() {
+	if use $1; then
+		shift
+		DRI_DRIVERS+="$@ "
+	fi
 }
 
 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
+	if use $1; then
+		shift
+		GALLIUM_DRIVERS+="$@ "
+	fi
 }
 
 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
+	if use $1; then
+		shift
+		VULKAN_DRIVERS+="$@ "
+	fi
 }
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index d312c9ee4fe4..8110cb256573 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
 EBUILD mlt-6.4.1-r6.ebuild 5685 BLAKE2B 9785e64a795bfa740e4e70b4c4941b2be9ef3ceeb936c112137e137c19e814cbca10b168498e1da4e5e63010589c98f21c0cc06d23a60870fd645d0229679293 SHA512 f77ba0383dc88fb9f5d473fee589995a8b8a77d433b691e54e165c3785adcdc0d8dc2c6af34f7eb4e17d866769cf85e1e3f8066acacf27d3b70460ec382d19d3
-EBUILD mlt-6.6.0.ebuild 5565 BLAKE2B 246d08c7d5c88f9b4d50548d7c9f1a25d26675445eb463876045f629056a35871ce97894ae2dbebd5d2c3bfca4bbdeefb43d16a25988d82b17ed7291cd2baa90 SHA512 dec02dc70ec8b515a8358957d0b5311984e1619de6490763945b5ae4182926df1f9a9e7398041c28a00dda56c67fe12537c717d2549be8af2f347631092b1375
+EBUILD mlt-6.6.0.ebuild 5570 BLAKE2B ad04d53ba03cfdbb2b1e2a073f3c5ebfdb96ba997d65b1038df10ecb0792978d5594abee77d7bd9766594091f7f9b4f4bfdde389bb2bba8c034e76acd62f9129 SHA512 54992941e5c45b3a8c43aad80e2f121790d54551cbcd8f644a995821feaa76c48fcb49ee5cdd436714f339ba62442bac33e41661ad770611dab8100de154cf88
 MISC metadata.xml 1571 BLAKE2B d048070896ee31a768268cef47e8b051d24a7a48a0728a82045f8a1cccc361378945cb6d84dadb31a7c664e5f57fe15dde85e08fc579fe8f839ce5c3e64e75cc SHA512 6dbfe8206f62d5c8801e2f3a71ab409a3f3072f600d6fc935b1dbb0cc4cb67f3a0ed221a3c6a76977b3fbea60c7fb7bbf2047e55ef5a7a5aacc8bf60252fcc01
diff --git a/media-libs/mlt/mlt-6.6.0.ebuild b/media-libs/mlt/mlt-6.6.0.ebuild
index 04688b411f89..16e7f54c7d0e 100644
--- a/media-libs/mlt/mlt-6.6.0.ebuild
+++ b/media-libs/mlt/mlt-6.6.0.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 COMMON_DEPEND="
 	>=media-libs/libebur128-1.2.2
 	ffmpeg? (
-		libav? ( media-video/libav:0=[vdpau?] )
+		libav? ( >=media-video/libav-12:0=[vdpau?] )
 		!libav? ( media-video/ffmpeg:0=[vdpau?] )
 	)
 	fftw? ( sci-libs/fftw:3.0= )
diff --git a/media-libs/skstream/Manifest b/media-libs/skstream/Manifest
index ba04e0e485c7..5eb26af61b9b 100644
--- a/media-libs/skstream/Manifest
+++ b/media-libs/skstream/Manifest
@@ -1,4 +1,4 @@
 AUX skstream-0.3.9-test.patch 565 BLAKE2B 776d0b9d2dd2efbacc6f6a838aa90abe787bd4a09e2913dbd4f7238dd23e4dfe9b1b4dffea2e4e6748f85294f151d19d19d73f8890507c044f3fc237a904f0db SHA512 88f66feefeaaecc19190ee2eded9fd935c3a81aab89bd339fdc5c10f51e949c5f560912c248f75f9291ffddb94c62d0825a25c3158bab6ea64c5ccd4f5353562
 DIST skstream-0.3.9.tar.bz2 326088 BLAKE2B 8eac32ad80c2ca6f3026a10facbc34f7d2a1f113c5b8ee1a550118c13b1819f79b4846082099685d37ab43bf57f6e9da0262d19d3aa1c1bdbace2892f07e0794 SHA512 88cf67a76c9983eaa50d2350a6895a1782e77d9e9794084999770989436a3306d1f4d4d4a6ddfa199235f1dc0518d65988cd1956fdd2ce5306fd6b2246db91d9
-EBUILD skstream-0.3.9.ebuild 537 BLAKE2B 0310594537c701a62cf398c78daf8dd87b54139c37042adadd655eaedb6097195c15d4672e711d38db2cc727ddcd2a1c6bf21b95826b9ec912a10799618966da SHA512 b8467d0d8ef3f08605ef3f0b86a166036079b689fdd0e7ec65d7bacb64a7d5927ae7cfad3c4d2611b13b6520fc24844cc90bc1b77b711d1174122318be9fad74
+EBUILD skstream-0.3.9.ebuild 538 BLAKE2B ec5f0bfb5ed258d2da2f6a9d2643fd926981a00d2835f40eccf5cee9038849f8b5fa097cb48e14c346d9b62cf4c6150cdc256caef5f156c96692f72e6b5e9cb5 SHA512 9e2a05fbe8e3e0dc5a4d11b76e1069ac80cae6f2744ee78144187ff74ff54cc8d486a9e4deca51ed14261c3c04d57912004cb6714f7dc97b51f9716ba781551a
 MISC metadata.xml 297 BLAKE2B 5b10a51b749a46d330855e89fe7fe2f7a06a4ab9d2d497bc09add82ecbd0d84d3088bc60f7f4d5022191aac8a31f258a0b8605d89a78908118fd89ded0b75497 SHA512 3bc0a3cb0bcf72257ec7d027cc751e538b2f31be039b4e9b86ffaf127e358f37eaf4e9caff7d933d7a86a7ab2d4ff24b6034f776a89854cd516e4d0d45d380c6
diff --git a/media-libs/skstream/skstream-0.3.9.ebuild b/media-libs/skstream/skstream-0.3.9.ebuild
index 0acc8b73db99..f4dc2d81af1a 100644
--- a/media-libs/skstream/skstream-0.3.9.ebuild
+++ b/media-libs/skstream/skstream-0.3.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="FreeSockets - Portable C++ classes for IP (sockets) applications"
-HOMEPAGE="http://www.worldforge.org/"
+HOMEPAGE="https://www.worldforge.org/"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-libs/taglib-extras/Manifest b/media-libs/taglib-extras/Manifest
index 651a48fe40fc..e780ee3b1228 100644
--- a/media-libs/taglib-extras/Manifest
+++ b/media-libs/taglib-extras/Manifest
@@ -1,4 +1,4 @@
-AUX taglib-extras-1.0.1-taglib110.patch 1217 BLAKE2B 21bc16152022034363b77c3c9c50197d2b1b14419a56c5433b3841d31920fe3e156f6f205357d312d1fe68add31463b16bb73c896c3f2538b9350c2a099b469c SHA512 339319e2378cbfdc9dfea7c620ce170fa6491c8217ed90e3b7786f27f8466d3224e947e37f9d589f815c5b5fc7691ec984f27dec58a82af92b8a533b9d5a90eb
+AUX taglib-extras-1.0.1-taglib110.patch 1221 BLAKE2B 9777a4031c09284fa959ced28e356af87de9c7799dea5f01c7674ef7cff0bd86320db694d27d5327692414fbc85ffb8bc8f898a4d1a1d900f6411e02ac25f2de SHA512 1099cd225ed9b248b71d10d4526272e2cc4df8a3f86f0bf464e21b10ff1166576f7e06763fe19a1b1caedc3711f5832dd0270d27d25d793437dba8c9b6fabbbf
 DIST taglib-extras-1.0.1.tar.gz 31363 BLAKE2B 19150c26d06fad281f172c7f360155ced709d461b26431adf3a02d34cf029237855b21980b0bd2de026420a3f3a45bb0bc9fde3a5f6091f1219eff51a55f9b56 SHA512 282f9c9cde81a250d8d6f4416658167665044d53cd10d8ecfa490df60a1fb95e1309feb17f69963f8dbfccc83ebb76af7275c25339931117435f34a56c4f1a65
-EBUILD taglib-extras-1.0.1-r1.ebuild 538 BLAKE2B ad0a500230568d080875a5867dd1bac06fd9fcc276032cff38ef8a5e05fe39bade1d06f329cd4d4ed3117e15ef6f6dcd84391d7a30a0d6ed8ff7c2a578f78305 SHA512 5da828b36e0edf146c40dccf0d42824bc9b4e2687774fd037e1dc2a5a89d2470ec06c5be5488873f7c8ae90020ccd0f954426fed46ea99cc6162055aeec32cdf
+EBUILD taglib-extras-1.0.1-r1.ebuild 511 BLAKE2B fe4429d438341dd8b0f86bc06d000e5c3103eff05a05cfc897e12567796e73a3ac1ddfedfbf8ba89ecaba846c556601e28fc735dca4aefd3f5c3942d5f06f4c6 SHA512 9e763eeba95281a88bc429eb620794f4aed02843a55347c6d0aa165643cbb264708a0874d0a76550466a6fdecc5396edfc19f411b79cd6d9746bb152aa2b84c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
index cce4201dece4..87f297511413 100644
--- a/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
+++ b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
@@ -2,8 +2,8 @@ Fixes build with taglib-1.10
 
 Gentoo-bug: 571072
 
---- cmake/modules/FindTaglib.cmake	2015/11/16 18:32:25	1444332
-+++ cmake/modules/FindTaglib.cmake	2015/11/16 19:05:39	1444333
+--- a/cmake/modules/FindTaglib.cmake	2015/11/16 18:32:25	1444332
++++ b/cmake/modules/FindTaglib.cmake	2015/11/16 19:05:39	1444333
 @@ -29,10 +29,10 @@
  
    exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index 9e7774c8447a..2a912b0522b7 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -19,5 +19,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog )
 PATCHES=( "${FILESDIR}/${P}-taglib110.patch" )
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6f0a7ae5e17f..b05b08b0508e 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,9 +1,6 @@
 AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a
-AUX vigra-1.9.0-automagicness.patch 2470 BLAKE2B dbe9116f2864cba0a20d125ec494a08275b4da7798ff9a210a4384ff39c0fb4848638d544d4f68b50a8a9cac14a1157df87e621465ddbfb2db1bd6e59d1e105f SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44
 DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
 EBUILD vigra-1.11.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160
-EBUILD vigra-1.11.1.ebuild 3535 BLAKE2B 23c0f6fea13190f8b0e729de8d2b28d3a8efbcd5fc77223f553b6c354dacfb61ad13c25f4f991b6b4ca87b73ee53050ba5fa77ab643469a3b5ef675ef0ffe949 SHA512 b1f535c04ca2df0724d6e2b45b714eb1cc0e217c4c1f22e00bdd7dc241730341792c2280a14299031907c7177c45ca69deb27e709d32f411ed0eed23293522be
-EBUILD vigra-1.9.0.ebuild 2637 BLAKE2B dc273de65af90b7b5093f00ab90d1f93a11e989dd267eb014e5e80fb635a85bb42250661761c897dfe499b3fb7796585d87505739a848e2f6f5f57596674cbd1 SHA512 c6d217e3a07bb9332f83a9eb98d98bf76909ec40528cc155c882ff00c2a1fc287935098798793ebc57505185dd7bd36b3c88ba6259b05464d822d3f1a61baf92
+EBUILD vigra-1.11.1.ebuild 3534 BLAKE2B 373b00b7edf79ebe3e9e5ca82cabaf032c87c0e3e8a96714f4f8fe2ac19bd6c6d1b5101303f0f048e1300b8f6e87807f31e6538b1af0eec25efbad0c08e769d8 SHA512 043b293c2648690780fffd19d55029ffdcfe8d8d60f80224c7fab8527e1ad75b15d3def0a2fa3ab7f8d92a905456232662ec000d94e5ea9d56dae22df0c22378
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
deleted file mode 100644
index e6deb761d1c5..000000000000
--- a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
---- vigra-1.9.0.old/CMakeLists.txt	2013-06-04 13:38:43.158564579 +0200
-+++ vigra-1.9.0/CMakeLists.txt	2013-06-04 13:45:19.290550486 +0200
-@@ -57,13 +57,27 @@
- #     search for dependencies
- #
- ##################################################
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_OPENEXR "Enable openexr support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
- 
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+IF(WITH_TIFF)
-+    VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+    VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+    VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+    VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+    VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
- IF(WITH_OPENEXR)
-     VIGRA_FIND_PACKAGE(OpenEXR)
- ENDIF()
-@@ -72,8 +86,10 @@
- ENDIF()
- 
- SET(DOXYGEN_SKIP_DOT TRUE)
-+IF(ENABLE_DOC)
- FIND_PACKAGE(Doxygen)
- FIND_PACKAGE(PythonInterp)
-+ENDIF()
- 
- IF(WITH_VIGRANUMPY)
-     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
---- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:38:43.207564577 +0200
-+++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:45:51.962549323 +0200
-@@ -1,4 +1,4 @@
--IF(PYTHON_SPHINX)
-+IF(PYTHON_SPHINX AND ENABLE_DOC)
-     # vigranumpy documentation generation using sphinx
-     IF(DEFINED VIGRANUMPY_DOCDIR)
-         MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
-@@ -49,7 +49,7 @@
-             ${VIGRANUMPY_DOCDIR}
-         COMMENT "Generating vigranumpy documentation")
- 
--ELSE(PYTHON_SPHINX)
-+ELSE(PYTHON_SPHINX AND ENABLE_DOC)
-     # no vigranumpy documentation if sphinx not available
-     ADD_CUSTOM_TARGET (doc_python 
-         ${CMAKE_COMMAND} -E echo
-@@ -57,7 +57,7 @@
-         "(sphinx-build not found)"
-         VERBATIM)
- 
--ENDIF(PYTHON_SPHINX)
-+ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
- 
- ADD_DEPENDENCIES(doc_python vigranumpy)
- ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index c7db801f5f0d..44a25f14450a 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
deleted file mode 100644
index 0252dcd97b64..000000000000
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-# This ebuild could use python-r1 in the future when upstream gets Python 3.x
-# support working
-inherit cmake-utils eutils multilib python-single-r1
-
-MY_P=${P}-src
-
-DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
-
-# Pull in dev-lang/python:2.7 for vigra-config which is always installed
-RDEPEND="dev-lang/python:2.7
-	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( sci-libs/hdf5:= )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
-	)
-	test? (
-		python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
-	)"
-REQUIRED_USE="doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-DOCS=( README.txt )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagicness.patch
-
-	# Don't build nor install API docs when not requested
-	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	# required for ddocdir
-	_cmake_check_build_dir init
-	local mycmakeargs=(
-		-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-		-DLIBDIR_SUFFIX=${libdir/lib}
-		-DDOCINSTALL=share/doc/${PF}
-		-DWITH_VALGRIND=OFF
-		$(cmake-utils_use_with python VIGRANUMPY)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with hdf5)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use test CREATE_CTEST_TARGETS)
-		$(cmake-utils_use test AUTOBUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_test() { :; } #390447
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_optimize
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1b7b852bbf93..22370f3a9e9a 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,5 +2,5 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B
 AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2
 DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b
 EBUILD vulkan-layers-0_pre20180601.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d
-EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d
+EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B d9a5a239e0287f50a2c9fcff4fe788379d94e092261d455fa76b0588e969b34887c2b937a27b38de085645f06529c8c7570be7d5cfaad57bdd461447b924a1d3 SHA512 5f1fe4527a620fe027570c823fca1f8c89ae4a9ab8d9efbc52484a82c239e6049e602acf5968ad163211f60207ae155dcac5ec0c482572410eeba0359d34641f
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 2187d9d65c0d..c4dcf61a753b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,7 +37,6 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )
 
@@ -50,6 +49,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /media-libs
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)