gentoo resync : 14.07.2018

50 files changed, 1001 insertions, 424 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 89a3620aa600..973924c3fdb6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index e1d2ec189b39..588be6ffac6f 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,6 +1,6 @@
 DIST adplug-2.2.1.tar.bz2 810257 BLAKE2B a51c85a10af6a1cc308a7ccfa657daab1e627800a0617f6cf8b874726a115bdef188dc3d82fb6af9fd2aadc2b28b12f0707ea12cb52f6656d2b8654849bad806 SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f
 DIST adplug-2.3.1.tar.bz2 1478424 BLAKE2B 8c2b65d11d3b12b4a3337bc9c6ada2920b07279ac0199d4bdf1fa2ceec2f51748a1bb9357456b3e7aba7c906253691066b274e7a7c7578c777d1e2e77f5131f0 SHA512 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3
 EBUILD adplug-2.2.1.ebuild 624 BLAKE2B e762d87d6b15d6dc6e6c2367db8e8b1af9c504755e2be3a547129b3a21dc64b672a16ad1b5e7d5726a87a389e831a732f331279b1141c8f195311347b55fc5a6 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090
-EBUILD adplug-2.3.1.ebuild 888 BLAKE2B a01ec48a5f6bba6d6ccf9334165c0f907d73db518b453b2abab2b19f2c09bb31b33818f210a509f74a59aa7ed48149b73fa5d5d47d1cbac2553110465ab77910 SHA512 55fb2fbf046fb2a5a57d97396967660f8f250674f61b9000c56b2dd9772abfeb9550c4ef37cef4a4bb5794ede7652dcb217ab2011833d84d387d4e5d6d05d2cf
+EBUILD adplug-2.3.1.ebuild 887 BLAKE2B a42f5a3b4a2bc21ac2dbcd1284b3059a3955fa8dd88a488d4395b895a6caaed1fe9a1f40c4f4b73c02d4eb706312f77c9e00cb17813a8269b578924a8de40a45 SHA512 6bdb7e93d0a5c35630fece9b0f891633dd5647dc61316ea34db3f631d9e68e15c2572c6fd6759bd9c58fb4e71079a4b31dca6f2354205ddf28e13ebfd70c0b88
 EBUILD adplug-9999.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
 MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
diff --git a/media-libs/adplug/adplug-2.3.1.ebuild b/media-libs/adplug/adplug-2.3.1.ebuild
index df3d368a1770..b1a8021b9528 100644
--- a/media-libs/adplug/adplug-2.3.1.ebuild
+++ b/media-libs/adplug/adplug-2.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
 else
 	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 09158a450a48..b57a8b5605e0 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,3 +1,5 @@
 DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
 EBUILD codec2-0.7.ebuild 485 BLAKE2B 06f9744dbf2dd9eeb47bebfb09662526253ac62e3d34b47390b9b4df147721b6b7aeb51a67c9a5495474e133a4fc27465736ff50c4a9043e3be8e3ff8c834357 SHA512 39da503a4cfd811cd0de69e775b38cd16a1e41cf97342df493f09597efbd225a06e2f56836e9641367d67c5005da67e4c89bb5ee5052b1605117226b251d8b89
+EBUILD codec2-0.8.1.ebuild 617 BLAKE2B 95cb749714a9f5f90b0e2f8f6bc8b16f071ecf0583d27cfc655e88affdf932aa9af77dc584f791794615975565de4eac268a510111a33564259a2ce94faf24c4 SHA512 73fa97599384d3fc755a0449f793ee920a7e32931ff2444249e674dc9ef9daaa27d5c98ec5b7373538788e416caa447429ed75230b59942f91c3e6ef69cd57b6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
new file mode 100644
index 000000000000..07c6f859762f
--- /dev/null
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/"
+SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DUNITTEST=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	if use examples; then
+		insinto /usr/share/codec2
+		doins -r wav raw
+	fi
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 4ad605c2936e..aaa8f8c07880 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
 EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
-EBUILD hamlib-3.2.ebuild 2228 BLAKE2B b30f306ef16f8f9c8998ef1dc019e3a1e2beaa2d21b2a654bf39b9f927b4ae4d0d25921cad2d8fed94a2d3aeb420dfa75e0964c7f5854714b0cf7d8ac58f7e7b SHA512 c34b82e9c7e31387c28d78f1e240c8f1025682ee1e08f6f1cf374b7e62806eb3e3c1c9f9c820e45f94da52724bb29dd7727398afbe74f9c712180cf05b5cb702
+EBUILD hamlib-3.2.ebuild 2227 BLAKE2B 23d7ae9e5987706a88d124a3c6731bb82bcf4c8616380b4f57a79b195d4589164148dc20c4bfdcab2ca76353bee0514fdebd7cece62a9f441e65af762d871855 SHA512 b11c5cdc7952aef7a02b3a245ae7d0e139a2bfec3eb4ca682aaa638d155e7825804debda11595c940c30bf4fdef6d8bb3e68ac36f9bb3be1128005305a1c9e21
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 5b7abf81949d..82d0cf58c42f 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 946657a7dbfc..a5a26dd81a1d 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,8 +2,10 @@ AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f1
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
+DIST harfbuzz-1.8.3.tar.bz2 3828043 BLAKE2B 038a714480f10b05b2b31ba46667ce563598b43d122f64ab4adc6f267b2b99ea23ba92a1ae0df173be13f29da8960d55a5c5fdee25aa9fc4541a109c5e76946d SHA512 d3ec8f31ff51315fb35f6b5c69b3fbf29e1dff710fb11158801990fbeb99be5fce691f3c06df1c295a08bfb6c14021c511993b0d22ca96e76d8212ddfda198b6
 EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
