gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-libs
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
192 files changed, 3699 insertions, 731 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6ecd14c89e89..599068520626 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 5c553a4de1ce..5bafe51af965 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 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.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-EBUILD alsa-lib-1.2.1.2.ebuild 2081 BLAKE2B fd2d0ee1156be52d3c71585e44660bff6b0fc387b04be344dcb6ffe514739e192602b9979c3f58aa38e8a014e2888779b4f185d1c2162b156ece817fdf01238d SHA512 f21334e3525ddbc6621d0b588b73208d88348e51c8b3c89ec645cd322449046c86b30de99accf3f943ddd444aba08d62546376bb22569bd9ba5f8126270a12f3
+DIST alsa-lib-1.2.3.tar.bz2 1037485 BLAKE2B 522c5c2a4bd3bc13d96f64781270647271e131042e0a6ed0f2104d9cb9f93341af1c14d000d5acb9c4c327e10202b0e9f280e59f355819f8861ae023a5a0f0a8 SHA512 567c094914833af511bd7b175b0865ae4e4483ae68a7d4f90a34b12d7f077782835eec24257a7928631c104c78eff588f7b92068aade37e3c4806d79353758a8
 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
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.ebuild
index e6d96d0f76ee..e11bdf33b0aa 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
@@ -13,15 +12,15 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
 )
