gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /media-libs
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
141 files changed, 1299 insertions, 1288 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 599068520626..635e4d8c2edc 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5bafe51af965..0da0dabadcdc 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,7 +2,7 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a
 AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
 AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-DIST alsa-lib-1.2.3.tar.bz2 1037485 BLAKE2B 522c5c2a4bd3bc13d96f64781270647271e131042e0a6ed0f2104d9cb9f93341af1c14d000d5acb9c4c327e10202b0e9f280e59f355819f8861ae023a5a0f0a8 SHA512 567c094914833af511bd7b175b0865ae4e4483ae68a7d4f90a34b12d7f077782835eec24257a7928631c104c78eff588f7b92068aade37e3c4806d79353758a8
+DIST alsa-lib-1.2.3.1.tar.bz2 1037942 BLAKE2B 0460ec9449e3936582b29af6ef019ddbe9875090ba722e00074d3d3dfe6214f40c1d96cec8827bb724a52b06abbff1d80dc5fed46f5bb1f03bc5c46a765756fd SHA512 ed0a81371117a91a5024f3bef5a881ffa9521399eab5e016924669a3f1eba2d6a02efa284b160089bc581717d39d15325ebb2faf162e4d3dabe4c29785a5fb58
 EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
-EBUILD alsa-lib-1.2.3.ebuild 2064 BLAKE2B 4454afdd4a63fa500fa00afb7b54ec4d08ee62e7481d4ee90491e1f118cb49fa0da5a0311a108854dd712b0f8589f739153e5196f1113ddf2f6611c2ae31ad8c SHA512 f416a0ab5aa031ed0cc5bf19c648318af59b47a367d3586877cabad2bfb2cdbcb904cf85d7c12358d8d68727dd506b9f4eb07cf06f7e85196cd3b7d4e0c5cb84
+EBUILD alsa-lib-1.2.3.1.ebuild 2064 BLAKE2B 4454afdd4a63fa500fa00afb7b54ec4d08ee62e7481d4ee90491e1f118cb49fa0da5a0311a108854dd712b0f8589f739153e5196f1113ddf2f6611c2ae31ad8c SHA512 f416a0ab5aa031ed0cc5bf19c648318af59b47a367d3586877cabad2bfb2cdbcb904cf85d7c12358d8d68727dd506b9f4eb07cf06f7e85196cd3b7d4e0c5cb84
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
index e11bdf33b0aa..e11bdf33b0aa 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 29a2ddc43935..36b4de023b80 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,8 +1,3 @@
-AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
-AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
-AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
-AUX assimp-4.1.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
-AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
 AUX assimp-5.0.0-disabletest.patch 392 BLAKE2B 1654fb964c738aaa343abd1905616648c85ab0793d3450d4a05358c9463d00655f0a1b7aa5f1444d90e12ce51341b9a52e75fd81090a65607c3a21efcd374360 SHA512 25856886bae9cef071317880d8d677a3241c74c0cf288a5677f3be492d640d6db3ba5de3d53cf3f41f78e12ee9f544bf37de7ba82e98d9f4e3f699e38f053bd4
 AUX assimp-5.0.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
 AUX assimp-5.0.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
@@ -11,13 +6,7 @@ AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c1
 AUX assimp-5.0.1-fix-unittests.patch 1062 BLAKE2B 3e1e2a236f5f4fc9aa901001a526261569513b221082480bcb366e208489b00df33f7da38245293a17e8aac846ca715a86d10c1a7362137c4afd30f63782fdb0 SHA512 66f52cc5f809eb6987e1c6298730ae6bf89e1d0fb1c7665834448494121f79c1602277ac6eabb69a302171cf1048b54560ade3bc00a8e1adb4fe464bdb71d9de
 AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a918831e7fbbd3c9e46cb654c94c370d95ac5622f3c95ab161debeee92234548778de494640f88e4d8131f0bf91b76b07c9 SHA512 981d62f20448cc47c732dd4c0bd24ad43c2bb02a9a765ea1da12e834cd50a1675bdbed94d37d1f60c011ba237327be953db89ec1d509dcfeaf30ed480eb9217f
 AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3
-AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
-DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
-DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
 DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
 DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
-EBUILD assimp-4.0.1-r1.ebuild 1412 BLAKE2B 6887461a143ac6864da211607bfb4ca8c98cbf092150c8f67c61806680faa414a29c8da199a0da434a1ab0a094f5a524730289d5d2091d1b8a64d7c21ffc5710 SHA512 a218a38b0c6c4b4b2d97a5f6260381c33beb0c3d46e32f7ee08e7c6651ddbabe0d729410673aa0f9027fa653e7207397b9957e7e3841140b098f40d15180e1de
-EBUILD assimp-4.0.1.ebuild 1361 BLAKE2B 3e443ab7c085b57d15f426b591d23975e18ad4c2951ce3a71d7210a4ad9851cc916425de6ed8aa0e434dd7f3c49488fa83a7f419f6d2f80aa6a76313719812b1 SHA512 627808af638bb489fcc341ea9ff502a7bda81137292fa48e707f9c1f83b381295485ecf22f212de45ca66a789f2641f30aa4ef0b54ed2f8b267a558c05085e95
-EBUILD assimp-4.1.0.ebuild 1362 BLAKE2B 672412dc4acc3c48f4d376d9a3787442050e32a639fa901ad2952b6d7442709d6d89856eae5f9a23ce67e8ff2a7823a2b242020f26eb081674d04719716c91df SHA512 a538b4e10a5406a01f1f0e60fbd50630679c44a56d1de474aa5d0b6ba3db55e3f22c4fb1bc26e23f4457114080fc08f23d10b45c0660df844466f83891a953d9
 EBUILD assimp-5.0.1.ebuild 1476 BLAKE2B d7cf3d256493e8a6aae269f1a131378755ed12342bf7d73505acedf22dc6beb6af5bda074a9062b816ba38106c5633be1f895f463f554507eb473621730c14a6 SHA512 c5b5f457e87069841d4b2bfd6c2a66c1717f05e98f676a811afffec034bc07ac47e1ca64ee05660b99f471055bdf74abf403d5c9327169286600b81ea97bb94e
-MISC metadata.xml 415 BLAKE2B 66f2082a72d1c299f8d93b13a2139538096f6fd609768f5600f523eaa3a031793cbb0d70817201cea85af8c3d082905fe8c5594817fab7190da387002feeab37 SHA512 5c1688db3bf253c842d996f17bf596260e618eb50aaea9f639eb92fb00c5391e1a5c9337d992e78952d074484d7de25c179fe3dbf47e4d9ac01daf69d94227ae
+MISC metadata.xml 362 BLAKE2B 7a2e578189dd0932529ceb85203c83cc8b64b39d3dcd20e27dcd2590ebc3febc75d5ec121041a0a119e37282352ebd567b452911d00cdbf8565ef263b44d4e2b SHA512 c2cb23027c4fe2d95e5f97ca789ed97dbe77ca0d29adfb8ae1945be12bd08e86f13a2126961ef3d1e23e21cc89fd612db6ae1cc3c1c63720ac4053380ee4bb97
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
deleted file mode 100644
index 2454b233cb62..000000000000
--- a/media-libs/assimp/assimp-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-	tools? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		media-libs/devil
-		virtual/opengl
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/findassimp-3.3.1.patch"
-	"${FILESDIR}/${P}-qt-5.11.0.patch"
-	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	local mycmakeargs=(
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
deleted file mode 100644
index 5ad3d5d68370..000000000000
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-	tools? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		media-libs/devil
-		virtual/opengl
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/findassimp-3.3.1.patch"
-	"${FILESDIR}/${P}-qt-5.11.0.patch"
-	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
deleted file mode 100644
index f52e8180a882..000000000000
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-	tools? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		media-libs/devil
-		virtual/opengl
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
-	"${FILESDIR}/${P}-unzip-of.patch"
-	"${FILESDIR}/${P}-findassimp.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
deleted file mode 100644
index 4afe5bbd26ba..000000000000
--- a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp	2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp	2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
deleted file mode 100644
index ef5a50249396..000000000000
--- a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:45:25 +0200
-Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 42ef0fb3..9f1b68ca 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(assimp_qt_viewer)
- 
- cmake_minimum_required(VERSION 2.6)
- 
--find_package(Qt5Widgets REQUIRED)
-+find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED)
- find_package(DevIL REQUIRED)
- find_package(OpenGL REQUIRED)
- 
-@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui)
- qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp)
- 
- add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs})
--target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
-+target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
- 
--qt5_use_modules(${PROJECT_NAME} Widgets OpenGL)
- if(WIN32) # Check if we are on Windows
- 	if(MSVC) # Check if we are using the Visual Studio compiler
- 		#set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
--- 
-2.17.0
-
-
-From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:58:30 +0200
-Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 9f1b68ca..b41291e3 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -42,3 +42,5 @@ else()
- endif()
- 
- set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-+
-+install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}")
--- 
-2.17.0
-
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
deleted file mode 100644
index 4afe5bbd26ba..000000000000
--- a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp	2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp	2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
deleted file mode 100644
index 6056f4973c55..000000000000
--- a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/cmake-modules/Findassimp.cmake	2019-10-08 08:08:29.025321121 +0200
-+++ b/cmake-modules/Findassimp.cmake	2019-10-08 08:09:47.976323079 +0200
-@@ -54,14 +54,17 @@
- 
- 	find_path(
- 	  assimp_INCLUDE_DIRS
--	  NAMES postprocess.h scene.h version.h config.h cimport.h
-+	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
- 	  PATHS /usr/local/include/
-+	  PATHS /usr/include/
- 	)
- 
- 	find_library(
- 	  assimp_LIBRARIES
- 	  NAMES assimp
- 	  PATHS /usr/local/lib/
-+	  PATHS /usr/lib/
-+	  PATHS /usr/lib64/
- 	)
- 
- 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +81,4 @@
- 	  endif (assimp_FIND_REQUIRED)
- 	endif (assimp_FOUND)
- 	
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
deleted file mode 100644
index e75b47a1af4b..000000000000
--- a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/contrib/unzip/unzip.h	2019-08-21 21:38:10.991542891 +0200
-+++ b/contrib/unzip/unzip.h	2019-08-21 21:38:24.507543226 +0200
-@@ -45,6 +45,8 @@
- #ifndef _unz_H
- #define _unz_H
- 
-+#define OF _Z_OF
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/media-libs/assimp/files/findassimp-3.3.1.patch b/media-libs/assimp/files/findassimp-3.3.1.patch
deleted file mode 100644
index 0f36fafb0152..000000000000
--- a/media-libs/assimp/files/findassimp-3.3.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmake-modules/Findassimp.cmake	2016-09-26 07:52:09.719727490 +0200
-+++ b/cmake-modules/Findassimp.cmake	2016-09-26 07:52:28.509727838 +0200
-@@ -55,13 +55,13 @@
- 	find_path(
- 	  assimp_INCLUDE_DIRS
- 	  NAMES postprocess.h scene.h version.h config.h cimport.h
--	  PATHS /usr/local/include/
-+	  PATHS /usr/include/
- 	)
- 
- 	find_library(
- 	  assimp_LIBRARIES
- 	  NAMES assimp
--	  PATHS /usr/local/lib/
-+	  PATHS /usr/lib/
- 	)
- 
- 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +78,4 @@
- 	  endif (assimp_FIND_REQUIRED)
- 	endif (assimp_FOUND)
- 	
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index a9d38618addb..6eafc14b8fba 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -4,7 +4,6 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="samples">Build viewer library</flag>
-		<flag name="tools">Build assimp tool binary</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">assimp</remote-id>
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 684e1aa08bc7..1878fa218b66 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -5,5 +5,5 @@ DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c8
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
 EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
-EBUILD aubio-0.4.9.ebuild 2504 BLAKE2B b3f9e65f3542d02851de50e4c3b5d120f623d7d526fe291af1d2894c1e40aa9c75b0392e941ce159a9d14584104c7f1ddb3c03b20a5770c0f3b58a12817ee523 SHA512 0dd0d11550ffb12adade15a570d1264126c6f63f67266903a26b6723aaee77f0bf00dea59950ab327c50bb9d66a59e6164b9fc22f5badb4b4d41ea4f302f6eee
+EBUILD aubio-0.4.9.ebuild 2503 BLAKE2B 5ccaf8c7091c005be9d481f2689ee5e9c9d344f0fc851d6a5b77d1ae954e8e635de65f7803ebcff967be69799533fa5450cb82f02a8a6a2994f1700c5d0f2df9 SHA512 baab2d27ba3be1a91f9940b516270b94353433ca3fb6ec25a852de53e9ce5f893c0b99ddd726206c35105a2f61bf847c53384144496ca8392bf8cdca2c2f008f
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 117ce73c4de1..786cb94ce5e6 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index b9fcb4ffa9bd..9f6319e9fbfd 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -11,5 +11,5 @@ DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 EBUILD fontconfig-2.12.6.ebuild 4887 BLAKE2B 345eb589656f00006527680240e19666e509d840c27dd1d84f5ccd1767c0ab36077f3c3eef8d0d332c23ee2a71a1593d526e162f5a6a366196bda7ae6e3a04a8 SHA512 ff4c3186c81f614de2882f4792844ffdb6b94a3cd8342fd058c3dcca2382f2dcf64450801079383eab6f145e45b8475e491794e5574e030b0bf5dc4cad93556a
 EBUILD fontconfig-2.13.0-r4.ebuild 5166 BLAKE2B a26fa62a00f519500c02e3972c9718978e163b6b27eb67c8c8ba2fbaeaa460c870ce21cc55989e29e8fd928934ff89802a65e6bda1f774faf1566072cf22670f SHA512 751d7456a010a26002ee4749cae2eb95c00476fe3916953b577d9bb75acd68632f5e65c4c51b44ce6de6ea9be4c0f93940898e63bce25f84039ddda430ca4a6f