-EBUILD harfbuzz-1.8.1.ebuild 3212 BLAKE2B ec5c198e5f01625d6fb05fb275a4cd11995300a7135785f1a3213d0646fc73ef4c64a2ce1c09480f21887fdcd34a20d287887db334bcdf0ad42439a2462911f4 SHA512 161bde7c3fa3f28e8faa2cf890c2843251de6c3c67463bd474d41a1e563e37cff1a76ee39f7913883e8341746e7a211bd0cdd47fc9fdc79f8bedcd3ca3701cd1
+EBUILD harfbuzz-1.8.1.ebuild 3210 BLAKE2B 5728ea38556eb2aa0d113bf2f3a4d4632c1dfbe1a05d4531fa4553a17130c2fe56f49bc6db688e5ab00666c27cb655a67c7f4fd16d77f6503bf1cb74264be832 SHA512 83efd6b91b845884a7a43abf4dd8cbe2a0e6e04c2c0701b2dc9974796e0c22b39311eef27987b9db38a10719f4167b47c4f669d96b192ba1244e91bde710b3c0
 EBUILD harfbuzz-1.8.2.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.3.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
index f736d69ecd44..92d65fff155f 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
new file mode 100644
index 000000000000..c723137a7e55
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+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"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 3c832cc2b656..9cb6de54c9a7 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,5 +3,5 @@ DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538a
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
 EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
-EBUILD imlib2-1.5.1.ebuild 1969 BLAKE2B a6d7f500fd5432b2d9344ef7ccdf48d7ba8d7c5076611a0b48a3fe0a1228fd6726d37698fb051bd0a549efaad5d53711ac5bd0859c3724f4e4908122f71e502c SHA512 bc4f3e27207996f4feb484512fd3bef8ca81a71e74289f1575ca119a7d5aa2d95b5967e2aa2df234a4dac56e175b1be177635403dc0c070226137ec148c54eb0
+EBUILD imlib2-1.5.1.ebuild 1968 BLAKE2B 51cf776a53f08aa0f55136248c80f980082dd00ce9df5cf549fed7a46e1a97ce2962202267c7874264750e868a8fccca5d8f6866067584808001da1adfb10133 SHA512 7ee47df946294a8ec7b21488c9aa0ecccb325052e87ebca92930899fa2bd4bad8c1f3e0c4653d43f25a75acae85b8f209bb0c879a2fac48c123d6d77bca68e00
 MISC metadata.xml 2445 BLAKE2B 58a14b7c6eeb627113a5a2a4e72c3937b4b74b3ac6e363d8e0f735f25775178ac2aa5bae2ccc6881bc291d220268fc7db85cd33c0ec796ada823c7812c40d10a SHA512 7a6940cd007784b50b010af8d01992ba56bb756f6433e26ae4962ccdfe25efc41ca1b020b7d88f15cb784ba2d8cb39caffd89b727db7b7f7149ecb137dcaae6d
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index ad93bd2f5e8e..3810890007b8 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
 
 RDEPEND="
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 2df256ea8b3f..75880545b410 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,6 +5,6 @@ DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484
 EBUILD libbluray-0.9.3.ebuild 2186 BLAKE2B 811d0c37422c0a9425084573f25c19be5a272a88654a227338029de63b4217a6ffe644cd88e45410fd66cd810d1931130e973ce839e8721ab3214710890ec1db SHA512 e2fa9e014338231de6f2811439f88bc861a8765eac08e25121c3200307d01dd478a537b368dd4b9a28966d4f3b2fe73f2d451369dacde8ef441400c0add68629
 EBUILD libbluray-1.0.0.ebuild 2194 BLAKE2B 16b08e28b74eb2d8635092ab2a02d2225d8d69b0b100346170abef947f2a56cb3a3aba7e8a52307c0781e11b74b35ec13b11e15bf2b2e78f46c3481e7ce57976 SHA512 33d28c33eb451f6360426efcde049a9250bcc8ed63e35132f37517bc1630e9c95d189b40fc69ae642e5444ed19bd9a19f4521a92bdaa2640c62fbad8c0060952
 EBUILD libbluray-1.0.1.ebuild 2202 BLAKE2B 486111965f4623e1f9b894f4533276c3e626a1152cbfb4ca0417bab5c4fc11489a7e564b6724123312bb7759e711db945cdbd4f508a0bef77df94ab65ea60353 SHA512 d6666bcc3db0d2c0407b364eccfda76710da9fb66710e93bb71707e4a5ea5941b7bcca4d06a1afa4273d20e1224496f8b60f2106f35ccfe6121efd25d1aae896
-EBUILD libbluray-1.0.2.ebuild 2217 BLAKE2B 3296a880c09aca896d4631be7b2ed7de24720bcfbacf59234ef4f316ec939be4ae59ca881598428438ff35d3bd7efdbb1654583eb62224ec08cb2162ed46a7f4 SHA512 64e47c04e42f184a805572dd3dd6a3330c1e38ae3f53b70dda722c2c117e8cc9991287b598c0473f6454cfdc986e419b69468d111ed6c3eb3a12b13219a8df9d
+EBUILD libbluray-1.0.2.ebuild 2216 BLAKE2B 0ccf81a396903645ca601a72cfb09e1adc8c970a30d8a3498441b5c0535c13d9c8a11edc43479e3409b3235bd46534f0a87cab0dc45062683ef38a394605aa18 SHA512 193b8ef72dfe4e958b1144c77bfcba0a221a1abe1bbb0ea5dd2978295e91b8966d801dfcc9ebcbde5ff1004c139bb15fcc58b55d58bb238513fe75f1c89dd9e9
 EBUILD libbluray-9999.ebuild 2201 BLAKE2B 161cdc3be5991a0462a1d4fd90d361032d44e8d6c21ab4166e2db49698803b7a561a1e5f78c5dbcd95708658b46e33a968c78d0f4466387833eeb02afdde8451 SHA512 a3d54041b72299fa25da8c4ec957f77aff6f8b4f1c0be1d775172fdbf6162bcd51c36275e16b71951f1e6f267bd12bc799a99b87f97a723b74aad7522da7b81a
 MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild
index 0704851b93fc..1dd1be0ec72a 100644
--- a/media-libs/libbluray/libbluray-1.0.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libgltf/Manifest b/media-libs/libgltf/Manifest
deleted file mode 100644
index 6cace8cd0995..000000000000
--- a/media-libs/libgltf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libgltf-0.1.0.tar.gz 736163 BLAKE2B d134df92ef246043290fa6a28c2d8a78e9c1d0d90208737d3ef5115d5b37ad942663316a1b54d7385cfa480d7cfd03c522136ad0d63fc733a34723aa20a58b38 SHA512 c4ef222d638a3f691bcce493776ef451830168ef0569c417f0acdd305e5f261500767943f92a3e65d6b00aecf6c02bdae56f52e0943b8d36490ef66474d9252a
-EBUILD libgltf-0.1.0.ebuild 1043 BLAKE2B f0ba4f415a7b1df249fa9b6b6e1b7be9f624282468858c9b361b426ee122666aad743722ca60fd849a2eff835ebf2f9e9d3872a85c6cab3c0f67c4a4e8c7a487 SHA512 7cbd4cb546e24e2b34dd579cd0f286ced4dde7c923ce0669cc6ff288ca1ec9e823f0a3f46e0e79f99b9f1235fa332200ef723a0751211e2abcc747b7b4af2c63
-EBUILD libgltf-9999.ebuild 1045 BLAKE2B 29e412d589785ca95c5a72fc02fdab8cb4e1f47511254fdaa5c8d91386f604a85f4a9ef44c74b95d718c226198a1ef591c356bab88c08ff8b4ea87a886b5925a SHA512 0b6ad4de2a8a8bf219c6cbd27c575d7064a161cb5a591974ca52f357f182f288c580b9fa73bd3a4a8fd496e4930ef9affc16df0d405a5fd04b2e00e564116db1
-MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libgltf/libgltf-0.1.0.ebuild b/media-libs/libgltf/libgltf-0.1.0.ebuild
deleted file mode 100644
index 41afce1e5ba6..000000000000
--- a/media-libs/libgltf/libgltf-0.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
-HOMEPAGE="http://www.libreoffice.org https://gerrit.libreoffice.org/gitweb?p=libgltf.git"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
-IUSE="debug test"
-
-RDEPEND="
-	>=media-libs/libepoxy-1.3.1
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# testsuite not in tarball
-# only in git; unsure
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libgltf/libgltf-9999.ebuild b/media-libs/libgltf/libgltf-9999.ebuild
deleted file mode 100644
index 320dc63b2873..000000000000
--- a/media-libs/libgltf/libgltf-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
-HOMEPAGE="http://www.libreoffice.org https://gerrit.libreoffice.org/gitweb?p=libgltf.git"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
-	>=media-libs/libepoxy-1.3.1
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# testsuite not in tarball
-# only in git; unsure
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libgltf/metadata.xml b/media-libs/libgltf/metadata.xml
deleted file mode 100644
index 13ce236ee519..000000000000
--- a/media-libs/libgltf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-		<name>Gentoo Office project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 386e522cbcac..da6ee2f6e410 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,5 @@
-DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fbaff5afd9a66c1a1fd85d78dae1b9ed9c057030849fd8fc0acec5f2ad012c0f098323d3596f6c38d5b01a9603a SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77
 DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1
 DIST libmtp-1.1.15.tar.gz 805983 BLAKE2B f464c58a9844706ecc066a4a744b525ac6e8020ab80e35b01eab2813562ea1452deb5e6fb4477eb243b6631c24f8bc11887ec35279cb6cd89e1a459aca6b36cb SHA512 c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a
-EBUILD libmtp-1.1.13.ebuild 1596 BLAKE2B 34ae4dc534b04f1a010155aa2c20c956e1ff692a57b3b291bd701a1c20f291c79eb4f7dd9263749374c3b3b13796379f0eba1fb2acd65c77882214258a0e71ac SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b
 EBUILD libmtp-1.1.14.ebuild 1597 BLAKE2B fb0ff0ba1478dd9c6d8b1e6be56f88d288a0cce2294ff271a1c392881c009dbf41ee457ff8a97282e76faede81a35296fd04507d64c9bd5cdb425e593e50df93 SHA512 ed6d56fa731f121082cc27e7790530ef4c4a02885685a8f0fdaea693c963d0b9a18c6b74bba8772c4965d2d910590131cf4da96fdc1f35568c7135f4da11ccea
 EBUILD libmtp-1.1.15.ebuild 1603 BLAKE2B 52649939b562e4af906e7ee5613afa6cb35d3c7834a6593a426553f19a921f87a7a2a0bd763843a7c115e236de9c7919855af60702d88d128c8fbf0648e7d652 SHA512 8de4ae97012b8c8cbe4d7b5408834a048c73d91b8e9371d936c48a93193a8b528d5b3e148d14d31cdbbb669bb995f796c8bdb22cf9e708e60e1c59a74e2885f1
 EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
diff --git a/media-libs/libmtp/libmtp-1.1.13.ebuild b/media-libs/libmtp/libmtp-1.1.13.ebuild
deleted file mode 100644
index 515e227cee7d..000000000000
--- a/media-libs/libmtp/libmtp-1.1.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils udev user
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="virtual/libusb:1
-	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS README TODO"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	default
-
-	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm -f ChangeLog
-
-	if [[ ${PV} == 9999* ]]; then
-		local crpthf=config.rpath
-		local crpthd=/usr/share/gettext/${crpthf}
-		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
-			cp "${crpthd}" .
-		else
-			touch ${crpthf} # This is from upstream autogen.sh
-		fi
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable crypt mtpz) \
-		--with-udev="$(get_udevdir)" \
-		--with-udev-group=plugdev \
-		--with-udev-mode=0660
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 084f0f72a03e..0d4b76c9c414 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
 DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34
