gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-libs
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
174 files changed, 735 insertions, 3286 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1a905f029ffa..1e166ff0c1a5 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 12a5a7cf3b15..4ef585c13358 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,6 +5,6 @@ DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805
 DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
 EBUILD alsa-lib-1.1.6-r1.ebuild 2047 BLAKE2B 106e4eec3488a7f76a505f8afb0ed4687f11893aadec2afc393a2c198f387d848052954a110617cbbc451fc446a3a166b445eed101db544bfb9c44859ef92d05 SHA512 8c95080b33d5360f66e586544223f94bae816bcc94115c3f3a6b03c065ef9f54354ccdefcebd6f306facc05f258a89a80cf48465db9369492a88234ee17723ed
-EBUILD alsa-lib-1.1.8.ebuild 2058 BLAKE2B 3e78962d6149f9f572f8546b96f2b9b3b1109b4d3494160e7685666a6dcf7585a01403aa4b838745d50dccea12541e645b1e2b105728a00f0c4f3e763b028fff SHA512 d1be036bcd64715e117923e13bde9e5f8c5ffb21766bbca2aac6518c62783cbd9d36ced6ac3c9639ead1f5a31b3d9d48972ceda845ddc4f565077c8176b701f4
+EBUILD alsa-lib-1.1.8.ebuild 2056 BLAKE2B 9ce599763ab63174ccbca4951590517b56ed44c76ca0ac3c823ad57cb270fc1dbab55c6fc7c6c2d7565506c8b3e95e3060b51747f812ae995eb7f6d78d89ed2a SHA512 bf38eaaf66b1970dedc03f767e7e5f75da365fac7b724b3487b93169c9edf9c897db2cfedd2c01c275cc76e870c54565794cd318d6468ed1413286664e590683
 EBUILD alsa-lib-1.1.9.ebuild 2060 BLAKE2B 862171dadddc859c404a2f7fbd795b72d64f9e76bdf44900eca9827fdcddb91bafde3120089dbe47d76c063aa94d1bf3b1b742f66a5e2dca11b9a9a2c69f8668 SHA512 7db838e58d526853a13174e92ee54f5250be04edd352facd471208d752cba2937069191669a4efbc416ac70a13f10e82d5377e6ed1366f2d86e554d6fc6673c7
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index db73845281d0..61f20eec56ab 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 12cef170bd7d..dc83b08ac94b 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -4,5 +4,5 @@ DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e5
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
 EBUILD alsa-oss-1.1.6.ebuild 914 BLAKE2B f4d40c1a5ba78451221491f5eb7da72cc3e228cf306dd0bd82097ba3a1b6e34a9896c34e903da06486752b893d116a243e89cca6fdc1b99dbe47b5ac2759fba0 SHA512 a05bfc6a2ee9e964c79f831a3854c4183781124250ca70110fe91ce03a2f3955a89417623c7798d89304e4431fd4fde670f31b5e82cc426515bf3a65589904da
-EBUILD alsa-oss-1.1.8.ebuild 1021 BLAKE2B cba8a742482916b38139d375863c039700decb5858bcc083024f36b5d6e1847a59a90bd1a7f0a6b7b59eab6d9e02dfd855e97bd4bfaff0ada8ae0eeba86fe80a SHA512 58154010935c62acdcf2255ffe5db529f7818fc0ad24fb40981d236c3568357428bbefd66e0ac27d83d20f4ccd42385bc5c55609f2feab76a35d300a7ee22359
+EBUILD alsa-oss-1.1.8.ebuild 1019 BLAKE2B 887d47483c9be353c15d590c9432e92dfd0e42966f1ef3627e88cb93024bed4965553a3335082e9e50678e7b38def54a457a5714c6a48d826097aba17d2e9d24 SHA512 1016e23ada908d18062b5fda3453a2a69b496d4c203b05f12a512b2930412a9178769627b06c8cc12d2a066ca7d5a59654e26b830f5af6c2a12a00b8900fd5a3
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index afff1dc8c150..d48c49881f0e 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index c61bf91b9e70..e0cfb7633ffc 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,4 @@
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.8.1.ebuild 656 BLAKE2B 97fb008459d7498ad710f2d6f65aef97201864b02073a814776e76963220d0b796e11f39b47e9b90fd230597b49955456b5bb4d644a6907c4b4751f51cd59816 SHA512 b3fd814edf9490d967db72dae85ed388c658879b878009502eb4f8fe9f51ae831d39a2e39ffbd27b48ad940eedb5359585b1fd8a83744bf41344fc8461d29995
+EBUILD codec2-0.8.1.ebuild 655 BLAKE2B b090db07fb7d88b316f8798cee9fcdd5c4d7b3c6f38e41bb2e3d112fb4d6e10b8d22e75045e46c14ec66ccb83deae0ea4e7fe2fec06d65a80cd8198efcbc6fc0 SHA512 92a3198755c3e3ba2c5c1d10a92b27b1189a199a49e71ddc4ce534966f7c6867d74cd0db141f118095efcf41ca7cabdb06ffe93efa2feb16fdcd14e8cf2b3e8f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 10b8231aed83..91ab050c004b 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="examples"
 
 PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index 60f35ffa1312..a97ee3cc3097 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
 AUX compface-1.5.2-destdir.diff 408 BLAKE2B 83798a6d80b57f29b06edc1ce931d5fe52357344693fb890cbbc1de81a7fd87a399c585de370b396d5ca180c41b7ff049a1d007c0e575306462df1a428510de0 SHA512 d9137aab3623907ee48d72f61593480f5a952dcecf794e69404b15a3b0be0b5098abd9aaff8966f82f14f797fb243e00d2b4b4a7f7951f1aef233fe24bfa543a
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 657 BLAKE2B d00b4a0e2fdf75e2b96ddede89b987066bdd22c7e9fefd9b15611794dbc30578282f3c034d35a8b47eb44742a7a2e2b80c724bab21bcb53a79f583bbbb0bb07f SHA512 d7a4cc4cb5ff48ec2eb95b34fa2f3d2732a7c3d875850c993da19b62539130c626512e55ca1bcc89260f182ce8946d57c30f5005339eb2f67d60fb2da2dfe1dc
+EBUILD compface-1.5.2.ebuild 653 BLAKE2B d677a651cdbba75cfbc73fb3007ca981e50956ca6e46c2a947f7a12c3f5f6f6db71c5f97d51a3bded1c9604a22f9fbae4c9a44b6db1fe668b3f884e76de626d1 SHA512 5afc7e5219b8a404e0da2be62ed0e717caed9fec50a5509423d4f52fe148dfd4240dd83d57ef5905b348760000985abeb9dabd038f811dae2c791cdc3f69d1f3
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index c87c7474c992..985757f29b0c 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index f4b70b4dfe14..50dd231fcabc 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,5 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 718 BLAKE2B 45773a3bea5c0c5c82852e3eaf25a7fa3d2139157c00d6bc2c4a0c0435f3e55d703fad300f232909ed0407eed9c57fd30010cee0add96489df905e56f2fdc728 SHA512 aa386fa9c2f9558b71912c46faf03adc7b50753aa2fa856cd2de9bc7ed09cec229c11565721bd65c58d4079aead1e97f67a257074ff8e4a9bec63f453cbc2449
+EBUILD ctl-1.5.2-r1.ebuild 717 BLAKE2B 101011f1a1a52b1301b22d6be822e577c4eea1f684b59c7d5c90b24bcfc016855ecd50d8f56bbe247b831a824a0be598759247401be719727415812b9068edf4 SHA512 4d1911d037f5c422fb09d191cc1a95bbd8918439f2e3d0acdb7819094c94dc94182832f46963053e80a095f8420370ef3af32e10348d157f5311e54db6a6a0c6
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index cfa7ee63be20..c431fdafe5e1 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 1dc4b5941181..99a5c146c383 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -7,6 +7,6 @@ EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f
 EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
-EBUILD dav1d-0.3.1.ebuild 1151 BLAKE2B 7c1954398e73726df79ebacc9a1cfe2632de564c6533c212028840a19fa4e46a9991c608c1e6897591f20ec6afa79f020ee07d9d2c7f4159dffa072470bfae05 SHA512 5b9ef49cd4588183043abd7f49755e8838f1a9e372a37937a6b1ea2dfaab772d7b4eb1f26dc193f8620e0395a54964549e0a23e5e8eb3bc4f16af6b30d40bf40
+EBUILD dav1d-0.3.1.ebuild 1154 BLAKE2B 344aa8b94ac7f54d056ecc0f43089618f55067e957c5337854759183668174a435d0cfa893320983cf57556020e568854890efa255ada5ff7ead5c5af357d6b6 SHA512 c0904a26810c5efbb493f6f43344047c26777bed07210861b2776f5fca6cf566d544c6b56206cb6112d28e58412cf47df1c31b52c06410e286e36cedd8487823
 EBUILD dav1d-9999.ebuild 1159 BLAKE2B 029caf1d3950e395f7b3a8c9e144992c730d4a7a44f73794b08e0e028989c439137b8a23a42045102796b89c958b8bbdb4c8de63129c989363a9b63c512f9608 SHA512 88eeb6a6cc54b4bdc1305fc73d3c4b6f4ba40963fcf40bbc485d658d205ed30368e455cf2c74214342c2fb2a4ce37b38abef040da0a423939262fdec9291487a
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.3.1.ebuild b/media-libs/dav1d/dav1d-0.3.1.ebuild
index e706c77f9006..1a0ff07d7677 100644
--- a/media-libs/dav1d/dav1d-0.3.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.3.1.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 1e1752311d31..7d190adecfe5 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
 DIST Image-ExifTool-11.51.tar.gz 4573052 BLAKE2B 9b38550127e9d21471ce11d25fa267a13e21deb65da3e0f1fbee7f7970f65b82e9e3a1b30ba6340739a2fc402fa8aac874a1813edf5e71634e5f23268a3fff96 SHA512 e6f48d803714a3fb8e12f869d3f9d3957db9aa330cf4e910a6eaadde759aa4ec0fc4873576d46bcbe40462d87bac341e6a546813f4753ba0bf61cf36dde7deeb
 DIST Image-ExifTool-11.54.tar.gz 4598312 BLAKE2B 2543f56a9d7b59d085bf147a51f90be3764093853a66f522cc8ea96caefa0389a64cc1c2ae18d9eb1d79dd97f406c13a561c495a249c025b5cb6bd3af3acd5c6 SHA512 3d21ac6208b2410b9e39afc21738da14528fa891a4115472b66a489345bcc9580c922924c6060c413cef30671a7508bc5ec1ce9ec6c3645838210f025059d37f
 DIST Image-ExifTool-11.55.tar.gz 4608120 BLAKE2B d5f18ad336913ab43e6ec1916987f425398f7ed2f5a1ee0a1a7912968e0ca99985b5773d1dc1fcbcb29c3fbb8767c3664eec7bac78d4fce4873fe67e21286ce8 SHA512 175aa7cc9bb2f85554964466092bf289e16dd5dee514edac12ebf8beabce59ad559ef8eec78ef515bfd9b404e3cbb3131476d3c5357128368d4f3ca426cc4740
+DIST Image-ExifTool-11.60.tar.gz 4610485 BLAKE2B 25cd45b20a1089be4894ccc645cee81b55099f46eed55b8d67f624bbac8618f46e1bb78ad19dc88c330231fa974a1a96311d305e09bd13f0dce2d69cf1acbb21 SHA512 e5d104a4b849af903f721bd9cc2898d84f4e7ea6d7a1e3619ba99626ac29ec8e0c02e7a63347787385af3262e77e6da7dbaec06d63c33a931ad1ffce059613fc
 EBUILD exiftool-11.51.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
 EBUILD exiftool-11.54.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 EBUILD exiftool-11.55.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+EBUILD exiftool-11.60.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.60.ebuild b/media-libs/exiftool/exiftool-11.60.ebuild
new file mode 100644
index 000000000000..d65975820b77
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.60.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~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/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 8c4b5aca422c..937e7be813a2 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -3,5 +3,5 @@ DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e4
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
 EBUILD fdk-aac-0.1.5.ebuild 1329 BLAKE2B 4b253218fe7f3792205f1f4a49f825cb2e3659256309189cbac4176744957a9739c365eac282a45f43f0294bdef2204844ad064c7aa0d4dc0980f103574b212b SHA512 4d1cf29c86faf68d62604d324cc68132a386486fb7c88b5c54b893019fa59c9b14438a0011c701e1286ec5a6f1078313acf0eb8df17d27e741762d00807ae49b
 EBUILD fdk-aac-0.1.6.ebuild 1360 BLAKE2B 140c2622a15b32a10e6c79f249c15a591d5ae2b68f2e695662d84a221ae031b8fbb460258aaf823b5efec4fc318b312d1e77fc6795599c26c2a79a092df42344 SHA512 aaa3428c0840753488d2019a8d58524868d237a3d0c0324fd5ce77e7500e2bf0be8520ee0dfeda7d44963a2fba5280009ab5e3c40b6a607b3bc3cf480f1bcb0f
-EBUILD fdk-aac-2.0.0.ebuild 1351 BLAKE2B 3d1f1b88f94038c60d7d011f649e78e00a86459f173c0877c17072a99366d89ad4010d9a3dad92cdbc80231f99b899c2b4cc181df2f05a36e81068c1bd256303 SHA512 1b149961afda806bb0926819218fc1e2e2ed8dae0566f4f6c7d3bc0f332480515229f63e9cf393d92d91f92443167828538fb60f67e15fef7dca1224bd3405cb
+EBUILD fdk-aac-2.0.0.ebuild 1350 BLAKE2B 66c5217f6f661da2591d462e0cd94372e064d3c25fc163fd89a877a4025c21ec2a7c857260894f50442c050959e606ac77db2d52921bb03a5a910e0d28512c8c SHA512 a9585640e9d072d357ffd652388be2ddc923090bf62a17fb7ec988cd3a2de9a3c1b73925b0f84a475cd78c7b553785b25265534138efd2125fdf759ee44bd711
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
index 3bb86d429f6e..00ecadc705fe 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index c78069b6ba72..2ad7a3973dc4 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,8 +1,5 @@
-AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 BLAKE2B 858a7f7b4845e75963855cd7d6191cb57c96da017faf50a78addd75a994a53f5adca66c33e8aa2564623a469596e443a24caefb3288b2e77e768ee13e8b3d287 SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561
 AUX freeglut-3.0.0-bsd-usb-joystick.patch 23398 BLAKE2B a55c99083262409976a3074bdafbaf42e19ea980f7d8e3641cb65cd6d502668f1f8ec653eb7d23852276a0634ba5841e7b989f32b8a50036b6b26a69d6630988 SHA512 fe527efb2be40a87c6767e65315795efd632627503f6e43b6ba50d81b7a7d59608f4bf4387001ef1443f47dfb739d972259eb406e6f32996dd710a78a10976cf
 AUX freeglut-3.0.0-drop-unnecessary-x11-libs.patch 1158 BLAKE2B 85f025a23d1fb0e4866ffdeafcd563e6d752d5d56a5f4d0648a376e8a6b9dbc54f80f5ab6d35d4a6bd71f469e9fd7225df2f93eecd49916bd86cbca580d369aa SHA512 414ace62ec3b6db139e4667648d0af8c4ad1beb6a91ea86218aa4ef6e27bab1eb1d3749ad08bc55a028ed1d9020840763f20fe4c5a317cdf374fc8494eb8c2bf
-DIST freeglut-2.8.1.tar.gz 1005343 BLAKE2B d830f6d19659ba6bbe60fc9c981ae16582de8d90e05d58bcaee43133b7699a5f0b2507a777c11c5fcdb730b17c394dd6fc562d5e857024d99d4feb2130ff7cde SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-EBUILD freeglut-2.8.1-r1.ebuild 1091 BLAKE2B 6f80874ea0d55177b70898e7886a9b4f016008a8672e8fabc82ec88e4d29ecfaf7a7d7e031cbc88760056881a87db2c90342a6b4f78d9a70d634fb4544b9f451 SHA512 87fb9a6d839b74c77a2e1fcd4c51bee57d34cf57f4f4d7eb551c478a7f1ae6a714470e18b9ff7d6cade2364953a48fe77278d75a7f3b81389db7b23676ebb40c
 EBUILD freeglut-3.0.0.ebuild 1322 BLAKE2B 40ee9faa939ac5e56c0f4c55607a47b2e1d88ce6c2968f2007ec4f8cc9966091fecf33b6069d5aeb54a6a3fe333602cf47d275290c7f04712f2ec47516fb428e SHA512 c503d74959f04442423e2b60b6f81fd3ba778bbfa1c2d59478aa75556de75c961354db2040f4c9934e690cb253f4460579196f11344a7fc71fc14791e0036005
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch b/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
deleted file mode 100644
index 08aa1326ebc5..000000000000
--- a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We disable BSD usb joystick support until upstream has a better support for it
-so that it can at least build. For now it builds but does not link to libusbhid
-so that libglut.so has undefined references to hid_* symbols and causes linking
-errors later on in the build process.
-
---- freeglut-2.4.0/src/freeglut_joystick.c.old	2008-08-08 15:26:15 +0000
-+++ freeglut-2.4.0/src/freeglut_joystick.c	2008-08-08 15:26:32 +0000
-@@ -78,7 +78,7 @@
- #    include <errno.h>
- #    if defined(__FreeBSD__) || defined(__NetBSD__)
- /* XXX The below hack is done until freeglut's autoconf is updated. */
--#        define HAVE_USB_JS    1
-+#        undef HAVE_USB_JS
- 
- #        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
- #            include <sys/joystick.h>
diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
deleted file mode 100644
index ddd46e1ea7da..000000000000
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="Completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug static-libs"
-
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-PATCHES=(
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	"${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
-)
-
-HTML_DOCS=( doc/. )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 49c77862b50c..69d2fff5a901 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,6 +6,5 @@ AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a
 DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r1.ebuild 2098 BLAKE2B 618b894c17512da414cafcb7c483519d115567f64069e0aef6773eee7cdeedc488f328956f7ef58dec5a366d43a6fee969a882a013bb8debd7c8cf9da34279e6 SHA512 a26a8fc9d231d5d2acf7093f415e3b2431e79739f7b96be0067fe36610754357f6ca997c6cf05648ec47919dd7a01e620c77b1d985e1694b2360e1ab89e74671
 EBUILD gd-2.2.5-r2.ebuild 3140 BLAKE2B 0c3230a15c2342ba8ce7b6818b10944a4b99dc24f65ff1097c7d9365403ac51e0f4601475516c236857fb4aac24bc8b5824a16ceaa5ff1dbf53cf6828879be6b SHA512 faa020502b7e35085c085e63eac5c00f0ecb990131fc32f33c82115123e0082b53f983eb9ecd828128f3e00d47dd29eeb285938cd6cd457a5dbe061a1d5c3f38
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r1.ebuild b/media-libs/gd/gd-2.2.5-r1.ebuild
deleted file mode 100644
index 4e85c3bff54e..000000000000
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/lib${P}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2018-1000222.patch" )
-
-src_prepare() {
-	default
-	elibtoolize  # for shared library on Solaris
-}
-
-multilib_src_configure() {
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 10d315ebf567..a97f6184b67e 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -19,12 +19,12 @@ DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66f
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
 EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
-EBUILD gegl-0.2.0-r6.ebuild 5029 BLAKE2B 73b40173344754c5ed6ca189aa0adbd19397295e3d2583d9605d3506450ae391d09f0dcd4a00b48c3c8601e13e39911d70809339eaed265dec1588956e33a046 SHA512 d8b512cacb89a6a400acd85a38d846fb14d85c2de43925bc0453b992266f49dee82acdd3a236ce99dbcbfe35635649358f0d8504e65211ddddaa4b3f43b38d78
+EBUILD gegl-0.2.0-r6.ebuild 5028 BLAKE2B 88cc7d5f327c6379555f7b6a6843d72e505b72ce6515b008762e1255298d05d4b11a6e14ac17bc9975e3963d91145b7dd1d0b3b1c63e6de285fc8afd23e766e8 SHA512 4e2a290c7c0c627a8bb9f96ae401fd78522ec1da7281a57583bbf34f3c65096a3706a86ea63e7f2d46ad9df227c83a2c1ed3a17a29436bf49d42523ecb06a4c5
 EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
 EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
-EBUILD gegl-0.3.34.ebuild 5367 BLAKE2B 54f2c29fb02d16f9b265d6e3b9c9d1ddcb3094025cb8cc45fa17c035625e89c5e567a9e0ce6c5d649aa9fdbede2e7a62585d3eae03b288819229fc8b009ee320 SHA512 16a254bea6fc478bbdbe90acb795180fd56e1dce3eef4817b3da47f9343608e8b12103fd008feef37e4805aa8aa21ce3ce18cd3d4acfb513814137e8d2a397ac
-EBUILD gegl-0.4.14.ebuild 5035 BLAKE2B 80c187f746edb14fb3b48a0d900750ab19b7b42ecbd7b34d714cb90fe037f243576ec96b2930c6d7e24b0b85f0e99ccca31d93ec1d57bccef83873a435de35ec SHA512 99370369820135e06e1a10cac1f19483c699dea415766b4eacedf2bb70f3778b0d37387406cc87a87c42a4b27bce5f895cdfecc05e6be7b9b732d7588e951bfe
+EBUILD gegl-0.3.34.ebuild 5366 BLAKE2B 5de40f7719f3e7376c3fca95eefc3f7a45a1312eb7430df7d192771ca48c614995b50340fab56bb70deb489d51f5666817a9c80b646170c34cb52d3f1ac05b5a SHA512 09cafab516cc80478674476c579fedd38a202c6eac0517fe8f9b3078126708b670714bd00145236be819a9c7fe8d959eb6dd2c189383889d9783ec20b3acd104
+EBUILD gegl-0.4.14.ebuild 5034 BLAKE2B ff04f06bfa647db99ea4fc75aa783f003abf31966704139f7b6af679830b1b66d84b32496a19cb85db0b934dacb552ace42f3a07f435d837851a98dbfe5b8a36 SHA512 1e90df3fa07e59a75daec2d4d9eaebb43179b5cd4ffeff74203869288d20c8eeeb6b6cd6462f1f356b51e50a15cf7861e290a5d8c7d5d5848e604fa794748e54
 EBUILD gegl-0.4.16.ebuild 4921 BLAKE2B d2b59d69d4aedf53471cd4a5eef5728a4b2c75f58239f70d4452fe00c22619a28d64df1563a9c4570426f7441bee9bbc6d5652745a472a0d5fc2591b7021e05c SHA512 842175c0de307c8ce8f7ae617ade970ac18f071dd42cf250a9f27d7bd0fd7db38a09a6c1f3a0496b62d45ad2cd1d3516cf8b185b8952225877920a4674954adb
 EBUILD gegl-9999.ebuild 4860 BLAKE2B 9155550f7e4b13980aeb6ea781e817c690c5d0ba79e03adcd8cd3d1e4bc2dbd3d17eaf5e5f6eab5a387d10304376168194696aa43dffd80c777015c6647e1604 SHA512 eaf89e93e24839fb7f2523e10d6a6a714106a4d48d38aca7267d817ece01041f383fe4efddf8bf925ba9d9aab81f0f0fa1444a6d670e382d697afdad7812a043
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index 81311c097907..cf53c1f3df96 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 5d43a230b8ee..f8d856ccf08c 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index 2514434d43d4..5bd3966b05ee 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 7cd8001d39ac..c5619c85d442 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -4,5 +4,5 @@ DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d7
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
-EBUILD glm-0.9.9.5.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
+EBUILD glm-0.9.9.5.ebuild 861 BLAKE2B c26fed064cd65b6f4a56b5c52c6938a6f4035690e5c31931ee316cca499088792dd157ac6f2ea68bcfe54d0fd5c482f293e817acedf339e979b8cedcc9fe2982 SHA512 22779553f39a41a0153ecd14a54d0995194615dde016ff2bfd2a7bc579812631585692a89565f05b05d474cdf88a4c06bea4d088bbad2ad6f18b0958b1670bc9
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.9.5.ebuild b/media-libs/glm/glm-0.9.9.5.ebuild
index 169bf319fadf..8ae918b52994 100644
--- a/media-libs/glm/glm-0.9.9.5.ebuild
+++ b/media-libs/glm/glm-0.9.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index f92ab0e2c97d..fe55c0267a59 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,6 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
+DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
 EBUILD glu-9.0.0-r1.ebuild 861 BLAKE2B 805c6ecf0287e0f91fd21ef79463ec98fe4fd129cb9dc5fe18783a0e31c3e4ad7990963c719a8dc19cdf589a3797a88af20ff0042a5901a1b0d3323956d04307 SHA512 b4afff965bb31272039f8ebbf3bc0b852eca73feadb275160bf9fb4ec01dd39970dc2e1e3d551e87df00083f1663e96faa388c8e92cb84cda259698d596d48db
-EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
+EBUILD glu-9.0.1.ebuild 1057 BLAKE2B b643ab76123ed0a288e27d70a867b78e52b9c86ffdf98887018aed7408093fef81c5b2072658853fcad39fc44f8bb6d44f3d433edb7e34d8f015816c1c48bdcc SHA512 33a465a89ddf272688c17e1418190c94e4867c1ba77d9340dc4c49ec9c40fa6dd6bcfe88c2d4e680d1aec84ad75ac1311a2c9910179cb9ed88009ae574a1d8ad
+EBUILD glu-9999.ebuild 1057 BLAKE2B b643ab76123ed0a288e27d70a867b78e52b9c86ffdf98887018aed7408093fef81c5b2072658853fcad39fc44f8bb6d44f3d433edb7e34d8f015816c1c48bdcc SHA512 33a465a89ddf272688c17e1418190c94e4867c1ba77d9340dc4c49ec9c40fa6dd6bcfe88c2d4e680d1aec84ad75ac1311a2c9910179cb9ed88009ae574a1d8ad
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
new file mode 100644
index 000000000000..ec7ab407c722
--- /dev/null
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit autotools multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="The OpenGL Utility Library"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="SGI-B-2.0"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<media-libs/mesa-9"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	:;
+}
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index b743ef44af75..ec7ab407c722 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,7 @@ EAPI=7
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
-	AUTOTOOLS_AUTORECONF=1
 	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
 fi
 
 inherit autotools multilib-minimal ${GIT_ECLASS}