-EBUILD fontconfig-2.13.1-r2.ebuild 5254 BLAKE2B 6f73a6be0de0f8aa40c0208d53f6e82f86ccff0bfb045c8b3937d974a6387ca7e4f3efb31f6a2bf75924244399017c62ffe96817892861404c9efafd87ee60cb SHA512 f5039c123ea51bdcd47f74788208b8614bab96cc2acc2ca9baa9969466529fc58287ab44bc97bdc09447945fb6a8da031ddc330519dae2b845b626043667c1ea
+EBUILD fontconfig-2.13.1-r2.ebuild 5234 BLAKE2B 408968ee4421f420b687a1d68a38897ce797fe9d361d41df01af4dd1340f7846ec9555f6b2eaeb608554730e484960f34ab7237f34e958fc052c7bafaeab4621 SHA512 435fa05ce82eb0cd392830662eea6f88a4ed7dc82b455a3a69d37047df645bbde9605dfa1a1a33aee5b26520cfb705ea5a52622dc5f6e54654e9042cf0a0525a
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 21301b194b4a..8ccc0a909943 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -17,7 +17,7 @@ IUSE="doc static-libs"
 
 BDEPEND="dev-util/gperf
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? (
 		=app-text/docbook-sgml-dtd-3.1*
 		app-text/docbook-sgml-utils[jadetex]
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index a794f3956f53..a8486986659b 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -6,5 +6,5 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
 AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
-EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B 0adbf8883c66ae7f82c0b5a4cbe48bbaf25e524bc11b819093cf052604cf332614777e07313984fbbec3b020d773200e81cc3ad263d22f407773701b1656fc76 SHA512 6c096525ed81414aa1685352f155d82e3409d4da1de54ec0fc844569620becdafb6e3dcf4c25789815ab3a1bd58b2a4cfea97543f3445bcf9e9a8db5660b7ad2
+EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B be0c69f23fc61d60b0587e1acb9be99d6b59028f98c03da37825a19a0ad15a20271550f15a1ab2b55b6df6c2dffeb2a993896f6b4b63e2831a5e31fff1b54e96 SHA512 3d55e13976038b63109c39dcee4bdd34a8b78dd9db98a3b07b1f90095a5a875bd1b047230a03b7364a0b2669f896956ae130bca93f663270d940345ae283d8dd
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 144c53bbacba..e904c560e531 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PV=${PV//.}
 MY_P=${MY_PN}${MY_PV}
 
 DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
+HOMEPAGE="https://freeimage.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 	mirror://sourceforge/${PN}/${MY_P}.pdf"
 
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 3e02d5b7ea2c..9f99c5f074e8 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1228 BLAKE2B 228336ca2d778e6cf2ed8399e74d759520962f5bfd9b630e138372811c2ec2cb187d249bfeeabe3d48d8533a650d25a04142bacca0493291e52591c564d37d7e SHA512 75fe9094785b68be48f35c40fdfde9ed14f8fc81d9d0be33f3c7df95e1510b578a56f2413a41d1ddf9929309b60d48447fcfcc7f2872769975d897643a4f851b
+EBUILD ftgl-2.1.3_rc5.ebuild 1238 BLAKE2B 7c11341b962fb85d4cd68c98e114151fca6c7eecfd46bf14caf034122d5e9e92e446c3d023c0976f92825966a3811d35216e711c81292ff1f44bc06ecd555a80 SHA512 9bc05a662dfef9cb509a66b36d87e428ae28d5dc86eb73b584dc1bdcb523b4436941f69c6cdeff033639581978b7056f766d89717c6d9441727324e5bd1f54b3
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 77cc21b8bd26..93fcaebd0f1b 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}"
 MY_P2="${PN}-${MY_PV2}"
 
 DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
-HOMEPAGE="http://ftgl.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/ftgl/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 4fd3b0bb44fc..468a342ff156 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -10,6 +10,6 @@ DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 7566cefe70ef129bafc17ed928b0e7c1ccb5b1b05d25b7c6016e08f62ea680ef96e9a9a7a48ed8e0e49b4d3e87e8dbf90810b1b992a4ce0f52bbb703cec9af86 SHA512 581529ce33b146df1711422a3b916d1af1c74e85669d274e8639acaa881f56404f0c4afd62886688d77439a2467c6c9045864413b50b47452742b26b3da1be24
-EBUILD gd-2.3.0.ebuild 2573 BLAKE2B 3d5dac353d6a0bdc83a6c1f206788022796bf89ce5ce0e5a8b2da46c6136c2d7c2f62e70d777906603d6322860da9f429e0c244a750f8c8a8e29567740f79f21 SHA512 f886f05814a55492f0af93649c3177a4cadd20dfb653c4cdf2528ffa9184cdfcb5c9c59171ec41b787b050e8f04c130779567f634523b06f85e5a12be44cb0ad
+EBUILD gd-2.2.5-r2.ebuild 3116 BLAKE2B 6d8149681eb1b178de4b816891602bc9eb978b7b05ff34ee84d3f9fa3c5f9c375a674f172bbf73d75fc148f30468aa108b992c9e1a9053f7ea4563d4f46b83c9 SHA512 0ac9ce9ba782762ce5c8c935edcc89270b7046a3e3b51078eddd1372bfe6ba9844226015c9b0c207b3670959652a4bb8f93ba0f9bf1bb1c5275e887c79efdea6
+EBUILD gd-2.3.0.ebuild 2546 BLAKE2B ddaa75cd04902204a36ddf712064bd542e4c2e16e59fb21e296bf081e7e13ba6311e52ed0dd2c0c36f4a83a79a35ebb83627afa815ed0d767c0a8abf730b0237 SHA512 643ba24e91561046794da0f4f9d07db97e7726cb9c61cb6b1d22a1ffd0d4c8b04cb2f4fc5a11d1d9e82c5a219e91befcbc745dbe9a619e5a730d0e81374d30b8
 MISC metadata.xml 1415 BLAKE2B eebc7a74a8d70d6d8c8eda0f59a752ce1f2589dfa0ab0df358a1fc0fbb843b285a270e626d1cd27f29b51ea46825184dfbfc9c4c252baed5092d2ab8cc33c0a4 SHA512 38aef9d6c1ad8b510a28aa54ed7d93c96d755fddc7a2693a6ab4667a38667ab37ba5eddce534f52e43c1ce9abe576ab4adefb2c17c64ff90ce1d24f44ae58cb6
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index 6341455b7147..b4896640b7bd 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 S="${WORKDIR}/lib${P}"
 
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index eca394038242..923a8390e6a0 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 S="${WORKDIR}/lib${P}"
 
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 892ee8752cb7..0fe90141ca37 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,5 @@
 DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
-DIST glfw-3.3.1.tar.gz 760014 BLAKE2B 72d23a612157b2083dc6950ff7a2531490d1440f24008fca39646860ea7f9e61eedc5d3c96edb024a125f2e9a1ef65780b4a672aa001bcbc6f41d908e904f966 SHA512 f9376002314eae5518ca63738cf1558433007dbf628fb6093a6f54c330f72d85e0ac30049877c50bc99f029e3eb6f69e69508f412d1ec9bdde0ac721dbbeba1e
+DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
 EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44
-EBUILD glfw-3.3.1.ebuild 877 BLAKE2B 456e0c472dd7cbb5e3415e79cb5f799029e802469a58a26e500ef8a64e55c5b1b33635c75329921b1903e2e57f7f8fa491b2a4a26389239cde5aa0ccc9ddad4d SHA512 6a6cb51a6166e2767b1693837db1b80e217dbd58b9480d79cb0753e713ea85749403e0cac916064fed3c5608ce63d44193452c56162cf7c1d328b3764587c216
+EBUILD glfw-3.3.2.ebuild 907 BLAKE2B 802330dfca2487ddf282e97275ccfdef1b53808a8a99636a5fe59010203a911b43b51b6508fe536370680697b0138774b09457e446f4540351c768dda818d4b3 SHA512 96de9db15b776476b9e9a94b2c36e90f1a9bb1c3e9539228b42157ce58297257e0a552fd990bb5323a0a793314bddd5dacbe98c6818c5f31a00c92995504809e
 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.3.1.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild
index 762e43166413..8639de154daf 100644
--- a/media-libs/glfw/glfw-3.3.1.ebuild
+++ b/media-libs/glfw/glfw-3.3.2.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	!wayland? ( x11-libs/libXi )
 	wayland? ( dev-libs/wayland-protocols )
 "
 BDEPEND="
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 065ac4448175..5136460f0ed5 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,8 +1,7 @@
-AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
 AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
-EBUILD glm-0.9.9.7.ebuild 1225 BLAKE2B 742f59dcc2c08797d68ecf39f6851460642209fd4b7bfec8e785379ddac6b30159504af70158bf21b96c48e3600f08ba7279f4c8e338974548db4b416e5eb88f SHA512 1f1fd53711ebd0a5c429c47ec40158328a124c2409ff18533e6b60dfc14ccfd4c086169a608010dd9c9d457b174a320af7817449f7703383bc0f7d31a665e699
+EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.9.2-avx.patch b/media-libs/glm/files/glm-0.9.9.2-avx.patch
deleted file mode 100644
index 3549af416fc4..000000000000
--- a/media-libs/glm/files/glm-0.9.9.2-avx.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/glm/simd/platform.h	2019-03-06 18:57:53.309630574 +0100
-+++ b/glm/simd/platform.h	2019-03-06 18:58:30.796988006 +0100
-@@ -233,7 +233,7 @@
- #define GLM_ARCH_SSSE3_BIT	(0x00000010)
- #define GLM_ARCH_SSE41_BIT	(0x00000020)
- #define GLM_ARCH_SSE42_BIT	(0x00000040)
--#define GLM_ARCH_AVX_BIT	(0x00000080)
-+#define GLM_ARCH_AVX_BIT	(0x00000000)
- #define GLM_ARCH_AVX2_BIT	(0x00000100)
- 
- #define GLM_ARCH_UNKNOWN	(0)
---- a/CMakeLists.txt	2019-03-06 19:27:14.052353176 +0100
-+++ b/CMakeLists.txt	2019-03-06 19:27:05.161503895 +0100
-@@ -203,7 +203,6 @@
- 		message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler")
- 	endif()
- 
--	add_compile_options(-O2)
- 	add_compile_options(-Wno-long-long)
- 
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
---- a/test/perf/CMakeLists.txt.old	2019-03-18 20:18:58.397352048 +0100
-+++ b/test/perf/CMakeLists.txt	2019-03-18 20:19:08.466182370 +0100
-@@ -1,6 +1,3 @@
--glmCreateTestGTC(perf_matrix_div)
- glmCreateTestGTC(perf_matrix_inverse)
--glmCreateTestGTC(perf_matrix_mul)
--glmCreateTestGTC(perf_matrix_mul_vector)
- glmCreateTestGTC(perf_matrix_transpose)
- glmCreateTestGTC(perf_vector_mul_matrix)
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild b/media-libs/glm/glm-0.9.9.7.ebuild
index c9c8d1c1198d..23177ad7f0d5 100644
--- a/media-libs/glm/glm-0.9.9.7.ebuild
+++ b/media-libs/glm/glm-0.9.9.7.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 RESTRICT="!test? ( test )"
 
-RDEPEND="virtual/opengl"
+RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 38780a01b71f..de220a055780 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,6 @@ AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5c
 AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
-EBUILD gstreamer-1.14.5.ebuild 3546 BLAKE2B 425709e719cdb23f49f7936e411a1d06b102109240287d90b8673885b496a1eb32dd51b735e3c03e6b320d5853b2cb1f51794b10f784df043f6e1d279e34f641 SHA512 4ef500bc764dbf072e54ada340bf2429f332d25a9ac57010afb26b13d5dd60afb398678a59d21cccec6e96468a822530782b1f90bebcb4a0b45a119cb25daeca
-EBUILD gstreamer-1.16.2.ebuild 3470 BLAKE2B 382ce44b3dbbbdcf62b3e37093995376560106a35509ceefdb35aaa779072799590b5fe3e65583deee66fdbe38d9cbac8cc7b08e82641dbdbd4a96b58af30ea6 SHA512 3536aaf84eb291e89bf0a82a1302d1eb2c6fb854899f990749b6d74ad1bf74523d5f03c222e16fc0de2b0babf6b58d2c203e92099b2bcfcc3aa6e0c3eaea447d
+EBUILD gstreamer-1.14.5.ebuild 3519 BLAKE2B 68989e70071e43baa0b35007b7b42be640a1cadff4c0f8d494ac3fd2fa2e3b13c5e2063b7bca967b4f59b86ac9b41a9fe8aa5f2438f1e44fbc9835f3f8766a9b SHA512 3b6bcd25bd60f9706820412ec58c8781e8dd9ba8955392c4cacbdf8ebad89793429859e55acd0a8b9f720d0eb04e1a2126b3fde52eda6f223f644a83402e0cc6
+EBUILD gstreamer-1.16.2.ebuild 3443 BLAKE2B fa9a34626580d09f8e5dd01b1b5597ba5ec06edd7e769d9e58ad27d4a09f9460b2ef9b424df1bb609402824af28675986afa09b2a2182643855389b642b87c03 SHA512 029ae60f4177a0768512558cfd2b3578a92d76ecec3e059b69bed17dd92a5df06b10324b71980bd6e0660084dcbb2a3bf569fabcb89604c48b7152cbd5d7eb63
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index 642bbd7fd66b..043fe837d5a8 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 	sys-devel/bison
 	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 # gtk-doc-am to install API docs
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index 5160237662ac..b93960892a1b 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 	sys-devel/bison
 	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index e564a4d9cd6a..31bc603860ea 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,4 @@
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-EBUILD ilmbase-2.3.0.ebuild 1019 BLAKE2B 84d7ee260ab910f34907fbba3c2d68a31a8cbc4cb1bdd9d578151861a8f74df757a26db9d09a88cd0b18302204122f3d6ef74908dab8944ea5cb9028b12c13ca SHA512 864719fc262269b83a9e22dd1a12f9e553e04a68954c626c6e0f39ee9e8ef2420c7c98d3b2c9b1eacb95a1bb69c8147d895d281124f2ccabf6d5519b26e200fd
+EBUILD ilmbase-2.3.0.ebuild 999 BLAKE2B 229bd39fe805117717cba562b0261d1b5e4d235ed2f6b77bb34ee395c25cce9cf73481e467e945444e3e6297dd0e009e09e74778dcd7ce22ad248481da7dea7d SHA512 9b026e21e2554d5ae0d7d4de73bac8c993737c5ebfd2c0d7efa92873cea37015f2decf195323d1dce927766850e262878f4833bfc695fd4793fd45ce45e73332
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 09128428d3f1..8e86f6eadb1b 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/24" # based on SONAME
 KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="static-libs"
 
-DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+DEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3.0-testBox.patch )
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 6ed66194e019..aa91aa094ad9 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -4,8 +4,10 @@ DIST jpeg-6b-patchset-1.tar.xz 2592 BLAKE2B 6518fc5e94dcb4cecbb2d9f4edd2ad297d1f
 DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e7df466e5408e715aa20738c047f0f709699311186e17da443af9afc208765f74bcc51a7bab2284c54351868 SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe
 DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
+DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
 EBUILD jpeg-6b-r12.ebuild 1111 BLAKE2B ea32ca2509659217d2e5ce8d8e714e09cf71d7a8fbd77e5effa3da1c51ad430a9f888355bc992de56966896ad3b7b297b1e65fefa690c4b8cdd61829aab51ce4 SHA512 729c6970970fd738182cfa9cd454f7fa589e18fb1034cc0c45478d9300453550a7725ea599a8332005da906876c7267b1948976271ee6841fa3d8011230692f7
 EBUILD jpeg-8d-r2.ebuild 1388 BLAKE2B f5727b52bfd19b9690a615fc3309d65480a4c1d88b1c892952ea78d60706097ef0ccfdb9b10869ab7acd4cc4ac49b9d8174ffb43efdc12b334e55f0c00638e22 SHA512 4a569c78ccffea89adfa37568d6d5e95a2df66bb965d757c6cdebd3e1730aefc10906ee7f632458c3f04153b31449803b245d6a7247a6c12c9b2d050a6a87da5
 EBUILD jpeg-9c.ebuild 1983 BLAKE2B 4bd96d7634c43435e9ab200c364a6be807d637e32055da5f85876b95947aeb85d5856b05067976aef1b8b6bf99f082d3984cb4193f168b8c9512b47ae2a4f07d SHA512 cd12c2be6d222d954129fdb93ab0129e2f29c136fe4fcebd4dc27f9e37f7c2866865b01a255a6188acd805f949e9cd5cec12a11d184d494c90eeec95704ba855
+EBUILD jpeg-9d.ebuild 1984 BLAKE2B 8c0a313939ce2c706e9b92c7b837e429c5739a3483e38d127ef02aa3663eeb0937512fdb6df8b1dccaf3cac9d6c827fd169afaf2e3efff5717be360b36305a15 SHA512 87c38891767d9c31750d82ba07e092d6227b6ca05d7a9441678eacaedfaebdbe474dd1e9cbd8ee48622c81bbc1b380a3516b2259e3d35be487db3b54949a1c8a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild
new file mode 100644
index 000000000000..9caa1bcc96a0
--- /dev/null
+++ b/media-libs/jpeg/jpeg-9d.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
+HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
+SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
+	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
+
+LICENSE="IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="!media-libs/libjpeg-turbo:0"
+
+DOCS=( change.log example.c README {coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch )
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
+	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
+	local ldverscript=
+	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--enable-maxmem=64 \
+		${ldverscript}
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		# Build exifautotran and jpegexiforient
+		cd ../debian/extra
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+
+	einstalldocs
+
+	# Install exifautotran and jpegexiforient
+	newdoc ../debian/changelog changelog.debian
+	cd ../debian/extra
+	emake \
+		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+		install
+	# Remove +x bits from man pages.
+	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
+}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 2e5e29cc851d..cd6d9fd1411a 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,3 @@
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
 EBUILD lensfun-0.3.2-r1.ebuild 1425 BLAKE2B 37045036e950a9466e1ffcd3abf1d0c32f625d881ee13a5937b8f5e2a145fd4b6bf2ff64c827d246e8c5d7cdd2b08e918a3405de4257e21e4b1d7bc02fd8bf5e SHA512 dfea007fc8988f66f159c8aeaadea6292a37ea9d0f56f088cfd977a0bc9e744326265edd73742f0fa48e0753474a7256dd2813303fc90b0ca1460f4dc47ad3f4
-MISC metadata.xml 607 BLAKE2B b4da5ae3ab9b9623f08349a137692ecfc9da4a00e16ebbbf1912e47204576d8bcf1505598df14a71f94b703b2dfed0ac5876f76a3fff764d503a4128cc7fa714 SHA512 e16ecf3a3b3b94c16feef66a396cc341c8211df0340733e903b352e42c9ac20e78d036bda45da8e048416ef34ba9bd5eb7d0fa530952993ca5bee6a61fd31b21
+MISC metadata.xml 713 BLAKE2B e8cc55a88122f0d188e1bce8f72f9ae57f1799c50ccebb1f1253094de326b9858e0ecf38922873397693946848910435103aefe6ed61040080e514d6d0b0bf0d SHA512 0c04301dcb4cb729050574c28c29f7f27494f1368bea0b62667e8ef3ed322a3339bd74090aa2e970129ae6b8e4e3bf749a090dbcca878adec90de568146bd32c
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 47129c22689a..6c19237136f6 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<longdescription lang="en">
 The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
 </longdescription>
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index 0f4ee36f20a8..916188f8e608 100644
--- a/media-libs/libart_lgpl/Manifest
+++ b/media-libs/libart_lgpl/Manifest
@@ -1,5 +1,5 @@
 AUX libart_lgpl-2.3.21-crosscompile.patch 2007 BLAKE2B b5a1ab145e5f33ea33d23ca6eace0dfbb156056dd82a195ed72e853cbcba4bd0d774425f8cfc0f8c7658302a5113c9deb9364b1cd0fa702d3e165d92e5e58e67 SHA512 d7710f23972b309b08a318a76ef58c0bb2303c52f1348e817be01298466b894e2b7ab3cc666ef94e8cc3571b5d0fdf543139a24d2c85cecab16a01d5af124ff0
 AUX libart_lgpl-2.3.21-no-test-build.patch 535 BLAKE2B b7752c0b0a84a56164bcca9fb30b10f5810112dd4829571185a5d759151de59473f8ee9621718440d29e5becd593d50ca819d26db7f88175fff55296ea917f1a SHA512 17baab4a8f572812d49a25abe6a455c3cf6637bb03833e8f4bd662e96d30a74a15cbc70bc2eb78b0d23d6f2448a8f272dc9317841f6dc9f27caee06933ee8e42
 DIST libart_lgpl-2.3.21.tar.bz2 329102 BLAKE2B 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b SHA512 8a632a6a4da59e5e8c02ec2f5a57e36d182b325b46513765425e5f171ff9ae326af1b133725beba28f7e76654309e001aee9bace727b5b4c8589405256a3c020