-EBUILD libqaccessibilityclient-0.2.0.ebuild 676 BLAKE2B 8d9b808bb4f5a3d67f5109b504a17646ee3dacbb76bd37a03a2594b60bd7dda1f7c054c774bfd76079e694e3ff3f10f487408fc975c3643ce6169910754b2ad2 SHA512 a5f306c068318b08b2da0faa5efcf3bfd46d40a3226a17c8cf54baa649d26ca59f3bd51b2a745593c8e355f3ab953afb0410276b6c6880c86eca51acebf1656a
+EBUILD libqaccessibilityclient-0.2.0.ebuild 703 BLAKE2B 6881be7f9673d83581794acdcdeb0b738260f37de0c277d98ddf721d539db16e9048533ca732494860baf84111f379177990857357d6bcc9b56644d4fea3b482 SHA512 6b3435f1ab30c35dfe06a3ee5e0b09931d591f1003a1c0144eaa179fafc1c9942d4f475eafc05fd1b89fa09a46c0e5b18fa2cb3eca58a998c2b7b77f36ee13e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
index f01a0f3a3c8c..de1d15f27a17 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+ECM_KDEINSTALLDIRS="false"
 KDE_EXAMPLES="true"
 inherit kde5
 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index d4b09c018ffa..9b64752196d0 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,6 +4,6 @@ AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab
 DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452
-EBUILD libsdl2-2.0.8-r1.ebuild 4745 BLAKE2B d9225e03e3099971db730d3b03554ab6be323cd5db8b73e5eed0b9eb476b9e6f355122c0eed8b7a5f1ecc48ece714f9d71f6baf2b22c476456e6beabe71b75a6 SHA512 fe18bb622ff74b93637010304dce886cba44ca43985c505de6c02f443fe6dd7d09c1c2db1a4ee266f9f8a64ed89827ffb25040d408534bf1feebdb330997c4a7
+EBUILD libsdl2-2.0.8-r1.ebuild 4744 BLAKE2B a9a1e0f5a717f8444550a7f64f7b3248f5cd311cfec836b59467bcb56c1d698827189e3294b151e621f20615df14d85a4be88b1273dd91b6bb30e23facdf84af SHA512 f6c79bf3600de8fcfd66dad89b3ecb15ab47c72ecee147c5c2ba60704d1acbb0996d98d5a2a802ddf446a45f7ee65f44c8c5510594ac864a23c89eaa0b8e7013
 EBUILD libsdl2-2.0.8-r2.ebuild 5173 BLAKE2B 03b84a9b6888a3fe83e3f689dc8f554eb612f64f1f258c15dfc7f8349ad08d38a4c4cf20a5a3a8aa3592225dfd6690db4724af32cf4d27943a97b336bf05a07d SHA512 7d7c1f59f492c7a856e947284a239d3b3a2d22a0259d80422af01fb77a0a48ddf49221faf965c46c1af9588da9bd4e08d7f24f507c816b228d729bf673bc73ee
 MISC metadata.xml 1665 BLAKE2B 7f469ffb0096991ffcd95d5cac92ded15aa0b6d0d60f0d38bcaf966336a8c782b51a4fd61e2984b97bf65896438517868836b251619647f330004c4795acd008 SHA512 dc0fae98711a1a79ccd76371e6747c8cf722dfb84d75d1d414bb90980886d649c53f9bdbee96e627854ace0fc6b30160688dc906aa74cc943e71172737ae659c
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index b263c1db9c1d..670e63c5e1f3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d010b8d65d0f..b4f908401e6d 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,5 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 EBUILD lilv-0.24.2-r2.ebuild 1492 BLAKE2B 5a7cbdc6d7dfea55ba9f4ce9ecd82cb2c29735670ade2018c09ab59d07a2ca16fbc344a4bd47b06ae461487acf25734c9c07af17587198ad33e5330edc96ffea SHA512 8d148dbc7d2bb524a6f53a5d49350a6a5d0767b28924cbe3e1a725b15659483e571fc8f1e9ed423d8455c85cf10617d272e347e158e6c929b6b2598b6f05bdd0
+EBUILD lilv-0.24.2-r3.ebuild 1588 BLAKE2B d518f977015f285bbf2631a79f5767f94c064d03e5b1e75494327951a3b523719554b5164ca9514807aafe03384a855448a8721d3c8aa495e64e798836e33c4e SHA512 f115672494c74bb7493a35f7caf7e197fee2b413e549e501828419838a55a6280eb08a4252c808f2d4de2e11da93f24535d68271d2e51ae550808d984c101bea
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
new file mode 100644
index 000000000000..9b5c50d8fcf3
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	eapply "${FILESDIR}/includedir.patch"
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	newbashcomp utils/lilv.bash_completion ${PN}
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8c2ed5f31e0e..08ef3a6bc746 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,11 +4,13 @@ DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f657577
 DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
 DIST mesa-18.1.2.tar.xz 11124408 BLAKE2B 8327f16f41d59e6ec8d4145a8399503cf04799d437e336714760e4bdc563c483583363e32d41affc2365e977b96494156300910b1834bc9957504b6c0cf168fa SHA512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5
 DIST mesa-18.1.3.tar.xz 11126236 BLAKE2B 2315cdc95130ef604a86e3886abf9b15e6c7944fab3b3cc020358dd08a76f2b876904516e5c081d549b16240ae4dedd647402dd7bd8de4c91015bb601c0c2923 SHA512 f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887
+DIST mesa-18.1.4.tar.xz 11133392 BLAKE2B b0c205e5baa04bb018333ffd89942f86f19edd3f610cce004db23bad4ebc1a3379ea35e72c85ccc08c34c8bc0991c1f0b595227fae2259e4b76895542d3f25b9 SHA512 04b8e5bbfa640f2303c388ab701fc2aca7f6d5d127ca5a9f9409975556813ba8e94305d27c9cea236a0e6d44a38b97e2877509268a96d9ed2a6762ab385aa3dc
 EBUILD mesa-17.3.9.ebuild 14465 BLAKE2B 9fbe7ed8fd4f46d918288fe6f8b944d56cdd470c804d2786a19ef713b65c6b609e7286425c2cdc47aa52fd509af02eb077bea83ba04fa9dc232b2e6e19e59b1f SHA512 2f09d42d19cb4ef714d6b5fc1b6526f630393428522d98d24106d351a135e93eab172a2072e11cd9968e9c9e18da82b3f96cd7f6b0dc81ab316db80d6c542e3a
 EBUILD mesa-18.0.5.ebuild 14421 BLAKE2B d1170f83f571b84a1c3906b02aff38190c9586e3a22928b3f85b16c98448c928574faa18975bc01210c524d10221af679a894c975f83e0cdbca0146b553950a1 SHA512 a9d5c7284211a34f8022388838fedf2df792bac3188cc4e12ed4a5f362a978651b39c571402d798e559bc625708a2dd3a0363c19ccc43dfed9de81eda40e22b7
 EBUILD mesa-18.1.1-r1.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
 EBUILD mesa-18.1.1.ebuild 13086 BLAKE2B 1b16c276e43656dae8281ab4cf73540856b6745ddca81b11ee7ce2cd70ce376c24f370217b22b4756ef4271946806b36032a0a9ef225a37a17c848e70a652568 SHA512 6360affa7be25af6f9f97b4de04a42706bf1fae95dc4453a6480c62135792dd9ef6b3a1c1385fbf9c6dfa7e84243d3f9d09e3be0770b9d1005665ce5a5c9a602
 EBUILD mesa-18.1.2.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
 EBUILD mesa-18.1.3.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