@@ -19,7 +17,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
+	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -32,7 +30,7 @@ RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 59957b1f97dc..a0ee918a8b4d 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -7,5 +7,5 @@ AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180
 AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
 AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1355 BLAKE2B 34d16538274461682793582ef9097d85037c094978880a0c7af80907b1f55ca99bc95d0066cdcc052632aafee4eee872259b18a2ccc5c32cfa4e26dfe299225e SHA512 e0ddc43b28f76a0a4868ee1555285b760e88bc08a661709d0557923050a5cb6b2e460a02645d55d6f2132763d56f453308b8c942c6d2a650c101dd5ec2d99552
+EBUILD id3lib-3.8.3-r8.ebuild 1354 BLAKE2B f29f8ce983523c1ffdc21f30a1bb8162273412b258c9657b910ffb142f146ae252350c1c2c349b2e58b4d819fee4392853b5396e5921983c3be05476371c6b5c SHA512 ee04e9c3f6f0c36f1505c9d999358678fd122b0be376b6f8c58ca4cab678c014ec3852e5d8300c8c3f68f2772be00c3e7a85c417ff10cf375af806faf38050a1
 MISC metadata.xml 339 BLAKE2B 7edd7b91c817463342d9d8123d07014bc77b8d1342a1bbf17811ec54ed2c749441de32f6d518b30ab718459a3edde8b1f4953b7202df294407da192f33c669b7 SHA512 e5d02d27394556f17ac426d2c87cc19aa8c603913d9c5ca3641154e87b54f5de6768dfa4334c371d3a65af5c39f265f561b1bac6ab497ed5b41ad10891d5a800
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index bd06982408d7..80713f9f8b3f 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 4d7dc10cdefb..730d011d511c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.5.1-r1.ebuild 2170 BLAKE2B 8b9ab6c0fe358e9459771bcaa3bdf9e0621d261501893c87260be3fa79e00ecbf3569bd9d0a1fdf94d998f49ff87317410f606ec62c6464e5a3b1ce96fa634da SHA512 3368d44f6cafc9e1f17d837b47542258d002eb7298d77ab8c910183c9f8313c0452f053b9a10f72a0a5761d83e24aa3d956dbf90352ea68ff6e26eb7bd996f25
-MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
+MISC metadata.xml 2448 BLAKE2B ca27be2f23b000d1121343dfe8d21c93062ca12cf358860b30be062744e54df49a0ba108c991f090de5f84945189e02fa1e936df081e564c777a880421e36045 SHA512 659e2887be742527de8386577bbcb0c0544b1526089e67d5bf99745b0c63eb9634f6daa4b09d31bad81bae12ec9d7c227b687ebcec2c34d052e60b9e65bd05c3
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 01e33b1417ed..7f1dafcefc66 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>juippis@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
 	</maintainer>
 	<use>
 		<flag name="shm">Use MIT shared memory support for X image transfer.</flag>
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 46ca6cd5623b..ff45fd5370f5 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,3 +1,3 @@
 DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
-EBUILD libaacs-0.9.0.ebuild 819 BLAKE2B e6ade8d24c9ec33ac9636d2f6d912b4aa5de1906c57f2f7161ab8a28278f1f1b453f92007cd2e45f071b6c848a37abe3c1ceef49759f3e5eb15a36017c48bdcf SHA512 ff58d41093b1b3770b8d15bda7dd98578154a8420a3a298aae4ae466639f5fa4b368d7adae4cfdee4f40ae99a1cbdca4f67f3ba59c35879da519e01ecd382a4a
+EBUILD libaacs-0.9.0.ebuild 818 BLAKE2B bce0b1712a3fe1892da27d08826f733fb56fac11c6230675f650a1daa080150b264f89e6c8279396411cc73424ea865d3f590585d82b468e724d44094338f726 SHA512 bc2efe38a18f0ede13475f2f7f97bba50be3642e23bbc90f52456d205ad30448d8c8a6e32220ab4140b368d65cac23db735a3178688bba4f66cb83e588048be5
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
index bb5b69d1e040..94b9b1f46052 100644
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ b/media-libs/libaacs/libaacs-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index ff9dff544bd9..9e6f2d318d2e 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -5,4 +5,5 @@ AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db1406202
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
 EBUILD libafterimage-1.20-r2.ebuild 2688 BLAKE2B aea13f936d29281c4282b4c90baba653152870ad117bf1e729e05bf9d97b2215cebfe802074e1fc55ec440cae9a442dcb403833e4dc6c80463c7cbba9831d658 SHA512 1d52582cb20ca744e99b3e5da7fb59014ff7b4a369916d68c73060c007df6147fe6ec78c6751496805883cd3f7db52aa87324a4a0d6a343c3367aff2fb1eac2c
+EBUILD libafterimage-1.20-r3.ebuild 2623 BLAKE2B 7f81290a7c6e59d722402e88bfdac756c1b107da72e3ba7ab86f0e4429f35da48236258baa20b7a26473add5b036c01852f037efd97519f84cfa3ebc725145f8 SHA512 847ee835b0c65bed33e87389d5059d5020cab1bd1a7406dd3c3c46710ca22df3ef5983f1de7760b614cf344187a31d21235ecaa2e76a3b289370f4c207f920d9
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
new file mode 100644
index 000000000000..4d52a6cc3e26
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_PN=libAfterImage
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
+
+RDEPEND="
+	X?		( x11-libs/libSM
+			  x11-libs/libXext
+			  x11-libs/libXrender )
+	gif?	( media-libs/giflib:0= )
+	jpeg?	( virtual/jpeg:0 )
+	png?	( >=media-libs/libpng-1.4:0= )
+	svg?	( gnome-base/librsvg:2 )
+	tiff?	( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	X?		( x11-base/xorg-proto )
+	virtual/pkgconfig
+	!!x11-wm/afterstep"
+REQUIRED_USE="
+	shaping? ( X )
+	shm?	 ( X )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# fix some ldconfig problem in makefile.in
+	eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
+	# fix lib paths in afterimage-config
+	eapply -p0 "${FILESDIR}"/${PN}-config.patch
+	# fix gif unbundle
+	eapply -p0 "${FILESDIR}"/${PN}-gif.patch
+	# fix for libpng15 compability
+	eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
+	# add giflib-5 API support, bug 571654
+	eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
+	# do not build examples
+	use examples || sed -i \
+		-e '/^all:/s/apps//' \
+		-e '/^install:/s/install.apps//' \
+		Makefile.in || die "sed failed"
+	# remove forced flags
+	sed -i \
+		-e 's/CFLAGS="-O3"//' \
+		-e 's/ -rdynamic//' \
+		configure.in || die "sed failed"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
+		$(use_enable nls i18n) \
+		$(use_enable shaping) \
+		$(use_enable shm shmimage ) \
+		$(use_enable static-libs staticlibs) \
+		$(use_with X x) \
+		$(use_with gif) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with svg) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		--disable-glx \
+		--enable-sharedlibs \
+		--with-xpm \
+		--without-builtin-gif \
+		--without-builtin-jpeg \
+		--without-builtin-png \
+		--without-builtin-zlib \
+		--without-afterbase
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+	dodoc ChangeLog README
+	if use examples; then
+		cd apps || die
+		mv ascompose.man ascompose.1 || die
+		doman ascompose.1
+		emake clean
+		rm Makefile* ascompose.1 || die
+		insinto /usr/share/doc/${PF}/examples
+		doins *
+	fi
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 7c3c71642488..5b9eff5955e5 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,7 +4,6 @@ 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
-EBUILD libaom-1.0.0-r1.ebuild 2464 BLAKE2B f73d81d653a1913287af544186bad78e33124c6b2c30ff96a4bc4c92a5b5f2decc60411523d129bc50b8a0569dc29d497eb70224fdcc44e75fa7e4382c57deda SHA512 2b4e8e4413cab4534fbaed0781d97c5fa6b36b4969a5aea29bde54b304b74ad9bcb8da1b398a6f82f97bc16b4a1d893821bb9bb1ad237c8f290c627ef46db48d
-EBUILD libaom-1.0.0-r2.ebuild 2602 BLAKE2B 765a726c23c4e13ad9a7c6ec5440891cd0faba75fc8b586761ec895b25ac084fbe4a5e72303b876554f8b27c91fef251c2a8585f7310ece43f08a90277fa4443 SHA512 6e67331228e61a9cd98247c0a64de41a1b28e247a521a8a1567b43279fb0b595496b510a706222394b2e8bc1cc275b45e4566d59b11f0ac1372d10eb57dbaae7
+EBUILD libaom-1.0.0-r2.ebuild 2600 BLAKE2B c7de9b3bdf8f4790aa90ebd0e44cbc1630d9e374e7e44bf05f952682e2e416fa6ccfaf89767616bafe8224b84d5a8a9cf209f90ea17c9f8a0aa5c09e1eb43410 SHA512 2f6d26570987403dd231a15432384209fe0ebadd6decfb1f12b9b588005823a5e056c4337935f28831b62e5333023397eee4fd8b69a321c58c42f0ec7b1149fd
 EBUILD libaom-9999.ebuild 2110 BLAKE2B fc0aabd237735452c5218edccfdfd723808d67877025d20e344fc13e567f8705bd48a97316d641b056578a4d70fca8ece459a3fad684febca2198f27f8644d9b SHA512 401a82d1cc0ec2ca9086edb0203d3e9c39dc995241bccbc546b322bb0ad6da8af2a01101d7ceed32b381b3ad175bc7bc616f3fbec17c28eb1cda99d2fb7cde2e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