-EBUILD libart_lgpl-2.3.21-r3.ebuild 1115 BLAKE2B cce1f461f326ce300e5bd3e54f68bdf2f62f390904881e58f8c35211deeab5dab13f7041e659f392d4c0b95b0c3a8683799c10482da739911efb9056af24ed6f SHA512 228b01815d6e77f73da8e4bd02998c86e76827f86020a905df036e5d15a94306be525f1834ff610c381e1d49f1b13eb044f303d86e5477f147a3240c56c2fbdc
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1088 BLAKE2B 998ec786a0a0a3bab2387778025046e89b603268bcc8256a65dbb4658f598c6366ff7bf9bc69bd04d9f10fcc36a66cb750338560e9fb8c538e848b8a979fcc27 SHA512 691f68dd3abc264409a44e732f6e428c6e7767e05330629ec2d7175900cc775fc618459dc5dbbb164900d7d033cb0ef822da748c35abc23aec78ef970997a0df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 1ad5cd159e96..087d0d390219 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+DEPEND="virtual/pkgconfig"
 
 # The provided tests are interactive only
 RESTRICT="test"
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 40d7416c8fa4..beadfca9f949 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -2,7 +2,9 @@ AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117f
 DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
 DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
 DIST libemf-1.0.12.tar.gz 1314880 BLAKE2B 61e1e56e713ce53c589a758ad01eca572d61ca336c0a6cb08f4becb9b850973a82d4fe124b8fd6f39530d2d4637c38ccb137d4c5eecb17469654fc921e9ef150 SHA512 a96f2b14e4dc0b0b388d21789890b3a89e20bdd6aaba3665a7af2c61c3da531718ed19eb0d70ef1ce1f46e1327530a7edc057c1b78f68e7e883b5357829c7453
-EBUILD libemf-1.0.12.ebuild 640 BLAKE2B 49046404955696d85a43ae8802d50477cd1b5ac973356aa2007874f212f34d3d6a342cee8653168345006e0e37550a2ec6c7fb2bb594d413466ad1ac6fccd228 SHA512 b9dbd4738771f7631cdd76c491b142a5536e23bcad89b6382149afb347ed1f549d50a7f41117d40b9ee984c7ddb72a4169c492ec1960a78cd9003cfbcc38504b
+DIST libemf-1.0.13.tar.gz 1314905 BLAKE2B a2614aae1e34fdd65292d7feff3c0c002393aad806bbe398c665191e496ff0d3af676b04bf95400e732f09b846d033f98d3f08e47f6d7779dca9694372ef1451 SHA512 37fdc959d2269ad1ae97d49c4f75b914593b7b636024c035d96a5a47b4258b5b522cd1928a5b99392afcdfe54e46c7f2d4c157056f99c8c0d88d71c25813cc60
+EBUILD libemf-1.0.12.ebuild 637 BLAKE2B fda46e44496076d69cd53a97810544b9b52d324c0ea0cb674cb9fb4ffc3d26fd70ee1d1297d7aa387397427f3e82450dcbeb5323ca6bba919b7920f50f683014 SHA512 5f8b8104a0848f6089e551bba5b33ef104cda39ac0ab621df3abe2f1993780d3504db8e16550ac5bba86c1984a73ce2efa0b0fcfbb95c80d3be453eccf317c0a
+EBUILD libemf-1.0.13.ebuild 639 BLAKE2B 419e05149bec30f2799c6cb5e1b196b785bd302cc2796091b1d8c4293c45528eff21720aaf5b926eb450aa21da982036e796e727e62e974c738b2045de014dad SHA512 fdf9f34eb03d36f3a3f2be9cd346724f739f018eb800c8d8ac974e47e22e4573fdc42c10d43841a638a556327bfe18bdb79299d3e6bacf36bc1da72f715f226d
 EBUILD libemf-1.0.4-r1.ebuild 864 BLAKE2B 7c6720af9200e2417baf17d34c8776e2ec9422a9d283d362807b3c8b69b6ddfc53872692fcdab74f83aa3151398b231a9401ebfe806b729883b1c73dbc5c13bb SHA512 dc75bcb21bcd45634877aae19feccbc2048c01e58abbf6e2bba6647c2f55ac1985fede7c38f701975562135327e7b5e7c6f77a5c80af9e10229771db20006fce
 EBUILD libemf-1.0.7.ebuild 815 BLAKE2B a6eba4cc0279401fb72110e17bcf082c6768fd18c3aa3ad94559622680bfba3b7936e15e623078c895cb9147882bca8d36751496cdb8199dcd7ae170bc590bd4 SHA512 b0b3c94474b8aaa809456b89222886f1f0fdf0672d355895f1835e7151a4f5bd8419b8abc31c5ad932afb31167e621049d5feccfa46309209b780a6a3efaccbb
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.12.ebuild b/media-libs/libemf/libemf-1.0.12.ebuild
index c4e2a96b965d..18a1df100b15 100644
--- a/media-libs/libemf/libemf-1.0.12.ebuild
+++ b/media-libs/libemf/libemf-1.0.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_configure() {
diff --git a/media-libs/libemf/libemf-1.0.13.ebuild b/media-libs/libemf/libemf-1.0.13.ebuild
new file mode 100644
index 000000000000..66abe8cd1c61
--- /dev/null
+++ b/media-libs/libemf/libemf-1.0.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
+HOMEPAGE="http://libemf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+src_configure() {
+	econf \
+		--enable-editing \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	use static-libs || find "${D}" -name '*.la' -type f -delete
+}
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 38b71873027e..4fd57fad63cc 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,5 +3,7 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
+DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
 EBUILD libexif-0.6.21-r3.ebuild 1340 BLAKE2B 3af2fc92b0ae5c2b004ecb125b21fda1171c0b2318b882b927a8490a6a420d263ff8175fe52def0039d6f9723abc73e95cca7c27ef0104043ca23bff937369b0 SHA512 339383b4ac82b6b907465d08b06b53ec0c6e35bd839918085fcec2f61ff3eb6ffe72c454771703721d9520014c0b8deca317704b24ccd64182a3e477ca1c9ef6
+EBUILD libexif-0.6.22.ebuild 1291 BLAKE2B a42df6993fa399faf7e525951106af6af0818eb7d2f6dcede28ad8e2ebaee0339645036cf72b5449c57c914abfeb7e76b8b7579844c13c0412bb0aacf775da2b SHA512 aa1366b2cbc19028a2e850676d8b59d5125f17e6c80eb9a0e3a88e78279e060dcd6bbbfdba3008b327172480fd6ca60f2a2fb73097787396c9f11ae5fef924c6
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22.ebuild b/media-libs/libexif/libexif-0.6.22.ebuild
new file mode 100644
index 000000000000..742ffe397dea
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
+	elibtoolize # For *-bsd
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(use_enable doc docs) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
+}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index d9a4cdbcf167..f9fd0bf7bedd 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,3 @@
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
-EBUILD libgphoto2-2.5.22.ebuild 6197 BLAKE2B b1755041b64a853944af68ca29f3880bdb94d767592f07ca990a4b4a9721d21705a1459e71dd482540c920dd20119abd07fe8c3faaae14c711f484a9bbf562e6 SHA512 805d12321076a4cce2beaf38c3b969d397bc1cb7e2f504424b61b323646f1b23f93e278907a0ddc06844393ce3384c026c30728954b99113e59fa64f516e687c
+EBUILD libgphoto2-2.5.22.ebuild 6170 BLAKE2B a83709b54295c4994ca246aca207bc5376688155cc29f3d6df086718a7f0dde4db7e9bcb2aa3c686b76ead993e806b1b59dc9754292a6c287eb4d237e9d5f365 SHA512 fcc78f218b711f4b363cd3cfa72bb6dd83ccee3e7656e4382a8160021269a4405429037d387bf0645779603430fe292aa8aed14cd10ad54565ae85c4af9dfa28
 MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index 87f3c4bd930d..d45dbc32ba06 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	sys-devel/flex
 	>=sys-devel/gettext-0.14.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 99006954ba8c..cc534b505767 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -3,5 +3,5 @@ AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r2.ebuild 1974 BLAKE2B 54d81f74a3d970996e5ea5868c9790a6c6fc614e2dcab0a5d60a5aaa7b7cb8d9387575baf59bb4685ca3683271b548bea9ddffa428bdc9cb3ef5a617b09cc75d SHA512 70b858bd917667770950475a159259ac656c44d03af17e3d88fc38d055889e437ebb6633753aca7cbede140ae7f02abfadc4d490d62c37d11f06be5c73ac992d
+EBUILD libgpod-0.8.3-r3.ebuild 1636 BLAKE2B 41434a2a6e95737b25677378192badd1afff279562b3c85ef1523909287ed3886ab909d9968b47546d7bf7d91c0de4910a7d9a2ae86097ac0bb4309b8d80f6d7 SHA512 e7fee7000206185411dd6d203b952e192e39d174c986d0b54c1bf4700d9f72d8b2655f5edaff79b08f3ffdb97477b9aaf83cf600d7ffb01e26143c5b9acdc967
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild b/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
index 17b0445aa5ba..bdbbcf9a5bc2 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit autotools eutils ltprune mono-env python-single-r1 udev
+inherit autotools mono-env udev
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod/"
@@ -13,9 +12,7 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-
-IUSE="+gtk python +udev ios mono static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+gtk +udev ios mono"
 
 RDEPEND="
 	>=app-pda/libplist-1.0:=
@@ -25,21 +22,14 @@ RDEPEND="
 	sys-apps/sg3_utils
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	ios? ( app-pda/libimobiledevice:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=media-libs/mutagen-1.8[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygobject-2.8:2[${PYTHON_MULTI_USEDEP}]
-		')
-		)
 	udev? ( virtual/udev )
 	mono? (
 		>=dev-lang/mono-1.9.1
 		>=dev-dotnet/gtk-sharp-2.12
-		)
+	)
 "
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.24:0 )
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/libxslt
 	dev-util/intltool
 	dev-util/gtk-doc-am