+EBUILD mesa-18.1.4.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
 EBUILD mesa-9999.ebuild 11964 BLAKE2B 48537a7aae256d79f3a29075bb2e258dfd2876dd0c5f661b01cb3d23519be1505b15c3fe81a08686a0a1d7e9a84090203db58323794df06ba89fd56262d4455d SHA512 09462036738bb8bdce4550754eeb25f902a96a69c5f9743ea6e26f2a2e5253c8db2ea5f11f041e64c7b17454ce20381d006c7565c11445ab188b69048c4b15a2
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.1.4.ebuild b/media-libs/mesa/mesa-18.1.4.ebuild
new file mode 100644
index 000000000000..fab799310391
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.4.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/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 || ( video_cards_r600 video_cards_radeonsi ) )
+	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="
+	!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.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? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="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 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"
+		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
+}
+
+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}
+
+	# 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/phonon/Manifest b/media-libs/phonon/Manifest
index ba6f094daf07..401accc6c3d1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,3 @@
-AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc
 EBUILD phonon-9999.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
diff --git a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
deleted file mode 100644
index 5f478cac18c1..000000000000
--- a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index 3245e9b..3427c62 100644
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -178,7 +178,7 @@ if (PHONON_BUILD_PHONON4QT5)
- endif (PHONON_BUILD_PHONON4QT5)
- set(BIN_INSTALL_DIR             "bin"     ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
- set(LIB_INSTALL_DIR             "${CMAKE_INSTALL_LIBDIR}" ) #  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
--set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-+set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/qt4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt4)")
- if (PHONON_BUILD_PHONON4QT5)
-     set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/qt5"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
- endif(PHONON_BUILD_PHONON4QT5)
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index be3dce253787..3080d51106aa 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,3 +1,4 @@
 DIST rubberband-1.8.1.tar.bz2 177501 BLAKE2B 57ca56abc7db2f2a25ff7c900daf24f32a892a1ef27099d34ab8ad290344ea8c5884cbace9206bfdf75262ee0c30bec8d736ae5398d5aaf92f73d0d5980e6932 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620
 EBUILD rubberband-1.8.1-r1.ebuild 1318 BLAKE2B ef83174727b0932afa5aadd90c0beaf29d099d01dc259cb57803e0c717e1b367ca962034964587fa5743474b057a0a93d32c343c54cdd42d0d637b6071eaad76 SHA512 da3e700e934bec7f7b05382c277c7d6226446052729363503631562b2eedc6a9e88e62595817344f25c153462806c20e77f8d7c2daa13386521192b3d56ba416
+EBUILD rubberband-1.8.1-r2.ebuild 1342 BLAKE2B f8d1f872e092a3d8f7a76ed7626dcab553f4e11e36d474c222ef58dbaeb2661fa6aafb9c491b30cea2bf01f7ef39c79eb755f92800cca555e18e9ed4d52bac50 SHA512 f80a3f0d07ecabb31e299ac044ed064e6df3df631faadc6ec9df85e9f27c86efd46ab5e6c391dc7be9ff6ef1e8d17d07386949c922d50fd36038338b408d690d
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.1-r2.ebuild b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..754ed4704a40
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}]
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/ladspa-sdk
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	if ! use static-libs ; then
+		sed -e '/^all:/s/$(STATIC_TARGET)//' \
+			-e '/^\tcp $(STATIC_TARGET)/d' \
+			-i Makefile.in || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_install() {
+	emake INSTALL_BINDIR="${ED}/usr/bin" \
+		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
+		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
+		INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
+		INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
+		INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
+		INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README.txt
+}
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 9078e3100dc2..c3bcbbb03aaa 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1,6 +1,7 @@
-AUX sge-030809-build.patch 4020 BLAKE2B f503cd2e76f1cd6845a25816754c254c2873671452495eaa5709926677e12a3634cba33d23bdb38bebfda67169952df0f605484a6900fa70fe8205500d7731d2 SHA512 e6824fcd18226f416289ad96b2774f5f3339fe9feda1a77d797f5d0e229c4bb65b06ed3e92b00db4e12c8343b5c1bb1d7a208b3acfae7ca8001fac7666d9d029
+AUX sge-030809-build.patch 3874 BLAKE2B a01040b011494cdada26c22c163b7f478a59f762bb736370e0ca695ac02248e97ec640b30fb67592a51fd1229d5c8360525a74e9cb3fd8eeac2fcdc466b4cb58 SHA512 d685efed24604339013099deca3846bf1b5547a7518eeecdc36d36cee41a914f9f8d10d0880fbfe7f936ff3538396eff22bded91be553315bf57c6c126cca6a8
 AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91775af03e6d37e324b879176c838487b9537fa1aed9582258285ee80921a834a7b911df80b9ee06049cf435 SHA512 adf9018c09c8e2581d1693cee28224b65c605f95a8df333ab9f50fe14668b501d1e3ce39b91b43216f67f1d107c167b77be8aa28a9025b95ec8ea025e9d6a43e