deleted file mode 100644
index 3dd2b5c6462e..000000000000
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	if [[ ${PV} == *pre* ]]; then
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-		S="${WORKDIR}/${PN}"
-	else
-		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="mirror://gentoo/${P}.tar.gz"
-		S="${WORKDIR}"
-	fi
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/0"
-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 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? ( app-doc/doxygen )
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-PATCHES=(
-	"${FILESDIR}/libdirpc2.patch"
-	"${FILESDIR}/pthread_lib2.patch"
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-armv7l.patch"
-)
-
-src_prepare() {
-	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon 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)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-	rm aom.pc # ensure it is rebuilt with proper libdir
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc docs/html/*
-	fi
-}
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
index 52296f61d4ae..b9f1a7ad37d2 100644
--- a/media-libs/libaom/libaom-1.0.0-r2.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 27413e29e1d2..7db52de59623 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -2,7 +2,7 @@ AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b27
 DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
 DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839
 DIST libbluray-1.1.2.tar.bz2 745779 BLAKE2B 04803f67d9b0732df54e85d960539280ce26755c5874ae90cc8d787036ad279fca8c508695ea0607eed1183eea7b0be9326999dda473dc864fa4da131a27af40 SHA512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
-EBUILD libbluray-1.0.2.ebuild 2219 BLAKE2B cba86f2970fb0ce1700509caeac6ac16e2efae09d0d400dbd659dffe50dc9736008730766cc8727a42238bc4c7b87d56eecf587f08fa7bb9314bc21a973281de SHA512 de4800bb34dfa522af592d095ead7bd91d17016b9771571cae38bc8aad94a4831b50b1f270f9a9e0bbd5341dcf1283e0c29cae3e1afa0af2e7dba2478910b412
+EBUILD libbluray-1.0.2.ebuild 2218 BLAKE2B 94f92daf6fea1d680f82e60e515e30e88fe395521bebcfa3f723fcfd213785a08b7af417845b57712ff9ee6f446b67e7c594e0ff7422228f716b3161f122a3d1 SHA512 e4d830940b67205000c00321d91b57e260d5cd353a819cad0711aee6a686c51c33e9b1010c03b083a2c5b2a6212876eb1b6e9a2e0663236164720bcce488949d
 EBUILD libbluray-1.1.1.ebuild 2044 BLAKE2B 81912035ba4accc123015b7f2cdfc24f984a8a41db2042b65a7c34e09e7f897fbf24ecb91402961a31317928c504b4e47cf0610914191309d28281ec88c82721 SHA512 871c8eb5d856ec923380e89fe071772ef1f62d3466ba6dfa3d5b4c6b2f1d89f033e59fa4c38f5338e8fbd3e927a4ef7a945eecefae5ad0297fa6916a8a97302b
 EBUILD libbluray-1.1.2.ebuild 2044 BLAKE2B 81912035ba4accc123015b7f2cdfc24f984a8a41db2042b65a7c34e09e7f897fbf24ecb91402961a31317928c504b4e47cf0610914191309d28281ec88c82721 SHA512 871c8eb5d856ec923380e89fe071772ef1f62d3466ba6dfa3d5b4c6b2f1d89f033e59fa4c38f5338e8fbd3e927a4ef7a945eecefae5ad0297fa6916a8a97302b
 EBUILD libbluray-9999.ebuild 2044 BLAKE2B 81912035ba4accc123015b7f2cdfc24f984a8a41db2042b65a7c34e09e7f897fbf24ecb91402961a31317928c504b4e47cf0610914191309d28281ec88c82721 SHA512 871c8eb5d856ec923380e89fe071772ef1f62d3466ba6dfa3d5b4c6b2f1d89f033e59fa4c38f5338e8fbd3e927a4ef7a945eecefae5ad0297fa6916a8a97302b
diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild
index 82bb6902a072..3a0de19840c7 100644
--- a/media-libs/libbluray/libbluray-1.0.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 93ad02cfc61d..6a22ca4c82d8 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,4 +1,4 @@
 DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
-EBUILD libcdr-0.1.5.ebuild 1160 BLAKE2B d0928d3a66257d38b2332b56605f626c130d5e9de79beedd8689137014b111591fbfd7f2059cac7ac8704648324b9de52c27546f4784e3fa67db64cd0396d7a8 SHA512 a111403928d5e6cbef9def49c3f2860ea7d0810b3cf72aa57f0d2acd81b8f9d014fcd491546d5ffed26dc4ab6bdc4be66cd1fddc20d7eb0062794972b26bc3ac
+EBUILD libcdr-0.1.5.ebuild 1159 BLAKE2B 6ca28abd906ae50dda0caf7b513c0fcf99bc72a3968c750b71187a03dafadd3a3e69655c6deb80c668f1fbe6c738704c07d5052d5922b016dbbdb2f0f2b668be SHA512 6a3a5e517b50b9ced7b2e86a376d7b9bcf2c8472c29df1cbcf8ad4f925efb32ea3bc6209b1c0894c009b380397ef628d41e03c0799d894a5ff97ddf21011470d
 EBUILD libcdr-9999.ebuild 1164 BLAKE2B 2ebed7c2dbd73964ea5a203693681b51c9e4dd4fcbfe24723dd3a92ee82ac286edbb9eef311fc891cff3cab2990084e176b6453b17dfbfb7df6120d29acd5389 SHA512 c4d2fdaeb651c2fa6065b7c7355375cfd813547d4007e0bdc37de70c785f99eee0f435b568e2dc7825390ee1832fc6b6e5d572ec6ea50a9a8b379cd254b55c94
 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
index 00b103be1047..32f49593d6a9 100644
--- a/media-libs/libcdr/libcdr-0.1.5.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.5.ebuild
@@ -10,7 +10,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/libde265/Manifest b/media-libs/libde265/Manifest
index 58dbf0690173..f39c6cc68394 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,6 +1,6 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-EBUILD libde265-1.0.3.ebuild 1650 BLAKE2B 4e758d45444e1f7742b74182523299d0a58313327e39c3e042e8bf35983928f2fd151070398420692011d688444016eeb9ea8d5e877e91318d573c2461e07862 SHA512 bf6cff70ac0a626cb99ae10f84a849a67d7ac8d50e1e3fa1b9b9127a1fbc4574f5a478b6484669c3a4c42c1b4b46b22f6e8850ebc16318a80661f99d299168bb
+EBUILD libde265-1.0.3.ebuild 1653 BLAKE2B db45b73a01efdd3b7c8b31949048519b7a575a69012358dd0b90dbede784f60c595442603d079f968e0f48779e1aa4b8f41b48c51f9155cd363c619f4f8777cc SHA512 c54ded9bbc7ae235632ab2c5ab60666ed98ce8f3949b1c650db6e5fb5dee6a3e2bd335a9bf3db0e06ea705f117a483d2e33ce680fe3ecde5e975e049db805eab
 EBUILD libde265-9999.ebuild 1587 BLAKE2B bf6bdc557cdbf839934ab3424012b5cae2637d26992d2f87492fb5877dd8ae3884cf5d57d053d67e81d5cada2dc21d41df8c5541086298b36b51f711aca8e369 SHA512 d147237b24d3fabf9c172c5b2b4d2f29e9ae96244dcd0bb91d00074b1d20e0a87a3d4f1fff982170ae4015538f29af5e7cdc95d33a55cd654567982266189e75
 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
index 987ec1c18c50..777432a1f9e9 100644
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 4e199de8f6c2..14496eeb8fdd 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,3 +1,3 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.4.2.ebuild 809 BLAKE2B b314501bf264cd37c1dd761eaa6ff1aa253ffd538f99a14451ea9981357c65f2df8b9cacb349ba33ea1f28c969870dbd1700dc3f8f08f68d200c4065719ea779 SHA512 2e9a29278a3b008a6686911cd6ebd17e1e42f5d88405300806fb3abe9716fb099654f087bbfd41193b13016784bda54263cb8f74f6a2f4fc16b3de5a007f2272
+EBUILD libdvdcss-1.4.2.ebuild 805 BLAKE2B 765a03061328fd96edf4b661d9660662ffab8a85f2294bbc3be2dd8525c3fd287e307b3a725f11cd36d245b04ac0bdf290b110a9329995dcf9c788fc9ad63453 SHA512 9e6761ec85561ed0daea787e7efc21f24ac5f121e84bb5f0aece3a4bb084e06528f6bf412c3e785ab79ef99efbc258f62e8619ea855cf3d7a1c794447fbe98ab
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index ef7df0099acd..431e864bc694 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 9e98e336dedc..d44cf8ba9676 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,4 +1,4 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-EBUILD libdvdnav-6.0.0.ebuild 1178 BLAKE2B af97a767a55b77e29ae0b8c3b69c12c5c55912476a17e432481e7924b2dde94ad054c19600d2dddb83b9c2a6d7ebe40ab1b828e2778df89ba5f86878df5cc6c8 SHA512 46ce672a6c05b784901c2e719b5a393ab4e6528bc16c4635d3bf0bce02f8261dab8d143f15982f4e59254e02629b939748795733cacb122f6433b56dfb937637
+EBUILD libdvdnav-6.0.0.ebuild 1174 BLAKE2B 3480e5cb36aade63057fcf86227655b8ab55f1f71d37e22e49130d041b5b228c5278d689a2afff9d958046ee1556a00a1ed2df19530885a9f2f11dec23f4d4e3 SHA512 f3a8ee69794623296651e7d35d3788976e4472a525766c76b8db5f55e13832bb640b68eb9283558e7535916ce226a8a8faefb4c78a9fee8a4d81b2988dbef5f9
 EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index 86543cb79115..a2b8131348e8 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 1fac022194d0..6304dd1237c3 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
-EBUILD libdvdread-6.0.0.ebuild 1148 BLAKE2B ec06c3c7f0e6f7272473f6b2df07d6457e17135828e74252e16dd1c22bb13ef6bf0d1462a90174fcd24ca077e842af8233dc5548d21e0a4a1cee6f173ee6b2ed SHA512 b0ddbdab2d9f0d3515f6133e43847abc71b71bf4d9443dc8581336eb7766507105963d2c8bc1c00359626d46e39387ed75aa1688cfb60e5249535609d820c119
+EBUILD libdvdread-6.0.0.ebuild 1144 BLAKE2B a0d3f6efbe7e2b40d220e7ea469a75e7bbfb614b32436b332395b72d2dddba0c6f01f88ab6ff9677aeb06c9e366b7232848302df7506d3b88eb904c3fb5a9ca7 SHA512 e999526b9683635dd1bbaef66f5f7f63616f1ee02e471b56a15a34b2b01a9d1971d3c5d414807266ea183229d405a0e550d06a5810aa3ccae2334de69c65a3fd
 EBUILD libdvdread-6.0.1.ebuild 1162 BLAKE2B 4b8308822337313a32e016441ab17f1eab9681adc280a316556a749306f2c74cf349c9958537b9b6f636ab993e76ef1c0e8b01877e99e91714f885b152db5b2e SHA512 9113cdf82860b9d09cd49b3ba7b30cc3ebf067c33ad8b037ab9397ea2c65bee7678422e5552d94ac008d4f8b3ab528734bdadc7a8c51b8b2dfb260746492e339
 EBUILD libdvdread-9999.ebuild 1162 BLAKE2B 4b8308822337313a32e016441ab17f1eab9681adc280a316556a749306f2c74cf349c9958537b9b6f636ab993e76ef1c0e8b01877e99e91714f885b152db5b2e SHA512 9113cdf82860b9d09cd49b3ba7b30cc3ebf067c33ad8b037ab9397ea2c65bee7678422e5552d94ac008d4f8b3ab528734bdadc7a8c51b8b2dfb260746492e339
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index 1ea628dfc223..8231d5e177b8 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 255c867e63b7..513af3093435 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -2,5 +2,5 @@ DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc
 DIST libebur128-1.2.3.tar.gz 22150 BLAKE2B dee5857aa6d7a2523a4635d9d69964f22c7bda32b4329822650ad738d88a789f13d9ab5b66058f75093cbecac6db31742f4d041a511605be1357b5c2b6988c00 SHA512 d3e335a547e7e2b276be4f28ab93b87f6af91e818ea1e6513bcabe1ea74c99a04af0b03b6a36a27a83fec065ac609db0c6f70b67275134d39151114d54a50e29
 DIST libebur128-1.2.4.tar.gz 23140 BLAKE2B 4095a11b976109c82ffbd133d5e509b60a2fa27871982d4a81c1927cb23783e89f907bcce52e78d3c743d1e41d1bd823b9b7b510792137649e4b3b680c93eca7 SHA512 d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
 EBUILD libebur128-1.2.3.ebuild 970 BLAKE2B 756ad8d9412bc752117965ec970f7b102626829b833a82d78ce40c84dd1b8ba3243c1a183cbff4a139a6e87468fc3ae862858cb429f61ed05c1e2d95de849111 SHA512 43df56ce963f83c6b87e7e2a4ecfd9b44317956b44ef58be7ba210ecfecf9da64dfa136eb2e8e016253e5af1f9e966a0ce4d853cbeb66fe435a1afb7c50d4514
-EBUILD libebur128-1.2.4.ebuild 979 BLAKE2B 61a42ac0b2c7b49c047e1b96f52d11c2b7badbc06803b01803b45fd624a6d833d5fc10403b08a050fbe65ea230039ae03f639edc7bd3039a1c8fcc957e651ce3 SHA512 036b1c0bf507b607c9fa3f8fff577905e6eafba2c742ce729e35422e331873680013477448fb4b4e0b27cdb19602d949d953ad90b7ee6240229292c7b5fb7445
+EBUILD libebur128-1.2.4.ebuild 978 BLAKE2B ccb54106d660b69e0d1fc10f1a7fd122e6f32fc62b83adfd567d5314c3a44dd43ff770f9e2b9cb091be039bb51554cd5f8f1ccd6ba3e9ce424f0d584b0187d40 SHA512 238457dd51c2319a80d27d6e8fce86b7cd6925b0acf20096cd54fd542efb365f62b0034fe52e06c103fb9d2cf55e6734b6042cdac03bc9e89da70af92b742f13
 MISC metadata.xml 751 BLAKE2B dc363e6e8a40a11e18c8204cf4ce6b3054bb8edf61b872c836af6404230e6e9a1fe758bcc49bafc83dbb0fd36c9cb37a65d3b889cf2c323b441f7e763312dd8d SHA512 2fe85871c10acb1d2aed6ada85d2522e6bfdd4bc51f06c560e262438840e499bbec842e451074275431c94892d887eeeab715f3e8ad2a0b85fbb5a5fce200617
diff --git a/media-libs/libebur128/libebur128-1.2.4.ebuild b/media-libs/libebur128/libebur128-1.2.4.ebuild
index 088bc8687f26..20e824cc1a28 100644
--- a/media-libs/libebur128/libebur128-1.2.4.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 95ab047908a1..0974de7c1ae0 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,5 +1,4 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1269 BLAKE2B bcd4d0286a99217e964a2651cabddd66fcfe32f1af18a1e6cc5dab2dca99bcdd29c7265560bdf7aa494e66b05be3acafbf8fc6cdb25037bbff5d0a90939128ac SHA512 e58dd80dddf5bdd0b789277b7fd1bade6d600b471815c32b929ac129cb7cc55beb7e56ac3330213f8e4c16a7ae44e956b0133edc575670d982e7d88e120eca5a
-EBUILD libepoxy-1.5.3.ebuild 1245 BLAKE2B 6de1b1561df3842b3cd90ff06703ec51e5eb61a0e2e89768eeaa790f6cf71711d4760cafc4d1d75a24746281e800f71945d76424494c10aa231b57dd62f756d5 SHA512 8d22a6fc0c8ff21f70aa998c6fde33a0dc810fed00c7afe301bd19e87e80fcd3abfb4bb9ed39a51c10b758f49b718f2eb1b232de6c42ef6175ac64426b41e163
+EBUILD libepoxy-1.5.3-r1.ebuild 1267 BLAKE2B 7c056f41c6ab150fbacaf1b102fce4f8c1fda21cd5c88c5a6e8a0515b97cdeee982a695905e7c550f7d1988822b5d38378a21c04084547d3241c23c5a17275c7 SHA512 92cf4e9421b6d53a612893c5226365fe760613296e69904350bb63cd21784552b439376a6386c622607b0ba3b38e14fe6bda34a7021b7438352be878d203ac14
 EBUILD libepoxy-9999.ebuild 1272 BLAKE2B ba91a63b33a5cbb320353e066749210509e6401d503ec3990ea1fed6e43753ab6a3f008ea87f0518cec65106a1524db90a013b9d24e6efacb01a9ed6bff56518 SHA512 bb1139c5457aa1a6ef9680883e19e45ab0206d7a6a5b4092b2a88240d0a9c39ba2d7d0d487a031610036bf7f9594c95ec797cce08d94a273060174503cf699d4
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index 340f201c37bf..9733adb8ca9f 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
deleted file mode 100644
index 858276b1405f..000000000000
--- a/media-libs/libepoxy/libepoxy-1.5.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE='xml(+)'
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
-
-DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +X"
-
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	>=dev-util/meson-0.47.0
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	virtual/pkgconfig"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Degl=yes
-		-Dglx=$(usex X)
-		-Dx11=$(usex X true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 1fb69e230cde..af2c24c7fd14 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,4 @@
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1192 BLAKE2B 30432e92cc79cd30318bc23254b124e3a36d6078d15dc7d2d6d58732bfebe406a4b99aac13e1f6447bb6b14a53a21218f05055e1f82b445914d4062c63d59ea4 SHA512 dfbe742e16a5332121b625fb9bd1c4d18836b3efed846b1dbdf8e9ab759032a4ee7d72f4bd393bdbd949e73908b44099106240a953c0ff9553e5e6d29c24faf3
+EBUILD libfreehand-0.1.2.ebuild 1188 BLAKE2B 3a8bb50e8609ad253f17b3e7eaaaba8d07ece4273de198aafe7cf526fc644cda20e747241c007449bcfea6a23822c583e3abd2bcc8cb05a6ee7d5d7e04bd7e37 SHA512 b03c5417960418c4d0227597ca42b11b68135dcdfaf984a77db8527dbae2b9e6375bd52e2bd380d22dbe7543d992788730e92f63e18ca81c7bebdd310ceb12e1
 EBUILD libfreehand-9999.ebuild 1171 BLAKE2B edf9a99dd928bda98b3d15dcdb2c4943c3499fb14d0d51f0d0287b55236323f1ae0e9377d09bc221fdf42a2c00daace6a9fa26a3a79a797446a91451306c7fdd SHA512 ce17b320bd3c30f4f36d315a45309fd54eba638fe95bc12cef2cb08da575bad983406b1f4725ecd6a0bc7aa6766aea1a542cbdb0080f45e1e5cfd292042b7d80
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index 0eaea8fc2a9b..f27b47bb1398 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index 3510b1b48402..db5f31389f30 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,4 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
 EBUILD libggi-2.2.2-r1.ebuild 1378 BLAKE2B 237bcf61189c4d71bd119cddc4c257eda453a64c7fcc02d41f3a7ef44a0e7de0f62d6624a9a6353e6f138fcdfd3bed6a7547e5216b671b4ac7c54626cd046a62 SHA512 80c83cdeeb852f91acdbf0eb9073796fb1617dd28107cedd877b85c04f1068f4004c79be532ee66b6cdcd8d5cb315d98e4b4b3a4fde0be4d16134a195548ac8e
-EBUILD libggi-2.2.2.ebuild 1529 BLAKE2B 24954c7d8d9f3fc779f6840dd3fda3bda764a3f7eba14466875e91de15040dac99db642f0b0a92cf4f14f5bfb5e19b7af083d9e804be740164657f7af3e561e2 SHA512 3f4e4d5783949f2aaed32037955869910d86c180c662453b0b6c93aeb9da7a050e88f19c560a5526526e5f618126c62a82d2f61ab5c0193559b516d5627e7741
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
deleted file mode 100644
index 521bb6974d00..000000000000
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Provides an opaque interface to the display's acceleration function"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X aalib svga fbcon directfb 3dfx debug cpu_flags_x86_mmx vis"
-
-RDEPEND=">=media-libs/libgii-1.0.2
-	X? ( x11-libs/libXt
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-		x11-libs/libXt )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	aalib? ( >=media-libs/aalib-1.2-r1 )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_compile() {
-	local myconf=""
-
-	use svga || myconf="${myconf} --disable-svga --disable-vgagl"
-
-	if use !fbcon && use !directfb; then
-		myconf="${myconf} --disable-fbdev --disable-directfb"
-	elif use directfb; then
-		myconf="${myconf} --enable-fbdev --enable-directfb"
-	else
-		myconf="${myconf} --enable-fbdev"
-	fi
-
-	if use amd64 || use ppc64 || use ia64 ; then
-		myconf="${myconf} --enable-64bitc"
-	else
-		myconf="${myconf} --disable-64bitc"
-	fi
-
-	econf $(use_enable 3dfx glide) \
-		$(use_enable aalib aa) \
-		$(use_enable debug) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable vis) \
-		$(use_with X x) \
-		$(use_enable X x) \
-		${myconf}
-	emake || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	dodoc ChangeLog* FAQ NEWS README
-	docinto txt
-	dodoc doc/*.txt
-}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index aeb17aefcb37..a12cd04bcbc7 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
-EBUILD libgphoto2-2.5.22.ebuild 6232 BLAKE2B b57827e478aa21fdc68b07e1e8222ee488c4c5b4dcbbc0a21b6d0272dae78b6bfeb947361cf0bb110c0df520fed01e0c712b689878cf45cf9c4b36a87bca5765 SHA512 a7f54d69d66b3337ed1150ff97752a821ed25b5b22957eb98c5a354859aa7a3053433416b3d19ade20bee47c7e6e47922f8f3ddec259c3dd00b990edab038134
+EBUILD libgphoto2-2.5.22.ebuild 6231 BLAKE2B 87419dc414d34ef6722f6fed1906c026eb9eade7663f6bcd966fbe7c2df55b0d5ff03577d28d146a8d48eae09e172d32ebd02b76e80eb805f10105e2ff71411a SHA512 9bba7a79f8d8fe7f5e6d7007a4ebe142a67057d405b772dd0306484298c3ceb2079fa432a61064ad3e487a977173075fea4610f88863c7f6a86f34cc23e145b4
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index 6ecdd4bfd8b4..b6417dddee32 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index f478911066cd..2f338ee08217 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,7 +1,7 @@
 AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
 DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
-EBUILD libheif-1.3.2-r1.ebuild 1247 BLAKE2B 5c420043fad3797adcdddbe1604f6264a110596495edb2a74bc8ad6eefed7ea985fd5f11d0e3901c442132f6423e0853086bddbde9203d1f79185f222eec91c0 SHA512 cf43868c006597926163c7a095248c375a09f4bf33406a9d6e7b2819f8536a48ac76f413635ac4b380a884d43bc2f3f47a2a0c49162084d776e07b731876c0c1
+EBUILD libheif-1.3.2-r1.ebuild 1253 BLAKE2B 2c16caae78c6ae8858ea3c9db14ca532768b10b7c748804c8e79705eb9f61cf59c2d8a4b40f633b2cdface010bdaa411370c057a541affb644f7d796d993bb8b SHA512 5851eeaf4b4f45414cf5c61c4a62685c40298e490353df573818f3467832c5bf712a82822e8c339234e15edd774b239d352dab0d8ca7ee7f2fcae55fb1e47d41
 EBUILD libheif-1.4.0.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
 EBUILD libheif-9999.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild
index a18e6d840ab7..f65ef1de3e8b 100644
--- a/media-libs/libheif/libheif-1.3.2-r1.ebuild
+++ b/media-libs/libheif/libheif-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 arm64 x86"
 
 	PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch )
 fi
diff --git a/media-libs/liblo/Manifest b/media-libs/liblo/Manifest
index 3f1da0cf4fae..378249a03bb3 100644
--- a/media-libs/liblo/Manifest
+++ b/media-libs/liblo/Manifest
@@ -1,6 +1,3 @@
-AUX liblo-0.29-ipv6_build_fix.patch 4943 BLAKE2B 3555606b1f3aa1409facd5bb81947b02bfc5eab60463134e591249d3eef0b3638eaa002feb4b101decd344efe751310b15d8e8e645d2a2fc9345a88987a2eb20 SHA512 3f077109bcc8e0e5ffb18e41b8e27a9809aa00f59dbba40c30f3a83a526aad4ca25e620b0fb59825de5da37e27b4596572cfad0769c330eece1cfe857293dc3f
-DIST liblo-0.29.tar.gz 645313 BLAKE2B 2ef68c49446c83e13541e626eb666360f4b1b579abd2685a9eeaf18989e0252860a7c2eb99e9f6991210873b60dd4b0a62f4f2adfe88c8ac2e069b41fea0e2d4 SHA512 11e20725a049c55c02ef8cd106be5802507f3df95422d8dad10009bdd1237af7517e3261c7336c3005e21ae8fd1e663badef46e4bae006c7af70520bdb336c7c
 DIST liblo-0.30.tar.gz 641498 BLAKE2B d884cc723d770f45414e838b6f2520c1f3b2a11972a9977d19b20ba68bc653f895eeb21ba0182a09fde1f096c9be084def1572f747463cd71e96bf0022ef7549 SHA512 51132933cc23237b70ed08fa7986a4a9f838529b83807746b358bcc171f8bbce7f37115b7c855520c9219bae93c74e502aebfb90e44dabdc6d0a00b8335336e3
-EBUILD liblo-0.29.ebuild 954 BLAKE2B 7fb70af478e08e76f4a78ef76cf4fe55437765097bcfd0041eacf189238f6b0a5521d462bc2e19b990e8d1b197b731db2cc424d1d9cfab9257ddc29b433a025f SHA512 bbb2fdae4173ece64cf88700ca30bf206c1c1c134e4f6d9ce4f008536d065cc38113102440d0c4a70ef369a50466678c1f8d56a12661757c0bd5352709722fc5
 EBUILD liblo-0.30.ebuild 916 BLAKE2B 2f92abf52d3aaedf60ecf0916bd454ce9678f9aebef4c87708170ab50545f748ad7da596c0fbd9843595b4d060cda3eaa9b6fb0f5d83e18e621f5fc29d68fff6 SHA512 0e1c6be66f68f6446e20873a3ec4becfda57ec4e52d3b5d9c660574b3c994a371e4702166fc36264862baaab2111c09d6886752032a81321346464c70219a055
 MISC metadata.xml 470 BLAKE2B 1402a4921f55313ebaa73a1b4733f9e850943fe23033fdd0980df892665ed42355762d27c64f2091a23d4d72e991498628dcca0a26df55603b086ed3c87ab6f5 SHA512 2604ac7fbd125c9f45faeefcad35a40bcd65d4034311cda5a95ceaaa3904b7e46b6e449f0373ad6f0ffca66ff9bd23d785a035a63888adc754939e19fb93eb56
diff --git a/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch b/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch
deleted file mode 100644
index 484fddbd6032..000000000000
--- a/media-libs/liblo/files/liblo-0.29-ipv6_build_fix.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 968dff4d576ca102525c81beddb36a623890424b Mon Sep 17 00:00:00 2001
-From: Stephen Sinclair <radarsat1@gmail.com>
-Date: Tue, 29 Aug 2017 14:32:24 -0300
-Subject: [PATCH] Resolve hostname using getnameinfo for ipv6 support.
-
-Iterates on interfaces, possibly searching for a pre-selected
-interface, and resolves the hostname associated with non-localhost
-addresses.
-
-Fixes #56, fix compilation with --enable-ipv6.
----
- src/server.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
- src/testlo.c |  7 ++++++
- 2 files changed, 72 insertions(+), 9 deletions(-)
-
-diff --git a/src/server.c b/src/server.c
-index cf20495..4aff673 100644
---- a/src/server.c
-+++ b/src/server.c
-@@ -55,6 +55,10 @@
- #endif
- #include <sys/un.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_GETIFADDRS
-+#include <ifaddrs.h>
-+#endif
- #endif
- 
- #if defined(WIN32) || defined(_MSC_VER)
-@@ -298,20 +302,72 @@ void lo_server_resolve_hostname(lo_server s)
-     /* Set hostname to empty string */
-     hostname[0] = '\0';
- 
--#ifdef ENABLE_IPV6
-+#if defined(ENABLE_IPV6) && defined(HAVE_GETIFADDRS)
-     /* Try it the IPV6 friendly way first */
--    for (it = ai; it; it = it->ai_next) {
--        if (getnameinfo(it->ai_addr, it->ai_addrlen, hostname,
--                        sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0) {
-+    do {
-+        struct ifaddrs *ifa, *ifa_list;
-+        if (getifaddrs(&ifa_list))
-             break;
-+        ifa = ifa_list;
-+
-+        while (ifa) {
-+            if (!ifa->ifa_addr) {
-+                ifa = ifa->ifa_next;
-+                continue;
-+            }
-+
-+            if (s->addr_if.iface) {
-+                if (s->addr_if.size == sizeof(struct in_addr)
-+                    && (ifa->ifa_addr->sa_family == AF_INET))
-+                {
-+                    struct sockaddr_in *sin = (struct sockaddr_in*)ifa->ifa_addr;
-+                    if (memcmp(&sin->sin_addr, &s->addr_if.a.addr, sizeof(struct in_addr))!=0
-+                        || (s->addr_if.iface && ifa->ifa_name
-+                            && strcmp(s->addr_if.iface, ifa->ifa_name)!=0))
-+                    {
-+                        ifa = ifa->ifa_next;
-+                        continue;
-+                    }
-+                }
-+                else if (s->addr_if.size == sizeof(struct in6_addr)
-+                         && (ifa->ifa_addr->sa_family == AF_INET6))
-+                {
-+                    struct sockaddr_in6 *sin = (struct sockaddr_in6*)ifa->ifa_addr;
-+                    if (memcmp(&sin->sin6_addr, &s->addr_if.a.addr6,
-+                               sizeof(struct in6_addr))!=0
-+                        || (s->addr_if.iface && ifa->ifa_name
-+                            && strcmp(s->addr_if.iface, ifa->ifa_name)!=0))
-+                    {
-+                        ifa = ifa->ifa_next;
-+                        continue;
-+                    }
-+                }
-+            }
-+
-+            if ((ifa->ifa_addr->sa_family == AF_INET
-+                 && (!s->addr_if.iface || s->addr_if.size == sizeof(struct in_addr))
-+                 && (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), hostname,
-+                                 sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0))
-+                || (ifa->ifa_addr->sa_family == AF_INET6
-+                    && (!s->addr_if.iface || s->addr_if.size == sizeof(struct in6_addr))
-+                    && (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), hostname,
-+                                    sizeof(hostname), NULL, 0, NI_NAMEREQD) == 0)))
-+            {
-+                /* check to make sure getnameinfo() didn't just set the hostname to "::".
-+                   Needed on Darwin. */
-+                if (hostname[0] == ':')
-+                    hostname[0] = '\0';
-+                else if (strcmp(hostname, "localhost")==0)
-+                    hostname[0] = '\0';
-+                else
-+                    break;
-+            }
-+            ifa = ifa->ifa_next;
-         }
--    }
- 
--    /* check to make sure getnameinfo() didn't just set the hostname to "::".
--       Needed on Darwin. */
--    if (hostname[0] == ':') {
--        hostname[0] = '\0';
-+        freeifaddrs(ifa_list);
-     }
-+    while (0);
- #endif
- 
-     /* Fallback to the oldschool (i.e. more reliable) way */
-diff --git a/src/testlo.c b/src/testlo.c
-index c128d10..c69570c 100644
---- a/src/testlo.c
-+++ b/src/testlo.c
-@@ -704,6 +704,13 @@ void test_multicast(lo_server_thread st)
- 
-     DOING("test_multicast");
- 
-+#ifdef ENABLE_IPV6
-+    // Print a warning but we let it fail, prefer to actually fix IPv6
-+    // support rather than just skip the test!
-+    printf("WARNING: Compiled with --enable-ipv6, multicast not supported;"
-+           "failure expected.\n");
-+#endif
-+
-     /* test multicast server and sender */
-     /* message is sent from st otherwise reply doesn't work */
-     ms = lo_server_new_multicast("224.0.1.1", "15432", error);
--- 
-2.14.1
-
diff --git a/media-libs/liblo/liblo-0.29.ebuild b/media-libs/liblo/liblo-0.29.ebuild
deleted file mode 100644
index 034568c3215a..000000000000
--- a/media-libs/liblo/liblo-0.29.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune
-
-DESCRIPTION="Lightweight OSC (Open Sound Control) implementation"
-HOMEPAGE="http://plugin.org.uk/liblo"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos"
-IUSE="doc ipv6 static-libs"
-
-RESTRICT="test"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ipv6_build_fix.patch" #627832
-)
-
-src_prepare() {
-	default
-
-	# don't build examples by default
-	sed -i '/^SUBDIRS =/s/examples//' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	# switching threads on/off breaks ABI, bugs #473282, #473286 and #473356
-	myeconfargs=(
-		--enable-threads
-		$(use_enable ipv6)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index d2680e8eecde..61be35b9bb76 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,7 +1,3 @@
-DIST libmatroska-1.4.9.tar.xz 64556 BLAKE2B 9f2c01213edd979b325eb1dda148054bc6e0117ad41b29385f6d505108d4e2a4da643df76f957d07541bb581e71d5fed9875f1aef0804894cbab4cc39da50a98 SHA512 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33
-DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852c20e5a25f6bb9376cd4b5224bfc7db3f45daffa5ccff140af75a2addca2bdac024228c7512016e6568e669c639e7 SHA512 eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754
 DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
-EBUILD libmatroska-1.4.9.ebuild 661 BLAKE2B ae2a926e737b0cc32a9c8c0976e2d66c6a9c58eb0ed4ed23d970c626408736cc757944aade2ac03b3182d745f2ead53e67e12995f1aae82087a2a9b4ef47b7c4 SHA512 be7d2508b8ef0ce98f23330b7192a64cbd50ca62d26c4fc8e4865e76a048d2f08e2aeb1af4b056f066a8b58bb02da6fbfd3275155e17f401fc23fbcc1b15a2b6
-EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
-EBUILD libmatroska-1.5.2.ebuild 666 BLAKE2B 262d6c7bded3af018b70ff9d392abf21029d5b50dcf1a5af2e04f9d6343b8e7a6fdaa60384f93b346a993e27a42ff70036806dc9be316cae2fd045ec86537d3c SHA512 d56df76b7c9a4ff576777bbbbd6421a92871451355a80c04dca4b055bab051d6bd4d76f8dd8529f3df1beba0bf1df8ebc73a59cf967630a5eee9a7dc9755178a
+EBUILD libmatroska-1.5.2.ebuild 661 BLAKE2B cc6818261f4825ea41ddb8581460eb39b55a6178e22a51de99b54927eff4e84a2b0b0fd7d9ead73de59f68ccc3650f27d1ab66b1cb095195ae0d4fb5ddf90bae SHA512 6c88b451c9e3e9be32d2459af125bf3f560c49e56bf7cf23ff09802c10861802b42142a50523456a529c25a2505a03b41893e8b3acf38d48c53476578525b42c
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.9.ebuild b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
deleted file mode 100644
index 830cbf92352b..000000000000
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libebml-1.3.6:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libmatroska/libmatroska-1.5.0.ebuild b/media-libs/libmatroska/libmatroska-1.5.0.ebuild
deleted file mode 100644
index 960db31935ba..000000000000
--- a/media-libs/libmatroska/libmatroska-1.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libebml-1.3.7:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
index 55b853f488c1..a84fbb11012c 100644
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.9:="
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index ce3c266d0435..a069d43e6569 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,4 @@
 DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
-EBUILD libmtp-1.1.16.ebuild 1623 BLAKE2B 9e5b832e442a3cd600f779624047114fc54bd5cb411c4779bbd1a6ce292bca3bc5fb7de86f8df2bb973c1380f7410c5cc1773c4493745594e3044fc85bd00f10 SHA512 691de364d8d835506b0332553c44c88cd20a02804731533ccebc76a87dc34f2198a6e6ac726a03c9d8d6f183e39a6c513451875ce84ef44b1ca843ec6cce6062
+EBUILD libmtp-1.1.16.ebuild 1622 BLAKE2B f7356daf622a2861ffcd8d9a4caa00e40a53f25499df6fb74f34cd5d14ea9277344a4cc003569b43a41f4de6a38992e8bf2f3c7c578eda91de63874e6ac1cc10 SHA512 dcc6821a7bc13e4aa5be63c4558830939d2c4df4e6d0e1bf72f69cc863185d7787d495454b47e77d9bbd3cddb1b5ecf2649e119523dcc126aae56a851565de56
 EBUILD libmtp-9999.ebuild 1628 BLAKE2B bad7949d12c89c03d2d2ab92e83dd19943998aedf2b031f2ce0e60f811653654670388615c43177466fa10110ec077a83c95131df557584197f107624063bd49 SHA512 7942bb95447ea68b21c7da14a2236ba05ea73316350b3a7dfc40db4603a9f16311c3ab0d795278efcbf3550306009209239bdd53a13fec784d4a8ce2d1ca3da7
 MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
index c70009186dea..ec06cebf2005 100644
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 5b8718da74c1..464e5447fc68 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -2,7 +2,7 @@ AUX libmypaint-1.3.0-gegl-0.4.14.patch 4368 BLAKE2B f4094718153e1cf08a173f2a350f
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
-EBUILD libmypaint-1.3.0-r1.ebuild 1380 BLAKE2B c17825bf21bfbf5774a85a2f2b088ada6b700d3ea7f39b7a5a87c190a4ee18b209dec2b50524c0e24f0d206305f4adb553c9e990ba40b1d4277dd7361d0f2e01 SHA512 f8ce3da4972b0138025522aaa5cba4f78bb10d049b94fe13af1b1b3a53d4f26c3b5ab6bf4b213458f95ed65ba8f16b197fca6a70c5d1ef88c9df70d9958e0ec0
+EBUILD libmypaint-1.3.0-r1.ebuild 1379 BLAKE2B e3603b7a33c563d63cae697e8bca9f1c4dbb94d6872f96207db9867a53108ca78270e637c6063a747158ecffcfedabb687c6a06b6a3c897f5679c32c45326635 SHA512 4343dc01b4d811b94f5b735a6b42a4ce11330c3f62675d5a0e06b68adf9b2ab49b3103f6189874f0c1a5fc5ede3b2a7de4547f47fa91dca90bcc0f0588e3ecc9
 EBUILD libmypaint-1.3.0-r2.ebuild 1461 BLAKE2B 2f6429f2b99c144dba254bce0f20d8110f553d6007c23b8d933090d2adbfe749249415ac42bcea68f4d0cd874fab7cc2b1c3791e899b05f85ed2689e5314cb8b SHA512 e21750363fc23262d7614ee879bd9580e95cfa0bf10cef555eea73a39f52edbe4cb8db7f71b5e755dca05170245326b244f8509111c7a87a31128ee39b0a1189
 EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
 EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
index 48b121713f5b..209570fc8852 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 55d0aca6233c..b890b44df724 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 967 BLAKE2B 4252a8234bf5346dfd2413aa7d751f0538dd7f95341522ac86a11445a166c903c8193ecafdd2a6c05d3c917abdf03540207bc034256871c57ba39494287b0b24 SHA512 8158046266acfd271c6bc4c91b27194c48e423c2386b2c19c1adfd35fa831341e5f024397407e3f54638d4749065b97eb4471fef3d7b55a980b39f4bc37c966f
+EBUILD libpagemaker-0.0.4.ebuild 963 BLAKE2B bd7058b441a96b4888dbc446cfcb08b978903132f8177830cc0d782dd28df273918a41c72c55aa9d8205806a04d23b9db7b0072ff18600fb006e8e6cad983bf4 SHA512 0d292c6474ac837be80f508ab584956b66a573d5d1f0cb281c70a485d4491a6e9b801a380f35926f5990587484c941eb796af0cdd4237f39f73d3da43efff2d7
 EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 60251afb91c8..52f9c783e3ea 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 439c265ba0b1..e228c8dcd632 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -5,5 +5,5 @@ DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
 EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
 EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
-EBUILD libpng-1.6.37.ebuild 1365 BLAKE2B 5afc18298758ca823534f0ceac625a8a30edfdb31a3c7265b90c0c05882879812a749808f5580b9add835a9269947b0c2dd370d3d49b72d18c27fffd5a043cf9 SHA512 dbd994a0f140e05b62d6d754b7026ea68c520771e5794800122c82aedc7a52cedee9c278612cffb42c26310be13abd2a72235e8c2fcd35722ef21481de2caeda
+EBUILD libpng-1.6.37.ebuild 1372 BLAKE2B 79c18b86aec3af6bfd0f54228b7dcfea480f6dd85c0db4156b5ed2325dbef10fb5a7d52dab74ababcef7eb8733f7cd4f03ea6d0f7779db32e95764eeba6d3790 SHA512 5ee8d91834b74cb013358d1a61d1e330ab1d073abd5285bc830d4432f4b93535a9afe9bda04774fc606ec6b81a798582c8bf679d936f581cbb3719a14c79ac04
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index e9519907ac8d..fda499f3c369 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index c41a5e05eebf..433e8616fc48 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
 DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c
-EBUILD libqaccessibilityclient-0.4.1.ebuild 629 BLAKE2B 1bf60e020ff19695eb84f7c8794c819ee45f302e1bcdec93334f2a38ca2bc3ae6feda9c41ea80d273b81a77c276f34a48baac3e07df5400a8bdca2ec9232dc48 SHA512 5bc23325808ea36235f8aecb8e2f4eb941f8e9315561aa68dcb3c5fab226a458669a7eb25d019a833c1f2b8ba9f1cee407b9160056189d7e5beeda32dcb06ebd
+EBUILD libqaccessibilityclient-0.4.1.ebuild 628 BLAKE2B de5ad3ad92a64641da50d2bf44d5ecbc0a5a67d87004aacf850797694d27974130bd0e73bb9944abf487b6a74639d0c13fbabb196bda60e8e70b86a3f307b04f SHA512 55e7df2b5665f715e4e4e94315e2c5a434e25b417565d6678d0247f8d31d121951531805f7fb645479542d1f062e1ad84fb3b3dfcb4ae1cb2e34933eb2abeb2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
index 244647903c51..fd12c42aff63 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityc
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 93d4c5cb7070..3d0426a3e7e8 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,3 @@
-DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
-DIST LibRaw-0.19.2.tar.gz 553780 BLAKE2B 45cf88208a902fff476a51cc95434d1033caa9162278db64bc610d63bafa5a29f7281ebf353bea7242fc1aef2ce315f45e34e91a4079d4b6da5217e46a04fdaa SHA512 a1472720ca40a86e19fab7579e37246ad7f512249594c2162d7d6bd5a29bb756f1e4d7948fb8f23137661aea8a9423d7b8c7672834102155ead5546155f6be88
 DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2
-DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
-DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
-EBUILD libraw-0.19.2.ebuild 1495 BLAKE2B 8d447b1613e72790cf2e3c556741b3eec0f331ebbf140416cad2595125f757d4c5ce32131b54f954e5dfba3758ab5ca4d41719e2be6bf23cc0b64d039edbc858 SHA512 658dbcdecfed69773dea274a272afa0232a080ce4e21921a528efd2de6bb43ff26a1e2b0010acfa113f3c2b631ba1800bb6ef8ed0a6e1bb4c7ee7858cfbaf28e
-EBUILD libraw-0.19.3.ebuild 1490 BLAKE2B 054b70c3f99ef69baad79df141cb6e43136f6c52b5d00ecc5502692fba8f7562683e96e31c7a5b57512de1ae1f879dae6c63cb6370a1cb3fc68652e2b54b7ca6 SHA512 cf8e92dcc205e05ebfd09eacc9d249ef872ecf89fd39a7f1e34df94c3807f8e5aaa02408647db2ddcd343d8d7238abcf7666110e03e4a963b59928654818480d
-MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
+EBUILD libraw-0.19.3.ebuild 1488 BLAKE2B 1b47f7da7acc3011b7557ab3c724d1dd5fd6195557a3d928dad9885252e5761064f2b03cb4ec746537951cf8d007cbf7af11ca9fa69f56129aeeca8fdb4746db SHA512 e2fc80e686eced406f1bfa55836c645510c84a8fdb9a372e431fc6646fd5e76adb2580189ac3b4cae527ab90fddcf6d43a0e598eaf7a5fa33aa11819d4c7647d
+MISC metadata.xml 337 BLAKE2B 895688be926ca12497ac0fa00495cdecb0cbc5547e495bc52b394a3ed8fe6e27dce2e891daa46aa5caff8b710e680d1f54e3035a5cd89af504b2d1005950a434 SHA512 982fc145a755a52aba352b0cac94f6d32caf2b74f86d24da90466955330177f94d2e9135e9bda4a17d9e9a554c7dab9ac6e5b3a8a042434989c5dbf7975c9062
diff --git a/media-libs/libraw/libraw-0.18.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
deleted file mode 100644
index 1510fc0e5b09..000000000000
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.19.2.ebuild b/media-libs/libraw/libraw-0.19.2.ebuild
deleted file mode 100644
index e173c4608942..000000000000
--- a/media-libs/libraw/libraw-0.19.2.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 autotools multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README.md )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index 36fc208c4875..dac5a5a9ced5 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index a09979d7f181..270c52dee7d9 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -5,9 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="demosaic">Enable support for external interpolation algorithms</flag> 
-	</use>
 	<upstream>
 		<remote-id type="github">LibRaw/LibRaw</remote-id>
 	</upstream>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 02d122ac4a2a..54ca5bb449d3 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,8 +1,7 @@
+AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bfa5f43fdd82281e8022db62c30bfed671298f9011bbf2bbb59d6613dd9fe6e118ec71cb98b9d976c96c5d046fea46156d15 SHA512 bab5b6788b1f09f60a2686ce385496b31b6dcc4c5d76fb8abaeb5f2eb4d2fc6cdada8295e555c1f1527a70465452b0263ea54a0eea5f626f3faa266049b25119
 AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25eb0eb3436478c1dddb4165c14d543793e2c378401f7b371976ffea38d6c3ceba4c4e4bfe415c0cfc4d07e62f2ec18dfc3f SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0
-AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
-AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd71b58fb53ff6e5efce8486e5009d05babff6fd5ee46e46bcea7386555bec0078d894fe81e211844fd6a366c855e2d72799932 SHA512 fdb54d6a8ee1fa1596dad2cf16cb389038167e4ccea123f68e54bd096600e90d86de254667c7dfc46f80ca62edae9f0f47fb3307c72bce5c142afb146870a9b1
-DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
+DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
-EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
+EBUILD libsdl2-2.0.10.ebuild 5324 BLAKE2B 68386a905f34fa505d6c15e5798b1f2ec12cfb75582640541c2bd6d9740ef7e0c093c63c3df37c413099026f6f0164cd0d0deee886bd64325f7f93eed8f35860 SHA512 c8be24393a12507764a0d8f9b4b0c39e081a2d42b4270828af90244c8268ce59a0e7a3d23287b3bb66dd90bd7d0c8a4600507305e9a38e2d3ec12576ee09d508
 EBUILD libsdl2-2.0.9.ebuild 5397 BLAKE2B 25db64fa1f24e9e6c097a3dead86ac350afa31712ed6c87bae67b4b30584dc96fbe65c4edca029dc0dcbea510259bcdb4896fbef577b5a951e4455da85bdf759 SHA512 76f69076eaa39510c84284cbedf19614c681eb0708bc98f324155211ca806927232bad73613fa06fd2a5569a503349872707fa5f83b1410f54ec10fc799b00ea
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
new file mode 100644
index 000000000000..0b01568af6ad
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
@@ -0,0 +1,44 @@
+--- SDL2-2.0.10/configure.ac
++++ SDL2-2.0.10/configure.ac
+@@ -3648,7 +3648,7 @@
+         if test -f /lib/w32api/libuuid.a; then
+             LIBUUID=/lib/w32api/libuuid.a
+         else
+-            LIBUUID=-luuid
++            LIBUUID=-Wl,-luuid
+         fi
+         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
+         # The Windows platform requires special setup
+@@ -4069,10 +4069,10 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+-	\\$(WINDRES) \\$< \\$@,g"`
++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
++	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+--- SDL2-2.0.10/Makefile.in
++++ SDL2-2.0.10/Makefile.in
+@@ -147,13 +147,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
deleted file mode 100644
index 9fc43f2b38cf..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1524545759 25200
-# Node ID 28be2719184c8177899d96b696bcf5e28451266f
-# Parent  2a7839691e3d88c0480c4a855126d5fa03f9ff6a
-Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc
-
- Azamat H. Hackimov
-
-When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc:
-
-CMake Error at CMakeLists.txt:147 (add_executable):
-  Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has
-  leading or trailing whitespace.  This is now an error according to policy
-  CMP0004.
-
-diff -r 2a7839691e3d -r 28be2719184c configure
---- a/configure	Mon Apr 23 21:50:03 2018 -0700
-+++ b/configure	Mon Apr 23 21:55:59 2018 -0700
-@@ -15752,10 +15752,17 @@
- #    fi
- #done
- SDL_CFLAGS="$BASE_CFLAGS"
--SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
--CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
--CFLAGS="$CFLAGS $EXTRA_CFLAGS"
--LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-+SDL_LIBS="-lSDL2"
-+if  "$BASE_LDFLAGS" != "" ; then
-+    SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
-+fi
-+if  "$EXTRA_CFLAGS" != "" ; then
-+    CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
-+    CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-+fi
-+if  "$EXTRA_LDFLAGS" != "" ; then
-+    LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-+fi
- 
- base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
- 
-diff -r 2a7839691e3d -r 28be2719184c configure.in
---- a/configure.in	Mon Apr 23 21:50:03 2018 -0700
-+++ b/configure.in	Mon Apr 23 21:55:59 2018 -0700
-@@ -123,10 +123,17 @@
- #    fi
- #done
- SDL_CFLAGS="$BASE_CFLAGS"
--SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
--CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
--CFLAGS="$CFLAGS $EXTRA_CFLAGS"
--LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-+SDL_LIBS="-lSDL2"
-+if [ "$BASE_LDFLAGS" != "" ]; then
-+    SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
-+fi
-+if [ "$EXTRA_CFLAGS" != "" ]; then
-+    CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
-+    CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-+fi
-+if [ "$EXTRA_LDFLAGS" != "" ]; then
-+    LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-+fi
- 
- dnl set this to use on systems that use lib64 instead of lib
- base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
-
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch
deleted file mode 100644
index 95dd17304810..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur a/configure.in b/configure.in
---- a/configure.in	2018-03-01 16:34:41.000000000 +0000
-+++ b/configure.in	2018-09-21 21:02:34.823834390 +0100
-@@ -1411,7 +1411,8 @@
- 
-             WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6"
- 
--            SOURCES="$SOURCES $srcdir/src/video/wayland/*.c"
-+            WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c"
-+            SOURCES="$SOURCES $WAYLAND_SOURCES"
-             EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)"
-             AC_ARG_ENABLE(wayland-shared,
- AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]),
-@@ -4003,6 +4004,7 @@
- $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS
- $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS
- $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE
-+`echo ; for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS_UNSTABLE ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo`
- "
- fi
- 
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
index 27ba581990ae..20b9115c6f4f 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
 DESCRIPTION="Simple Direct Media Layer"