@@ -47,7 +37,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS="AUTHORS NEWS README* TROUBLESHOOTING"
+DOCS=( AUTHORS NEWS README{,.overview,.sqlite,.SysInfo} TROUBLESHOOTING )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-comment.patch #537968
@@ -58,32 +48,32 @@ PATCHES=(
 
 pkg_setup() {
 	use mono && mono-env_pkg_setup
-	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 
 	# mono-4 fixes from Fedora
-	sed -i "s#public DateTime#public System.DateTime#g" bindings/mono/libgpod-sharp/Artwork.cs || die
+	sed -e "s#public DateTime#public System.DateTime#g" \
+		-i bindings/mono/libgpod-sharp/Artwork.cs || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable udev) \
 		$(use_enable gtk gdk-pixbuf) \
-		$(use_enable python pygobject) \
+		--disable-pygobject \
 		--without-hal \
 		$(use_with ios libimobiledevice) \
 		--with-udev-dir="$(get_udevdir)" \
-		$(use_with python) \
+		--without-python \
 		$(use_with mono)
 }
 
 src_install() {
 	default
-	rmdir "${ED}"/tmp
-	prune_libtool_files --modules
+	rmdir "${ED}"/tmp || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 60645ce95819..12d0c9437d81 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,11 +1,15 @@
 AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f93c57a5c879cdc6920c427da097c3dc5eb111189c40510252c0209caf63100ecff7ffec1b10a177b09449db4dc5c3c6 SHA512 9ffc28a89db43eba9545bca2d4c1f5a11953f36a46e294b697bda190058dcaa59982f83552ce54f37ef83970d4b0fefd1e14497854c7991db38ab7f7c1c6afae
+AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5f6476ef539e3499d2cfafbe5be129c1a246cf2f3e7f170e71bfb33adbaebe6b3812ccdfd72d99c5961011e093f740d7182fd7c1398 SHA512 1f97899970327fb6dabe521e93029a518f1493bdf45f9a345f55e803f97af7f36b65d569e4921c1aab7478006b4cd34c4f17bf150a7ffdd3760f14d9acb5b303
 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
+AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d194bc43b7aabc1c0af7c1a362073c1e1006ef4598e92deacc1373d9645076b43f0277a777007b986e62c71bc84d9d2640308872fa46 SHA512 dbb8b6cfcc672e41af8150139a964deac3d926e7e4435e0d5125b36e7dcfdfcb3915267efeb1a7d891581b34790636ea2d1de48163d8c6ddc50e041dbd1ae140
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2975 BLAKE2B 8adcb465f8dc025163ede13aba9c8c16ad5ba76151181d8800a549c4f3faf2f1ab259fefcca77e13b4384dbaf2f174285f7ee4a76f35b2da2e84ce0b956d189d SHA512 696184c66d92d48a66fffff01d4cd3bf0a4e723896ed659a0d4acd029c768ab23957f6dce4e0b39e576441e4c89e57b89141f8465fc202075a7a11e241cbe63c
+EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2972 BLAKE2B 4154ddd9f709b22356760b786cfe3a3296699e3a7291feb415f830f16ca71963d32307654e69c52c32c054852f29191c126fb757328f017a60e0e4c1dd8bf1c1 SHA512 e4fdfdc8a6f520caf42e692e4610617bbbb132fe20d5cb1af982e2e6166b7a1d52030b2c5802062e9c972a7aeef56f5a88a4543baae6843a0103b15cb7554c51
 EBUILD libjpeg-turbo-2.0.3.ebuild 2596 BLAKE2B f474623d5a37027f79a697bd13d12a14ea05ff4c302ec4cb90a82ee4703775b8290994634caa1d688a06170386f79190f4c030d4539d493b87b6c56925b5c189 SHA512 2b4b663c921eac0f088d4881352a65d81eb7a7dd398dfb17cedd062eb957177c41723a2006da1426e1eb4983bc1358e9b0e449d85fb0fe95beec1c526a41d3e6
+EBUILD libjpeg-turbo-2.0.4-r1.ebuild 2819 BLAKE2B 49ee8d67bb5d39a471fb75980ef91df148aad386518563cd45e0bd8b3099eb131d7d6e19a2c42a9a0b79a9fedb3ea335c1a964a8b16fed0d743a6d57993dbce4 SHA512 ebe40fbbcab1f1edfc73a28bcf9cbdca1c6041c5c63fb9c904496b764105c0546f8da68d9160fbc6b88c81a218f2fb7e2cc475372ed59eb79065c766881cf46b
 EBUILD libjpeg-turbo-2.0.4.ebuild 2764 BLAKE2B 9c43210e19cec992e9966f71aae6249155877d333bdf822716acaf3d2e5893f973f69e8f92b55e3a9a057d270043b62b8a836b2b69196226378d7eb826343fee SHA512 92d67d8c8e27251ebc3806e8769a0912d2f043ba5858c054a0911a90c60546cc3db498af391334711ce47a7a3ce275117cb26352c0a65c05c81b7a622a9d00f4
 MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
new file mode 100644
index 000000000000..8a9fcbd79724
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
@@ -0,0 +1,43 @@
+From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001
+From: DRC <information@libjpeg-turbo.org>
+Date: Tue, 2 Jun 2020 14:15:37 -0500
+Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
+
+This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
+include binary PPM files with maximum values < 255, thus preventing a
+malformed binary PPM input file with those specifications from
+triggering an overrun of the rescale array and potentially crashing
+cjpeg, TJBench, or any program that uses the tjLoadImage() function.
+
+Fixes #433
+diff --git a/rdppm.c b/rdppm.c
+index c0c096218..899436eec 100644
+--- a/rdppm.c
++++ b/rdppm.c
+@@ -5,7 +5,7 @@
+  * Copyright (C) 1991-1997, Thomas G. Lane.
+  * Modified 2009 by Bill Allombert, Guido Vollbeding.
+  * libjpeg-turbo Modifications:
+- * Copyright (C) 2015, 2016, D. R. Commander.
++ * Copyright (C) 2015, 2016, 2020, D. R. Commander.
+  * For conditions of distribution and use, see the accompanying README.ijg
+  * file.
+  *
+@@ -22,6 +22,7 @@
+  * the file is indeed PPM format).
+  */
+ 
++#define JPEG_INTERNALS
+ #include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
+ 
+ #ifdef PPM_SUPPORTED
+@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
+     source->rescale = (JSAMPLE *)
+       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+-                                  (size_t) (((long) maxval + 1L) *
++                                  (size_t) (((long) MAX(maxval, 255) + 1L) *
+                                             sizeof(JSAMPLE)));
+     half_maxval = maxval / 2;
+     for (val = 0; val <= (long) maxval; val++) {
+
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
new file mode 100644
index 000000000000..e88ac174684d
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
@@ -0,0 +1,34 @@
+From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001
+From: DRC <information@libjpeg-turbo.org>
+Date: Tue, 2 Jun 2020 14:15:37 -0500
+Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
+
+This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
+include binary PPM files with maximum values < 255, thus preventing a
+malformed binary PPM input file with those specifications from
+triggering an overrun of the rescale array and potentially crashing
+cjpeg, TJBench, or any program that uses the tjLoadImage() function.
+
+Fixes #433
+diff --git a/rdppm.c b/rdppm.c
+index 87bc33090..a8507b902 100644
+--- a/rdppm.c
++++ b/rdppm.c
+@@ -5,7 +5,7 @@
+  * Copyright (C) 1991-1997, Thomas G. Lane.
+  * Modified 2009 by Bill Allombert, Guido Vollbeding.
+  * libjpeg-turbo Modifications:
+- * Copyright (C) 2015-2017, D. R. Commander.
++ * Copyright (C) 2015-2017, 2020, D. R. Commander.
+  * For conditions of distribution and use, see the accompanying README.ijg
+  * file.
+  *
+@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
+     source->rescale = (JSAMPLE *)
+       (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
+-                                  (size_t)(((long)maxval + 1L) *
++                                  (size_t)(((long)MAX(maxval, 255) + 1L) *
+                                            sizeof(JSAMPLE)));
+     half_maxval = maxval / 2;
+     for (val = 0; val <= (long)maxval; val++) {
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
new file mode 100644
index 000000000000..0d028b01df98
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool java-pkg-opt-2 toolchain-funcs multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+	"${FILESDIR}"/${P}-divzero_fix.patch #658624
+	"${FILESDIR}"/${P}-cve-2018-11813.patch
+	"${FILESDIR}"/${P}-CVE-2020-13790.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if multilib_is_native_abi; then
+		myconf+=( $(use_with java) )
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+		fi
+	else
+		myconf+=( --without-java )
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+	# Force /bin/bash until upstream generates a new version. #533902
+	CONFIG_SHELL="${EPREFIX}"/bin/bash \
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--with-mem-srcdst \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	if multilib_is_native_abi; then
+		pushd ../debian/extra >/dev/null
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+		popd >/dev/null
+	fi
+}
+
+multilib_src_test() {
+	emake test
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	if multilib_is_native_abi; then
+		pushd "${WORKDIR}"/debian/extra >/dev/null
+		emake \
+			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+			install
+		popd >/dev/null
+
+		if use java; then
+			rm -rf "${ED}"/usr/classes
+			java-pkg_dojar java/turbojpeg.jar
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	dodoc -r "${S}"/doc/html
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	if use java; then
+		newdoc "${S}"/java/README README.java
+		docinto html/java
+		dodoc -r "${S}"/java/doc/*
+	fi
+}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..c48f5acfac1c
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+[[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2020-13790.patch
+)
+
+src_prepare() {
+	local FILE
+	ln -snf ../debian/extra/*.c . || die
+
+	for FILE in ../debian/extra/*.c; do
+		FILE=${FILE##*/}
+		cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+	done
+
+	for FILE in ../debian/extra/exifautotran; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
+EOF
+	done
+
+	for FILE in ../debian/extra/*.[0-9]*; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
+EOF
+	done
+
+	#default
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use java ; then
+		rm -rf "${ED}"/usr/classes || die
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	docinto html
+	dodoc -r "${S}"/doc/html/*
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	if use java; then
+		docinto html/java
+		dodoc -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 2e7367d3fd8a..206b6046a575 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r4.ebuild 1313 BLAKE2B 045bf594f778a1d8983a32b28b50a1462528ed2dcbcf2459fabaf4770d2d1f53afb6da210792cb6b88f97c0f46e78218193397156fde48fbabf9337bc39a9587 SHA512 ac1f06c2b043de1a14a909de42f0c8f5e4584e80ae401b778f4267303485475ff33f42899b6bf9862696d4b6b01c36261da066a6cf85d34f286c1602b7d3fc22
+EBUILD libkate-0.4.1-r4.ebuild 1293 BLAKE2B 8b8a5a9ffc83563b96a1a50dcce8c7fcef13ca818be6281d7ed0d5b7e19b9fe888e5b9dc475844fe0b1c7688049db40aeecb567fd7c98a37d5f219281cfeb7e1 SHA512 7b4b7adbb4874a5048e5aacdd292c62cd7337f20931ca2c98fe496b5a6ec2fb385d9b2b7c5ce2fda9c31f644fc214b434c2a2fa39953d95fba3d01e0116a9ada
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r4.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
index 4bfadc43985f..21c8c8a455aa 100644
--- a/media-libs/libkate/libkate-0.4.1-r4.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	sys-devel/flex[${MULTILIB_USEDEP}]
 	sys-devel/bison
 	doc? ( app-doc/doxygen )
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 91693831b7fd..c801f44e80de 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,3 +1,3 @@
-DIST libnsbmp-0.1.5-src.tar.gz 463299 BLAKE2B a9aa4f682262c4bfb5007c623e3da324f9ce2ddb732737b8217def899e8507ae41589607a1e0b71b34190542981ad4286f64f87795f0043049626c101001fd85 SHA512 2998de98db05a04fb860fdea258961d66aebc78d58614054311ed4cafa2f265472ad19789ab1e343d39ca293e0a304baee4941bd04948d9cc7c39bdadb0756e6
-EBUILD libnsbmp-0.1.5-r1.ebuild 735 BLAKE2B 0b1c64b969b78fb2beec7896188ed428b45ff80f2c719e98cdb532bb479fb3cafe502f81f306eef46d50fa9672e98777f29669cd5428a6097624163526422a45 SHA512 8a88a963cbcf0131295538932cb3b3f0ad5b921b338534c3b26d8644cd4cffa0416887449fb507b49dadfd2d6cfd9fbb4cc7ffde81358e540f78ca7f2b78c3c1
+DIST libnsbmp-0.1.6-src.tar.gz 463348 BLAKE2B 546f26c0ebbc2b93aec3002424c8e6d5aaeaa06f06fea13712675dd33c71b431c7f6d296c55a4d091cba7c9d5eaf053960b3d7e16e24b0832e42f8f4881f675d SHA512 7e987a47d56216b2e2a795c1233c63599d474fdd9dd495f31bc9a902f92072078ae79e73323da457fd5059908a65f44bacc6c8742f92f0950af80196a4bb4732
+EBUILD libnsbmp-0.1.6.ebuild 735 BLAKE2B 19635f1c6228c3abe3c2c9c67ef97abcf556bcf6d2812766c30310ab5962c99a4861cc48b98f85aa006296c2f733ce1dd27f93d1bfd9dcc1b60ed54cb53a69bd SHA512 b1e39c5b84baa1e37811f91eb5bb7d6450e5c168ad3b46acc5cdc740cd5f8dbe6dad57adf7a6e82bda593f91267033a4ed3a7d5c3c38e433f6c3f15427d80f6c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.5-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6.ebuild
index 95d0f2b2d063..099d99f052eb 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.5-r1.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	dev-util/netsurf-buildsystem
 	virtual/pkgconfig"
 
@@ -29,5 +29,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 5c90e9eb9c6d..3a123eed4641 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,3 +1,4 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
 EBUILD libnsgif-0.2.1-r1.ebuild 883 BLAKE2B 3cb9521d197a236c202e156bb9ba595589f57532c3ed4e0ed2f18ab3e85a5eb5c1aaf884c2eb71684695b871730eadb8a4f5c781ad392ce84adce33a9031d038 SHA512 a50a9179fdc4811f4b97431ebf5e3d76bff815612f07934abd4810d8c3609b2f735821b1d5a3e7db481176cf3019cbe2d20d1471468467d777490c24f43c8a17
+EBUILD libnsgif-0.2.1-r2.ebuild 886 BLAKE2B bfb2a1a99c4b13a2c67fac3ac2497252a9ff9b0d8c03b50e282031a46b3a4220f735bb63a3d0422a318008ebfe49ce84f0fb6cc14ed4d442c19d203bcac5a79f SHA512 d704b5d385e7cf25b1d0078d8aa426b933abe696e4c2b78ae271b7fcf3d7997ece92ba0e2bd0c1172b51b1eb0d9c5e6ded14bd18ffdfa2567cea6805c6e18b37
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r2.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..a2572cad5ac3
--- /dev/null
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="decoding library for the GIF image file format, written in C"
+HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+IUSE=""
+
+BDEPEND="
+	>=dev-util/netsurf-buildsystem-1.7-r1
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/lzw.c || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index ceaf3593201c..ce66c2fe477c 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,5 +1,7 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
 DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
+DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
 EBUILD libnspsl-0.1.3-r1.ebuild 726 BLAKE2B d476ae693c24bd71b289cf13e5494850b24b35c6ee1e206b1b2eaf6525f4fab352fc8cc8edcd2d62d1a6c5903879761751dc8b84e109949f72d3fd8d026cde43 SHA512 eaa00f9e818a32a56c31f48232ebfb9d2b1a6bd9657fe4d2fcbd1a8d913663bfd4121c94b2cacf2de099470ddf08114d4743edb2b5ce382392275472b036a270
 EBUILD libnspsl-0.1.5.ebuild 727 BLAKE2B 88c017e94018428786e302321a864cc5ae1cb02080dfd297d36ab4145de976e0d536c8ebc0b3d0094ea24792791694c59a8c5a3303f99f203354cb676c83cbd9 SHA512 fc4237d96028eebf1d80254c57a319ec23bc74fd6111c21640df0e07a773182dc38232e891d48a6e447d452bbd35556c1793eabea7bd636d4144ac66df7bfb20
+EBUILD libnspsl-0.1.6.ebuild 702 BLAKE2B cd926de85f162e1f3e5fbb4bd4c8f1f18adc288b427e3a45e277770d6a4e99b887e4506e8bd1852ea735548a053638714e7b057da86645f0cc4bac313e3fba73 SHA512 27efb4329cdf769bc847fd1ce680845ce1e53c1762b5bde84f135aebbfdbddebba803da2d89bdac6c77206439c722cb7fde443a6213b8807b7b8495804c8d2ad
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.6.ebuild b/media-libs/libnspsl/libnspsl-0.1.6.ebuild
new file mode 100644
index 000000000000..aa9ede7b9c22
--- /dev/null
+++ b/media-libs/libnspsl/libnspsl-0.1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C library for decoding BMP and ICO images"
+HOMEPAGE="http://www.netsurf-browser.org/projects/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE=""
+
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index b7e4e93856fd..694813503b1c 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,5 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5
 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r2.ebuild 1113 BLAKE2B 37d8ab311fdfba0e2800a4604b013bb526fba8edae9644fa94da7ae7fa8fb6303128abe972c7a26b430c6526249bf59a66b54ce56741d8a05e6ead81185e7a0b SHA512 a68e8e30a66b4f8501611ae6f33845141cd45edf422741e5e1fd869f653af34176d1ea3e4b4a135ebd4d491d682f53fcf021c7d1292b69f04763a9ff926f54f2
+EBUILD libofa-0.9.3-r2.ebuild 1086 BLAKE2B 6bed90b4d5798302854c985fbf7bec86bc2b5d9c2bf4dcb133641e0a4ba2d9ed9114996467fbe5f1e77bc6afebf7b6b93fc26e8197b55f91079e64275a2a13ed SHA512 697c34782b0d089daad5b4da48f223883fbaa5ec5e3f544ba3c058998f21c68455dc8c74fe723e549d0a1935c95817be22c6a6f6d79fba79adb5d3640fc92e70
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index efbb61fc521d..ff6565c00a7e 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 2a0fc7318d99..d21216308bf8 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,8 +1,11 @@
+AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
 DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
 DIST libplacebo-v1.29.1.tar.gz 330673 BLAKE2B 3094f167afb45097ef6e494d7f6f6d61b7ee4ed00bab9f1d33bfd27b032020489eb43005a30a44934416dc52577eb7fc66baf367fdfda71652e97214d87023df SHA512 9f09560832a88e670d6c31e9f5b9cbc03de437bfb19ceb0985140307b5cdf20e2050a1dab5d07f18258dfa3e5429a51f1d3d54532099be4bfc6a0dafe3ffd516
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
-EBUILD libplacebo-1.21.0-r1.ebuild 1313 BLAKE2B 2acee78d091349c05b03b55b3d95139f9aa66415ba0552193e33bc4a17d5a733606658c5877b6a4531aab0c3d107399ce7369b9395c0fd49ff38a6cc8b7377dd SHA512 974c4f9bc20fdb4d5b6ba160bd2f5a14bb8bf66cbac6d47a9593b11da1bd08ec47f28f7ba8d6ea8fb73cbe001b7465029c1e6f3a127b1dcda5b1e6bd18b47ce5
-EBUILD libplacebo-1.29.1.ebuild 1359 BLAKE2B 0387bd7dee63195d87b83a3ef435b952c67817e82e1712dba4b1c385dffd5fa7d37eaf788a3fb5bc2b67c3a8523d26393766eb5032d7453ed5e2aa71a2453781 SHA512 cec08c69cf41b1c292ae4c6f9111e9fb76bec03260bbc0b0e3ecda008ff245b648a152188af0680b7bd98b79975e7ff15688f3dc84b54f9cf701087ed76a163d
-EBUILD libplacebo-2.43.0.ebuild 1452 BLAKE2B 1c2fe783ac484edf7745c80e895cc4a66a3de4ca91c46aee3828e7d485d38d12f6c144aefbaaa804832e5b3d265b90b3c50c6dedc6ddfbc1111d8d65df1b6d70 SHA512 10f72cf208b7eb9e7eab1c5a08465212368f0c8852d52a7e1c2bcda73c2d159df279d099ca2893cb0cb0156dfa6c82c458803b0e95687e01e7827f040916ccd2
-EBUILD libplacebo-9999.ebuild 1487 BLAKE2B f1eda76ea0dff6e38021b4b5090bc578faf314403e97497b3c0f625e5aae4197fd9c24234dcbbf9eccf150e210576518096f2d57172b9e0aabe60375637079aa SHA512 549efada3d0d68110ee0e0761b82da5ea733567b4724bb959a6df74929e79cb42a5cf575cd3bd054b1738343948d50577f1e986c658912ad2ee93e8b058602e4
+DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9
+EBUILD libplacebo-1.21.0-r1.ebuild 1323 BLAKE2B 6ecdd7d4492f64a25447be420154212b792ce79688c6551b6fc38eec39258d6946cd9701b4fa2ed032968619b876309375bccd52717b9ff7e3dc0730b7ad0319 SHA512 037369e0c9351435347946635cdd8aad4190bdd6faca193f98bc15a093099709105c8e469869bd2040aac3246adcb9c4eee1341f338ee24ab0dceaee44615a22
+EBUILD libplacebo-1.29.1.ebuild 1369 BLAKE2B 539cd7f857d41ae9e4881b9fd03136e08ff9cc0eea21891f49eb60f16637f42292bcccc7ccb60c1aa800d95467c56f3f8d74969423b44c3d810ee9c89ec65aa9 SHA512 717a952a19637c62d4f21585f47c675c545aec53a3579b209c4ecb5222bbdfd1c4c90b259a7f579cc82d1612aebd437dd744a62588b443456b543c16603a74ef
+EBUILD libplacebo-2.43.0.ebuild 1567 BLAKE2B 8ceafc1a60387029b217a0197676c1c7a227f33267ba13755e3f7a804f10140ea0c8b72820f66b08270c3ac873d3f360f70b2f8d1e331abe5a4770f16319c7c5 SHA512 23044ae8cea34b3d26e963ad4c48916898cb09d5d59e3602caa50fab03d73c9ccade741e1bc6b4e65ed1518e1123bb258f6aa3901398f03ae59c32a49526db99
+EBUILD libplacebo-2.72.0.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
+EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
new file mode 100644
index 000000000000..8fa64744fd05
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
@@ -0,0 +1,59 @@
+From 45e19e7bbbbfceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git@haasn.xyz>
+Date: Tue, 5 May 2020 00:13:49 +0200
+Subject: [PATCH] vulkan: get rid of deprecated enum members
+
+Maybe we should just get rid of the switch coverage check altogether. I
+wish we could somehow differentiate between enums defined in our code
+and enums defined externally.
+
+Fixes #71.
+---
+ src/vulkan/context.c   | 4 +++-
+ src/vulkan/swapchain.c | 7 +------
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/vulkan/context.c b/src/vulkan/context.c
+index 10928a9..14a57cf 100644
+--- a/src/vulkan/context.c
++++ b/src/vulkan/context.c
+@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx,
+         [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU]    = {"virtual",    3},
+         [VK_PHYSICAL_DEVICE_TYPE_CPU]            = {"software",   2},
+         [VK_PHYSICAL_DEVICE_TYPE_OTHER]          = {"other",      1},
+-        [VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1]    = {0},
+     };
+ 
+     int best = 0;
+@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx,
+         VkPhysicalDeviceProperties props = {0};
+         GetPhysicalDeviceProperties(devices[i], &props);
+         VkPhysicalDeviceType t = props.deviceType;
++        if (t > PL_ARRAY_SIZE(types))
++            continue;
++
+         PL_INFO(vk, "    GPU %d: %s (%s)", i, props.deviceName, types[t].name);
+ 
+         if (params->surface) {
+diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
+index bf6fd54..6bf40dd 100644
+--- a/src/vulkan/swapchain.c
++++ b/src/vulkan/swapchain.c
+@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space, struct pl_color_space *out
+         return false;
+ #endif
+ 
+-    // Included to satisfy the switch coverage check
+-    case VK_COLOR_SPACE_RANGE_SIZE_KHR:
+-    case VK_COLOR_SPACE_MAX_ENUM_KHR:
+-        break;
++    default: return false;
+     }
+-
+-    return false;
+ }
+ 
+ static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx *vk,
+-- 
+2.27.0
+
diff --git a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
index a6faa8fb9ec6..d646a388cae0 100644
--- a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/media-libs/libplacebo/libplacebo-1.29.1.ebuild b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
index c431e963d163..9dc0a873f27f 100644
--- a/media-libs/libplacebo/libplacebo-1.29.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/$(ver_cut 2)" # libplacebo.so version
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index b0088dafa647..13e550979d0e 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/$(ver_cut 2)" # libplacebo.so version
@@ -26,12 +26,19 @@ RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
 	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
 	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-vulkan-headers-1.2.140-compatibility.patch
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature glslang)
diff --git a/media-libs/libplacebo/libplacebo-2.72.0.ebuild b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
new file mode 100644
index 000000000000..9303b586426d
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal python-any-r1
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +opengl +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig
+	vulkan? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vulkan && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature opengl)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+		# hard-code path from dev-util/vulkan-headers
+		-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test -t 10
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 1c2ef2ff86ae..15f1430100f8 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
@@ -12,26 +15,41 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-inherit meson multilib-minimal
+inherit meson multilib-minimal python-any-r1
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 # Please add a sub-slot for releases depending on libplacebo.so version
 SLOT="0"
 IUSE="glslang lcms +opengl +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
 	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
 	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
 
-RESTRICT="!test? ( test )"
+BDEPEND="virtual/pkgconfig
+	vulkan? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vulkan && python-any-r1_pkg_setup
+}
 
 multilib_src_configure() {
 	local emesonargs=(
@@ -41,6 +59,8 @@ multilib_src_configure() {
 		$(meson_feature shaderc)
 		$(meson_feature vulkan)
 		$(meson_use test tests)
+		# hard-code path from dev-util/vulkan-headers
+		-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
 	)
 	meson_src_configure
 }
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index eddf23360a09..15a7f05fb2ea 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,5 +5,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r3.ebuild 3650 BLAKE2B 01c2dfb8034ab3ca5dd604611c71afbbf92161296f4a87b7bfffc0cd38fdce6ddf020602c40cb0ff5c6117e672bbf4783fec92c40cf8663bc2cdb058146c0aa1 SHA512 ffe74639123cd95b5c4577a2cb1b392f65c408d2db62a604398ee558890e5105b694859fedfc296af92eca0f0fb7c6e3380298be8d1752893462d9bffcfe4ece
+EBUILD libquicktime-1.2.4-r3.ebuild 3623 BLAKE2B 4924bdfe77b93c6b2dc7e2b5a3a1de3d07f9b4bd0d7d6eab2209428fa0ec65149b4691b501c3834d18097a45fd6af2e876243a9db49406ed62450d4a83bf81ea SHA512 10cc454da1a6b60aa6ac34f891f510002f511dcc827f6afc862422ebec9fec6452cbf9301655ef8d821179228eea3ecc9803fd7fbd5e84588937bdddf54e03a1
 MISC metadata.xml 305 BLAKE2B 6d9bada3e0a351337e65ebe3b38f821d76707bf4fd85c5d91fe186d019a2e179614d132cacf99d4d9d72ac0d15b93f6ebaac5758773736f2ac867ee5fbd1d473 SHA512 2f35d071d5211038792c700f90bf585c5d427ccf6aa98f41b38ca3faad0bcf6f2445c98985b7a51f751a2cf6287693ce21966cb1e98ce8162fc57fa0617ff166
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 1616c1db31fd..cf8f4821192d 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
 	X? ( x11-base/xorg-proto )"
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index d1d46f03940c..d262e47abfa1 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
-EBUILD libquvi-scripts-0.9.20131130-r1.ebuild 897 BLAKE2B a6236bf6572ed0451edc12f27d0679603e08d6611d32d4697150f7952f149bda45c39059536398be45423f8c31c6d5a2e3eaafb585276a51e89075e0255f568e SHA512 faf23cba23b7b6757de2530fc80e364af9a8e8fb87688db356bcefc53f2de7f64dfc8829d7b4e03797d6dac02d99887af0f8502592413895618e60e00b6ca7a1
+EBUILD libquvi-scripts-0.9.20131130-r1.ebuild 870 BLAKE2B c9ab7b204703afa89e8d6cdd1ecd88cc1bcbd11c6e29ca1f24ba3d82cf0809a8af1d837379f7a47cf8e5ef6637c5b21282e2a02cc3f9a7dffa614ff5a85a8281 SHA512 32cb042c4abba8637d8c901e12726cdcc36a968ab40d4fc54d08d79f5a4142d2d7593a4ad8864dc5437a5d1647db92685f8079775597609d39cc3329ecd2f97c
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
index d929bc964083..d4abf353873b 100644
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-lua/LuaBitOp-1.0.1-r1[${MULTILIB_USEDEP}]
 	>=dev-lua/luajson-1.1.1
 	>=dev-lua/luasocket-3.0_rc1-r2[${MULTILIB_USEDEP}]"
 DEPEND="app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 # tests fetch data from live websites
 RESTRICT="test"
diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index a078d9f60a72..553f204dc453 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,4 +1,4 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
-EBUILD libquvi-0.9.4-r1.ebuild 1296 BLAKE2B eef2ad59f6d07211bb304bb007dc714ae1c64274ecf40bee52503d4127f8ee04ade277d235d335f6e236b3426a19c81baa4218196335504983ef24e6499834f2 SHA512 f0c43d7d00d667e48dad9b30f8a1fe51edb86cadb448ae517485458a07ce4c7c538a1f554d62bd4109e96e1e6570beb4bcc25232730c043375fb5f197d914758
+EBUILD libquvi-0.9.4-r1.ebuild 1269 BLAKE2B ab5329209eca8f6187a90c171e8893b7404ce6fbbd587edf3f0219ad27a08b1f60814442caf46693a8ba2ab17e08e09991072a129d2a8f36d713dcb313666665 SHA512 7cc272ff5726874c8754354e9257e9904c290eab7a29fc6be5820511c367628d4b321dec3e865a180c6be45922eeb2a53007166c4175f7007f0ca8591fcf338f
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
index 17609a305216..71aeba6b75e8 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="!<media-libs/quvi-0.4.0
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index d7295962589a..9130691e24a5 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,3 @@
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
-EBUILD libsoundtouch-2.1.2.ebuild 1539 BLAKE2B 4d08e1fdf21cae29d25aea2551efc4fb032b3e61e5e0f39e04e00d37f3fca222c69d531a4a12fe2d9ce5699c4b81d5e0ee76ed7b82c11ba907284f4c079f851b SHA512 de90c7d3e67df7e1d0aa19346139b9b6484e5dda03c3b5ff980cbb50290632280c240ec7d99e3d1a4556ddb12d82a064832239a4dc3e95a808087f4c8af7f3a9
+EBUILD libsoundtouch-2.1.2.ebuild 1512 BLAKE2B 2a31449c063086520572e99aceab81c91fffe94eaeadf5183c3cbc4082cfeebd0ce019a2fde30c6a7653838d690f5cc324c36b2971942303a8d12d145dc641e3 SHA512 b6a871b18e0310e71f7a944813a2b06c75b94546ab545dcb3322c8636d4d8623647aaceb70517d6340998fbbfa0d8b2591ab19d8b00697cacf24f08c7669f5c2
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 9621818824e8..52aa7ea0a6e3 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0/1"
 KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 1b8edf85b611..dc95e4266fde 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-EBUILD libsvgtiny-0.1.7-r1.ebuild 881 BLAKE2B 68873947deb4cdc224a30074d325770e3eea1391003ec56749a448add9cda976b969f1ebd9addfa19880fd0c39e13d3134abe3d3c449754d467055d0b929ea11 SHA512 048fa50fcab894e02c059bc2f9823e92f31f368742fd78915926d6c835c74a140af570b6f1154206c599ded002578be1c6caa25f56fbcbed8fc38c208f430583
+EBUILD libsvgtiny-0.1.7-r1.ebuild 880 BLAKE2B 35ffdfe39c3f1678deb0a8c1a1a5efe89a779711716bd47b3faa8cf834ce6017ec65867fe454af15f699fe327d6e7f6566824c72cc23e788799d7ae8145328f4 SHA512 ac5b6d826e334d50194623ce08a8e66145bf4d2c269be73489f8dee73159a1abf141b35dd5e67db931db0ab792ceb48b1de360326b2313dcf88d0242c9fea78d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
index ff91da3b9135..d236e41cfe65 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,5 +35,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index 8cad3f4b1f15..4569f24e74ef 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,3 @@
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 865 BLAKE2B ea2622fe3a98d98b34386b3b20298c7d1c16fa5a37b6b7b7963bc9280c47f1ef440ca4193b098a142fee02d3668c4ac889b08363fc7aae974f3e04f64c3a0caa SHA512 086a83cd76e04d00a5bb0c27ca5dfc1e3d49f0d1d929ea85fbadcd25900dad80abeba3f8a8fcf0848241d993d49b8428e4309d3bc9368ec3c44524c27420c1e2
+EBUILD libtiger-0.3.4-r1.ebuild 845 BLAKE2B ef5b4b557db2aa428d08f7c490260ec988cfc65bc72d6170abc672db5ad64734cd5174c2df3a6fdb88efefb179f9eef0092b07489a97fea5b9ea3ba781389e55 SHA512 06d8b3c9ea72eaab21654b74ffa366bb50474450d21ff5dd671239308ee8e253722923d293e19153aeb9b35d08d267742c293e4fe6cc6c96e814ca05549fe35b
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index 8ad6c144f449..2e118f17e648 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
 	>=media-libs/libkate-0.2.0[${MULTILIB_USEDEP}]
 	x11-libs/cairo[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index d754f9e5bec5..f642d46aa34e 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -2,5 +2,4 @@ AUX libvorbis-1.3.6-CVE-2017-14160.patch 738 BLAKE2B 799426d01cb7a55a79e518d4014
 AUX libvorbis-1.3.6-CVE-2018-10392.patch 728 BLAKE2B 774165f3b0483924d464289bc6ae28b774e6307c3be7b388b33ff73d52f5e77d4180648af5644e28e23abce4561d09ae0e3fe8b548e06bd0c9138a77ea555676 SHA512 294de5e0c40b64d495df7f53196260be5ffaba11c75fc4a1a54ec0c058eeba4793c1ef685c8cf866195a2972c91a7a896df5f05f478b7f25a564abb3f82f331f
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
 EBUILD libvorbis-1.3.6-r1.ebuild 1365 BLAKE2B 7cdee799c4b06c2daeb7773fb29ee92b5a7fcd1cedb3e6e8103d41063f2302d2e7e1ba52c59ea5c5781043e559d76c1cb8d93c812b284a9bb6a549a310d753fc SHA512 de1515d8caa692c3e2b60355a634429b5ad611fe72b40d7a9bf8f2b10ae9dd3fd659be69e87aaee2ce1cf4127854b25fd38b2c001d9a461039f8d3f34cbf878c
-EBUILD libvorbis-1.3.6.ebuild 1030 BLAKE2B 4ee47b32ed619c35ff519fca93d537f2c96ab36fc34786b8b6e6b3ef3e8ab6da173e455b382a486e081b988f8c39c566214ed351ea1e0fec1d0fac43b9b9c8b7 SHA512 5317922fc81a3ea96a2c4d6491f556e59d72b57af2eb875253c80a0a4e2743961bf7b58f75382c8b917aaa3a376ef98b3d616df1423b467f706c56e566da7277
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
deleted file mode 100644
index 015ddfccef7a..000000000000
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="The Ogg Vorbis sound file format library"
-HOMEPAGE="https://xiph.org/vorbis/"
-SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-O20::' \
-		-e '/CFLAGS/s:-mcpu=750::' \
-		-e '/CFLAGS/s:-mno-ieee-fp::' \
-		configure.ac || die
-
-	# Un-hack docdir redefinition.
-	find -name 'Makefile.am' \
-		-exec sed -i \
-			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
-			{} + || die
-
-	AT_M4DIR="m4" \
-	autotools-multilib_src_prepare
-}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index e0425bdc8f08..d2866d9af5bf 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,4 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.6.ebuild 1764 BLAKE2B 23d5c0f39b6fc96a9e15c411395d48f8ba4a949c507dfb0b7799e60ffae98f2bc22182b95a11e7b629a7b05caaa9cc96a7d7005ddb506bf0bb40ce906ac0237a SHA512 c875e9fd916ce0e67d42e22192bba538b03bcc8abc802926f089cdc8c57bfd5ac4df05ba1d8c51a1c740eaf958f3daa081736efc9de78e1095e329f9ccf96b2c
+EBUILD lilv-0.24.6.ebuild 1744 BLAKE2B 8215ab36a46d5e44a2efe870e719efa061bdb6b9917981671ca6889685090cdbdd1922501c8dee394b55ed6ab54769a302f1436ab033085f5783e5cce646a330 SHA512 ee36be9929f9a1cd117acc52a9fcf9e399c4c68fc11c2c1759ffe46763c3d67814e8aea2fd1bb9042888d8b8d8c558d4fbddbf998a305a502b6db18172169bb5
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6.ebuild
index 01a192c0cd71..58febaec1c0f 100644
--- a/media-libs/lilv/lilv-0.24.6.ebuild
+++ b/media-libs/lilv/lilv-0.24.6.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( dev-python/unittest2 )
 "
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index ddf3f87c5b74..9e28c6eceeee 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,7 +1,9 @@
 DIST lsp-plugins-1.1.10.tar.gz 53837323 BLAKE2B d890e80d2c6bf871053bd53994af597e653c19894b64df8396c54e1b70bd716adacb8ff7ce7946098d96ca64fe0e03aafc7d4d52af342b67b2551fb0dadaff42 SHA512 aedc6a6a421bfb1ad964f6963793cdb2616456044736745a1c3dc27e947b1d6395de1942c2525bc983e654df5335d35466eed16b8f31612119284b024bdce6c2
+DIST lsp-plugins-1.1.22.tar.gz 61694018 BLAKE2B 5c14140af797624cf67d61618d22a006c4b02232cef92533244f36b108b58461c56c28379cbdefc8d967de34c3bae91450bc787a0e6ab2ae41f53e4e431a17ff SHA512 6004136b55a990033d22e60af6c418a5ee708aaf0f4263fc3af8097876f7eea6e125a44392468ed8e30a92c0fa44eb65f40d80b25a5f243d3fd4f1c0f3af70d6
 DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
 DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
 EBUILD lsp-plugins-1.1.10.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+EBUILD lsp-plugins-1.1.22.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
 EBUILD lsp-plugins-1.1.5-r2.ebuild 1260 BLAKE2B 31d54fbcb2d2a175e8ab93eff26535f9e62c151d4e9dd0d22f1092d7e83fccd11da864aa89a95df86da9eccd8434c623716b48d27cf6f3990d326e554543304e SHA512 2d09fc21ca51ddaf084461b664139a2855dc23a8863ea73c58da57e808fcd1d29a47054a0c83adbc4c10b0bff006239f5a426bacdf8b8bc1007262c2eeee2b8c
 EBUILD lsp-plugins-1.1.7-r1.ebuild 1037 BLAKE2B cd70d7c20ac3e6abc074780b15dc24a5c7f0f19eb8dbc54239e6ae4977fc5ac04ffdeb29f105cbf1b71975a029f5ffaefa182903820c8ae1f57754c2256dc7e1 SHA512 cb9256462b87742bc44663d6888f385fec69f4ac8776434574e305ef3526a0befcc8b737ca94d5d931b4337682195a2f4ee8990e86e4254266230896ff0a1a61
 EBUILD lsp-plugins-9999.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
new file mode 100644
index 000000000000..3e66062b835d
--- /dev/null
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Linux Studio Plugins"
+HOMEPAGE="https://lsp-plug.in"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc jack ladspa +lv2"
+REQUIRED_USE="|| ( jack ladspa lv2 )"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/libsndfile
+	doc? ( dev-lang/php:* )
+	jack? (
+		virtual/jack
+		x11-libs/cairo[X]
+	)
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? (
+		media-libs/lv2
+		x11-libs/cairo[X]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	use doc && MODULES+="doc"
+	use jack && MODULES+=" jack"
+	use ladspa && MODULES+=" ladspa"
+	use lv2 && MODULES+=" lv2"
+	emake BUILD_MODULES="${MODULES}"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 6939b9b78c27..691a91ce783c 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -2,5 +2,5 @@ AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
 EBUILD lv2-1.16.0-r1.ebuild 1376 BLAKE2B 3826579de7cbba3611dc893f9c192185fbdfca25f87f6add254c63088cc9c0e85f1e4331e56c233ace6295f050d0c857c3c78d44912132f9fe27eb70f1f2827c SHA512 420d21694ad738cf489f58bd271057ad8d33101df5a1be4b667b9716c827494f6153114d30586822cf54fe64ee127f9538eeabd9e62c8c18ea0c3891a58c0f0a
-EBUILD lv2-1.18.0.ebuild 1335 BLAKE2B 5de225a386760c670478c43a155c223c134448ff18d2b47ac98b3a40ed80b337fc90212aca3713823d6f5ed9e85b756f532ef538fd154595828c54dbf1536945 SHA512 f78c3a70fab2847a6943cc96ba65572206cec0f492f76a5e9dee21cf4fd3fad5ae22be060180c789cd5ba6f8ae4a347f50189fa572ead2c748f542123604f750
+EBUILD lv2-1.18.0.ebuild 1339 BLAKE2B c89e4c1c94f0489959bf7d08c8f109ed963a9d379a642515300d74f82f38e8563d976fe24f2018437cb326ff3773e1c2894b702f1b021864cee754ab284b9884 SHA512 b88bfdf0be6ee67179fd63b94a3c05d83a19bbda97c8886da6f075812b59237edc2f38cf3dbd9f013102b32db9df0c4ded96665b01308ffcbe75444643b8063b
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.0.ebuild b/media-libs/lv2/lv2-1.18.0.ebuild
index 619c9ed011b3..a3daaf8fa595 100644
--- a/media-libs/lv2/lv2-1.18.0.ebuild
+++ b/media-libs/lv2/lv2-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d6337826529d..f518b3a93b36 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -9,7 +9,7 @@ DIST mesa-20.1.1.tar.xz 12683180 BLAKE2B de602430ea91076f93b66d1be6da31bd3c74bc1
 EBUILD mesa-19.3.5.ebuild 14865 BLAKE2B d7b0fcc84cf17d248a23f8d3decadaf7e55165bec5a186633d4cfb01b738583e4c7cfa81de5f669445776ee8b10043af8f1328a5918f48529ec9750324e1a155 SHA512 b7132b00f57356a4b244e0a9dd4b618119efa85b539bc0228f8e770b28fb6f1ccfffbe235100748ff2834a674c49bca38b8282b6c2e47d20356349c244b9f6e9
 EBUILD mesa-20.0.4-r1.ebuild 14877 BLAKE2B b7221bc6c6c564f5621d19d01c7412fdf8b734304b3469b757f9fed0fe9aa67330eab2ab6e2b8595cfe6cc4b019474118cf50b0c7b156948f0ee8c5bec1ee167 SHA512 8ca4b2b70f08775a2fce7c857cb64fc5cdf5e10075e4b5d3723535380024585a17a34cd344ec5de47acb404acc9af76171f7e97c6f54354a8da2d78135cecbf2
 EBUILD mesa-20.0.7.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
-EBUILD mesa-20.0.8.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.0.8.ebuild 14908 BLAKE2B 63ebdb72ac3300968c253175282946c5497f9f07a90103df6d1b9d014920a99cfd5566ae7e5856bde9308a7f643db67cf42cc06899e985376f4fdca86fc7086f SHA512 b429df8009f73da07436028d76a74dd829b24696cd387f74ee98cd26d8ecd1fc0ecd62e46d21fd8881e6707389ec1ab1d96a9f0046d0e3be61502cd8e4956511
 EBUILD mesa-20.1.0.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
 EBUILD mesa-20.1.0_rc4.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
 EBUILD mesa-20.1.1.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild
index ff719014070b..8b592738e83d 100644
--- a/media-libs/mesa/mesa-20.0.8.ebuild
+++ b/media-libs/mesa/mesa-20.0.8.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index c296fbc11b85..c6c091875ab4 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,5 +1,9 @@
 AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
+AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494
+AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
+DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
 EBUILD opencollada-1.6.63-r1.ebuild 1640 BLAKE2B 18ac545d76b9ebc99b5f85d44503e184fa195ec691ddc6cb2453ce9cd8d095784df884a029caba88cb1a962ea40a525efe309032a4bc93b1e69cbe05580b5b69 SHA512 04c9b1453208e360d449adb678876f0d6856704222e1cfeb5de4c1448f34b73b407c00235b62848a7fd9b6e4360dfd1be419a8815acbd7bf24f719d9169fbf75
-MISC metadata.xml 256 BLAKE2B 9e83a301f9fadaeea1559fbf7774e1d353df51a19661d95134705312a6f1465807f815f733b0ba72a6e891a551891fefc05de9a37f9c8cb2c2236e6e475962c5 SHA512 4ffbc8e0ad4a1456f33e5b568166f3e6285ffd42218fbc0d9f8f04c319a341c367aec0b92a1074029cd11ededf0c110a22f3358a47e2cdce5946a6d42c82fc30
+EBUILD opencollada-1.6.68.ebuild 1874 BLAKE2B c3b50085f4e57def1bf52f713ad630b73a8f3167cff8814041515d92ef5d764dc788c07e04da281cbdf290bbe495967d24d840174a2c9fba23745a12edf78c46 SHA512 bd64254f549da23fadbbba96d58d5624fd48482e6a3db257b4fce09672efa9ba4ff19d5b87284db3dede63009732fb02c96a128dc11cfac4111dc408ab4b4df9
+MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch b/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch
new file mode 100644
index 000000000000..3d4be8dba1b9
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 13 Jan 2018 11:54:44 +0000
+Subject: [PATCH] OpenCOLLADA/CMakeLists.txt
+
+Use CMAKE_BUILD_TYPE which can be overrided with custom distro types
+
+Adhere to GNU filesystem layout conventions. Not all distros and OSes
+have directories in the same locations and they define the
+GNUInstallDirs variables, so use those variables. Also, this enables
+multi lib installations.
+
+Define the version variables to enable SONAME versioning on the
+library files in case there is ABI changes in the future.
+---
+ CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 36 insertions(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95abbe21..00ad8d6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,14 +37,41 @@ cmake_policy(SET CMP0010 NEW)
+ # Input directories must have CMakeLists.txt
+ cmake_policy(SET CMP0014 NEW)
+ 
+-# avoid having empty buildtype
+-set(CMAKE_BUILD_TYPE_INIT "Release")
+ 
+-set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release and Debug" FORCE )
+-mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
++# Set Release type for builds where CMAKE_BUILD_TYPE is unset
++# This is usually a good default as this implictly enables
++#
++#   CXXFLAGS = -O3 -DNDEBUG
++#
++if( NOT CMAKE_BUILD_TYPE )
++	set( CMAKE_BUILD_TYPE "Release" )
++endif()
+ 
+ SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
+ 
++# Adhere to GNU filesystem layout conventions
++include( GNUInstallDirs )
++
++
++# #-----------------------------------------------------------------------------
++# Initialize project.
++
++project(OPENCOLLADA)  # must be after setting cmake_configuration_types
++
++set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
++set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
++
++set(OPENCOLLADA_VERSION_MAJOR 1)
++set(OPENCOLLADA_VERSION_MINOR 6)
++set(OPENCOLLADA_VERSION_PATCH 68)
++set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
++
++if(NOT SOVERSION)
++	set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}
++		CACHE STRING "Set the SO version in the SO name of the output library")
++endif()
++
++
+ #-----------------------------------------------------------------------------
+ # Macro's
+ 
+@@ -58,7 +85,7 @@ macro(opencollada_add_lib
+ 
+ 	if (USE_STATIC)
+ 		add_library(${name}_static STATIC ${sources})
+-		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name})
++		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
+ 		foreach(target_lib ${target_libs})
+ 			if(TARGET ${target_lib}_static)
+ 				target_link_libraries(${name}_static ${target_lib}_static)
+@@ -84,7 +111,7 @@ macro(opencollada_add_lib
+ 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
+ 		endif ()
+ 		add_library(${name}_shared SHARED ${sources})
+-		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
++		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
+ 		foreach(target_lib ${target_libs})
+ 			if(TARGET ${target_lib}_shared)
+ 				target_link_libraries(${name}_shared ${target_lib}_shared)
+@@ -145,19 +172,6 @@ endmacro()
+ # end copy
+ # --------
+ 
+-#-----------------------------------------------------------------------------
+-# Initialize project.
+-
+-project(OPENCOLLADA)  # must be after setting cmake_configuration_types
+-
+-set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
+-set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
+-
+-set(OPENCOLLADA_VERSION_MAJOR 0)
+-set(OPENCOLLADA_VERSION_MINOR 1)
+-set(OPENCOLLADA_VERSION_PATCH 0)
+-set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
+-
+ 
+ #-----------------------------------------------------------------------------
+ # Compiler warnings.
+@@ -190,9 +204,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
+ #-----------------------------------------------------------------------------
+ # Install vars
+ 
+-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
+-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
+-set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
++set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
++set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
++set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/OpenCOLLADA)
+ 
+ 
+ #-----------------------------------------------------------------------------
+-- 
+2.15.1
+
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-fix-null-conversion.patch b/media-libs/opencollada/files/opencollada-1.6.68-fix-null-conversion.patch
new file mode 100644
index 000000000000..5a2fa46fe5a4
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-fix-null-conversion.patch
@@ -0,0 +1,12 @@
+diff -Naur a/COLLADAStreamWriter/src/COLLADASWLibraryAnimations.cpp b/COLLADAStreamWriter/src/COLLADASWLibraryAnimations.cpp
+--- a/COLLADAStreamWriter/src/COLLADASWLibraryAnimations.cpp	2020-05-08 01:17:06.981501609 +1000
++++ b/COLLADAStreamWriter/src/COLLADASWLibraryAnimations.cpp	2020-05-08 01:17:23.011549185 +1000
+@@ -62,7 +62,7 @@
+ 
+     //---------------------------------------------------------------
+     LibraryAnimations::LibraryAnimations ( COLLADASW::StreamWriter * streamWriter )
+-            : Library ( streamWriter, CSWC::CSW_ELEMENT_LIBRARY_ANIMATIONS ), mOpenAnimations ( NULL )
++            : Library ( streamWriter, CSWC::CSW_ELEMENT_LIBRARY_ANIMATIONS ), mOpenAnimations ( 0 )
+     {}
+ 
+     //---------------------------------------------------------------
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index a3be9fdab74d..936e18ecb590 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>agrigo2001@yahoo.com.au</email>
+		<name>Adrian Grigo</name>
+	</maintainer>
+		<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
 	</upstream>
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
new file mode 100644
index 000000000000..f5f42819616b
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils flag-o-matic
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	dev-libs/libxml2:=
+	dev-libs/zziplib
+	media-libs/lib3ds
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/OpenCOLLADA-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-null-conversion.patch"
+	"${FILESDIR}/${P}-cmake-fixes.patch"
+	"${FILESDIR}/${PN}-1.6.63-pcre-fix.patch"
+)
+
+src_prepare() {
+	edos2unix CMakeLists.txt
+
+	cmake_src_prepare
+
+	# Remove bundled depends that have portage equivalents
+	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
+
+	# Remove unused build systems
+	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	find "${S}" -name SConscript -delete || die
+}
+
+src_configure() {
+	# bug 619670
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DUSE_SHARED=ON
+		-DUSE_STATIC=$(usex static-libs)
+		-DUSE_LIBXML=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newenvd - 99opencollada <<- _EOF_
+		LDPATH=/usr/$(get_libdir)/opencollada
+	_EOF_
+
+	# Remove insecure DAEValidator RUNPATH and install DAEValidator library
+	dolib.so "${BUILD_DIR}/lib/libDAEValidatorLibrary.so"
+	chrpath -d "${BUILD_DIR}/bin/DAEValidator" || die
+
+	dobin "${BUILD_DIR}/bin/DAEValidator"
+	dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
+	# Need to be in same directory as above binaries
+	docinto "/usr/bin"
+	dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
+	dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
+	dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 2aa5045d9c3e..055baf23d471 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -28,7 +28,7 @@ DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611d
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-2.4.13-r4.ebuild 5973 BLAKE2B 2243648334c7c959d874b2255bc6743b3785f30b5f2a2a2884202f97568cea342d978e6247b33d4c069903f213f9cce970e73de5f9049ec72f0fcb2c2cc883ad SHA512 a35e75145fe2ca29570a9004a8526385654b26a41143eb104f2a7be61769542eefaca6020e79bf1ef4ad37f2e07168ce0aba0e2fea29ff3bdc07daab0f36cf84
-EBUILD opencv-3.4.1-r7.ebuild 18569 BLAKE2B 296a275a5bbc44ab2a43bcd48336de85f9806b1667ae201aea7444925a681a9262c326b831beab157f9573c8a7967b22cb5f63aafeed494ad7da3906cfe109c9 SHA512 781fa7d47616b45d24f1be3b1bd6bc9c8e8770cf52b0c7356c538514ab3e461f62288617ddef1f087502afd89566a7f68263eff99317597f15ab729f24abd581
-EBUILD opencv-4.1.2-r1.ebuild 18254 BLAKE2B 531cb1baf152b065cfe10a1d074a5af323da39d367385ff09b53b9eaf3fb2a60033f37c779beec52970c3cb91ea2b30261d9a6e890f8a411687b611887a1b6b3 SHA512 6229f825c8aaafd82ae9261e3a7c4f83d26b909b7d773b81b2efa108503664fc2dc31e6975a2bbcea7520aea31ab1792b5d19b71f9f47de805a94ec9582743d2
-EBUILD opencv-4.1.2-r3.ebuild 18339 BLAKE2B c93988a8a7ebbbccc7e3394c57bf95d22ac963e9fae72a0c6d9397926a2c1f12df70ba3106041582716b0032687edeaf1b53d15fe0a4748a6483d0fe23c94e90 SHA512 42faba97bebbd0f5f5bd351c347b801bf2bbdbf02486dd14ce1efb639afbdd35ec1aca9b39a60502e4b70b269d1e2c9e4cb8f09e874fa5865bc3d15265d33703
+EBUILD opencv-3.4.1-r7.ebuild 18549 BLAKE2B 48af0cef62a6f3d672f21f97eecb34b6048a6b7cf6d3064c7166c226a645634137da33cfa91416eaec240ab82cc98d0191c5b668ff20f1cd19c6ddedc0c56aa6 SHA512 d277fae628589279850b35fc6b947b7f02137b21b87e88e80651825b9d75dc9eba0c524ffa265fa8ddc3998366f1122b383dfdfd508b77ed7967cf769a6054e3
+EBUILD opencv-4.1.2-r1.ebuild 18234 BLAKE2B cb0ad9fe36fe6b4c95ccd5fbb2234802a040d9eeff437999dd7b6b594b1d9f2d87d5d46322244a117e72fdab8a6f461173412a953bf9d8012b206efc3c10f8c5 SHA512 49baaa76d391452b611dd40dfb4b144b9c67c34f1e500397b3415f95860306532b167ab98ed9b0ed09f06b66abdcf77ce88c15957967229d0bd54363de56c0db
+EBUILD opencv-4.1.2-r3.ebuild 18318 BLAKE2B 8b7ae5933e6b6a7b7292eb112a8b2c5164726e5718dc0bb81fcb8c477f42bd31578f22516447dcf9f6649c368809f478759ee4810606d3315b2333433e001774 SHA512 730bb5c1ca8cc0d20ebf7b9720d74d950ebec413679b7dd6f4040cbff34df967417ba51169d156882f19d08fd1f9abf7d034dec8d749c7ed7c3785262f557aa3
 MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 683c36a14930..76c7ada5db8c 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index ba6201ddc539..19a98b7fe06d 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 0265b3431315..3fec493f57f6 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/4.1.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
@@ -99,7 +99,7 @@ DEPEND="${RDEPEND}
 	vaapi? ( x11-libs/libva )"
 BDEPEND="
 	java? ( >=virtual/jdk-1.6 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/opencv2/cvconfig.h
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 7c751e5266a7..d0241653336f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,5 +8,5 @@ AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f3
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-EBUILD openexr-2.3.0.ebuild 2210 BLAKE2B f41642f7a9330b268f9a1e4c2c56c7b09f7245d026d4855fff2344a3b2283b153543256b9c9e316af1d7175d1e50f4eb992ed7a21517e2efc2c385c33e53dd68 SHA512 92d5212332ef1b9cd4b3166622d4dba3a7f2e86c681d05301004151bc2ae9749aefe725c3d0fb44da7426dabbe9a110449be94a310c5a8b003aecfc2aa329152
+EBUILD openexr-2.3.0.ebuild 2190 BLAKE2B 4e6f5ab459d944446a549556e5eda5b1b521e5673787e4eeb11f0aac9427553b63aa095615e1fb1adc8a39529c653212563e16514a5e92ff5a59ec8bc77b9689 SHA512 34a09e52a17ccecca0b642b11bf776cf8e075f2b6605334f49b8d62af413c7fa7c5103d6495a42dfc5f219e754702fe5e5fd07a6a08c2baf3e86e6b201008a8f
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index a7351949fe4c..1fee7ea7fa6b 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2016.09.16
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 1ed9c0c6ec41..29492732dd56 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -1,7 +1,6 @@
 AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b
 AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8
 AUX qtav-1.12.0-installpaths.patch 894 BLAKE2B d5e964a15566c5df08e35ad3dc6a666ce88a71bb260b0a0b56e2f6dfc1cc421a893e8104c740d911f805746ed4fd00f716453e58bd14ad80349a3b4c459f2006 SHA512 0eb3b37c86e29467db10263c94ea2efcd2fed014e49b1dc280c40c4ba0f63a7537260572aa786817df8e6bd503012b7e193ab0c9e66883f2eaf04c23976fa527
-AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb32add562a54e9d5eb17d3da603e6bdbcf2544ef60667390de0a44475d9b0457c8664f40b982162a569846b511adf SHA512 0b9db739ab6b4a23d653de56d993f44a6e8d108df3a635a2ebc822bdcc2ac1006643f31ceda8a94626a84aa8556b45ab5aa72aec20d990cf09e7396191bac3bb
 AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
diff --git a/media-libs/qtav/files/qtav-1.12.0-multilib.patch b/media-libs/qtav/files/qtav-1.12.0-multilib.patch
deleted file mode 100644
index 608a67dfe0d0..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-multilib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 87e54cc4d3fa76f3b226fbf2822a87af48cf3e51
-Author: Johannes Huber <johu@gentoo.org>
-Date:   Wed Sep 6 23:30:42 2017 +0200
-
-    Fix multilib install
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef7ade07..11f8603b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,7 +66,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for .moc
- set(CMAKE_AUTOMOC ON)
- if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   set(QTAV_INSTALL_HEADERS ${CMAKE_INSTALL_PREFIX}/include)
--  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib)
-+  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-   set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin)
-   set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml)
- else()
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 14d029865713..0d57fe48bbdb 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,4 +1,7 @@
 AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
+AUX rlottie-0.1-disable-werror.patch 381 BLAKE2B 26afddff05d0cfda88617473ec4affca4a721f081e393c31b409fc6a3e73efe73e4e661caf13aeaf5394f31533390b1439492e066ad19087d76b984b6304f421 SHA512 2363100f6b0ab09f3ad9ae46dd02dffd2a5ca2124ae1b4f3791c88b3b7563e9cafd68da4ee719f9460d781aab80b4a83f21f0d788db2eefa5cd9d2cab0ab69ce
 DIST rlottie-0.0.1_pre20200424.tar.gz 3371620 BLAKE2B cdfc89f66e7aec736029416decf76777f22b4cb8293bed74e647088480faed4c6ffd03a29a967ac532f9e747858fdd93fa552eb974085f7cf1701a12fe3a2c38 SHA512 1a05b835c083337a80b32ea8c1e201d1d2356c58e314b791f74f95504303f3ef46d3951abf2a7467daaeae462c1fe2cf793d9fb2402639b279ca6ea6367cdda7
+DIST rlottie-0.1-1.tar.gz 3370181 BLAKE2B 7ba580af961f2af7b92c40b4640f8b515c21a354ef5e639c5f00b0ea26fd3e2929dbf2e926b58d39ad3f48228511ba42a42a24d4b7bb914389a7e43df810d667 SHA512 ab9b913d9e0bc938a878a6847851cd6965dc61efbf8ef71761b83d6ff577479cf0c0b214c36e58ddd6a29927a1954c3d3db9db427779b5a2d472c8962cd45ff1
 EBUILD rlottie-0.0.1_pre20200424.ebuild 1009 BLAKE2B 8961c52e46ad05d16f96a04620373a950b8a6164b2dee685cda2079b96e466edfb5049c4f8f551f327b5a6f16d31ddb061aa88c8dfe3b6ced9e0f828b088cac0 SHA512 54bf08e1a2781a80b4c190bb0c86245dbc267a6d4bbd4e14e6bc83538c237819be1275737085ea25ae926d639397c26a7026ea93156649444a74f4ba42738ebd
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+EBUILD rlottie-0.1-r1.ebuild 938 BLAKE2B 81089ca22c2eecf141786f318bc3e9e0e695ffdc4ed813fe21a4d4aa797149140f1fb3112e6b62c5c20c390ecec2fa01ba35fffb316737dc22b966bfe31b4f2f SHA512 4ad3a001804d54da606f857a22350a82acb34479f0a937a8925c42fee361ea85897251879dfe8a03ef6bdaa286ca08dc78092ea9fefd70b40570b3935eaa94de
+MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch b/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch
new file mode 100644
index 000000000000..55e50d63a553
--- /dev/null
+++ b/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch
@@ -0,0 +1,10 @@
+--- a/meson.build	2020-06-19 08:49:20.511888022 +0300
++++ b/meson.build	2020-06-19 08:49:49.166640657 +0300
+@@ -1,6 +1,6 @@
+ project('rlottie',
+         'cpp',
+-        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
++        default_options : ['cpp_std=c++14', 'optimization=s'],
+         version : '0.1',
+         license : 'LGPL-v2.1')
+
diff --git a/media-libs/rlottie/metadata.xml b/media-libs/rlottie/metadata.xml
index 6b0a0fb3a729..be0ee7cd3352 100644
--- a/media-libs/rlottie/metadata.xml
+++ b/media-libs/rlottie/metadata.xml
@@ -5,4 +5,17 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <longdescription>
+    rlottie is a platform independent standalone c++ library for rendering 
+    vector based animations and art in realtime.
+
+    Lottie loads and renders animations and vectors exported in the bodymovin 
+    JSON format. Bodymovin JSON can be created and exported from After Effects 
+    with bodymovin, Sketch with Lottie Sketch Export, and from Haiku.
+
+    For the first time, designers can create and ship beautiful animations 
+    without an engineer painstakingly recreating it by hand. Since the 
+    animation is backed by JSON they are extremely small in size but can be 
+    large in complexity!
+  </longdescription>
 </pkgmetadata>
diff --git a/media-libs/rlottie/rlottie-0.1-r1.ebuild b/media-libs/rlottie/rlottie-0.1-r1.ebuild
new file mode 100644
index 000000000000..5aafb5241279
--- /dev/null
+++ b/media-libs/rlottie/rlottie-0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
+HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
+SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
+
+LICENSE="BSD FTL JSON LGPL-2.1 MIT"
+SLOT="0/0.0.1"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}"/${P}-disable-werror.patch )
+
+src_configure() {
+	local emesonargs=(
+		-D cache=true
+		-D module=true
+		-D thread=true
+
+		-D cmake=false
+		-D example=false
+
+		$(meson_use debug dumptree)
+		$(meson_use debug log)
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
+	eninja test
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index d14130618c89..ee005e92b2b8 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,10 +1,11 @@
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
 AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
 AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
+AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.4_pre20200405.tar.gz 273897 BLAKE2B 6cd02d0db17d0c92b3f2b65bd46284b8432538e3899e088c2e08648a6797ed596af13e251afdf0c1747abc27fa49b56df32ce67beb72c6e99a6bda463cf9dea1 SHA512 556d519faf6e3df6efbe77a24b21e74198468b0638dd7c3143228afce5625f04707fa77aaec997998795166705271e2e8d086cd2e82609eaaef786ea36554ac4
+DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
 EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
-EBUILD shaderc-2020.4_pre20200405.ebuild 2089 BLAKE2B ee9e8ed191ee3094cae26dfae29e8e5542f1816ea22b2891f75b9bcc825918ee5d2f6607bcf50c918c9dd38a3c08d06ee43cc6c19435311daef20f8a9eebd781 SHA512 e618ffa15344e1489b43dc3a29e571f4f88ec234988df5a729d2f9a84e905bdcf049f0252a3d76cceb89afdc636d4c38e73558983977ba4df0e93f7aa6d5fbe4
+EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
new file mode 100644
index 000000000000..f46aa5ddb668
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
@@ -0,0 +1,17 @@
+This patch is a revert of commit 15a66d72f33a099ec65e0fd37cf14548ed1d2bdb (Rolling 5 dependencies and fixing build (#1057)) because it adds usage of the .maxDualSourceDrawBuffersEXT field which is not available in any tagged release of glslang. The field is added in glslang in https://github.com/KhronosGroup/glslang/commit/e05cc20ec20a154d94256c744a3837c23719c0f9
+
+---
+diff --git b/libshaderc_util/src/resources.cc a/libshaderc_util/src/resources.cc
+index d64e47f..458a63f 100644
+--- b/libshaderc_util/src/resources.cc
++++ a/libshaderc_util/src/resources.cc
+@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInResource = {
+     /* .maxTaskWorkGroupSizeY_NV = */ 1,
+     /* .maxTaskWorkGroupSizeZ_NV = */ 1,
+     /* .maxMeshViewCountNV = */ 4,
+-    /* .maxDualSourceDrawBuffersEXT = */ 1,
++
+     // This is the glslang TLimits structure.
+     // It defines whether or not the following features are enabled.
+     // We want them to all be enabled.
+-- 
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild b/media-libs/shaderc/shaderc-2020.1.ebuild
index 3de771d443aa..17392a54f21a 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20200405.ebuild
+++ b/media-libs/shaderc/shaderc-2020.1.ebuild
@@ -9,23 +9,20 @@ inherit cmake-multilib python-any-r1
 
 DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
 HOMEPAGE="https://github.com/google/shaderc"
-
-SNAPSHOT_COMMIT="f175adffa9d2da6ae18a5f8d54e7b5f27df0f1c2"
-SRC_URI="https://github.com/google/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
 	>=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.1
+	>=dev-util/spirv-headers-1.5.3
 	doc? ( dev-ruby/asciidoctor )
 	test? (
 		dev-cpp/gtest
@@ -36,6 +33,10 @@ DEPEND="${RDEPEND}
 # https://github.com/google/shaderc/issues/470
 RESTRICT=test
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build.patch
+)
+
 python_check_deps() {
 	if use test; then
 		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 43b0269aa775..0ed57b40cd8b 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -2,5 +2,5 @@ AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6
 AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1354 BLAKE2B 8dcdd6b0beca2a992d217ab0ced89999cff3fb1d069f16c8830a75d0311d979d8de516b3e6b8d3592cf0af131091798f844bc8293ccfd42e885de49644bc14d8 SHA512 bfe111fb0f11ac04c6a52c15bd4c65658859f3b0849ceac553df83221af126f0ccd5cfb45dc938d5eee4a4e3ca7ab9881b40cc1d85cae4b2ac31e3ae88aac71b
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1327 BLAKE2B 2304ae98d6670be27c245e3ceec71b0f8f73b5965e6874f16030ff6b6ae585f66bd9235684affd89847900dca5a3e8c0663baa7dbaa8eed550152325c1307ab7 SHA512 1b3c546ce8397b53153b32d43a6d513337ab4f79a346b670ed162d61254a75d3ea17e696fe3d82aec2b4098cbfec771f70089a3801e1a069f8b7258cc9b44483
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index 7ae3e405da27..9f2da54374af 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="debug examples test"
 RESTRICT="!test? ( test )"
 
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index 253cdd7b5d92..29ac4ef13074 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,9 +1,4 @@
-AUX virglrenderer-0.6.0-libdrm.patch 391 BLAKE2B 471d68831129f1c01bdeddfb8748cb71fc30cced692f73493ed6ad07c519e15b8412a4dc4f533833181b8aa3a04566c160f7f08bccee7b1fb1adc4ee58c9a61c SHA512 935a3cd1aa7c947a472c8fe5f1880e1897311451f42da26ab941af91152c60e2b66930446b6ff370cc29831a345fa73f9374fc82ad22ced445e448f520b07853
-DIST virglrenderer-0.6.0.tar.xz 222536 BLAKE2B 2e359e88489458460a5fe1daa62913ed0159c10eee1e360fbf561221dc38aa27e3c6c402960eb1313e55dfcbdca3483a5672f5c68b7303783320b8beb330d987 SHA512 23d5f8c582f02303e3b4b59a6ca66e7859367a0bb931b884521f615bf9e25290f1ad2a32a92c127df1ec0f48503e20f557f6e910973ca2c7620b75801d5f3401
-DIST virglrenderer-0.7.0.tar.xz 258128 BLAKE2B 93d878caa635671b0cabb4726df6f3a75a3153e6a138beb6f7de0985abd3c3cc50618727573d5f6a887cec2e0cdba082327ec7c2f9e359e9bd1c0ea22785abba SHA512 b8ee9242ac4184e65ade700306827e4d3e345bf6d742970d4b1ac7a09d8883e4195c4c2e69b73a59a08a43b4d8ee078a16501fbafe927e59b0f7627470d04ba8
 DIST virglrenderer-0.8.2.tar.gz 2697672 BLAKE2B 2c5b14fcca8ed778a674c35f3a88213d017f0cb30afcd5c28a13f8ea8d9d2fcb052150451cf0c9e7b48f0619fa93c9cc9036b59677fdae09ec97517984af43c1 SHA512 a64069bf6a28e5b77da53b5226a447decc3fe07a5c28bc49c2c15413b7651605170c5644a24f6a0ce9216a0f55afcee0246c3e4d9bc8f32dad771be3115e0f2a
-EBUILD virglrenderer-0.6.0.ebuild 1052 BLAKE2B 9b73cf2f385a1b3097def7cb588afd3686690cee78b56aa9433bc29630b90720f29ffa5e59eb950bc46f376e7907b6cca3528f8cf4a61fcabc78cd1c5baa019d SHA512 a918e18f227e266815e099b4962ab887973d652dd3b2a30120f2c81a5dbb435cbfb9ca2662236854cffc0b3ced5bb66ca2dbb48aa7c96ddb49b2ba358e9a8b37
-EBUILD virglrenderer-0.7.0.ebuild 1054 BLAKE2B a9301454f8cf10279c8d6efe7a81c5f5cabcd0f2ac01f523370ce4f4a4d0e7de72281717bb16896267bc8c0dae395b045a975d78b9719e067711e3568d1fb52a SHA512 3c0a0ee38960d5d45c10e1d9e6c7147d935faca44b0704fec68356a4ab89674744cdadb5bdd44cf3d7707a8b6f22a736914393c2b0841306a79bc841ee564714
 EBUILD virglrenderer-0.8.2.ebuild 965 BLAKE2B 80a530f2799085f5dd234dac0bc3dadcf01b02d2dc928729dcd618efe58619c16f70616fa695a64d5abdd72832c561cb728e20caaf3550ab0350a6de54bc2a30 SHA512 71eb7c0f75ac412376297e20605f344bf639f41eeef7bce0405876dd01dc9203e7df7517922fb4198a413009e4c10ad1e7fa30d318fd709639cfde7d30546ac7
 EBUILD virglrenderer-9999.ebuild 942 BLAKE2B a17fbff964ec6e6a664738d37437e786a8505cc74283a36133dbfa1dd98a19ef19c4de7c3fbe7ae0fcc4c92067394df0224fc0882b92486bd6ceb1cd8a07b0de SHA512 2380fdec62258309db09746db46ce47a2a14b29e03e5e666e5722a651414bb8432a41844f563f9081b5879f6f54add3e7282447a26c6ea4a487b2a8325cedc7b
 MISC metadata.xml 371 BLAKE2B 3e3bdb314577f4b67ad0b800c37da42bf1f94200938519c39a3fd4020154065a86925b9afe83aab994ef0cc9b3480005691fbbb7277c367fac72d6e4ce608510 SHA512 94fcfe4653d16579ae9fab9dede61165c0b45ef1f97b642b4d50f0933909fe6ba04e3aa0f0f0e3311d780f126b7860295746caadd1a0245cb950e1012784902d
diff --git a/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch b/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
deleted file mode 100644
index 17bc3bce0a8d..000000000000
--- a/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur virglrenderer-0.5.0.orig/src/Makefile.am virglrenderer-0.5.0/src/Makefile.am
---- virglrenderer-0.5.0.orig/src/Makefile.am	2016-04-11 11:23:51.000000000 +0600
-+++ virglrenderer-0.5.0/src/Makefile.am	2016-11-18 04:44:32.278594781 +0600
-@@ -1,5 +1,6 @@
- SUBDIRS := gallium/auxiliary
- AM_LDFLAGS = -lm \
-+	$(LIBDRM_LIBS) \
- 	$(GBM_LIBS) \
- 	$(EPOXY_LIBS) \
- 	$(CODE_COVERAGE_LDFLAGS)
diff --git a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
deleted file mode 100644
index 76de6a8b81b0..000000000000
--- a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/virglrenderer.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
-HOMEPAGE="https://virgil3d.github.io/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libdrm-2.4.50
-	media-libs/libepoxy"
-# We need autoconf-archive for @CODE_COVERAGE_RULES@. #568624
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	>=x11-misc/util-macros-1.8
-	test? ( >=dev-libs/check-0.9.4 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-libdrm.patch
-)
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name 'lib*.la' -delete
-}
diff --git a/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
deleted file mode 100644
index f8b6f0251918..000000000000
--- a/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/virglrenderer.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
-HOMEPAGE="https://virgil3d.github.io/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libdrm-2.4.50
-	media-libs/libepoxy"
-# We need autoconf-archive for @CODE_COVERAGE_RULES@. #568624
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	>=x11-misc/util-macros-1.8
-	test? ( >=dev-libs/check-0.9.4 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-libdrm.patch
-)
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name 'lib*.la' -delete
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 7e873280ee7e..b0dcab0d8eb9 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,13 +1,4 @@
-AUX vulkan-layers-1.2.133-Fix-build.patch 588 BLAKE2B fe510a968105213a54a3bc98cb1da386f64d3e7c85c601535f0cabce72408c237492c7382fad6274b72386a46f95ee3bb69f1c67ee749c457e484350f70cebda SHA512 e99f84e6fde309804118d5d68f0ceae61c156808b374bd273982f62be94c3868afe07471e6b2e5d5610e044941307c9721fda1ad49cb402f9795557b88732152
-DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
-DIST vulkan-layers-1.2.133a.tar.gz 1864458 BLAKE2B 8da19effe360dfdd7b4896407a62870c825bed62aafc3fe68dc0ca7d9fb92dc7d9337101b9e46535ae901ec24f8d4f6d0301c4e72a5c29ebdf4f28e07e4c49ba SHA512 a7fe404f8732486c12ddee0443649fc5a5b4a67bb255a439d8f55939b171e447f5711632726eaca0e492bd6ab80e3ebd7efd3156e8bd0fc5b15dcec8b791301f
-DIST vulkan-layers-1.2.135.tar.gz 1963632 BLAKE2B 89069971266d0797e57f868ad996218d555687a40878b5d5cbf37dcbc392316e53066e8d457fb7b2505727b6529c217d8d6118b45c76416bf8dab7830d2d6818 SHA512 44a660b4c3bfa6f5ea355d7d1121f239c92e96cf2ef941d85b0d4a12154c4bec218b4c4c19e18c7a42cbb03a468f90ffcd6752ec773a8223e67cc182e1e96324
-DIST vulkan-layers-1.2.137.tar.gz 2002707 BLAKE2B d26ae5289a551bc8a42ef431b7c57340a96b049359b8ed9088b1e6e9d5cb101bd05e6ca089a16bd6c88e71f0b353796f5eb407236868357ee1136f5206343a5b SHA512 c3d0039cd49d91890bfeff24f3df536170d3072db333b7438b92a22b0385634051e2309133d100ab0d22150eeea57a21190ba5eacbce5293983fd280bcf83045
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac
-EBUILD vulkan-layers-1.1.125-r2.ebuild 1462 BLAKE2B 33e3d3d8578f6620fa64b19deafe8df8b62c2811da3fe2aae1c5154524cdf0fdf829ac988a9364a32478480132957982854dfd398216e9768ce1412d5e093d60 SHA512 86984927f83bcc8eaaef651a43285ffb4401acf64a960fcfe69c10c734960c3ec1199929fbf5f5dd20bf9972c1b32fbb92f4fa1ddeb9461a6754a83eaa360d76
-EBUILD vulkan-layers-1.2.133-r1.ebuild 1467 BLAKE2B 26403477675e3cfcb7314d98889e6be1ad16f7e10a794bb7a1cadc69a10233b0d74d4f57e53a0de799a247a8e9d48cdf7d13b4f655fe9b797b8f021c20e06943 SHA512 a943f5209fa779cb5259d7782f00c7a2fc09f1c2b21fe6da84240f51b618fbe38dc996ca2d9122d778c0a73138070e261b637a2aa7370bee509fcf77da801be0
-EBUILD vulkan-layers-1.2.135.ebuild 1408 BLAKE2B bf5e56a00864183299d79b38789c17495394e62be0973a936b16a8ee377791e5a927637bb7fcfeedc703ff4a5d9b624821795d691403c5149bf1145f019d4847 SHA512 72eddd500a610bbbc81d1e82bc571b4af89bb7041ceb332cbd727f03f1d7f713bdd1eb25532732d7178eb9946644299d4f33724a987cd85cae61b2828c904587
-EBUILD vulkan-layers-1.2.137.ebuild 1420 BLAKE2B 09ea2895e7c8800c42c678df17f5686d1479e4605c4576efba1e0c7b3c6454e94db99f6ef2d72dfbab247d8ebe12d3e241a30eeff070ff55197c066f712f8c37 SHA512 30dda1293db736a4ebdfc29433bf26fc2a67e332ee6f520cbbde8b7bbbccf7fea6631a546a54a0d47e4a24bce40d31da392c591d8d9a818665adba52f81cee74
-EBUILD vulkan-layers-1.2.141.ebuild 1408 BLAKE2B 5f197a8a89a58e15eab3100041ab14ab819a3ff14c4b34e68df9fc88426996c1d1fce946fe67e7fb4a303614e8dda338e6fe6362a84e7b886e276953a23811fa SHA512 56e3e899eeb8b48d2d308dda9e9e792340f86e62b28f307c4ed5972d849c735ee6ac68037b1e792fec78f175fc106ea3c1f5e1186fe4e522c0814a58aeaf389f
+EBUILD vulkan-layers-1.2.141.ebuild 1394 BLAKE2B 0bc514b37bc413915c23d0d5abc9c9675c877511aa2a266f331c3bda918a786a6684541dc258f449d13922055d8372463eaaa0f87b6bdd9972ca106ef7c0257d SHA512 5f81dd5433106c4eea8b5f2d6568513a9c155b9b1d6ae5a9f0b499721d0e06ad12b05ed4ad994d20d1f1c1fe4377c5b380c066ffa160de59d9ed15016ebc8fcd
 EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
deleted file mode 100644
index c3f42539bbee..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 511b30622aa9e7859e5b606b25621a8d84888d40 Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Wed, 18 Mar 2020 20:23:13 +0100
-Subject: [PATCH] layers: Update range_vector.h
-
-Change-Id: I595fb8b5ccf102d652e86846cbf8489c79a1c8e0
----
- layers/range_vector.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/layers/range_vector.h b/layers/range_vector.h
-index 5d650586a..37de88ee7 100644
---- a/layers/range_vector.h
-+++ b/layers/range_vector.h
-@@ -28,6 +28,7 @@
- #include <limits>
- #include <map>
- #include <utility>
-+#include <cstdint>
- 
- #define RANGE_ASSERT(b) assert(b)
- 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
deleted file mode 100644
index 5c8a22273cf5..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="X wayland"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
-		~dev-util/spirv-tools-2019.10_pre20191027:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.125
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_LAYER_SUPPORT_FILES=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
deleted file mode 100644
index b8a19367f7bd..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}a.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-build.patch" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
deleted file mode 100644
index 716f47b5b7c6..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild
deleted file mode 100644
index 70a2744338bb..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.4_pre20200429:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
index 1ea1b1ebbc05..45245cfdabcb 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -28,7 +28,7 @@ IUSE="wayland X"
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
 	>=dev-util/glslang-8.13.3743:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.4_pre20200429:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.3:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index a8a5ef0a8bef..eb6ec54cb3eb 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,13 +1,6 @@
-DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
-DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
-DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
 DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
-EBUILD vulkan-loader-1.1.125-r1.ebuild 1814 BLAKE2B 85c569e9dc7779940d6ce2d6fb1d56cc2d0bd21625f09dc172b1439e6919c40f6258b5c0a69666af5d4f966fc657db23696c5b29f978b994fbd621380c95d809 SHA512 70cdc83a57c0285f0a632e0f04b63274f48a8bd91e1c2aeea625f145014027973769c6d3acaabc6cab6846f169329812c6ec1ae8346f923c3696c96f9187a88e
-EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
-EBUILD vulkan-loader-1.2.133.ebuild 1710 BLAKE2B 58d6114fdbc285b35423bd318cccd55e7a6bcddd682a2f7f8e622d1c38657991082bc1832c6c6edecff3101b9d85585ffcbe74e555b683751410b0a7c2ec9ccc SHA512 22c3909f1118270cf00f9a90d19bb5c89072a0da7691a91b53b0f1c20f853435c713022f69cbc83f3c8144dad13bb9e4bea5a5855b04a0153ea0a9e594451aa0
-EBUILD vulkan-loader-1.2.135.ebuild 1712 BLAKE2B aa4f8b37b669b257e1bfc7e61fbad75187ce6604c7a4b73f992255ce9de582bf9e06a04030638ffdd51e2b47bf1a77aa6ad245661d003d243481d7556a0d985c SHA512 6f327be621a3f90bc39b88a5d31eb32af3be0ee3609d8b71b810ef39fb0f7830ebdc75adb418ca43d8c46bcd91af2edff00b6e2ef3e56b7c8b29f2fa72038fb6
-EBUILD vulkan-loader-1.2.137.ebuild 1712 BLAKE2B 55ac967b74ec23b16cef99478681958964db6ee22c73ffe83b68c86f969e225ee31af58b842dd8e43508c1e7172808be44f066c74ab8827d9009aa1241610d9c SHA512 3e0fb63325d9d296190d45ad4311919787f4186854d641f81056d8f120a4f2de3696a11eb61a589e9da432ac6623c7ba0997486c58b47d1611d5e2c5711e9f45
-EBUILD vulkan-loader-1.2.141.ebuild 1712 BLAKE2B 499e5e98e4767791ddd389693ccf8a337cc3f520471fac0e88224d4b4e3d00679a36f32222e5cc6689be2125c177314580b7477c43adc91d312ae5d030ea606d SHA512 5c051c635ba1d300ef8000e6aa4daf264400019f17772c09179ce496dabf117e84e344c714a4eec2a19ea64237c7644d38a59adcc6c5c965cc6b5a3b95502d07
+EBUILD vulkan-loader-1.2.137.ebuild 1710 BLAKE2B 3427e40938c277700720bc50df5b0583f10ccfed19025bf0a6e7ed0cfae364ab8e3e1b420a0b2266f832c5ef7b0f574d03efee3658420771ff147698e11f3576 SHA512 f5923a57cfa7e80052e26eb3645771c7f9c506e638075d32186cc00ddd7e42c8e5c5f033554d7a8c624faff6a6dfd3ca9a78e2a4333d62e7f669c0df142d4ba0
+EBUILD vulkan-loader-1.2.141.ebuild 1710 BLAKE2B ace0b28fd303ae99b0ed7b4878ac2538534863f89f4a1442473db1508e570cfc5ebf0bd1a9b8d3e0bdc4d7f5a0c803ddd4ce02a0f62d13e4e17d3e00918b6978 SHA512 8004d2d27090080f0ee60f9d708ad0d51ee5335aa6301c92126a1972d692ebd85e0361c7779dd1cb0698eed7f6babccbde8628f264ab1c0ae54c5b63fbf520a1
 EBUILD vulkan-loader-9999.ebuild 1711 BLAKE2B 8a7cfcd2603391ba298c407b8fc5eff6bc6364bd650ffa6e07637ccfad00aea16ea813c81d6855fa6b84049f59e8eca039967a1cf89d8a2ddaaaa1ed4e8153df SHA512 f561c79296a73545c3cbca97d1807e57549869c9bff4f81aaa017d8846a3b28cd85208f1956af8b51982896411aea2c7f94ff6b77f97026a7da2d77ac5ec092b
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
deleted file mode 100644
index 815cee75b5ab..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Loader-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
-	fi
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit flag-o-matic toolchain-funcs python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
deleted file mode 100644
index 50090116171e..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Loader-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
-	fi
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain-funcs python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
deleted file mode 100644
index 24139711b288..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
deleted file mode 100644
index f82708238364..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.136
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index ad3f56422f29..0246966ff47f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
index 9f43ba5ef134..71f3ce8b1cf8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index c0e354b803a2..ea133631c31e 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,7 +1,5 @@
 AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
-DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
 DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
-EBUILD waffle-1.6.0-r1.ebuild 1785 BLAKE2B 7e9740942befff54b7ed861cb876ccf39d5a3a757a151ca6721d0581a1f5853d7f177e264b5de181aa8ff1e6734d8132e938e745fa5f690b6af31b40ad94fe8f SHA512 5521214b333841d7d22f0b9041b1956422c1aa97425ccc165e488731b08f2dadbfa44c58a9a13542e0348376aac3d9b27e03c96ea80b8bc1351b796695050fbe
-EBUILD waffle-1.6.1-r1.ebuild 1721 BLAKE2B bf494a656e23de505c649ff0dc07caa80b7122f5092478ee89c46f2d76eb61a50865aa6086e458406eb16d39829f1b11a201ab603243883728668cc455c49e81 SHA512 4aee06b4373953bb561572c74d79e3bd57a85ab8b56a71b87b50a5f845ef6d7ac577db2309c965006e9432d1ffe5479de31a3fc094c73428fdb27dd72f5f9377
+EBUILD waffle-1.6.1-r1.ebuild 1718 BLAKE2B 1e0ee700d4537d3da90f166724b59445e91a2870fafff71c7604fd91c6014001625ae420113583a8635a5ae48ddcd97d480080d938fa8df9287bdd44af9c4a20 SHA512 86a5d9bb19290a5f062c57402de0442d32288876ff21cc2fd6bf1c7a3edaac5660deaa3b2619772e63dcdc2d6fc349dd0f2473e07ace1b775729f43630270489
 EBUILD waffle-9999.ebuild 1622 BLAKE2B 0d2e8656bf04480486f7d9af9832ca92cc53d50dfe415d8470c4ef53702b1ea651fbdef5a28ef39e7850bf2eb8cc691ec4237e31e97df4b3de851cdaf8a0c27b SHA512 386dac3e7c795344683124f747ba3dd10d15f43683a46e71ea6698dcab3d2d6cc4c3f41537d663184d6cd29204df074357aa702789ec3cc6de074190793ebb0c
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild b/media-libs/waffle/waffle-1.6.0-r1.ebuild
deleted file mode 100644
index 50f1ac32ba41..000000000000
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-Generate-cmake-config-and-version-files-if-mes.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		$(meson_use doc build-manpages)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	rm -rf "${D}"/usr/share/doc/waffle1
-}
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild
index bb76a7df510b..6bd3d6db7455 100644
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 6018daea3896..af41ed210e05 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,8 @@
+AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190214.ebuild 1795 BLAKE2B 4d2433753d997269c78f88b91f6342a077f31cc5d57b29282a21761016291771468898f49a34120d3a118bad45810226b077188f19c4f72a1f75b9bdb7743c93 SHA512 07df0bbe58003cabbad08363ec4f0f36223d9b6fa6fca69aa865099a8860994ff0fd89cf7ab0583f03fe7c1c71c2b0332fd4fc6974b0039b659370685a65c256
+EBUILD x264-0.0.20190903-r1.ebuild 1905 BLAKE2B 032fee7109566d43c7f1df5b27b48634b8beb8418c6f00d684bf7cc401c562473bb5332998aa662ac7504fc4e5312594f3458a879ac81183ea87123eab924985 SHA512 ba68920936237b2be3be0c8602db57c567e27d2a19701cfe933e5891d60c17170879179e2325b4cc71cef519410112fc60bb3701330f7ba6891a3d1acaa09c5e
 EBUILD x264-0.0.20190903.ebuild 1830 BLAKE2B 8c3dc73bf37e830e0c8601aa15acf60d87b209ebedf7de0e2c0cdbe11f1744f8ad061578fafb349704ec40bf8b2229533fbe4de753b4cabd063d88accbbdc0a5 SHA512 658c2e9cf82118b19628822d97430d1ae93a00fbd62a6c505c8d7aaa02603de71ed4b6d559288a621a26629ea44ac2ca9c4cba10ae2709c16b219fc21a31b2a0