-AUX sge-030809-freetype.patch 621 BLAKE2B 478e6105ccab4e2200d925cf015968181bd7b35bb6a2cb028f3739b90a77be5ea8a1b07a57163decd16102023b55345ad36517ef27c956bb62226f8a764c7816 SHA512 6a0d22209d047f607b4409519798947a06e0baa15ca628134fe1b503c90fa691274a5fa8a23f30a696f97cc74adb3ea0a2f75daa38e97454c579f223119c7e04
+AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
+AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581
 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1209 BLAKE2B cb5e1e660e0c79b48af5415efb1a67fc80375837295a2b6a7ecd6e4d9f888ec5bd1c31a0338ab419fb57de22de26c95b0f9dd4d7bc9bd2452a6d008548f12485 SHA512 5625b1f3ffb06898224a8269822f91a48986f95fc39bc291deb8c99fadeea22fcb0ad04f91ca7bbc60122c376535d295dc4b164da0fe326a49cae2f7c1793b27
+EBUILD sge-030809.ebuild 1325 BLAKE2B a05e59e3d3bbbacaebdd20cf084b17980a78fb26f9a3be18b7c4e2701764040288fde9a0f8e237ec39dbcffa473df3affa6844a89f1ffd1ac236fc665cce2177 SHA512 e956073120c740ffb6f8fc6a0ba82ac7e0f67b883de56d68360c3dee903f9473b91a37108b9f5e7690ef112cccb6fa950ea518fc8d16bc30769717441988c493
 MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6
diff --git a/media-libs/sge/files/sge-030809-build.patch b/media-libs/sge/files/sge-030809-build.patch
index 5b277a0a6b08..4ded0888a7f3 100644
--- a/media-libs/sge/files/sge-030809-build.patch
+++ b/media-libs/sge/files/sge-030809-build.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2006-03-29 00:08:39.000000000 -0500
-+++ Makefile	2006-03-29 00:09:36.000000000 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  
  include Makefile.conf
@@ -95,8 +95,8 @@
  	ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
  	ln -sf libSGE.so.$(API_VER) libSGE.so
  	@echo "** Headerfiles installed in $(PREFIX_H)"
---- Makefile.conf.orig	2006-03-29 00:08:39.000000000 -0500
-+++ Makefile.conf	2006-03-29 00:08:39.000000000 -0500
+--- a/Makefile.conf
++++ b/Makefile.conf
 @@ -11,6 +11,7 @@
  # Compilers (C and C++)
  CC=gcc
diff --git a/media-libs/sge/files/sge-030809-freetype.patch b/media-libs/sge/files/sge-030809-freetype.patch
index 7b638e4100f9..f07ce98256a5 100644
--- a/media-libs/sge/files/sge-030809-freetype.patch
+++ b/media-libs/sge/files/sge-030809-freetype.patch
@@ -1,5 +1,5 @@
---- sge_tt_text.cpp
-+++ sge_tt_text.cpp
+--- a/sge_tt_text.cpp
++++ b/sge_tt_text.cpp
 @@ -36,10 +36,9 @@
  #include "sge_textpp.h"
  
diff --git a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..ceb478f3d828
--- /dev/null
+++ b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/655798
+
+--- sge030809/Makefile.conf
++++ sge030809/Makefile.conf
+@@ -35,16 +35,16 @@
+ SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+ 
+ 
+-# Is freetype-config available?
+-HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
++# Is freetype available?
++HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;)
+ ifeq ($(HAVE_FT),n)
+   USE_FT = n
+ endif
+ 
+ ifneq ($(USE_FT),n)
+   USE_FT = y
+-  SGE_LIBS +=$(shell freetype-config --libs)
+-  FT_CFLAGS =$(shell freetype-config --cflags)
++  SGE_LIBS +=$(shell pkg-config --libs freetype2)
++  FT_CFLAGS =$(shell pkg-config --cflags freetype2)
+ endif
+ 
+ 
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 6bff1d0d2baf..159379bb02fd 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=6
+inherit multilib toolchain-funcs
 
 MY_P="sge${PV}"
 DESCRIPTION="Graphics extensions library for SDL"
@@ -14,17 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
 IUSE="doc examples image truetype"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	image? ( media-libs/sdl-image )
 	truetype? ( >=media-libs/freetype-2 )"
 
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-cmap.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-cmap.patch
+	default
 	sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile || die
 	sed -i \
 		-e '/^CC=/d' \
@@ -43,10 +50,13 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="README Todo WhatsNew" \
-		default
+	local DOCS=( README Todo WhatsNew )
+	default
 