@@ -11,20 +11,21 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver"
+IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	gles? ( video )
 	nas? ( sound )
 	opengl? ( video )
 	pulseaudio? ( sound )
+	vulkan? ( video )
 	wayland? ( gles )
 	xinerama? ( X )
 	xscreensaver? ( X )"
 
-RDEPEND="
+CDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
@@ -59,9 +60,15 @@ RDEPEND="
 		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	)"
-DEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="${CDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
 	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/SDL2/SDL_config.h
@@ -72,19 +79,18 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=4144
-	"${FILESDIR}"/${P}-rework-variables.patch
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=3977
-	"${FILESDIR}"/${P}-wayland-headers.patch
+	"${FILESDIR}"/${PN}-2.0.10-static-libs.patch
 )
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
+
+	# Unbundle some headers.
+	rm -rv src/video/khronos || die
+	ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die
+
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
 
@@ -106,7 +112,7 @@ multilib_src_configure() {
 		$(use_enable threads)
 		--enable-timers
 		--enable-file
-		$(use_enable kernel_Winnt loadso)
+		--enable-loadso
 		--enable-cpuinfo
 		--enable-assembly
 		$(use_enable cpu_flags_x86_sse ssemath)
@@ -131,7 +137,6 @@ multilib_src_configure() {
 		$(use_enable sound dummyaudio)
 		$(use_enable wayland video-wayland)
 		--disable-wayland-shared
-		--disable-video-mir
 		$(use_enable video_cards_vc4 video-rpi)
 		$(use_enable X video-x11)
 		--disable-x11-shared
@@ -153,7 +158,7 @@ multilib_src_configure() {
 		$(use_enable opengl video-opengl)
 		--disable-video-opengles1
 		$(use_enable gles video-opengles2)
-		--disable-video-vulkan
+		$(use_enable vulkan video-vulkan)
 		$(use_enable udev libudev)
 		$(use_enable dbus)
 		--disable-ibus
@@ -176,6 +181,9 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -type f -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
 	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
 }
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 2527bb05d2f1..d7ed21296511 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,4 +1,4 @@
 DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
-EBUILD libvisio-0.1.6.ebuild 1214 BLAKE2B 470e0e680818d5ad606468f19dbb1450cee5e2d28da5d171e44c47fd8910baa30c1864c9e9947f1eec4d3a0ecae4a2c3f09e5ca9998622b629d439c191ae5eb4 SHA512 91343f0652d2f99ac62d5a43d5962548a58ba8d6da511dee663d54f10249000c61685cea0f4f7c421a9681a499d68aedc7cc3e503eb5e607e70024bc2a04a540
+EBUILD libvisio-0.1.6.ebuild 1210 BLAKE2B d2ea49d29ab3c84b415849c7434fd249e2d2d133c6e68db5f01b6bdb561aec6197ebbe3798a7112ca0c41a307fe3f08ba6e176b0f2ac6a43f7c8984f2a54c136 SHA512 b64ee3644f2eb32d2d9cf7eee267f04e4f60b49015ea7014b341d1643b7a3757d45ee93c6a8eb1ba580991ae5becfeeceefc0cef382a0d63c0239bff229f5530
 EBUILD libvisio-9999.ebuild 1211 BLAKE2B 50fe1bbacc7ac8885aa556a5a1123267567e5cc7b3db06ba5b3341b9511bd254c8899135c6a64bd053908d31a4634b35e26a6f87229fd972a1725d69b1d2df3a SHA512 50653377d8d8e6b326ac79e4de255b793db97f0d4fc12520117174a7d96746c435af694e2f7c8fb367abb7522ee3a3145ff6387dee0cdf85ec14d2d15042b9fa
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/libvisio-0.1.6.ebuild b/media-libs/libvisio/libvisio-0.1.6.ebuild
index 9e713e78e915..7506f6f6c417 100644
--- a/media-libs/libvisio/libvisio-0.1.6.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test tools"
 
 RDEPEND="
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index 606bc171f2c9..629339c6a1c5 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
-EBUILD libzmf-0.0.2.ebuild 1019 BLAKE2B 1cae493daea274747f51be385e19cf4159a1c96e2cd163626fc3e579d8debcf7abbf6f6ae8e7eba9b77f0be31180a767a92c4d9ecee217e71be09b2ebb8ef48f SHA512 5864ac289201dae76686c5d8fec52f88bc6fba67c36631184e2008daf8af28afb7af9aa5e581e748a3de6e6e01621ed91a314c7c5e5bf62ae95732c14c2fef78
+EBUILD libzmf-0.0.2.ebuild 1018 BLAKE2B 19150af50a62fb840b2e1d789c7ee806e206e4cef7c90b6aea2bc2980c3c9174d27a836d4961eac6cde3ecba14834c2135547f7d93ebf822207773475da0d538 SHA512 45c92dee3f83ee41cd0f23706dc5e584d9cc96880823eee0269a745f06816988ec7bbbded2acf19471d4d5ae794228461803ccd7b740fd7ddc50122806d6598a
 EBUILD libzmf-9999.ebuild 1014 BLAKE2B 255a8b8d4297d17e4ebc7040156a964bf9b474d7c1bcc140d2331aff5b2018815d1e2bdb4a81a6b779a7525294055de52d59422fd1d19837f7822cb78522e0ba SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index c29487195fef..bd353a89f5fe 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 IUSE="debug doc test tools"
 
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 5791f851bfb1..927037d9a4f9 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -6,5 +6,5 @@ AUX mediastreamer-2.9.0-underlinking.patch 1969 BLAKE2B 6c820661cc5cb0c8dee4523e
 AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3f9411ec3d91ddb4b2e2880d5bac8b2cdc4aba5b5a0b18830f975401b35bfde23409215f40a2ed8ec8847e8173f36bf1ff021e592f SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
-EBUILD mediastreamer-2.9.0-r2.ebuild 4606 BLAKE2B 14f15ab5fe6126c5dc64fd56157c05dfdacf3130059d5890309c15969a68de10e250b32b96652d3a058979ebde827f023921425dc0e0ce94ee112fa4899f14b7 SHA512 353037e9774882aeb12fb13cca9b1ded4009fa2ebb4b47f3c9868156e2216e7c71cbc5b0b3f3880766bf1f8f1ab44753ecf549d3f880af1dc9b8e29adf221b89
+EBUILD mediastreamer-2.9.0-r2.ebuild 4605 BLAKE2B a55639acb20c085a0045ee4a5b8fa324c0271d478fb661e769682bf38faa9e1b71c37706143fec51fa60ee3da007722a65f5e45caf11e536235f5c7c45bba75a SHA512 eba4f73b44bc9e3195f46e66c9e9b286ef2ab1a34450335bc5b802e38ca7bd67c320e2aff20b279d2e128e5abd8190bdcb7030d85467af0d1036456fb3d52bed
 MISC metadata.xml 815 BLAKE2B 9bf63033f9e0b69f3f6e8d0d66534c6c93408cb33bdad955b42a536767cf0c641c00dd8430cab979bd1adc9a1a3d717e49e5ee6b3e35d30741d9db6abfea2a8e SHA512 97b32950d71cf40df5df5488aff7fa56914deb1e76bc7779d67442d19609892240ff8dfe037c69d88b5c5b11b155cbfcfd2e4c09365eb9a7a7a65a8226ad39e9
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 751272cdb492..971c8789bb6b 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 # Many cameras will not work or will crash an application if mediastreamer2 is
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 70b656785166..feac342b67aa 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,6 @@
-DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
 DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
-DIST mesa-19.1.1.tar.xz 10927620 BLAKE2B 503d7fb37144868c4e71e22fd310b7049265a6babf3b7ccd4f8d5a4db6a3b2e309e9e20006c913e02a0015750eaa9ca303165818b0b3542cdaa59e016817149c SHA512 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922
-DIST mesa-19.1.2.tar.xz 10930748 BLAKE2B 2f4882837902f02104db0198ecb8f24a48803fb9ff442c49b6b5055967c9f60662e3d65c92bb40391ee1824ac48ff1ef0c9db96adc0830bb11a3a83eb69ce1b5 SHA512 cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19
-EBUILD mesa-18.3.6.ebuild 13714 BLAKE2B f380e34556fe72952161527a13c4ce2d0380239e5d32d8b83018fdb6a204976ca9a43979749568862ca3c9a3498ddede5a978430946e812d5da4c7065df70f44 SHA512 b1ad91b975099bb51efe3ee0dbb15c7839834f593151a9f7c42cd85a1e9a84fae2af2073c2bd3cdda6ce5076ad16baec52919d7ea6d4a436e731ccc9a15afc57
-EBUILD mesa-19.0.8.ebuild 13854 BLAKE2B 01cc202cae0228e3bb1035a05473c37cddc06ba627c53a554bebbd7b64808d1f9f50e97e0b7c2d96e8cf6b6d6f52222e991c5ad56dd5f3c7ebc66a9adbcef7d6 SHA512 f07dc5bbe5f947013508e7190f7325c511d37f761ea3526b4b3caf63ff6d93f770bf437be9c813cca0f3d2afb7889742bade4bc68b13c318d3a97277d1f1cb84
-EBUILD mesa-19.1.1.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-19.1.2.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-9999.ebuild 14352 BLAKE2B ee16a3409540ddd237e48a7b1d6dc058b99d92fe193a47fb3f72693f1f945b3d9a893be4896041348aa873e33927951794cd0809ac8677d10585342abd885fd2 SHA512 0fc85cacd6550795548997ff8d9515a19a10d9eeb58c5ee9cbc9931f4382c45438bb6283305dd5308f1c7386efa7a52148ef389b52fa40fb628ab84c150e1eda
-MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
+DIST mesa-19.1.3.tar.xz 10935604 BLAKE2B 4dfda4b3ef7a2d53b20a7a0c81b08901d6b88431b6b56679b8d97d6f2f57ce18f6dcdbae9b79c5d02b9175f47db629833da6012658295fe456829ef07a5ff087 SHA512 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb
+EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B b828c73a96f85de9c392444fb1a697d86ebc7d98d6b7571757e2900c84f16c62bf82e11fdcf037757ffcd7cf5a560b638da5bc6c51d3086493741fd3f00e286d SHA512 24fbbc005fd0fa7376dc960d6388861c041a5320f6b58f3fd55ffd15d2d09816aff3034154a2047734c0ce9596c1c9187b01973fd45e87a64e04325074463973
+EBUILD mesa-19.1.3.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
+EBUILD mesa-9999.ebuild 14485 BLAKE2B 4c897388a3e48ba1b7639c7449101e560b4f807af64ca197665485dd445293a79cb1ab4a4176e24d6258c0b1e40a21e18602021f209e92c68b9e7c60ae4e7d85 SHA512 7d71637292295eb2cd9898609458a2a815b15ea90701a0193c24ca94781413b8c32191e36c16af3ac054166b96252c4d7d4435da4b721c0244534d9afe9c7edb
+MISC metadata.xml 1945 BLAKE2B 9661d981c3472b6726f603982e94ba9a00066994bee201fcd0127eb8a7b436ea9112d55097054e079ba98f35f12826230e33f4bbb9ed23e19453bcb70d2140f9 SHA512 849994334f6ff6fa8e737e9b33eac509b21d50b0f71e4c0f1f6d7d1d13c7dfbc47611185562fa91a183b4411e9c10352d172ce065bd76c41bf83ac6929950c45
diff --git a/media-libs/mesa/mesa-18.3.6.ebuild b/media-libs/mesa/mesa-18.3.6.ebuild
deleted file mode 100644
index 88a3f43e5c6e..000000000000
--- a/media-libs/mesa/mesa-18.3.6.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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 imx intel nouveau 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 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	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] )
-"
-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. < 8.
-# 3. Specify LLVM_MAX_SLOT, e.g. 7.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	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 --host-root ">=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
-
-	if 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=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if 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
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# 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_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_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	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=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--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() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild
index c566adbde7db..f6cc92985b5b 100644
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ b/media-libs/mesa/mesa-19.0.8.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-19.1.2.ebuild b/media-libs/mesa/mesa-19.1.2.ebuild
deleted file mode 100644
index 0fd4ae716a5f..000000000000
--- a/media-libs/mesa/mesa-19.1.2.ebuild
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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 nouveau 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 pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-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_i965 video_cards_iris video_cards_radeonsi )
-			  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_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	libglvnd? (
-		media-libs/libglvnd[${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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	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}] )
-"
-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="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	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? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-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 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
-
-	if 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=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		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
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	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=dri
-		-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)
-		-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
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.1.1.ebuild b/media-libs/mesa/mesa-19.1.3.ebuild
index 0fd4ae716a5f..0fd4ae716a5f 100644
--- a/media-libs/mesa/mesa-19.1.1.ebuild
+++ b/media-libs/mesa/mesa-19.1.3.ebuild
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index de737e259d61..b28120fdcc83 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -38,7 +38,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
 	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -68,6 +68,8 @@ REQUIRED_USE="
 	video_cards_virgl? ( gallium )
 	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
