Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
author: V3n3RiX <venerix@redcorelinux.org> 2018-06-02 17:13:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-02 17:13:10 +0100
commit: 0bff53119f08d677db6c1a991bd30741682a8a08 (patch)
tree: 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /media-libs
parent: 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (diff)
53 files changed, 254 insertions, 832 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b1d6c477d362..48524e1199ff 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 69adb3ffeaf0..fa2ee9411cd7 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,3 +1,3 @@
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4.ebuild 620 BLAKE2B 48dce29d6f60a204e17691744375acce4fc5214c26bd3201325e6cc3108811c7300b5df1de17340a59fab3faec9a160caca98c2ba4fd613030d05cbca471fc96 SHA512 3701912187738433f839cf4d99fe99d4d4e17e9366bdd46b89ea71220991aab2ccb6228c0cdcef34094a8b4d808471bde1bc7915335434a0db7490c1955f03ab
+EBUILD bcg729-1.0.4.ebuild 622 BLAKE2B 63cf260f9f9ad470eae1ea824d56a67ceb29611cbbce6d3b318aae9062ce57b9e13bc4c361d17b3ce3ccb361fa63e69b8758754f5a1f64f97118aa7359fe97a2 SHA512 bc37d135e6a01876ac8d1bceefca1f0951710d90bf1116bd983bcc3f112d3af735c89b90cbdd6d3c57a436fea9c1c037c3665d924e01c8630368e609b41930a0
 MISC metadata.xml 213 BLAKE2B be9f4b06d7567b80dc4d16cb47551ef3e825a84f13897115ef207911582b9062e23181c5d7583fbe1a8299e563eefc7cdeee4114d36ab911f685fd27b294d23e SHA512 b2ac78c6617cda0ce08982f7a56bbedd709df884c5ac51b5ae4fdbc36eee2690a177afa507206d8e3914c0e1b80d96291a329164a1883b7c76e5e4eae376b667
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index dff0967147ac..efe46a208633 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
diff --git a/media-libs/celt/Manifest b/media-libs/celt/Manifest
index c3a39cb0a9e0..3f28ff97fa73 100644
--- a/media-libs/celt/Manifest
+++ b/media-libs/celt/Manifest
@@ -3,5 +3,5 @@ DIST celt-0.11.3.tar.gz 465020 BLAKE2B 9f6221edd77c117778eb5ca188c21430905e1e540
 DIST celt-0.5.1.3.tar.gz 440772 BLAKE2B 680be58bcca806ef2135a022cd01103c1518c883868abc2aa60a1ff8c555a0646310901cc5bc01d2b330054af8b5729303d8aa6b3ba58395f7272862a5d5a7c9 SHA512 bf5621dc3ec1b0808bdd83f006fd7b88df1b6caffe07e18eb696c268b31c6c7127329ecb4c9582c44e0ecf9577bbe2f3dbe40f15b80f8681bb7f4115f1501921
 EBUILD celt-0.11.1-r1.ebuild 826 BLAKE2B 330e3a87c22bd792be4da505df444c88f3d34f40d1e9ea37a8756ae43f37a0442830b22d402edb6f89c1d76693309eb8502b61e044376ea037c663331ab49e9c SHA512 08e905b2ea0b2ea435faa2f46c09f6d49150140c77a9627c4275db9eef6a175d8f51d0ccc264f1cc271a55dc915157a539c4047b53df539af042f544df27f0b6
 EBUILD celt-0.11.3.ebuild 1080 BLAKE2B e07796888e2471c1db182d5eb76a650b96345de10ef7d8aeaf0e9fc2a80774078810ed93747cdd59d1cb0be8bbc0662ec984940764be06fe5d1f434cf7366358 SHA512 0771df4e2d1223d4b18fa36b704a45d5edaf5464e48b37d24eff49c6c6f4405068d4ce1259ccc1184d7fe5c1049e82fd19a9a4b0f08e19c99a1357a765521233
-EBUILD celt-0.5.1.3.ebuild 692 BLAKE2B 19fb7f2e5acff2cedf7e1ffde9e88c33e7cfa433bc0d308736cf5076bbfc1f5a61e3a20e9ee2f1240431733935930bab8967ae28ee27d67ec0a04d5e92ee2e61 SHA512 490f087ba8a6a857b9c9aa05f6a81663a484ff5d4abf559c8e219e65e8a2795850fc57da5b52219d509a51221e99543ada6c7b65e1a684565bf25712eb6fe575
+EBUILD celt-0.5.1.3.ebuild 751 BLAKE2B 7d9503b2a3e7b800d73261b1a0c5e79d698b8f38c8901fd32d79bd19dd6407077452ab5a12d01363f49714114c7296ab8724277f2bf199492d59e2565b8ff460 SHA512 19bd7739f5b287d26c063bfd3aafc4aa17cdeffe75a9b677f89e831f5c5badbb33f3e402ad76a4f908609a2ec80e9c81a177bdfd031faaaf87d5da1991d413c0
 MISC metadata.xml 375 BLAKE2B 9d1464b5bbf9fca2dbf6b926da41d7beb3bb6cd0a4fd5f3b887a68e0c953886c74376c3739e041411838c8afd3639a115a0cad1fbd812f58770f9bcfd455afbe SHA512 0e4cadad691e660d7229130c3348b902634c07d0e21100caf352fc1c8578af75c9c4418c30e5e9bb9943c0b72a8b4a18abd056362e07e6d071503330c9443b4d
diff --git a/media-libs/celt/celt-0.5.1.3.ebuild b/media-libs/celt/celt-0.5.1.3.ebuild
index 8d4ede3a5894..9f9e2598cac0 100644
--- a/media-libs/celt/celt-0.5.1.3.ebuild
+++ b/media-libs/celt/celt-0.5.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="2"
 
 DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
 HOMEPAGE="http://www.celt-codec.org/"
@@ -22,8 +22,8 @@ src_configure() {
 }
 
 src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die "Pruning failed"
-	fi
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README TODO || die "dodoc failed."
+
+	use static-libs || find "${D}" -name '*.la' -delete
 }
diff --git a/media-libs/dssi/Manifest b/media-libs/dssi/Manifest
index 673cd3453681..fcd1b4b3f0f8 100644
--- a/media-libs/dssi/Manifest
+++ b/media-libs/dssi/Manifest
@@ -1,3 +1,3 @@
 DIST dssi-1.1.1.tar.gz 712038 BLAKE2B 426fcbf5eb9024b6b0a4fad34fd8c0e0b18ff8eefdab22902cd929dae86be55d8cdc01e92c0c75c9cf1c6e5918317109b78f8aad4d2db0abafd6d9405eb285e4 SHA512 faf35ae851b889ad17a8ba624c713af8a5f33bb93db8e34842e8b778a0e36c3eab9ab712a40e4ca7ecd96954f3e70504d89a75b3826dd138332085e176c0d34d
-EBUILD dssi-1.1.1-r1.ebuild 896 BLAKE2B 391fa09f273f1968638f1a8adbc4376bf33b08c4408b39c0a30566ca2c1de774d1f5ea4cf6092016bf6b379f52ea33173a6d61926af6439fc9e90e1599b73c84 SHA512 3bd2d25f5044b21284f9db9cc3230b5be349bf23e6305a273e857cf481c0e19b155b377b7bb2f6835629ec4cf7d6f96739712dbc5b73eb45fe538fe5cb091f76
+EBUILD dssi-1.1.1-r1.ebuild 900 BLAKE2B 1df3be9f267ebe240ffdd8bfbca1611b6d39323c13d8badd6076898ac8f428e57accb057f5e6a06ca08ba17aeed578bf155223ad384bdcd615890770bf02075e SHA512 54c49d8adeac4e847ee60421063b6331af41d68dcec8ff44d5f44f02e6991324bfe18f247c09f2ec4f54c238a750c74b36ef5a8eef895ae189bcca92ecc0a4b8
 MISC metadata.xml 333 BLAKE2B e39f496c64a33bc34c7f8f6401731cad91786984d96c0707e4fa3c8d21157f54a0b4efba3d654a3fb19b51a85422f93962730e28ad1699ed0b2e80f1d8864f1a SHA512 051e33a55f071b13cb45d35abc79ae192a053e55186051f5cf166c126145d222739e16e96e59ee58d119b103568714eae67d149a6861332d19fc0a5a8c8fb83f
diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r1.ebuild
index 686a3cb12271..ee5f8943082e 100644
--- a/media-libs/dssi/dssi-1.1.1-r1.ebuild
+++ b/media-libs/dssi/dssi-1.1.1-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	default
+	eapply_user
 	sed -i \
 		-e 's:libdir=.*:libdir=@libdir@:' \
 		dssi.pc.in || die
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 1972cb54a589..47a15b3eb5c1 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,3 +1,3 @@
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5.ebuild 2037 BLAKE2B 108ff2719261c4d51fc1c5485786a9d6dc85b4b9f26c11bfde9d018f168cf975b9653cba5e9835c44c7645aba687c07205a2220b05bd2fcda354104028aeb087 SHA512 3cdb9f04ecdaedc2b2dd5b02a7d0ab860e2825cf0162bd9cdb605cb2b1e0073fc23cd846cb39503de58eae88330f9563f5f987fb809f60084c6394f8f3a7b4c5
+EBUILD gd-2.2.5.ebuild 2038 BLAKE2B 94e061857acfd83a4142d7ed03992f96fe5efca3c0da4c0fc1ec5de2dc8c3f949849b1753155cf8b098ee335f4d60cd6acd2a51b34d065b691e48195e0f237a7 SHA512 afdca8fa6b31f1842fc2a825b97ec02d4a006654d42d65b56635ec632423d97f622a3f6293771ca5f5a7343a606db19a79f466b5554d93d5a8b0ab3cdc5c68f9
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 33273e3ba801..545b781f4045 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index bda94b76289d..6d9b1ab4f71e 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,3 +1,4 @@
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 EBUILD giblib-1.2.4-r1.ebuild 895 BLAKE2B ae292f6ea1c0688a20d4fd63172e469fed0a3cd42fa2be8c3583404166139a15a28e9d965b51ba3102dbe335aee30e939e8902f21244c727f0c65e316dbb4f1d SHA512 d79eac983c0c9bb85d11951eb672672cbb70934aef5ef9d470aef929e318acd9b20ae72118e22fa37a2253a75d6472ed43132011b94463ec5a7a0bd754b43da0
+EBUILD giblib-1.2.4.ebuild 681 BLAKE2B bdaf9b49e82de1e24c8e7ea7a6068693694347a7b91e0b8d7448bd5695633a4a73836d0d6353efaeae6174e024bd40d789b1987a37ed49b5e705e83e2775971d SHA512 4cefd326bdb2a4074c076f91de822fbe254790bcf90138a208ddc5307df9d8ec74db22e14f1962e59970d436922e0d366055545a3eceef83c33100578663290b
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/giblib-1.2.4.ebuild b/media-libs/giblib/giblib-1.2.4.ebuild
new file mode 100644
index 000000000000..34c96c37ca4d
--- /dev/null
+++ b/media-libs/giblib/giblib-1.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit epunt-cxx toolchain-funcs
+
+DESCRIPTION="Giblib, graphics library"
+HOMEPAGE="http://www.linuxbrit.co.uk/giblib/"
+SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/imlib2-1.0.3[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	>=media-libs/freetype-2.0"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epunt_cxx
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -r "${D}"/usr/doc
+	dodoc README AUTHORS ChangeLog TODO
+}
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 03acf19a6485..121f1d32f13b 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -9,5 +9,5 @@ EBUILD glew-1.10.0-r2.ebuild 2315 BLAKE2B 403bf435c4c4ac04b2004771d7693e0798c1b9
 EBUILD glew-1.13.0.ebuild 2363 BLAKE2B 7697beed6e91c72651668f22a99fd4056d767a41d49e97bd4b19a2eb62a065d8e12073e3a16ce47afee199d05f0b672a9f6c72e37ff2b942aad8373c08ca2e71 SHA512 2cb6bc63987555d2318beee186cd1067637540e0f9743248cfcb9355dcc65d1c5bd58bdcd31994a42c2d3a20cf25acc7c40bc27399b1d6daf32dd194072882db
 EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
 EBUILD glew-2.0.0.ebuild 2481 BLAKE2B b5bd5d5548b813dd8a7d3417def5b59d94c51cba7288ece7f54caa7427598afc0671378091f867c5923b95a7dc2965eb615d23ddea1ad3bc9fa07aec715506f4 SHA512 892f40d7db982d74e528570479add88b60b8552339a5762973dab1412061bfa4fe963e2d0c19b7c504f66d966086d4cd23d64244ed62c19c99177602b2c01a50
-EBUILD glew-2.1.0.ebuild 2513 BLAKE2B b8c9f8cac57435196d09f9536a6d2dd11c7236922b99d2df76584c1a04f57fcf505fb21589696e7267b1ab4e63834cad1c84f58cc99f35a9961870950eb431a1 SHA512 40be22ce95d3e618803791ff13ecd40554ceb56cbc8a8cdc1a5cb10800f02b00c22b417fd35b70323a27a718ba68f4a56daec0a0ac06d87a8778b774cbc4c0e3
+EBUILD glew-2.1.0.ebuild 2514 BLAKE2B 3405ce81a1f6e8c8b1ddb50e0698d9cabf3606c08303fc2a2b184f1a90733a17cbf972836f1d5b92f9e3b3171e6b216f0a62d414faee1548f84303e38963980e SHA512 db8380ca88da0d1214979e2c12520bcefae9d5d5804b5242a8abe145910eb54ca75333bc35b93a51a0dacfd1d4f7536d5678e460d1a9520824f42beac43cb5cd
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.1.0.ebuild b/media-libs/glew/glew-2.1.0.ebuild
index 68426a2fd5ea..cf43bf32b3c4 100644
--- a/media-libs/glew/glew-2.1.0.ebuild
+++ b/media-libs/glew/glew-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index ebf5cad049f1..0fae2cea86a2 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,7 +1,11 @@
 AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
+DIST glm-0.9.6.1.zip 4232099 BLAKE2B ba8e9fc4a4401f9a78c46f6eebe5fdd6bd9af14f8c65bfcac7b61988b551ba27bf8d28f3a50f3f619dad5a10e11adb6988f9408227d10d738ea6d809d81db0bf SHA512 7f1468c5e60e65181f4685a2429fa8d70350a3576175a55b7c9e8597a03837cb84aeaeb88d311e1e1948c5bd90ad9cee9286433cb78fdee54b0fbe5313ce2f84
+DIST glm-0.9.7.6.tar.gz 3457100 BLAKE2B f9c0e481dbac76fa8922d4f58f2d4d60f0735a44a249b1136aa519f7638c21fa193e8c618c784b8b3adbbcf3838e9dbd6ff6a22a2708483bfc39bbea5a24494a SHA512 d4e1e173405c11b5744df8dc12f0848cd84ab27b868434c0f8fc74f15110b78606564991f3063ccc97e68a0aa1c1cb4a1b40ba6ce7feffb0d1a23c3e5cff315a
+DIST glm-0.9.8.4.tar.gz 3769208 BLAKE2B f675d110d1ceb16ed8afe171fd537254bef68790eca010677a15db501f964e0f7ed7a2cacc93e17c71140e7e3cd9a36a12222f0a40c908d01c405ae335be3016 SHA512 ff0e0651a695caebe9235882d14e09546d52b3cdf66cca8e2078f15b02a3fca4e47bd97d2807aa329f76aa633af3b4999501bd4d0b22ad44b00558d4917f39ed
 DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