-	use doc && dohtml docs/*
+	if use doc ; then
+		docinto html
+		dodoc docs/*
+	fi
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 251c8374c7b5..806183ec0ffc 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
+AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
-AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2
 DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
-EBUILD vulkan-layers-1.1.77.0.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
-EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
+EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f
+EBUILD vulkan-layers-9999.ebuild 1589 BLAKE2B 18735830fd91904282c3e7f38d1dcd095f96541fb41b4f504dc4fdc9f6d4d5daf0ec1c7cd207c07d96421dcd9e4d51656c3d847ad1845c1d0b1976a1222edee3 SHA512 b461f270d7cb92a6c9da25e737388899b122fd7b7d603b2da3a44e3e0e609d0e955903b0f3c279b92c7d04a7479c846ed11c3946bbb637ec6dd5aa3f41085b65
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
new file mode 100644
index 000000000000..d0b48a749c26
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
@@ -0,0 +1,68 @@
+From 4c0da77c705464a259b38944fb53cf747e4c0554 Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+Date: Tue, 3 Jul 2018 10:17:21 -0600
+Subject: [PATCH] layers: Rework include dependencies
+
+This change removes the assumption that vk_layer.h will include
+vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
+in the near future.
+
+Backported-by: Nick Sarnie <Sarnex@gentoo.org>
+
+Change-Id: I082ccc52c3cb8257bf57342404d52dd737009b4b
+---
+ layers/parameter_validation_utils.cpp      | 1 +
+ layers/vk_layer_logging.h                  | 1 +
+ layers/vk_layer_table.h                    | 1 +
+ scripts/dispatch_table_helper_generator.py | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
+index 17f95bb8..c65a4970 100644
+--- a/layers/parameter_validation_utils.cpp
++++ b/layers/parameter_validation_utils.cpp
+@@ -46,6 +46,7 @@
+ #include "vk_layer_logging.h"
+ #include "vk_layer_extension_utils.h"
+ #include "vk_layer_utils.h"
++#include "vk_layer_dispatch_table.h"
+ 
+ #include "parameter_name.h"
+ #include "parameter_validation.h"
+diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
+index f111cc5d..f67a3f55 100644
+--- a/layers/vk_layer_logging.h
++++ b/layers/vk_layer_logging.h
+@@ -31,6 +31,7 @@
+ #include "vulkan/vk_layer.h"
+ #include "vk_object_types.h"
+ #include "vk_validation_error_messages.h"
++#include "vk_layer_dispatch_table.h"
+ #include <signal.h>
+ #include <cinttypes>
+ #include <stdarg.h>
+diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
+index 45b8f6e1..23990a12 100644
+--- a/layers/vk_layer_table.h
++++ b/layers/vk_layer_table.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "vk_layer_dispatch_table.h"
+ #include "vulkan/vk_layer.h"
+ #include "vulkan/vulkan.h"
+ #include <unordered_map>
+diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
+index fba25e55..1e2412c0 100644
+--- a/scripts/dispatch_table_helper_generator.py
++++ b/scripts/dispatch_table_helper_generator.py
+@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator):
+         preamble += '#include <vulkan/vulkan.h>\n'
+         preamble += '#include <vulkan/vk_layer.h>\n'
+         preamble += '#include <string.h>\n'
++        preamble += '#include "vk_layer_dispatch_table.h"\n'
+ 
+         write(copyright, file=self.outFile)
+         write(preamble, file=self.outFile)
+-- 
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 0d5cb22f74d2..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 157e9e714c64f3148f09053454d15a25af550a28 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sat, 2 Jun 2018 07:01:28 -0400
-Subject: [PATCH] Use usr for vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt                            | 2 +-
- layers/CMakeLists.txt                     | 5 +++--
- scripts/lvl_genvk.py                      | 2 +-
- scripts/object_tracker_generator.py       | 1 +
- scripts/parameter_validation_generator.py | 1 +
- scripts/spec.py                           | 2 +-
- 6 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa2e87ed..85c3cc21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- find_package(PythonInterp 3 REQUIRED)
- 
- # TODO: Add option to override this with env var, or even to use SDK
--set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-+set(VULKAN_HEADERS_LOCATION "/usr")
- 
- # Output warning if vulkan headers submodule contents are not present
- if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h")
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index d67e8d79..35485e35 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
- # Define macro used for building vkxml generated files
- macro(run_vk_xml_generate dependency output)
-     add_custom_command(OUTPUT ${output}
--    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output}
--    DEPENDS ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${VULKAN_HEADERS_LOCATION}/registry/reg.py
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${output}
-+    DEPENDS ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py 
-+${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/reg.py
-     )
- endmacro()
- 
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 4dac9ca2..170bc0f5 100644
---- a/scripts/lvl_genvk.py
-+++ b/scripts/lvl_genvk.py
-@@ -16,7 +16,7 @@
- 
- import argparse, cProfile, pdb, string, sys, time, os
- scripts_directory_path = os.path.dirname(os.path.abspath(__file__))
--registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry')
-+registry_headers_path = os.path.join(scripts_directory_path, '/usr/share/vulkan/registry')
- sys.path.insert(0, registry_headers_path)
- 
- from reg import *
-diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
-index 8d4b68af..ac3020c1 100644
---- a/scripts/object_tracker_generator.py
-+++ b/scripts/object_tracker_generator.py
-@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator):
-         previous_dir = os.getcwd()
-         os.chdir(os.path.dirname(sys.argv[0]))
-         vuid_filename_locations = [
-+            '/usr/share/vulkan/registry/validusage.json',
-             './Vulkan-Headers/registry/validusage.json',
-             '../Vulkan-Headers/registry/validusage.json',
-             '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
-index 66ede40d..9eae6fed 100644
---- a/scripts/parameter_validation_generator.py
-+++ b/scripts/parameter_validation_generator.py
-@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator):
-         previous_dir = os.getcwd()
-         os.chdir(os.path.dirname(sys.argv[0]))
-         vuid_filename_locations = [
-+            '/usr/share/vulkan/registry/validusage.json',
-             './Vulkan-Headers/registry/validusage.json',
-             '../Vulkan-Headers/registry/validusage.json',
-             '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/spec.py b/scripts/spec.py
-index 4eeb46aa..212b0c57 100644
---- a/scripts/spec.py
-+++ b/scripts/spec.py
-@@ -28,7 +28,7 @@ import re
- 
- out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option
- db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option
--json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option
-+json_filename = "/usr/share/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option
- gen_db = False # set to True when '-gendb <filename>' option provided
- json_compare = False # compare existing DB to json file input
- # This is the root spec link that is used in error messages to point users to spec sections
--- 
-2.17.1
-
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
index 436c46fc5259..cbe189ea63ce 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		dev-util/vulkan-headers
+		>=dev-util/vulkan-headers-1.1.77.0-r1
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ DEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	"${FILESDIR}/${PN}-1.1.77.0-layers-Rework-include-dependencies.patch"
 	 )
 
 multilib_src_configure() {
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 436c46fc5259..b2e238baddb1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		dev-util/vulkan-headers
+		>=dev-util/vulkan-headers-1.1.77.0-r1
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 9ca81c798a52..519e56f451d6 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,9 +1,10 @@
 AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
+AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
 AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
 AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
 DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0
-EBUILD vulkan-loader-1.1.77.0.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
-EBUILD vulkan-loader-9999.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
+EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78
+EBUILD vulkan-loader-9999.ebuild 1582 BLAKE2B 66c19b3c7d53aeb752606921a61504a4298d6d714c36b27d809aadda683552fd19ab7640578b0a62466dc50651e4f0fea205587d81bfb99e2d0e5e5f3ad13624 SHA512 ac1ee088a9887eb45b8d26106b0e55cf84d14260dc251ba84e1f05be22320745207b2ae1cf32107e99a9d9d2ea86a324a4b636af5e9a28b0190429c56705bf30
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
new file mode 100644
index 000000000000..21fe853ce4e1
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
@@ -0,0 +1,54 @@
+From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+Date: Mon, 25 Jun 2018 14:09:51 -0600
+Subject: [PATCH] loader: Rework include dependencies
+
+This change removes the assumption that vk_layer.h will include
+vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
+in the near future.
+
+Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c
+---
+ CMakeLists.txt                             | 2 --
+ loader/loader.h                            | 1 +
+ scripts/dispatch_table_helper_generator.py | 1 +
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b942bd47c..64f498945 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -201,8 +201,6 @@ if(NOT WIN32)
+     endif()
+ endif()
+ 
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
+-
+ # uninstall target
+ if(NOT TARGET uninstall)
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+diff --git a/loader/loader.h b/loader/loader.h
+index 0af2abf27..c39c5385e 100644
+--- a/loader/loader.h
++++ b/loader/loader.h
+@@ -34,6 +34,7 @@
+ #include <vulkan/vk_layer.h>
+ #include <vulkan/vk_icd.h>
+ #include <assert.h>
++#include "vk_layer_dispatch_table.h"
+ #include "vk_loader_extensions.h"
+ 
+ #if defined(__GNUC__) && __GNUC__ >= 4
+diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
+index fba25e55e..1e2412c0c 100644
+--- a/scripts/dispatch_table_helper_generator.py
++++ b/scripts/dispatch_table_helper_generator.py
+@@ -113,6 +113,7 @@ def beginFile(self, genOpts):
+         preamble += '#include <vulkan/vulkan.h>\n'
+         preamble += '#include <vulkan/vk_layer.h>\n'
+         preamble += '#include <string.h>\n'
++        preamble += '#include "vk_layer_dispatch_table.h"\n'
+ 
+         write(copyright, file=self.outFile)
+         write(preamble, file=self.outFile)
+
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
index 4f7ccd73988b..28a5a5566365 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
@@ -26,13 +26,15 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	dev-util/vulkan-headers
+	>=dev-util/vulkan-headers-1.1.77.0-r1
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}"/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch )
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 4f7ccd73988b..0331bbbe2b69 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	dev-util/vulkan-headers
+	>=dev-util/vulkan-headers-1.1.77.0-r1
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 80b59032e7be..b5961779df79 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,4 @@
-AUX ffmpeg29.patch 1861 BLAKE2B c4045b93f352ecec5668fce239a04108f273307d3221b0c2a48cac64ebc6d556b8bd5efdc7e12bbcd3b1783b28492a72c969fd257192064dc0e6a808eb74ad87 SHA512 3697cb1ab8801a1d091aead3e50837946e6d8f6c6329341ced40039ebb6ac68b6e186ff2bd2f2ec5d517e5ed45bfb61d0cd21921f255e1ad768c186faf75beca
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
-AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d06662659d59c8f15e0b378518117ba55b7ee5a5fd55cc8fb7c896e2cbc80d297fd1b89e8437c6278d7e442453779e5f933f930 SHA512 c3415c9a0f65ec35dcb59b6880905ae525c6cfc38a42578d96ac713a4426b642069613e4234903e46e852e8f33b4eeab3ffce3864ca672efe8170ae987121783
-AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.9-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60
 EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34
diff --git a/media-libs/xine-lib/files/ffmpeg29.patch b/media-libs/xine-lib/files/ffmpeg29.patch
deleted file mode 100644
index a220483218c0..000000000000
--- a/media-libs/xine-lib/files/ffmpeg29.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
-   int got_frame;
-   float gain = this->class->gain;
-   if (!this->av_frame)
--    this->av_frame = avcodec_alloc_frame ();
-+    this->av_frame = av_frame_alloc ();
- 
-   consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
-   if ((consumed >= 0) && got_frame) {
-@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
-   /* try to reset the wma decoder */
-   if( this->decoder_ok ) {
- #if AVAUDIO > 3
--    avcodec_free_frame (&this->av_frame);
-+    av_frame_free (&this->av_frame);
- #endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
- 
-   if( this->context && this->decoder_ok ) {
- #if AVAUDIO > 3
--    avcodec_free_frame (&this->av_frame);
-+    av_frame_free (&this->av_frame);
- #endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
-   this->stream                            = stream;
-   this->class                             = (ff_video_class_t *) class_gen;
- 
--  this->av_frame          = avcodec_alloc_frame();
-+  this->av_frame          = av_frame_alloc();
-   this->context           = avcodec_alloc_context();
-   this->context->opaque   = this;
- #if AVPALETTE == 1
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
deleted file mode 100644
index cc17643d9c56..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.xine-project.org/show_bug.cgi?id=572
-https://bugs.gentoo.org/584640
-
---- xine-lib-1.2.6/m4/video_out.m4
-+++ xine-lib-1.2.6/m4/video_out.m4
-@@ -305,7 +305,7 @@
-     dnl xcb
-     XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
-     if test x"$with_xcb" != x"no"; then
--        PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
-+        PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
-         if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then
-             AC_MSG_ERROR([XCB support requested, but XCB not found])
-         elif test x"$have_xcb" = x"yes"; then
---- xine-lib-1.2.6/src/video_out/Makefile.am
-+++ xine-lib-1.2.6/src/video_out/Makefile.am
-@@ -147,7 +147,7 @@
- xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
- 
- xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
--xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
-+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
- xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
- 
- xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
deleted file mode 100644
index a7168d5b4506..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix build w/newer glibc due to major/minor includes being dropped from sys/types.h
-
-https://bugs.gentoo.org/580012
-https://bugs.xine-project.org/show_bug.cgi?id=574
-
---- a/src/xine-utils/xine_check.c
-+++ b/src/xine-utils/xine_check.c
-@@ -55,6 +55,7 @@
- #include <dlfcn.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <sys/utsname.h>
- #include <linux/major.h>
- #include <linux/hdreg.h>