@@ -75,13 +77,6 @@ RDEPEND="
 	!app-eselect/eselect-mesa
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	libglvnd? (
 		media-libs/libglvnd[${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
@@ -126,6 +121,15 @@ RDEPEND="
 	)
 	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}]
+	)
 "
 for card in ${RADEON_CARDS}; do
 	RDEPEND="${RDEPEND}
@@ -144,9 +148,10 @@ RDEPEND="${RDEPEND}
 # 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="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:7[${MULTILIB_USEDEP}]
@@ -212,8 +217,10 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
 
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -349,7 +356,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
 
 	if use gallium; then
 		emesonargs+=(
@@ -471,7 +478,7 @@ multilib_src_configure() {
 
 	emesonargs+=(
 		$(meson_use test build-tests)
-		-Dglx=dri
+		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=true
 		$(meson_use dri3)
 		$(meson_use egl)
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 1adb4bf77ae7..81c21d9fef22 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
 		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-		<flag name="unwind">Add support for stack trace unwinding and function name resolution</flag>
 		<flag name="valgrind">Compile in valgrind memory hints</flag>
 		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 		<flag name="vulkan">Enable Vulkan drivers</flag>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 7a5671ed82ba..985fc08ee167 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,15 +1,10 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
-AUX mlt-6.12.0-frei0r-w-tractor.patch 1469 BLAKE2B 50cb2d6360548299bf49755f16b32b0dfda69ec4992f4964bf56ca5e4cc5b5b4016af43bcae2cb686b6b26e46834b461cc7c66f29f57280b13537f108b4d611c SHA512 45abb6f650f34d707e9a7b762a801023684b6d046eb747193be94ff7d8c780b6a3ecde19e6200dd1e74efae956e5f8b8cf999b1ddb11ba5e7049c8a6e17f704b
-AUX mlt-6.12.0-rgb-to-yuv-accuracy.patch 7735 BLAKE2B 122c51cb168a4c921cb180fb219795fffc98caee9d199fe8ce40b6ccf09b6be373b0eb20dcdc2d09f8674d679694018ed950fdaad7297e8a7b13e2eb4a0e0124 SHA512 4e09f0d324cb54ae638fe8281b9a7f3d4878568ac323738a9a2398c67e507e4a122fc02842f7642f895ddfba2c28a2afe79e923ebea4db8fe66dbbd460048824
-AUX mlt-6.12.0-seconds-digits.patch 829 BLAKE2B a696c33a9eb97ef5ca07a7d7e302f3b83ab07a46de61f32aa7b84c60bb8174b8683fe4f08ac6b6b8506fa0a3da84a611c9e06ab190774427bfb5372881772479 SHA512 b96f47dea8532c9b98112bfcd284dac521e5b91a2d852a4570adb26082870f27e2d32f567ee1e9b49ee315013f657c7c68ba61e2b8d2d8edfc8648e4f11800a5
 AUX mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch 2661 BLAKE2B e17a6143998c207a1686b40dbb0d7ce01d02a012b22bf2a78f4e866b362a9293db0e1acd9f540e9a3c701959cfdea493b9834289423c0d28a4998ea38d41c422 SHA512 6e2f396736f46d9a1bdfeb5acfe7deb51a97ca80c99460fc838d569209739bb01c59f0ca1109b24a43c7c1d9757d820f44a721e295c0e0a394e7065404ce2872
 AUX mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch 1056 BLAKE2B 506087e2785f17dfd1dbc64d0a0a3271e4ea05eed742451085dbbf234629f940ad7c646845474ed6969de2ea41fdb765861623264c4b42b549b57aeb1285b477 SHA512 5ca89ca1a49763f9fcb80e1beff6a33830c360fbe5c88929701da305d67cfc76313503bc7438e5b9419c62668768065777263c305dec140958112933e6ef8556
 AUX mlt-6.16.0-crop-filter.patch 1420 BLAKE2B 359f02e95c7afd66c412e8b1e8dbd59d676d3923939f017bf27b19fff114797c3ee269018fd6fed5dc0d666cf1616fca4ea041ee9150a2aa920ed37a01c81695 SHA512 91bde7e934f1a856453ae375699650f2b7f0ac0fafb954af992aa2b35363abb4424aa5adc61c246f56dfdf63f69f7de8d7b741d0c22184fa2fffd31c7d697de6
 AUX mlt-6.16.0-mlt_consumer-race-condition.patch 936 BLAKE2B 1ac34744d8bab9cc18c37092bb7f62a92cd297ab7a31b3ce4927f08257bf0fb87bf33c533df6a12c045c6573f5d8d0ce4105c99a740dd75e9b9e4ab3764c8abd SHA512 3bbcd1172263e8e6048e329075a0ea521dab7f27f6f92496f4e39f8ddd48d6c3b65c96f4ea0620aa1ab5dca886aeb5b58ad09b757acd2ad33ea3cb5729e7bc2f
 AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113a4d8f35454ecabd73f4f9de0c0a9c385aad44a941610ed075bd278d0b45f9101bb3939b82a0565938d4e3c4f29f320d93334cfad4b0 SHA512 f785df6e7db75018c05f57f49537e57e86fbd0b3cf2aad705c0179f36d2cb1115cd8f20f2b4977db0c32b485fef3ba32283fc68c817db4eddcc161e549a63685
-DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
-EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451
-EBUILD mlt-6.16.0-r1.ebuild 5756 BLAKE2B f6184a6457e96053c8b7f33064054f76d76790d0d1505f24fb70f31f34cf1403fff8b657c76884b265f3807fd46e3d5e19a308cace838e82686d2be8a8b03cbf SHA512 b7e93909507a61d5e3fc1ed71d123d7e08d34fa40c710f61c4a0e03a3a45616afcee94bd726164ab9e3f2d46ca8f76e9205d2e81692d38ecd6186195860f1e51
+EBUILD mlt-6.16.0-r1.ebuild 5754 BLAKE2B 57bb4869541c355e1ba55cb57cfbe584fe7aa411c10fb8ec3851867a239da2be3ad89376980666628b1056a0a051db099f160b64e55be0d9286237b60269c7c0 SHA512 32f956e6c3088152058bced2d37ecb736409a5c2a9e5530c4622df518099a9970f854ca3bce4e4cd4680208f1a4b2294b6d28b352cd138b4253ab9be45f0da08
 EBUILD mlt-6.16.0-r2.ebuild 5757 BLAKE2B c8719b417038fad701b9a8a4f7d0a6298e5cc9ec8ce0d9dbf8d87f1926bab0c2515e103857ac36cc376609eebb78a9bf34ad9ab9ccb101fa70eebb4616c72163 SHA512 7c9c6bd8d79c452b5f1589249a500b814912f790ead14779675ad3128215d9ad0da57445f09490b563ebb4759495a5577789966e3a3a173553ddcded3657db28
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch b/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch
deleted file mode 100644
index e655f805f539..000000000000
--- a/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 30621f28fd3a21a4162de17a12d943e811566b5e Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Wed, 5 Dec 2018 11:14:54 -0800
-Subject: [PATCH] Fix frei0r producer not working with tractor.
-
-Reported in https://forum.shotcut.org/t/color-bars-working-not-
-correctly/8308
----
- src/modules/frei0r/producer_frei0r.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/modules/frei0r/producer_frei0r.c b/src/modules/frei0r/producer_frei0r.c
-index 9a90f6b6b..d1547f6c5 100644
---- a/src/modules/frei0r/producer_frei0r.c
-+++ b/src/modules/frei0r/producer_frei0r.c
-@@ -26,12 +26,7 @@
- 
- static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
- {
--	
--	// Obtain properties of frame
--	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
--
--	// Obtain the producer for this frame
--	mlt_producer producer = mlt_properties_get_data( properties, "producer_frei0r", NULL );
-+    mlt_producer producer = mlt_frame_pop_service( frame );
- 
- 	// Choose suitable out values if nothing specific requested
- 	if ( *width <= 0 )
-@@ -83,6 +78,7 @@ int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
- 		mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
- 
- 		// Push the get_image method
-+        mlt_frame_push_service( *frame, producer );
- 		mlt_frame_push_get_image( *frame, producer_get_image );
- 	}
- 
-\ No newline at end of file
diff --git a/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch b/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch
deleted file mode 100644
index d0930c5ac63b..000000000000
--- a/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From adc5a2284b3a1073cb364c5f07d1d7c97e94c937 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 30 Nov 2018 15:26:15 -0800
-Subject: [PATCH] Fix color accuracy of RGB->YUV conversion.
-
-Fixes https://github.com/mltframework/shotcut/issues/674
----
- src/modules/avformat/common.c                |  2 ++
- src/modules/avformat/common.h                |  1 +
- src/modules/avformat/consumer_avformat.c     |  7 +------
- src/modules/avformat/filter_avcolour_space.c |  7 +------
- src/modules/avformat/filter_swscale.c        | 12 ++++--------
- src/modules/avformat/producer_avformat.c     | 12 ++++++------
- 6 files changed, 15 insertions(+), 26 deletions(-)
-
-diff --git a/src/modules/avformat/common.c b/src/modules/avformat/common.c
-index 2b1f1fd5d..dca9dbaee 100644
---- a/src/modules/avformat/common.c
-+++ b/src/modules/avformat/common.c
-@@ -22,6 +22,8 @@
- #include <libavutil/channel_layout.h>
- #include <libavutil/samplefmt.h>
- 
-+int mlt_default_sws_flags = SWS_BICUBIC | SWS_FULL_CHR_H_INP | SWS_FULL_CHR_H_INT | SWS_ACCURATE_RND;
-+
- int mlt_to_av_sample_format( mlt_audio_format format )
- {
- 	switch( format )
-diff --git a/src/modules/avformat/common.h b/src/modules/avformat/common.h
-index 54df63e93..ce0f0f079 100644
---- a/src/modules/avformat/common.h
-+++ b/src/modules/avformat/common.h
-@@ -29,5 +29,6 @@ mlt_channel_layout av_channel_layout_to_mlt( int64_t layout );
- mlt_channel_layout get_channel_layout_or_default( const char* name, int channels );
- int set_luma_transfer( struct SwsContext *context, int src_colorspace,
- 	int dst_colorspace, int src_full_range, int dst_full_range );
-+extern int mlt_default_sws_flags;
- 
- #endif // COMMON_H
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index eab96271f..1e445ef76 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -1956,12 +1956,7 @@ static void *consumer_thread( void *arg )
- 						mlt_image_format_planes( img_fmt, width, height, image, video_avframe.data, video_avframe.linesize );
- 
- 						// Do the colour space conversion
--						int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
--						if ( pix_fmt == AV_PIX_FMT_YUYV422 || pix_fmt == AV_PIX_FMT_YUV422P16LE )
--							flags |= SWS_FULL_CHR_H_INP;
--						else
--							flags |= SWS_FULL_CHR_H_INT;
--
-+						int flags = mlt_default_sws_flags;
- 						struct SwsContext *context = sws_getContext( width, height, pick_pix_fmt( img_fmt ),
- 							width, height, pix_fmt, flags, NULL, NULL, NULL);
- 						int src_colorspace = mlt_properties_get_int( frame_properties, "colorspace" );
-diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
-index f25cf092b..89ee6b522 100644
---- a/src/modules/avformat/filter_avcolour_space.c
-+++ b/src/modules/avformat/filter_avcolour_space.c
-@@ -84,14 +84,9 @@ static int av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt,
- 	int in_stride[4];
- 	uint8_t *out_data[4];
- 	int out_stride[4];
--	int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
-+	int flags = mlt_default_sws_flags;
- 	int error = -1;
- 
--	if ( out_fmt == AV_PIX_FMT_YUYV422 || out_fmt == AV_PIX_FMT_YUV422P16LE )
--		flags |= SWS_FULL_CHR_H_INP;
--	else
--		flags |= SWS_FULL_CHR_H_INT;
--
- 	if ( in_fmt == AV_PIX_FMT_YUV422P16LE )
- 		mlt_image_format_planes(mlt_image_yuv422p16, width, height, in, in_data, in_stride);
- 	else
-diff --git a/src/modules/avformat/filter_swscale.c b/src/modules/avformat/filter_swscale.c
-index 475036a6f..52c165f9f 100644
---- a/src/modules/avformat/filter_swscale.c
-+++ b/src/modules/avformat/filter_swscale.c
-@@ -1,6 +1,6 @@
- /*
-  * filter_swscale.c -- image scaling filter
-- * Copyright (C) 2008-2017 Meltytech, LLC
-+ * Copyright (C) 2008-2018 Meltytech, LLC
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -88,23 +88,19 @@ static int filter_scale( mlt_frame frame, uint8_t **image, mlt_image_format *for
- 		interp = SWS_LANCZOS;
- 	else if ( strcmp( interps, "spline" ) == 0 )
- 		interp = SWS_SPLINE;
--	interp |= SWS_ACCURATE_RND;
-+
-+	// Set swscale flags to get good quality
-+	interp |= SWS_FULL_CHR_H_INP | SWS_FULL_CHR_H_INT | SWS_ACCURATE_RND;
- 
- 	// Determine the output image size.
- 	int out_size = mlt_image_format_size( *format, owidth, oheight, NULL );
- 
--	// Set swscale flags to get good quality
- 	switch ( *format )
- 	{
- 		case mlt_image_yuv422:
--			interp |= SWS_FULL_CHR_H_INP;
--			break;
- 		case mlt_image_rgb24:
--			interp |= SWS_FULL_CHR_H_INT;
--			break;
- 		case mlt_image_rgb24a:
- 		case mlt_image_opengl:
--			interp |= SWS_FULL_CHR_H_INT;
- 			break;
- 		default:
- 			// XXX: we only know how to rescale packed formats
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 9b96b4e5c..d24ca41e7 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -1281,7 +1281,7 @@ static int sliced_h_pix_fmt_conv_proc( int id, int idx, int jobs, void* cookie )
- 	av_opt_set_int( sws, "dstw", slice_w, 0 );
- 	av_opt_set_int( sws, "dsth", h, 0 );
- 	av_opt_set_int( sws, "dst_format", ctx->dst_format, 0 );
--	av_opt_set_int( sws, "sws_flags", ctx->flags | SWS_FULL_CHR_H_INP, 0 );
-+	av_opt_set_int( sws, "sws_flags", ctx->flags, 0 );
- 
- 	av_opt_set_int( sws, "src_h_chr_pos", -513, 0 );
- 	av_opt_set_int( sws, "src_v_chr_pos", src_v_chr_pos, 0 );
-@@ -1338,7 +1338,7 @@ static int sliced_h_pix_fmt_conv_proc( int id, int idx, int jobs, void* cookie )
- static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffer, int pix_fmt,
- 	mlt_image_format *format, int width, int height, uint8_t **alpha )
- {
--	int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
-+	int flags = mlt_default_sws_flags;
- 	mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( self->parent ) );
- 	int result = self->yuv_colorspace;
- 
-@@ -1400,7 +1400,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- 	else if ( *format == mlt_image_rgb24 )
- 	{
- 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
--			width, height, AV_PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
-+			width, height, AV_PIX_FMT_RGB24, flags, NULL, NULL, NULL);
- 		uint8_t *out_data[4];
- 		int out_stride[4];
- 		av_image_fill_arrays(out_data, out_stride, buffer, AV_PIX_FMT_RGB24, width, height, IMAGE_ALIGN);
-@@ -1413,7 +1413,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- 	else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
- 	{
- 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
--			width, height, AV_PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
-+			width, height, AV_PIX_FMT_RGBA, flags, NULL, NULL, NULL);
- 		uint8_t *out_data[4];
- 		int out_stride[4];
- 		av_image_fill_arrays(out_data, out_stride, buffer, AV_PIX_FMT_RGBA, width, height, IMAGE_ALIGN);
-@@ -1475,10 +1475,10 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- 	{
- #if defined(FFUDIV) && (LIBAVFORMAT_VERSION_INT >= ((55<<16)+(48<<8)+100))
- 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
--			width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
-+			width, height, AV_PIX_FMT_YUYV422, flags, NULL, NULL, NULL);
- #else
- 		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
--			width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
-+			width, height, AV_PIX_FMT_YUYV422, flags, NULL, NULL, NULL);
- #endif
- 		AVPicture output;
- 		avpicture_fill( &output, buffer, AV_PIX_FMT_YUYV422, width, height );
-\ No newline at end of file
diff --git a/media-libs/mlt/files/mlt-6.12.0-seconds-digits.patch b/media-libs/mlt/files/mlt-6.12.0-seconds-digits.patch
deleted file mode 100644
index c00accefd1e3..000000000000
--- a/media-libs/mlt/files/mlt-6.12.0-seconds-digits.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 64a71150650616ab0309da1a76e37e762572f641 Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Mon, 19 Nov 2018 22:44:07 -0600
-Subject: [PATCH] Fix number of digits for seconds.
-
----
- src/modules/plus/filter_timer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/plus/filter_timer.c b/src/modules/plus/filter_timer.c
-index 519f1f72a..32da3281d 100644
---- a/src/modules/plus/filter_timer.c
-+++ b/src/modules/plus/filter_timer.c
-@@ -90,7 +90,7 @@ static void get_timer_str( mlt_filter filter, mlt_frame frame, char* text )
- 	}
- 	else if ( !strcmp( format, "MM:SS.SS" ) )
- 	{
--		snprintf( text, MAX_TEXT_LEN, "%02d:%02.2f", hours * 60 + mins, secs );
-+		snprintf( text, MAX_TEXT_LEN, "%02d:%05.2f", hours * 60 + mins, secs );
- 	}
- 	else if ( !strcmp( format, "SS" ) )
- 	{
-\ No newline at end of file
diff --git a/media-libs/mlt/mlt-6.12.0.ebuild b/media-libs/mlt/mlt-6.12.0.ebuild
deleted file mode 100644
index aeb0b93427bc..000000000000
--- a/media-libs/mlt/mlt-6.12.0.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby24"
-inherit python-single-r1 ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
-# java perl php tcl vidstab
-IUSE="${IUSE} kernel_linux"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#rtaudio will use OSS on non linux OSes
-RDEPEND="
-	>=media-libs/libebur128-1.2.2
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?] )
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-#	vidstab? ( media-libs/libvidstab )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-seconds-digits.patch
-	"${FILESDIR}"/${P}-rgb-to-yuv-accuracy.patch
-	"${FILESDIR}"/${P}-frei0r-w-tractor.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
-	done
-	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-
-	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use compressed-lumas && echo ' --luma-compress')
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable gtk gtk2)
-		$(use_enable jack jackrack)
-		$(use_enable ffmpeg avformat)
-		$(use ffmpeg && echo ' --avformat-swscale')
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable libsamplerate resample)
-		$(use_enable rtaudio)
-		$(use vdpau && echo ' --avformat-vdpau')
-		$(use_enable sdl sdl2)
-		$(use_enable xml)
-		$(use_enable xine)
-		$(use_enable kdenlive)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	if use qt5 ; then
-		myconf+=(
-			--enable-qt
-			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
-			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
-		)
-	else
-		myconf+=( --disable-qt )
-	fi
-
-	if use x86 || use amd64 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang="none"
-
-	econf ${myconf[@]} --swig-languages="${swig_lang}"
-
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
index f2a3118ce6ba..76fc970c2228 100644
--- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
 fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index dd421d56e021..edfd6b75736b 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,3 +1,3 @@
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
-EBUILD musicbrainz-5.1.0.ebuild 1041 BLAKE2B 7c8a431fec44f4abecd7ed524f00f9c3069b4e9ed5f7f66458a4371a6bfba84834d2dc343ba87b0ecbd62c2aa2f2e18f6865b73e86c8502002477c325161b649 SHA512 38fc34bed25dfc580b10f317d70cfcc1f40dbd4292ac2e2ba44d581ff9ec43f5565d0cada5c55558f81a1955069ea438041c8f444e50c25304a88c3c83fd933c
+EBUILD musicbrainz-5.1.0.ebuild 1037 BLAKE2B db6ff99fcf43aed4f17e8fc5a5ec33a0032f348256860b81c2f78d43212067a496992e88a3d3c8e30a98923f548eff96e61c97d144a6c143fc19fe889c0cb714 SHA512 62c26c32c4cb82c2f899933c1a7bc41b6b98651c11cadac88d7ed685e54a93d4589f9773215609652aab53959b7709b3403b8142d70e955ed1a5a805b5cd1c66
 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index 92bbfd2203fa..fae42e7057e0 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/
 
 LICENSE="LGPL-2.1"
 SLOT="5/1"	# soname of libmusicbrainz5.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index c9899b83ea72..695684180d40 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -9,5 +9,5 @@ EBUILD mutagen-1.38.ebuild 1031 BLAKE2B eef55684a41c17d279d3e58041a1b7ae42bf4eff
 EBUILD mutagen-1.39.ebuild 1076 BLAKE2B 0883613d632c85c68008af015ddc38c0737b020e9118a7f87a0c7cdbf60b52565f46aa86516b21557dd102e939af2d1cc683456932a9ab5be766d8395ae3a63d SHA512 27b94a87fdd1c01c80d3e37844918766a6f17b74e1b24f15e40892502fdebcd63e1c7fcb1390a683ca27487b3d924b219cdfce44b26fc05931ccc80d2bc55be7
 EBUILD mutagen-1.40.0.ebuild 1085 BLAKE2B 8a4e6f2aa3d65a3c6342e033e7c73931aafd133ce2313d517eff837ad4f1164d4c7ee3c79e893a01c8c88f351ed38b4dd9b8e49581c995c89ee9d8a75b1357a4 SHA512 d226ad490c6033dcaefb83d00fd26e1c0d94322f3274f4a043c1f1ef6198e9d1576d3dcdf6814ef91f366805c1ec858d5872e00dc0d997ef1c95bbd82b20476e
 EBUILD mutagen-1.41.1.ebuild 1093 BLAKE2B c09f23a432d820b157f7eb0d7dd79ebe9531e2666332e860989b205093d57505a5a66df012963ad4ae7e512c0573d00c83a853f50ef5d185cf4fecc8a430062d SHA512 e9e175cafef034d670853150b79a3b5148608396a68515b398ed5e9cb0b93dea081609936b40532a1ec939a729f1f5fb6b2cf327ee25943df33ff3dbef839b0c
-EBUILD mutagen-1.42.0.ebuild 1087 BLAKE2B bc291debdb3aa8a5b7fe3cc7ffa74da978b0e183e96566190555767f2c1ebc648dccf059c157a775609820dd5820668be4dcf861fb3283d9784a160a9baa20c7 SHA512 d073862134e08c01bf9ca1a47e9c020d2cec821e6aec01a7dff1b7fbb1c5c449c111e0196136bd54eb7ec4b85e7fc3b2522eaa574b3ca3a4b73794925c748464
+EBUILD mutagen-1.42.0.ebuild 1086 BLAKE2B 660c5efbdd2e2f794d14c7d3b8c49b3ab7be386e2816f65c44945e27f50e4741140967edaa6eb564f60a7bf49f98acb74fb6cfa1a81ee05d669f8260af1d7140 SHA512 b4a8eb287c455cefbed547636f5172c4cae4d900350c3489d68f20796cd08689b0891c9bd1b5b9effba107ea468b66912def0cf3afce699cde24cd037d801b68
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index 84852ce4fb50..9d4af6135fed 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 16aceb61e155..a3e8cf6b7b66 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,6 +1,8 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
+DIST phonon-backend-gstreamer-4.9.1.tar.xz 88460 BLAKE2B 236a1ecdc5fcb96d041e9e743993c1f613e6a9fde8b2c8a094216f00f5862f1a5617bc87d2a5b6b8dc935de6538233b6c6ee54ca67ae7796f3f6b96be835c2b5 SHA512 c7ad71c4273d3037cb245abffeba679e4920b0797b72cf5876b0b9a5a76be200de317a7d5da5dd9eaf46932030fd8ff9e5c64975d1258319d6c8ad1c17d773e0
 EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
-EBUILD phonon-gstreamer-9999.ebuild 1170 BLAKE2B 4490f89a367ac96fcebef6a32dbcee91aaa693066d744bed8d37540a0ff6acb4c8476d3e50f3bbb248f627179d8d79817c956539266265f3767a5a0dcdf6ade5 SHA512 3ab9128e35376d87edb61cf8bd616b7af43503781a3bbb2b1f79ed03b35139ba3c6cfabe8e57d83f49ba54492bf86cce12d21b21db66ea99af1f6df38267805e
+EBUILD phonon-gstreamer-4.9.1.ebuild 1169 BLAKE2B c2141b77f575ff9982e02ac7dd1099ef04e5a99e999cc5452d0eeff9151667c26836606faf929db307574cb416df63f9110ac7a826103fd9ea8da3caed8cc484 SHA512 037509201a8ecba808bd190769078e798e195331bcd930d5a1568f7350d79a8ae144b7e9722691912888b32b0daf8539b94a0d48edabc502dfa088c2cd344875
+EBUILD phonon-gstreamer-9999.ebuild 1169 BLAKE2B c2141b77f575ff9982e02ac7dd1099ef04e5a99e999cc5452d0eeff9151667c26836606faf929db307574cb416df63f9110ac7a826103fd9ea8da3caed8cc484 SHA512 037509201a8ecba808bd190769078e798e195331bcd930d5a1568f7350d79a8ae144b7e9722691912888b32b0daf8539b94a0d48edabc502dfa088c2cd344875
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
new file mode 100644
index 000000000000..24ced106443d
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-gstreamer"
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Phonon GStreamer backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/phonon-4.10.0
+	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+	virtual/opengl
+	network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 541cae229fe1..24ced106443d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -23,7 +23,10 @@ LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 IUSE="alsa debug +network"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-libs/glib:2
 	dev-libs/libxml2:2
 	dev-qt/qtcore:5
@@ -38,10 +41,7 @@ RDEPEND="
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 0970e4075eff..bd82f61ecc35 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,7 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
 DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
+DIST phonon-backend-vlc-0.10.3.tar.xz 66488 BLAKE2B d7e50a24f47117a0e00741457e9526e3042c7a2a0492a13a67a23f5dd7e2c9db89f6b9cce71d7bebed41327315e222a4a6b4637731dc15416be002ff47bad3fe SHA512 77f66536b9debc62807ca952173640a40ab9b82e17a2ac85e524c1f5dada16a39c7bb1c72230f3ca14a9c826adaf79b9439aa223be960cded634dbd00e91127f
 EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
+EBUILD phonon-vlc-0.10.3.ebuild 804 BLAKE2B cb7d0f2709d6f897f6e6dd85c43cf64697977b67dfd56499dbd7ce2557d31496b274444ddd2458d2849967fe6728ad003ad6e5b005613ca7aea96246852e4114 SHA512 51e211f070d3d22ee413840a6debcb601a4a3830559f72ae91030672be52ccee80e9974426536463b7d7fd397f47a1a2f4ee59f2c241dc68bba7a2eb0d0f1cbc
+EBUILD phonon-vlc-9999.ebuild 804 BLAKE2B cb7d0f2709d6f897f6e6dd85c43cf64697977b67dfd56499dbd7ce2557d31496b274444ddd2458d2849967fe6728ad003ad6e5b005613ca7aea96246852e4114 SHA512 51e211f070d3d22ee413840a6debcb601a4a3830559f72ae91030672be52ccee80e9974426536463b7d7fd397f47a1a2f4ee59f2c241dc68bba7a2eb0d0f1cbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
new file mode 100644
index 000000000000..e6d157cf774d
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-vlc"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/phonon-4.10.0
+	media-video/vlc:=[dbus,ogg,vorbis]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 0cf441288e15..e6d157cf774d 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,17 +22,17 @@ LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 IUSE="debug"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	>=media-libs/phonon-4.10.0
 	media-video/vlc:=[dbus,ogg,vorbis]
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 2e7a50bacef1..71a181321711 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,6 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
+DIST phonon-4.10.3.tar.xz 336724 BLAKE2B 33ac87fa15985bb57672da0e29389a396e8f5662ca94d475eaa111a5a1fef16f9fc90cdee696b80d131fc53abd9500fbb7907ecb483d81e422e339660e19900d SHA512 2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6
 EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
+EBUILD phonon-4.10.3.ebuild 1350 BLAKE2B 3ec7589a29c3b500547f79a98e2dbbca5a1f37828453aedd9ae947d6993c45621222fad53b9c16ef46c75f4e9a7671f0ddca95ba58951baa4385b8c29178d633 SHA512 857df22ce1ac9a1963224b488e462b2f70610a93d26587dc594f9cb1f46182f0ce9af5cd4ab8f88474bc041a2a29b6d2418b5d90898ee4a283e635e430924eca
+EBUILD phonon-9999.ebuild 1350 BLAKE2B 3ec7589a29c3b500547f79a98e2dbbca5a1f37828453aedd9ae947d6993c45621222fad53b9c16ef46c75f4e9a7671f0ddca95ba58951baa4385b8c29178d633 SHA512 857df22ce1ac9a1963224b488e462b2f70610a93d26587dc594f9cb1f46182f0ce9af5cd4ab8f88474bc041a2a29b6d2418b5d90898ee4a283e635e430924eca
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.3.ebuild b/media-libs/phonon/phonon-4.10.3.ebuild
new file mode 100644
index 000000000000..18d770debdb9
--- /dev/null
+++ b/media-libs/phonon/phonon-4.10.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils qmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug designer gstreamer pulseaudio +vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
+"
+DEPEND="
+	!!dev-qt/qtphonon:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
+	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHONON_BUILD_PHONON4QT5=ON
+		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+		-DWITH_GLIB2=$(usex pulseaudio)
+		-DWITH_PulseAudio=$(usex pulseaudio)
+		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index abf73992ab1f..18d770debdb9 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,12 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 IUSE="debug designer gstreamer pulseaudio +vlc"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
+"
+DEPEND="
 	!!dev-qt/qtphonon:4
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -32,11 +37,7 @@ RDEPEND="
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 PDEPEND="
 	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
 	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 853dee0a4594..1058487a33d4 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r1.ebuild 1304 BLAKE2B 7b7d5a1df2595d2541f0e4c502f2272bb85977168fd1b2637228fa6ec62694a5923cbaa5d5acd90edc31932dc1c271b3482d0579625a6d4be1b1cafcbb433307 SHA512 acff9301c7e2d2faff2a2c3b702eb29e0f828161ea08bb2395dc829caa5c88ea9a793ae36954dfb33b5782f53c5554d6b577c4f3de250c53130f84197230dfe9
+EBUILD portaudio-19.06.00-r1.ebuild 1300 BLAKE2B 4306155bc45797c73ffddf3eb5b0e71d99b4d8184b1d3008fe07206c4aac2f3cae4933847b5c02ae82f4edac09bd5cbb5a0b7b8dee7fff2b5532f7fbbb797ef3 SHA512 6007702b517a2fb73dad8108d4336ef8bbf619dad98768b8b67b2d47d29a1728cbe5ae3b2e79466962d68ce3c7c3ceaa58504adbc9a79b73d3ea16a19ffd0497
 EBUILD portaudio-19.06.00-r2.ebuild 1547 BLAKE2B 80c4c05d4039e408ab4ff6f7b331deecbf3c76f2cac2087e26cfae75d80444830310f214696c0c44db5d6eecdca8b9cb89554cbd95e2484a4bd10f4a3b1e4f50 SHA512 e3c4a4f27f3ef9837589b4825a12d55b039884c669564e2919410cba6d64fd25139c297295463185d6471d483adeaa34e6d15bd774ed3ec86b558336252b0868
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 8ed072228b92..0b4f1938c3a8 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/qimageblitz/Manifest b/media-libs/qimageblitz/Manifest
index 5d452d243cc0..a30d620e73bd 100644
--- a/media-libs/qimageblitz/Manifest
+++ b/media-libs/qimageblitz/Manifest
@@ -1,4 +1,5 @@
+AUX qimageblitz-0.0.6_p20131029-cxx11.patch 390 BLAKE2B 8e338b462d69dd320e4545ac2a0d22ef3b258bf817d7e5eb8f9a16936c00d76b5366a73703e9710148447afb856a9d6873e697917d7600e61d2185ad1612a00e SHA512 e8cc1d28b93f05375c293c4ccedcf2f41be282106cec1afd6e3c81c7fc569a5b3ec33c1dc3876e6745ec5fd08ec8044ff4296859cdfee4ce966f7ce56e03f9d7
 AUX qimageblitz-0.0.6_p20131029-gcc.patch 693 BLAKE2B 73f99f9160db49fb9946c409c5e05b1559f391ad264b219b87a3efebc1edd3995ca8f8edd31d9d52bd3391ffc40c8d22964d6b76a152fe0364b472b5ddcec0ee SHA512 a189c0e44d09fb0b0fbd4c46e7fd4fb98a2af485174af2a8bbd176ccd4d4abd55f364236b6113b6ef32681d30131ff4c698b098f3c13fcac2544ef1a123f641e
 DIST qimageblitz-0.0.6_p20131029.tar.xz 43428 BLAKE2B 6a10f12236d759cb2999f807ae05345ad91ca2a3f965fa8ae6d38431a4a91439242ceac2facce67b46a5260cef11a4a5fdceccff73260235658830262fc909cc SHA512 2a32105aed52ea33fbd46702a2b7cdd9671efef9bb52209ede534abc95ac40dd9ae2bd22cf09b30a309337653c4a754c50ef3fe4ad0aad7d4ffd0b5994a85981
-EBUILD qimageblitz-0.0.6_p20131029.ebuild 982 BLAKE2B 508611765ea0d59353cbf818d14edfa56035a5cc65a4f54d29e364ab065e82b7cad145997abe53f7c5871af0efed975be753da4d62a1101c1c53ce0c69514415 SHA512 4932679b2d1fcdf5688d27c74b0b2030da4172342bb80aa8961175fce5f7f85764b5606b3844f8264f9650e425611b9193f91ccb9313307994c090af7143a8ce
+EBUILD qimageblitz-0.0.6_p20131029.ebuild 1025 BLAKE2B 21c9a3a225ad6f74301d172861a01d55cdb52e8be4c6e99ee1f0d3f924050296c84fd6338e882c33e31958f347bbbc50168243fdf2d9428b051b9cb21fb26f45 SHA512 522cb2a88e82226233dca5eabb108a4aac6d9f769223a4060f0d4b3a7fe3434396ecaeea5df2208e043d8f7b230e952b9d9c77f90c7afa664ab34feccfb5f830
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch
new file mode 100644
index 000000000000..da962cd1c95b
--- /dev/null
+++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-03-15 00:31:04.000000000 +0100
++++ b/CMakeLists.txt	2019-07-21 16:39:14.365729343 +0200
+@@ -14,6 +14,8 @@
+   set(CMAKE_AUTOMOC ON)
+   find_package(Qt5Core REQUIRED)
+   find_package(Qt5Gui REQUIRED)
++  set (CMAKE_CXX_STANDARD 11)
++  set (CMAKE_CXX_EXTENSIONS OFF)
+ else()
+   find_package(Qt4 REQUIRED)
+   # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
index a9370aa19ecc..bbbf7fcfea31 100644
--- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -21,7 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-gcc.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc.patch"
+	"${FILESDIR}/${P}-cxx11.patch" # bug 690360
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index b2e943bbac59..002d37722a33 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -2,5 +2,5 @@ AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
 AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1199 BLAKE2B fb6f307e36afda118c32111b0d0f18b4bd031150d6a8b1cf55895f36874f64f05d5751f496e334ced2bac39d3ee375bddb92fa014a26a99f6f404e81f30b1a65 SHA512 4dc84a4d08e1fdad001e5eebc61f358dba404e737a85942cfa06d9a3bfa0474dd554ed558a1b66d119c3876fbc1ddc24b1ea68f61f4fe43314d400c1fdab7f69
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1198 BLAKE2B 8e92d575a36881192af8570977e8b2f1fa7b626bb25f81c2e6633b908378e6de48e7efbe3722849345d8fb89727695aa21f4a0a8db3417f9e937246b32fd0c06 SHA512 d755cb4883768ae9e6ad4b7ee0638ae9b41b436d8d35bb7f47b72ad8687ec3616776173c4c7174e52f717166a58e82e2b1e7700a47b56cd333662a67cc2aec13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index 75bb49515718..72741f9402e7 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
 	inherit git-r3
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 5a48e0705b60..2aa2496a9887 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,4 +1,6 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
 DIST raspberrypi-firmware-1.20170303.tar.gz 118888867 BLAKE2B d90fc012d4371a797ed52172f0d0f94ea33901bbf10fc59f1ce0f54fbeb74a849b46dbbd4f71a73a7de655a4ed27586ee354e1535079e304bd66513452a33193 SHA512 cb0015fcaa607039db2ff40cadcfcafd0cf2ec7dd1df47f38414540fb1f86d626648bf6403989007895b0617c13ff4ec233a7b1987986224c09a8209e7732501
+DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 EBUILD raspberrypi-userland-bin-1.20170303.ebuild 980 BLAKE2B bbb6e6844a73c96d9cf58a2addaf12dd884897b82240c0619ba31ffdacaa2c7d30608f168cfcea0ae1f2beeccb3f9f2d87e671095fcdb81042abfa0dc653daf8 SHA512 ef356c392cea33c03d98990004235b6ba3bd5d8c50883b91a6568c0beaaba23313d1b0edcf29f6fbbc53d3f6feae1901088d541b3dfaf3dc1b048f775a5e2f48
-MISC metadata.xml 317 BLAKE2B c0c853910662804b9d5a6e428006f2832130cd982ffa92f1f413aa9deb23c0f28b60e23aa6c5ef12979e7a87c56da8372aebaa48cf34ab43ff254ae1aa647b61 SHA512 706af78cf1e48f89cfa11f97d51a063219dc71af677f03ba8b0703d3b7e6d8f95af1cf832ddb74f797700529c8dff0ee7aaa083178e16cef261b11951363fbaf
+EBUILD raspberrypi-userland-bin-1.20190709.ebuild 879 BLAKE2B 312786fded4a752e8d2a7252f9fa487e52a1bd8954a213c5e864ed4e7ba6cd76e06e1c2439afaa30bca89c084565fbffc2241ed067f9b69ddc2eeb64eff8ea4f SHA512 f453b77801bc519f69b2a332f0a029a3b9345878c63ac13b5ebe818bf90b16738cc001b4a5a01fa02f423e868d4603f30e8b298081d00877d2db19a4b5ba6842
+MISC metadata.xml 401 BLAKE2B 50e313c1b4af550c8e4547e399a105ad7d36cf028a4a5ef1ede4a52ca47ca0358d8b1a171785748959726683c0b53eedb9f9b40e13ba2a204bc4f6f7fdc3c9a8 SHA512 ce7de7cb51da21dfcb681edbdb01f49982f5885edddffb958b4a4e1f66de40c8b293fac49c0c37756f4848477736566b810d6420bddb102b8bc4aa84b981bb10
diff --git a/media-libs/raspberrypi-userland-bin/metadata.xml b/media-libs/raspberrypi-userland-bin/metadata.xml
index 43773231f6e8..7e9cc8e5385a 100644
--- a/media-libs/raspberrypi-userland-bin/metadata.xml
+++ b/media-libs/raspberrypi-userland-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<use>
 		<flag name="hardfp">Use armv6 hardfp ABI</flag>
 	</use>
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
new file mode 100644
index 000000000000..336f6354c109
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+MY_P="raspberrypi-firmware-${PV}"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS="-* ~arm"
+IUSE="+hardfp examples"
+
+RDEPEND="!media-libs/raspberrypi-userland"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/firmware-${PV}"
+
+RESTRICT="binchecks"
+
+src_install() {
+	cd $(usex hardfp hardfp/ "")opt/vc || die
+
+	insinto /opt/vc
+	doins -r include
+	into /opt
+	dobin bin/*
+	insopts -m 0755
+	insinto "/opt/vc/lib"
+	doins -r lib/*
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	if use examples ; then
+		insopts -m 0644
+		insinto /usr/share/doc/${PF}/examples
+		doins -r src/hello_pi
+	fi
+}
diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest
index 83c60302ef8c..a66af2f452d6 100644
--- a/media-libs/rtaudio/Manifest
+++ b/media-libs/rtaudio/Manifest
@@ -2,6 +2,6 @@ AUX rtaudio-4.1.2-cflags.patch 405 BLAKE2B cb495081882e3df93c29e8b4cff0d71e70a7f
 AUX rtaudio-4.1.2-configure.patch 3054 BLAKE2B a1ea744db19ba3f59229d738cf4ec1aefd71d38c29ede28d13d403db69ee7c4dbb72c8c91fb3048b183086e7aea08224ed7b1be5711f57a95d609e19805e0b0e SHA512 d359742fa55d7d188a0032f512165cb73300fff3e85e03221a7b30340941fab5149645fe8683cad79f26c5ebdcfcef1a591cc16d0096fb0d5a699e6e7a819ed9
 DIST rtaudio-4.1.2.tar.gz 682382 BLAKE2B ddfb0797db8ffef9a73b1af1864a7e9ec5028ff92473a82c8198fc0e8cce35e76ce820487b750988a91b7a519230659f446f2644288b0347c12c2f72b03fd45d SHA512 1e7f7f0f4dc451d023a7c8ab287fe63034cf6b4e18fe138bab253c307d6dd0cddb669b031f6c21325aaac0ce53002acd2a17dd1e47bd8ac2cb14e058cfce1a21
 DIST rtaudio-5.0.0.tar.gz 615284 BLAKE2B ffb21042896b868b5368708594e050773ea23638e5eca8ea4c63204ee8ad3e433e26f1cc7f359a113df3a962dcaceaff72846346357c9e134c30dde89813cf0a SHA512 390b6c454c42cf066fa94af397b784430dadc1650de320be377b7bbd09eda8705936bff3ee4327358815c3d5247a38fead81c8778cd85db30a12a6ace742c84a
-EBUILD rtaudio-4.1.2.ebuild 1212 BLAKE2B bf0dfba065a33fe12a3966773c5ec458f17e272a09d812824be939c90564f67a15b29babf73a54dc87f84fd2295fe830a342c7ee54df9d4029ccbaecfa92b7c1 SHA512 2f2da6ce17abdfcc9952cff3f99dc2f7636104b4fc1737587f5a0cbc17a7c8679c17c57555b908c68544cb884d78279016107113980204a10a77db3e9d81285e
+EBUILD rtaudio-4.1.2.ebuild 1215 BLAKE2B 64056fa39e7213a87d46a333eccc254c5084285d69c263b423081c8f3882bf57ab4656fc9c822052dab469e4dccaf259f6ca96931792e8eb37c0ec5a51c86774 SHA512 4c238c75367fde305cab267d2aea1b6ac27d84213e9fa4e0e66af47150dca9fb4bac4714ee8dc26118d796eab473040ee118824046ddadbf96684bf55cd42710
 EBUILD rtaudio-5.0.0.ebuild 1181 BLAKE2B 22500844a4cdcc82419f02af2da7c4bfcfcdcfa63b29b92df796f6f3192cae6fda870d258818d3f1e4ed4eead0f6fa544fe8d2bf46244c3356fbb0e66bcf35e6 SHA512 90901e14e75cc8fa3cee6f3cd4652740a1853737b4cbaaf38b1e56af7c3c4653150ada18d84212dbba811af1373131c00a2b5e18510e1a67cb129b6ebf6ab044
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rtaudio/rtaudio-4.1.2.ebuild b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
index 7f19d2f895d4..da46efba2187 100644
--- a/media-libs/rtaudio/rtaudio-4.1.2.ebuild
+++ b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+alsa doc jack pulseaudio static-libs"
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 513dbb57dceb..2c8cc8ea9993 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 1538 BLAKE2B 80bec7b5519034007d44ed05c36cc685f536eb274a139bfe2e2bde658b86c1a16c3fc6540db1954dc28b95df00f1eb5e7c385443a9dd99f73ddab9c216968564 SHA512 b1705651937d5819642f519fdffc4165266d108d5c04ee4a5863839cbdd490cc5a6ce7e562431befdd6af18823a605a2b90152f6805b415591ed754ec7efe8e8
+EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5
 EBUILD sdl2-image-2.0.5.ebuild 1548 BLAKE2B 2e440990786f95fb97dcef41d6aeb70fd43c37fe68b874bafb45ff59b7ed0c078c390aa239709727bcccd9be46a708280fa13b90c58ce4ce4b75ea2cdbaeab86 SHA512 9e20433828454475b3f76659515b8c8942c3885332b6ee206a6cdbc7a5a4565c9559e920d589f6eab26a61cc4c98d9d27faac6a47fa5ba444c104150723b89bc
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
index 4d91c2350604..10dfe667c67c 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.4.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 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index c13379a847b3..7bf237f28bec 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,3 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6.ebuild 2044 BLAKE2B 31c98d4b4b2ac35a7a4aaf4d54d2d49f713ce8abee815133456dd1f618404cf8862cee5c9a943e76bfb722d9ff37cab299ed7bee3cd24f948fde855f53334d42 SHA512 a44947b229448562ffdb611b3e1c40735b0efa7e6cd5c00e8474c2234254c134281699a8d694dc2a5fff7c8eacd4ec72d77840c744f8fded37c70d5e0f448f1a
+EBUILD spandsp-0.0.6.ebuild 2040 BLAKE2B b15dfdd39e545741fb377bb9120273f447f0a3e1786a815ae857f9f6d39f4765bbc9cb9d28bdcedab6d0b441d24fb6aaf55fc8ad45ec47a9ef88650fe71b0661 SHA512 ae2ea4114db5574129d98faa9c2cbbf2b09675e7d340daa5cf6aef8162d69a62120199de3df7c63d736fc28de328485b97ae0e89b8322f0a4e13a51631502bf4
 MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
index 48d26d120ecb..5adc3d7d26ac 100644
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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 fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
 
 RDEPEND="media-libs/tiff
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 42231441b4cd..4330e84afdd9 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,7 +2,7 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1763 BLAKE2B 3f5c32e8939496f89137ec8933d0d844e6f265b0f58d57cfb96c24f68fb8e27b38f353716d090f52466ae06a172eea776e461fd84e5ae518ebd0e9b591aaefa3 SHA512 4104d16174d7f8146dfd3780fb4a5ed79a1e6bb413a78c510a2d2fc53139bba3730ab731bfc80cd5090670f24b48d641b488aa5ae1e8fd20c3cccc54c5b4a049
+EBUILD vidstab-1.1.0-r1.ebuild 1761 BLAKE2B 7c5ff617fccf7d6561bc7b8d8d70cc2e57d6ca98b77db52207fa399f9600bbfbda786f5077fc46940b72fe7180bcffd74dd3307f8265712727dbd7f16d6396e3 SHA512 feb02becaa852db96088bca94dfce81324e4ef7df043456ba5992a2d52f27e094238fa7d83ac69fb5f16cb09f9971862c6c57b12ab73563d3121516a2f217204
 EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
 EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 343e7c46d84e..f4855e70ae68 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index 4a0d491b4efa..6b28622f2dbd 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,5 +1,7 @@
 AUX virglrenderer-0.6.0-libdrm.patch 391 BLAKE2B 471d68831129f1c01bdeddfb8748cb71fc30cced692f73493ed6ad07c519e15b8412a4dc4f533833181b8aa3a04566c160f7f08bccee7b1fb1adc4ee58c9a61c SHA512 935a3cd1aa7c947a472c8fe5f1880e1897311451f42da26ab941af91152c60e2b66930446b6ff370cc29831a345fa73f9374fc82ad22ced445e448f520b07853
 DIST virglrenderer-0.6.0.tar.xz 222536 BLAKE2B 2e359e88489458460a5fe1daa62913ed0159c10eee1e360fbf561221dc38aa27e3c6c402960eb1313e55dfcbdca3483a5672f5c68b7303783320b8beb330d987 SHA512 23d5f8c582f02303e3b4b59a6ca66e7859367a0bb931b884521f615bf9e25290f1ad2a32a92c127df1ec0f48503e20f557f6e910973ca2c7620b75801d5f3401
+DIST virglrenderer-0.7.0.tar.xz 258128 BLAKE2B 93d878caa635671b0cabb4726df6f3a75a3153e6a138beb6f7de0985abd3c3cc50618727573d5f6a887cec2e0cdba082327ec7c2f9e359e9bd1c0ea22785abba SHA512 b8ee9242ac4184e65ade700306827e4d3e345bf6d742970d4b1ac7a09d8883e4195c4c2e69b73a59a08a43b4d8ee078a16501fbafe927e59b0f7627470d04ba8
 EBUILD virglrenderer-0.6.0.ebuild 1028 BLAKE2B 42e5c4047e7b441c1dd7e087aafa6f4871b7a940085509cf310b311dcba87a83724e5721e394e76019c265050566cae8aa8e5edbee4a4623268b102aac041701 SHA512 b3c83ffcc486142b54c2d795ccca3b1b9c17b2f23855bd201b23bba2c8a232eea92cca2bf9131760d18276a86f66f23ec788a49cbe98d5385134e60583813162
+EBUILD virglrenderer-0.7.0.ebuild 1027 BLAKE2B 50cac0a6e9e4710f9bc7a766b71f15d0bf77b57837b98f97b6ca5d649e585d58e36fd02e595aac6ac95ec64ab5bd4075163e83b93ffc627f422717c35c9d45f9 SHA512 a5c2e948d61ab9b70faf89a78637bb5e34629298ed57b2f38f911e1357a2ea44bf6df02cadcc96851f5dea468b02e941c5799e03c6d5c2a55ca35fd2c18b7092
 EBUILD virglrenderer-9999.ebuild 945 BLAKE2B e60197cd251140f20ebbe0cddf8755e867df402159e6f599346995c60776760ccd073f50d104d2eb640f474c67443415c3384891c52378c4f18302f4e262424c SHA512 cb4c8e06b01cb2de59d6fd58588585158b152cd744d3b39e4da2390625e54d6964e065485083cdf7e22951cf00fdbe3a694dd56d5ac4340fcfcd65f634a9ee07
 MISC metadata.xml 371 BLAKE2B 3e3bdb314577f4b67ad0b800c37da42bf1f94200938519c39a3fd4020154065a86925b9afe83aab994ef0cc9b3480005691fbbb7277c367fac72d6e4ce608510 SHA512 94fcfe4653d16579ae9fab9dede61165c0b45ef1f97b642b4d50f0933909fe6ba04e3aa0f0f0e3311d780f126b7860295746caadd1a0245cb950e1012784902d
diff --git a/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
new file mode 100644
index 000000000000..c4890aad262b
--- /dev/null
+++ b/media-libs/virglrenderer/virglrenderer-0.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/virglrenderer.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
+HOMEPAGE="https://virgil3d.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND=">=x11-libs/libdrm-2.4.50
+	media-libs/libepoxy"
+# We need autoconf-archive for @CODE_COVERAGE_RULES@. #568624
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	>=x11-misc/util-macros-1.8
+	test? ( >=dev-libs/check-0.9.4 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-libdrm.patch
+)
+
+src_prepare() {
+	default
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name 'lib*.la' -delete
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1787e82165b5..ca612b056441 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,11 +1,4 @@
-AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
-DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
 DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
-DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
-DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
-EBUILD vulkan-layers-1.1.101.ebuild 1397 BLAKE2B d1e42df59eb04d9f6e42f67e5c130038fcd88e52e88ab328c280d69fe4abb8ed7368699c11d2ff5eeffd21d6adda1964703859274d24db7bb6b9eb9e17d1f449 SHA512 3736990ec0e948a1840ecf7bfb7f2545024aa5b429969220a1a1d55137bcdbbb80b8e8369eece097ca6342513ac8c72f50137116b156b7eed081874de398821f
-EBUILD vulkan-layers-1.1.106.ebuild 1409 BLAKE2B 63eb47c0d571a185626a984c368bcf6c9c7f24d5a71d74c94148b631732fb874a6a38d67ea7ddc8a07de6335e59181d2cd64a94d6f646527a0b5369d59ddb4fa SHA512 38e45b08f2c2bfdb1913da715cb6d6d063c59e20321c2c993025668b462a5e6d799acc48ffbee48593de06ca61c8b8f1ad60715d9de15f0f5fb9214bb7ee2e6d
-EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1511 BLAKE2B 2807d2a7bb147049ceac792aca00a76ed67dd623d0680b7672ef926f9b36d48cd08ec2601d4ae96d747704221bda2f0e2e8a095c7bf6159decf5203be9bf39b9 SHA512 285690f105861791073332f918f16798b24853f22e98eae48e57604cac4c17351721746efa9f613e3b26dd801a2092137de20e7208d7acb066103bd1d233da3d
-EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1393 BLAKE2B 9560cb9f3dacad4ae5002c8fab1f6c37ddbc23729fcea6352234f82535a9b1da43aaa7338118880dc62d30f67a349aa110d4e530044ed1f5498a631635e0ef4f SHA512 3dd3ea7d31947f73da6cd9bad8ea8b94756943af87be0fbb2326aeab76f1bd2e6fb57019935f367f74ffee7a9c0bfe1643eb3018fa5698a3ab381b03fb437829
-EBUILD vulkan-layers-9999.ebuild 1405 BLAKE2B 9e964a27c5a56ed5aa73d081feb5a4943d69826e6499a8e2595a352172caab45eb9d1c933c0c4471e2b9bf8b6efa798559937e3b41acbf7cc539afe444c95820 SHA512 8bb329d435bdae6e431f98649817f1a1070784e8ddf5d58b5117f821b71e302f8e1c45ea8e65a8f62432af4ebecf3e66e82063a93954cf36633e3f4b8844b620
+EBUILD vulkan-layers-1.1.106.ebuild 1408 BLAKE2B deba604fcd8171d7ea1b27f496bab561659073d3405e655561570ff11d74a92b091a8eb78b19eb8335b5a32cb2466f609b0750c873ed981afac71245aa866a82 SHA512 ffb87f7a8a1843b60b28218ad413d51e9673a5d659ce9e6eb5c1b197d7a395b991561d109ba62413b9188b902e61503080095c0251b749289d02aaece92abd7e
+EBUILD vulkan-layers-9999.ebuild 1410 BLAKE2B 79c5abc89ee6e21e80d89ddc58d1bba03f233a381802b06096dea9997f4eaa262e1545da91c696e840409f1ae2cefc106a1cf7994e6905e9e64e785d541be573 SHA512 b44ee188f0bb8af2bb61ad4adabda57e8bd45396346f809d750cb801b1158989a958932bf2e6e8433ddc854d7541d6596767a8fffc3533d77246ae85205c6835
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
deleted file mode 100644
index 7688eb8d5cf6..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2bcf0e5097070532ebfb0bf0ee0b28e1065be1e8 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Tue, 22 May 2018 20:11:17 -0400
-Subject: [PATCH] Use a file to get the spirv-tools commit ID
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- layers/CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 5b3758d1..2a9c2f32 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -51,6 +51,13 @@ macro(run_external_revision_generate symbol_name output)
-         )
- endmacro()
- 
-+macro(run_external_revision_generate_spirv_tools source_dir symbol_name output)
-+    add_custom_command(OUTPUT ${output}
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output}
-+    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h
-+    )
-+endmacro()
-+
- # Custom targets for generated validation layer helper file dependencies
- add_custom_target(spirv_tools_revision_file DEPENDS
-     spirv_tools_commit_id.h
-@@ -78,7 +85,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
- run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
- run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
- if(BUILD_LAYERS)
--    run_external_revision_generate(SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
-+    run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
- endif()
- 
- # Layer Utils Library
--- 
-2.17.0
-
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
deleted file mode 100644
index cee610cca79a..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
-	KEYWORDS="~amd64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="X wayland"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.101
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
index 51564a729aab..6aced6feec5a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="21638dfbe1f15091659a722a805c9020e87ddf49"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
deleted file mode 100644
index bc580d746434..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="X wayland"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.9.2888:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.82.0
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
-	 )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
deleted file mode 100644
index 00a214d89007..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="6e6da6ccab8931f7c30815966ef839b1155e5bec"
-	KEYWORDS="amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="X wayland"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.92.0
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 5e0a2448e380..0858c0d8f899 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index c52cb7e1e178..6c638b1e156e 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,12 +1,6 @@
-DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e4f0d366353f1949c27f5dc3bcbd9997bb97e7d7dc13f141c0423ab162706399a45693da5dc5ed7e6802cc65ec55c711724 SHA512 b26a9389a90cd833c7b18a50766ee0d54ad52aa252d33eb1760ebef38305559664974198a84b0ddbe92950fffc8d2a136c23acff40f73d3cbbd183bc75489a10
 DIST vulkan-loader-1.1.106.tar.gz 1347960 BLAKE2B cfce908571d7033cfaeb1491847b3b1d2032a073cd824e0368402840dfc49ff223023b2d5b2de66f2df63bca7a526c94ab8e11d27d3c1d47b43042659ac38052 SHA512 b5c0f50644f6f026d309af41a232373052ba926c969ce4e5eacdb0accd997906f673bdb3c73b98593ca90e656d444ebd40a7e26a48470b64dea6e9f0c88cfe22
 DIST vulkan-loader-1.1.114.tar.gz 1343624 BLAKE2B 1212c837d86f29160b19bbc14a82564d57722d0d8b540e9360af0a470db59d8c5ad76a1f9f5f892a09b7f43ae62792262b1713c8cabace087c37c2cbb103215b SHA512 90fe8fa7b0a0028faaf8e3aea0724799eb57989a0297e416b3b651a81e0de99b0506eb6b17f84bfc1a6ed33edcc806a5b6c1b187d0d49ea0c8d99ae9dcb5338c
-DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
-DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
-EBUILD vulkan-loader-1.1.101.ebuild 1545 BLAKE2B 453c9783dc86b037c10e2369ca7f63a3dcc9e09507d967344e835bab8cc4348fb207ac39786a610912c01f1ef643015b345e6581acdf9f7b2ea05b2372e64dc0 SHA512 b144467cc7b0f583417c590a94d2ba7e393e135256b5ec42fe5df1d0ac55fba7ae1f2af05a7131e94c971a8fedacb98a1d85e5d9c8d3346fec545933f8c2b794
 EBUILD vulkan-loader-1.1.106.ebuild 1544 BLAKE2B f45fd9efdb92ea4c8c795a3b8a0dd119992d5272128bb0130004715ec08f1fa94cff558c04b3065c82f3aa5bc372c36bf9cde9673e42818095edd01494d7933f SHA512 3d08ffe794072cce055e1578cd6360d204b219f8258f7aacc63ef417950542b8fdb08274f452a6fd2b017507b2cd3eea091d23a1059ce10ed979d3bf6b1e2bc6
 EBUILD vulkan-loader-1.1.114.ebuild 1546 BLAKE2B 864d20027485428d3f252e3182fd33cb488d9fc51a4ad37e9c30986ccf91025370641ca76f6f11e4cad155b3174493f0f4351bec5eadcdd88b1987b9451c570d SHA512 01abf36a3efb2efc6d39624a715888d066768cc21a631562ade8b7d0b92acfa134fff00e1a7c7e6b673568357a461c02f996de97914bda16381ae7b97e35265d
-EBUILD vulkan-loader-1.1.82.0.ebuild 1577 BLAKE2B 35be92f5ef1db058387d143a0f3c3582184cbb6de3bfd180b4d0b65414fbdea17c288dc2c783836ca954ab86503e03d5b6c31b42a3d2f6a3bc6784ec60d4e0e1 SHA512 bf016f1e3feb1f1833b081d10748fe744556baa247919c7fdde981b8ba99d01f74a8e87290162c03648e85cd3cc553286a4fe9f2108b2733e90de2fa16f75306
-EBUILD vulkan-loader-1.1.92.1.ebuild 1541 BLAKE2B 73bedd25efbf694a49f813c1f519ad19a38da9475ffb2dbd83d56ef1f115b6a8ddf0495d1123a378830922641e25d340e7ea81dba7f87fccdb4fa8644f7adf14 SHA512 5990de98b83d7b270f35efa7de0df9b5c6fc2d226bbac8d96cbc84bd0521bd9de27b9ca5a4ef3803f391fe4e782969f61b7757399942d87edfa8125da15ee87d
 EBUILD vulkan-loader-9999.ebuild 1541 BLAKE2B 203234a07960cfd576212095173a1ac3e8b94d7db8aa06a16b5e63ca2b35c8c0a21d942bbef73b75ca7337a99a7611e384a41d6d4b365b9b398fbfac55c38458 SHA512 d15c216c8346e7c3efa5864deb8d0a586b9a2b4b5929ce7a34e149cf30e01fc93ce4433b1b8dfaab3032e07cc8716d2d2254ac4708ce215af98783099ecb04bc
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
deleted file mode 100644
index 65da95c20fc5..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	KEYWORDS="~amd64 x86"
-	EGIT_COMMIT="15fa85d92454f7823febeb68b56038d427e2a7a4"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.101
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
deleted file mode 100644
index 3ee666998a58..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="979f925d939e4daa3c823bd2b9d46ca479481fe9"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.82.0
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
deleted file mode 100644
index d1dc5f29ec5f..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	KEYWORDS="amd64"
-	EGIT_COMMIT="4cd7e44fc1ca6c4d8361720b43a3588ddf9fc4b6"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.92.0
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 602a51e8e31b..2c9f6c4dcc5e 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,6 @@
 DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
 EBUILD waffle-1.5.2.ebuild 1414 BLAKE2B a88cd403d6173d0af963f2534d9df66a1b4ff184de9fcc98f88981eaea50bb338e58c12f165d5c320eb2071e6716d1dee3b6155c6367b13586e42b6cd8b9e1f2 SHA512 d0fca799279802a5deb3e8f32e85d3d63058f96ac78c8839c91f8bd2644f0fd35ea7bba647d24a57c6723f1f36340a63c5be6de264db71b8231a3ed692f85feb
-EBUILD waffle-1.6.0.ebuild 1643 BLAKE2B f7b6e1f45ffe58a2111de95829c3ad8b4a96fdd25105b821edb06d5d0fe3abef312fc4bcaeca47faa57a03dbe1aeaf81586d7871813caa6d1187c979b2a307d7 SHA512 9c3ce579256c369857f7173305a63f9c19d8d7e6c95bf966da248e505a4b61acf333199ba57634383d4934fbecb6da13a75b67930c8f8bd4876390eb64283275
+EBUILD waffle-1.6.0.ebuild 1642 BLAKE2B 7262ae28599b42db5f96adb1687e8db28fee31045c5066cc12d8807aaa1884f7c553bfb8ba45863f06556ef663e9d12334f496e9d1cc8ad6553970a46436fbdd SHA512 ca8b3cd470a01234ba8cd85140245155933df0679438cb65c13f86a5c34199793063c1be440a482fed9a4f2b0d164249d778615eba54be766533e75bf322ac2b
 EBUILD waffle-9999.ebuild 1645 BLAKE2B 3d6c0a12d5484a9b4336d56a153a811804bdebd6aca67068b42a4824c21da01f5d1796d2ba704ed23833aa1a465bdade7208a21dadc902d60158bf81373f49b3 SHA512 15b9a381dc3b869bbdce9165ecf62582b37159a78f5b082c1b9d1eb6018b8fc2c0bbc83f7986296f5a027fab4b8dbac4405d166d372a6124d69c282f6b05ceda
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild b/media-libs/waffle/waffle-1.6.0.ebuild
index 281ad9364c45..ccfc41d0c8ca 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 49393858a88b..4d5b6895271e 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,4 @@
-DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
-EBUILD x264-0.0.20170701.ebuild 1911 BLAKE2B c21bc7d12348132235a36e20861e3a233470de8568232ef87e0b3140abc5fb8184171d429a19b558704fdb1fc61274d65e4cd50414ad4071dd1a440065bb7a78 SHA512 bf8bb4ff81bf4dd743bbd02aad8854aa6a532e023c53b7d22a49a69623b4394d1527e5a325bfd150f4b211317d91e96d2eb713a1b008ae086163fbdf58121b70
-EBUILD x264-0.0.20190214.ebuild 1816 BLAKE2B 075a654bfc771b528f693ac39d5920e7879f87c3336a8446d09e9501d286edbbf8d58d374228d22895c10943878bca86404116673a82120ba6de54632c3a100e SHA512 464d292cd43c6806e80308b4f6004e289f45cb2666ed00615d797ebc7148c194ae447df24c3a6a4efba230ba3570b3de98be11acb0ce538c0676291bcb56d52c
+EBUILD x264-0.0.20190214.ebuild 1815 BLAKE2B ef9a8e82e7859922afc7f496a7a70b5ebdd01442bd11b5990b14b6a5384faf87123529398ed8bdc21f1685eed839aeb5cbd4ad9614c6073d0dd0e0f04651d9b1 SHA512 9d1e2c6ae46dd73d71929e1d46eea7f8e63517653b17aa3d88b884cd59a1b3fb1646560363e52c517eaf33afc11ca9f6b36d094162259faea8b2aee94bbf8f58
 EBUILD x264-9999.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
-MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
+MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 1ab4b5f74437..5f2a50269007 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -5,7 +5,6 @@
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="10bit">Set output bit depth to 10, this may not be compatible with all decoders</flag>
 		<flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
 		<flag name="opencl">Add support for OpenCL.</flag>
 		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild
deleted file mode 100644
index 284bd9ada4b9..000000000000
--- a/media-libs/x264/x264-0.0.20170701.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
-	inherit versionator
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="152"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-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
-		asm_conf=" --disable-asm"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-cli \
-		--disable-avs \
-		--disable-lavf \
-		--disable-swscale \
-		--disable-ffms \
-		--disable-gpac \
-		--enable-pic \
-		--enable-shared \
-		--host="${CHOST}" \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex opencl "" "--disable-opencl") \
-		$(usex static-libs "--enable-static" "") \
-		$(usex threads "" "--disable-thread") \
-		${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
index 9c2a819d5bb0..25efcae6f52c 100644
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ b/media-libs/x264/x264-0.0.20190214.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 9cbbb1c88470..dd89a7d2738e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,5 +1,5 @@
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.9-r2.ebuild 5355 BLAKE2B 51850a735106de45ee02196dfffb877808a8990762123a3a359bba173426d9bec09385899fcb356cbfac9a542ce029208b23575a18d56c6320dd14e6a8c089fc SHA512 4cc3a1c26122fbfbe7413e8594ce82ace1e0d15585e7e6f1b43dff548cdaa3e9ef0cf42d23fa362d8a30a599e8e6b560d918aec3b07734b2c82d617ece5073a5
+EBUILD xine-lib-1.2.9-r2.ebuild 5351 BLAKE2B 0ec852662e113d0e05617babcec1019ce1db51c86847dfbb58bd7923dee33cc525c159eb7a7a469510ed33ec87d178c7753b355fdecb80ee5f55d0e84862cfc8 SHA512 ea39781f1d8c8375c87d1536fb0354a0f53fdccbe7c11a7c76673f34ac80feb98e1c304ecba9db8f9e8a35ea95f48e8dd2b860fd127db0a4bc600b9edf0d9058
 EBUILD xine-lib-1.2.9999.ebuild 5243 BLAKE2B 8888c9919af784852b6559444a68a9893bda5c12eca5b930f026231c686eb8aba342345e5848c40ae73f4a138bd1c43194290f07df15927f992da0f09fab022f SHA512 9501d294ecb056060f1cbc9b3367ab48ca56e30bd3448f13027ec51764a707a70db707852587a68a29896fffd302e00cc22c602436e90a049f3d3a161bedbf66
 MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index ffafb74e6957..d0dac86ff295 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 35346f06ccc2..594f2326c711 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,11 +1,4 @@
-AUX zimg-2.7.5-sse2.patch 9349 BLAKE2B 2b1220d747919074d400dc35d5a23d53be800071d386801c737faeeebf3694925c20de6e0198ef8cbb143580da46e136b24ad39831167440e6ad7415adb76a04 SHA512 c8f27676c441a76dac56b1d8e11229b6b5b9d515a99082d15af9a173b7570becb03961384c64ad62c908e1d64a4427e2b838836c65c1fd687773e6a2da5d6e38
-DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
-DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
-DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
 DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
-EBUILD zimg-2.5.ebuild 825 BLAKE2B a44868a6c09dde69f9a14d88e292816982efe3d2a710be81eba6d6ec5879c23b2ffb24ca55015550854e10956efcb9642257889867e0d206302cf1897d472e3f SHA512 5630c26971ac2075b4ceb82f615b818d6c2a53a273258ad4a08bf154239ff552220bfdb7104f94e6a1c69e0e4ff17d0be7dda56c98fcb5fb99cbe44509efa42f
-EBUILD zimg-2.7.4.ebuild 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
-EBUILD zimg-2.7.5.ebuild 819 BLAKE2B 971193910a769767c6793d576a7c15a1f39c9dc86609e3c5f6ef61716aabbfcf5b7cc8837c383d3d36a8f6fdfc504337e29bffa13b0810d270aba16d264d1655 SHA512 4bfeecc8a61a0c158397a4f84403ec2ced106573df74c7cd7b8518dfb934e4932646760a9ec56d7f91b38b7ec01087d8f9b400e468231b36b580835203e1d4bc
-EBUILD zimg-2.8.ebuild 770 BLAKE2B 3f5368f591f1a802330d49170fa89dc015289279fded4b0ea62affe9c1fb293ce90c73ca9661f9ab060f5d560a551df0e967fff30950c5539c8a3aaf2b46fb3d SHA512 40209ec0c1e8bd84e5109e00ffd542d813fb9ed52341f27e01ddcd8ffe3ff4c1720f2aef8bc9ff33f9156c86e95b480324696de4281fc1e1865c5ca2b17ccc7d
+EBUILD zimg-2.8.ebuild 768 BLAKE2B 3d2689c9a337f20018731922a2dfd0ec8b761987c3694c660a72c1f2de954a20889a2e280c203da12fc5c260c4e094108b9d48d7164c3c2bb44af684f26335d9 SHA512 d5fd7567920aa819a0ea21b93b9e2a570c1d0b97d8e81793448fbfe7735919143bf381431f38f87a96d64bb3de9c84c46e58b365e637d5a5cc7044388689a7f7
 EBUILD zimg-9999.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/files/zimg-2.7.5-sse2.patch b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
deleted file mode 100644
index 77483ab59e73..000000000000
--- a/media-libs/zimg/files/zimg-2.7.5-sse2.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From e30112df0ca703be82ed2c852511916fc46defbd Mon Sep 17 00:00:00 2001
-From: sekrit-twc <noreply@example.com>
-Date: Fri, 22 Mar 2019 18:51:14 -0700
-Subject: [PATCH] colorspace: use bfloat16 for SSE2 linear-to-gamma LUT
-
-On Skylake, processing 512 pixel array:
-
-direction	cycles/sample	cycles/pxvector
-     g->l	         2.35	           9.43
-     l->g	         2.49	           9.97
----
- .../colorspace/x86/operation_impl_avx2.cpp    |   3 +-
- .../colorspace/x86/operation_impl_sse2.cpp    | 104 ++++++++++++++++--
- test/colorspace/x86/colorspace_sse2_test.cpp  |  14 +--
- 3 files changed, 100 insertions(+), 21 deletions(-)
-
-diff --git a/src/zimg/colorspace/x86/operation_impl_avx2.cpp b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
-index bbbbf896..f0e7f792 100644
---- a/src/zimg/colorspace/x86/operation_impl_avx2.cpp
-+++ b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
-@@ -114,8 +114,7 @@ class ToGammaLutOperationAVX2 final : public Operation {
- 	{
- 		EnsureSinglePrecision x87;
- 
--		// Allocate an extra LUT entry so that indexing can be done by multipying by a power of 2.
--		for (unsigned long i = 0; i <= UINT16_MAX; ++i) {
-+		for (size_t i = 0; i <= UINT16_MAX; ++i) {
- 			uint16_t half = static_cast<uint16_t>(i);
- 			float x = _mm_cvtss_f32(_mm_cvtph_ps(_mm_set1_epi16(half)));
- 			m_lut[i] = func(x * prescale);
-diff --git a/src/zimg/colorspace/x86/operation_impl_sse2.cpp b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
-index 48645031..da9d4dbc 100644
---- a/src/zimg/colorspace/x86/operation_impl_sse2.cpp
-+++ b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
-@@ -3,11 +3,13 @@
- #include <algorithm>
- #include <cstddef>
- #include <cstdint>
-+#include <type_traits>
- #include <vector>
- #include <emmintrin.h>
- #include "common/align.h"
- #include "common/ccdep.h"
- #include "common/make_unique.h"
-+#include "common/x86/sse2_util.h"
- #include "colorspace/gamma.h"
- #include "colorspace/operation.h"
- #include "colorspace/operation_impl.h"
-@@ -20,14 +22,25 @@ namespace {
- 
- constexpr unsigned LUT_DEPTH = 16;
- 
--void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float prescale, const float *src, float *dst, unsigned left, unsigned right)
-+template <class T, class U>
-+T bit_cast(const U &x) noexcept
-+{
-+	static_assert(sizeof(T) == sizeof(U), "object sizes must match");
-+	static_assert(std::is_pod<T>::value && std::is_pod<U>::value, "object types must be POD");
-+
-+	T ret;
-+	std::copy_n(reinterpret_cast<const char *>(&x), sizeof(x), reinterpret_cast<char *>(&ret));
-+	return ret;
-+}
-+
-+void to_linear_lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, const float *src, float *dst, unsigned left, unsigned right)
- {
- 	unsigned vec_left = ceil_n(left, 4);
- 	unsigned vec_right = floor_n(right, 4);
- 
- 	const int32_t lut_limit = static_cast<int32_t>(1) << lut_depth;
- 
--	const __m128 scale = _mm_set_ps1(0.5f * prescale * lut_limit);
-+	const __m128 scale = _mm_set_ps1(0.5f * lut_limit);
- 	const __m128 offset = _mm_set_ps1(0.25f * lut_limit);
- 	const __m128i limit = _mm_set1_epi16(std::min(lut_limit + INT16_MIN, static_cast<int32_t>(INT16_MAX)));
- 	const __m128i bias_epi16 = _mm_set1_epi16(INT16_MIN);
-@@ -73,16 +86,61 @@ void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float presca
- 	}
- }
- 
-+void to_gamma_lut_filter_line(const float *RESTRICT lut, const float *src, float *dst, unsigned left, unsigned right)
-+{
-+	unsigned vec_left = ceil_n(left, 4);
-+	unsigned vec_right = floor_n(right, 4);
-+
-+	for (unsigned j = left; j < vec_left; ++j) {
-+		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
-+		__m128i msb = _mm_srli_epi32(x, 16);
-+		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
-+		x = mm_packus_epi32(msb, lsb);
-+		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
-+
-+		dst[j] = lut[_mm_cvtsi128_si32(x)];
-+	}
-+	for (unsigned j = vec_left; j < vec_right; j += 4) {
-+		__m128i x = _mm_castps_si128(_mm_load_ps(src + j));
-+		__m128i msb = _mm_srli_epi32(x, 16);
-+		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
-+		x = mm_packus_epi32(msb, lsb);
-+		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
-+
-+#if SIZE_MAX >= UINT64_MAX
-+		uint64_t tmp = _mm_cvtsi128_si64(x);
-+		dst[j + 0] = lut[tmp & 0xFFFFU];
-+		dst[j + 1] = lut[(tmp >> 16) & 0xFFFFU];
-+		dst[j + 2] = lut[(tmp >> 32) & 0xFFFFU];
-+		dst[j + 3] = lut[tmp >> 48];
-+#else
-+		uint32_t tmp0 = _mm_cvtsi128_si32(x);
-+		uint32_t tmp1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(x, _MM_SHUFFLE(3, 2, 0, 1)));
-+		dst[j + 0] = lut[tmp0 & 0xFFFFU];
-+		dst[j + 1] = lut[tmp0 >> 16];
-+		dst[j + 2] = lut[tmp1 & 0xFFFFU];
-+		dst[j + 3] = lut[tmp1 >> 16];
-+#endif
-+	}
-+	for (unsigned j = vec_right; j < right; ++j) {
-+		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
-+		__m128i msb = _mm_srli_epi32(x, 16);
-+		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
-+		x = mm_packus_epi32(msb, lsb);
-+		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
-+
-+		dst[j] = lut[_mm_cvtsi128_si32(x)];
-+	}
-+}
-+
- 
--class LutOperationSSE2 final : public Operation {
-+class ToLinearLutOperationSSE2 final : public Operation {
- 	std::vector<float> m_lut;
- 	unsigned m_lut_depth;
--	float m_prescale;
- public:
--	LutOperationSSE2(gamma_func func, unsigned lut_depth, float prescale, float postscale) :
-+	ToLinearLutOperationSSE2(gamma_func func, unsigned lut_depth, float postscale) :
- 		m_lut((1UL << lut_depth) + 1),
--		m_lut_depth{ lut_depth },
--		m_prescale{ static_cast<float>(prescale) }
-+		m_lut_depth{ lut_depth }
- 	{
- 		EnsureSinglePrecision x87;
- 
-@@ -95,9 +153,31 @@ class LutOperationSSE2 final : public Operation {
- 
- 	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
- 	{
--		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[0], dst[0], left, right);
--		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[1], dst[1], left, right);
--		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[2], dst[2], left, right);
-+		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[0], dst[0], left, right);
-+		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[1], dst[1], left, right);
-+		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[2], dst[2], left, right);
-+	}
-+};
-+
-+class ToGammaLutOperationSSE2 final : public Operation {
-+	std::vector<float> m_lut;
-+public:
-+	ToGammaLutOperationSSE2(gamma_func func, float prescale) :
-+		m_lut(static_cast<uint32_t>(UINT16_MAX) + 1)
-+	{
-+		EnsureSinglePrecision x87;
-+
-+		for (size_t i = 0; i <= UINT16_MAX; ++i) {
-+			float x = bit_cast<float>(static_cast<uint32_t>(i << 16));
-+			m_lut[i] = func(x * prescale);
-+		}
-+	}
-+
-+	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
-+	{
-+		to_gamma_lut_filter_line(m_lut.data(), src[0], dst[0], left, right);
-+		to_gamma_lut_filter_line(m_lut.data(), src[1], dst[1], left, right);
-+		to_gamma_lut_filter_line(m_lut.data(), src[2], dst[2], left, right);
- 	}
- };
- 
-@@ -109,7 +189,7 @@ std::unique_ptr<Operation> create_gamma_operation_sse2(const TransferFunction &t
- 	if (!params.approximate_gamma)
- 		return nullptr;
- 
--	return ztd::make_unique<LutOperationSSE2>(transfer.to_gamma, LUT_DEPTH, transfer.to_gamma_scale, 1.0f);
-+	return ztd::make_unique<ToGammaLutOperationSSE2>(transfer.to_gamma, transfer.to_gamma_scale);
- }
- 
- std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFunction &transfer, const OperationParams &params)
-@@ -117,7 +197,7 @@ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFun
- 	if (!params.approximate_gamma)
- 		return nullptr;
- 
--	return ztd::make_unique<LutOperationSSE2>(transfer.to_linear, LUT_DEPTH, 1.0f, transfer.to_linear_scale);
-+	return ztd::make_unique<ToLinearLutOperationSSE2>(transfer.to_linear, LUT_DEPTH, transfer.to_linear_scale);
- }
- 
- } // namespace colorspace
-diff --git a/test/colorspace/x86/colorspace_sse2_test.cpp b/test/colorspace/x86/colorspace_sse2_test.cpp
-index d5130868..ecaa05e7 100644
---- a/test/colorspace/x86/colorspace_sse2_test.cpp
-+++ b/test/colorspace/x86/colorspace_sse2_test.cpp
-@@ -53,9 +53,9 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
- 			"162687e701627cdc17283a32c36ea711d28a953e"
- 		},
- 		{
--			"492587e7ed75b7e3ab868bead6ade7a4137c6ea1",
--			"3b0694e9fbce61466cb5a575f300d784089b6cad",
--			"b68f103f52ccafae867d664d7f27fe56ae9208af"
-+			"95f2715bd0d417028bebd5c5377180fcd5b01119",
-+			"76f7c88b198f1ab08167f8162c1237b54f22007a",
-+			"1099c3ae187c0a9f79acb9445761b6056218c779"
- 		},
- 		{
- 			"4c0b5ffe768a7812d1ef102b4d8d52614838bc8e",
-@@ -63,13 +63,13 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
- 			"85a277a80dfca2e21789cedd76aaee307dbc4562"
- 		},
- 		{
--			"df546ce0ad6f859499a96d2d697d896067e60e38",
--			"f0041b8a008ab45f0ea1319090ac7e8be0990d92",
--			"06880efb598e41f96fa79e04dbdfcccd50d6dc6f"
-+			"5e35786d313e936566d9873ba7a08a8d6005b2ee",
-+			"829fa88acfbbb26801871bf3cadf5cc2eb6830c9",
-+			"f82fcad18a19b548d419a1952b6a7a423a684b62"
- 		},
- 	};
- 	const double expected_tolinear_snr = 80.0;
--	const double expected_togamma_snr = 40.0;
-+	const double expected_togamma_snr = 60.0;
- 
- 	SCOPED_TRACE("tolinear 709");
- 	test_case({ MatrixCoefficients::RGB, TransferCharacteristics::REC_709, ColorPrimaries::UNSPECIFIED },
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
deleted file mode 100644
index df91e3a3d814..000000000000
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	autotools-multilib_src_configure \
-		$(use_enable cpu_flags_x86_sse x86simd)
-}
diff --git a/media-libs/zimg/zimg-2.7.4.ebuild b/media-libs/zimg/zimg-2.7.4.ebuild
deleted file mode 100644
index 1d720a336c91..000000000000
--- a/media-libs/zimg/zimg-2.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	autotools-multilib_src_configure \
-		$(use_enable cpu_flags_x86_sse x86simd)
-}
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
deleted file mode 100644
index 7bac59befc36..000000000000
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-inherit autotools multilib-minimal
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
-
-PATCHES=( "${FILESDIR}/${P}-sse2.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse x86simd)
-}
diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild
index a4d7d1777da2..5108ffad5122 100644
--- a/media-libs/zimg/zimg-2.8.ebuild
+++ b/media-libs/zimg/zimg-2.8.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
new file mode 100644
index 000000000000..4eaf8599225b
--- /dev/null
+++ b/media-libs/zxing-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST zxing-cpp-1.0.6.tar.gz 128813069 BLAKE2B c222dc2cc21b28e5333a2dcac47e1c13712851a0d8185bf410f455f4a9176c9c3795e242d71b89fb211e9f4da29cb8d3b7a7c380ea37d48f1710540316914a70 SHA512 fa773ba7dfca6325419118221cfe555810e793dbffe5cae1c62056479fdd6d6a60c81fb88e3bc3bb71bc369b6899a8db64f4b18eb7f4d13b8ea4cdd2d51fa9c6
+EBUILD zxing-cpp-1.0.6.ebuild 416 BLAKE2B f9d8777fd020cf30e42b770efeef8a6be278907bf8ccc6d799a07b5c37d4654d96d3061fe9a0c48a696fa614f8e12875ebb47d5a266348525dc6465a6e6f97d8 SHA512 889cd08b0832e500aeff31fc21d212cf01d0a2bb696e273ea61d43b132fa2119c96894e22e699ae265702a6bdef926e63a1a8efeaf12bce3e71a7f899dfd2679
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/metadata.xml b/media-libs/zxing-cpp/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-libs/zxing-cpp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.6.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.6.ebuild
new file mode 100644
index 000000000000..e90efd377b2e
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
+HOMEPAGE="https://github.com/nu-book/zxing-cpp"
+SRC_URI="https://github.com/nu-book/zxing-cpp/archive/v1.0.6.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-libs
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)