-DIST glm-0.9.9.0.tar.gz 2716220 BLAKE2B fa48b318532cacd7d89325c615005b028e88b0702ed9248543f7d9a8e201dd6c130a63498d335289c452708dc627ebafc9654888b6db23ff238352fee638f236 SHA512 b7a6996cb98bc334130c33a339275b50ea28d8dfce300f3d14ac52edf0b5c38bf216d318f411e898edef428876c0b2d1f6a6e951f160f31425fe0852ad150421
+EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c
+EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5
+EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541
 EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.0.ebuild 858 BLAKE2B e9bdf5cc1f28f4f182c4755afc0d7f476a6dda7be107e1d84c01f015bc147f2b124bc1197bd42e3c515ac7e07a5872431bb4bbad79d03ffcffd451bc1ce74ed2 SHA512 e8cc8fe5696e2f77ff1c3d003cce52d540ae9a1154bbac1c5b68577e7df980c35047055593d07203c5065ee3b13d027f1f28495bde6ed8714e440e11c40a5dc3
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.6.1.ebuild b/media-libs/glm/glm-0.9.6.1.ebuild
new file mode 100644
index 000000000000..730a756af3b9
--- /dev/null
+++ b/media-libs/glm/glm-0.9.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="mirror://sourceforge/ogl-math/${P}.zip"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+src_install() {
+	dodoc readme.txt doc/${PN}.pdf
+	cd ${PN} || die
+	insinto /usr/include/${PN}
+	doins -r *.hpp detail gtc gtx
+	rm "${ED}"usr/include/${PN}/detail/*.cpp || die
+}
diff --git a/media-libs/glm/glm-0.9.7.6.ebuild b/media-libs/glm/glm-0.9.7.6.ebuild
new file mode 100644
index 000000000000..434184d6146c
--- /dev/null
+++ b/media-libs/glm/glm-0.9.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+RDEPEND="virtual/opengl"
+
+src_configure() {
+	if use test; then
+		local mycmakeargs=( -DGLM_TEST_ENABLE=ON )
+
+		use cpu_flags_x86_sse2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE2=ON )
+		use cpu_flags_x86_sse3 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE3=ON )
+		use cpu_flags_x86_avx  && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX=ON )
+		use cpu_flags_x86_avx2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX2=ON )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/glm/glm-0.9.9.0.ebuild b/media-libs/glm/glm-0.9.8.4.ebuild
index af2730d813fd..c1f45f53b1a6 100644
--- a/media-libs/glm/glm-0.9.9.0.ebuild
+++ b/media-libs/glm/glm-0.9.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,20 +11,19 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
 
 src_configure() {
 	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
+		local mycmakeargs=( -DGLM_TEST_ENABLE=ON )
+
+		use cpu_flags_x86_sse2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE2=ON )
+		use cpu_flags_x86_sse3 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE3=ON )
+		use cpu_flags_x86_avx  && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX=ON )
+		use cpu_flags_x86_avx2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX2=ON )
 	fi
 
 	cmake-utils_src_configure
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a366d1c93aa7..25f27f3dec00 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,6 +4,6 @@ DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
 EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
-EBUILD harfbuzz-1.7.6.ebuild 3254 BLAKE2B 9509b338dd156440ce72a45f39f35dae51690a69b86979eb766ee8f3925307fbf9a8f6218c5e0c9314a25280ae306bb2af2a2a69ca5c77d8e3143b9c144404ed SHA512 b9526d44a37d2783c1d1755e8ca5f0a04b7594a0381faf3f390014d53ffe4510bb9f496b7bbbe33225d07b1ffe7604229cb812b227e92312a0217eace53ec7ed
+EBUILD harfbuzz-1.7.6.ebuild 3255 BLAKE2B 5ed71758597b9e6fcf7047c2976c9f8770dd17843eba4009e5deab472e888f9a3bced0ef40c72ef0c6c3a91685ee8f17ccc0a9588252ca6bed529da3d9604d1b SHA512 ef51ef45af19c56068adc21e7e964cb2de2dce82e4fcb0bd7c8c5150439cdd5515644857f49ecdd4bf2cd104b8349bd6f31e3341a68bc407f9a03119b817de48
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 588c83ce9b5c..190e46d04b77 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.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/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index bcffcf40d586..0c9ed8a7d755 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,11 +1,11 @@
-AUX ilmbase-1.0.0-asneeded.patch 434 BLAKE2B 0bdb50ec8def23f821b8fa820c7f680f7037bd641213b5a881992141fd7afab11512f10441b94b4d596919663e59b39d56eda44415992b45a3b900b31534989e SHA512 b282b6fc8eb7a26a992deb49e62ecfa55208524b703a1e09edc53575b18593cb3d750a873f31d87c13b303fb737e64a22ef023f56be6a6fbb27e1c38861ab191
-AUX ilmbase-1.0.2-gcc43.patch 294 BLAKE2B ca179b94dfa7db269502772fefd7339281ae5c252db942da0eb527e6d782fb7a225caf3b947bacdc52605156006fa0fa1305df84842eedb3f6d80bea184683c8 SHA512 d891afedb80b2e1270469eeefce9497a025b308d88ab9b71b79130cea864f927782b00ae890cd2cc6c115e9efd56df449c4d0a5b624527faf9c33917b0bfbf64
+AUX ilmbase-1.0.0-asneeded.patch 430 BLAKE2B dc57749e5c56c54b1f596fdabdc1b7ee59da67a6d0eac2cb445ba0733657e28753d443867219ecd3751af3c2c7ccfc556e6237f6e6b8dc88030bd4934e9c358f SHA512 ee217602f51f146324c277f3876d9fe6f23524e9e7d81c00707b7a29a0edcaa200adf2e8835485f04c4b7914b7fcfc8307dbb984072d895588e4e10ef0cff525
+AUX ilmbase-1.0.2-gcc43.patch 290 BLAKE2B f10e2cc1a3f1c1f883b69f9abc478fc23504c5eaed797a3c50e2e6aaef86813ed8e3db436c649c76a08244acce8b78782bcd8e8b86492294b9baf10d0b1024b9 SHA512 7436f6ea0bc6a25a6496566b2d3169f11103fd5376dfa7883bc0a420e32d2f2dbcd94ad02cb7eecede36ac1d0f27564d9b442c4ee9d82c19a9c7c1cba51204cf
 AUX ilmbase-2.2.0-Remove-register-keyword.patch 2582 BLAKE2B 04c54acec24b523e657ea9b5db787c4ab82fc43748c3fb47589a03f376eba31622071ae42a9ad1df4170d3dc832a9853d57ae458750d5e5241f41c5e0121fc38 SHA512 786b2edc895efd06fcfa78441704ea0ec9608d872d0953212adfe83f9a9c2c838e9caa88dfe9fab140a237e645ac90d8a099761057e3cc6a4e44865cc316459c
 DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
 DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
 DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
 DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
-EBUILD ilmbase-1.0.2.ebuild 730 BLAKE2B 018474bd4196c2ee89f1c9e14359d2c4cfbf9b8277ae4cf1e5ee4a2be742ff0884881bf9967c28be6cf27b13edcf5e753222e5991be20239ee9604710fd98e8b SHA512 0e746dc823c5ea990a2f05329c45716ebff1c7094097a3095fd513a0a82f8c5a47688b57d37e9c158574a15947aa85426398aec728a89f825a4c5b1ce371407e
+EBUILD ilmbase-1.0.2.ebuild 800 BLAKE2B 2527e4bf3601d64423e7e46b897bdf524c60dd0e369314e9bb0ab04f06c2f0812c226bff55dd885eb5083f43dc4b9a593e9a98b03856056c1eb1f33b18999eaf SHA512 e302e98e65e0620e0367d74b0a797578420ad540394e8ee307883b70a1d1673e863ae418f4e00966960dc5c39be4d43649e84f2338cb0fea31a5b79e7c8557a4
 EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
 EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
 EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
index a3953efd3513..dc69fb983636 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
@@ -1,5 +1,5 @@
---- a/IlmThread/Makefile.in
-+++ b/IlmThread/Makefile.in
+--- IlmThread/Makefile.in
++++ IlmThread/Makefile.in
 @@ -209,7 +209,7 @@
  			  IlmThreadMutexPosix.cpp
  
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
index a4e186058fe8..d822092254d8 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
@@ -1,5 +1,5 @@
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
+--- Imath/ImathMatrix.h
++++ Imath/ImathMatrix.h
 @@ -37,6 +37,8 @@
  #ifndef INCLUDED_IMATHMATRIX_H
  #define INCLUDED_IMATHMATRIX_H
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
index b92d275e1df2..eb979ea8ca4c 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit libtool
+EAPI=2
+inherit eutils libtool
 
 DESCRIPTION="OpenEXR ILM Base libraries"
 HOMEPAGE="http://openexr.com/"
@@ -16,22 +16,20 @@ IUSE="static-libs"
 RDEPEND="!<media-libs/openexr-1.5.0"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-asneeded.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-)
-
 src_prepare() {
-	default
+	epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	elibtoolize
 }
 
 src_configure() {
 	econf \
+		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+	find "${D}" -name '*.la' -delete
 }
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
index db46c63bb3f9..a2af205eaaf0 100644
--- a/media-libs/libclthreads/Manifest
+++ b/media-libs/libclthreads/Manifest
@@ -1,8 +1,10 @@
 AUX libclthreads-1.0.2-makefile.patch 917 BLAKE2B c5a84695e1706ae23877de6b382477cc039768efc3bde862228d8dae33dc2a8c4227b796fb9c45cc4e4a4312ce749f18f37d97d83107e30e9a740272ef80a8ff SHA512 2a50e274c92103c8ea922174666f9aa69f88161ee4d6c52a34aa4b98d7d5fb1ef72326d627edf84e72b5fcab2b96c5335053e59ad428d0099c79bc2b52bd50b5
 AUX libclthreads-2.2.1-Makefile.patch 1462 BLAKE2B da80c7e3382cb5b5961ed4b3ccf4a47e8e4ca6652414dc85abce329ae906030c8bda18c94ba90659079f587fd68a7ea657588ce919dc589e3bc2fc2f9a318788 SHA512 f89d4746ed938f95ed12f04c01150c384c1c117808504f40a4399121a7a6e6bc32d4dd9e518a705842e7ac9a4f4547618000d76381c212a6042fe93dbba08cf5
 AUX libclthreads-2.4.0-Makefile.patch 1589 BLAKE2B 13640b1e9a449e87277c5a89fd1df71b8cda59976b0db0d8102593c84880131ff82002f64f1157838d7297b01cd4ffd66665712d503706131c91f330bd945d86 SHA512 3b58b701d46027d5c1fe7c540b100e1a62059db3d1c3b4c2201ab2e02557de5393a3b1eace0656fab4ea14089a35752e5676f1a52a2a3ed7c60f5fea89abae75
+DIST clthreads-1.0.2.tar.bz2 5681 BLAKE2B ee3da306c93239d75214057ae29714cd49c86e50ce36e0ccbeeab44aeca97a20684d1a76993e3d80de6238d4402515fb7a27a4a375bda2c949f18116cdb7c90f SHA512 09ecccae900162271ba9188bf86fcf4094f1008928ff022a98007342c1663226ba74eece7bd820b8483939f876f7d85e47d7c77dc8de37006d11b00abf4c2028
 DIST clthreads-2.2.1.tar.bz2 5968 BLAKE2B 4326f517fbcf24dad200edd93e79e0c067aae4b47b9f24c34d0737ab24ca3103cdc25522a360d9af3788bb0a4750031cdfc90c7f865b875b65eb02ae4d6d7f4d SHA512 0f0fe2d296a32ccaa4073629007ca762ed9f6c1d901d8cc8ac2aa65255c80cc6fee4ea353c914729b09be5e67012add794edbc92015e23d0e96da904dc2c3e14
 DIST clthreads-2.4.0.tar.bz2 14796 BLAKE2B 7c79608b8ebe29a8170a355069aa39496f785146a272edfe048e7dc61100302b56789ab5faa0aaad227cbe8b44eb660132f1ba22d34d304e417301d8582d5431 SHA512 c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
+EBUILD libclthreads-1.0.2.ebuild 736 BLAKE2B 8e2e12980cf185f89891ed5a45e327a4daad883f0a735feff4b3db0bc1422c97a354c4def0ba8351ebfa2f880f90aa1d898c5402fd9f7d10eda2f4dba7abe12a SHA512 c0fca0647b9085a2da10da5ea1ad5ab2cf3de27f2ce61a79548e910c17a192b51bdc68aca009391776211e8ef72bd3cfd2cb09bc8ee85052222e55a9ff469758
 EBUILD libclthreads-2.2.1.ebuild 774 BLAKE2B 4b044a79a7ccf4bd9a95d06882f4554a5c179adab4edf009d22462cb7fa5aeaf67d931186e46992d8aee33a1cc2423c0b97a517621966d12f28e49ea2bc0d2d5 SHA512 8fe28fbc5d0f63e1333ffb3eb2d017fc559629b6af358c2e5db1976eb68ff6d91587625b41ad354ab9c525f161f3e21fb8465cebe22646e0fe79cd429ab14260
 EBUILD libclthreads-2.4.0-r1.ebuild 739 BLAKE2B 8eb9711168dc0f54f2a662aad9f1595950e4c554fe016550532490dafadc2c137e67d1518e6346653df4e0f73aacb04a714022861f363023d164f688738ec807 SHA512 41cfe771ca41c61052cef3205a68864fd96e1ae93da38f22a30d72e0f1064fb95c55c122ebbdb88b97513b2e7feaa263dc5b01f9837c5c11e05420f43cca4714
 EBUILD libclthreads-2.4.0.ebuild 785 BLAKE2B 505c680937b077c927f197c17dd7c203be6927902ee8b6e55904de52cfbdaa647fab7d987f452a91435efe6422999182a180085b6b6c93ec87821ba00bc33150 SHA512 8dfca894957dd8a36d492266336417944b0bf8814bd451ebd5b0416c9b2d02e873df36515bbd21178176b357b3158bd3d2bf535aee006834a79662755f935cc2
diff --git a/media-libs/libclthreads/libclthreads-1.0.2.ebuild b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
new file mode 100644
index 000000000000..00ca14fdd3a5
--- /dev/null
+++ b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+MY_P=clthreads-${PV}
+
+DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index cc5d3e9e2d0f..31681d0643d7 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -5,6 +5,6 @@ DIST libepoxy-1.5.2.tar.gz 324905 BLAKE2B bbc1904b99e6674b03259bc2a5f4076f248d69
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.1.ebuild 1203 BLAKE2B dccf195c51e8a940a4e8d662069d86aaf933dc04bea426bdad78a49745b282edd392f4373f31a1863ace42e824476b88ddd177bb1ac8bfc13a777124d7e81524 SHA512 6ff58a8592e299ab63c3128428b0b817a1aee5f09cb2b112a14fe4edf7e96f5f180928ecce1be1e6a3e2e8caa141db4ac3951ad4fb944c9dc7ff8398f436ded6
-EBUILD libepoxy-1.5.2.ebuild 1241 BLAKE2B f6361dd6d472d8e68cbf5594438365126015593b0e4b5152aee0e79289b7fbd6bc07a9286e07a0dec5704f0c07ba781b3655de1eb7137e9a25ec3769e48fac4c SHA512 f78655ff92745ae8d36070a850932248291989828dcd9057436981eed97d7b937c7a3a9aba146fcb8a5fdc379851573854d24cb20bbd543be527c460e9de0ff8
-EBUILD libepoxy-9999.ebuild 1253 BLAKE2B 764a6e010d232ffb04193ace7e1e2b209bba2acb667d06b570095df7b1ab68e80a414bd73360a2b0b2c49eb6c5132da87452d1b74f0fb0014784d0e4c448ece4 SHA512 42ef98f03c60a60cda685c8ec151195c307c908a6dd01e07172aca1755527425afeb2de3e705503594794b58f3b3cfbe0cdbbcf3551a68142e1be7bd2937e5fe
+EBUILD libepoxy-1.5.2.ebuild 1212 BLAKE2B 7cb9c61326e602863f9c8e014eb403c3d243a30420a45a1c252dc73f8c1ba49580ec80e6784f8a7432c7bbd8363232ec34f5ea0f3b0de1c7a2ef2ed364d379d7 SHA512 2a34ad6e5a4a70cc637480006e75298c1674aac76e80ae8056b48d75e5a69357c8a53828383e72a25abf59c1caaaeaa5490758887cf0cab1b73478a191b8388c
+EBUILD libepoxy-9999.ebuild 1224 BLAKE2B 47604c61c6f4e9baa84e4eb5e87eea12141cb0c5fe139dba409a091306825bb32162e178c4a8ac22b06aadff6534ab0801ee1f7f8bcc9c6822515182a287337e SHA512 dd72815b8bf3d0aecc7c66ec49596dbf9bdf3aa855c6d7c469903829801b92e5ac4f8786fb12bb4e716908c3e53eac584bce7413a68227f7804127740e321f70
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.2.ebuild b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
index a814fceec62f..21db4db9f63b 100644
--- a/media-libs/libepoxy/libepoxy-1.5.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
@@ -26,12 +26,11 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
+	media-libs/mesa[egl,${MULTILIB_USEDEP}]
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	>=dev-util/meson-0.44.0
-	virtual/pkgconfig"
+	>=dev-util/meson-0.44.0"
+RDEPEND=""
 
 src_unpack() {
 	default
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 476702c15fb7..17eb5ee20a7c 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -26,12 +26,11 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
+	media-libs/mesa[egl,${MULTILIB_USEDEP}]
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	>=dev-util/meson-0.44.0
-	virtual/pkgconfig"
+	>=dev-util/meson-0.44.0"
+RDEPEND=""
 
 src_unpack() {
 	default
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 04b800c47f3a..d4d1be049e31 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
-EBUILD libgphoto2-2.5.16.ebuild 6275 BLAKE2B e59c1e9e66f9737eaee1ac3d4cce62cff26a44723450627a727e4bffff451c14fa51f1f941e5a6b0b32dc607514d04f8ddc99a94cbedfb29dfdf8fa62ee89598 SHA512 48f244c9d9a936a17ab1d650779e7f541732dd49a09feb6e6c3485fa36bee8040614404962a3ef0694b373d2f5dc9f055be48cf6be483682718a003de941a6db
+EBUILD libgphoto2-2.5.16.ebuild 6276 BLAKE2B 7a28d3080efd0fb6acd623fccbc1221c8d442b27a80315f358fc4544a51ea12069c65b2dc0a09a4b0f3b8d518c53ef620801c465be1a94dbd2e9e2a9a2b70973 SHA512 0e4c07ae27ddc62c9db5f9a5af5c0f2f6509c65d7fa8a2e689d1269f6d51807dbf1afa9ea67720340a18007ac8c4bab7e48ecdae5ef7d801df1fa5402b76f673
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 0ca3ce3d2785..d55089897700 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 7b0adeeb3d54..6669adfef9cb 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -7,7 +7,7 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.11.ebuild 1846 BLAKE2B 3178cacd80810437fa937407c298570dcb2f4e170343a99a29be266fbd7ae7a9bc592a06425b99cda8e060dec15e3bf5389f6f4bf9767fc3517b8a3a2967bcee SHA512 38c4feaf7f0c06cac5d062d6aedeb0f9010eb37fd604ca3ba3609368ffb6662a7a28b4c5c4b19504a8a074e88a198e7132a72e4d3824635d7f59ba0bf9361864
+EBUILD libraw-0.18.11.ebuild 1847 BLAKE2B 92b905400196ccdca17decb4b25049a08ebcca89e5c584834265291a1863ce4e8afebecf6f964215229985712715e845b8c24f7309776c510542557bb87a9b5d SHA512 0ce9ef55645e335f7669db97ce3ed8ccbbb8e525bdcf5e8e1b18034e96325d201308a645208f4afba2056cd677dfd23af0b84f1272114fb7629b55470e0be134
 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
 EBUILD libraw-0.18.8.ebuild 1723 BLAKE2B f48d3b7e4d07c1d48064a8dc16d5af25f532bde1501cc1a6714f5412c42b824b6e9c1ae936a2d548746871925df553f3f7f722aa450930f70006ffdd2e4026e8 SHA512 679c029b6628eaa141085c1a4788ddc17b927eda419a6ebdd6d398341293aec4703e00e0aef81ef7c5ee9794ccd8eb45cfcea682bee006b75621325cbf0692ed
 EBUILD libraw-0.18.9.ebuild 1815 BLAKE2B a17813cba8285e7dddbb7c13db642faed63dc11d4b32b69a8d9ca7cb46bcc8c55a3c0a415afbf243e9fa487f05a6f933feddd48a35ac9ec919379401896a8508 SHA512 55ca2174034614f008fd9c2daa96ff5dcfb612353c5d3b1ccebd28b71b91c5b40bcb130efc98b263f17eab46d13019d06dcd41d37bb5ddf22d257d830ec8dd01
diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild
index 7daababc6e6f..676dbd1dc244 100644
--- a/media-libs/libraw/libraw-0.18.11.ebuild
+++ b/media-libs/libraw/libraw-0.18.11.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index a3da4b0b3bf5..f0b290fbfec5 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -3,5 +3,5 @@ DIST libwebp-0.6.1.tar.gz 3990217 BLAKE2B 680dcc56bd10797e93d09dc64ed04fd2ffb0b8
 DIST libwebp-1.0.0.tar.gz 4023549 BLAKE2B 10286182ddc1f3561d01edf095ba8921b932b950175c45bbc86400318f9a88237c7623b0bcdd0dfecea6efb085e84e029c82a61396cb784d778d59902353d2b4 SHA512 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99
 EBUILD libwebp-0.5.2.ebuild 1771 BLAKE2B 910cb7ed016abafd6fdbab80b3c37435b1290d6444a65e639f6291526a1c54798145cd45c2281690d4624fa057cdd69ba3caed970b5fea29cedcc9d8dd50506e SHA512 f461a096427a8fb7dec8a2126474b97f4d6268d9c5fba3b9a581604c06f76980e31da67f2a9b55b45439bcf820b6a81021a6087070899ae73943e9386b514ec4
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
-EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
+EBUILD libwebp-1.0.0.ebuild 1825 BLAKE2B d67d794b02d412cbe9f937fbef07b150e16b33b793701866d5f2e6b84a855acfc7c0e82d768bfeec039697a055522ee36e2e3498a337a4028dcc4ef74dac473b SHA512 fceed52ca5db11f48bd7f74538ef44fc94945c0b5b6059a3f6c86dc587d19d8979a1b18e8ab9e64ca7eed7dc6fe8f2f34962596b81f7d33cc6b50da35789fdbb
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.0.ebuild b/media-libs/libwebp/libwebp-1.0.0.ebuild
index ea796fca8f7e..6ef54b5061d5 100644
--- a/media-libs/libwebp/libwebp-1.0.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
 IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e8ef68761ee6..7c63912a7248 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,11 +2,9 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900
 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
 DIST mesa-18.0.4.tar.xz 10939356 BLAKE2B 6bbf19f4e547be3be7385f6e8b094444fe78c0e1ac04d42f1e762ec92d83a53c06bae987b63a542553df4a8a1e17c0b3738e2db6faf356897f49b8d7efd5845c SHA512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c
 DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad
-DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
 EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3
 EBUILD mesa-18.0.4.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb
 EBUILD mesa-18.1.0-r1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
 EBUILD mesa-18.1.0.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
-EBUILD mesa-18.1.1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
 EBUILD mesa-9999.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.1.1.ebuild b/media-libs/mesa/mesa-18.1.1.ebuild
deleted file mode 100644
index 70702be097dc..000000000000
--- a/media-libs/mesa/mesa-18.1.1.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use 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/opencv/Manifest b/media-libs/opencv/Manifest
index c54555031160..8c068e3b9506 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -19,9 +19,6 @@ AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c07
 AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644
 AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6
 AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826
-AUX opencv-3.4.1-compilation-C-mode.patch 2077 BLAKE2B 78f55e49bd51ac4377a1db37125da6ca1ddfb9d723243eca7ef3df9d6d7b3922329cdd1c5915d480a9264af623c2953b4edaf81fd53afc950dc19cd49f04ea6f SHA512 203a4376728df6aa3dcaab147654139ebfd296a98d83847ac3ab0184dba828cf2ee298fedf7e7c2c64e1e8965237172fa6f1d5c7a4f6be5165a384d21b6875e7
-AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
-AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
 DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
@@ -40,5 +37,5 @@ EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0b
 EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6
 EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba
 EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f
-EBUILD opencv-3.4.1-r2.ebuild 18471 BLAKE2B 88ae4e84db3546588aa16bc9a627c25559246254838f9c8b20d452a3d0dc2778c583eb2f157ee87ab55482fec8ea45156ce71ec79cdab966e43c794e46b1d74d SHA512 cc9ef5c86592cfd5fbbbe68c648891e33087fccc0cc6ffea04b36050e215b635ede62d7843454fcc293dab154130e784e9ff95e0816bf401d1dccee94f5ed9b2
+EBUILD opencv-3.4.1-r1.ebuild 18274 BLAKE2B 1bcf6b99f53bc30edb77f73810edceca0de7baa06e60b99843448d23d98769096abf725bb4d20bbba72b5c4a02bd25fdec604e44969ecab7aaf4aed58453f0c0 SHA512 caed3d62f9b8bb3c7dd2380a3bcf4c736a876442d5b9dc1d40ba2df495327a690436e4b27d8ad10d76dd278b8593bc72a21005dbafb61ed7440a4386c74ceaa6
 MISC metadata.xml 2648 BLAKE2B fe794c98503b602b365ea04bf32c1011fc485faf7da60e4475db32a3403be3f13be3c713270121feab8f5ec7dc6ac4caa7cbd9dbefaa121fa337273184d5a326 SHA512 60544f21407bffb30e12a2207288832487f0e2ff535343f06d103c0db13441776d84c0645d568ee7a9f7d502ca4267a8be923fe1cbbb8902a950ca7395616848
diff --git a/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch b/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
deleted file mode 100644
index c94f206ed4f1..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 549b5df22520b60b91dd77096434d79425b31ac2 Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.alekhin@intel.com>
-Date: Mon, 28 May 2018 18:07:23 +0300
-Subject: [PATCH] build: workaround issues with C compilation mode
-
-- cvdef.h + cvRound (double only)
-- highgui_c.h
----
- modules/core/include/opencv2/core/cvdef.h           | 8 +++++++-
- modules/highgui/include/opencv2/highgui/highgui_c.h | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
-index a87ced09d78..4ab72b34cc1 100644
---- a/modules/core/include/opencv2/core/cvdef.h
-+++ b/modules/core/include/opencv2/core/cvdef.h
-@@ -480,7 +480,7 @@ Cv64suf;
- // Integer types portatibility
- #ifdef OPENCV_STDINT_HEADER
- #include OPENCV_STDINT_HEADER
--#else
-+#elif defined(__cplusplus)
- #if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
- namespace cv {
- typedef signed char int8_t;
-@@ -517,9 +517,15 @@ typedef ::int64_t int64_t;
- typedef ::uint64_t uint64_t;
- }
- #endif
-+#else // pure C
-+#include <stdint.h>
- #endif
- 
- 
- //! @}
- 
-+#ifndef __cplusplus
-+#include "opencv2/core/fast_math.hpp" // define cvRound(double)
-+#endif
-+
- #endif // OPENCV_CORE_CVDEF_H
-diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h
-index 1eb414a76ca..35413139c79 100644
---- a/modules/highgui/include/opencv2/highgui/highgui_c.h
-+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
-@@ -135,8 +135,10 @@ CVAPI(int) cvNamedWindow( const char* name, int flags CV_DEFAULT(CV_WINDOW_AUTOS
- CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double prop_value);
- CVAPI(double) cvGetWindowProperty(const char* name, int prop_id);
- 
-+#ifdef __cplusplus  // FIXIT remove in OpenCV 4.0
- /* Get window image rectangle coordinates, width and height */
- CVAPI(cv::Rect)cvGetWindowImageRect(const char* name);
-+#endif
- 
- /* display image within window (highgui windows remember their content) */
- CVAPI(void) cvShowImage( const char* name, const CvArr* image );
diff --git a/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch b/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch
deleted file mode 100644
index 11ca6aa861e9..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
---- a/cmake/FindCUDA.cmake	2018-05-26 12:57:45.698858052 +0100
-+++ b/cmake/FindCUDA.cmake	2018-05-26 16:49:01.196390803 +0100
-@@ -447,8 +447,8 @@
- # Parse HOST_COMPILATION mode.
- option(CUDA_HOST_COMPILATION_CPP "Generated file extension" ON)
- 
--# Extra user settable flags
--set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit multiple arguments.")
-+ #Extra user settable flags
-+set(CUDA_NVCC_FLAGS "--expt-relaxed-constexpr;" CACHE STRING "Semi-colon delimit multiple arguments.")
- 
- if(CMAKE_GENERATOR MATCHES "Visual Studio")
-   set(_CUDA_MSVC_HOST_COMPILER "$(VCInstallDir)Tools/MSVC/$(VCToolsVersion)/bin/Host$(Platform)/$(PlatformTarget)")
diff --git a/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch b/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
deleted file mode 100644
index 248e5034a218..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/OpenCVDetectPython.cmake	2018-05-31 09:14:42.998873104 +0200
-+++ b/cmake/OpenCVDetectPython.cmake	2018-05-31 09:26:08.444914001 +0200
-@@ -140,8 +140,8 @@
-         else() #debian based assumed, install to the dist-packages.
-           set(_packages_path "python${_version_major_minor}/dist-packages")
-         endif()
--        if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${${packages_path}}")
--          set(_packages_path "lib${LIB_SUFFIX}/${_packages_path}")
-+        if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIBPY_SUFFIX}/${${packages_path}}")
-+          set(_packages_path "lib${LIBPY_SUFFIX}/${_packages_path}")
-         else()
-           set(_packages_path "lib/${_packages_path}")
-         endif()
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r1.ebuild
index 34085a8db247..578d147619a3 100644
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r1.ebuild
@@ -226,9 +226,6 @@ MULTILIB_WRAPPED_HEADERS=(
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-gles.patch"
 	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
-	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
-	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
-	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
 )
 
 pkg_pretend() {
@@ -403,7 +400,7 @@ multilib_src_configure() {
 	# ==================================================
 	# cpu flags, should solve 633900
 	#===================================================
-		-DCPU_DISPATCH=
+		-DCPU_DISPATCH=OFF
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
 		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
@@ -471,7 +468,6 @@ python_module_compile() {
 		-DPYTHON2_EXECUTABLE=$(type -P python2)
 		-DPYTHON3_EXECUTABLE=$(type -P python3)
 		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-		-DLIBPY_SUFFIX=64
 	)
 
 	# Regenerate cache file. Can't use rebuild_cache as it won't
diff --git a/media-libs/tse3/Manifest b/media-libs/tse3/Manifest
index f7fbea4000a5..481326bf0e63 100644
--- a/media-libs/tse3/Manifest
+++ b/media-libs/tse3/Manifest
@@ -1,8 +1,8 @@
-AUX tse3-0.2.7-gcc4.patch 217 BLAKE2B 1560902b7719f15dbefba11b5575ce0f138eba63bd95da00c8c00454f83b58b1bc3d5b2b8c4be9c6f6659817e29ede4ea65d4035e6b8c7987aa6ef0319f76509 SHA512 59e0610cf7e34872b8898b48da79decb43dfb1af26bd761791332b9bd12f981567ef20e234e20274e3492a7f736e4ab1eb4ed53a18dda07a08b78a91fad63bd0
-AUX tse3-0.2.7-size_t-64bit.patch 943 BLAKE2B 571b7663a606fe3488ae0c532fc81239d47717c0a61287dc240b10ae081eee8aa445fc64576fc10011bb93c601c0acd9f1967e26154bb10c4b9ff37d78f9dcd0 SHA512 96a14a52b3c6477555a4b6b82006c1758ab7560f7924df608b990a21481651cce28e435eb8cbafd06cc47afe1e3abea993d30de848e1561c034ea78caac1635a
-AUX tse3-0.3.1+gcc-4.3.patch 1463 BLAKE2B d5a688ef93c77481eb26d7e6ceff25242e7582db223ea5f9341824266ddd7491fb69513e2a4ade3f7bf249d608602045d0fae67325e7d5b4fd2a0df2da43ee9e SHA512 298c08104b1fa37d51031163cf84817fe0509f4b551aa38966625ff922d3164ff4fd5cbeec88214df2e26e4ad25a03f67f5c58590136f06ebd741ba59fa825b4
-AUX tse3-0.3.1-parallelmake.patch 233 BLAKE2B 69bcccd58954beeaa844b76fc4d733377520db3eb04ab76a1891c522f87a18c687c50864e5a2573789dd17dee4d64d06966d713b9281707901223d3ca0af3a5e SHA512 d5d6a9750bab5146e4f3daae271284def29bc7456905beddac0278f7a65ac705e07a4c4fe43d9a57914ec5af5134feee9b7833a72c7739856eff3a7c76645cd0
+AUX tse3-0.2.7-gcc4.patch 290 BLAKE2B 432dad256846003e1e953a941c4c0b8b94e572b3fb234447f95e5b2bc52bfe6ff17d1008fac91c287f64e58a13ef97c9770c12a32543d0874aec7d28addbc8da SHA512 07421f043f979b02aa17caa03752bfef7dff8a4e0a04135ff947c36c75ea1c7b019cef0e74e4a03e61bbc5941e5ca82c2c7b3120f4c053774de11635c57611c8
+AUX tse3-0.2.7-size_t-64bit.patch 1089 BLAKE2B 547adf8cdc3a28bbc7f7d3b6cf0ad6fe5b936b7483be5d9011324a21cc53e72f9bfb8bde62fbef252e7f63450faaf92270d0960d9207c9a726017e1c59be893c SHA512 cffae23b4611791698b349debc9bbb7caf5650502d0ce8aee6186f7a671d7c1a7cde29a340b5b220f4df58166800cff823065d76ac8491b5819e0598e1f4b580
+AUX tse3-0.3.1+gcc-4.3.patch 1974 BLAKE2B 33a772dd38603d99e500121bbd4895ae80990084a2da3833938573758e8b24b9be218835ad156d956647eb51ab4d86975e819fec6b180ec1faf1c7a6aa03e0ad SHA512 e88dd2be90bb01bb6d6f684d9822374f9e149481200bc0ae0ae5098b36ccc64a387f234c8e5a7e8c30fb988f157a8ba8f5aa732639e60f76d3e1ba6624d688d2
+AUX tse3-0.3.1-parallelmake.patch 305 BLAKE2B 427fc002f27377905ea0333a7ae046f5aecee50eb7632c6453025d3ec6aefc6bdf104edad4fc85210e3f603737e1b2e3661627d10fc7e53b1de78206c7eb06a7 SHA512 c8b8e30122b8c52421c154e686445f79c018281582511d9f273a41b4a83602470fdae38e097dca5b912837f95d0758b61e661cbb5f6c13dc5bbb2310bb6899f3
 DIST tse3-0.3.1-awe_voice.h.tbz2 5681 BLAKE2B c5bb8a3fa158adb85ebd242a3d61e41555c0f93af2f138eada59af4e3aa39a01388d26ee8e509393706260c0634bf743b28486e46528d073cfccd46edcd00413 SHA512 3b935891ed21936518ca0351fa2fc4affc2e4ba680ab7fab00073e9fa5f13f98c7af73d9a2383c7c3f1df3c323311b7ec6c0a64f2543cbbad35d9ff9db843ec3
 DIST tse3-0.3.1.tar.gz 755666 BLAKE2B 8c2f3ac18f4fabc62af63d1b037638e077fc0ee622f727fc30672cba31e2b3978a50999940c096a6f53ae24570341096eacbf8f59a0227177fdf887249f4ff3d SHA512 cff94f274f90e61257eeda532f56b77ef0d2d03371876c2e6fb739ac32dcf107254702464c9c62a672e7c3e31bd063dc84a311daa0218df710bada8399d49860
-EBUILD tse3-0.3.1-r1.ebuild 1123 BLAKE2B 42883031b5a1bfcddaaa44bcdd48b836abde3968e3d7d9d7ad81caddd9394a7d97f666bd5bdd426fb69ce10e1e9bcf226d326433f265583d8e63eff457b14051 SHA512 3bb2244db65008534ca69087dc30af34a658803da245e3379d9144649e82a17b1eff944af7aad73dfa265e5acf1a510b1ebd290215bbe04c49f57f0a6e197c11
+EBUILD tse3-0.3.1-r1.ebuild 1104 BLAKE2B e5eb3783c0879092905b35fbdaa85443bb53b3cf26535dbc47c9ba75d449488d77bc7e1f5f8210b02aaf317ed8e9f0cb2f9fdf669e55c0506ac66ca8364bdc6c SHA512 6b34f816e3b87379c8816c7c7007b30fe1332ae3401b7d361b7a66fcf65dc507764b85de6ee331e0c061b3aa8aab2d8ebe64feae8fbc32b1f5f8c7e2b91a1a14
 MISC metadata.xml 327 BLAKE2B a5bdf33e3a72f1e66a8619edb0c29d58b27b8266d4101d0c9f0151df0039d68e584d509fa35003b5804971f3c717b571fb9707313a7ef63106790fe7f0b84f8b SHA512 b46483abcf9d26839bbc36b40b20971a9a397ae2b45c32a5a406e91c7bd95eec3ad324d7163c3e37e96e1a3d5ba837720bfd5276a310333ac5f2e5557def12b0
diff --git a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
index b58e538b8fed..ed92ded207ab 100644
--- a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
+++ b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
@@ -1,5 +1,5 @@
---- a/src/tse3/cmd/Phrase.h
-+++ b/src/tse3/cmd/Phrase.h
+--- ./src/tse3/cmd/Phrase.h~	2002-07-28 17:17:11.000000000 +0200
++++ ./src/tse3/cmd/Phrase.h	2005-07-29 15:45:03.000000000 +0200
 @@ -19,6 +19,7 @@
  
  #include "tse3/cmd/Command.h"
diff --git a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
index fe628c306670..29c54edc084f 100644
--- a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
+++ b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
@@ -1,5 +1,5 @@
---- a/src/tse3/file/XML.h
-+++ b/src/tse3/file/XML.h
+--- src/tse3/file/XML.h.orig	2002-07-28 18:17:11.000000000 +0300
++++ src/tse3/file/XML.h	2004-04-25 14:51:56.000000000 +0300
 @@ -154,6 +154,7 @@
                  void element(const std::string &name, const char        *value);
                  void element(const std::string &name, int                value);
@@ -8,8 +8,8 @@
                  void element(const std::string &name, bool               value);
  
                  void comment(const std::string &comment);
---- a/src/tse3/file/XML.cpp
-+++ b/src/tse3/file/XML.cpp
+--- src/tse3/file/XML.cpp.orig	2002-07-28 18:17:11.000000000 +0300
++++ src/tse3/file/XML.cpp	2004-04-25 14:54:01.000000000 +0300
 @@ -116,6 +116,12 @@
      out << "<" << name << " value=\"" << value << "\"/>\n";
  }
diff --git a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
index 0ff1ebb6ea1d..4581da9d0bf7 100644
--- a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
+++ b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
@@ -1,5 +1,5 @@
---- a/src/tse3/Serializable.h
-+++ b/src/tse3/Serializable.h
+--- src/tse3/Serializable.h.orig	2008-06-08 12:17:05.000000000 +0200
++++ src/tse3/Serializable.h	2008-06-08 12:17:27.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <iosfwd>
  #include <iomanip>
@@ -9,8 +9,8 @@
  namespace TSE3
  {
 
---- a/src/tse3/TSE2MDL.h
-+++ b/src/tse3/TSE2MDL.h
+--- src/tse3/TSE2MDL.h.orig	2008-06-08 12:17:41.000000000 +0200
++++ src/tse3/TSE2MDL.h	2008-06-08 12:18:02.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <string>
  #include <iostream>
@@ -20,8 +20,8 @@
  namespace TSE3
  {
 
---- a/src/tse3/MidiFile.h
-+++ b/src/tse3/MidiFile.h
+--- src/tse3/MidiFile.h.orig	2008-06-08 12:18:26.000000000 +0200
++++ src/tse3/MidiFile.h	2008-06-08 12:18:42.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <string>
  #include <iosfwd>
@@ -30,8 +30,8 @@
  
  namespace TSE3
  {
---- a/src/examples/recording/recording.cpp
-+++ b/src/examples/recording/recording.cpp
+--- src/examples/recording/recording.cpp.orig	2008-06-08 12:18:56.000000000 +0200
++++ src/examples/recording/recording.cpp	2008-06-08 12:19:18.000000000 +0200
 @@ -26,6 +26,7 @@
       *
       **************************************************************/
@@ -41,8 +41,8 @@
  
  // Used in step 1
 
---- a/src/tse3play/tse3play.h
-+++ b/src/tse3play/tse3play.h
+--- src/tse3play/tse3play.h.orig	2008-06-08 12:19:34.000000000 +0200
++++ src/tse3play/tse3play.h	2008-06-08 12:19:53.000000000 +0200
 @@ -19,6 +19,7 @@
  
  #include <string>
@@ -51,8 +51,8 @@
  
  #include "tse3/Transport.h"
  
---- a/src/tse3/plt/Alsa-0.9.cpp
-+++ b/src/tse3/plt/Alsa-0.9.cpp
+--- src/tse3/plt/Alsa-0.9.cpp.orig	2008-06-08 12:39:53.000000000 +0200
++++ src/tse3/plt/Alsa-0.9.cpp	2008-06-08 12:40:25.000000000 +0200
 @@ -25,12 +25,11 @@
  #define HAVE_SYS_ASOUNDLIB_H
  #endif
@@ -68,8 +68,8 @@
  #include <sys/asoundlib.h>
  #endif
 
---- a/src/tse3/plt/OSS.h
-+++ b/src/tse3/plt/OSS.h
+--- src/tse3/plt/OSS.h.orig	2008-06-08 12:45:46.000000000 +0200
++++ src/tse3/plt/OSS.h	2008-06-08 12:46:06.000000000 +0200
 @@ -21,6 +21,7 @@
  
  #include <string>
diff --git a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
index 7a0d0918b142..b4fc927a7183 100644
--- a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
+++ b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
@@ -1,5 +1,5 @@
---- a/src/tse3/Makefile.am
-+++ b/src/tse3/Makefile.am
+--- src/tse3/Makefile.am.old	2007-02-06 23:57:38.000000000 +0100
++++ src/tse3/Makefile.am	2007-02-07 00:08:01.000000000 +0100
 @@ -53,7 +53,7 @@
  
  noinst_PROGRAMS = test
diff --git a/media-libs/tse3/tse3-0.3.1-r1.ebuild b/media-libs/tse3/tse3-0.3.1-r1.ebuild
index 9c10927b83eb..08519f982de1 100644
--- a/media-libs/tse3/tse3-0.3.1-r1.ebuild
+++ b/media-libs/tse3/tse3-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools flag-o-matic
+EAPI=2
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="TSE3 Sequencer library"
 HOMEPAGE="http://TSE3.sourceforge.net"
@@ -17,21 +17,17 @@ IUSE="alsa oss"
 RDEPEND="alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.7-size_t-64bit.patch"
-	"${FILESDIR}/${PN}-0.2.7-gcc4.patch"
-	"${FILESDIR}/${P}-parallelmake.patch"
-	"${FILESDIR}/${P}+gcc-4.3.patch"
-)
-
 src_prepare() {
-	default
-	mv configure.in configure.ac || die "Moving configure.in -> .ac failed"
 	if use oss; then
-		cp "${WORKDIR}"/awe_voice.h src/ || die "copy failed"
-		append-cppflags -DHAVE_AWE_VOICE_H
+		cp "${WORKDIR}"/awe_voice.h src/
+		append-flags -DHAVE_AWE_VOICE_H
 	fi
 
+	epatch "${FILESDIR}"/${PN}-0.2.7-size_t-64bit.patch \
+		"${FILESDIR}"/${PN}-0.2.7-gcc4.patch \
+		"${FILESDIR}"/${P}-parallelmake.patch \
+		"${FILESDIR}"/${P}+gcc-4.3.patch
+
 	eautoreconf
 }
 
@@ -48,7 +44,7 @@ src_configure() {
 }
 
 src_install() {
-	HTML_DOCS=( doc/*.{html,gif,png} )
-	default
-	dodoc doc/History
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README THANKS TODO doc/History
+	dohtml doc/*.{html,gif,png}
 }
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 7dad3c7060a2..99175be6f267 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,6 @@
-AUX vulkan-layers-9999-Use-usr-for-vulkan-headers.patch 4931 BLAKE2B ae95e01ba7f0e62145db587feebb2c65545f597a0bb2a467e8287d639ad4bd3c52a3d896c9f13f193ad10a1eef864f201f465dff6687f153949cb436a17762d4 SHA512 cdc3496b3673bea3ffad267aee4143df98a1b31b11848901b0a97d043478043f982da1362437f378e0e6b838a9d8c0363db0e1dc3da4a077047b8cdaeb59428c
 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 2610 BLAKE2B a7ae2f31d1eed1bf0120d09e91b67a45a3ef3dae62e19221185eab7edbf7a23bcd6397cea2153ef893e3e958c70a165fbaecb9192c69e81f586c06cb04e124dd SHA512 f55ab09cdaa10562a472001be4613ab2eaf3fed97bd77618d13047d5040d2181236dd8d0366ea13494dcd37abc535448493a9521006bcfd95e89b0bdc57ad51c
 DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1
 EBUILD vulkan-layers-0_pre20180526.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8
-EBUILD vulkan-layers-9999.ebuild 1596 BLAKE2B 26d624c532063c005851983cdfad52c55d491a001a5b8fab0eabf2bc24f4f783572acda7b19a0a39551b45489c0a4279313297fa887a40c4ef1d2a935b4b35aa SHA512 e536ca47643193aa15a96a348db1c431e9895ca79a267d20fb9f9e22f622b17a74a32d69acbeafa0a595fd48b59cab3179dc51502a24bbc758277ed5b574f6ed
+EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 3ce121350395..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 895c8a28b69be0ac436cd501e8d66f1b936393e3 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Wed, 30 May 2018 19:19:04 -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..2364f50e 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}/include/vulkan/registry/vk.xml ${output}
-+    DEPENDS ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py 
-+${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/reg.py
-     )
- endmacro()
- 
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 4dac9ca2..6ea83ddb 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/include/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..dd8a26fe 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/include/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..29ef873a 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/include/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..0ea237b4 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/include/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-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 1c718ccc9648..ca8180bed039 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-Use-usr-for-vulkan-headers.patch"
+	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 1c9edd60688a..2d358cc18b66 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-9999-Do-not-install-vulkan-headers.patch 725 BLAKE2B 6b48104a774c0981af5625e9908b752494e3603c86f7d2ca59181d7510acdb859e445b366ef55b574b169476b84a2c81894f90191edaa83bdd3d4e8d747d14c9 SHA512 8cf05233a575108f29dd7f4bea2a92e68067b9fa87c1a6f5a29072d5044833d8b9eb9a7fe79e8b75d0c23c46fb4129f2fd1cf655a69223d68ac894805c3fcbab
 AUX vulkan-loader-9999-Use-usr-for-vulkan-headers.patch 2084 BLAKE2B d8dbb0df82d5bb3b570b1233e5bfbf7c80bd8eab1e7127d3964cb7307a324e91b6e964c26161f6e824ab2dc5ee3519d1bb2ed792c355a23ce7bd5e5ccbbfacc4 SHA512 8406ccbde73bd9d5868c1c3fb33ef1799bee653d177839ed576ecc2e78a2286d67228ba035d38f9dba9e43819995c950f88f300832170f333541649fd4774d2d
 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
 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1780 BLAKE2B ee2078c51a1368e97e347565d0152b70b636ff094b39e3c44c348c2d37aecba7781140a36deb74f803e90c25d272d34e46dfa4853345c05bb2490cb4c702623d SHA512 4c9254c7cc300db6107e77755117e0c1a86c4e5e5750aaff31f753aa7222516c48e84a4cdabe7fb7f84f92bfbc8f4f84b8ad4287126c423627898ab1fbe3cccd
 EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681
-EBUILD vulkan-loader-9999.ebuild 1532 BLAKE2B 08987662c1f098a6144ea2385819cdb237578de8dc4ad760bc6134a78c56717c086b4b7b27a702c6239ddbeb52aab3ca50cf10a30e0e029a4297a575d682fa1d SHA512 4a3118a14309100f9af7a705b279d974e87fbc088caaac994e2bdc1e3bfdfa89a06be1df7f6bd840eccd8b67a82d0ef9c4e6e22f13415f777ffb11fc0cc9ca27
+EBUILD vulkan-loader-9999.ebuild 1588 BLAKE2B 55c21df60e6919ccbe0646414f0ea4c9efca6f243665640acdc77a3807f3cab5c6c4b42b3a598cac622d3d6292755e87c2fef2de5d0c51e8737291b8bac48fc6 SHA512 bcdcee331cfe38008ce58aff629f52ccf75337649cc38af9e2e0801d2a700e1a027391294c6da08775bdd3d30285aa70529f339e041a6fa15346a4d71ca75945
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
new file mode 100644
index 000000000000..b0cc73c44868
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
@@ -0,0 +1,24 @@
+From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Mon, 21 May 2018 22:34:25 -0400
+Subject: [PATCH] Do not install vulkan headers
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 627de6f70..65f5ea0d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,7 +170,6 @@ if(NOT WIN32)
+     endif()
+ endif()
+ 
+-install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
+ 
+ # uninstall target
+-- 
+2.17.0
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index e265bfcef23c..33afbd7d8348 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -33,6 +33,7 @@ DEPEND="${PYTHON_DEPS}
 	)"
 
 PATCHES=(
+	"${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch"
 	"${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
 )
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-02 17:13:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-02 17:13:10 +0100
commit	0bff53119f08d677db6c1a991bd30741682a8a08 (patch)
tree	6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /media-libs
parent	6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (diff)