-EBUILD x264-9999.ebuild 1830 BLAKE2B f8c5d5a10399aa4a55cd0ad1ea1ba0dbdcf0775c973e98e528fed8d8a9f08dd41b9021211d3181a8b8707ff158a6b44667c0b41fbc821baebe22428ba5d249b7 SHA512 3d28aeddd664f26ce3f0caf327f269c729579e4f17056d578e134eea47d2586f3c4c6484d4c9438c103dfc57633ed73fbd4c3e319c05a77a4abd12af5eb8669a
+EBUILD x264-9999.ebuild 1861 BLAKE2B 3abe3cfb710f96322a627d82f162105f28a0ae9cc9303462d7b584a147311568832d7b7e4f241c4df42eac5505a9b69196f10433bebab71365259019b633f003 SHA512 64f801345cf2f61f531448de4cda105b5cd1559a80bcda84a86a8699156c58f80cd8ed8807ebf7acf0ca95bf3a4cb1ec0695908eb126dec73f6c6a43e2f4da20
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch b/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch
new file mode 100644
index 000000000000..952fd268005b
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch
@@ -0,0 +1,37 @@
+From 235ce6130168f4deee55c88ecda5ab84d81d125b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@inbox.ru>
+Date: Fri, 5 Jun 2020 19:34:02 +0200
+Subject: [PATCH] configure: allow 'strings' override via STRINGS variable
+
+This allows building x264 on systems where 'strings' or
+'${HOST}-strings' does not exist, but llvm-strings exists.
+---
+ configure | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -541,6 +541,7 @@ done
+ 
+ CC="${CC-${cross_prefix}gcc}"
+ STRIP="${STRIP-${cross_prefix}strip}"
++STRINGS="${STRINGS-${cross_prefix}strings}"
+ INSTALL="${INSTALL-install}"
+ PKGCONFIG="${PKGCONFIG-${cross_prefix}pkg-config}"
+ 
+@@ -1017,10 +1018,10 @@ CPU_ENDIAN="little-endian"
+ if [ $compiler = GNU ]; then
+     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
+     $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
+-    if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
++    if (${STRINGS} -a conftest.o | grep -q BIGE) && (${STRINGS} -a conftest.o | grep -q FPendian) ; then
+         define WORDS_BIGENDIAN
+         CPU_ENDIAN="big-endian"
+-    elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then
++    elif !(${STRINGS} -a conftest.o | grep -q EGIB && ${STRINGS} -a conftest.o | grep -q naidnePF) ; then
+         die "endian test failed"
+     fi
+ fi
+-- 
+2.27.0
+
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
new file mode 100644
index 000000000000..452ddd0f1835
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20190903-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+	MY_P="x264-snapshot-$(ver_cut 3)-2245"
+	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0/157" # SONAME
+
+LICENSE="GPL-2"
+IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+PATCHES=("${FILESDIR}"/${P}-STRINGS.patch)
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then
+		asm_conf=" --disable-asm"
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		--cross-prefix="${CHOST}-" \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 2ddcd7e513cd..6aca6aa96dd3 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -50,6 +50,7 @@ multilib_src_configure() {
 		--enable-pic \
 		--enable-shared \
 		--host="${CHOST}" \
+		--cross-prefix="${CHOST}-" \
 		$(usex interlaced "" "--disable-interlaced") \
 		$(usex opencl "" "--disable-opencl") \
 		$(usex static-libs "--enable-static" "") \
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /media-libs
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)