@@ -67,16 +66,13 @@ multilib_src_compile() {
 	if multilib_is_native_abi && use doc; then
 		emake doc
 		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
+			xargs -0 sed -i -e "s:${S}::" || die
 	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 0b04bf514511..89a6c32e35cc 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,5 +1,5 @@
-DIST alsa-topology-conf-1.2.1.tar.bz2 5377 BLAKE2B 95cd1074068ba85e6c6b74d65f7ddc40e182426cff69c7765689edcaca3609a249638c70e5f92c889b3c76ea662e7e43e355af4573acb3fc293026392f614522 SHA512 ed86e7372f887a2e13596ca7456da1db84ff05d01f98d80c403263673d2c0f247834bdc9edbeb62231ca1dc6b9792dade87672d905303a8e0fa462c1fac1b7fd
 DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
-EBUILD alsa-topology-conf-1.2.1.ebuild 508 BLAKE2B b9ee49c419bc7031c0d9ae43c9755b5d6e959c988d4134058be8b60aa5df7242307bf5d09ccc2f726a520dc1680704058a1b5c74e980a4bb3a4b3519784b8613 SHA512 8cb4d00cdc952b1d3e1b6a262e6603ea7fab93624af981eb03cb92a39fee9f35c1f21ea9e993516889892ea7ce7e12c678fac7aea179b1319d16cfe9d9cf8c0c
+DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
 EBUILD alsa-topology-conf-1.2.2.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0
+EBUILD alsa-topology-conf-1.2.3.ebuild 500 BLAKE2B 3dcd66d24b527410c91c191b9bf3551b850559297d999e28936ea9f59d7faf7f39135dca08499ac05cac539e506feba2d87940383c723f649fa2fc005e7c87bc SHA512 0026765fbfe2dd182b1eda729624624fd36b2fdfb0ad1d9d02c60972e3c44c1539d3371f5c7227693b073e070d62dc845403f56c35481bcb06ccc4fa99468941
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
index d7bc4c5ca7bd..84b05683cf78 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
@@ -9,14 +9,12 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/alsa
 	doins -r topology
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 6024f738f53e..6a8ff288efb6 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,5 @@
-DIST alsa-ucm-conf-1.2.1.2.tar.bz2 14660 BLAKE2B dec3e11d2aef17344eb1a11987eb9b6b53606fe278bf84523cf6a829799b264b6a0bfd0e6af46c7ce834f34584078fbd8e1a78c667c64f51e0ef67e448264705 SHA512 e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
-EBUILD alsa-ucm-conf-1.2.1.2.ebuild 502 BLAKE2B 1ae7ea2cfbc19b75907a9fc6a0735ad629dde011e7f696cd3d3b18c2fee2e9cd09d0b0ab3e200bb67757716148aa98b3d0e36590cde94ea900162d25bcc522ff SHA512 079df2aa14928f0676bb01129f9c269ff8bf49845903fb9e0aca6709125925a58cdda235e82a122a27c7bbedbe64a7dafc691910059348029532cc826d507ce0
+DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 EBUILD alsa-ucm-conf-1.2.2.ebuild 486 BLAKE2B 456d70f97a19fd26cb183e365f926cbeb4b5e457b60086a385db8f694bced10d6ad9370b6b4860790c4742fb9c1d70398e170c702231827c20a70dddc2f724be SHA512 d013fe3c77ebd5e6680938d4464d0dc8730ec395321450f93b2ca3c186541a65b82df77dfc454479148915cc2971268c8202bf7e88996f48466380a1b200f1bc
+EBUILD alsa-ucm-conf-1.2.3.ebuild 494 BLAKE2B 576963ae39b2529e38a71864f3101aa123dc1e7346c830e17d7624243d516cf121d643e6403f36cd1ec1e9f3bd21ac7c0b55d0704127cd7bfeec8ede2115e6d9 SHA512 5ba6d22fc98276d85958b5fd28dc7f56ab5d3db9eaaed54674a8ab33406e681996556d0692ad3992674ffafe87c31eb84dd9bdd280422c8766724c46caa65808
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
index 522f5a35e125..1424e013ca8f 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
@@ -9,14 +9,12 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/alsa
 	doins -r ucm{,2}
diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 3ce0893952df..700efc415cdc 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,4 +1,6 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
+AUX alure-1.2-new-dumb.patch 954 BLAKE2B e136519eb210cc003f8e66a02a1023cd5c169998dfef99b2dcf3d46b6259a04c3c7094bd4bd892f92b4a53a48cd3ca6028da4163d418b31eb5ae5a9380270582 SHA512 27000ad19dbd9278fea67c40e037745b182c4b067b30d5853274b1cc4216813ba0d9f3e292e4d997d93b870cfc0117cfd1a9a2f5adfc77defb908765f3fd03ea
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r1.ebuild 1233 BLAKE2B 6c7febe0888310b765139da60ddc573af59a64f82c168ca47cdada18827abfc4f7105743edda7eee6ff9dac43b9b976e195013038a5d8e9494250dd63a2b33a2 SHA512 0baf16125f4753b41bd4e7c76260d9acfbc3b1f709ea6017c720313cd86c317596e4248763d57a886821c99f37ba2c9a05bc8ad088e961c629ff437c7b3338cb
+EBUILD alure-1.2-r1.ebuild 1241 BLAKE2B fe9fd13925d2b52aaab8f145052db33486b132b7117e6a327f77d4943dad4ef5265014551fb9c4a9dd79cfc85793f5a8fc937e22438e74c78062caacd8529e36 SHA512 1c33711b317515a95dee8c1f18020982b27465a801c06b72f0a33c514885838f6ec959e0ffc226f855f19bcf77435c9d5d928e18cd9c4e91280ed26050cb10a5
+EBUILD alure-1.2-r2.ebuild 1273 BLAKE2B d7d8e3d8607c13543951a765db73cbb74c3c9ec497eb99c3cde399961deefe3b1728896111bbb0f468eefbf25453801f078e3246b36df98a6acd26161a87944a SHA512 67fcb3eec6625f6a5fcf344589c76819731d6b00b2df57aa20370fdf5496ff6d95288143a38cd206a26a8418adca5f56b53a1e739b61ac7a40f5a7ad99a06f51
 MISC metadata.xml 440 BLAKE2B dbe7f0e580e3b0c1b28237654dc06f8c3945ddc42ec690a254add4f5d2855fd1e60d0cfc91cf9ed62c6edd39bfdf9d2d75e3fc7fb6cbdfae3bac1e7e07026f3f SHA512 5b6106088e98c6676d01e02b99a93dc661eb24909ee8aa235e9506c18175fbac7d765c05ce95dbe085c8aa772d45a4f8f717657f281694f40ddc10dd83f1e58e
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
index 69166861c89a..3053fbc78e10 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-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
@@ -16,7 +16,7 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
 RDEPEND="
 	>=media-libs/openal-1.1
-	dumb? ( media-libs/dumb )
+	dumb? ( =media-libs/dumb-0.9*:= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )
diff --git a/media-libs/alure/alure-1.2-r2.ebuild b/media-libs/alure/alure-1.2-r2.ebuild
new file mode 100644
index 000000000000..49baf11fcec3
--- /dev/null
+++ b/media-libs/alure/alure-1.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The OpenAL Utility Toolkit"
+HOMEPAGE="https://kcat.strangesoft.net/alure.html"
+SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
+
+RDEPEND="
+	>=media-libs/openal-1.1
+	dumb? ( media-libs/dumb:= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
+	mp3? ( media-sound/mpg123 )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-include-unistd.patch
+	"${FILESDIR}"/${P}-new-dumb.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
+}
+
+src_configure() {
+	# FIXME: libmodplug/sndfile.h from libmodplug conflict with sndfile.h from libsndfile
+	local mycmakeargs=(
+		-DMODPLUG=OFF
+		-DDUMB=$(usex dumb)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DFLAC=$(usex flac)
+		-DFLUIDSYNTH=$(usex fluidsynth)
+		-DMPG123=$(usex mp3)
+		-DSNDFILE=$(usex sndfile)
+		-DBUILD_STATIC=$(usex static-libs)
+		-DVORBIS=$(usex vorbis)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/alure/files/alure-1.2-new-dumb.patch b/media-libs/alure/files/alure-1.2-new-dumb.patch
new file mode 100644
index 000000000000..97b8f71b7024
--- /dev/null
+++ b/media-libs/alure/files/alure-1.2-new-dumb.patch
@@ -0,0 +1,30 @@
+# Already fixed upstream:
+# https://repo.or.cz/alure.git/commitdiff/9939cdfbf9c6c7a2690db7fb8dd2892389adcd5f
+
+diff -Naur a/src/codec_dumb.cpp b/src/codec_dumb.cpp
+--- a/src/codec_dumb.cpp	2011-07-29 09:37:48.000000000 +0100
++++ b/src/codec_dumb.cpp	2020-05-10 15:59:48.502632496 +0100
+@@ -272,7 +272,11 @@
+ 
+ private:
+     // DUMBFILE iostream callbacks
++#if DUMB_VERSION >= 2*10000
++    static int skip(void *user_data, dumb_off_t offset)
++#else
+     static int skip(void *user_data, long offset)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();
+@@ -282,7 +286,11 @@
+         return -1;
+     }
+ 
++#if DUMB_VERSION >= 2*10000
++    static dumb_ssize_t read(char *ptr, size_t size, void *user_data)
++#else
+     static long read(char *ptr, long size, void *user_data)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index c1cdd002d152..29a2ddc43935 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -6,12 +6,18 @@ AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59e
 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
+AUX assimp-5.0.1-GNUInstallDirs.patch 11844 BLAKE2B f426b1aa400a840bc9c3768d5becd527bd8ec4408158923002a941c0f7a25c5c213f6bc7481ba0263cdf24d8cdfc3f42121191ae3c5d2de1ded90483f31801ae SHA512 1ac1c74dfd971b5a6502d3a6df9e6f069da50a9e00ff1c837616774117adc5ac9b266b772a6be18c8367d07f195dce39ba301dbd7756960cba6853b951b3ce70
+AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c169d0f50eafddb35582a93a6e4bd56ebab8560aa32f7e486866c449884fadc50d0e9b48c714ec0bd743a585d82b62622363cb99c921a8c SHA512 301827d1f134e4f18fdfd05aa6f83cd0020b4788e840d766a589eec7962e48e6f401d87dc41cd344abb3d08145e326b6e9a16970e46b5bbc67dbdacc3985fe2e
+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.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
+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.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
diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild
index f52e8180a882..95aa293ace46 100644
--- a/media-libs/assimp/assimp-5.0.0.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -1,62 +1,61 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 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"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
 SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE="doc samples test"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
+	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"
+	"${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122
+	"${FILESDIR}/${PN}-5.0.0-unzip-of.patch"
+	"${FILESDIR}/${PN}-5.0.0-findassimp.patch"
+	"${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912
+	"${FILESDIR}/${P}-projectversion.patch"
+	"${FILESDIR}/${P}-fix-unittests.patch"
+	"${FILESDIR}/${P}-fix-aiGetLegalStringTest.patch"
+	"${FILESDIR}/${P}-versiontest.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
+		-DASSIMP_BUILD_STATIC_LIB=OFF
+		-DCMAKE_DEBUG_POSTFIX=""
 		-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
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
+
+	use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf
 
 	insinto /usr/share/cmake/Modules
 	doins cmake-modules/Findassimp.cmake
diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
new file mode 100644
index 000000000000..134edc7d7da1
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
@@ -0,0 +1,239 @@
+From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@fh-aachen.de>
+Date: Tue, 31 Mar 2020 21:30:07 +0200
+Subject: [PATCH] use GNUInstallDirs where possible
+
+Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
+disable redefining FHS-mandated install locations via user-editable
+ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
+Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
+---
+ CMakeLists.txt                 | 36 ++++++++++++++++++++++------------
+ assimp.pc.in                   |  6 ++----
+ assimpTargets-debug.cmake.in   | 20 +++++++++----------
+ assimpTargets-release.cmake.in | 18 ++++++++---------
+ assimpTargets.cmake.in         | 15 +-------------
+ 5 files changed, 45 insertions(+), 50 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcafb649f5..c23c0df33e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
+ SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
+ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
+ 
+-IF( UNIX )
+-  # Use GNUInstallDirs for Unix predefined directories
+-  INCLUDE(GNUInstallDirs)
+-ENDIF( UNIX )
+-
+ # Grouped compiler settings
+ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
+   IF(NOT HUNTER_ENABLED)
+@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
+   SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
+ ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
+ 
+-# Cache these to allow the user to override them manually.
+-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
+-  "Path the built library files are installed to." )
+-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
+-  "Path the header files are installed to." )
+-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
+-  "Path the tool executables are installed to." )
+-
+ get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
+ 
+ IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug"))
+@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED)
+   )
+ ELSE(HUNTER_ENABLED)
+   # cmake configuration files
++
++  IF( UNIX )
++    # Use GNUInstallDirs for Unix predefined directories
++    INCLUDE(GNUInstallDirs)
++
++    SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++    SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
++    SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
++  ELSE( UNIX )
++    # Cache these to allow the user to override them on non-Unix platforms
++    SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
++      "Path the built library files are installed to." )
++    SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
++      "Path the header files are installed to." )
++    SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
++      "Path the tool executables are installed to." )
++
++    SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
++    SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
++    SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
++  ENDIF( UNIX )
++
++
+   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
+   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
+   IF (is_multi_config)
+diff --git a/assimp.pc.in b/assimp.pc.in
+index c659e19f2c..555a3a1d3b 100644
+--- a/assimp.pc.in
++++ b/assimp.pc.in
+@@ -1,7 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@/
+-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Import various well-known 3D model formats in an uniform manner.
+diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
+index 1ebe2a6081..f5034c9349 100644
+--- a/assimpTargets-debug.cmake.in
++++ b/assimpTargets-debug.cmake.in
+@@ -42,22 +42,22 @@ if(MSVC)
+     # Import target "assimp::assimp" for configuration "Debug"
+     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+     set_target_properties(assimp::assimp PROPERTIES
+-      IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+-      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
++      IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
++      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
+   else()
+     set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
+ 
+     # Import target "assimp::assimp" for configuration "Debug"
+     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+     set_target_properties(assimp::assimp PROPERTIES
+-      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
+   endif()
+ 
+ else()
+@@ -66,17 +66,17 @@ else()
+     set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
+     set_target_properties(assimp::assimp PROPERTIES
+       IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
+-      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
++      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
+   else()
+     set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
+     set_target_properties(assimp::assimp PROPERTIES
+-      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
+   endif()
+ endif()
+ 
+diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
+index f3db8f12cd..a416e8899b 100644
+--- a/assimpTargets-release.cmake.in
++++ b/assimpTargets-release.cmake.in
+@@ -42,12 +42,12 @@ if(MSVC)
+     # Import target "assimp::assimp" for configuration "Release"
+     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+     set_target_properties(assimp::assimp PROPERTIES
+-      IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+-      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
++      IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
++      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
+   else()
+     set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
+ 
+@@ -57,7 +57,7 @@ if(MSVC)
+       IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
+   endif()
+ 
+ else()
+@@ -70,17 +70,17 @@ else()
+     endif()
+     set_target_properties(assimp::assimp PROPERTIES
+       IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
+-      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
++      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
+   else()
+     set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
+     set_target_properties(assimp::assimp PROPERTIES
+-      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+     )
+     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
++    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
+   endif()
+ endif()
+ 
+diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
+index ab1a8d2c7b..ef90c834a6 100644
+--- a/assimpTargets.cmake.in
++++ b/assimpTargets.cmake.in
+@@ -40,16 +40,6 @@ unset(_targetsDefined)
+ unset(_targetsNotDefined)
+ unset(_expectedTargets)
+ 
+-
+-# Compute the installation prefix relative to this file.
+-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-if(_IMPORT_PREFIX STREQUAL "/")
+-  set(_IMPORT_PREFIX "")
+-endif()
+-
+ # Create imported target assimp::assimp
+ if(@BUILD_SHARED_LIBS@)
+   add_library(assimp::assimp SHARED IMPORTED)
+@@ -60,7 +50,7 @@ endif()
+ set_target_properties(assimp::assimp PROPERTIES
+   COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
+   INTERFACE_assimp_MAJOR_VERSION "1"
+-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+   #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
+ )
+ 
+@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES})
+   include(${f})
+ endforeach()
+ 
+-# Cleanup temporary variables.
+-set(_IMPORT_PREFIX)
+-
+ # Loop over all imported files and verify that they actually exist
+ foreach(target ${_IMPORT_CHECK_TARGETS} )
+   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
new file mode 100644
index 000000000000..b0db38a0e8a1
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
@@ -0,0 +1,76 @@
+From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001
+From: RichardTea <31507749+RichardTea@users.noreply.github.com>
+Date: Fri, 11 Oct 2019 16:28:14 +0100
+Subject: [PATCH] Update assimp legal and version
+
+Will now report the major and minor versions specified in cmakelists
+---
+ code/Common/Version.cpp | 14 +++++---------
+ test/unit/utVersion.cpp |  2 +-
+ 2 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
+index 868cfb06af..cf1da7d5ba 100644
+--- a/code/Common/Version.cpp
++++ b/code/Common/Version.cpp
+@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <assimp/scene.h>
+ #include "ScenePrivate.h"
+ 
+-static const unsigned int MajorVersion = 5;
+-static const unsigned int MinorVersion = 0;
++#include "revision.h"
+ 
+ // --------------------------------------------------------------------------------
+ // Legal information string - don't remove this.
+@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION =
+ "Open Asset Import Library (Assimp).\n"
+ "A free C/C++ library to import various 3D file formats into applications\n\n"
+ 
+-"(c) 2008-2020, assimp team\n"
++"(c) 2006-2020, assimp team\n"
+ "License under the terms and conditions of the 3-clause BSD license\n"
+-"https://github.com/assimp/assimp\n"
++"http://assimp.org\n"
+ ;
+ 
+ // ------------------------------------------------------------------------------------------------
+@@ -70,13 +69,13 @@ ASSIMP_API const char*  aiGetLegalString  ()    {
+ // ------------------------------------------------------------------------------------------------
+ // Get Assimp minor version
+ ASSIMP_API unsigned int aiGetVersionMinor ()    {
+-    return MinorVersion;
++    return VER_MINOR;
+ }
+ 
+ // ------------------------------------------------------------------------------------------------
+ // Get Assimp major version
+ ASSIMP_API unsigned int aiGetVersionMajor ()    {
+-    return MajorVersion;
++    return VER_MAJOR;
+ }
+ 
+ // ------------------------------------------------------------------------------------------------
+@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags ()    {
+     return flags;
+ }
+ 
+-// include current build revision, which is even updated from time to time -- :-)
+-#include "revision.h"
+-
+ // ------------------------------------------------------------------------------------------------
+ ASSIMP_API unsigned int aiGetVersionRevision() {
+     return GitVersion;
+diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
+index 233b2fb0b2..66e832baae 100644
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
+     EXPECT_NE( lv, nullptr );
+     std::string text( lv );
+ 
+-    size_t pos( text.find( std::string( "2017" ) ) );
++    size_t pos( text.find( std::string( "2019" ) ) );
+     EXPECT_NE( pos, std::string::npos );
+ }
+ 
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
new file mode 100644
index 000000000000..1b1efa027427
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
@@ -0,0 +1,37 @@
+From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001
+From: Kim Kulling <kimkulling@users.noreply.github.com>
+Date: Sun, 6 Oct 2019 20:19:59 +0200
+Subject: [PATCH] Update utVersion.cpp
+
+Fix the unittests as well.
+---
+ test/unit/utVersion.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
+index 5cfc91ccdd..233b2fb0b2 100644
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -4,8 +4,6 @@ Open Asset Import Library (assimp)
+ 
+ Copyright (c) 2006-2019, assimp team
+ 
+-
+-
+ All rights reserved.
+ 
+ Redistribution and use of this software in source and binary forms,
+@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
+ }
+ 
+ TEST_F( utVersion, aiGetVersionMinorTest ) {
+-    EXPECT_EQ( aiGetVersionMinor(), 1U );
++    EXPECT_EQ( aiGetVersionMinor(), 0U );
+ }
+     
+ TEST_F( utVersion, aiGetVersionMajorTest ) {
+-    EXPECT_EQ( aiGetVersionMajor(), 4U );
++    EXPECT_EQ( aiGetVersionMajor(), 5U );
+ }
+ 
+ TEST_F( utVersion, aiGetCompileFlagsTest ) {
diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
new file mode 100644
index 000000000000..ed82e1b0b4b0
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
@@ -0,0 +1,22 @@
+From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc?= <loic.fricoteaux@airbus.com>
+Date: Tue, 14 Jan 2020 16:26:24 +0100
+Subject: [PATCH] Fix Assimp patch version to match the last bug fix release
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23b6f6d618..e14c4aa21f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED)
+   add_definitions(-DASSIMP_USE_HUNTER)
+ ENDIF(HUNTER_ENABLED)
+ 
+-PROJECT( Assimp VERSION 5.0.0 )
++PROJECT( Assimp VERSION 5.0.1 )
+ 
+ # All supported options ###############################################
+ 
diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
new file mode 100644
index 000000000000..8267fc004d61
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
@@ -0,0 +1,23 @@
+From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Lortie <marc-antoine.lortie@outlook.com>
+Date: Mon, 20 Jan 2020 09:14:04 -0500
+Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate
+ year.
+
+---
+ test/unit/utVersion.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
+index ca54620533..aa75a26d85 100644
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
+     EXPECT_NE( lv, nullptr );
+     std::string text( lv );
+ 
+-    size_t pos( text.find( std::string( "2019" ) ) );
++    size_t pos( text.find( std::string( "2020" ) ) );
+     EXPECT_NE( pos, std::string::npos );
+ }
+ 
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 16f406e2e654..5808c36a11ac 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -2,4 +2,4 @@ DIST cimg-2.8.3.tar.gz 11208996 BLAKE2B 1e76f99d20a99955647228cffe5fcd2c26596f40
 DIST cimg-2.9.0.tar.gz 11213143 BLAKE2B 88f463990e1210221361be8d93bcad3abf19ba1f83440c102581417e66ebc771176a457d9516b4fe160e1640d3a996006aa64b218359397d75a204a3c34797fd SHA512 c3a45bdbf19a0598a7865920cc738deb71aa95351734d9bac9d77514dc6d5252433a28d4a8fe27aeb06b5c2557dc4e7a10e67cf788bcef2e52bf5038aa876031
 EBUILD cimg-2.8.3.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
 EBUILD cimg-2.9.0.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
-MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
+MISC metadata.xml 294 BLAKE2B 3fcd6df8ac7918baa264a1c474264a924204f4308a0786d45a200e4644f3424e36e167683e0ef01b0a799cded28721a807dc2289b93a546640f9c495c4c7cb2e SHA512 d6441a30bb7dce111cdcc911a732e6ba35530ade8c5974f77dca51974688e743fbc7592dbaa0312b77a480ab8d9548db3d8282f8e8bfd4608b9ed4d5f4967b0e
diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml
index 596b50fd39c9..decc730ae1c7 100644
--- a/media-libs/cimg/metadata.xml
+++ b/media-libs/cimg/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dtschump/CImg</remote-id>
 		<remote-id type="sourceforge">cimg</remote-id>
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index c7abec47ff16..301b24a87307 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,5 +1,8 @@
 AUX dumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX dumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
+AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a8131505c932b2413404d691ee4a580f564be5290b7063849746babcfba94f7a9dccac9bbeb67c97a8ee68353f440 SHA512 bed13c5369ac951837f41b7bb10b86fa73c871a7ed3b7b9876a304f2ffd31635d4e45093e09cd62ba0b856f58b27ae15a508ad36c773ee7b96c3cf7d90a47660
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
+DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
+EBUILD dumb-2.0.3.ebuild 996 BLAKE2B 7bd9136e66ff8a45d8b85e3a41b6bea19afeba36ef5ee9fc6146e0d957a1690c982156998101205feb05b6af6a196e24b019cec4f2565812fb231ae931376609 SHA512 8cca80a77c1ea2dbbc474a6bbd86c99ed5f1f5794e1a893b6b60258cefb58e19bca7fb6212d4ee3369a4b69d8f88e16ec4673527672d47137cd6012c626cb3b4
+MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
new file mode 100644
index 000000000000..7c509445721b
--- /dev/null
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Module/tracker based music format parser and player library"
+HOMEPAGE="https://github.com/kode54/dumb"
+SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="DUMB-0.9.3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="allegro cpu_flags_x86_sse examples"
+
+RDEPEND="
+	allegro? (
+		media-libs/allegro:0[${MULTILIB_USEDEP}]
+		!media-libs/aldumb
+	)
+	examples? (
+		>=dev-libs/argtable-2
+		media-libs/libsdl2[sound]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pkg-config.patch
+)
+
+DOCS=(
+	CHANGELOG.md
+	DUMBFILE_SYSTEM.md
+	README.md
+	UPDATING_YOUR_PROJECTS.md
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALLEGRO4=$(usex allegro)
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DUSE_SSE=$(usex cpu_flags_x86_sse)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch b/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch
new file mode 100644
index 000000000000..5b8d9856e171
--- /dev/null
+++ b/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch
@@ -0,0 +1,21 @@
+From 3a4f71afbc23d716d0d1f71664b94af143ae8e11 Mon Sep 17 00:00:00 2001
+From: Robert Colton <robertbcolton@gmail.com>
+Date: Tue, 18 Dec 2018 22:03:51 -0500
+Subject: [PATCH] fix pkg-config linking issue -llibdumb
+
+---
+ pkg-config.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg-config.pc.in b/pkg-config.pc.in
+index c11861c..92a9735 100644
+--- a/pkg-config.pc.in
++++ b/pkg-config.pc.in
+@@ -7,6 +7,6 @@ Name: DUMB
+ Description: DUMB is a module audio renderer library. 
+ Version: @DUMB_VERSION@
+ URL: https://github.com/kode54/dumb/
+-Libs: -L${libdir} -l@PROJECT_NAME@
++Libs: -L${libdir} -ldumb
+ Libs.private: -lm
+ Cflags: -I${includedir} 
diff --git a/media-libs/dumb/metadata.xml b/media-libs/dumb/metadata.xml
index 18f5db992196..66e3068bc83d 100644
--- a/media-libs/dumb/metadata.xml
+++ b/media-libs/dumb/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">kode54/dumb</remote-id>
 		<remote-id type="sourceforge">dumb</remote-id>
 	</upstream>
+	<use>
+		<flag name="allegro">Add support for Allegro 4</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/esdl/Manifest b/media-libs/esdl/Manifest
index f7e0893ca1cf..e16c8ddee400 100644
--- a/media-libs/esdl/Manifest
+++ b/media-libs/esdl/Manifest
@@ -1,3 +1,3 @@
 DIST esdl-1.3.1.src.tgz 308475 BLAKE2B 258d4c774ee56cf1c4afbb1f0a712cd42a1ca5742c7dde6c03b3f297351d3c3cda918491ad58338551450fb68ea29da04477c4057cebb7ffa81b9bba25a918b7 SHA512 66e8f69fa29fc0400f58dfa892656e00536a481a3dc364b9b295aee98818ff325f6475a009287352520ef428941e866b46e6f0267a7df184831c87b9304d385d
 EBUILD esdl-1.3.1.ebuild 804 BLAKE2B 9b53830d9c4643773988dc6a9e578bb78b0fb35810f610fe3d0259e89203d412c5da6aca4251d61192f14ac931ecb69b63bc1e40599bbebc15965c15917c3746 SHA512 e0a86f1ee1ae5363fcb736f89fa4ddb452ec0b6a00f284d3545a1c58f4cdcadd3757a70d6ff4f141e33bc7dbacf8cddc077a1b2a4fb249462c9bcea1bbd5609c
-MISC metadata.xml 666 BLAKE2B 0c7e10f19e47370b885b8a15481683560d5e734a645d121136997f8268431bd3a41a2f355880e6eff941109e9b85389b8b7aeec75c87e3f95677da01b488622c SHA512 f27a7eee8bd4b88e9239bcea08dff2e4f79b654c1b63b6aaa2f79461acaba0950cbe3ad2875ad6b667b21ecbcaf6704ddc1d47640630fe1cd2a5e24b72a3aef4
+MISC metadata.xml 569 BLAKE2B 97a0cc90b9e0a074f81467914a8b2f3559f17d21ffe82c39a83d5d9fadd9c7b4c7c6863a21de70cd0d0c396ac631ffbe1bb57bd8eb72086a77be1739f489bbfa SHA512 488bb609405c6b0186624e4434eed2ea24d5501b54e74197b2d02ac6c762bdf54477f006857e0bd8a8192e19579e4b3dbfe05923b0a5e322872ccf4585519b35
diff --git a/media-libs/esdl/metadata.xml b/media-libs/esdl/metadata.xml
index 22ffd472bec3..0548a929d60f 100644
--- a/media-libs/esdl/metadata.xml
+++ b/media-libs/esdl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 ESDL - What is that?
 
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index b5add7294aa7..995696d106ec 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,9 +1,7 @@
-DIST Image-ExifTool-11.93.tar.gz 4799548 BLAKE2B 29867c0407bed7568d92a4b8a0df1ea1377ad9ea54ea9496d09b5b76d946999db312247d6044c179cb064471f888c50c31bc85ddd44475a78a122eb413d73bba SHA512 e8d9dd34710e3346788e10a3b50e4d2a4ba1aeef1969efeec1ddcb7507378b313554e00587cda9c71a325f7d4d7238c91f743c67051d9cef8a012798551dcc59
-DIST Image-ExifTool-11.95.tar.gz 4802010 BLAKE2B c1486ed0c84d6837b9bcdbdee31af5c4c3038442cac8a516b6b7f079bdfb28858ddee18284fa3a88925cdea70a87c1cd444e35fa99ce1b201af03bf1c084d796 SHA512 9def56bde479312584c60ec847338aa55fb3697b6c0e8f894291f6cd67cd16440b563a3982bcec3d787860ba35046f73089f90065891f6f6d93d46243a08c485
 DIST Image-ExifTool-11.98.tar.gz 4804406 BLAKE2B 86bf7fdcc9781fa22e379e3f04ec01b43451978ae33f1c811796ba820198ca417a9ca94b634a8c39acb01604bc8004f47c20e747e6b19f5b4833d29c5cee8fb1 SHA512 d992173a16679b0c3b9fcc466713d5c208e7b161c542535e88088f9695ec14f0ff76ae5fa46d0d6065a8ee366464d0602783170438e2f8fe02d21e458365bbb0
 DIST Image-ExifTool-11.99.tar.gz 4806946 BLAKE2B bec63b26674d551b12965d984610776ea70ff8a4969d83e26677f860af418a792bf26546daa4d487adb521a77da64298907fb3b203c20c827b1197ce9e24b34b SHA512 e8d7d9dcf57b71553cf894bb26997e4b5b79e23bb0ccb2b496e1ed7e39a0c65933492a01ec164f53cb9633457721c6bc938002bfc1f81bb020a455b080b1d1fd
-EBUILD exiftool-11.93.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
-EBUILD exiftool-11.95.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
-EBUILD exiftool-11.98.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+DIST Image-ExifTool-12.00.tar.gz 4817545 BLAKE2B 007f7b3dc155f1240c300c55bd32be137096538b13ba455338dcc0aa8341c8f29316ca53d62905b4a362d54eb9b2e3a4173952bca9d71197c03edcac5d07454f SHA512 458a0cbab18202f796645656ba431b5179b79392d91064f7c4d6d3cab60a28b1cd0a45e6ea1d0ba9296b7ccd00088e320e95f020fddfc4a41e22c00d2e9d1c1d
+EBUILD exiftool-11.98.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
 EBUILD exiftool-11.99.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
-MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
+EBUILD exiftool-12.00.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+MISC metadata.xml 10039 BLAKE2B da44aad7d46d49683f89fa75db8c92230b9088cd14a5c8715a9f3a982843d8a348393f1bd10bdcc08d5d6dc4e5f2fbf0fdd517ce88df2180807796fbd5c06b32 SHA512 c4647e7055ffcae7226aa2bdff458576cc0fef14f6d782a16695902f4af96740a96f0388398eafbdca22ee76a0c808c81dafc2ccc583f8218c718f69c8fd0da9
diff --git a/media-libs/exiftool/exiftool-11.93.ebuild b/media-libs/exiftool/exiftool-11.93.ebuild
deleted file mode 100644
index 556e4d04a9d2..000000000000
--- a/media-libs/exiftool/exiftool-11.93.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.98.ebuild b/media-libs/exiftool/exiftool-11.98.ebuild
index 58ee12770a1c..556e4d04a9d2 100644
--- a/media-libs/exiftool/exiftool-11.98.ebuild
+++ b/media-libs/exiftool/exiftool-11.98.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.95.ebuild b/media-libs/exiftool/exiftool-12.00.ebuild
index 58ee12770a1c..58ee12770a1c 100644
--- a/media-libs/exiftool/exiftool-11.95.ebuild
+++ b/media-libs/exiftool/exiftool-12.00.ebuild
diff --git a/media-libs/exiftool/metadata.xml b/media-libs/exiftool/metadata.xml
index 4241e2937c4a..4ce3651a6ec8 100644
--- a/media-libs/exiftool/metadata.xml
+++ b/media-libs/exiftool/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index e2a01bc6dcc8..7f2f846e590f 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
 EBUILD flickcurl-1.26.ebuild 961 BLAKE2B 66d0a3e98248434c6ce01e22af1e0448e83735112ea0a8c1f41e646da683ea8e66ab9fc61f48025341f45210872d725e2eb5385c869e8a617152a509f9eedb21 SHA512 04399b9c75f098f9314aedb9f153baa2d1ff215c69806bbe1577c8daafceab368fbcdba654b5cf1f7c29d6e57cc83e595eefca14cb78cc9290acb1d9b66df745
-MISC metadata.xml 363 BLAKE2B 5c232f1979f459fd64d3abad15375b4b272fa854ca95f547660e5cb6db9cc98d1180683cff9cce88888e6f37b2bf5ecfedc9fbbaa9bce3ec2e277c0bc22470ad SHA512 559d5623de272c87d524f656f3cd6534ddf4361700d75e789b4de58abeba543a1b58eb5c69db71a705bb20fef82017d72e4fe7d946e47a64ec3180a3f81f5951
+MISC metadata.xml 271 BLAKE2B b0687fe8ae2ec88c72e0ec255e0dd5f58947e593412c57d0c43e22614cdddc7cb0635a1c9f945d23e46dfc16876a45a6068b3be4dc35f71ce889e31dfc039515 SHA512 a479526f4526d3f6a474021c2226731726a8af01aadbae851a6cec31d32ba5a8e861109e9134a3dcef273512d098b8c13a5f34012573329745e780e2811ddf2b
diff --git a/media-libs/flickcurl/metadata.xml b/media-libs/flickcurl/metadata.xml
index f62550969d40..99e9214388df 100644
--- a/media-libs/flickcurl/metadata.xml
+++ b/media-libs/flickcurl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="raptor">Use <pkg>media-libs/raptor</pkg> for proper RDF serializing</flag>
 	</use>
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index a94fcb10848d..18ffb15b7722 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,4 +1,6 @@
 AUX ganv-1.4.2-no-fdgl.patch 843 BLAKE2B ae7007f466712536681a5736d73e585315a6129538642fb20676fb967aa978bb3f4acbd61be6652b2918bbff235faa4c2e6f38cd96158e3f04ee13a784c82f62 SHA512 94f0cf7536ae6ae844088cabce0a22caa61113145c51332fda0831878af23267d24780416e2157eb6b50e9690deb508b9474c9b50b08186fb367406a896de55c
 DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2
+DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
 EBUILD ganv-1.4.2-r1.ebuild 1056 BLAKE2B 1f2c2c92f244b04cd2c45fda244c9d45f4ebb483cbf14af2900715152de856e3e35c31c54a68acc12dc54bc72cdff1aa400aeff4c5e745b0582f8ef88b1c6ead SHA512 197393a1a1eb0f37ea3bf571805b014f845d878329ed0d0e4cc385672f1215099ef46ac13abce415a474800105b9725a45456cc497ba358d77ea752f48b19daa
+EBUILD ganv-1.6.0.ebuild 1011 BLAKE2B d4687ad27eacf1692259cfbce92daf28cd85dce5834a98bc12546d0725fe466f1d9b3b7ea1122b8b2a69670f4640fcd41b7e3ba938f99213f1a32f7d5b675017 SHA512 c50c3da14cceb7eeaf334dae40828025f065fa30d6d066349086e1dcc5e5e58173fb9bc23e96e42538360f8814077b048db9c83f6c69f985364d330dbe283fc9
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.6.0.ebuild b/media-libs/ganv/ganv-1.6.0.ebuild
new file mode 100644
index 000000000000..516ec4cbc85d
--- /dev/null
+++ b/media-libs/ganv/ganv-1.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# oes not work with python3
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils flag-o-matic waf-utils python-any-r1
+
+DESCRIPTION="A GTK+ widget for interactive graph-like environments"
+HOMEPAGE="http://drobilla.net/software/ganv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fdgl +graphviz introspection nls"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	x11-libs/gtk+:2
+	graphviz? ( media-gfx/graphviz[gtk] )
+	introspection? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection:=[doctool] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	nls? ( virtual/libintl )
+"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	waf-utils_src_configure \
+		$(use graphviz || echo "--no-graphviz") \
+		$(use fdgl || echo "--no-fdgl") \
+		$(use nls || echo "--no-nls") \
+		$(use introspection && echo "--gir")
+}
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 2da80b80400f..4fd3b0bb44fc 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -12,4 +12,4 @@ DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78
 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
-MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
+MISC metadata.xml 1415 BLAKE2B eebc7a74a8d70d6d8c8eda0f59a752ce1f2589dfa0ab0df358a1fc0fbb843b285a270e626d1cd27f29b51ea46825184dfbfc9c4c252baed5092d2ab8cc33c0a4 SHA512 38aef9d6c1ad8b510a28aa54ed7d93c96d755fddc7a2693a6ab4667a38667ab37ba5eddce534f52e43c1ce9abe576ab4adefb2c17c64ff90ce1d24f44ae58cb6
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 32fa1e5daa8a..c476739e6bdb 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 gd is a graphics library. It allows your code to quickly draw images complete  
 with lines, arcs, text, multiple colors, cut and paste from other images, and
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 266dd916edc0..4ee62614c205 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,4 @@
 AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 EBUILD giblib-1.2.4-r1.ebuild 801 BLAKE2B b3c2275d63f13af5801fd51ee17c5b3ac5cca3c66e6b60d66047b2ab83973a0a5ecbcca9f7806568d2177771552d362012f8bbc191c6996aa694985f5edc490d SHA512 e22f9ca54c2b2370ce102ef135709ac869b39a2c85760a103f40e89d882dbc09e143835bcae503d15c257e44b08466ad7c82d608de49e0c41ca3bb6b3302e87c
-MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
+MISC metadata.xml 658 BLAKE2B 95c037a832ab160962f89e9adb80b15500dba4e64283b0af8e1acb01deab70f34433e37b023a8d572b157be05c52c9c01c561e0ead3a0da3b5fa2ddcb4fac4c7 SHA512 f8302255d4ab8044f831945642b25865ee4c74bd8d77bbf1810f1641b4b1d164a9f0e0e7f983704a044ad44cececa8142c0a1a845e50a01b9d413ec6436e3793
diff --git a/media-libs/giblib/metadata.xml b/media-libs/giblib/metadata.xml
index 0e4309143ec7..0041355f4ec9 100644
--- a/media-libs/giblib/metadata.xml
+++ b/media-libs/giblib/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 giblib is a utility library used by many of the applications I write. It 
 incorporates doubly linked lists, some string functions, and a wrapper 
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 79e60774248c..adab76817468 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,5 @@
 AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-5.2.1-r1.ebuild 1916 BLAKE2B bf0c0d58865b5ec9292946a8ec558bcaeb852c570a88645ff521a4ecb5933e9798e359c2ec572a3adefb9d103bdfd3261b13cbd65f2ce26b8766707fb0600110 SHA512 67f496e3d5c2566d61892e881cae18f275d571e05d56722df9b30f211a68143d73c9de5bc55b0311eb9b81b36ac4b9c5d44bd11c1e0fd8308edc24e147d73f05
-MISC metadata.xml 345 BLAKE2B 86b96e35605026c5c83878ee105a1f90aa5f8fb32c11af81a8a8ec42b89e0a82d321898ca714087d4c1c8c123718f97b2a8c0ac77edaff0f2bd9f52427032cf2 SHA512 0a21a308b86cd075e436bb61f42a7bbc40eb069f2704cfe44b4c13f1e5dc124294d614be0130af66d60214b75989acb17510bfc44943a585277bffb5feda767d
+EBUILD giflib-5.2.1-r1.ebuild 1937 BLAKE2B 1486e6f03d0a69b64c826aa4502353ccdbc9d96c1f0503573bac83aceb8a798b42266f70a227d5b515aaa0a4a4a9c4c73548637187616185f21982969d319f18 SHA512 bf1c6cc39d48ce21ccc139382ae2b7195a6629a938e7f54f92b8b6684626046ceb15431062107783efc12e4dafee9babcdb01f81a5bd343b4d11eb04a494dad0
+MISC metadata.xml 248 BLAKE2B 46adedd4004568ddad75971a42a14a53916a118e2df96eec2eb420a1c55009c152f5d41510e7b3030825d81d476c3db981847f12aedafa2c0b556b549666c389 SHA512 3e9d14a9f2c2e9bf88543fb580abb09dfc35c8065b8f77579bbbae2330fa105ca808f35c8542f4db4b0dc0ac4026bc26adb9f2f45ac52755b822e0b98c751532
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index 4a0ee5d1bfe0..7a6bc4d1161d 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -35,6 +35,7 @@ multilib_src_compile() {
 	fi
 
 	emake \
+		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
 		LDFLAGS="${LDFLAGS}" \
diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
index 8aeeef3de709..bc534d2f74eb 100644
--- a/media-libs/giflib/metadata.xml
+++ b/media-libs/giflib/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">giflib</remote-id>
   </upstream>
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index e09ec7400a2a..a9ab846bc7f9 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 835 BLAKE2B 20783da2497157094aa9b6305e35a946ed7469a2ac3dd2f3e74e40d7af1df0d4ecb990835a6522e16c67f799ee53c7cdc90e707bf36c50bffc3bbe7f68ae3f58 SHA512 9f154e73011e55051b152735b0415cd90f97765c42146bb27f90bcc02d11be07cc138ddcf2a0e1c9850bb4f4eef44b38bfbe7ce452c1eb400215e201e3a432eb
+EBUILD gsound-1.0.2-r1.ebuild 840 BLAKE2B 86ce5f9912a71a58c30cf6467d49b660f85d91b67e92388f27023ab8af62c9ff54bcb4971028b6e38ab9108af48db2eaa03b1d57c38fc27cfa36a4e3bed8690f SHA512 79ba41aaa997eae46954656e012e547f7a7f8a3b4a8eda3a916831704a0df3016f0357823e4c738c9f876f609f50263a8276d342634f40b7ddd85274f8ab5030
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index ef942f7e5821..cf05d8cf1144 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4135f2450a2e..435ba22b3866 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f
 DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8
+DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
-EBUILD harfbuzz-2.6.5.ebuild 3041 BLAKE2B aaf6b49d40236c3423fa960a38418e881e1e7e1553729f2007758c330cfc64c2817038632be9b7a0dd7e0b070d4bebf3a341edc8727acd16669cadb0b8bccd1b SHA512 275c8ccac579d4e58f45f634a44eca38f24471f7435c7df2aff85d1ed01470d544e7917346415ca939fb646c69197429c288df98065bd40db8c588f0ec2f7129
-EBUILD harfbuzz-2.6.6.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
-EBUILD harfbuzz-9999.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
+EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd
+EBUILD harfbuzz-2.6.6.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
+EBUILD harfbuzz-2.6.7.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
+EBUILD harfbuzz-9999.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
index 12dfabc26074..63f6e1fd3798 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 
 if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -76,7 +76,12 @@ src_prepare() {
 			test/api/Makefile.in || die
 	fi
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
+
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
index 085525d97eed..bdc327af67b0 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 
 if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -76,7 +76,12 @@ src_prepare() {
 			test/api/Makefile.in || die
 	fi
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
+
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
new file mode 100644
index 000000000000..bdc327af67b0
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
+
+	eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 085525d97eed..bdc327af67b0 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 
 if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -76,7 +76,12 @@ src_prepare() {
 			test/api/Makefile.in || die
 	fi
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
+
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/icclib/Manifest b/media-libs/icclib/Manifest
index 8308e7971349..aba211614790 100644
--- a/media-libs/icclib/Manifest
+++ b/media-libs/icclib/Manifest
@@ -1,4 +1,4 @@
 AUX icclib-2.14-make.patch 3074 BLAKE2B 9f45af8c8c0041525e98352b9aa4b2743607d76b79dee02b17cf67e3410f9d45caf433f7e6490bb761c2b19616acf19275356f21a9b9a582f3f30a0e15997e70 SHA512 e2245b6f7aa24fcb135e8ce7a4332b6a689822c6429cf48cab5cd61285e80c72ff50adb6d8e691b948e45b9dd5d3df42935b810e1a25aba4f2d9d51ac9b9a1eb
 DIST icclib_V2.14.zip 158606 BLAKE2B a42a16a00d540f3e0036f86a4934ed8ac3c67bfea135df5fc893cef939b451f0298c576aa4067360597912fff1afe3315588af64e4edc9605ea5944ff9e42cf6 SHA512 ed038c8655968c794491f30c295ef115900bfcc2e8bfd8607f12f73d6f2236fc339c1ed53a364524478273097ab9065a372bb26f38231bfc6dc02773a11546a3
 EBUILD icclib-2.14.ebuild 805 BLAKE2B db0ef3c262563d5593fae5c59c534a0834c9d765b0b9f3cccd1853cccf748e3a1c485750c51d816f96f3cb5d1841eaec64295dc415053bdd40342e6ab98a151a SHA512 4ccf44eb5347c97c9e96a3640040095af3e5c20e210ece9f508ba0b6adae7e8a50801c7ba4886f3fb4be928310dc6bad99caabb56fcce1d78835a0d30cf0dc58
-MISC metadata.xml 452 BLAKE2B 6c283d428da4dff860b53d17c0c3a64a63dae0fe9736acdd44045d0be9b9a8a9b2fcc8ab97ded5252bf59d4cf85f55a67aa68de15c1831553aa1103b492d53d1 SHA512 a95f4b878cfad5719ea1a161f0cda34b81982fd000f04da81a8dfcdd77c7592c6621d612eb6faf854deb78902ae31e36cc0b0b8e6e37b559ddbbd2b34e19b23b
+MISC metadata.xml 332 BLAKE2B 228aac7bfb93c3611d6308bc9edb709395734cbbdc97d686647f8030ff1cd258191d734e1a94a7aec2dbac31081d081c5de0f70d7b4d09ef3f46ad377665a782 SHA512 079f7df30b6a832bd5d0b0ff76889c44c615126a9297a80c9fc8a3b0aa9b4cd4c8f63e2ea57fbc8d2bbf742a5cc95638f66d702aa50fd19477dcdefbd6a58717
diff --git a/media-libs/icclib/metadata.xml b/media-libs/icclib/metadata.xml
index d13235b93d4e..088df729b9c8 100644
--- a/media-libs/icclib/metadata.xml
+++ b/media-libs/icclib/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 15f4440a5a69..61a1c335e0d1 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -11,4 +11,4 @@ AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5
 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e
 DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
 EBUILD imlib-1.9.15-r5.ebuild 2138 BLAKE2B 7b8c0a3d1054c42e649b886e8d3794b6f0645cbfc6f5dd552b0a8944c816c54cbfb7bf9a14bbc1eedbd8b7159c505c448a974fa2018fc38a2b59cba0e5fdc6d6 SHA512 45b61ba2ef4aaa51b38bd2e5ea05b90de6ef4b08a2974794a6402ccee5cb952f6c7947844d2b4b9dcda0b3709e888737f3c0c44c6aef54ba565a2078a7bd4621
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/imlib/metadata.xml b/media-libs/imlib/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-libs/imlib/metadata.xml
+++ b/media-libs/imlib/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index ab5314509756..57107a08f180 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -4,4 +4,4 @@ DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaa
 DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
 EBUILD jbig2dec-0.14.ebuild 1141 BLAKE2B 5bec117e5f087d42b74bc9e665ea82ef0091d93e7abaa0bebcbb6f48a7c56a4069858921a8f03955db98ad2c50074a9e977bc66d644b2cff6b897ba8e656eb57 SHA512 0fabea3ebe23edd6b29ab513f1e37de10b7c374fd27b098ea12ecdef583757779b384464c72323cd95d0125da0b04341bce8793c97efc8522f75359bf1e8de0a
 EBUILD jbig2dec-0.17-r1.ebuild 1615 BLAKE2B 0a67e44adf16face69d8a4eaa56fe437f40253cc49364c71d81d6c7dda4d0e71e53e299f71738d238cf7ed92130f72e9b6c0b5a137793566bd25961f366f1005 SHA512 8832d6c0b9d649e620950c5f348ecd59e488450cbd356c66ce49ff1f4447c3626b97140d24b5dae9fd5530b374ef9a4d4a27247c48c8974bb92e62c6faae9e57
-MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
+MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/metadata.xml b/media-libs/jbig2dec/metadata.xml
index f38100eccb08..a6c28dbb00fc 100644
--- a/media-libs/jbig2dec/metadata.xml
+++ b/media-libs/jbig2dec/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <maintainer type="project">
     <email>printing@gentoo.org</email>
     <name>Gentoo Printing Project</name>
   </maintainer>
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 026dece6199c..b054b2ccee2e 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
 AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
 EBUILD jbigkit-2.1.ebuild 1411 BLAKE2B a510c50a2031387b774045333706999680b7ca1a3eca992db956009c5e4927f11e08fcfa3873bb96b09f3a748d03ec063ba81fc3da9ecc6dddd0436f4e43828e SHA512 83c7ce193ef786458b3788e3d231d38dda207f8325ed49d69643e12cbb29cf90c6ea84489048446877386371a0a8ae5cd77b034f9cb5a2500e8a68c049950f86
-MISC metadata.xml 465 BLAKE2B fdf534bd45566d595255f6196cf5d8290a9aa2d7a716f61b90f2f3384610789dd3af84965b80f49b8eb7dc129f2c50052927ad5cc62a12092b6d7db32da2a977 SHA512 a328f6b53c517072f28a88360a31de1ecd5188516ac2a46338c9b6bb1fb92c3727a9823f22e075577bf02a9e937038e87b70932de511174c965b4e991ccc6769
+MISC metadata.xml 373 BLAKE2B 02b125f44ea8401eb695a1b3fff8584c38f50cf9f359cf70e209955babbd749fcfbcd14415a757281f8fd4c0970ba5efbd67b937b81b45b2152a79093d141a34 SHA512 663285ac228539d95ca401d530b53cdb58e2f01e3ee4187622afd1c8bf6ca0ae76bbbdaeb92742408502f4b55dd269464ac2f21231d987ab73f949f6abb92882
diff --git a/media-libs/jbigkit/metadata.xml b/media-libs/jbigkit/metadata.xml
index cd630a4f29e0..89d711c548e9 100644
--- a/media-libs/jbigkit/metadata.xml
+++ b/media-libs/jbigkit/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">Provides a library implementing a 
 	highly effective data compression algorithm for bi-level 
 	high-resolution images such as fax pages or scanned documents.
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 1320e9c78e5c..6ed66194e019 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,4 +8,4 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 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
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/jpeg/metadata.xml b/media-libs/jpeg/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-libs/jpeg/metadata.xml
+++ b/media-libs/jpeg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index f8f607628919..12c356f5b812 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -2,4 +2,4 @@ AUX lasi-1.1.0-cmake.patch 421 BLAKE2B 39ebb3759e055f045f406f59d9408c09f70a5496a
 AUX lasi-1.1.0-pkgconfig.patch 701 BLAKE2B 50c59743897a07974e5329d1b0c039707533c4f3b0d51595b93faaf9abec034ae0407db59f4e112996210398fdabad4b4a0812f6888c1c6b83fe4b7bcb4a3854 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da
 DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
 EBUILD lasi-1.1.2.ebuild 1289 BLAKE2B 5b3662e8551c4cda3fcb38cc9a42fd0167741aa0166376bf05f6225cb9455bb22bd245a7d9acecef32f316cb5684af35cc8a22758d19e55d7710785c43de5d8c SHA512 b92229396f3f43d0bb19aa12ecf1ed89bb9c0f9961e3b0876a9d6b769b26241bc797d9ad77a0b2822b2b1db915aa1f696f19d8be43a3bb3ec9c59ec1c74ec1df
-MISC metadata.xml 1344 BLAKE2B 493803ba65928eb023c4afd0b8e87182bddc64034c16a7cde193f0e567ec4629c620cb38ed98c2d877b8abfb4df75915221b0cb544008e10cf6ebb44fce2a656 SHA512 ee7b45b3da8adee8a7073890241d5fc318c5fe86a5815a252a52650999b0019576d5fa5a3627c947f08ec68e13c9efb5c56d837ba6ca8290c24084ed32b67493
+MISC metadata.xml 1218 BLAKE2B f6a5085f03d1bc69e88727d15754965b6db817bda61be0e71a7e7eb39262f3836de56e44498263f7c55ebdc2d58f7914e364fc23d11a1988a0ef4ca2883529c5 SHA512 c9688f2a9e74c81d7906d6609db72a7f29463c12800fb9e7922f1a4cd41db001722e5c5b102642464541e02d3a3f678fe0dd7013df9c8eace959dba3ba49ed71
diff --git a/media-libs/lasi/metadata.xml b/media-libs/lasi/metadata.xml
index 43c126333884..a22a34eca635 100644
--- a/media-libs/lasi/metadata.xml
+++ b/media-libs/lasi/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
   <longdescription lang="en">
   libLASi is a library written by Larry Siden that provides a C++
   stream output interface for creating Postscript documents that can
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index a486428a7fd5..5201bbd13c56 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,6 @@
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
+DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824aa1a083f258f72a63553c0576ba8ec29fe8c3bc46cb80047818bb8ac97765ae7de85b689ac2eb950516531c6 SHA512 3c068e7b2aff4a9aee720ced7afc6bc8b6ec6bf1f2bf0697d486cd68648104882f36b94201dccbf8cb448282998d27986b881c6b784fd9fef86ae72325fcf20d
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
+EBUILD lcms-2.10.ebuild 1222 BLAKE2B 6cd910f445869a02b79db2ff943dffb441a8227cc2d6d988337f555eece3743d8a19469ed35d1e5f659afa4be10c009869bc3c0c2102ed3db188fa7d649a81d4 SHA512 7771fa312aaab3f2bcee9bcf110bf74abac6a1725b021440a1c28f59b175e1d8d87f62c1cb6b95c7d619093a39b5f0b37b620992893f24f1a4c529a64e78653a
 EBUILD lcms-2.9.ebuild 1252 BLAKE2B 7b6f2d081715b4d41662bfc6636086d13adc26f02a8e655d2013103cf9471cd901399694359a635dc392c22c87c8408bd5b906ca4d7d870b6893f2c94d66af8c SHA512 0a3c2b3698a8e2593f5dc47f5f4fb175f100f7a959a060ee13abf38d2dd59281cafd50a7f55483db9a68fce7455df11d1257fb400ccbc41d31045ab1c7de1ef2
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.10.ebuild b/media-libs/lcms/lcms-2.10.ebuild
new file mode 100644
index 000000000000..f414c375f3d0
--- /dev/null
+++ b/media-libs/lcms/lcms-2.10.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="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/lcms2-${PV}"
+
+src_prepare() {
+	default
+	elibtoolize  # for Prefix/Solaris
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		--without-zlib
+	)
+	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use doc; then
+		docinto pdf
+		dodoc doc/*.pdf
+	fi
+}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 1257c4fb47b4..2e5e29cc851d 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 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
+MISC metadata.xml 607 BLAKE2B b4da5ae3ab9b9623f08349a137692ecfc9da4a00e16ebbbf1912e47204576d8bcf1505598df14a71f94b703b2dfed0ac5876f76a3fff764d503a4128cc7fa714 SHA512 e16ecf3a3b3b94c16feef66a396cc341c8211df0340733e903b352e42c9ac20e78d036bda45da8e048416ef34ba9bd5eb7d0fa530952993ca5bee6a61fd31b21
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 89c819c3b108..47129c22689a 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</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.
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 6970288b1580..92d8033ca9e3 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,8 +4,8 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-DIST libaom-2.0.0_rc1.tar.gz 3497410 BLAKE2B e8443e5d390c82912b951d78551f2c7a3e0cffe6aea1b846da29c0264cc9736069110e6701e6dc075964c0375e95f2c1c108c0c980a5ea78d0f970c6f47f4790 SHA512 06a0971e8fcd1d449c4fd2b04569dc32ce6fb8ab6c4a270413997c3aeba7a186e071683686e0fbc1eb1f8d6c2c3afa7f48601bf5530984bc1cf612ab5dd64841
+DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
-EBUILD libaom-2.0.0_rc1.ebuild 2391 BLAKE2B c3a087f79a756ebbd7b6dfd2bf59afe3d6cb4beb8ba89414f9830c4a515e19a9fcbebe4b879b3a13b2713ef543927840f0bfaed9b3c0b664fddf620cfffcdd9a SHA512 6a001c1c43c863428016fe20b702faf73b9cea9d0b884f050edd4960057dcbcd317b0083fd1cd180eba0e18a7e632b0e2b4ee66bb207ad74d99b5b2d713dee59
-EBUILD libaom-9999.ebuild 2464 BLAKE2B b7ce12113d541280fb7d0ab762970ae6e91bf5fafc05a6457a7e7483faab698d3a354e2a013ee97c011d6870a9e4ddb8530af43d7bba33c901742197385d41e2 SHA512 46fea52aa9dc196e9c740f86164264ac2bf4c5ab4acdbf0e94358c2dfd2c3d14b1417e5f2c3e7b01e622bfe183b3ea3afd9f83d2c45698ff88391f1ea94fa72f
+EBUILD libaom-2.0.0.ebuild 2315 BLAKE2B 56e5f6ee7d9902442d5ca1e1c22c7059d8bcd0e33467cbd346c256e383f109b87953953d6b7b9e389f22e0a09f2bd4d4cb2eeac068c3ddc48cff523755ab0e18 SHA512 970cf77beff2c5de51342f257a50eb2c248dd23ab61ca9902bdbf34f096d00fc9d71949df49bae47543d98fd7fc23726daca3d97a4a99f81dbc3a35bd12398e6
+EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-2.0.0_rc1.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild
index bcc3c9689fb9..8e92d73e9986 100644
--- a/media-libs/libaom/libaom-2.0.0_rc1.ebuild
+++ b/media-libs/libaom/libaom-2.0.0.ebuild
@@ -10,9 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
-	MY_COMMIT="1e711b0aca6721da83835e3b5ceda07238e8b6ae"
-	#SRC_URI="https://aomedia.googlesource.com/aom/+archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz"
 	S="${WORKDIR}"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
@@ -52,7 +50,8 @@ multilib_src_configure() {
 		-DENABLE_TOOLS=ON
 		-DENABLE_WERROR=OFF
 
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
 		# ENABLE_DSPR2 / ENABLE_MSA for mips
 		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 67c9b166e78a..a437118de10a 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
 HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
-SLOT="0/1.9999"
+SLOT="0/2"
 IUSE="doc examples"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
@@ -44,8 +44,6 @@ BDEPEND="abi_x86_32? ( dev-lang/yasm )
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/pthread_lib2.patch" )
-
 # the PATENTS file is required to be distributed with this package bug #682214
 DOCS=( PATENTS )
 
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 345f73157bb4..69eac1b3a503 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,6 +1,4 @@
-DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
 DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
-EBUILD libcdr-0.1.5.ebuild 1186 BLAKE2B 9d1625bb05adb07a2f90cf20b1ea16a23da8b821c34294ccd28de0ef1698d7e8b3b301bf41f6793de65393d7c28838ea2cc0cd871c42a7703b94ab86fd87738b SHA512 7252f07c3e3e383f9d7801003415a5ac4e4e2643eb6c2e0f53e343f46298d4a78f669b3913dda80e7165e13dbf784250e10144ea6609b614adc73c96642efa96
-EBUILD libcdr-0.1.6.ebuild 1125 BLAKE2B 7a07b971e4019de09f4d3deaf5f14d2aac47b4f6ea4d0f64f7f230ac2df64a60c7ce961465d8e1e3725783e768520d2130ff77ee68d88729405ed273a429ee79 SHA512 38de41ad48b70d653650916b56cf8cc1d3a6e61e108286fe9e847d38ddf3985d0dab6ee4511ba85a63e321b1ac0a7512289549b1dfb89e54fabc8cdc2f4212b4
+EBUILD libcdr-0.1.6.ebuild 1122 BLAKE2B 402cdb2ed262e4350268d2d2caa4e01b311c660a421641db4c69b7ed7e017b64c6b3299d0b556b6e4c1081658934100bf81fc8f4156355e5a2b6b49d5f8f6861 SHA512 23ddee4eb4fdf67e6795627b54fa77d717a0ef8bdd0d3e4f9cec46ac3acda5819f0a697d0ee2721cb579ad067ee0f589b53f4bed114282583b59b571d67eebc5
 EBUILD libcdr-9999.ebuild 1127 BLAKE2B 74fb23765b40c9dfd07e08ddd36a4c24f8faeb95b0832f14f9f6d82c23df1ba2e19a863aa20efa7ecb2e95b4c40136a12fa79283fe03bb927376d40a6f600e17 SHA512 8ade7a79f4e57083628dab0b914484c7d083f37fa2fefa3a10488e71cb7ee5c777cf8a22776e83bfd653dd71e8af96ee9a574ce17c4ccf9ea612975cc98f9a97
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.5.ebuild b/media-libs/libcdr/libcdr-0.1.5.ebuild
deleted file mode 100644
index 88fd7662e04b..000000000000
--- a/media-libs/libcdr/libcdr-0.1.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/librevenge
-	media-libs/lcms:2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# bug 619448
-	append-cxxflags -std=c++14
-
-	local myeconfargs=(
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
index 600f064a6c0e..24045430a370 100644
--- a/media-libs/libcdr/libcdr-0.1.6.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/media-libs/libexif-gtk/Manifest b/media-libs/libexif-gtk/Manifest
index 4f5198c4b322..b8688ce4c8c6 100644
--- a/media-libs/libexif-gtk/Manifest
+++ b/media-libs/libexif-gtk/Manifest
@@ -2,4 +2,4 @@ AUX libexif-gtk-0.3.5-confcheck.patch 647 BLAKE2B 75bb71eb2e4b2678cf6b5e0ca8badc
 AUX libexif-gtk-0.3.5-gtk212.patch 954 BLAKE2B 2312a0faa54ae07653f9b50265770137ff519ea2bfdb2ebf98956ec2f282b9f3b0bd4af51ed445ced57c0f5487645d5f784e9aa7120675fcef1f954888842cd6 SHA512 db07e9350c469129440adfed75fbb697589493a0dea2386c6e31bd8cc9c282f9c0f2de99e1a141a50651e816aabbda5da6aa54957d0d21d95fe882a9df87e0d3
 DIST libexif-gtk-0.3.5.tar.gz 396534 BLAKE2B 7ec81dee28893e42a80541b8d3c4129375c9fad2fa8c0a2c2b416eaebb0885d82cde51c2a7844b541c9c55e0f7d16380befcaee83fd0782e37a03289c76fc0c3 SHA512 c4df800f7bcc04fb27638ba56d8bda3ea27afadc94fae792a59673cef867f29976376f1ca00da899a7b2176ddb6f3e53bfe770a86171428cebe68bd413861baf
 EBUILD libexif-gtk-0.3.5-r2.ebuild 871 BLAKE2B 085daa0a547318d0e71d09e4a1af44f27ca88f824eb8a1b5ee68f99ca7dfe91bfbee96769200484a14611c868ba058239928bb0f7c91c2d823cfd2b5d285c054 SHA512 c3ab5bc410f098d6a1b993e4cadb83ba0ddcc3e08d61f9798cfd59e0e18f063530f23a128a9a2dbdab392c5035b4179102fb848d37817df9448be499116d17b1
-MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
+MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-libs/libexif-gtk/metadata.xml b/media-libs/libexif-gtk/metadata.xml
index 20c42d325f66..7f099d1061b8 100644
--- a/media-libs/libexif-gtk/metadata.xml
+++ b/media-libs/libexif-gtk/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">libexif</remote-id>
   </upstream>
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 02b0f19bb878..38b71873027e 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -4,4 +4,4 @@ AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd
 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
 EBUILD libexif-0.6.21-r3.ebuild 1340 BLAKE2B 3af2fc92b0ae5c2b004ecb125b21fda1171c0b2318b882b927a8490a6a420d263ff8175fe52def0039d6f9723abc73e95cca7c27ef0104043ca23bff937369b0 SHA512 339383b4ac82b6b907465d08b06b53ec0c6e35bd839918085fcec2f61ff3eb6ffe72c454771703721d9520014c0b8deca317704b24ccd64182a3e477ca1c9ef6
-MISC metadata.xml 403 BLAKE2B 174c4d11ebb47cb6037799b340557bc258b854e276a893e70726eb7ae6d57bcf108bb4f17cec453e850bde5693221ae52e825ee73a73c1160c20ac8a86bc81e1 SHA512 43defe52eed54a1fcfdaf2a7057e56267e3286d55e2ee77e32c1c5ccc535d2c5415567d2fd923ccd7dce116a880db022e50d553786f83bae1f07e00b1e73159a
+MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index fc7d045d25f5..f8874c54adaa 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
 		<remote-id type="sourceforge">libexif</remote-id>
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 71008558156f..e6b6cb50edd6 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,4 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
 EBUILD libfpx-1.3.1_p10.ebuild 988 BLAKE2B 88ccbfcecab4996b8d020faceab7b9a05f3946ff458492e85e95f38e6c4d15a4c7cad76a773bdbfd759b23bcfb75ab621d976df6e0e0bed2a957dee27ffd597e SHA512 414910d3d95fa40a38cd3ad8b90f3f542cfd12f79589de2250f585733cbc9cd8ba4254665b860d4e9ff453899e40853d94ba09c37079c9cccbcf376cc92f7536
-MISC metadata.xml 430 BLAKE2B 06c7b8d737850306370a49f0d4ff7357a6a97de82bafb26c77f1525fc2b775a6aa03b954167dd7a27213dbbb56bb331cb5140ea4c78aafbd96993987bf998d00 SHA512 c041796d2ed0067ede9168e4212917751f7a7a4fb3463b9ca8343af1e2157cdbbdfaa763fc5b8390179b62b368ff7f098fcdce4e13a74193a34654c06f998f94
+MISC metadata.xml 333 BLAKE2B ded0f3e7a01b6a7c6b9073b5970f4760cde2230e21dc53ef3285cd9a69aae162acdaafe34aeefd66a7f4761cf54c62889cc990cdb1de9404df7a14d30eea91af SHA512 ea962485ec3f07a7d60d17a16dec78a249b76007e51bfac544028d343634b981077e6bf9fa72499fb504f2412661acafbfce47d5ceb87701c68d54e43f606f4b
diff --git a/media-libs/libfpx/metadata.xml b/media-libs/libfpx/metadata.xml
index 7a252f9efc58..dc8481383d5b 100644
--- a/media-libs/libfpx/metadata.xml
+++ b/media-libs/libfpx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <slots>
     <subslots>Reflect major ABI of libfpx.so.</subslots>
   </slots>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index bb020fa3d9a5..d9a4cdbcf167 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
-MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
+MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index ba03da0953dc..1562920a4f09 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<use>
 		<flag name="serial">Enable serial port support</flag>
 	</use>
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 1b4db76804ac..8dfb5ba41853 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -4,4 +4,4 @@ AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41f
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 EBUILD libharu-2.3.0-r2.ebuild 989 BLAKE2B a43ec8fff874db7c3293a89460f98eee691327489165850660778004a703b69ee2801f662027d869188b5bbe66bc4463c7eca5e9a1838d7f87bf16264dcf365c SHA512 8fd2da54d0e3e2e742771cf6fa9b4fda6526f574ee95ed456aa1ead9a48d97e2e2b61a59350bbcf431c9e1c25716dc55823927344f99aa1875a1f6e72a9550ad
-MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
+MISC metadata.xml 875 BLAKE2B 1c9251d1eed492f8e1e19ba2e579ac05a91e19f52b44c3a04185ff0ecb1e087efd9da03f7eb512b64ff3fb38fee456aab45c6fe696a9f2f26ef77da38fda5380 SHA512 fde85e36972d2a50280cdc8d8baca9e958e7816bcb63c7c8203d65dc4400a1673f8dfd7921e4d87a2322fd0a9a696643e9d530f88cc6642f23388e19f6715853
diff --git a/media-libs/libharu/metadata.xml b/media-libs/libharu/metadata.xml
index 96274c62cc05..48a1acee9662 100644
--- a/media-libs/libharu/metadata.xml
+++ b/media-libs/libharu/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
   <longdescription lang="en">
   Haru PDF library is a ANSI/C library for generating PDF files.
   It supports the following features:
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index bbcd0351ef2d..52925fe90547 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -3,4 +3,4 @@ DIST libheif-1.6.1.tar.gz 1514950 BLAKE2B d658f0c408f9a09eaac890119119327bd3e9c8
 EBUILD libheif-1.5.1.ebuild 1457 BLAKE2B 083d8e9034d5c4fd5816047ab2e577978b395a13546e3a2d3a747f09c087feb99df885cddf20a0129c3e574bbe981a59c60bfece141505412358214463a4df92 SHA512 79599b18a58d121ffef9b15842c0faa90792d3821fdd9d54a0b2ed2ab81e6c90880230f96137cd21e406d6b254ce1f0b205401d49d0c3a774b6fc923e4b8ce93
 EBUILD libheif-1.6.1.ebuild 1464 BLAKE2B 065ca01588345b31e9f119aaeba6677fa9c126bb9430c1674432dc1094c2261553bdfb7113cc70ccc193552b99a5fc48d962f4c9724f2d4613072b9d40cca3db SHA512 249f96cc76fdca8e0b1df09515f22bdd73f039cc83e3d39d1a62ab9fa2b7f5f6bb0a8116cee3feb1f25e18a7c12eca9bcd1074a6fdc52b4aecc68047ef7ce06a
 EBUILD libheif-9999.ebuild 1464 BLAKE2B 70597a66418d649017792b147e47dee7f69064326b40ca72e37756fd7e778621178dfab5213bbf5f1587b7735235d75d49a3732beb492342692ee57ad0924f6a SHA512 431ba0826e3087c0a95cf3898130ab31bc57ac975a561c0220400e832afa8a93ff0f214223245689488d01e0f681d461b4bbb60f31ce7c5f632f2ecaa8999b5f
-MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
+MISC metadata.xml 316 BLAKE2B dcf0d4edec65ba3a6b81a64d7a7d93cf53872a3acd0907ca30e8490f07512dde8e8cec86099352db691fa0e73da5e19d3e6082a9a9ba34c8a7edce93155cf564 SHA512 298555a57208bf6b9e986f3c8b573c2dca354851fa1408a6abd14bddb53f017417c8a63948a2c5d3f47dd4e03de8d0ec667aab16c735d0970976a78a0df43e39
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 22000d0b0b55..ee4cf414e0db 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/strukturag/libheif/issues</bugs-to>
 		<remote-id type="github">strukturag/libheif</remote-id>
diff --git a/media-libs/libicns/Manifest b/media-libs/libicns/Manifest
index 022f8ed88e9b..aa7bfcdcb6d0 100644
--- a/media-libs/libicns/Manifest
+++ b/media-libs/libicns/Manifest
@@ -3,4 +3,4 @@ AUX libicns-0.8.1-fix-gcc-warnings.patch 1406 BLAKE2B e16cf880e1b73809169f04163d
 AUX libicns-0.8.1-support-libopenjp2.patch 11807 BLAKE2B ed074caa669d755e5a19fe2a1a079ce9c6bd2e4627902ffbd024160af2b74bc379d8ae7c1c8bd7c41c5182950ee94603cf9cf5ed89f3150b50db4e6006bf09d7 SHA512 be6e1c83c4f580438ac7aad362bc79b33e08b6682841a8aa5ad3cfbab516c4c0a5ff9d273b250494f9aaf6c6f18c10cb56ec23217e186ff163ba2f0d5b813cad
 DIST libicns-0.8.1.tar.gz 460819 BLAKE2B bc8989d2e58bff343cdf9538ca2d14600e1bee25697e767dfd51dd69b533995c76f83d3076b63c6604c18a2e08bbfd489408f0dd28847ac6b354210b7732b87a SHA512 e9a6da6d639c4e7aa85e21cf0201ec2e8fcad5c8542ef55375dee7628eff6e0136974ebae93f6c7d95447f879d3d001e8f5d480f6590061c8e0ad0e06b52742c
 EBUILD libicns-0.8.1-r1.ebuild 816 BLAKE2B 8121da975e1996885eecaa64422992fd403351ab2a36f63eb51879898985aba1a5d866a11860e893ee3549dd17e63a55172ad5a2e13ce3156e0eaaa05aec0ccd SHA512 f975624417f52f2b8ea27870924b2dac7e0c54bdb40bc0fd943aadf6b40c274af58fbefea858fe3c044541d340504310298cc6ba2e2c0de46dc9a0fb61a499f3
-MISC metadata.xml 333 BLAKE2B 7e301b02d958a41b5f991e4db560fbe37f78e051ef1166c3721f1ea65f34fdd48f6f56f6718ea9d0f8936f45921b061f9c6d7bf5c8d5e67bd8c1b8af1981b2da SHA512 398c15324aff5d97d6cc431f8b4455f37879c5afa0bc3e41e994e65e052c8c3fd07e3d2c473b4bf42c14d7fe203a91ee6cef28dd149612a289333e8ce7a7d9f6
+MISC metadata.xml 241 BLAKE2B b508aa0145d31a6a04f6fbc5603e94a07da91f102b13c4468b4c2e95f81f7104b3eea6869ef05227a76aa0c9016e3b47438dc2706b36ede0c3a5512893874412 SHA512 8dbc71194d4e2137d7614e3cef31ff5bc1615f2db6585bce0c2d1f3d5556cde875d5c25ff4b0aac95e63330547925b949a865ebf9e483e291b8c1688b3634eb2
diff --git a/media-libs/libicns/metadata.xml b/media-libs/libicns/metadata.xml
index 7cbd0ad7d33d..e8ce1dd0c771 100644
--- a/media-libs/libicns/metadata.xml
+++ b/media-libs/libicns/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">icns</remote-id>
 	</upstream>
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index bbe4d1743b8b..5c8ac485d3ea 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1,3 +1,3 @@
 DIST libirman-0.4.5.tar.bz2 225330 BLAKE2B a8910631b4985e5ba8a425ea0914005fefb89329b9cb297e78a6c6775d386765aeabc86a92b63eadef17c7428e07213ebafc81d26fcf237f770ddf5aed06bff0 SHA512 5b0a8e1c0699bf1d8b43bbb2320b3abbd1f8d400264efd78d1cfb5ea942ff1d272b150012dfa61f5afc427824282a62755ec1e1189dd3d849a5f62293125ffb3
-EBUILD libirman-0.4.5.ebuild 676 BLAKE2B 8b457e11919b55c6e90d2576235159867d4a85fc036e028f43dac72ce966e28165bb83e72e7702ab2d7d41267ca025449de1517ad78f1322f1a54279a8b8a37d SHA512 635d68af8f61b6740d704b6a8eaf20a30b25ab3fa2418c0dcfb27fa2f645842abc6a8ddd7e1e7a9f222bc375c0990a25a4e013ce9626fa920a2531467d101e6f
+EBUILD libirman-0.4.5.ebuild 678 BLAKE2B 01aa13c11eca7f8cfb3ccac5fc2a371dedc93396b4939f7e6a329a4e6ae8dd20f7442f38c172595a2b17f35d9ca76da3333f0b1ba17ba313bae15475a7b8d455 SHA512 d2e92d6c25df00a3ac8c0241bac7cbd436e87384bb7145f3a5703de6920df6d0f5e9350502a8c68a840666e06a0d2c7d3811594da43eea2d7a5f7064a78efc5f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libirman/libirman-0.4.5.ebuild b/media-libs/libirman/libirman-0.4.5.ebuild
index f8f4a774babb..ea00085e4777 100644
--- a/media-libs/libirman/libirman-0.4.5.ebuild
+++ b/media-libs/libirman/libirman-0.4.5.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools toolchain-funcs
 
 DESCRIPTION="library for Irman control of Unix software"
-HOMEPAGE="http://www.lirc.org/software/snapshots/"
-SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.bz2"
+HOMEPAGE="https://www.lirc.org/software/snapshots/"
+SRC_URI="https://www.lirc.org/software/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 537fb8caa163..60645ce95819 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -8,4 +8,4 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2975 BLAKE2B 8adcb465f8dc025163ede13aba9c8c16ad5ba76151181d8800a549c4f3faf2f1ab259fefcca77e13b4384dbaf2f174285f7ee4a76f35b2da2e84ce0b956d189d SHA512 696184c66d92d48a66fffff01d4cd3bf0a4e723896ed659a0d4acd029c768ab23957f6dce4e0b39e576441e4c89e57b89141f8465fc202075a7a11e241cbe63c
 EBUILD libjpeg-turbo-2.0.3.ebuild 2596 BLAKE2B f474623d5a37027f79a697bd13d12a14ea05ff4c302ec4cb90a82ee4703775b8290994634caa1d688a06170386f79190f4c030d4539d493b87b6c56925b5c189 SHA512 2b4b663c921eac0f088d4881352a65d81eb7a7dd398dfb17cedd062eb957177c41723a2006da1426e1eb4983bc1358e9b0e449d85fb0fe95beec1c526a41d3e6
 EBUILD libjpeg-turbo-2.0.4.ebuild 2764 BLAKE2B 9c43210e19cec992e9966f71aae6249155877d333bdf822716acaf3d2e5893f973f69e8f92b55e3a9a057d270043b62b8a836b2b69196226378d7eb826343fee SHA512 92d67d8c8e27251ebc3806e8769a0912d2f043ba5858c054a0911a90c60546cc3db498af391334711ce47a7a3ce275117cb26352c0a65c05c81b7a622a9d00f4
-MISC metadata.xml 425 BLAKE2B 675a25f38cc91c2d60d54acf1b07e58c682415b14f2a4fc61f363b743b8d00c8c7f0f8c763f8c6d3199afd2980a834b6a2acf587f6a6f94a6afeeae0d1d3ac25 SHA512 36f6245075da1d9925e7816a0014244e18c4cf5e2e634e7dedeb1aeba6f944449017a98bfa37f0724e1a04d30173533c81f770eca7a332191df7af8afab80959
+MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 8f62c78fd6c6..adc27b89bda1 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">libjpeg-turbo</remote-id>
     <remote-id type="cpe">cpe:/a:libjpeg-turbo:libjpeg-turbo</remote-id>
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 03bc18cc69e5..91e218d8f009 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.3.ebuild 1242 BLAKE2B b1e9f532c5e79d363bb1c1ba9cd8c491f55ce714e799c2cb6ac2ba15f5a36fc7e6960cba99a2c9ebe5eb4b755b3b3e6e24abf30f0e23ab573c8af5b36a5d4959 SHA512 3879386da773b73accf45372cc9c514f1b6ef09e9bebe4336b7cb140948384be4b9f4d0e1c18735fd9c38caf74fff8a9d2b53517e8d542d6113ef4d0bbcffdec
-MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
+MISC metadata.xml 243 BLAKE2B 1bcbf4a3c9842a0c6f19c77c1bb17f80a5ab562decc5f4eeb25133e967062740c401fd4b8be8edd9a1e346827ebdbcff2e5b94d6b3d3411786c90cd0300dd9c7 SHA512 bf875271b80f39360a138083a69ef53ab64ce04d52e0155de091fe8f2f4742dafbea353833549bef28b43599e91e5a3f3f3dd79801c2fd3302e7cf65007d95d4
diff --git a/media-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index 95cf3d4b1dc6..afbe76002326 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">libmng</remote-id>
 	</upstream>
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index e007dacca0fc..35be7dfe2aca 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a
-EBUILD libopenmpt-0.4.12.ebuild 1554 BLAKE2B 3870f7a3f7707e9c919ded11f1bd241fdec746649eb134cfc4949a9b9cc9c4127802fc5d6f8067d6ff57996efcab3546eb03277a50cc1cd529e10ce3cc78f9bd SHA512 63e37a8a5fba2e1d3f8547d2d41f7203cfbba34a5129cae8718d905611d95247ee026009c55492b641eea83bc53393c390b01f12140b48de8c7e2671f47d944a
+DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
+EBUILD libopenmpt-0.5.0.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
index 093c6758739c..cfb89e4fb8bc 100644
--- a/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
@@ -46,7 +46,6 @@ multilib_src_configure() {
 		--without-portaudio \
 		--without-portaudiocpp \
 		--without-sdl2 \
-		--without-sdl \
 		--without-sndfile \
 		--without-flac
 }
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 6b0fd4b20f98..fafc543eaaba 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,3 +1,3 @@
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
 EBUILD libpano13-2.9.19.ebuild 901 BLAKE2B 5f3ad769bc933c544b99876fb0f1d11d492d54a8ed5a01f20ec9c3e59032c0cabb3b9f28895ee68a1a35b4b19207d5c27b4f636588269121934492713ac6e632 SHA512 0608f468d2c6f4ac0dc57612fd183986a673e9802194f5a7f716f62bf331488070d5c8ea84746c0b4471c2144c8e442a65341170cfc7f636755487e8f4b3cd07
-MISC metadata.xml 338 BLAKE2B 1ec5e22829216634d2abd6a1053661d8c226a7b852aa5725146d4ac2300c2ca308b2771a71c85cfce761a3c74eb70d10ee8bfc7fee9316d237bb80f298ca05ba SHA512 0797dff4c92d3f6a18f7d8244d39079e718e381ab04620c6f3b165ef1ae1e0357c9d56216e50290bf0f91d2803720a3e67ae7224c9f6f7097dbed2e33dd47929
+MISC metadata.xml 246 BLAKE2B 0044f92dfce4879b250fe370954c07fdeec406db6de55844505ef2a930bb27894ac74a33ac3fb3754bb862c76ed5e03e7214597ad01a22d81b3c7f8df1907187 SHA512 bf6e12f289f25afa6c54fd54591808a69365a18ab7a59051fbb7be668a5e2fe4f3b8a8e50410a4518f5022fce6c66fd3231774a28adc8e166d7cb9e242c93e38
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index 6cfa358a43d6..cf2a5088ea2c 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">panotools</remote-id>
 	</upstream>
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 425a4d65bf48..4957a1c72e79 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,3 +1,3 @@
 DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a
 EBUILD libpgf-6.12.27.ebuild 690 BLAKE2B 4a96fdc13840fa9277e7befc0be6e5ad6c19fd41d89cbbc4a6bba7b20d1de183dd8eefa6c7323a4bb885fa8aaa01fa34be5467fefc9b66e19eba5509047f65a2 SHA512 172ac9ac033df7d2a6d4397faaa37ae286616784e240ff19a8338d7b94015942edf08700ede3d024ebe6c7ede163e752120e21aff392c198e96ae3d84175cd3f
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-libs/libpgf/metadata.xml b/media-libs/libpgf/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-libs/libpgf/metadata.xml
+++ b/media-libs/libpgf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/libpqstego/Manifest b/media-libs/libpqstego/Manifest
index ce0f38f327da..e6b5e91aa690 100644
--- a/media-libs/libpqstego/Manifest
+++ b/media-libs/libpqstego/Manifest
@@ -1,3 +1,3 @@
 DIST libpqstego-0.0.1.tar.gz 360725 BLAKE2B b1ea4559f424205bcc08310b0e49f24cdaaa2b049b42f9c89ca5a4197cef054aabb6ef5e0c610605b1e4757a217be4dbb1dc1b7e90beb69029c79669fcafaca7 SHA512 bad57743da674be597b6d648821190b6bddb9463e6665751def1a3dead88279ffbc71b0f05b362e61a25f67112f5a49de80ac4691dc3670792097b4830895c44
 EBUILD libpqstego-0.0.1.ebuild 516 BLAKE2B 5a53474652dcab8de65f4cdcc3e795f9b29081c2ce02ed0cb64bacc353d439de29ce502c548f2a07e7f114ce5a6f5357df75cae07857cc731701222cfea8c4a4 SHA512 11ac05dae5444118e805df5972f1280b5e8928191cc6a64fff27f79dd03d88ff6e995426980d9b63e06a07037e4a484aa6718f92b6bff7bfba0f28738626f832
-MISC metadata.xml 346 BLAKE2B 69416f47156576f7e842d6452198ac2715d5c4ee8fc215cdb7104d071331a767f2b053981e6cc63ba754d769e5f71322d357cc783158bb97ac2329268a66c735 SHA512 f49877aff2dc6429963ac5d9bce07797df793bbd89ef82cbb745d13fa2aed484a0758b6209f554fe3f21b3bde84827c6125cdca6fdaa5d6b6b1a4764c5d34d8e
+MISC metadata.xml 249 BLAKE2B 8898fdd295c177d9bb7f8528a9bbafd98b2af32934a1e3779740e449c78dc278264dcdc7984694b7d4be0cb8adbc6e5c500de5b9ba75c079ba78b8416664d8c6 SHA512 8456e089d75a69f5eb955f4de3133c8507ff9fdffefa27c6de41c588857c8f94a10c4dc1e49673c97c2893df52e7d586d180a2efce3e181f9b8e18648f819d11
diff --git a/media-libs/libpqstego/metadata.xml b/media-libs/libpqstego/metadata.xml
index 0dc38e231139..365722ece28f 100644
--- a/media-libs/libpqstego/metadata.xml
+++ b/media-libs/libpqstego/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">pqstego</remote-id>
   </upstream>
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 4898b7cc53fb..4d19961a11bd 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -4,4 +4,4 @@ DIST LibRaw-0.19.5.tar.gz 1303806 BLAKE2B 7ab6e30d88aa4aed2ed6825898f8de02f0d139
 EBUILD libraw-0.19.3.ebuild 1405 BLAKE2B 32da66b4f6550a70acb9229f0118ce592720e90a94a9d0a262a4e26a9c6f8fa29bb86625f4522e10839857d130a815bfd556becbe19ae83cdec80073712d9605 SHA512 98e4f79907e0edbe5d4052da27c24d08b95096c12f1f620a2618d20b066e903700ea1eba448e1aadb465dcc457656c0bb9a91e818c4f6a12a350571b44501d27
 EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
 EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
-MISC metadata.xml 337 BLAKE2B 895688be926ca12497ac0fa00495cdecb0cbc5547e495bc52b394a3ed8fe6e27dce2e891daa46aa5caff8b710e680d1f54e3035a5cd89af504b2d1005950a434 SHA512 982fc145a755a52aba352b0cac94f6d32caf2b74f86d24da90466955330177f94d2e9135e9bda4a17d9e9a554c7dab9ac6e5b3a8a042434989c5dbf7975c9062
+MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index 270c52dee7d9..0ae770dc6b40 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">LibRaw/LibRaw</remote-id>
-	</upstream>
+        <maintainer type="person">
+            <email>zlogene@gentoo.org</email>
+            <name>Mikle Kolyada</name>
+        </maintainer>
+        <upstream>
+            <remote-id type="github">LibRaw/LibRaw</remote-id>
+        </upstream>
 </pkgmetadata>
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index c81759748240..5ced92b7628a 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,5 @@
 DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
+DIST libtgvoip-2.4.4_p20200525.tar.gz 1482357 BLAKE2B 9324165a2818f3d6907fb80403c8df83e196e7566161d781f5608c2bc4fc0f34a4b69883202ac1a9d20d783d363534c11436cedcd24fa93c092eaca97369734e SHA512 5c9fbbccde8fb7dbe8076cda53a3ec80f633493c9b3016627307463dca3426623703cd28ea7ad360bd9ff7c062edecd04787b9f8a32c439cc6622d8680d624c0
 EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
+EBUILD libtgvoip-2.4.4_p20200525.ebuild 1098 BLAKE2B a5d7b79ab969443ec6e61dbcdcb5e5eee3cd97f6d9dd5e42879ab0884573584ee17b11f0e8667ff86c707741c22e27484edb36fb04d51d32ae1c626531c8227b SHA512 c23f91744a01ffccd74eb58fd28d5e048470b19565c903ad00dac2980367ff37251ab8acba3ed5df7aa48c4ecd42b959636e06b5218091a3eb18ba5d0e291e2c
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
new file mode 100644
index 000000000000..89791a76dd27
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="d2e63429ec94ee178a62b55be01f1cca98e9de83"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dsp libressl pulseaudio"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/opus:=
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable dsp)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 50092196a129..fe28c88c6c66 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -3,5 +3,5 @@ DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e1
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 EBUILD libwebp-1.0.2.ebuild 1844 BLAKE2B bdbf6a9a11c75afa156fd79dde7432995d12a208f473dd62cced1aad47094aaec724daff8b470acb7f2a0cc6c203bddedd21e842939d9eba40fc640b4c4d8423 SHA512 52eb96dd6d80ab6b5b02078d78ee90cc413c54b5016fc5a25db274e46d0180c7b245c4a19df456dea967bd8b33dc7056a044441324f0dec6e3266b23dc097502
 EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
-EBUILD libwebp-1.1.0.ebuild 1853 BLAKE2B 24acb92f6787e20e2a3b6b3d2c06a67f01bc00a4e4249fed77bea5f48475b6a265b1e44501e718f7722a623331de53dbd8f042576a9d5cd78e8b61d209584518 SHA512 417aa75900b4c2ec1a598b80e14fc3b78745dfa80b9e7d820827ee307693e9aad74dae3b85aa22361b82ae7b245f0ddedc720f93e8f3a4eaa07d0a294c9a0aca
-MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
+EBUILD libwebp-1.1.0.ebuild 1852 BLAKE2B a79fb48b5a141d098e38652d4da6f6b195e167faeecc78b7c14b1ff7b448fd8891de4fc10381d8a6ed3f39a6821a9aae35c77b92fa33a67b43a20d8c6f9d980d SHA512 2fbccf21e2ca844f1399a5fd0ef51f726291113708612a9639d4dcfd1f078c70cac5885f0f0c2f01cfbfd592fdfe0ef331272595fd34f4fc499841330d6477b5
+MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index 883fbf2d222e..0758ca314ff4 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index a4733f12cce1..ae3f40e64e1e 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>chromium@gentoo.org</email>
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 5c846b8adb08..e0425bdc8f08 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,6 +1,4 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
-DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.4-r1.ebuild 1627 BLAKE2B a763f1383ab4f0e7b631d0023375bf35989ef4da4a82e0973f4e5ce929353e54103553a74c177ffbc227b309499c8a55c3d152d81af778f0cee35d81d7ad1adf SHA512 d256df37dd57149c0b34e693ded331dd571b22a0ecae86f87af24e636f778bc0cc85cb71313d35fb55db8be785bd58b9392be73340762873b1e9d14af4398e4e
-EBUILD lilv-0.24.6.ebuild 1765 BLAKE2B 0d922b4cdfb6f0fbcc63f0cd35b0483715bc1ca2273530b6e95f4bc2f3486514125e02130aa5ebbc3383b0fbd5ae62f5eccc556f8de2ae74e435a8c66c4094ec SHA512 15a179dc612e88d4c7ad3f0a62df947e1986c521a83cb039c9c7f735f18ac4fb56f9b662f29063ac593bc614c654ce0bea0a1c1ba3fb33d666fc1b062bfc9d5e
+EBUILD lilv-0.24.6.ebuild 1764 BLAKE2B 23d5c0f39b6fc96a9e15c411395d48f8ba4a949c507dfb0b7799e60ffae98f2bc22182b95a11e7b629a7b05caaa9cc96a7d7005ddb506bf0bb40ce906ac0237a SHA512 c875e9fd916ce0e67d42e22192bba538b03bcc8abc802926f089cdc8c57bfd5ac4df05ba1d8c51a1c740eaf958f3daa081736efc9de78e1095e329f9ccf96b2c
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
deleted file mode 100644
index 25e49d8494c0..000000000000
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc +dyn-manifest static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/includedir.patch" )
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp utils/lilv.bash_completion ${PN}
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-}
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6.ebuild
index 71194ebb48b8..01a192c0cd71 100644
--- a/media-libs/lilv/lilv-0.24.6.ebuild
+++ b/media-libs/lilv/lilv-0.24.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc +dyn-manifest static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 0dccc2977fa6..6939b9b78c27 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,6 @@
 AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
-DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
-EBUILD lv2-1.14.0-r2.ebuild 1370 BLAKE2B f2755705d9de56e800dfee4d1e734a84b7edbf1e2addb4c33311f5e996354edae2b3a97d962d309a2e95dc26efdf01f110f1adbcc0fcdc313bb24d52f8359642 SHA512 bd725c86c65236f6ca476183bb9e28ed328e3cdda5ea5dcdb2f78e2e334dfc1075a03fab2f8ae9ab6a753bf2aa9282a04a2b730a0329de410aeac5b2ee1bd78c
-EBUILD lv2-1.16.0-r1.ebuild 1374 BLAKE2B 4bc9f94c695197d7ff4e8ff49957b34b94d4cce497b9ef703b54d23665276fe07a3b7c69938c9b2f57c93875738e84186837c8603b4d0fe1d75046e89cf340b8 SHA512 5d6517175cabb5adca92d0fb8b1708aacc3327348567996e506057c852ca2b5ab4c7fdf6477306846594b9921b564281dd48f7e48bb55beddb8b5a435020eee1
+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
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.16.0-r1.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild
index f55b702ccae6..d7b0d73f20b1 100644
--- a/media-libs/lv2/lv2-1.16.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.16.0-r1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE='threads(+)'
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
 
 DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/lv2/lv2-1.14.0-r2.ebuild b/media-libs/lv2/lv2-1.18.0.ebuild
index b7351ced68ec..619c9ed011b3 100644
--- a/media-libs/lv2/lv2-1.14.0-r2.ebuild
+++ b/media-libs/lv2/lv2-1.18.0.ebuild
@@ -3,36 +3,38 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
 
 DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
+BDEPEND="
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )
+"
+CDEPEND="
 	${PYTHON_DEPS}
-	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
-RDEPEND="${DEPEND}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
 	$(python_gen_cond_dep '
 		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
 		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
 	')
-	!<media-libs/slv2-0.4.2
-	!media-libs/lv2core
-	!media-libs/lv2-ui"
-DEPEND="${DEPEND}
-	plugins? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen dev-python/rdflib )"
+"
 DOCS=( "README.md" "NEWS" )
 
 src_prepare() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 904eaf739092..d6337826529d 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,12 +2,16 @@ AUX mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch 1179 B
 DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c SHA512 413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
 DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f SHA512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
 DIST mesa-20.0.7.tar.xz 12308160 BLAKE2B fac8dffd08ada27080ee4c6f1e0dce69218c8f15b97ca59d9a1dc84098b7d376cea6ccdf05957690beb47a7c2ecfd75497bfa150c7c46a0c509ba37abb0e5359 SHA512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685
+DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
 DIST mesa-20.1.0-rc4.tar.xz 12601932 BLAKE2B a7d02e7f8f155ae1591df8c07aad642109cabfc64c0d015605bc0baa10233830b423e5aa57be23e450628f5ffc6f8655ce3962aecea08504574e54d7b2e1aa01 SHA512 31358470a330294fa4842997cd2e6f00c4ee6cac10d6c264aa673a10d82c29051fea2e83629e2a638b659df4cb17f4e2b9d0fff1c6f6259d07d9db4dbfa10824
 DIST mesa-20.1.0.tar.xz 12661712 BLAKE2B cdd5f1d9167ed2c2d1e4f63d5c8ededbaf3d10fc31a6366535a3424b89137fafa34df29f59443ca97eb071cad502e10fa85c32ca33982018d7a50299130d76c7 SHA512 f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be
+DIST mesa-20.1.1.tar.xz 12683180 BLAKE2B de602430ea91076f93b66d1be6da31bd3c74bc194709d36834bac6767c8c2f6047b0930cc070a19293f89a041dc881855ae1f1adedf02284ee4ebc3682487d61 SHA512 a8ae02915305488e5e0d8c104da73df1cdd61ab0b5c5d27a6851c418d25a2c9beeea9cddf93a341afa63cec52d356fe68b194c8c36e78c26f66fa884fc27f147
 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.1.0.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.0.8.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+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-9999.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.1.1.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
+EBUILD mesa-9999.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
 MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild
new file mode 100644
index 000000000000..ff719014070b
--- /dev/null
+++ b/media-libs/mesa/mesa-20.0.8.ebuild
@@ -0,0 +1,559 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	# os_same_file_description requires the kcmp syscall,
+	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
+	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
+	# get a spooky warning message if the syscall fails.
+	if use gallium && use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-20.1.0.ebuild b/media-libs/mesa/mesa-20.1.0.ebuild
index ff719014070b..00b4050b4e80 100644
--- a/media-libs/mesa/mesa-20.1.0.ebuild
+++ b/media-libs/mesa/mesa-20.1.0.ebuild
@@ -504,6 +504,7 @@ multilib_src_configure() {
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
 		$(meson_use vulkan-overlay vulkan-overlay-layer)
 		--buildtype $(usex debug debug plain)
 		-Db_ndebug=$(usex debug false true)
diff --git a/media-libs/mesa/mesa-20.1.1.ebuild b/media-libs/mesa/mesa-20.1.1.ebuild
new file mode 100644
index 000000000000..00b4050b4e80
--- /dev/null
+++ b/media-libs/mesa/mesa-20.1.1.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	# os_same_file_description requires the kcmp syscall,
+	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
+	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
+	# get a spooky warning message if the syscall fails.
+	if use gallium && use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ff719014070b..00b4050b4e80 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -504,6 +504,7 @@ multilib_src_configure() {
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
 		$(meson_use vulkan-overlay vulkan-overlay-layer)
 		--buildtype $(usex debug debug plain)
 		-Db_ndebug=$(usex debug false true)
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index feb915093cb4..402b2aaa2b62 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,3 +1,4 @@
+AUX musicbrainz-5.1.0-no-wildcards.patch 1316 BLAKE2B 39eb1691ec5967432cbcc166fda63f33cbb5d1ca9761ba47839733d2e78a84bc425e7b7fa200f397d6f6be982ce48688048db73ca55f2e0c84537f504b4afdab SHA512 2768c4c054fb3b1df312e7d9d41c0d9c618ce50ada9013739251933a4f84b32d147d6033507395d8d189b2d203f9c4c982d07375913907bd374587fabd8402b6
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
-EBUILD musicbrainz-5.1.0.ebuild 1056 BLAKE2B 9ee4279962bf2fc77e72ee58c55a76a40fb6d315d5e8bd25f8a25179d6e81ff33dcead7ff3966e91f671344aea9d57fda84d8d0ea975f1105fb91609c2165b8d SHA512 120d845f18fa0472b2695d5cf7b2ab665221ae0fd1aae85279f1ccd3b231058ace67aa774d69c80a9009ad77c83b954343b7be4c86702c25a9ac51c07d37ab65
+EBUILD musicbrainz-5.1.0.ebuild 986 BLAKE2B 5a5f0c70a31514905bfe999e0ac1f2c6c3ef5356da4f46cdd4caa18f74153031cb96e1d86cc7fbfdcfc9c14e442f26f919ce6ac013e982a96c7a6b7bb8fb9388 SHA512 0afae34601c907240d37ec42d524ad3af793eb6c496872a1f5b1bf243020873dc00dc00d0e2900daf0b92f1dcc79ecba02755084e02b595a5fbf2f4dffb216b4
 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
diff --git a/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch
new file mode 100644
index 000000000000..d0bf0868d549
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch
@@ -0,0 +1,27 @@
+From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <a.kitouni@gmail.com>
+Date: Fri, 13 Apr 2018 09:56:57 +0100
+Subject: [PATCH 2/2] src/CMakelists.txt: do not use wildcards for dependencies
+
+This is discouraged by cmake's documentation and doesn't work with the ninja generator.
+---
+ src/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 68c04e3..f7439d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND(
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+ 	COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
+ 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 	${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+-	DEPENDS make-c-interface cinterface.xml *.inc
++	DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
++                c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
+ )
+ 
+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
+-- 
+2.26.2
+
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index 3c7debe14517..fb349000f076 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake
 
 DESCRIPTION="Client Library for accessing the latest XML based MusicBrainz web service"
 HOMEPAGE="https://musicbrainz.org/doc/libmusicbrainz"
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="5/1"	# soname of libmusicbrainz5.so
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,20 +26,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/lib${P}"
 
+PATCHES=( "${FILESDIR}/${P}-no-wildcards.patch" )
+
 src_prepare() {
 	use test || cmake_comment_add_subdirectory tests
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug 619668
-	append-cxxflags -std=c++14
-
-	cmake-utils_src_configure
+	cmake_src_prepare
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples; then
 		docinto examples
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index dc867886e81c..c884831a90f6 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -18,4 +18,4 @@ DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa390
 EBUILD netpbm-10.66.00.ebuild 5551 BLAKE2B 286f8f86ba048e3f24bd2c82e929e495481d2887d225f64ffdbae8e52b25d10977b26f3cec9fde5821419f03800d5e7beadb394aa2183565f04cf2da711eb97d SHA512 8e4ab18e164e50ecf5cc79f12bf5c5d4ce09b1ceffe82d278dd91acb664a934cf5f5c1ab6316976370745345ccccdaa22bcafaf40a803c4161bfdb640f2323f4
 EBUILD netpbm-10.70.00.ebuild 5291 BLAKE2B 44d1e0f2a83811ad87ccbedc12787fd9ad45e8379ffe3901c8314515654c1dc5059a2c155e8730785287712f74d6ef5599943dc4add93458cb855b4675050c3f SHA512 1e0fd672914d2b607204a9ac7da290bc3b858395135a062218567879b110ecdbc8f24b63e06e60b1724aaf9bdf846473d9aa23705e8e11fcbf3732ab55eb8f7f
 EBUILD netpbm-10.76.00.ebuild 5181 BLAKE2B b0c32184934b4640f21f727ea579f9dc59c2f7e5562f346c3b61d5d3537cc18d19b2be3ee710b467b53ba342989fec56af6015213e666b52a56bca0c6b268361 SHA512 ba51a645c80128e8589a0c1f3193df358533e7f2da3e642c682e1d3e8d0596fcda6009540149c79bae0005f9fe7e5e229e431870cfd2d9560b8493b868a38957
-MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
+MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index ca3e23b04d54..788f49b6fe29 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
 	</use>
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index fa46843f3e5a..8866833ca160 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,5 +1,7 @@
 DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
 DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
+DIST nv-codec-headers-9.1.23.1.tar.gz 59400 BLAKE2B a4f437b5abc8bac05bafde4f01a4fa42f7acf2fd4a1d8b7e58f6a5a5e54c95a6ef9d6b510829bed9ed63f804220de460adc6441bf3c0bd451774dacc6f11e43e SHA512 0c1112cb1db98f60e64eeee24e3592b65c31ea8a808de707d4d0a56efb71c9a483bb3af45a641bff1f8422ab44e6be4bffd548b6567305021a448bcd66202b29
 EBUILD nv-codec-headers-8.1.24.2.ebuild 791 BLAKE2B 1a30ee929c9619f0497c4912b709b3e860227ef5daf466e9319bb4799aaf6de7b377324f779d674b78b45ae23041d65188a4ede6827a1cf35cd913ad36a2c9fb SHA512 258ad2e47ed9dcfabe870010f15670e318d064e35bbc1ed60347b48b91d0be65c941125794e817df013851263657628ee844e08d1c000390ad244960f5b58675
 EBUILD nv-codec-headers-9.0.18.1.ebuild 791 BLAKE2B 883e69bfc8304eff9f48c6095f2356df69ad16f6cfcfe2f4ef23cc648641a69ea9a3f50740e1f1b8305e00d72e10812d69714603bd96c8f2dc42e0322a5b66b4 SHA512 0a947197e469c989d2fe76adc2f303c96ce6e9d441521daa7ca87c4aaf99d7890d19b59c3727d83be54bef1b2279097033d5441ba274b9212958289086e453e6
+EBUILD nv-codec-headers-9.1.23.1.ebuild 759 BLAKE2B d09b9c5863b543e4f8f58891013cab461c5750ea9bff3caab8d4d5f2064d12e4b0180479ce0616537f9c3238c3f81adb2743e0b71c7ecea94adeb9458265764e SHA512 56b6dbe1c3248fd8045c2c5d9375a7f497ed96f0f5498baf2a35bc1587ed6af737586f6da7c2ca36755b252991c933b8c2a0aa62c6e1c202008b1614860208b3
 MISC metadata.xml 319 BLAKE2B 227369d173003d904c042ec479371e9a483e6d7d58af0f8f1a03317e773bbbd0a06250e06583cf2cbbbe9020a1d7cd416b51467dc96649ead55f51785c79a019 SHA512 c1815f8f72b994c4f4fbd3edf1a856c89848e092b3b6515e706ef26b6b09d0096582219b7670b2b822ccecdfeefcbbbe768141acc3f4e55ca8879045a8ed51cd
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
new file mode 100644
index 000000000000..53d4bd8e6f39
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=x11-drivers/nvidia-drivers-435.21[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	multilib_copy_sources
+	default
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index e29915d8d1b2..9c52bf672c51 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -4,5 +4,5 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r4.ebuild 2310 BLAKE2B 788799b39e953132ca0b41bab5e75f9fd0064525115f60b6f5c2dccede772682eeccd5a52f7c8149153fe194bd07fa871fe679ccd3f5c1c408bde18f05bccaba SHA512 62ff61d22e5bd13019568bfa9b17ac1533ca3791da58bf8cdda0af65e26481f8027ad3695ef61dbb654c1e556d10e6944ecd4612530517a78880b1df302c5346
-MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
+EBUILD opencolorio-1.1.0-r4.ebuild 2327 BLAKE2B b3064acecd3582ee6aa687e0bb4a56a68e598002194d96227705e0b9b3bc77d907600478181876684d33efbf9e1339a3ddfc43c1102cdbbae377c44a8eaf516d SHA512 9ce4183f83ae5a3d9d1a33d811ad89a4f5d92613e8b83b337fb83e943125ef976fb483cf13057598a7c5a91f0c18ce229da7f8869f238501ae1989979373589d
+MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index ea85c9e1ea2c..af0822c7321d 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
 	<upstream>
 		<remote-id type="github">imageworks/OpenColorIO</remote-id>
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
index e1ff1e915821..1bb1af8e32cb 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
@@ -88,7 +88,7 @@ src_configure() {
 		-DOCIO_BUILD_PYGLUE=$(usex python)
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
 		-DOCIO_BUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
 	)
+	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
 	cmake_src_configure
 }
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 3d51222b7bb1..2876eb1efd49 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -3,6 +3,8 @@ AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389cc
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
 DIST openh264-2.1.0.tar.gz 60239088 BLAKE2B 4941399476fb6184fc09b09d9bd496d9f3fa77a424199f6cb0d61d654d6cf88b49eecc32d748b656cec663c31844165b81b7962de163441f04e5a606a48879d5 SHA512 7a65f494e6a1b5a9d96115dcd15853ebb804f0ba259b20ddab01770afde31f370536d9e365b18a6f4168eae7f57351d9fc2d3d3a0c51bb21db7b4d5c48240848
+DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
 EBUILD openh264-1.7.0-r1.ebuild 2949 BLAKE2B 2085049cb86b5ac355e552acf9b0aedb363f6d9fd6ed806ce1bdf70e9da633b8a9657eef131af8dbc647e9e66e410190fe7c05ae99ff4311423b81ec4ceda08f SHA512 d5ed45707baa5a689b9060e0a1c784721b3f8be5632565bc0581acc9dec982666b54bed97aa7e04f0ecd429784e45aabf20c2fed88f7bf5d8e648308668c1140
 EBUILD openh264-2.1.0.ebuild 3016 BLAKE2B 9f66932a8bc4adb8999889fbab3ba7dd45e6115c8e90a244ae476099bdaf24001c8bfba25e95c4c6ad789de40b45ba2853884fd3a0134a9cc2ad8823069e418e SHA512 f5a3b0afc0c30d53d5770a6a0423176f77fd6c23d16b91458cbc654b907324fa294674ecd89f3e3a2c78f818c8325cbc7be846bdb813fc31ad469d479798bebd
+EBUILD openh264-2.1.1.ebuild 3016 BLAKE2B c8bf727c8abbaa423d170755e9af055afcee35f84c8b544b5cf279d373288453941ccf6633c5e674365903be1445869dc27f3bd794ceab34cd286a3e71bba080 SHA512 68dec8fc95fb150be83d05afa0661aa3365d703442e7c785f500a3225b354bde698ab1a79d1e94f71985eb0afe7cab4e79a3b7472eb5abf5b2e40a910e2a894c
 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild
new file mode 100644
index 000000000000..49c486ea6f52
--- /dev/null
+++ b/media-libs/openh264/openh264-2.1.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+MOZVER=39
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="https://www.openh264.org/"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
+LICENSE="BSD"
+SLOT="0/6" # subslot = openh264 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_avx2 +plugin utils"
+
+RESTRICT="bindist test"
+
+BDEPEND="
+	abi_x86_32? ( dev-lang/nasm )
+	abi_x86_64? ( dev-lang/nasm )"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR_NAME="$(get_libdir)" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
+		$@
+}
+
+multilib_src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+
+	emakecmd ${mybits}
+	use plugin && emakecmd ${mybits} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	if use utils; then
+		newbin h264enc openh264enc
+		newbin h264dec openh264dec
+	fi
+
+	if use plugin; then
+		local plugpath="${EROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
+		insinto "${plugpath}"
+		doins libgmpopenh264.so* gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		doins "${T}"/${P}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		doins "${T}"/${P}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+
+	if use utils; then
+		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
+		elog "to avoid file collisions with media-video/h264enc"
+		elog ""
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 0b187675353d..bc6cc034bbcc 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,4 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
 EBUILD openimageio-1.8.17-r2.ebuild 3303 BLAKE2B 36740a48bf14c437d92bdf5882e63353c60745fd3f3677c5398569af267749644ca2423ee42b5f4e4b0e17dc63774e68372e0f47b0b992fd777128b8d91787cd SHA512 911a1f992f1f298e4d496834b1c20f8db8779a02681d572b992a27f7d32b4a8860fc304e2f7e6d893479402fdd799b9c81465d6f3984b541d8a219f386944c99
-MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd
+MISC metadata.xml 748 BLAKE2B e89aa731461192e01b368333a0832a106ced96d7a6d6dc1aa749e6c8658e28f654e9f4901946fa547d5ffca5c10364277814850d9b9936f5831d86bfa418cca7 SHA512 3ff7883072966c763052d32c6fff17732ccc551e9cddfa4548c1613a08bdc93644f16c1e8e8f88a3ecbe7a10b21a0a920517094ff13e40003adc97ecc0936bec
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 5a6930d59d5d..4593e8d4cbff 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1fa0aeaa8a5b..e03166cd5998 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -7,4 +7,4 @@ DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f67
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1924 BLAKE2B 9e1db8cd8f7a2e395b30c2b095e44e6fd18403b5c51cde0624db1c85e91848fecfb584e93bd815c5b9b1095e8769be8ab77545eca0f2d2ebb2b0291b310332a8 SHA512 18768a2552149908e927342dd9f5a80b423f6d5b9303c299e99bb6a4f5d50e892f7698f7b0d0c4a357d9ee89daf79d4d40a265b01fba3bf23b4f139a78e6875a
 EBUILD openjpeg-2.3.1-r1.ebuild 4307 BLAKE2B 52b1776e6dbc6d8053144e56a6ecfb3a22213eb1facf58c6ca5437eba4f814dcd8c7dfd774630442dc52cca62b303bb86f92618aa9615a9f801a2b7681af5ecf SHA512 82499a78d1c79443d0edef4c34cbb39bd095ddb2554afa3d173a07a791c7eaaa633157a8338885864b326c24c6a89a6c34da0fc0d1216e1370a4fbd5a9a1da9c
-MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
+MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 3db697d1b99a..bb813794a941 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">openjpeg</remote-id>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 6aee1b264dd6..149168b615ba 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,6 +1,12 @@
 AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
 AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
+AUX opensubdiv-3.3.3-install-tutorials-into-bin.patch 5952 BLAKE2B 02b44fb3ceb5b3cbffda13c91c518a6ab1c5e549085ca19680c068343ccb38f4ceeff8d98ef106c5b3b9c3db59e540ac31cf6e77023e3eadb8a319cf52a01ca9 SHA512 2c45710c2d0349f931d1a1a2d984bc1a83d99cee58a362d5a843b5540fb33cd33a21befd29fd541e8457a568a1939296095e0ee1494acea43b5e125a3c55cb91
+AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
+AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
-EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B c61ed763e2567b091e040097605cc646d80c48ce70842e816bccd3acfd03c9c36fbe6577229067e8a06720ce474c1ce650ce64c3b40d49a034c54c17cc231e82 SHA512 ab2e4725f77f7ef0cc804382af8616d06009c16d252c8fb9a880a8b8a8dfa87912436cc861652f31582ca374e7043dc28960cb6c6bb80fd098a382f7adf02cb2
-MISC metadata.xml 1033 BLAKE2B 20a5a095aebccc15e85b0aadb56e9b561c667cc68c4424edc2c2c5ba31e742f3d4214bbe296bbed34be92c68efb3501b2135f9c21c5efbc451b8e03c45d159e9 SHA512 a28e16a69b38365b9d9524d0d468e9228a398cfdb85ba2fc1afb950063f3d25aaed1d48c798532fb71d2fc2ee0d83ceb80feb824af4bcab10746e945fce7dbcf
+DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
+EBUILD opensubdiv-3.3.3-r1.ebuild 2353 BLAKE2B 4eccc2e751cbce369404a84cf63e4df2d34af2a4294d881318517b9720ec1907c9066596f8eab720753ad3113de2589ae20eedcaf1fe29439f3d6ce3f7e5f339 SHA512 c56ea6354772d7837b7649d43e2e221b76a0abbca1d5d2ef7aa0e422596d9e85d0faf9d61b1b75b5fd5bb42518793c0595bc2bd27f1fab3e618ac2ebc3a5f0b9
+EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B bdd3778c1189c2237ca5b2fbc4b68645c055654a877b125545fa2c528431ef0fcc73bff69118e3997289f7d5698043358c4aedea42fd6236bd4f2cef0629cade SHA512 643d0fc5dde3b521b3a4e794f836df3bf7f0a097626719858b86caa19ee05443961b16823ef3f72dc9e263326966fe07cec2532e4f0908c7ab4634a65e60a82f
+EBUILD opensubdiv-3.4.3.ebuild 2353 BLAKE2B 4eccc2e751cbce369404a84cf63e4df2d34af2a4294d881318517b9720ec1907c9066596f8eab720753ad3113de2589ae20eedcaf1fe29439f3d6ce3f7e5f339 SHA512 c56ea6354772d7837b7649d43e2e221b76a0abbca1d5d2ef7aa0e422596d9e85d0faf9d61b1b75b5fd5bb42518793c0595bc2bd27f1fab3e618ac2ebc3a5f0b9
+MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
new file mode 100644
index 000000000000..ec63f47b4404
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
@@ -0,0 +1,130 @@
+diff -Naur a/tutorials/far/tutorial_0/CMakeLists.txt b/tutorials/far/tutorial_0/CMakeLists.txt
+--- a/tutorials/far/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_0/CMakeLists.txt	2020-05-13 16:06:40.857855388 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_1/CMakeLists.txt b/tutorials/far/tutorial_1/CMakeLists.txt
+--- a/tutorials/far/tutorial_1/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_1/CMakeLists.txt	2020-05-13 16:06:53.137874901 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_2/CMakeLists.txt b/tutorials/far/tutorial_2/CMakeLists.txt
+--- a/tutorials/far/tutorial_2/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_2/CMakeLists.txt	2020-05-13 16:07:04.297892363 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_3/CMakeLists.txt b/tutorials/far/tutorial_3/CMakeLists.txt
+--- a/tutorials/far/tutorial_3/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_3/CMakeLists.txt	2020-05-13 16:07:20.377917078 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_4/CMakeLists.txt b/tutorials/far/tutorial_4/CMakeLists.txt
+--- a/tutorials/far/tutorial_4/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_4/CMakeLists.txt	2020-05-13 16:07:36.727941691 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_5/CMakeLists.txt b/tutorials/far/tutorial_5/CMakeLists.txt
+--- a/tutorials/far/tutorial_5/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_5/CMakeLists.txt	2020-05-13 16:07:44.797953646 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_6/CMakeLists.txt b/tutorials/far/tutorial_6/CMakeLists.txt
+--- a/tutorials/far/tutorial_6/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_6/CMakeLists.txt	2020-05-13 16:07:53.847966914 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_7/CMakeLists.txt b/tutorials/far/tutorial_7/CMakeLists.txt
+--- a/tutorials/far/tutorial_7/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_7/CMakeLists.txt	2020-05-13 16:08:02.047978804 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_8/CMakeLists.txt b/tutorials/far/tutorial_8/CMakeLists.txt
+--- a/tutorials/far/tutorial_8/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/far/tutorial_8/CMakeLists.txt	2020-05-13 16:08:16.287999162 +1000
+@@ -33,5 +33,5 @@
+     $<TARGET_OBJECTS:far_obj>
+ )
+ 
+-install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-13 16:08:37.278028518 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-13 16:08:45.028039168 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-13 16:08:54.138051562 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt
+--- a/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
++++ b/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-13 16:09:10.748073802 +1000
+@@ -35,5 +35,5 @@
+     osd_static_cpu
+ )
+ 
+-install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
new file mode 100644
index 000000000000..5455ba98e317
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
@@ -0,0 +1,51 @@
+From dc9d14c97fc22ad5b00c9ffb0f83931e42cf2eb0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 2 Aug 2019 19:27:17 +0200
+Subject: [PATCH] documentation/CMakeLists.txt: force python2
+
+The patch forces to use Python-2.x to build the documentation
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ documentation/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
+index 32b12a3..a93414e 100644
+--- a/documentation/CMakeLists.txt
++++ b/documentation/CMakeLists.txt
+@@ -54,10 +54,10 @@ else()
+ 
+ endif()
+ 
+-find_package(PythonInterp 2.6)
++find_package(Python2 COMPONENTS Interpreter)
+ 
+ # ReST - HTML documentation
+-if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
++if (DOCUTILS_FOUND AND Python2_Interpreter_FOUND)
+ 
+     set(HTML_FILES
+          search.html
+@@ -198,7 +198,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
+             OUTPUT
+                 "${rstfile}"
+             COMMAND
+-                "${PYTHON_EXECUTABLE}"
++                "${Python2_EXECUTABLE}"
+             ARGS
+                 "${CMAKE_CURRENT_SOURCE_DIR}/processTutorials.py"
+                 "${infile}"
+@@ -291,7 +291,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
+     # build search index and insert navigation tab
+     add_custom_target(search_index
+         COMMAND
+-            "${PYTHON_EXECUTABLE}"
++            "${Python2_EXECUTABLE}"
+             "${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py"
+             "${CMAKE_CURRENT_BINARY_DIR}"
+             "${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt"
+-- 
+2.22.0
+
+
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
new file mode 100644
index 000000000000..f042967a01af
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
@@ -0,0 +1,52 @@
+diff -Naur a/tutorials/far/CMakeLists.txt b/tutorials/far/CMakeLists.txt
+--- a/tutorials/far/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
++++ b/tutorials/far/CMakeLists.txt	2020-05-11 14:49:39.445969003 +1000
+@@ -30,7 +30,7 @@
+         $<TARGET_OBJECTS:far_obj>
+      )
+ 
+-     install(TARGETS ${NAME} DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++     install(TARGETS ${NAME} DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+ endmacro()
+ 
+diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
++++ b/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-11 14:50:38.076125987 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
++++ b/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-11 14:50:10.406051839 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/CMakeLists.txt
+--- a/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
++++ b/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-11 14:50:20.706079428 +1000
+@@ -30,5 +30,5 @@
+     ${SOURCE_FILES}
+ )
+ 
+-install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt
+--- a/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
++++ b/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-11 14:50:51.446161856 +1000
+@@ -35,5 +35,5 @@
+     osd_static_cpu
+ )
+ 
+-install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index 62cc4a9a2116..b043cddb4485 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,25 +9,25 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		An Open-Source subdivision surface library.
-	</longdescription>
 	<use>
-		<flag name="ptex">
-			Adds support for faster per-face texture mapping through
-			<pkg>media-libs/ptex</pkg>.
-		</flag>
 		<flag name="cuda">
 			Enable NVIDIA CUDA Toolkit support through
-			<pkg>dev-util/nvidia-cuda-toolkit</pkg>.
+			<pkg>dev-util/nvidia-cuda-toolkit</pkg>
+		</flag>
+		<flag name="opencl">
+			Enable OpenCL support through
+			<pkg>virtual/opencl</pkg>
+		</flag>
+		<flag name="ptex">
+			Adds support for faster per-face texture mapping through
+			<pkg>media-libs/ptex</pkg>
 		</flag>
 		<flag name="tbb">
 			Enable multithreading with the Intel Threads Building Blocks through
-			<pkg>dev-cpp/tbb</pkg>.
+			<pkg>dev-cpp/tbb</pkg>
 		</flag>
-		<flag name="opencl">
-			Enable OpenCL support through
-			<pkg>virtual/opencl</pkg>.
+		<flag name="tutorials">
+			Install the tutorials
 		</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..92f1b42c70ad
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-utils-r1 toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/glew:=
+	media-libs/glfw:=
+	x11-libs/libXinerama
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )
+"
+DEPEND="
+	${RDEPEND}
+	tbb? ( dev-cpp/tbb )
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)
+	cuda? ( <sys-devel/gcc-9[cxx] )
+"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+	"${FILESDIR}/${PN}-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch"
+	"${FILESDIR}/${P}-install-tutorials-into-bin.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	if use cuda; then
+		[[ $(gcc-major-version) -gt 8 ]] && \
+		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
+		die "Need gcc version earlier than 9"
+	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# GLTESTS are disabled as portage is unable to open a display during test phase
+	local mycmakeargs=(
+		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DNO_CLEW=ON
+		-DNO_CUDA=$(usex !cuda)
+		-DNO_DOC=$(usex !doc)
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_GLTESTS=ON
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_TESTS=$(usex !test)
+		-DNO_TUTORIALS=$(usex !tutorials)
+	)
+
+	# fails with building cuda kernels when using multiple jobs
+	export MAKEOPTS="-j1"
+	cmake_src_configure
+}
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
index eedadea99852..cbbf0be097d8 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.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=6
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
new file mode 100644
index 000000000000..92f1b42c70ad
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-utils-r1 toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/glew:=
+	media-libs/glfw:=
+	x11-libs/libXinerama
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )
+"
+DEPEND="
+	${RDEPEND}
+	tbb? ( dev-cpp/tbb )
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)
+	cuda? ( <sys-devel/gcc-9[cxx] )
+"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+	"${FILESDIR}/${PN}-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch"
+	"${FILESDIR}/${P}-install-tutorials-into-bin.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	if use cuda; then
+		[[ $(gcc-major-version) -gt 8 ]] && \
+		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
+		die "Need gcc version earlier than 9"
+	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# GLTESTS are disabled as portage is unable to open a display during test phase
+	local mycmakeargs=(
+		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DNO_CLEW=ON
+		-DNO_CUDA=$(usex !cuda)
+		-DNO_DOC=$(usex !doc)
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_GLTESTS=ON
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_TESTS=$(usex !test)
+		-DNO_TUTORIALS=$(usex !tutorials)
+	)
+
+	# fails with building cuda kernels when using multiple jobs
+	export MAKEOPTS="-j1"
+	cmake_src_configure
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 90b1c4dd5831..f08f74a1678d 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,5 +1,7 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
 AUX osl-1.10.5-upstream-patch-to-find-openexr-version.patch 3609 BLAKE2B 25951dd971f344d8c2233bb58d05f87ce77a12db182c19d16c346e41644c6cc64b4e20b631ab0e03b4a00a42de624693a61b04930beecea0fe0ed3dff1760fa6 SHA512 0c27bf26afbe5806565d3ad7617f35e66814695435e9c176e73faa09b5508830803709a040aea2901293a3fd2a2110b4daf622099a5c01e92fd2ee9d09b15cae
+DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
 DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
+EBUILD osl-1.10.10.ebuild 1904 BLAKE2B cdb76807d98edf4ea0233550aec7d28fd5689555a47c476f57cf8dbc92c1e9b4d747796c93ca0fc68adac92da0b91838aa817d1efcb409f0a5f448e229a53416 SHA512 9d59d15ffa88732628fad2d739a354c4a952c5f1aedfd51e559517e8edca0277e7376c54f7d8004fd01a216d373a2885701f893f2f955577601d62074b517e2a
 EBUILD osl-1.10.5.ebuild 2028 BLAKE2B 982a0542132c80ea6c30fe553215138a8d295174c9c22463a441d0c8504acc281fe1cba5bbf9ca361fc51cbbf314327f8464cdc15e3fac2fcdcca36628db8cee SHA512 ff72354c579fe82a12c524b9c3efa3af17b6fbc2ddf0967248da10bf050bb44582675f633d28dac03765332d1966bd1693729204b09fa79e7ff59910ed2df064
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.10.ebuild
new file mode 100644
index 000000000000..e37aeee77342
--- /dev/null
+++ b/media-libs/osl/osl-1.10.10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=9
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-10:=
+	sys-libs/zlib:=
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+	# LLVM needs CPP11. Do not disable.
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLERTTI=OFF
+		-DINSTALL_DOCS=$(usex doc)
+		-DLLVM_STATIC=ON
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/pnglite/Manifest b/media-libs/pnglite/Manifest
index fc78e23c61de..a43dfff46308 100644
--- a/media-libs/pnglite/Manifest
+++ b/media-libs/pnglite/Manifest
@@ -1,4 +1,4 @@
 AUX pnglite-0.1.17-include-stdio.patch 406 BLAKE2B 20f8f543906bf6c913b22de65c4ae1a1041fee3d674bf1f033b367021bbfbdb2fd5e10b9a9d62b5916791a77a6ad7523acef39d14690a9535af5bd5d6985c5e0 SHA512 96482d08c90ab90985c8694a99bf9ab1967a872fe32b441b3ac930a6af346f173859988132a339ed3e9b4935fbaaabc910276425955d8db20fa4f39b726a345a
 DIST pnglite-0.1.17.zip 6516 BLAKE2B 2c44855a5672bcbf633d600820f87f9f9ad42643bd0906fe62ed7c6da8b282d5c8adca684c828cc6064b1c6c02f3e7aca7a07df6c2317c674ed70ae577dacb1b SHA512 f728273a702287d1c299e2939a2e2da5a6c1fbc55372fe1869d7f93cfe59c016c9dcf02be0242c5fa77cda66b0016bbafe1b78f7a876ba2866c37f504d262ce8
 EBUILD pnglite-0.1.17.ebuild 1070 BLAKE2B 15a122f1a4bd2bcc4613b77437f7f4fe6a0bfa57026b44472034c48776336b07febb254474b102de57bea48d0006ba1b6d01aac5fc40c117c35fb4ffa141beb4 SHA512 65639bff8b3e231424483d90ea7516bf4ff82e56757b615b03640a55876ee87875467dbfa9092aed8bf812c4b73a563f3e6aaf91541d64028fd58830f7a227c6
-MISC metadata.xml 336 BLAKE2B bd60d0e8bcb1123e634637cb8ffe9d3b4822bd0d5a6326564c23a756a1079b31bb66ec206b02ce7ae2b2c39d7d87bc076dcf317f38e86363894d6c17acd7fa9e SHA512 858f257d97b86743cc7c30ab6c47eda5f00b0db780bbdf42bbbd635cada95b9582ff1b61512958c4c18b0a0e39cafc6347c8bca5fbcaf901088c315c24382040
+MISC metadata.xml 244 BLAKE2B 4f1127041c6043b79ad2bbee408e730ce6d03bab4cb6054663888947c262e60aa4105da8feb36cf8b7b8bd5032719f569306388d839b1891668286facbb92930 SHA512 00be6ce5aad771b58b8787411186c9c47dc2aadf68baa77940824a8a7218306c1b771591d2fb49854bb9a1d76263beb5a584f32d0939f07154e6195198042e50
diff --git a/media-libs/pnglite/metadata.xml b/media-libs/pnglite/metadata.xml
index 5edc7ee42a34..584b0b0e8b9d 100644
--- a/media-libs/pnglite/metadata.xml
+++ b/media-libs/pnglite/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">pnglite</remote-id>
 	</upstream>
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 93fce09c4e60..765d5557dd47 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
 EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5
-EBUILD sdl2-image-2.0.5.ebuild 1560 BLAKE2B d43904e1b6c84ce9d657219d643bf6f673495d4227ba2b73cc8c23a37cd91e53556c3e880876271e50c3a2caf35650a95e1a2f106d0ab486c0c62ebfe8f5d908 SHA512 80d3c98115aff75304100d7551facdb148300ed35609a4a6665aacd71c2fc8da9b4689bfc30e6a1115275274ff6bcb4241613bad63ddfa56599e8dd7ddb6459f
+EBUILD sdl2-image-2.0.5.ebuild 1591 BLAKE2B 1a0c53b014e44430f08b56c67133ab08c8459720ae823784acc1cac67d8ccbe468d1de6c9494ff6c7188be6753840b258a53efb574f56bdccc8d47f872ced8bc SHA512 95bc748ab1210b6fbcc0be5d82c979008c8bcea63b36e15c13b2c65cabc63d2b0ace3ce424f460b89ed5c660d7114d15e89ca7d4932cab7318c6d2c4b8cd1d64
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
index d5584bcaf463..d26e73ed0f26 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index e556691f6c05..a4c70fa53ee8 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -2,5 +2,5 @@ AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3252 BLAKE2B 1f894bcdb4436283dfc19a83ad70e057c7537f5240682973e24b564a1fed2b129a9a26a46c584a60de2cf1dbca0c2df0d36a0013d62dba171939ccf1d91306a1 SHA512 55a79b5c7eaca6b86017df5df83a4c9300800ee5553167fb250dac171658ec781bff5c621347e92507037139bb15e70f8ef90791ec2ef77435f34b0e1c550881
-EBUILD sdl2-mixer-2.0.4.ebuild 3230 BLAKE2B 7edbe036b4503a32ba6b6a339239bddf9f534fc03a3e032c10c750009723c3e7c8b8a65aef4ee4ab56041bac4500068812409350c7ae25860de8f0d3e1aa8699 SHA512 113de1e4e96fa73b0346c017bd13e97b4a813c7f972a5f44a9185d7b25a2c956a7f0188894d8846066402a1544ddf87c66523febbafab02fa24b4dc760421416
+EBUILD sdl2-mixer-2.0.4.ebuild 3275 BLAKE2B 8eb2c1314ef46b373d9e33a44de19319811373cdec226ae8ebc60d5ab6cef1567943d523f6b42b0ab7d53b762d8eb393e7c759ae5590b65c02072de6319c972b SHA512 45cd49a719b3eb8153fa440604c260c058679c30be3a9362305df51c81a778e3764531d2261413bd704cc1ff89d71d4bd62c6aaae25af5616e958872ea1155b0
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
index c79497e2bd1f..0a34c39521bd 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index c813255833a2..7ccb0554c52c 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -2,5 +2,5 @@ AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066
 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
 EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
-EBUILD sdl2-ttf-2.0.15.ebuild 962 BLAKE2B b7e59f19984aab7f957c55d4e414eace4efbdb53e86387d795950112f28d3e575039b5b23ab42b86d18831c4a2458662d03a3ac74648c5cc1e78362a39d9380d SHA512 be2832eb482046d939b1537bf0e562dd793ca16abe3164ae606dfe88e69f2f4cc4dfe5c13603b166295ba1b96def38411c90a095087d9fea361e2377684e3831
+EBUILD sdl2-ttf-2.0.15.ebuild 1012 BLAKE2B 13bba791f83c0b148a249b31e3f70455402662cdec18847b05df32f1e056f163b528786833aad2c001f3fcaee35b9abf41ca4cfafb5f2e9cc0dc734772833fe8 SHA512 b0329df5fc7504ed50241c8ff5fc671f07e04bc93bad0d03aa15c02cf09bf50a09dee4069afab1ce4b1eabaa916d9b81edc12122a256aced291548b0f92799e1
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
index 3a6aae37a7df..b3bd9640bd32 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 0754384b3c8f..d802f850be25 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r3.ebuild 1298 BLAKE2B dc145995f7d22120ff96f73cb5b5d48ebfe4a1fff16cade212c115b7c33565468fa05b454181c0b7e31ea89f3f23e1683630a6fa00e32758166f91ca6b375de3 SHA512 9f21d9ccc36e0ad86f22430ac1e6b3969dc1d7cb9a0bd109e6206b47fe26b6af0959f7f9f5a327fcb02eb224f54da492acc444baeb06c576065c39e438551fbe
+EBUILD smpeg2-2.0.0-r3.ebuild 1343 BLAKE2B 25237c8db3474d28428c561d55bbde026c2fa74814bfed78e357c3ca0e003918db99d3feb519d75afb15b18335ef7a157f383577fe52caa2d2cf490a5deb34df SHA512 0bf19cfd818e2095f49f0ac75888e69c1b17b5de79453b029906e2ea17f9a99cdac1144de7958d3407071dfe817e844b5c16b097c5e3e9f45431a387b8f7cbc3
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
index fecdebc507c8..bdb4befc0e10 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 89257b510af8..912031559624 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,3 @@
-DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
 DIST sratom-0.6.4.tar.bz2 339707 BLAKE2B acf29c7dd3c4e23bf20ef2811706abdd3543d0fc380183f7f419932c3178ff5e2f6d95c57bad2ef991dbc1e32c6e8a3645238c7b42dfd204942dbc4c05270652 SHA512 6462d8d33ed7ddaa2aea267fab14c9a15bfc077a4f8d26eb493be4c48c95d8dcec614f540bd82fe22aecca641771326a44d175c3991cd473ae371062c78aaac3
-EBUILD sratom-0.6.0-r1.ebuild 1231 BLAKE2B 74ef3e27d08e8a8f663a29a828907607da7f4fc375b8b256dec8f519c7b56790763a579e42d5d965e9e607fb887b95c641f816a4d913af729d9b6b650746e10c SHA512 d3c6e4cb1d2a79d638e718d272515c84e4849c80f3adece08eaf3569dd77ca802405190f6c699b9a140626e0cb156b8f9f9bc2f0e56b2eddfd4323bf0f84a730
-EBUILD sratom-0.6.4.ebuild 1232 BLAKE2B db54bc7fa030822f8074195ab31a5ecf9487843bf20139e2a29700bbe707554a0dbb0ec2dafb5332f5684c6f783cfd6f9794fb6f8f8c6ceafa8b132db0ea3a44 SHA512 20ad9475d0e6a0c6f94990cfc8c225145ddb158fcea0f7d9a1cd6f99da84e3641918f5192c9baef689bdd175d01370220e8fa2dacf951e1afed1fe3860c1ae8b
+EBUILD sratom-0.6.4.ebuild 1231 BLAKE2B bd32ee6b079cb385154c285dce883618054d2d35af660b3e431944b0a2c5031cffc4b1ae66412fcf4510c5e46f898337f183389636bc053634d3d9cefa879fa1 SHA512 682605394f9634aa976ec8e6b582255b91cda4f28519336128d0b8aad7fc492b30bd40889b3e534218723335001466fd4c28eb9e21a5d765f1dae534a5ff8e80
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
deleted file mode 100644
index 44cd492d3090..000000000000
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
-HOMEPAGE="http://drobilla.net/software/sratom/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1
-	>=dev-libs/serd-0.28.0-r1
-	>=dev-libs/sord-0.16.0-r1"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/media-libs/sratom/sratom-0.6.4.ebuild b/media-libs/sratom/sratom-0.6.4.ebuild
index a2a9e7dbe04b..ef2f5673e199 100644
--- a/media-libs/sratom/sratom-0.6.4.ebuild
+++ b/media-libs/sratom/sratom-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/stimg/Manifest b/media-libs/stimg/Manifest
index d65f264db71a..2cb2d8997425 100644
--- a/media-libs/stimg/Manifest
+++ b/media-libs/stimg/Manifest
@@ -1,4 +1,4 @@
 AUX stimg-0.1.0-libpng15.patch 1605 BLAKE2B ae89ad0ec25eb68dd8293aeba40bfa741bb4db06b98cba895cb286580fe382402f1d97cf8a6c59bb53016c5910d349a2eddca178ca6e178779f4c431cc297954 SHA512 16e6e34c059cc419808b42f0ff8d5414b92e8aafbba47ed42f51bb76eb6e0490247726cbb9a3171c285d1dd710090e96e631f3733f9b8be785b2d743b143cca4
 DIST stimg-0.1.0.tar.gz 187172 BLAKE2B 5e0a4d9874243bb1e1d3a092cc16cade427399de73cfb91fbf72e5bbd231d1e1ebaaccf4e0275dd5ec5a596ba35e7e6a124cd362c19759f88c2ea6c8363533ed SHA512 6a2b938e3fdac9bd079664a276e7091adc62fe60a386e5f575afe455e355e3639799171c0729131ee8d99c6b86776d64fecb3a85f15eb4ec5a4559e4cc1326a9
 EBUILD stimg-0.1.0.ebuild 666 BLAKE2B 37ec7e8965ed45f3da0eb379f9d2a73890b6b9e7a556ed0db97c0066eb0de31fa4e5733486aef926bd23cc6a97648bd8ed026eb343f9384a23cd87982921d1e0 SHA512 74734a0f5e5d650b8a117c9494195f05501a8620734d9a1ad671593f81a89af1fc4283b6d7ec329914d30c2147d54eea239711825802005d1d1daabe53e9d93e
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-libs/stimg/metadata.xml b/media-libs/stimg/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-libs/stimg/metadata.xml
+++ b/media-libs/stimg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 0994bb385982..e799f3549d7f 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,3 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
 EBUILD tiff-4.1.0.ebuild 2090 BLAKE2B 8d644e032744c6958f22c1bc5e54889d16adc9c836866ac570cc262aa600871fef24d94f0dacb28dbc0333ab6b00d68f61ceb29e3891db291f1bceb50b74b1b7 SHA512 c872ff1ab47fada244d3dba7dc1638ba5b199c840cddf526d9bd0e7ecf1f26d24a6ecb2ff9cd0dce51774dff965d9d2840c64f62989f13c59a414a7de291c893
-MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
+MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 815534de05d9..414505a38dd4 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		TIFF image library and tools, mostly for scanner and fax
 		support, but also used by GIS and other imaging tools.
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 5cac764f69aa..5186b857f4b0 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,5 +1,4 @@
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r1.ebuild 1022 BLAKE2B f153f867cd4326b392c62638ec680fa37034ead9424fb15aa16288d1f93a663542542c57162d28cfe54aa0ac412184848fc080fa968c85e45bb90248e2fda0a9 SHA512 bf9f397972e968f9ee384e64d0dc0d2e5a0b231c3e151c8a79fd316209c723ed041b334cea6ca31584de15d002a34eaaf4db1848c4b0d5c55383e793171a62ba
-EBUILD tremor-0_pre20130223-r2.ebuild 1107 BLAKE2B 875d0c2a1294aa8c735f75241d852ddd4fddcc5d01fedc45816b570a45a786b6f3b52f4489f22266668fc5f719e82e4251c773d1b5740268b798128550729fe0 SHA512 b4d256c39ee1eb32f3483a3d3438be2dfbc53fd0dc05aa8b4b84d0295ca924de7645a9ecf963948840143ed91e022fcdff82a6cd4deb37eb7598051fd8de78c7
+EBUILD tremor-0_pre20130223-r2.ebuild 1106 BLAKE2B 1963ff16f0059534f0776a503b7f69a1fffdca36f221a9790ca9b1635049fe6ba4dea586d26b85f19664db7ba88ef60509aa3f0f2425f4482d5bbb16aeac50ab SHA512 9351da68931373b599f1be5b4876e1f0087609236a4cc6c2837f3bafa739cdce7bfd21745ad1d8e2fa57cd15d0ddf81f98d7f7c3873d6db27dde4a993b38478d
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
deleted file mode 100644
index eb4cab721d89..000000000000
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# svn export http://svn.xiph.org/trunk/Tremor tremor-${PV}
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
-HOMEPAGE="https://wiki.xiph.org/Tremor"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="low-accuracy static-libs"
-
-RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "CHANGELOG" "README" )
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-O2::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable low-accuracy)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml -r doc/*
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
index 1d96e6e8fde3..6b4f301c3d52 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 4b2ffe844c48..da63e07fbd82 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -11,4 +11,4 @@ AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcd
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2024 BLAKE2B 83ced9f74ef19a2c24d0c93f55f1eb8d58d7e6c9e963b7c25485ce5fdb5215e7ce4612ab47533f9d5fbf5d0283bda98d151a1371d3a8fd4ff65066d4cc77902b SHA512 7b71e6690bc1297c30550e54ae92b842748c3ad41a3a32ffd4faa05d60404c5c0b136f0332d24c9f0229a75465c675fd6fb488ea16ceea361d228fcc900fbcb4
 EBUILD urt-3.1b-r3.ebuild 2358 BLAKE2B e54f679e95e44661ad7e334196ac1a5a6631c0ca0b3da637540fe514a8b363ba941b69dbe43d9126495186d20edab9f0c2a152e1593fbdbb248f12a1d73aafd4 SHA512 dab0b1fcb0b8a6acf46b6763a4d86f8949d1b311bb66fa89bc77520b866b915e0ed286f3edbfafa342106b67a145836a9291f5aebbeff9c1d75ed67c0068a426
-MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
+MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/metadata.xml b/media-libs/urt/metadata.xml
index 86d48d06885f..98ac19a93dd3 100644
--- a/media-libs/urt/metadata.xml
+++ b/media-libs/urt/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='tools'>Install tools</flag>
+<flag name="tools">Install tools</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 136df80f3ab0..7e873280ee7e 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,9 +3,11 @@ DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e397744
 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-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
new file mode 100644
index 000000000000..1ea1b1ebbc05
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
@@ -0,0 +1,52 @@
+# 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.3743:=[${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-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 9cfcfe52fabc..a8a5ef0a8bef 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,10 +2,12 @@ DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809
 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
-EBUILD vulkan-loader-1.1.125-r1.ebuild 1801 BLAKE2B fd54a22c96c7a4e7c300d0e1c0a550fe0efef2be29fcaf5aa2b0c4f5488ea723e628b9e155bac6c95cac219bcd7b2ef176e44a7f0b7260f687f237314fca7509 SHA512 dfdb4a2b512e61e1d4aee6290d401e5081b53311452b0e265ac659c43fc84b7b443b71a80c95473658c85ce93d6924a2f3da0d40b086eedcd4eaf54c682a88ef
+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 1697 BLAKE2B f4bf1eed24c38ce0021f600991c0ca54030ddf15be2e324c891b5c1b1f3aee3d66f5c3f6777a12af98a577f7e85da5b027cf1a02bb8b85686bd82729a897315b SHA512 ad844080c6a0d96dddabf970462248850d6c0aa4f97e0b88751fe537f8616d54e7f21619b55b0118c33103eecfafd39554bace0f2c37f539b56f01071b01637e
-EBUILD vulkan-loader-1.2.135.ebuild 1699 BLAKE2B f4ecffc6d5076ac5f2b14ab560710b64b72ad91b1f90222132cbb9caed631a30012de6969f990f8d121753e34c090558d09dd0ad860981ef144724ccbe3955c4 SHA512 f0968104aca0b72e3a12e5268518904fcf7c46c8def6549a3145becc5d76e0dbdbbb0321e2dcb47c73f27e5d7c2ab4805aab4036eeee67b1debb32f2694e7c15
-EBUILD vulkan-loader-1.2.137.ebuild 1699 BLAKE2B 17fd74e931fc376c6f10468990e647ba337fbdcd0ca7425be2b5668ae0b5ac364237abe0dcd5efa90ff859821f0dcb80a49098ada6ba7329454c44bd4920a907 SHA512 a5c8989d7365431805da588a317b5accca8f782fcb614b48c2717281ac520ba2749f627bd9a821f2346df08f943326949954fd8a21b4f14c0494127ffdca1650
-EBUILD vulkan-loader-9999.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
+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-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
index 703cf7774d17..815cee75b5ab 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
@@ -21,7 +21,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 fi
 
-inherit toolchain-funcs python-any-r1 cmake-multilib
+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"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
index 33cdb2c53840..24139711b288 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+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"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
index 45a674083b07..f82708238364 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+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"
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 0c346926f2c6..ad3f56422f29 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+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"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
new file mode 100644
index 000000000000..9f43ba5ef134
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
@@ -0,0 +1,66 @@
+# 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.143
+	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-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 60deb31aa071..f6e5a7abb270 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+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"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 94f25b626a29..6018daea3896 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
 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.ebuild 1802 BLAKE2B 153c3d6f00bcb4f56d5993daaa030b8203bef2cdf3b93aed258d8a86a80609b7aefdfbd732e2b1eab432a259d312c2862a99f4f5845230002274761b9f82c5fc SHA512 134d54a9cef4ab21f3a73b3063a8110680048499867051b9a24a981d1919ff261f0459d9be61c4a333ffd2971f0436919802f12b23c239841075567d6da21e2a
-EBUILD x264-9999.ebuild 1802 BLAKE2B 4c6f2e562abd8e9fafe18875972998456f8dfd8dc1d8cb896c60594df3e6ae163d07886ca08d2dddcc4cc735c00d92370ef879bc601f853bc841fa14720f8ae9 SHA512 80d05ceb92256f7c33f8838defcbed7295853c5e5f5970deadaba72c087fbfe463fa3e5ba6123ac19e87f29f3d8ab747e7bfcdb652611383e00a75802b70027e
+EBUILD x264-0.0.20190903.ebuild 1830 BLAKE2B 8c3dc73bf37e830e0c8601aa15acf60d87b209ebedf7de0e2c0cdbe11f1744f8ad061578fafb349704ec40bf8b2229533fbe4de753b4cabd063d88accbbdc0a5 SHA512 658c2e9cf82118b19628822d97430d1ae93a00fbd62a6c505c8d7aaa02603de71ed4b6d559288a621a26629ea44ac2ca9c4cba10ae2709c16b219fc21a31b2a0
+EBUILD x264-9999.ebuild 1830 BLAKE2B f8c5d5a10399aa4a55cd0ad1ea1ba0dbdcf0775c973e98e528fed8d8a9f08dd41b9021211d3181a8b8707ff158a6b44667c0b41fbc821baebe22428ba5d249b7 SHA512 3d28aeddd664f26ce3f0caf327f269c729579e4f17056d578e134eea47d2586f3c4c6484d4c9438c103dfc57633ed73fbd4c3e319c05a77a4abd12af5eb8669a
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
index bb3c2d15e52e..505ad4d2ed4f 100644
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ b/media-libs/x264/x264-0.0.20190903.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
@@ -20,7 +20,7 @@ fi
 SLOT="0/157" # SONAME
 
 LICENSE="GPL-2"
-IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+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} )
@@ -34,7 +34,7 @@ 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 !altivec ; }; then
+	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
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 5478a141f758..2ddcd7e513cd 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.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
@@ -20,7 +20,7 @@ fi
 SLOT="0/159" # SONAME
 
 LICENSE="GPL-2"
-IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+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} )
@@ -34,7 +34,7 @@ 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 !altivec ; }; then
+	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
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 0ace40ee6621..62cb0164ed31 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,7 +1,10 @@
+AUX arm-r1.patch 1448 BLAKE2B 1cb6b7282436c23565833eef725f74f6a0780911b54a84f3b552f936288496f429a057410cd57fb0214741b0f6b307ad3bd546872a628fe33cf2e036bb625113 SHA512 43d646200d2df2b041d9c2100559ea84f3a45a974624bd4b174eb4804201f4291a3d4e9915e16d81d781bb8ad49c6d4e61f438f470480362418e4e6e758ff1b5
 AUX arm.patch 1188 BLAKE2B 886fd2b177c0e1bc1dbdcb6f6b14219eac807a26dd76e67d57727d9fc523b69388a19b354a6d7c2653d674b8c36dff487ed9533c9d0063721483f9fe2b3bf792 SHA512 2591fdb86494e36d4c44b31ae73c1d544018776f21b4a22410aa48ea3f950c74ee808a8c2759faf9b84e29e4ee4fddd6b1baaa23ac2924da3e408b9947977dec
 AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6
 AUX non_x86.patch 698 BLAKE2B b565a558e521b32ff67b24abb49a546615f42f009dc12ae9ee00a43df3efa657960601109d3023e07322fc47b5e4d87cd8f4d12efd44888a28f52c9c6784a353 SHA512 444623b91301049175624664de58eef6735c1b86c92792e5a6f1d7154e08f46e861e38f7cec23b5528deaffabcc494ec8754a48ae8cdd9e0f8665bdf96c4cd5b
 AUX ppc64.patch 619 BLAKE2B 17ea28b03ee80af9e73222df7d999138a51d6c8836574d005981426465e328cffdde034753fcc510ae305ee061e2aa278fc1a37c3bf2bc439f7c6f21bf991c99 SHA512 7b23e9bdb3cc634206ffd42fc381bb3b7915b7b788b30567e01592d83b3d8aee8ba794a20587a31e5ead02c837deae9c8f3d9e82b2b05409892dbe6ff37fe822
+AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdde2c4ed5ed4ac6688d74ea75e11f00d4f901967f81cd80f138eaae662bd6cc1f67948121c3c0b2e34 SHA512 c6d2752027e42403704c68948256c52a237f8b83ee97d4b8e21cc13654964342ed061e5f048984fb649e9980f4899a64931ec97d6dfa1b786db6346134b04281
+AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178537f3598e796cf6550cc4efdb5bcd358bc96401d948d26f36676892bb344c097143a310a1e19c8b2a921cd44a SHA512 6be1540b89f0f622476d3511dd01cb3dcc24ff4823cef57d08432e857fd7da3c9810904a02d1583896767a33f97140651d3a4c163952ed459338623999d93e18
 AUX x265-3.3-arm.patch 1177 BLAKE2B 72ffeda05e1ec23153cd328b18d4719b7883d8f910354405de9780151b013c032fa3489ad7416f2b6dc8a8c016092c5156fbb730722aab3163eb6c3e49160da2 SHA512 9578a3f386e099eb15e5779d7ad99c6f5696f1694656b1ab91f59cdde821008f038bf5ab7901df2b1416b03127f09ef1a2178e3274075fddb41e2c701a2c5ecd
 AUX x265-3.3-neon.patch 666 BLAKE2B 27166c0e9de3bf316ac64742c40156a623c362e896ba358e4cbbf5c17a4dbbeccc645fea5731c9ac6615fe1bd254685fc742d5258e2953ddb53e6b0ccfbf7e0c SHA512 a5d84e7f111574a2fce90b24ba67b08d05431c903ad853a976eea476c16bb0b8ff2cc4c43e7212bc1b8b5a3cbbca7a5b346456527a8d6523200db7b9d1501b59
@@ -14,13 +17,15 @@ DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef88
 DIST x265_3.2.1.tar.gz 1426255 BLAKE2B 4184cfa290b36f497c5f3a5e3b597bf44e52dd20ba6af21c665d98709c9b984122a339d93aae572756a94549c0c1a293ee195c6c1d34902d298664ecf016f896 SHA512 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
 DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
 DIST x265_3.3.tar.gz 1438685 BLAKE2B 43806915c3b22fabff71c307dc53e9a3408262528f8ec01bf81168826eee26b468b0e68c738e3c0371f6de6121a3ac090bfaeed0cbfca0a3b8c57710d7f25ad0 SHA512 3d56900ecd58e83d2ecc93d956524e3b0e622dbe3c74a137c7b21f98599245547403401e9ec7f679996fd09fca788aa10272bf17e58a68fce449c8cb555ad7c0
-EBUILD x265-2.8.ebuild 5708 BLAKE2B 3ee8c0f535143ba5ac91476a4d30e5dd546cf3856a81b81ee5ced12414498329d8a5fb24222450770b0856cc5ee4b94018054d4e3437ac7a8bf0a475aac309c1 SHA512 1c91b82022cdc6c24991a891b691f6b13f04eed9aa586bc3fb333f5379bf868d0ab0006a05ce0438adbfdfbac8759360c27f5b3e57e17d4aad9848fd89a4cdcb
-EBUILD x265-2.9.ebuild 5726 BLAKE2B 05f297461b0a065d623e0de43a28d7e8f016c93da9e16b2316ad9ac19ea0ead60eb0f88e0abfa4e753444983b2c52aad673bcb5d41d2703cdb4f06218b94aeae SHA512 153cf5598086e6ef642328133dd8c8ac3d8a157dab810b5a95641dc2dce04ceba3639b0895f06aad5fa03f40d69474bb442dbc46d26fe339209d1be36d72e86e
-EBUILD x265-3.0.ebuild 5684 BLAKE2B 5ac5d28a1de72646b53a556398f42f849c77d7df72dca297d6e692036988112bf25bb2d6e9a6176ff0937cfaa15be46cd9482f912da5e298eb413fcba4044b44 SHA512 3f40e68a5fc46542103d555d6277da304c3c443f546c64c77b24127e28bb1f05ad85d1deec143346f23a0ac91942328e676456058f1b2b7051c7bf13d6a4232f
-EBUILD x265-3.1.2.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e720ae0e637309b4d4f0ad5e8b48965fad88b95a071d98f02bd2da8f63f35f71c22c6878cfb26c6c9156cbfe SHA512 900ef8019a7c894bc104ab7a7ef0476ff091e191309af89042a1804a4cae61877bfcd5172a1ba89aedda700d42454d68a92bf4a98fb1fcebc6711680af6871e3
-EBUILD x265-3.1.ebuild 5685 BLAKE2B 6cfac74e85e8b5637b480974c5dfa9be45614b31e720ae0e637309b4d4f0ad5e8b48965fad88b95a071d98f02bd2da8f63f35f71c22c6878cfb26c6c9156cbfe SHA512 900ef8019a7c894bc104ab7a7ef0476ff091e191309af89042a1804a4cae61877bfcd5172a1ba89aedda700d42454d68a92bf4a98fb1fcebc6711680af6871e3
-EBUILD x265-3.2.1.ebuild 5685 BLAKE2B ffe6557df2f83c26883d85d5c014d8d6f5978f93f4882a5a26ef3f139b409f5318043f1242626edd7c32483efbb718e2a3e07f364265a3616e416dacfa798708 SHA512 cc09a08013a2a4645aaa36199633071b408639902ca6d084d2e732b6df857aeb80ef46f29473a4cfe59d58df5af97a5896b5bb06e98ea27af628a7d0aeccd282
-EBUILD x265-3.2.ebuild 5685 BLAKE2B 03a54678214d214fe79b8c4cd5c6bca412f57c87399d0231b30ea7b276ee4bdcaa6438623f6ca6b73e1fdb91349b7b298ff3eae89afc3ecddd704ae3dde7588a SHA512 9bd96418e104f5f3675551aa40bfef52291b22a33e1560133f678feb9cd5b50d75ff10608d54728318e2f1c629b30272717dd9353c080b174c7dd80369c7f365
-EBUILD x265-3.3.ebuild 6105 BLAKE2B 617d44d3f721f322e3f61af3d3376454a919c6b5b2eff43dde47be1d98c306afb8e454f47456531a6cfd9283c1372816cd97c37a9dae73922fdd332bc824b5e3 SHA512 7e39312c29d8c5b0381022cfbc447637f6113afe5fc15d339db3e1a588a7183257aeff3947cba4aad02b35026c5b9c7d3f3a8594ba81c3328839b6eb8907f304
-EBUILD x265-9999.ebuild 6105 BLAKE2B 617d44d3f721f322e3f61af3d3376454a919c6b5b2eff43dde47be1d98c306afb8e454f47456531a6cfd9283c1372816cd97c37a9dae73922fdd332bc824b5e3 SHA512 7e39312c29d8c5b0381022cfbc447637f6113afe5fc15d339db3e1a588a7183257aeff3947cba4aad02b35026c5b9c7d3f3a8594ba81c3328839b6eb8907f304
-MISC metadata.xml 769 BLAKE2B 4e666c1f92c76523b92990a3f23cfe8945b16443ab04957ddb490d9f7c9c5aed7e636b54b823f5bf9123ed46a57a0b53b051812406e013af2b4296edf8b08def SHA512 19576dd98759fceeeb172e846c44354d709fe125a27e9fe027f9d220f3fc839c82f8bbf28014130d761fec05594b5964a31b247f9e3c7ba47099a934fb312b23
+DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
+EBUILD x265-2.8.ebuild 5744 BLAKE2B 0fb23baa10a859d8963e557700db0c86684e396955d70bc5703ada64164f18c738f8140518aae87480d1ce32de667672a8e3e5f6e735d60437e78c7ced4d4245 SHA512 9b5a24e32fa6efc04ce7399ca9b4f02cc858f42d5267cef2516f143f7b96fbd3e9dc6de7b3c2c6ab277dc699e820ce860924d28afd376921cccbc50b49327e2a
+EBUILD x265-2.9.ebuild 5762 BLAKE2B 6ff4ca4fd49e7f3f176a2c6dfda6c32f2d3c5e8121ccc25c2e654a3659dbc7b1b9c1e7b805eb90a552207cced06e4c9aae53711eda31cb73f384c7cb359c3cfc SHA512 b9b107cedbc320fd99917303890fe17a881afa418ab8e97260b8cff132a6f876c950034520384dd250f349a8dd973c4102777e2d1f2feae4cbc700e8d5b25089
+EBUILD x265-3.0.ebuild 5720 BLAKE2B a9d02ea77f6a82ae3ed27952b550bb7fba35597cc6d206cbb979a72d649a82a40eebd459c3b1a16df42d29a48283b58ec33bc7c84026d8c322099544656f58dd SHA512 2fa940d2cbad229c46f115a5d8ff8f859cd5244b71fea4306615913d4fa6d5e78b441941071b8b9b8547b4b770bb3994c532d92d50e68114ba242c2276ac505e
+EBUILD x265-3.1.2.ebuild 5721 BLAKE2B cf7994d75d4f5efcdd090c93e608cb55c63bef25efd493bdb63ce0caec7fcebd723c257a835f8a1cd841a32e8fa5e850f82191c6f6450d63769ae6f0f799c625 SHA512 f267d9f6c39294e4584491ac84f4b820b874fa746563971a337d23cd46dd1523e135bdc7af04f495b4c040005d48ee0ef25ac62f9fa5e7d144bbd606c01df86c
+EBUILD x265-3.1.ebuild 5721 BLAKE2B cf7994d75d4f5efcdd090c93e608cb55c63bef25efd493bdb63ce0caec7fcebd723c257a835f8a1cd841a32e8fa5e850f82191c6f6450d63769ae6f0f799c625 SHA512 f267d9f6c39294e4584491ac84f4b820b874fa746563971a337d23cd46dd1523e135bdc7af04f495b4c040005d48ee0ef25ac62f9fa5e7d144bbd606c01df86c
+EBUILD x265-3.2.1.ebuild 5721 BLAKE2B 065ae2fcb9b980145814248eb3588624b6a6f2321e697bd336b9a7bf90d9d167a6cf6218c11d522af78217628e9e2787161be3d88136ca5ce3a0b87488c83b6d SHA512 195be08454c99bae981480f591d5bab69e8e12e8fb3e8e1710395e524281e5d69353aec73cb28185e81d4c891f1b4449b85d78b38ed01da93f67bb6a742320ce
+EBUILD x265-3.2.ebuild 5721 BLAKE2B 065ae2fcb9b980145814248eb3588624b6a6f2321e697bd336b9a7bf90d9d167a6cf6218c11d522af78217628e9e2787161be3d88136ca5ce3a0b87488c83b6d SHA512 195be08454c99bae981480f591d5bab69e8e12e8fb3e8e1710395e524281e5d69353aec73cb28185e81d4c891f1b4449b85d78b38ed01da93f67bb6a742320ce
+EBUILD x265-3.3.ebuild 6104 BLAKE2B 81710a99dd0071e95ef4be31bcb8b3d7b2a9e2d78e9a73989b6b208d4619ca7651638c7679c7d5fcdeed3da4b8132ff12843e715cb720fe1cfc0978cf3916bfc SHA512 45e6861b55dec16c792e29abf0ecac608087e480eada55f96fbf6d4f76201a1a9944754b0bc03d54836dcdcf0af79d8796b06c8f361a54aa765b1daa81604291
+EBUILD x265-3.4.ebuild 6376 BLAKE2B d71b38281b47bccfb953aea2b014caa17f8b02d348c4a6b812b479013555f2171f4b73b3e84e0b6e02afe520635929a4df1d28a1fdeeaced74be22ef6f2191bb SHA512 d326f7fdc89ae914c3e608943bced3b21b4711748d4162dadfe596409c9ee46ebb898a60ec21f7cc15a92b76828b5f13812f094f101a59d0807db7808da2e9b6
+EBUILD x265-9999.ebuild 6376 BLAKE2B d71b38281b47bccfb953aea2b014caa17f8b02d348c4a6b812b479013555f2171f4b73b3e84e0b6e02afe520635929a4df1d28a1fdeeaced74be22ef6f2191bb SHA512 d326f7fdc89ae914c3e608943bced3b21b4711748d4162dadfe596409c9ee46ebb898a60ec21f7cc15a92b76828b5f13812f094f101a59d0807db7808da2e9b6
+MISC metadata.xml 687 BLAKE2B 3d6d04d2ae08bd7ccd6af221eea66b6a4834ff183b69563155c00d9955597f73b18ea057566ac91a775ed5e7533aaea46fe2069d4288e2716ac85ccd953ae862 SHA512 9706d99f55f8426e39e8b7b5df4d27b4b5945fb1e4f1817fe73d50475c896f62efde0a6966129fb6d97c62c30fd35a14b5288a2f40a13aade23352dfc18634dd
diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch
new file mode 100644
index 000000000000..8a8102dd2580
--- /dev/null
+++ b/media-libs/x265/files/arm-r1.patch
@@ -0,0 +1,42 @@
+More aliases for ARM.
+Do not force CFLAGS for ARM.
+
+Index: source/CMakeLists.txt
+===================================================================
+--- source.orig/CMakeLists.txt
++++ source/CMakeLists.txt
+@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
+ # System architecture detection
+ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+-set(ARM_ALIASES armv6l armv7l aarch64)
++set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+@@ -239,11 +239,7 @@ if(GCC)
+         endif()
+     endif()
+     if(ARM AND CROSS_COMPILE_ARM)
+-        if(ARM64)
+-            set(ARM_ARGS -fPIC)
+-        else()
+-            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+-        endif()
++        set(ARM_ARGS -fPIC)
+         message(STATUS "cross compile arm")
+     elseif(ARM)
+         if(ARM64)
+@@ -252,10 +248,10 @@ if(GCC)
+         else()
+             find_package(Neon)
+             if(CPU_HAS_NEON)
+-                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++                set(ARM_ARGS -mfpu=neon -fPIC)
+                 add_definitions(-DHAVE_NEON)
+             else()
+-                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++	        set(ARM_ARGS -fPIC)
+             endif()
+         endif()
+     endif()
diff --git a/media-libs/x265/files/test-ns.patch b/media-libs/x265/files/test-ns.patch
new file mode 100644
index 000000000000..898751a7ae2d
--- /dev/null
+++ b/media-libs/x265/files/test-ns.patch
@@ -0,0 +1,295 @@
+Namespace functions for multi-bitdepth builds so that libraries are self-contained.
+
+Index: source/common/param.h
+===================================================================
+--- source.orig/common/param.h
++++ source/common/param.h
+@@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
+ int x265_param_apply_profile(x265_param *, const char *profile);
+ int x265_param_parse(x265_param *p, const char *name, const char *value);
+ int x265_zone_param_parse(x265_param* p, const char* name, const char* value);
++void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis);
++void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis);
++void x265_picture_free(x265_picture *);
++x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile);
++void x265_zone_free(x265_param *param);
++FILE* x265_csvlog_open(const x265_param *);
++void x265_csvlog_frame(const x265_param *, const x265_picture *);
++void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv);
++void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);
++int x265_encoder_reconfig(x265_encoder *, x265_param *);
++x265_picture *x265_picture_alloc(void);
++void x265_picture_init(x265_param *param, x265_picture *pic);
+ #define PARAM_NS X265_NS
+ #endif
+ }
+Index: source/encoder/api.cpp
+===================================================================
+--- source.orig/encoder/api.cpp
++++ source/encoder/api.cpp
+@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par
+     if (p->rc.zoneCount || p->rc.zonefileCount)
+     {
+         int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount;
+-        param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+-        latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+-        zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
++        param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
++        latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
++        zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+     }
+ 
+     x265_copy_params(param, p);
+@@ -216,7 +216,7 @@ x265_encoder *x265_encoder_open(x265_par
+     /* Try to open CSV file handle */
+     if (encoder->m_param->csvfn)
+     {
+-        encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param);
++        encoder->m_param->csvfpt = PARAM_NS::x265_csvlog_open(encoder->m_param);
+         if (!encoder->m_param->csvfpt)
+         {
+             x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV log file <%s>, aborting\n", encoder->m_param->csvfn);
+@@ -321,7 +321,7 @@ int x265_encoder_reconfig(x265_encoder*
+     if (encoder->m_latestParam->rc.zoneCount || encoder->m_latestParam->rc.zonefileCount)
+     {
+         int zoneCount = encoder->m_latestParam->rc.zonefileCount ? encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount;
+-        save.rc.zones = x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
++        save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
+     }
+     x265_copy_params(&save, encoder->m_latestParam);
+     int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
+@@ -604,7 +604,7 @@ fail:
+         *pi_nal = 0;
+ 
+     if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
+-        x265_csvlog_frame(encoder->m_param, pic_out);
++        PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
+ 
+     if (numEncoded < 0)
+         encoder->m_aborted = true;
+@@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder*
+         encoder->fetchStats(&stats, sizeof(stats));
+         int padx = encoder->m_sps.conformanceWindow.rightOffset;
+         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
+-        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
++        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+     }
+ }
+ #endif
+@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
+         encoder->fetchStats(&stats, sizeof(stats));
+         int padx = encoder->m_sps.conformanceWindow.rightOffset;
+         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
+-        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
++        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+     }
+ }
+ 
+@@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param
+     return;
+ 
+ fail:
+-    x265_free_analysis_data(param, analysis);
++    PARAM_NS::x265_free_analysis_data(param, analysis);
+ }
+ 
+ void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
+Index: source/encoder/encoder.cpp
+===================================================================
+--- source.orig/encoder/encoder.cpp
++++ source/encoder/encoder.cpp
+@@ -186,8 +186,8 @@ void Encoder::create()
+         {
+             m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication));
+             m_dupBuffer[i]->dupPic = NULL;
+-            m_dupBuffer[i]->dupPic = x265_picture_alloc();
+-            x265_picture_init(p, m_dupBuffer[i]->dupPic);
++            m_dupBuffer[i]->dupPic = PARAM_NS::x265_picture_alloc();
++            PARAM_NS::x265_picture_init(p, m_dupBuffer[i]->dupPic);
+             m_dupBuffer[i]->dupPlane = NULL;
+             m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize);
+             m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane;
+@@ -756,7 +756,7 @@ int Encoder::setAnalysisData(x265_analys
+         curFrame->m_analysisData = (*analysis_data);
+         curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
+         curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions;
+-        x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
++        PARAM_NS::x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
+         if (m_param->maxCUSize == 16)
+         {
+             if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I)
+@@ -860,7 +860,7 @@ void Encoder::destroy()
+         for (uint32_t i = 0; i < DUP_BUFFER; i++)
+         {
+             X265_FREE(m_dupBuffer[i]->dupPlane);
+-            x265_picture_free(m_dupBuffer[i]->dupPic);
++            PARAM_NS::x265_picture_free(m_dupBuffer[i]->dupPic);
+             X265_FREE(m_dupBuffer[i]);
+         }
+ 
+@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
+     if (m_exportedPic)
+     {
+         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
+-            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
++            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
+         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
+         m_exportedPic = NULL;
+         m_dpb->recycleUnreferenced();
+@@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture*
+ 
+             /* Free up inputPic->analysisData since it has already been used */
+             if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE))
+-                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
++                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+ 
+             if (pic_out)
+             {
+@@ -2046,7 +2046,7 @@ int Encoder::encode(const x265_picture*
+                     writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData);
+                     pic_out->analysisData.saveParam = pic_out->analysisData.saveParam;
+                     if (m_param->bUseAnalysisFile)
+-                        x265_free_analysis_data(m_param, &pic_out->analysisData);
++                        PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData);
+                 }
+             }
+             if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion))
+@@ -2061,7 +2061,7 @@ int Encoder::encode(const x265_picture*
+                 writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData);
+             }
+             if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
+-                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
++                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+             if (m_param->internalCsp == X265_CSP_I400)
+             {
+                 if (slice->m_sliceType == P_SLICE)
+@@ -2199,7 +2199,7 @@ int Encoder::encode(const x265_picture*
+                 uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize;
+                 frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
+                 frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions;
+-                x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
++                PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
+                 frameEnc->m_analysisData.poc = frameEnc->m_poc;
+                 if (m_param->rc.bStatRead)
+                     readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType);
+@@ -2210,7 +2210,7 @@ int Encoder::encode(const x265_picture*
+                 for (int i = 0; i < m_param->rc.zonefileCount; i++)
+                 {
+                     if (m_param->rc.zones[i].startFrame == frameEnc->m_poc)
+-                        x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
++                        PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
+                 }
+             }
+ 
+@@ -2353,7 +2353,7 @@ int Encoder::encode(const x265_picture*
+                 analysis->numCUsInFrame  = numCUsInFrame;
+                 analysis->numCuInHeight = heightInCU;
+                 analysis->numPartitions  = m_param->num4x4Partitions;
+-                x265_alloc_analysis_data(m_param, analysis);
++                PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
+             }
+             /* determine references, setup RPS, etc */
+             m_dpb->prepareEncode(frameEnc);
+@@ -4264,7 +4264,7 @@ void Encoder::readAnalysisFile(x265_anal
+         else if (fread(val, size, readSize, fileOffset) != readSize)\
+     {\
+         x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
+-        x265_free_analysis_data(m_param, analysis);\
++        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
+         m_aborted = true;\
+         return;\
+     }\
+@@ -4300,7 +4300,7 @@ void Encoder::readAnalysisFile(x265_anal
+         if (poc != curPoc || feof(m_analysisFileIn))
+         {
+             x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
+-            x265_free_analysis_data(m_param, analysis);
++            PARAM_NS::x265_free_analysis_data(m_param, analysis);
+             return;
+         }
+     }
+@@ -4334,7 +4334,7 @@ void Encoder::readAnalysisFile(x265_anal
+     if (m_param->scaleFactor)
+         analysis->numPartitions *= factor;
+     /* Memory is allocated for inter and intra analysis data based on the slicetype */
+-    x265_alloc_analysis_data(m_param, analysis);
++    PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
+ 
+     if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
+     {
+@@ -4587,7 +4587,7 @@ void Encoder::readAnalysisFile(x265_anal
+     else if (fread(val, size, readSize, fileOffset) != readSize)\
+     {\
+         x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
+-        x265_free_analysis_data(m_param, analysis);\
++        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
+         m_aborted = true;\
+         return;\
+     }\
+@@ -4624,7 +4624,7 @@ void Encoder::readAnalysisFile(x265_anal
+         if (poc != curPoc || feof(m_analysisFileIn))
+         {
+             x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
+-            x265_free_analysis_data(m_param, analysis);
++            PARAM_NS::x265_free_analysis_data(m_param, analysis);
+             return;
+         }
+     }
+@@ -4655,7 +4655,7 @@ void Encoder::readAnalysisFile(x265_anal
+     analysis->numCuInHeight = cuLoc.heightInCU;
+ 
+     /* Memory is allocated for inter and intra analysis data based on the slicetype */
+-    x265_alloc_analysis_data(m_param, analysis);
++    PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
+ 
+     if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
+     {
+@@ -5257,7 +5257,7 @@ void Encoder::readAnalysisFile(x265_anal
+     if (fread(val, size, readSize, fileOffset) != readSize)\
+     {\
+     x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \
+-    x265_alloc_analysis_data(m_param, analysis); \
++    PARAM_NS::x265_alloc_analysis_data(m_param, analysis); \
+     m_aborted = true; \
+     return; \
+ }\
+@@ -5271,7 +5271,7 @@ void Encoder::readAnalysisFile(x265_anal
+     if (poc != curPoc || feof(m_analysisFileIn))
+     {
+         x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc);
+-        x265_free_analysis_data(m_param, analysis);
++        PARAM_NS::x265_free_analysis_data(m_param, analysis);
+         return;
+     }
+     /* Now arrived at the right frame, read the record */
+@@ -5378,7 +5378,7 @@ void Encoder::writeAnalysisFile(x265_ana
+     if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
+     {\
+         x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\
+-        x265_free_analysis_data(m_param, analysis);\
++        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
+         m_aborted = true;\
+         return;\
+     }\
+@@ -5600,7 +5600,7 @@ void Encoder::writeAnalysisFileRefine(x2
+     if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
+     {\
+     x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \
+-    x265_free_analysis_data(m_param, analysis); \
++    PARAM_NS::x265_free_analysis_data(m_param, analysis); \
+     m_aborted = true; \
+     return; \
+ }\
+Index: source/common/param.cpp
+===================================================================
+--- source.orig/common/param.cpp
++++ source/common/param.cpp
+@@ -102,7 +102,7 @@ x265_param *x265_param_alloc()
+ 
+ void x265_param_free(x265_param* p)
+ {
+-    x265_zone_free(p);
++    PARAM_NS::x265_zone_free(p);
+ #ifdef SVT_HEVC
+      x265_free(p->svtHevcParam);
+ #endif
diff --git a/media-libs/x265/files/tests.patch b/media-libs/x265/files/tests.patch
new file mode 100644
index 000000000000..6c85829ee22d
--- /dev/null
+++ b/media-libs/x265/files/tests.patch
@@ -0,0 +1,16 @@
+Tests run against static library (upstream build system):
+We build main as both shared & static, main10 & 12 are static only and linked into main.
+All need PLATFORM_LIBS, so instruct cmake to also link them.
+
+Index: source/CMakeLists.txt
+===================================================================
+--- source.orig/CMakeLists.txt
++++ source/CMakeLists.txt
+@@ -578,6 +578,7 @@ endif()
+ if(SVTHEVC_FOUND)
+     target_link_libraries(x265-static ${SVT_HEVC_LIBRARY})
+ endif()
++target_link_libraries(x265-static ${PLATFORM_LIBS})
+ install(TARGETS x265-static
+     LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+     ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index c585d5536314..2049b41f26e7 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -10,7 +10,6 @@
     <flag name="12bit">Add support for producing 12bits HEVC.</flag>
     <flag name="numa">Build with support for NUMA nodes.</flag>
     <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
-    <flag name="power8">Enable support for Power 8 assembly optimizations.</flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">multicoreware/x265</remote-id>
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index f4bb545314bb..3041c243b775 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/160"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -143,8 +143,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
index 5f28b491babf..ead3e157954e 100644
--- a/media-libs/x265/x265-2.9.ebuild
+++ b/media-libs/x265/x265-2.9.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/165"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -143,8 +143,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.0.ebuild b/media-libs/x265/x265-3.0.ebuild
index 2d1942d399d2..df633a2e1d7f 100644
--- a/media-libs/x265/x265-3.0.ebuild
+++ b/media-libs/x265/x265-3.0.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/169"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
index 71303686d68a..b69d74af9802 100644
--- a/media-libs/x265/x265-3.1.2.ebuild
+++ b/media-libs/x265/x265-3.1.2.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/176"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.1.ebuild b/media-libs/x265/x265-3.1.ebuild
index 71303686d68a..b69d74af9802 100644
--- a/media-libs/x265/x265-3.1.ebuild
+++ b/media-libs/x265/x265-3.1.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/176"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.2.1.ebuild b/media-libs/x265/x265-3.2.1.ebuild
index a7c7ebc8e962..6ce84bf0fa10 100644
--- a/media-libs/x265/x265-3.2.1.ebuild
+++ b/media-libs/x265/x265-3.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/179"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.2.ebuild b/media-libs/x265/x265-3.2.ebuild
index b1d719a14b6c..6ce84bf0fa10 100644
--- a/media-libs/x265/x265-3.2.ebuild
+++ b/media-libs/x265/x265-3.2.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=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/179"
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -142,8 +142,8 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DCPU_POWER8=$(usex power8 ON OFF)
-		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+		-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 736bea15bb84..1bcd7b28a790 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa test"
 
 # Test suite requires assembly support and is known to be broken
 RESTRICT="test"
@@ -120,8 +120,8 @@ x265_variant_src_configure() {
 				# because we want those flags apply ONLY to "main" variant
 				if [[ ${ABI} = ppc* ]] ; then
 					myabicmakeargs+=(
-						-DCPU_POWER8=$(usex power8 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 					)
 				fi
 			fi
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
new file mode 100644
index 000000000000..65ee36367eef
--- /dev/null
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/192"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 12bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 10bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist="" v=
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+				if [[ ${ABI} = ppc* ]] ; then
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
+					mycmakeargs+=(
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
+					)
+				fi
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	local myabicmakeargs=(
+		-DENABLE_TESTS=$(usex test ON OFF)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 736bea15bb84..65ee36367eef 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-CMAKE_ECLASS=cmake
-inherit flag-o-matic multibuild cmake-multilib
+inherit cmake multilib-minimal multilib multibuild flag-o-matic
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
@@ -19,31 +18,27 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
-
-# Test suite requires assembly support and is known to be broken
-RESTRICT="test"
-
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-
-BDEPEND="asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)"
+SLOT="0/192"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-
 DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-arm.patch
-	"${FILESDIR}"/${PN}-3.3-neon.patch
-	"${FILESDIR}"/${PN}-3.3-ppc64.patch
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
 )
 
 src_unpack() {
-	if [[ ${PV} = 9999* ]] ; then
+	if [[ ${PV} = 9999* ]]; then
 		mercurial_src_unpack
 		# Can't set it at global scope due to mercurial.eclass limitations...
 		export S=${WORKDIR}/${P}/source
@@ -67,17 +62,19 @@ src_unpack() {
 # allow disabling it: "main" *MUST* come last in the following list.
 
 x265_get_variants() {
-	local -a variants=()
-	use 12bit && variants+=( main12 )
-	use 10bit && variants+=( main10 )
-	variants+=( main )
-	echo "${variants[@]}"
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
 }
 
 x265_variant_src_configure() {
 	mkdir -p "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
 	local mycmakeargs=( "${myabicmakeargs[@]}" )
 	case "${MULTIBUILD_VARIANT}" in
 		"main12")
@@ -88,8 +85,20 @@ x265_variant_src_configure() {
 				-DENABLE_CLI=OFF
 				-DMAIN12=ON
 			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
 			# disable altivec for 12bit build #607802#c5
-			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
 			;;
 		"main10")
 			mycmakeargs+=(
@@ -98,8 +107,20 @@ x265_variant_src_configure() {
 				-DENABLE_SHARED=OFF
 				-DENABLE_CLI=OFF
 			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
 			# disable altivec for 10bit build #607802#c5
-			[[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF )
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
 			;;
 		"main")
 			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
@@ -107,7 +128,7 @@ x265_variant_src_configure() {
 				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
 				local liblist="" v=
 				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
 					liblist+="libx265_${v}.a;"
 				done
 				mycmakeargs+=(
@@ -116,12 +137,14 @@ x265_variant_src_configure() {
 					-DLINKED_10BIT=$(usex 10bit)
 					-DLINKED_12BIT=$(usex 12bit)
 				)
-				# we have to handle ppc here and not in multilib_src_configure
-				# because we want those flags apply ONLY to "main" variant
 				if [[ ${ABI} = ppc* ]] ; then
-					myabicmakeargs+=(
-						-DCPU_POWER8=$(usex power8 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
+					mycmakeargs+=(
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 					)
 				fi
 			fi
@@ -129,55 +152,31 @@ x265_variant_src_configure() {
 		*)
 			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
 	esac
-
 	cmake_src_configure
 	popd >/dev/null || die
 }
 
 multilib_src_configure() {
 	local myabicmakeargs=(
+		-DENABLE_TESTS=$(usex test ON OFF)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
-	local supports_asm=yes
-
 	if [[ ${ABI} = x86 ]] ; then
-		if use asm ; then
-			# Bug #528202
-			ewarn "x86 asm is not PIC-safe, disabling it."
-			supports_asm=no
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
 		fi
 	elif [[ ${ABI} = x32 ]] ; then
-		if use asm ; then
-			# bug #510890
-			ewarn "x32 ABI doesn't support asm"
-			supports_asm=no
-		fi
-	elif [[ ${ABI} = arm ]] ; then
-		if use asm && use cpu_flags_arm_neon ; then
-			supports_asm=yes
-		elif use asm ; then
-			ewarn "arm asm is not PIC-safe, disabling it."
-			supports_asm=no
-		fi
-	elif [[ ${ABI} = ppc* ]] ; then
-		if use asm ; then
-			ewarn "ppc64 uses altivec instead of asm, disabling it."
-			supports_asm=no
-		fi
-	fi
-
-	if [[ "${supports_asm}" = yes ]] && use asm ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=ON )
-
-		if multilib_is_native_abi ; then
-			myabicmakeargs+=( -DENABLE_TESTS=$(usex test ON OFF) )
-		fi
-	else
+		# bug #510890
 		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
 	fi
 
 	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
@@ -190,7 +189,7 @@ multilib_src_compile() {
 }
 
 x265_variant_src_test() {
-	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
 		"${BUILD_DIR}/test/TestBench" || die
 	else
 		einfo "Unit tests check only assembly."
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-libs
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)