gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /media-libs
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
176 files changed, 2343 insertions, 877 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1e5c647f94e8..09187d6d869f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 037b5f4ce264..0f3e138e0603 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -8,5 +8,5 @@ AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
 EBUILD aalib-1.4_rc5-r6.ebuild 1779 BLAKE2B e89ac319629bbe00158c7b9fee75e44681a050cc30e4beb6023274268e646ed8e0e27bc27ac982d70157807f71d8238d793c3c14fde689c6ea47674666e76fca SHA512 0217cdbdaacb10eef8148600c37623f63dd9682a9f652fe1c8da17676f4841fe501b5e3e8c9bf8f32463d66ef4d6520eec4787885756f5166eae1944667c2d78
 EBUILD aalib-1.4_rc5-r7.ebuild 1844 BLAKE2B c0da2a46a489a14d24268c78789fb2a381746533910ee313067dd577155711210ca2853e572e0cb9b9903dbf10fa8e6d6300cb2b199296e761f9f6bcb0dc39f0 SHA512 b8bb79cd21dd348258e0eb6fda05b75a009497d923801a742fc2dab142194e8bd1b60c3f640ae15063735721b6f0d387c4ec613f889e460ab982e1b5c3492477
-EBUILD aalib-1.4_rc5-r8.ebuild 1976 BLAKE2B c8235ce06a263ccc4c4b98f41a417fec47e3387fa1bbdea8b91453de659ea53e7e0e3aa034bf6fbb0add03a0d0b59456828d56045d6cede52b5675afb110fa67 SHA512 959aa0324f0528424cf28ebceeb1cd0c2063afd41826c0c1895595664759ec736ce8a749eb6dae29123c9943977f7a27ebcfe7917bc6992106229aa89472c633
+EBUILD aalib-1.4_rc5-r8.ebuild 1974 BLAKE2B 1f81b49b00fa524164e47efd3df390616d8768b7b2b2d886c21b0dd4c4446c4f3edbc103630647be6c07875ce96d01e1b30e03ec5d99f9fef215cb0264a12cce SHA512 d51d828d5f65486d1f12f2e4a0f599f6df99344d505b6f4a03e8d71457a83a44769da9b5758acb0c38c6ca8c539f58e2c5d23d5ad92f8a5b3fae0c5098efc40b
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index 70c16d8a2b56..6022782624d7 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 1bbd2397621e..12a5a7cf3b15 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,10 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
-DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
+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.7.ebuild 2061 BLAKE2B 4d85f8e9ba863e56a7100c5a3b64d00980c389aaf71a34fadf3026de610c92b7ac7d7fa21e1498bbdfcbd938d8bacf95a96d7315c65099226c593fd18af3622d SHA512 c9fd20fa7b2a891702ad0b8452dc5cbc91d57c0fdc1cde2be352eb2fee256ddd5fdfbd7fd752ff0127c234234929f19a46893c9904ab400a6c5cf735e4f0d885
 EBUILD alsa-lib-1.1.8.ebuild 2058 BLAKE2B 3e78962d6149f9f572f8546b96f2b9b3b1109b4d3494160e7685666a6dcf7585a01403aa4b838745d50dccea12541e645b1e2b105728a00f0c4f3e763b028fff SHA512 d1be036bcd64715e117923e13bde9e5f8c5ffb21766bbca2aac6518c62783cbd9d36ced6ac3c9639ead1f5a31b3d9d48972ceda845ddc4f565077c8176b701f4
+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.7.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
index d0d8d828dd6b..bd05d5482877 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.9.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/audiofile/Manifest b/media-libs/audiofile/Manifest
index 652ac564737f..0cc697fd7337 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -3,5 +3,5 @@ AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc39
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r3.ebuild 1257 BLAKE2B cbd806bc922f14bb45c0a49899f3307ddc515c4148e63fc28f9472c67a212ba8c96036d86572b294bc9c355e13eda3aa83ba828a56f3d2d62b9e463f5f915374 SHA512 ca67c2e6a5c279f94589a66289b82e44eb21915022946e06e78c7691a27ccabecaa501c0531d6bf9aeaf631561773e3645566051df4aaa29aff97acb5a06a73d
+EBUILD audiofile-0.3.6-r3.ebuild 1256 BLAKE2B 9d7550af23e13132a3e77fada87185a05879a4cbe3fc811d55b4bafef553e8a0590c5c2d60164f6d185521d6901532a57afe1b33d386332ec8a51c244881ab4e SHA512 788cbe79dd9e368bb826d054a1c4f8e060fc23d9cc1d1ea92babb1077981f00661a53b0c2b02e58c3fc85e71874e0cc14719f58bb4adc7a4bd9011d073d2bc01
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index ad1115fbc7b1..f381e943508a 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-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="flac static-libs test"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 04da18b48207..dae8c339f648 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -11,6 +11,6 @@ EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b3
 EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
 EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-0.1.62.ebuild 1541 BLAKE2B 0cf91fd3f1d7c4e02c59d182e261ecd3aa99ce5cd762309665c06127f77d647869d3a5dfe9ab14f6afe1575da93de48f402346063feac4e87e5e4aad799bfdd0 SHA512 77f7edbcda18c51fcbc0cd93a6fbadb8f69d6d43a4735521853ec5ece702f1be59dae12551ee699a00a717b90cae2302ecc813bd6ddf6bb3d165704783304dd3
+EBUILD babl-0.1.62.ebuild 1538 BLAKE2B 428218e93b8d7c4613ffb0057a2a535e907a0de557f9cd1175bef2337f0e361e719b2e612935525cf263fc87773588a583505e9d3c5fa9cb933dfc3ef58a9462 SHA512 fa952f0baaffa81ab911f068efec2ad9da35b944b96ca8e6a9bb556e711496c31289d8f5f9a1d98df04a3a7bc1eeb9805b39e132ef93746511bf0ef10526daa9
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index 9ede1d886122..3930ee7f2a6a 100644
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.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 dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 022b3451383f..18db82bddc82 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -3,5 +3,5 @@ DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1456 BLAKE2B 73af00b6ae7346527194ec03525725a491272fc3afdb73b7a9ba44eac1c3087d98a42924281aa794b2dabd1c7470dc3e992ee7289cccae2198a3cf1d9af52b08 SHA512 1c8edc98a94b46d0b2ac4f24b0d5f93ca4635643ba5648d3430ed5753849c2f786e93ca165bcab7ddd655c1bdd5c6be1cc028d53ee3dd5a9a00c2f1f790e3046
+EBUILD chromaprint-1.4.3.ebuild 1455 BLAKE2B 30a377aa69cfe7ef3634c8e903af9c579c65d1ede46b2eb9dd90d210c91bc65b1d3da79fb9d4420c8a50d6528c1620583b4bfd3558386890e86ce24cfefd6cc7 SHA512 c82f505335eea9f01d6d0924598c60b6f79820fc9282b7e8c6cdb60219b329e9021db3ed2af0eedd1697b6e0036f1d4ad3e1bd8f20b9a6106ff1a192bd516530
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 2bf949dc9321..5c817db6b18f 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.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=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 441cbc66439e..9a11f7e8c371 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,5 +1,5 @@
 DIST clutter-gst-3.0.26.tar.xz 402976 BLAKE2B 41a8da175c7b99e9072e76cd0fe8c89050a3b8a11c6c3e7887c1fc466e57d9e9a4f3c2efbc030dc3da51eebc54d56ec1702298bb04081f0a6a169f4f94fbb01c SHA512 c1dca7b6fb7756dd1642e176b2d26f28330388283623c46350a8c979f3dd4af916a9807dfe4937ebd9f747f781a7dad4f0f8eea74ba8423c32bd92610eebcbc7
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
 EBUILD clutter-gst-3.0.26.ebuild 1467 BLAKE2B 5433ba13390dafccc72989838ee5a991f935e473e932e1a045536ef7a79518b5cb40dea9411fa321088054974a132e85d214e6b3e223f764b5830f8c366c6120 SHA512 a6df80f8d18e661ff98aaa715c961beb57f0f7815e4a7750eb7aa2311568745c8d2b59673a6eb7f0cc6df7abb1c7e34928228af755f9fc06398ccc4ab858bd1f
-EBUILD clutter-gst-3.0.27.ebuild 1469 BLAKE2B f17ee323129f81c22a85baa95a7ed9bb3dd21338cc4652bc7cf14af25c7f40bc02bdbaf0b1ed03aff5597ed18ff3b6dc8038d08d23057902f76b55a9e6c3b2ae SHA512 039c2a7b90d0ecdfb436ad5ea29ad8c2e5ab82dcdd15ff340196ba11be29e25e077d63b1d19819cdc81eb83f67f4d78b646c6ba4f6784f8ff3a63c5d2a6b487a
+EBUILD clutter-gst-3.0.27.ebuild 1467 BLAKE2B 5433ba13390dafccc72989838ee5a991f935e473e932e1a045536ef7a79518b5cb40dea9411fa321088054974a132e85d214e6b3e223f764b5830f8c366c6120 SHA512 a6df80f8d18e661ff98aaa715c961beb57f0f7815e4a7750eb7aa2311568745c8d2b59673a6eb7f0cc6df7abb1c7e34928228af755f9fc06398ccc4ab858bd1f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
index 8d47b7020034..0de022907bbd 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X debug examples +introspection udev"
 
 # >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 0bbf79655a39..7019e8ad054c 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -2,9 +2,11 @@ DIST dav1d-0.1.0.tar.bz2 351745 BLAKE2B 302680ddfdc8d5a3eff90541ed156e820c3322bf
 DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a70e884c5116d8d1a56b81c1f852c93666bd0bb3f4d5105f2220bbc6c92f893848f0cf1bfc0bce1ee1f551287c SHA512 378060ed6762f9f6baf7addfa7382cb0873bbc606f0389eee4ed7537dcfc851f5b159a34af0f15d9f8d345a9b2a950f38078a419144b0458aa3464e54ea5d490
 DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
 DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
+DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 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 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
+EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
+EBUILD dav1d-0.3.1.ebuild 1154 BLAKE2B f79ee2f23c4cc171cc67bf35bba8fec0d82f49cc532c722d7d266a522c10c66827a7b6b6259a5266cf7a8751c685d16c728c3f6f1cc45cc21f29656781a5e508 SHA512 43cf2076f36bda99211346ed7c28dac9528856288bf3247472dc66340a5408fd227dc84655f9fd07244c9095cb6cbf57b94d6e98a65f2e9fcd6dce26c7979a94
 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.0.ebuild b/media-libs/dav1d/dav1d-0.3.0.ebuild
index 361df4a791a4..cd21f300fe0f 100644
--- a/media-libs/dav1d/dav1d-0.3.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.3.0.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/dav1d/dav1d-0.3.1.ebuild b/media-libs/dav1d/dav1d-0.3.1.ebuild
new file mode 100644
index 000000000000..853076cc5077
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 067971432324..be1925ea54a4 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,8 +2,12 @@ DIST Image-ExifTool-11.29.tar.gz 4503877 BLAKE2B 9afbb695edebb1be2c673abbdf32626
 DIST Image-ExifTool-11.32.tar.gz 4513430 BLAKE2B cae07a83ab5c46297ce0b4a12707450b9ded1a4e7edca08413e9671105a34d82ba7ee35eaf39ca64dfbd2b4607cd672b2399a325f8a3d3a76e18e348456fa550 SHA512 9dbb0d297292051171c28cf110976557f96df7079ea7ee38a722ed6ea9efbd758849ca77d9503c7d61964da5e48ab766c8cf58b3c5dfa96d499cbe6b5fb66668
 DIST Image-ExifTool-11.33.tar.gz 4526448 BLAKE2B a286809cdfc10c4015ddca95666ea7ac294c1b4c04c36cc2895918406e2cfed005b5b194a7f2a9c66e6d8f3551553e86ccfbc22339a14b2f9b906038b5fe8a6f SHA512 96a3a2421e3849ae6a2e49b7099415c11c2f65db1a49bebaf8b0c7f4de285aff0d412fb4ac12fa3d7fb59939199fdd49d86be0e55c72cd8b2056803a16fe5eb9
 DIST Image-ExifTool-11.37.tar.gz 4531738 BLAKE2B 2ed39e3767aed9766dad91869ae55503aaec7abd20a70a4bdf69646559fa2886e9a484c83dd3ae6257399267ceef8cc8f6a44dbbd71c0814fb8b1e7b342505cf SHA512 582198247e4804caa94df8acf684c6ac27b9f0b9b90b163079ed03b2f150ce7861f8d6464e56dec54a58e416d00f78ce8b02051b64f5e4df6df49a0c4c3ca25b
+DIST Image-ExifTool-11.40.tar.gz 4546521 BLAKE2B da0cffa18c415caf669688fb26d3cc252e2ce4fa0d9fba342b3c7743fedc6d8942e96a0d0d8ce2f76f7484264a5bc9651f2641e2cee1899dad1da23be5db53d3 SHA512 588c26076d1674de6521f8f5ac9dd6701faceb11b970d4e2567d30abca599e1f3b4da44647c980d1a56bfc228c560ff4db60dafe02bbb74ca75bfb22f9d943f7
+DIST Image-ExifTool-11.41.tar.gz 4547105 BLAKE2B 8bb2d2c2815b59aa744866790f2c46e7096d74f093bee9fd9c6615162c8be8b6716fe2ca967485fef4bff53ed56af1f0e8aafef162ab5504075fff133e21e84a SHA512 fff6806c30cea6d38ed30c3d736664af2e0021d29ad2798036407af6edc928e52a72e0b37e6cbe12e3511077b041bce9c251414d5b6e87328fcd08bfd3fe12a1
 EBUILD exiftool-11.29.ebuild 599 BLAKE2B cfc938c8e90e668addfedfb2c180043d181c5ce3119311bc5bb2f801960459c760336c60c34fb1df48ea676571005d83f366d7a90ecd4396795264e00680b2eb SHA512 5d292d66e8508c3f93d9f571cb382bde448909f3d146bf939afdcf555bcbef6bed31c6961ce4379312cb6dc882bb2b0d84caff176d83f30d166ab433d1fa6305
 EBUILD exiftool-11.32.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
 EBUILD exiftool-11.33.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
 EBUILD exiftool-11.37.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
+EBUILD exiftool-11.40.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
+EBUILD exiftool-11.41.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.40.ebuild b/media-libs/exiftool/exiftool-11.40.ebuild
new file mode 100644
index 000000000000..f6bf1a90acd6
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.40.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 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/exiftool/exiftool-11.41.ebuild b/media-libs/exiftool/exiftool-11.41.ebuild
new file mode 100644
index 000000000000..f6bf1a90acd6
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.41.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 ~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/faac/Manifest b/media-libs/faac/Manifest
index 25e4448b43d8..f7575a8bf946 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,3 +1,3 @@
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-EBUILD faac-1.29.9.2.ebuild 1109 BLAKE2B e7f4ca189087218d7bfb6add73f34413e6e0e94a9ebe225c180067fe29eebe478c7ef70a3d1bebdfbb72d6fef57238d0d6aa3bd1fd3d85554be0d48fa4bd93e6 SHA512 cc45535b12b7cf91874b73428691bd0045b7a9cc53fde222094a9a2eb534213154d29d222750e743796fbb05bf0a7cab9ba1a0ef602b077c57b7ca8065a2727c
+EBUILD faac-1.29.9.2.ebuild 1105 BLAKE2B e519265edb19db3666e5ba87e9d5c4ae8b05c4af180219afe3eccf09646af7ee4d448ab615e748b6a6eec23b860826f7bb1318af09dd024e46d9ea5cbdacf563 SHA512 67c260e2822015f791f1e172b39d9c3a647836061cdea603c71dae7a412dc70ce9eb5e3c36d247839f4e62a3a1c31fb91b9674f86d24077ee30b574adf85db5d
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index c5d4bb08d1de..5099c155cd91 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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="static-libs"
 
 DEPEND="${RDEPEND}"
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 10a539aa899c..4f0ab9d6dd4e 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 1356 BLAKE2B 228a3c640240c959ec98de26fd995f6cbf226628bdba72de2838af16fc36c96d550ae87e16931064b022e85476973fd014580c1826090b4aacc5a2407133fa52 SHA512 d4e5b828336e631861435719e9cb3d7af1c4f68a06524a723b9da403b14d6439be8190a07148fb37d051b28c893b859895df1869f9beb0baae054e3dd622c537
+EBUILD fdk-aac-2.0.0.ebuild 1355 BLAKE2B a836764d57df5d890a73311e41feff0d952ed5d112e115001ea2f6d0f46fbcfe96e1b35e701112a6b5d2c4cc5337377517c68e3525194cada2263800b8e22518 SHA512 d566cb8858255fcdcbec97ee388380632ad171ef65c5bbc123cf52257603d5c9405da54d625e38ac99ade78db334b793e5c4595e0654007626a4c5d8c0e2f9e2
 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 4f12537b1d3e..23bf017a09da 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/flac/Manifest b/media-libs/flac/Manifest
index bcacb5483ac8..bd90c416c47b 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -5,5 +5,5 @@ AUX flac-1.3.2-dontbuild-examples.patch 1251 BLAKE2B bcb0c5d9ad820e70224d23adc93
 AUX flac-1.3.2-fortify-sources.patch 619 BLAKE2B 409c249f9937076da74e4270bc94236cf2a952fc19657bfe724616ace5297ee31c3279db1625edcc2ab23f3b439f4d8f7baf41ad8cba0f100e5793f70a2202e4 SHA512 6eb197af0a945f2ee9ff54a7f35ee0fefe09ad0b3eff32b4a653d917f51bc8d4cb16cc5fec06980d9b6ea58e4488e28893ddeb5a454d32e1afaff1c1bd656518
 AUX flac-1.3.2-honor-htmldir.patch 2088 BLAKE2B 7dd5f79de44f5c2453bfe5137d22d8cfd77615fecf83170c3b9f2f4c68b00466ce0dd01ecea393fa1ae91cc04525dab766199778a7dc946ed3fc0ccb9c8af8fb SHA512 1617f13c469eaa71bd8c99833c50bc99eeebe37e5ccbb96d55ebd9b1b88587ae00d577e23dc11802d651a962ac1fa1ebf173fc8879270409a87ca3e2cf96aaec
 DIST flac-1.3.2.tar.xz 776192 BLAKE2B ff09df3fc4f985a00fcf6d497be675ceeda85cc57ea73b4f8ad6679cd40a33640f8502adc80c0a571d01fa0a17b8fcb6bfd8df7474620099d4f34bbc073bc7a3 SHA512 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15
-EBUILD flac-1.3.2-r1.ebuild 1851 BLAKE2B 0d70ecdc9ba356ea5986e2d1d60ebf56b7b85e5d813ffa765177c3909947f54e15e5c93a75cd08a55d9623a2a88620ff58af3e6de7bd2718a4a4767dd65cbf77 SHA512 ab6155ed6dcc923a5cd2a8cce8cd977cb537a104466989ad2d6dd7fb9abc461eb43656be8cd3c3936d6ea0b4a33f0332eba5f57047d6b7f599551924b9c93abc
+EBUILD flac-1.3.2-r1.ebuild 1847 BLAKE2B a5858c5fc7b69d0dd6fcce4b519b201d91562e817d5b7b7d49af2d18a8b911457911aa6a8956fc47a524736e3bbd87f3d1a3f0590ad4c01efb11519f1394cb08 SHA512 4f79efeef46e8929da857198e8609350fe9fa5d6d6eeb5eef7f11b3465d2e61ed25e240dfb141708b48f1cb629ee3c83be1739f53963d26c5ba387404ed62ade
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.2-r1.ebuild b/media-libs/flac/flac-1.3.2-r1.ebuild
index 5c43c541d2c7..634d03d1740a 100644
--- a/media-libs/flac/flac-1.3.2-r1.ebuild
+++ b/media-libs/flac/flac-1.3.2-r1.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 2c000bda8b98..c78069b6ba72 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -4,5 +4,5 @@ AUX freeglut-3.0.0-drop-unnecessary-x11-libs.patch 1158 BLAKE2B 85f025a23d1fb0e4
 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 1326 BLAKE2B 66b2e5ca4264de2b30f231c79eb45551c188dfe23e9f52a9aef68b6aad2d516e0495ceb213cb6df2c535abb6aafb32e21036908d04b834dad3ffa05f90a87dd5 SHA512 c0dd7fe97de5627d30e621990d16e56c79318eb62bd7ac48f4b2c06795fc3aa24fa8e78dbb9741583f2c7064fb09bcb1cee2d162f7e1828f32264dee8e9abd23
+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/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index 3fcb972cf759..1ac3aea844d6 100644
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.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
@@ -11,7 +11,7 @@ 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-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index e56c9a0899ea..7c584196c012 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1252 BLAKE2B fed9a7a8e2a4868e2c2457f070f5a889d17758cadcb69c6ad11bcae79fcaaf43504dfe2d00e7c220847f524f1f4b9f426bf264e6988fb41494b7d70355f03ecd SHA512 7cc82f40baeae60b3510dbdb3f1ab9792bf9141f52a95e97b610b35d56622e459e2807ac1ab3e6562cc9efc3554d6dae070d7258607d1c7744456cb2ca98ef74
+EBUILD ftgl-2.1.3_rc5.ebuild 1251 BLAKE2B 09e054b24c51d9c26e2303cbb39a724dee4e0bc4955ab029ebf7aecf07fd2d200081797736ac7bcdac6ad389fc8151d6ed565257e9ff293c817583956d4a1c88 SHA512 336b2a4f57184497b695ab85a94ebed299b0d803d0d5bdd6b963a2867e2077d3c6a808f2fc581aff120b34599733d2fe648aa52de2bb51a2e430f283013741ad
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 4081b052c58b..9ae8388a56d8 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 243ed4c835b2..cb004f945a4f 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,3 @@
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 490 BLAKE2B 7339dd5fd75dbf29c6ce8573074e3cc79bd0a1a7adcdc2c760c734cf07b3d1d267e0c8750f83d25b24528a2803718f6fcbe718d8bb2a108108ac1e469453f07e SHA512 80ebf21a586f60e97935204c674baa75acb956c40306f70e4100ef62a6934ed3d7c0e215c94e4f24fa960b1c0f6bd2e216d76066aa753724c603841da394c9ea
+EBUILD game-music-emu-0.6.2.ebuild 486 BLAKE2B ab56c95d9c4a84cd37bfabd6e6395f4da9e6683c0daa3c05f9902b052fbbf06100caca3df4ed47cfc4e916a81cac93ece7f9358ccb7bb216f93551c038280fb8 SHA512 20db723db3aa15a5349477ee78ec853438627bc68a55265069aab153f75bc8a79d5f6c4eae4c100e196a5416c3dc0391ad76c5d14cd62085d9f6d5ebdb85ffb9
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index a6d47dc95246..6e5cbaaf415d 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.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://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index f0217c8333b9..37651adb4aa6 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -2,6 +2,6 @@ AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a
 DIST gavl-1.2.0.tar.gz 4589139 BLAKE2B 9e99aa41128690f580ed023de07a449a101a15549e39f77e89dbf08c0eddd6db691d2bd5b50ad64b2be293d6c4cbf6a1d9157a9cc8d4749c7a5118c15cb9fdd4 SHA512 fe3b7ed91b8564e7f61b738f29ea439af462c1e28038ee04f5b8fc82d7fd6270acd7d1dd54c717f289bba181bafe9c3ec6156449d95153d9fd43e18a92a60c41
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
 EBUILD gavl-1.2.0.ebuild 1021 BLAKE2B 34fee7782a808bc01812044354996539bd6d82ba4a059c37a0e36c19a37f29f9a32946abe6baaa8b16720e731915644cbf62190dcbdec96f800616ca28fa5123 SHA512 bd67ce43d24c876b6b5281cf6e6d7567ae917c6a57e28340a98698d3900a239f0e54c1773661477d8b48788097d3eb7d4c9a85010b7418d3ad84872ed8171943
-EBUILD gavl-1.4.0-r1.ebuild 1093 BLAKE2B 189925c4b978ac82e512bfd0018d8e48b6ed9fc5a60d8019a6ef647aba0457eb81e95a95362779ba55e9b9a49e6d83d405c1b4162ffa0368ec597d13bc33fa85 SHA512 243405bf646fc1a0c2c9d38d74c833740ab5523a423c3d0adb08521d3aeac465757a768fbe30321e9dea4100ac7f4804fdc299ce8d659979acdfb9e585c01503
+EBUILD gavl-1.4.0-r1.ebuild 1089 BLAKE2B c6d284504cb16bdd3321c2ba6e0152ef50a6e5226ea9e814bf61515ed972af9dd087ce3116f16f822bcbe5f74c16c891b16b6e84d139a3c2e8fa09eaccf8f27d SHA512 bb18d6c0f9013f3cf07a6c1e2fd9b7d1470430e68c47c47eff7e76215bf5b3b95ec4e4a0aaa0750cb1a8c78c3024771ca61ba848d369180842b1e6667a2d21a4
 EBUILD gavl-1.4.0.ebuild 1038 BLAKE2B 0f58085701e912771bd1fa583057316cafff26ab12633c91b6fbe29be5c8914d4cd6650e590071b15cd276a5a1e5a6ac0e211a7985b36b077f9153cac97bd535 SHA512 c188d45c8e66f8ee204bf092f0d2ce10490beb1f35e604cf8db0a1081edabb71b7580984393a3bd05e8c1a303ff7361a911f8dcb0749be3c97bde4bf5259408f
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
index 322307180575..ce77e57baf85 100644
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r1.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 29ca97feae26..849f43945f2e 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -16,18 +16,16 @@ DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e529
 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
 DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
-DIST gegl-0.4.12.tar.bz2 7065555 BLAKE2B f0801739e67e6d6ecc88abaed8638c900edd7229d240f63af7cc0bf503cd29b33b84d7e3018c757b0bdb6ee5245f6af595b96decc3916b57debfb46712213577 SHA512 cacf9f5c34357b3939162d0d4712ee2b47298a3e806b55e275cdf5e23f186d436ea1a840b91b1b72b76d450d94674cca217b7c253cd6b52a7d9505b4ad73fde2
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
-DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
+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 5031 BLAKE2B f2a0afc2e46268561dd0e887c1fb05c56c69488177eaec0420cc4fa68441b1eac6f358dc78bd46d8eb35e69a3e2721ac53088de883586014fcd466b91edcb55e SHA512 a50ac55bcb8cddc08916d61da67174e4d24a927f685a8db87b2ab1f33b7190ea32d2ba52d9f2a263a0c0e055279b0609560626d1350635e86aa2f6a59e3d6272
 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 5377 BLAKE2B ac84c85d0ab0a6fab5e2176639f30cefda1081acab0bcc155915cdeb702cd681efe0d332d6ccfe29055b7e16d6b4406893f525574d702d7f2609e952c440b6bc SHA512 a7991520a562539a9f975fb7b7199b8c3129fee1415ddd1211b2b513fec29db7e4740f20109081981dbf656edc5cafac2c3cec339dc3a22e98c8bb272eb6e564
-EBUILD gegl-0.4.12.ebuild 4918 BLAKE2B 38df7754c5b30c18d6d2858a8cafb701f008b5c33ce9c45f9136f64746bacb9e22089ccb4758f844604dbf547834be23ab2d5c0947db6d0cdd4d97647bd0b162 SHA512 d2b0a08f7713683c2f62d1b29a94b23e37fc948a287c537f5d4cda60d1713e61815a78cdf629dbb3bacd41edc774c0ab59952846fe9761a894669c15b25b31ff
-EBUILD gegl-0.4.14.ebuild 5036 BLAKE2B 9c1a1f5768cf68a27e0495a2a868e649cdcc255e8b9e3ed2da5b59f47ca3f85b121caa9bff423b5b4476e4b56cd454ec67cd5cdaffd3b56f860d4678a901be1c SHA512 07f49bc6ae89e80b466116d2404f15a0f82ca9a2c502e127857546e2826b8ac1ffbab8f0bf283a370473ab8dd5b1d3dadc546ca5ca0a376f1ba8bb5be73a06d0
-EBUILD gegl-0.4.8-r1.ebuild 4968 BLAKE2B 3cdb9f610500db2fd90fbb55e64c22bac6fe13cc153d5b42b5f16509e09efba77e50e5cc803b33d0e0845f61f65bc201f4e2bfec5fcdcbfb6d6eeaf4966f8204 SHA512 5cef00dcb12ce6153a0831a129dedf0051c29abb683b06b5f5e4d85467f293c93de28149ed73946fc63bedaaac22150f6ade4b21c679a6a4cd422ea702ec307d
-EBUILD gegl-9999.ebuild 4976 BLAKE2B 8510368b9fa38dfb28782ba7076af4eb8d6ea8e912b4aa7f5029ba733a33eaf3827c48a0fd4853801672d583e5e004143d346f64ee245475b6bd40618f3230ff SHA512 5181b917e6db0170348f7b698bf55bf48914eccb678619d8515d16fd8073d63a03299c6ce7918bddb0877907f2d3653e2f0b48197e9d659735b59b08c668272a
+EBUILD gegl-0.3.34.ebuild 5376 BLAKE2B cafc7ab13e65baad41af687b1fceb2b901f1e244564ecdac9414a1e116dee7d63d75fc288b316083c81cbca5b2fd1b44a467a6f47c6c790e83e136bbb4319a0d SHA512 15d285373cfd8330b78d76eee6b74396e413b16092f4a0cb25879ed1ee0805b6950438a4dc91758377641ebb946cddecf5c36ed45386039904c34c96cb51852b
+EBUILD gegl-0.4.14.ebuild 5035 BLAKE2B 80c187f746edb14fb3b48a0d900750ab19b7b42ecbd7b34d714cb90fe037f243576ec96b2930c6d7e24b0b85f0e99ccca31d93ec1d57bccef83873a435de35ec SHA512 99370369820135e06e1a10cac1f19483c699dea415766b4eacedf2bb70f3778b0d37387406cc87a87c42a4b27bce5f895cdfecc05e6be7b9b732d7588e951bfe
+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.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index f697f4fd1299..f07c58dbbe4c 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 ac4f0a461ad5..2514434d43d4 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/gegl/gegl-0.4.12.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index fd4fb583dcb8..c45193011d15 100644
--- a/media-libs/gegl/gegl-0.4.12.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 # vala and introspection support is broken, bug #468208
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -36,9 +36,8 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	dev-libs/json-glib
-	>=media-libs/babl-0.1.58
+	>=media-libs/babl-0.1.62
 	>=media-libs/libpng-1.6.0:0=
-	sys-libs/zlib
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	x11-libs/pango
@@ -52,6 +51,7 @@ RDEPEND="
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	svg? ( >=gnome-base/librsvg-2.40.6:2 )
@@ -59,6 +59,7 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0 )
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -118,9 +119,6 @@ src_configure() {
 		--program-suffix=-${SLOT}
 		--with-gdk-pixbuf
 		--with-pango
-		#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-		#    but needed during testing
-		--without-exiv2
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		--without-graphviz
@@ -139,6 +137,7 @@ src_configure() {
 		$(use_with lcms)
 		$(use_with lensfun)
 		$(use_with openexr)
+		$(use_with pdf popplerglib)
 		$(use_with raw libraw)
 		$(use_with sdl)
 		$(use_with svg librsvg)
@@ -150,6 +149,7 @@ src_configure() {
 		$(use_with v4l libv4l2)
 		$(use_with vala)
 		$(use_with webp)
+		$(use_with zlib)
 	)
 
 	if use test; then
diff --git a/media-libs/gegl/gegl-0.4.8-r1.ebuild b/media-libs/gegl/gegl-0.4.8-r1.ebuild
deleted file mode 100644
index 58fe499c45d3..000000000000
--- a/media-libs/gegl/gegl-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	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"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.56
-	>=media-libs/libpng-1.6.0:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
-	"${FILESDIR}/${P}-remove-imath-version.patch"
-)
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		# disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		--disable-docs
-		# never enable altering of CFLAGS via profile option
-		--disable-profile
-		--disable-silent-rules
-		#  - Parameter --disable-workshop disables any use of Lua, effectivly
-		--disable-workshop
-		--program-suffix=-${SLOT}
-		--with-gdk-pixbuf
-		--with-pango
-		#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-		#    but needed during testing
-		--without-exiv2
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		--without-graphviz
-		# libspiro: not in portage main tree
-		--without-libspiro
-		--without-lua
-		--without-mrg
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_with cairo)
-		$(use_with cairo pangocairo)
-		$(use_with ffmpeg libavformat)
-		$(use_with jpeg2k jasper)
-		$(use_with lcms)
-		$(use_with lensfun)
-		$(use_with openexr)
-		$(use_with raw libraw)
-		$(use_with sdl)
-		$(use_with svg librsvg)
-		$(use_with tiff libtiff)
-		$(use_with umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(use_with v4l libv4l)
-		$(use_with v4l libv4l2)
-		$(use_with vala)
-		$(use_with webp)
-	)
-
-	if use test; then
-		myeconfargs+=( $(use_with ffmpeg gexiv2) )
-	else
-		myeconfargs+=( --without-gexiv2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 377cbb02f89d..2a01f502b352 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -115,9 +115,6 @@ src_configure() {
 		--program-suffix=-${SLOT}
 		--with-gdk-pixbuf
 		--with-pango
-		#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-		#    but needed during testing
-		--without-exiv2
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		--without-graphviz
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 9297be50de3c..f92ab0e2c97d 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 865 BLAKE2B e097e5308f0ef4403fb9bd237c4c58e720cc1380a1276fae8c544246a262ee2be7f39b5bbd07f8e0170ef15482b2d883bcfb2775bd9a092980b3074a8c5cb84e SHA512 5814b22bc8c7c01561015e82de39d6db0dcb85d8a6837f2b3267bdb8402f8c294c425875a4044aeb03c175084691ddabeebd25efd8ff94bccf3b1f4199db39d6
+EBUILD glu-9.0.0-r1.ebuild 861 BLAKE2B 805c6ecf0287e0f91fd21ef79463ec98fe4fd129cb9dc5fe18783a0e31c3e4ad7990963c719a8dc19cdf589a3797a88af20ff0042a5901a1b0d3323956d04307 SHA512 b4afff965bb31272039f8ebbf3bc0b852eca73feadb275160bf9fb4ec01dd39970dc2e1e3d551e87df00083f1663e96faa388c8e92cb84cda259698d596d48db
 EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 2c66edd816d4..732650e35502 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-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=5
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
-	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="SGI-B-2.0"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 15a1369fd05d..fc96f3d3b73f 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
 EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
-EBUILD graphene-1.8.6.ebuild 1832 BLAKE2B 63a9afa0bb27e02756bdbbb9bd609e68f4d2904860ac0a8b13482787dd28ac9438017b5287ceb5a4f461216729ca473f940c3177de234844b3d080b314f22162 SHA512 d890ad42f078bb2ab09eafb265f311863b81f73f131f0ee5d057ae6c4f03510578a30064dbe329ee5538e857d12850c72c3a2340f874fc8191afb567aafa37f2
+EBUILD graphene-1.8.6.ebuild 1829 BLAKE2B d32ba8fa47e8f825108e2cb280e77e825b3b2015038d9095ff75b0f909df403714bad136c972185c3c85161cb00863fd4e23aa286ee37417e61017f510fe07ee SHA512 74e305c9d98eb3fb3840c953518bf6b8a3bd4908ea7305e2b3f1b9ce1672ad929189d7b449c0a82569cf24f50165178ac22b6f8eadc39aba6b94ac6d8766938f
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index 6d52d6b3ded2..a2fbb6880248 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 6396ae0b2919..98072db9d1ea 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,5 @@
 DIST grilo-0.3.6.tar.xz 653864 BLAKE2B 58570975b2c4623b2a43b441c60d88146080327a86018bfd1a37967d35b6389e5102915296ceba1a8ebf23d27a3e4f8d23eeb59555a6c5cd0ca596b5ab674878 SHA512 175cf61a43aea8456a41f4dce7694fac50e854cf6340ed0671f233e6188fa34347c1e7308aac99bc49d081c36747776b9a8c1c5cc7c0be00a1df2c9d015d8849
 DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
 EBUILD grilo-0.3.6.ebuild 2358 BLAKE2B 306c6edb5517fc82856449f757785a3763842c53678f776d3269e4c3a1942a1b3485f326bbf89b7d994140cc7a64e26a7b671ee4925cab17ddc327310c2188ae SHA512 e5cbdbd5b32e77f6a82fc096525a51b283916943b8136d2059f446e176497dc9312b1fb97c9a7f63aef7d8e461a8ef1b15dd301479be93cdbecf49a38840e535
-EBUILD grilo-0.3.7.ebuild 2055 BLAKE2B 9867228ab704bd224033804f70c75ac0199b8225c8c235a7e4b9e91d5c1f740812b972efba680498e47d1d27cd91259b6ac4ad11f2b840245b2de716ef129f24 SHA512 e2c6446c202042b3fdc3ec9a35b5c1dbd4721b472e02b019457e71fa374d1f9f24d8ab35b3ee8e973bd3ef123b1e3601280253071a566862917714a09bde539d
+EBUILD grilo-0.3.7.ebuild 2053 BLAKE2B 13132593347bd779208414302a0268478867e98ac583673bcb71608f9c72c420e9dae73025bbb5e33994e6ef6c0c3d27c53bd2ed46802df80a10661c6255f23e SHA512 3ec448ba94ee9206379ca5f7676e14471a472ae761edd077ec306fb9aa48841ca4e342fb8c141b1056a6d964f5b3c9dcd5bd0ba0c1bdb968b634472ec2cf130f
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.7.ebuild b/media-libs/grilo/grilo-0.3.7.ebuild
index 0cc27f52b04e..9dd70438b908 100644
--- a/media-libs/grilo/grilo-0.3.7.ebuild
+++ b/media-libs/grilo/grilo-0.3.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +network +playlist vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/guilib/Manifest b/media-libs/guilib/Manifest
index 219c4eb13f33..495b898bcade 100644
--- a/media-libs/guilib/Manifest
+++ b/media-libs/guilib/Manifest
@@ -1,3 +1,4 @@
 DIST GUIlib-1.2.1.tar.gz 345042 BLAKE2B f9dbd0f4c3ba2e0ae90ef010af6a75d92dcdcdaf895f9ec56871a2057e2d4f9691184ceb1d639a76e09073c8802800172ea81169591ca80beadfee3d2c7ffdcb SHA512 8fa39fec10e942720f09092addc2d384fe1783b3d0fe2c01734ea60adfa1067f81bbeffc41142045ed4050c1eb21985273548e687a348bd9fff39473d42d9a68
-EBUILD guilib-1.2.1.ebuild 721 BLAKE2B 3e135f285dbbc753669a8d171a4c298168aa872195a0ea536eda186a88e708555b35ea869ce3dd17a993f5ea0415601b5993e2c9b05d0e591b8d003a2fc2e8f7 SHA512 d587fcec102fff6949146c2553a7ec2b664f84c798285c0da62c8c5127410dbcb165402d6228f8e3bfeb6cec901eb4dfa837f4016d4206a690a35fcc7de7a555
+EBUILD guilib-1.2.1-r1.ebuild 757 BLAKE2B add4e3898ccdde178f96fa84fae4f4aaa68cfe2ea36b0910269e0070adc24369484b52193a047b328c66e8ccdb373184778ecb2b1ff89fb26589d65a6ecaac45 SHA512 5cc95362f9f455f9c8c44a9509c3c877da1d7080affc2d70fb1473271585fe85f88c69ae3acbbbbf75a515b3e52814fc51d68374659768d67ea56d5bc6785dba
+EBUILD guilib-1.2.1.ebuild 718 BLAKE2B 2e21da5985af1995b1e7b267ae212085caa5f47b03b474649887ed0cae7685c555d8385e2773b4711f0a781dc6b91f7b951be1465e1cd4511b0e117362a2badd SHA512 6a0f9468808f78858f17e010bf3a2cc9cdfbbe808e68944cac2bd2ae63b9ed43e66f366e0c171fb171fe572f4eb7ffcd3108c25c106f5881d16895b4feadb708
 MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/media-libs/guilib/guilib-1.2.1-r1.ebuild b/media-libs/guilib/guilib-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..381f5353ebae
--- /dev/null
+++ b/media-libs/guilib/guilib-1.2.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=GUIlib-${PV}
+
+DESCRIPTION="Simple widget set for SDL"
+HOMEPAGE="https://www.libsdl.org/projects/GUIlib/"
+SRC_URI="https://www.libsdl.org/projects/GUIlib/src/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libsdl-1.0.1"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -i -e '/^noinst_PROGRAMS/,$d' Makefile.am || die
+
+	rm -f *.m4
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use static-libs; then
+		find "${ED}" -name '*.la' -exec rm {} + || die
+	fi
+}
diff --git a/media-libs/guilib/guilib-1.2.1.ebuild b/media-libs/guilib/guilib-1.2.1.ebuild
index 0e2073999a72..b58526c31b56 100644
--- a/media-libs/guilib/guilib-1.2.1.ebuild
+++ b/media-libs/guilib/guilib-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,9 +6,9 @@ inherit autotools
 
 MY_P=GUIlib-${PV}
 
-DESCRIPTION="a simple widget set for SDL"
-SRC_URI="http://www.libsdl.org/projects/GUIlib/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libsdl.org/projects/GUIlib/"
+DESCRIPTION="Simple widget set for SDL"
+SRC_URI="https://www.libsdl.org/projects/GUIlib/src/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/projects/GUIlib/"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 6c3184fd2a1d..4d7dc10cdefb 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 2171 BLAKE2B 7c7eedc0b4de460bb837de604502a07a9a06e165512ecb483961f299ad9a7afbd96d0461168ea2ed2e1e9e3ddb387feadc79272e96fe412fd21900b1fedf6199 SHA512 448673d0fbd6d14b750b30f10b7960d76630ae67c4e8f71616d040863fc48454d3ab11784be1b89b4df8abe972226dbb26b67fe9eeae5fa697fe8ac95331bbf3
+EBUILD imlib2-1.5.1-r1.ebuild 2170 BLAKE2B 8b9ab6c0fe358e9459771bcaa3bdf9e0621d261501893c87260be3fa79e00ecbf3569bd9d0a1fdf94d998f49ff87317410f606ec62c6464e5a3b1ce96fa634da SHA512 3368d44f6cafc9e1f17d837b47542258d002eb7298d77ab8c910183c9f8313c0452f053b9a10f72a0a5761d83e24aa3d956dbf90352ea68ff6e26eb7bd996f25
 MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index 1bbfeed79231..6a4362b928bd 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-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
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 90c905c31dd9..2116f7080d92 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f438
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
-EBUILD jbig2dec-0.14.ebuild 1168 BLAKE2B 23d2df9882de19a9a3adc8edd9fb45d2fd53c8292d5eb793f86ae02d18fa880e18306612dd6017f4ae24fee47802b086bdf24d333e2f55f837fc30d698a6bedf SHA512 982c90240a22eb36dcde959c1047ccb2e4d2f1b6c3f0277aacf7246c0ea2a1b4aa13864e48832ffd49508bfb19238d498400621dc99dc34e9c1c9da4c9ac6692
+EBUILD jbig2dec-0.14.ebuild 1167 BLAKE2B c2643abd084b782b5eaddfb44c215ace9c284314db48cc9d0dd0742ffb88bee633523637b9cf15946662df0c7f5ccaf25c3949427b50d998da5d28f626895202 SHA512 5f252bc5018a3e62cc5f49a31525b07820ecbf59724a5dcaf62ded16dcf87a0abbc801a1071cf448e59bc76feb35784437c27a02bfb382e780a4fa102f2f3f65
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 1cafc6875c9b..8e3906758dae 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~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"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 9b0913d64914..3e2c515811cf 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,7 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0-r1.ebuild 1832 BLAKE2B 0b2871bfa3063a967b31e8b43f4fbc347fb8275e7ca7ee8afd1c966d74680da09667b8ee0d3baef1ec00ac2514d69cadc01ee13e01cdf30782455371467b3639 SHA512 42ef6a05a979d34d94845673f92d5da73b20fb566ba0b98409a11cefa91c32a9a470096baad397ec9992b6937ae09eae163c98233d978cb63f489fb4b46942d4
+EBUILD kvazaar-1.2.0-r1.ebuild 1831 BLAKE2B f9af11501698348f0592f82adf48e8dc49530deee20e313d6a61463afea8b27729ae6eeca7b7c7d53ec0af977cb371d4f87d03de69e5d828a8c05058bae91fde SHA512 048015728ae35bca406234ddb7bbae4a655db0a46ddb0a0392fcbefb416e25929da420e71e0eda3c52295419dd49b3a053921b189f26c09e32be0c6586e59056
 EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index f094a8160a9b..b6c532021435 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index d681d8ac4778..6cabc7a4ce75 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -3,5 +3,5 @@ AUX ladspa-sdk-1.13-fbsd.patch 440 BLAKE2B 687df7bcd5ea20d7f8827e8639177c47731e5
 AUX ladspa-sdk-1.13-no-LD.patch 730 BLAKE2B be0edb600bc1e8834b10d55ec04294c40681900edd87564b36d6f1a3354f8b8f6899e3516d3137c16cf5c431118d79e2c4668045c6183bf99dcfb5eb83a106f7 SHA512 215aa1ce1338532e6a8f4ab90b29bd823030f6544d66a9954e476d4b9d5d8f9304b8dd39e386aa2e93565970878bb3174537b7315dcde9bc4eeba9ceb1cc01c8
 AUX ladspa-sdk-1.13-properbuild.patch 3020 BLAKE2B 4fc412986b9912ec0bee326b111f558b806811f12d430fe39b84a8751529afc96534c78c2e753aca8ba089074aa4e38c0c201237c63020c8cd2d3d5c2a6aac17 SHA512 6e86f309f8029d0de50cc505d7924965bc00d89489d689a7babab55f447ef43fbdf26807bc6f206e331c367a2bb1e5c75867268ac601991e3b7edbb9bf8046b7
 DIST ladspa_sdk_1.13.tgz 70540 BLAKE2B cfc5dce5b02107f361cfff3881173d04ea0ff5856cb7e9fb0cf5e23ca62c7f61b8b3b1573b95f67d82eb039cda874a3ba66856b6408e5e6785823c9d53c8cd2e SHA512 a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
-EBUILD ladspa-sdk-1.13-r2.ebuild 1484 BLAKE2B 80d1b2089f70f847cd5af8354dab3e59e15d98b9a2d521ccb0b16601a22c90e1c5b7ec8b9dc4e347946ea1b81e155c9cd956f03d622b66548e67b74ac265db35 SHA512 3df65f3c46a559021284ef4d8dbf261e2a6ee2ae17687a498f156d94d66b574b7359014b2ee2eab0205cc9e18623334f80f188561fc8e9012272155e1f89b6ae
+EBUILD ladspa-sdk-1.13-r2.ebuild 1480 BLAKE2B bc1e89390ecbdca3313120bcb27fb4ed4f00726f90cffb30e1c415e080e512776e1c7dec71e19a953a161166e285fac830ef340f18affde1811b525cefc685dd SHA512 16764bd212e81e0c4fb2b039c369760a8ee8936d1461ab1d99b44ed5baf5181ed7fa63806bd529a2a6b955483e25e942fc295867e52477bd56361344eff44cca
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index f9be1eb2b8a0..c97387a9f1a2 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.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=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 66f7294dca7d..2e0078759731 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -4,7 +4,7 @@ AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97f
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
 DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
-EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
+EBUILD leptonica-1.74.4.ebuild 1710 BLAKE2B ad7befb5fab551d8278b6fec3a4b7c9e6f71cbfb24c4bbdaf3d1a018f05b19bd7d80e657dab4b77554bb0cefe151c8522e99610f8676af9c1f8e5460873d0f80 SHA512 b66fa2435ce6b070c6d3c0a444ab95fe048bf647ba630abe4b9b04dc41ff2cb69b5ce24cb89d3ebd770ffb80ec56f026dadc50b77c0339ff841b7c5b9d387b77
 EBUILD leptonica-1.77.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
 EBUILD leptonica-1.78.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 3cf85a420a5e..b7780f8a88cf 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.leptonica.org/"
 SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 
 # N.B. Tests need some features enabled:
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 4d6389cf327f..68275a4f4e7c 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -2,5 +2,5 @@ AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad7
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
 EBUILD libaacplus-2.0.2-r2.ebuild 1388 BLAKE2B 43ad57a0d74847c633e10fb87184e4369fcaf0a156cc57037ab4a824dbc8b34a543bc1f7c266a4113e1a8a151b3c7f1280c28fdcd517cbf3fd9984d604ec345a SHA512 a066d2b1557944a0b5b9991ae018e0bfec5eec96b036a8341e4ee1f8a7eead15789a1f34c3520370e8191b07a5cfa1b6443b76399d62d1b648b048af6637206c
-EBUILD libaacplus-2.0.2-r3.ebuild 1422 BLAKE2B e3929ecbe45ab9987c40392504f1a2e1e763d4f7ede988c0c30669e4ca7e4df306ae7d9b3b2857b7c41c5022c30448740478dc503daac5f40996f7006751abdf SHA512 7be33cc6064c16873fcf4048ee9826036d4ab32957a4cd321ffc158184d82dab3681c6d04a7e15457643d50ba2a6928669de47f3919b2fd17d2bcaa1029646ec
+EBUILD libaacplus-2.0.2-r3.ebuild 1421 BLAKE2B 78abd72acfe48c638865fc148014e7d706bd38c9263dfc0536da4ac6ab15d462249d8987d299cb9deea30e13172bcbe6d008a2bd9a283cfbba4dde035e6b99a7 SHA512 01f62042da39d02d48c4c0fa188681c8b7fc9476de82e122b56dcf55d1bf3f75b95be70481397d58f9057a458bfd4641c3e64d6cc08ed405c076e39c82675361
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index 90c09d935596..9ca0645c9926 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index e41aaf977ab3..930dec03cdf2 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.13.7.tar.xz 352752 BLAKE2B 7ab5dd5656b58b090718e000893e6eb1a05512f
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 EBUILD libass-0.13.6.ebuild 1340 BLAKE2B dcdca280de6863af783fc81a57d803f284771eae3c38a6938f9135c1f04f2875890d28827949b87ecfce895b484d7256d29e799577644f14a06dbe5bcfea8ec2 SHA512 11fa0782ccad86072400819dc309c18c197f54f561bfac24ef53cc6f7462220c8dadfb4e9589fc14dd30bb46cc2f8768830db1a41ff7971d052aa8dbf8b693d4
 EBUILD libass-0.13.7.ebuild 1350 BLAKE2B 2b9c7009fbad3743ec1d53abab5c8eb72b5d49d9c625ddb2e22a109c3857d93eba2d08fc91197337f144e8fc77dd492181f19cbd997a7b445c81a8083ff3b855 SHA512 6db190fb50a10ef1ceab912daf9c8822bf35451f1f05e64292002887903400c89967e23685bf35fbab451036a8e4d221016d212f18a80849af4dffd857f915f4
-EBUILD libass-0.14.0.ebuild 1340 BLAKE2B f179ad055c06273da8250058379bf7f2b5f7a4bb39a42a193a9db1e69d3c906550ca3bfaa717845cec388f928e3c57b6e41c476b17b39d69601f67fe248caa41 SHA512 c415bd9e6aefb5681443bf9a84c97c2f17f6e48dd22e7a01304f4d1f525a751cae91e662fd07596e4003b266f3fb95e56af10e0105d913c46695609e688c56af
+EBUILD libass-0.14.0.ebuild 1338 BLAKE2B b140b16f57f55b8ae4631fc9b7d6bd60f773c901f4ed6df15b323b18bc60cb38e58c85c43de3d0501a78a71520f0a5e0b83a138c5525391cd5e2aad2d2e854a9 SHA512 afa0480487719493899bb97374427449833bdc2fed88afb59aa73db6f68f3164d71069e5c144898804a8cf345923eb40856b4b08e763c269b09529431568723c
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index 389ad1535b13..a54a4a7f2197 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-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 ~sparc-solaris ~x86-solaris"
+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 ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 166b06a5cf11..ad8ea2d3444a 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,5 +1,5 @@
 AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19.ebuild 4155 BLAKE2B 8d8a326339b40470582be15efc70c3bb268b8ceede79db11e60f74309ba9deb97b7150cc76a04eff8ef8a311e88a54d4d1a32dedda78ca0c41dc7cbf95446c24 SHA512 860872760bd33d95d3c82d82c9a4abc2bca010163b8e8c535a1c7644002fe0c3a7b35e7efcb64da24117b5da4a2388702fcd8298d31181d8d3b9c4c5efcb3e9f
+EBUILD libcaca-0.99_beta19.ebuild 4151 BLAKE2B d23f54bc4baaaf55348c655bd811a9322212f40997c13d9db6b098f95f541ea7c331908352b995aca19034fa044290ac9366e30a865363725f285c531f4ce2c4 SHA512 8b2476b95c008c2dbff8eefe24326e58a2e1399d43c81ed1b6949482021b1f3a20eec0bfafc1418d4282fb56308e8c10ec23176a9c153588077bfe9d197fe2b0
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 95e1897cc71c..42356744d5e7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.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
@@ -15,7 +15,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index 6496e1569587..5519c073a83c 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,4 +1,4 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 1025 BLAKE2B 2d73b3c89008e7fa447358be473cad3f3500c63a62d97eb4f63dae2b5749a5b88847236e01a42b7171b9ba525457697a4f2526aa5037b2122bc98c85f4a7f051 SHA512 56760a34cffd8deea4cef2c9d1384b97e8a8333cd59d153a0a103fff98097dd8b30e1f5b8e24378756b06eb4605fa4084e71e831fcc2af0395d8a37c051b2b6d
+EBUILD libcddb-1.3.2-r1.ebuild 1024 BLAKE2B 19b4014314b27b8e8a1a4034812764209f4f006668cfbd29a5add762d47e7f4e7177ba37a8739e1ae6b3846edf3eb5a4efd324ce5e04b51f2e4f7269577b5cbf SHA512 08d2b9b1174a6064906d34453b62db199e85bec7b1d3967e5cdf839b77f8445c233a12acb3018560df7d484628d502ecd4cf75ddf3c3d1770fc6f412b8345a03
 EBUILD libcddb-1.3.2.ebuild 919 BLAKE2B 4e781f83d377df35a65dfd16ec8d03c67da36f4ecf7b5aeeb04d77e125806b988407794d4a252f9bd147bdb80bc732522d7b9b158b526a946324e0ec1d467944 SHA512 a63f0d87d8e978dee164a485322a13f1cd46e2f28e8d034b365a1fef26964daf0144598fa5b54889a89b593ffe36eb1dad0539abd57c89cd75b40f1adacecfad
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 3f483f42cdd0..1a75bacf899c 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 963eedeb00d4..05a3fa56c214 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -2,5 +2,5 @@ AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
 DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
-EBUILD libchamplain-0.12.19-r1.ebuild 1816 BLAKE2B d06c23591b0349db7109d532f06fba85ed1110493096c7b15c14e191cc50da746824fb58493f4c006c6a6db4ba2bd67de6ef23e7218a721fb6a1edf5c20191c8 SHA512 3c234d13e602f99fe61ccdfe3b3126acf4559184d53a7b383c13ea4fa9dd810faa09650e72f6e932ea3de3cd0598a939eff3b4c502067ba82232a5f33c008b61
+EBUILD libchamplain-0.12.19-r1.ebuild 1814 BLAKE2B 960041a1731326c0eeb01aa3dba443d208efc6205bb90a962101082e47084c0ef8cef43fe4c619efd5806ada9d6e060ede5549681dbce41a6e9726772ed9af94 SHA512 dd900e90d629628e2c9a3022e926b56c4c25b0ee85ac4c938546865b3228a53e428a3461c4717d542f1152ff83e423533e0cfff0ca6cfbf41d233bfc0e18d317
 MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
index c4e1ded7271a..7121e6650ff8 100644
--- a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+gtk gtk-doc +introspection vala"
 REQUIRED_USE="
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index 88c0f66b7876..6bc98e5aa734 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,5 +1,5 @@
 DIST libdiscid-0.6.1.tar.gz 366393 BLAKE2B 551616a817922af5f90991690ea6d35523b3fb6606ab26ae7e0e4c51258fab5b653dbac96842526d9a4a51c81b5dfb63c9ec9b4fe723e88e758855cea381d46e SHA512 12808040b6bac7dd513d32b2f7a8424f0d9753a89c5703ede0454d0d8dea508a446adba20d899c3499e8621d2a752b3e8ca787b92e3ae92402c6df7bc2a3819d
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
 EBUILD libdiscid-0.6.1.ebuild 544 BLAKE2B 19a0f87ab6c43899d626dab7e3ee83a833315cc22bfd7a30e5290b332e0fac5fbddea125411f8a314cf424afa8cdc400e1f4fdb984f78c7a7a2198681b14a4d2 SHA512 21ffcbde75c974acf5e1040aa18a279dd93a53929a2eda8094b7b5d8fa6c06f08ce01296b78c846cbeb9353be9895c8e3483b8e7d3b192aaad479d98a0076f01
-EBUILD libdiscid-0.6.2.ebuild 578 BLAKE2B b0281073042e29442d203bcfd892545c908d53d08a64d1f1b7dea95f0b0023f804d6a4f30a81508ec5c9a24f0ca9f4ae6cc58b48d6ff6d1a874572fc4ee38725 SHA512 2adeba174cb1cbe7c49a58d1ba333faec0f6a19cc75362142c9f02e22504fbbdffb32352626d2d520d71911070dcd9602c08083789edcb0a84b1fd907d483489
+EBUILD libdiscid-0.6.2.ebuild 577 BLAKE2B af00c1d56df9a02e960e781cc2306e0cd43f7f906369e31c072b6674b550b11751c4aa0db8e8c7ad75e98fe0ebd81af8e2709aefae1bda036864f6af18139f18 SHA512 ab266133060b7ac68cf1fb45dfdbfe05f95ca547d0e8e860b68a0d9c44ae935875546ad589d77416256bc657c5a93c4e3050a117a61487b9ac83a019413015ab
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index b0365d4f5759..a599abe3d714 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 0e28a8dd418d..8ec7ed39afb8 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed
-EBUILD libdvbpsi-1.3.2.ebuild 960 BLAKE2B b0a8d0379649494014358f481b1ff9941f68ed9ed1109c0fe4bf1311eae0351c7e63dfd95e83db07f6d11be9982ee1e34b234bf40a182b774645f0e580415499 SHA512 d1b00133befeed3909af11a3ce07f03f3a941a313366b75216b181fc44b85a0eb21526acb606ab92370cc44544ef738a7b9b1132e3b7a30ef39f8798f2dc8f79
+EBUILD libdvbpsi-1.3.2.ebuild 958 BLAKE2B e9aa40ca6254ceab463572766eb7f83884bd75c72f4265042d69be540856b31683c52e0a6d994055a6befa26d26d56d5818e6858e2049582b7b463c2c9456e73 SHA512 e00ca677560636b09697575c80003aa3dee8957f373720ab0694fad5926e982d3d9ad72a4650b9405339c83f3815177a07c82589b60a443d57ecf2cc2e7ca567
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index 9cd90e007d12..c740210527f0 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index b2af77531b26..e7ca74da1726 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,7 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
-AUX libfpx-1.3.1_p6-gcc6.patch 840 BLAKE2B 4c9a5535fe452877f4b3e0b3bf2d9923505ce97dfd2f00aad45ef35baf86dfe5a8274bbb37df98bc099fd4adcfbe7f5573b5bb55b28ee0826bce0fd312d140dd SHA512 064e9f0f69bf66a93e6560a680b8680809260f6a4a6811f9568d9ef5230382a60e9bbd76680731434a4cae2570e6dd834ca3fd51e8c356ef949c1cf75f2c5af6
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-DIST libfpx-1.3.1-6.tar.bz2 2358328 BLAKE2B d522d674af92f7a5fe00378a01e743342978290297aea26738e6077834ad8eee6afffd01b16bcec29d729d87383b2123e35a62e9d0da9f1623f79a55b413d9e5 SHA512 d33bc59f091100f4e0f7db396ba2f3a93951b348f8b175070fa23186f7ce488e71b7be43a45ebd9a3af21affe5342f63955df8549ff15582f8b29e67601531fb
-EBUILD libfpx-1.3.1_p10.ebuild 994 BLAKE2B c8ce3f49eb4deb925a33a41ba1a875fa1f4e9a23a95586760de113173b9bcc2a1f0753f2fb1de952d241c4b8de690933899433930a88b168e7cdc0499f60880d SHA512 3db12cf05efc51d9963669de96e317209a48961242a17ef7d8c12d36eb126f3e48572085ae714b666314273d9927b3e4aa0e9540213efb7d4ae4ef44ac0ba447
-EBUILD libfpx-1.3.1_p6.ebuild 1027 BLAKE2B 89c16c6f85e16ce19bcb4a14d6d6fee17b50977344f323a82bf74caed434272df9b2e172dcd50d92de20c78df151fe6ecb74bdce1fa0f34781f10b15d839c597 SHA512 34418eb51824d3250da69eb119295b5785c4020cf05adecb6a04e62481ced8f893cdcdb5ca08e20887ef276a22baac68c0669e020d846e660714b0c025da8fe4
-MISC metadata.xml 343 BLAKE2B 87d81ba8409f0c9ad2be7cc2183ff5b7ec0bac3647f16f28e1e73acd7684de8419968eef18e524aad3a321e3f17403d4b22b762270fab419263ef5c50189ab9c SHA512 beac0e9d9adaa87113df0b38a8779ce67e35c89c54ad0d8e6b4470b82c1f41eb2fe5f2e40425cb039defa03ed7a5fc0d6f41912f6f8b98a98e79882c381d0bae
+EBUILD libfpx-1.3.1_p10.ebuild 1012 BLAKE2B 79976bc1924274587dd60709d3a3446f3c865f16307d5a186e3c78a00030d3391a5109b01ad98eaef296129bd1414e9621dff18614420d2c167a25ef0e92940d SHA512 3ad3ca36f92e7db5aeee0b1107749a0554f6f8e94eca796999bae76dc9be554205a65b60512f416052dd7668b3a124c82f6ef01d30550310733e49855bdbae00
+MISC metadata.xml 430 BLAKE2B 06c7b8d737850306370a49f0d4ff7357a6a97de82bafb26c77f1525fc2b775a6aa03b954167dd7a27213dbbb56bb331cb5140ea4c78aafbd96993987bf998d00 SHA512 c041796d2ed0067ede9168e4212917751f7a7a4fb3463b9ca8343af1e2157cdbbdfaa763fc5b8390179b62b368ff7f098fcdce4e13a74193a34654c06f998f94
diff --git a/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch b/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch
deleted file mode 100644
index 75c7a7efdbd4..000000000000
--- a/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/oless/h/page.hxx
-+++ b/oless/h/page.hxx
-@@ -47,6 +47,7 @@
- {
- public:
-     void * operator new(size_t size, size_t sizeData);
-+    void operator delete(void *ptr);
- 
-     CMSFPage(CMSFPage *pmpNext);
-     inline ~CMSFPage();
-@@ -133,6 +134,24 @@
- }
- 
- //+---------------------------------------------------------------------------
-+//
-+//  Member: CMSFPage::operator delete, public
-+//
-+//  Synopsis: Overloaded delete operator for CMSFPage.
-+//
-+//  Arguments:  [ptr] -- Pointer to CMSFPage object
-+//
-+//----------------------------------------------------------------------------
-+
-+inline void CMSFPage::operator delete(void *ptr)
-+{
-+    if (ptr) {
-+        free(ptr);
-+        ptr = NULL;
-+    }
-+}
-+
-+//+---------------------------------------------------------------------------
- //
- //  Member: CMSFPage::GetNext, public
- //
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 006ee9d4936a..b67400320110 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
+HOMEPAGE="https://github.com/ImageMagick/libfpx"
 SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
deleted file mode 100644
index 0b259aac38db..000000000000
--- a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
-SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
-
-LICENSE="Flashpix"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/_p/-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	# we're not windows, even though we don't define __unix by default
-	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix
-
-	elibtoolize
-}
-
-src_configure() {
-	append-ldflags -Wl,--no-undefined
-	econf \
-		$(use_enable static-libs static) \
-		LIBS="-lstdc++ -lm"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog doc/*.txt
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/*.pdf
-}
diff --git a/media-libs/libfpx/metadata.xml b/media-libs/libfpx/metadata.xml
index d845d64c112b..7a252f9efc58 100644
--- a/media-libs/libfpx/metadata.xml
+++ b/media-libs/libfpx/metadata.xml
@@ -8,4 +8,7 @@
   <slots>
     <subslots>Reflect major ABI of libfpx.so.</subslots>
   </slots>
+  <upstream>
+    <remote-id type="github">ImageMagick/libfpx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 07cbe413685a..e1cbca853441 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,6 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r1.ebuild 1154 BLAKE2B a718acbc16b40036f3407fc063622cd6b26afb84e9ddb2f9bd652c6719519445054b66d8085bacb142acdf433b3a6818460ca38a6f4f28fb0b8d53ffa9b1dd01 SHA512 2113ec3bb1b239d64b167cba172e135027d575873740b6bf238f49a4db386048cefa43dcc734b3eabdf601608464b7ea7975ba50384506f140790f5fbfd29ec0
-EBUILD libgii-1.0.2-r2.ebuild 1260 BLAKE2B 30977687e7c60707578be4f961fc9fe0e9231837ec8c0f7123acbebf4a6d3e2cf228f303569261d9143c43387152913a798e3c12165350ee8f3e55714169d706 SHA512 3c379d9c627b517a46e8746908665cf98dd21c248e625758477b7b0532e65ca48967420dcee0fb16940c0752c1c78f841233b5521502ea0411e8e4acf96ab96e
+EBUILD libgii-1.0.2-r2.ebuild 1259 BLAKE2B 468754125626dd72b21c39f7e463a55bbbc8376386d0c9663929833600cd09a9e817fd598b4c9e1ca0bc90fb76ee80a2307369f6f310bcdf9c77ffa945f0fa38 SHA512 90f35f055e20d3b0e8eb0ede452aa2b158cf779d4067b4fde036bafdba9a31915932d55336b770348ed7fa604d51989badf6e7e5434722b6ee9193ba7c6f8ade
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/libgii-1.0.2-r1.ebuild b/media-libs/libgii/libgii-1.0.2-r1.ebuild
deleted file mode 100644
index 09e2746d488e..000000000000
--- a/media-libs/libgii/libgii-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib
-
-DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="X? (
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0-linux26-headers.patch
-	"${FILESDIR}"/${P}-configure-cpuid-pic.patch
-	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
-)
-
-DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
-
-src_prepare() {
-	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
-	AT_M4DIR=m4 autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_with X x) $(use_enable X x) )
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index d731617ef338..7e32b4039f7c 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 197178328967..055401eeb604 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -3,5 +3,5 @@ DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f65562
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
 EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
-EBUILD libgphoto2-2.5.22.ebuild 6239 BLAKE2B 2fd9815fc3a3739455c511bb0674a74f023f098403e5f87b697768d8cc00f5fe6e9833f0a01aea2ad094617d687d12b900af216039135e763ef56178e9cce4bd SHA512 62ceef36668d07096784f243b1dcbb2e92ed7299725db4189fbc2056cf34578d52e7df52bf430352f5a3e10add49fa527bbed228d3e996f54223716e1e579604
+EBUILD libgphoto2-2.5.22.ebuild 6237 BLAKE2B 193a9cd4d99423bceced587ad2bb0bed7f20ddc643fa06fe0666399434b0fbdc7b4bb19dc814ee84e8419deb9ed45c0c4fa82708c9fcd7566ec384e2d750c927 SHA512 e2844be117f14e8ea5ff815b38d8d2ec95739a94c5bba16de85f16ddd6e277d1431cb1eb5a07b244b33b4362ace3a5e1ef2fddbde450773f6517b1dee9f6c360
 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 244269d65884..4ccf9b401da9 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/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index bf30c5902bb8..f0cc66ead166 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1641 BLAKE2B 741351a47d1cdadad337a31f74f0ff89a27db0c7a47ad62411ee979dd22c4a6b58419f5e366e3168ad689cc4eafe68740632adbb2c7959454f99abb7b627a255 SHA512 c46bfdf66d55d41a65041d2a87a5678f092a7243e74b9264df7fe0ec2e6304c04991cdba870226909a48c00b35ee43585e908c820cd358eaf21aea6d89bc1452
+EBUILD libid3tag-0.15.1b-r4.ebuild 1640 BLAKE2B 2f24a8169dd1872e415e79cd27a565394e0603a4ce6c2bbe2ff90817e49e74390ef4546e622b2e3edbf51f7b1a9d1bf4c52795afdc7a33c8ae6a31a19fb0a8f0 SHA512 419a138bd154474eba12f17e6593241c050c53c6e447a90dcf1db97ce4ed8e4ea0770846073f0899d8a2eb11f7081ea82a953cecd56fc1e222f2fca66817b993
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 1b2e8063586e..1b98abd5cf02 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index d825112d8308..22126e57b132 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,3 +1,3 @@
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r1.ebuild 934 BLAKE2B 2876ac583955163318822d4320feae672f722ce807c4af9728dc65f10e85f207c8682e972ad18d0ef8688347352e973c8b7f8a4aae7b8be508b1d561966370fa SHA512 b3acbcfc0722c99463e8c75a5a837b9440f6b1732197a694dd6f1e36ad725dbb0b3d29c7d91c9309dffde6957669e73d5aa3b23dcc2ba1abfa70597aac160491
+EBUILD libiec61883-1.2.0-r1.ebuild 930 BLAKE2B 7301b691a29d27c1a1763f31da6edf6510190fd985b5f3175303fb5f2df8721ed97d8e372d9d1afe359910b3a78865061c0a82def58444faf736456c46605b09 SHA512 ac5bcaa9943e5227ba7e485cd84bb3f8525ef690e0a6b98aa20489f58cf9e164836e03097c4894e502b258eebb2c8ac61fba285ecdc3387337292589f6380ffe
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
index 7fd3cfc32eef..95c6b28fc0ca 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r1.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="examples static-libs"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 2b883bb5835d..f92b39e68619 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -2,6 +2,6 @@ AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df
 DIST libilbc-1.1.1.tar.xz 302324 BLAKE2B 726d53fc638f9d019b6d50a3ec463350efd59510ce15b9d6af30fc0ad6094f5acc53c4a5c2e77d17fdcd35f3e63bceb310716eb175e82ca7226dec023cb96df4 SHA512 7c9fa6da4d8b32fd49ea62f9e876e385930501c9caedcafac94ea74b9372722b06dd28062dc4fcca765ad6c519cfb52bb595d396ca50d361f563c715f6679845
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
 EBUILD libilbc-1.1.1.ebuild 738 BLAKE2B a62dd1e51dc9829091d0391f3f55a213a7c9650530afe630917ceb9d6ebe62345b763e351533aabca791dbce7f6f55628b464bda3e723b444bbd4e780dec0f29 SHA512 5b57dfc0be813d600f23a129fe31982ecc40d0b376f2f3bd9566f5a2f52f96bc99d6db71cec3a9fc63bfa20f2f8db5a1e2185030a1388ec4e117db74c5f7afbc
-EBUILD libilbc-2.0.2.ebuild 731 BLAKE2B 8e267c429336cf72f7a1f17bee435c83dfc10bb2a43a4c13291ac1c6c17a1287ddc0b3964368acc06de485c1501e5a8cb4a47593e1631053ed3f8811118a470c SHA512 1cb9e81d6af7af0eae4b444a3fe152d35249735afc00393da1d59f8b0bd820bd377023d04c7ce0dfd7455cb52fee763784d4189d3eac41629a9b580046f07aa0
+EBUILD libilbc-2.0.2.ebuild 727 BLAKE2B d6e996a9b39fcbe50867bf68608d060ae7abd2c463eff1e21e93f84b9028a9779848a0eeb63b6d5e354d2ef4c5fb11aa46e8e344f83c70da9378072aa1c7a3db SHA512 925ed38c2eb24afbb882015208d9bbbc2fedcb6a228a60e34d23b06343ee0cbd65f64c7d75ace1685b3b5f6c0dda7ec75ebd50cf427f178414bc87ea8687d4c5
 EBUILD libilbc-9999.ebuild 673 BLAKE2B 4c40b095479be75fc7dd4e5c9a1e3200c0b176806c4d1ef44a1eab2aab5f0a59801748127dc2d2aae7136eb4e50a287fa6caf13d413f5266b6c699126b4ca466 SHA512 ab966edff2f696b7debd2449e289f196cc78e93e70c2017475be209952eaeef372c0e5ed1782437eedb7c10ced11ebc66959cec40802091c9429c9ff5a3164cd
 MISC metadata.xml 415 BLAKE2B 424981b7c747af54e0658541f8ed279ee5f0a66f3ddf92c62497c185f497341fb3b1a583c4786c6ffe8eea335fd0537802bfcff4567ca5f3c9f2482f0e526748 SHA512 f0be09fd8270ae30e2fc499de10ae5d7416a6ea50a787d6383428b81df8959ee4d18383011aca0d423549919982b6b05faa964c6378d2727d8be5bd82d4417ce
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
index e71021ba2c61..40eb6ee13b72 100644
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild
+++ b/media-libs/libilbc/libilbc-2.0.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
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 fi
 
 inherit eutils multilib ${SCM} autotools-multilib
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index ddfed906e3aa..785480e57aa1 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -6,6 +6,6 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
 EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
-EBUILD libmatroska-1.4.9.ebuild 663 BLAKE2B 32c6ce1248c12b8aa8139fa4e11694b2c72d99130b3121f0b2d8756aa8babb48473f5b2463b32f99c7b23facee266b8246bab17367d6242462dec5f819b01474 SHA512 a7ac97ef3af5a85252ebcc1ef7baaf47c9f1b1a740502748ba4c1758ff0fb225bfb1056e4605228c0c10ec638c5c7ca6f3ea68f43583bb076dc49d66273f8de3
+EBUILD libmatroska-1.4.9.ebuild 662 BLAKE2B 5a45158f814b9c4905081001c3e5a8c8e277eb144fc57432a8ed849964daee316e671692ca3530f7bf96833563a698014bbe0adb0b22df3081b70d1886115e6b SHA512 ade6d326be44913d8be1b3c514e23c738a50c680794205e41c21a7be95f5e2f19f9f6d7c3ba4c9fdb0ebde3abc21eeb7244cc23bd18ab05aa2cf239bdafd3557
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 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
index 9b9b4b1e6944..bcc4d226d0ff 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.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.6:="
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index a300f67fb37d..1b67ad673ec0 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_18.08.1.tar.xz 1662000 BLAKE2B ec5175c1d0f223e33c857fbd2eb160b55a32af9a2ec43f76ac9283aae9b262a1447997280053899ae3d91d08102eb198026591107d919acd4c33052d2ac3062b SHA512 0696ee74f6eeaffec97412decb114bdf732b6a44377b4c67925568bb14cac66266f14ec1c5eedd411de8504319add6bb384bad237063cbc3d17a82269080a0f1
 DIST libmediainfo_18.12.tar.xz 1667104 BLAKE2B 977f2728edb592a0d05720ed7e4f3f75a5ba951c8a494ed1c7e92439c3e812c1c68a65d6e7a492a9851449e26c56397d3c19bd070cf572676f5a0ac6f7ec5973 SHA512 88a5617404afbea99dfe5f96371711c8066f3a78353937e95fdfe72d3ab29943e68f0ecc21b5771f5f1cde2717af9002c61c388c3fd0e2ddcdc4ef77320348eb
-EBUILD libmediainfo-18.08.1.ebuild 1834 BLAKE2B 25c56766c4fdc52e0ec8c613f4b795846ed0f3ff2798bdf242241d7c2ae2bad142e02203cc0d709b3405c20c890d18dcc0a8a7bad93c2a8f1b9a5bdbcc3830de SHA512 5a74e1442f65761137ceeba0d7727f606c1d7e2fd52e7f2b4c4da6698b652e94481ff964fd1d96b90d225ffa7804c5772278535dd12c9a6b47ab3f40324fb714
-EBUILD libmediainfo-18.12.ebuild 1846 BLAKE2B 25a31662770cdab9453c60e6f65d2e63d3da91a13fb468121fe91c7c3fcd14190cfb73a6fb9f0135e1316bc74fee882d808a154ef9fa37c4a722b4f713722083 SHA512 693a76c64f42bbd985f971a164034347ba7a2222beb19b7b3afb1370ca9a1f53406354abd2828fb4ce1aeec5bb15ee9982ea15f2bd8144de3af71b849984c3f0
+DIST libmediainfo_19.04.tar.xz 1684320 BLAKE2B 04c468b74fe0f886ed0a1bd5d0d1ff4b430d5a2fbb8e17ff23bd6bf53143e99cb811220a76c6741b17dbab8917219211c87bff6b20285c5375a6f67cc3dc5bc0 SHA512 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04
+EBUILD libmediainfo-18.12.ebuild 1844 BLAKE2B f4f26df651c1e4b446f344d3eced6b695fcdb607191f0182cb0b0cee95b375b31dd51a42184665866f5e4af95e9dd17feb5189c913bd580453bb0ca01884bd88 SHA512 e34251fc3af7af2fca29164235497be9f7294b380b922aa4d1e0a5f014faccb82ec77b5ba9f430cfbc62e66d020c164a8f06e842a36541fa7b66a9ebf96a44fa
+EBUILD libmediainfo-19.04.ebuild 1846 BLAKE2B 6fc56ff465cc0fdedba9114959d9b5facabfd4b70bc1c8098724419e04758cd30a3783658a9fd4b843d6038537a5c5363173db1364a4d74c4e4ff8acb96f5cb5 SHA512 6fb8aff87af0f0df3c546feca2cb72840483661cf5b81055837860dc923987a0c3da70f870cfcd4b7d936b7037d3bda4dde5f05d30e8a400910b91d095ceea57
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-18.12.ebuild b/media-libs/libmediainfo/libmediainfo-18.12.ebuild
index 109c71c36594..8caee179e0b3 100644
--- a/media-libs/libmediainfo/libmediainfo-18.12.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-18.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmediainfo/libmediainfo-18.08.1.ebuild b/media-libs/libmediainfo/libmediainfo-19.04.ebuild
index 771653179b33..66497326e1f1 100644
--- a/media-libs/libmediainfo/libmediainfo-18.08.1.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-19.04.ebuild
@@ -1,9 +1,9 @@
-# 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 autotools ltprune flag-o-matic
+inherit autotools flag-o-matic
 
 MY_PN="MediaInfo"
 DESCRIPTION="MediaInfo libraries"
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
@@ -79,5 +79,5 @@ src_install() {
 
 	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 79b6477a8e8b..d48c2edf6598 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,5 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0.ebuild 780 BLAKE2B 24ffe6ae1d91d499f79465a30803103a74576e161c04632eb00f8dbd7de4f693401293a1ee51994f39e47a87833a24fc67df54ad038f721cbf842a8bf66a3b85 SHA512 dae2420bb31e9254ce12ec0299607d195849dfd5d830e7be0b093b57b1effd1e72fde6eb0a21b15f35c33c80e831ad7c360300319d8252fa0524679bf6c86e74
+EBUILD libmodplug-0.8.9.0.ebuild 776 BLAKE2B d4bb5e23658ab04973407c1b9407b3575edcd8ffda032d36aa353b3f7014bdc36ea73377b4cf5587a7b40e70fdd492845aad09e5d3c0ceb746e1bcfe44231060 SHA512 7f8d520d00a9d16d140bc9821816768104439372be7666e87e506369bb76f99d5763d4fb9c213742f9406edd929335eb69ad81ca8ad563d25f8bc7669e228544
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index da84517cd518..9f909c151c14 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.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=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 16e92390e657..9f68a39f59bb 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,9 +1,3 @@
-DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
-DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
-DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
 DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
-EBUILD libmpdclient-2.13.ebuild 1048 BLAKE2B 6339e52139ffea93ff33196139693a87dfa7ed2346dcf8e46be6eb161e77f9da1668f37a748acb0b8ff1004a22d28f917a0ba9f8276b0b1357ff95192b0f0132 SHA512 f72f00afc0e4adf5ce732c58f0da02d13e06b44433746d9b4882e269929ee8bc95484abb12fe0062f625c58931a8d365fbef4c61c7c5e6335798a1efaf703edb
-EBUILD libmpdclient-2.14.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
-EBUILD libmpdclient-2.15.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
-EBUILD libmpdclient-2.16.ebuild 1046 BLAKE2B 37f3b771541e27a379f098ca60e95c9c7259c09c37eaeb1afeb78d953503d257db063acad1a2bf0a656d043bf1ed67ba9bdea1ccb6bbdc0c6c6df0484fcc63d6 SHA512 f6372f51d549fc13e06cd8b97e300b15bab56e4bb43dcb48763188cc152ab68d211f034e638bb997a40ad4ba26e7bbab4386629f83de51841983cf4724c13870
+EBUILD libmpdclient-2.16.ebuild 1045 BLAKE2B 6b72700d212fc7772d9b96e7ba6f3bb35e5e80c28e5a6684a71ad49df852b902c7ebf4bf613a6746755c8eac5338c2b94d5ebb0493b48f2821a52c1b5ea44ace SHA512 eca07acc08932cfa96257249feede4676c05007feb15320e598748fa5a2157d71126922a72c4de5e68a5d5f4aa9b4d37841c4dbced9dd117269941f389f070d1
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.13.ebuild b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
deleted file mode 100644
index 64b9bcad80e6..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86"
-IUSE="doc examples test"
-
-RDEPEND=""
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
-
-	# meson doesn't support setting docdir
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "/^install_data(/s/'COPYING', //" \
-		-i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.14.ebuild b/media-libs/libmpdclient/libmpdclient-2.14.ebuild
deleted file mode 100644
index 14dad2fc2ab4..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples test"
-
-RDEPEND=""
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
-
-	# meson doesn't support setting docdir
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "/^install_data(/s/'COPYING', //" \
-		-i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.15.ebuild b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
deleted file mode 100644
index 14dad2fc2ab4..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples test"
-
-RDEPEND=""
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
-
-	# meson doesn't support setting docdir
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "/^install_data(/s/'COPYING', //" \
-		-i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
index bfb7363a9768..e50c68a1fbc6 100644
--- a/media-libs/libmpdclient/libmpdclient-2.16.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index db59504bb32e..5761aee28f26 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,3 @@
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
-EBUILD libogg-1.3.3.ebuild 885 BLAKE2B 5ca4a57ada3b5f15dcbe2ca5355ce74ab80677a54f2b9367d98c18e5b3863414e985498d78e4feb48168fe8cb7341ee26aacf98deca4deb368b8b2192bb33e0d SHA512 210383a819c2e4f93572909e58561515d42392bdcf62ded33cbad2670fd75fbcfd62759be94f55c9ff1784c07710b626b35a59a4d87cdcfb454601898bc20dee
+EBUILD libogg-1.3.3.ebuild 884 BLAKE2B 16850456835208a7d115e7d8412618fa7dce0133fb3a367828c829c237677f89cdf64b679eeb973174467d3bb22485476907779661cf70dd861db725a570a76e SHA512 23fdda66a88d23f3e11c71368357733abc3065a147b122ee1f9aac640bf9ba1c69c97d389e060aafca6b4562d3663db234a149d0eeb4a059225ecd332b1898cb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index f57e62563c05..4ca9f62beb0e 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 20484f698334..c9d95a7ac25a 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,6 @@
+DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
 DIST libplacebo-v1.7.0.tar.gz 312154 BLAKE2B 46a807e323cce5da6362828d931daeca3eaff8475a7318dfc756c097e2edc98f064a90b36e0f6d882f95f6bb077e72127fb6f8d7643dd992c7432a13b6fdbe64 SHA512 337662e538b1d6b3d063ec18db2627619e1bd72cff6017ac19027527b07a74b0f196a428b572c9f4e3c3856c32a123b70049d7938458fb4301fdd319d756ab27
+EBUILD libplacebo-1.18.0.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 EBUILD libplacebo-1.7.0.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
-EBUILD libplacebo-9999.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
+EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.18.0.ebuild b/media-libs/libplacebo/libplacebo-1.18.0.ebuild
new file mode 100644
index 000000000000..eda8818f5919
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-1.18.0.ebuild
@@ -0,0 +1,53 @@
+# 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://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="glslang lcms +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+	)
+	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/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index d564dd10f444..eda8818f5919 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
@@ -12,14 +12,14 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-inherit meson ninja-utils multilib-minimal
+inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
 HOMEPAGE="https://github.com/haasn/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="glslang lcms +shaderc +vulkan"
+IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
 RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
@@ -27,21 +27,27 @@ RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dglslang=$(usex glslang enabled disabled)
-		-Dlcms=$(usex lcms enabled disabled)
-		-Dshaderc=$(usex shaderc enabled disabled)
-		-Dvulkan=$(usex vulkan enabled disabled)
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
 	)
 	meson_src_configure
 }
 
 multilib_src_compile() {
-	eninja
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
 }
 
 multilib_src_install() {
-	DESTDIR="${D}" eninja install
+	meson_src_install
 }
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 4cbf6ef5b5d5..77ae42c9e92c 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,6 @@
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
 AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9.ebuild 1417 BLAKE2B 0cf894478276bcfd3d4972516eb38904976d9829570d0370bed12141ba3c781b815d0b22bb8faa8a5dfd184de1eed7ae8b524a1aa6362520993d079043d8e5f6 SHA512 4b87a957a4def8b39574d6e313e34a37e78f9ec9bc2813e1dbc913242fbccd834286b66a1a1f938dbb5a6b6c3dba4c3c7844fa8b0aa463e01426c57d0b0ccd8f
+EBUILD libsamplerate-0.1.9.ebuild 1416 BLAKE2B e479d0f3678a088f289456ea042b5e45c59e67ed2b81a6aba460ec347879580083549b926ad8db1cf4e9ad25c025de37e94619dfcc7ccab8375a6f3e5938c36e SHA512 3fcf3bfc84b4d457cfadfedd42fe75153eff27965ff545b2b15fa68d9e435fd2f405246910cc49fb64a77f730148d7129c96e2726db3ecfeba30080e10650570
 EBUILD libsamplerate-9999.ebuild 1300 BLAKE2B 04ce2d1e21e31f24c0d653a41c912ea70f78fab450cd2438e7473100f67cde8238a81868437aa3e3e331df5a0959675682560f6b0d96526f349f6c8b50279820 SHA512 776bd88b30e5fba3383af725ab05648863c3168335706959532f456cbb7c2835513fdd144ea36fae6919f8ed99eeb13bb7e6fd5f66e4ac97c601297ff5d594d6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index e8227340d39f..e62042abd4c0 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
+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="sndfile static-libs"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index f14b7a9627f0..650e2e605204 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4105 BLAKE2B 2fa64a8dd91478257ed9d5adca4aa7753c389f5f586a5ef86c0c4ebede43a1d2af9cf466a1c139dc94584ce75035299da6c5e6179e3776db34f941e7000c3224 SHA512 4ece1e8dddb187b3b4bebc6edda9c95b94923006b90cdc4a2e5c2f731bd3139bcbf33f24bea08f63158faa06a9353a036fb7789f3855125450f70b843ec3def9
+EBUILD libsdl-1.2.15-r9.ebuild 4101 BLAKE2B cd4d23f57dfca5379911e735eafe6503e2b41502efd1634d3589f5bf1072685e0e3635a8b6f2ca7e52b4cee60e8415f28cfed4d311d4339dc5a5b14791dec7d0 SHA512 31e23c47e7e1376fc6329bb970dc437d2049392a61d6dbac721093355434877f640a52bb3fb31da89c60f237f0a498f2b886633fd4f438d0ca8e32b38d53396d
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index f5679f595b96..79464c2542bf 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.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
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 47fbb0d61b6b..51a7ae182c2e 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 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.9.ebuild 5399 BLAKE2B 8314bdb95be7823aed439c700ed7188e49fd650a4ecd577f66a9a4086cf9e854ba2304aeff6f21bbcf48ec23c20b0e76a805c6416a68df2592a772d43133a080 SHA512 18079125693f9b260eda74838a686125a1b9952c1c0d4e6432f9ef682e99939f68c08248d9946cc609bd672bf866333a85ff72273ef8c410b43e69f6d1076671
+EBUILD libsdl2-2.0.9.ebuild 5398 BLAKE2B a8fcd429fc13c459ad2b1add8870e244c2bf693475f39427722d73ebcaab4d15c025237f61f3368c7073eca30911b3552fb5bf462df439aad55e1dab7f1d4810 SHA512 9aaf9ea34d1fb571150e2b8cfec48f91036a845e1a592d74960aaef336f758447cb52fc1093c140b5ea33cbfd70877cf69509df0b696787e8e9878644ef9fdc8
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index 725fd954dfd3..64ccd9419459 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick 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="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 927867fb6bd3..e057af799f47 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -7,6 +7,6 @@ AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e5
 AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
-EBUILD libsndfile-1.0.28-r4.ebuild 1880 BLAKE2B 106215eaf3fb946137e3aba967f6d8d5a8d63bf92c46b04d75df24f0be7c6402f636af5e93ccfa46b8eeee1182e51aa2c61854b3497b93d6051d09d520d1d3aa SHA512 27e5e3e2c45f14220e77705673f05386aac3650c9c85efe6c45cae468928a6675ae6883a883e96f50c650f1efdc3ce91f364b2e585db56798f9404a1734f6c00
+EBUILD libsndfile-1.0.28-r4.ebuild 1879 BLAKE2B fbe9ac494948b6a8db6a91dca40b52a0280ed09bb863d84856f12dd1de8cf0f4f734606c208ada4294014eadf7292015c1a634f7fa4a3259e046ed091f3bb285 SHA512 f44b94792424a2855c0cc2d127bc59bdb6336a37a7cc27819d7b4347b5f0233c28ac5fca4628d1e0f8200b31984afabf061d90ffa94e421c9ff0ccc47155127b
 EBUILD libsndfile-9999.ebuild 1781 BLAKE2B 311f58ead67a65b184cc7f3ea594a7f6145d929990d46ebc2326ac7e826555c089d76f70b749ac21cd4b375185d9140f6898502899629527dd787ee2453650a9 SHA512 6da5bb0a8ad27f93a0916caa2c1d07ffd57fc3735d520fd645d04321c35d03722880360c63c52aa4ac7e35a3d28498940dfb1423d733ed485402a9528204da35
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index 2b5b625c6236..3097c0887094 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 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 ~x64-macos ~x86-macos ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 0f47fe5d5df4..c29d59f7abc3 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2371 BLAKE2B 9ca277e4d8e14abeb864172ac3e3e938d4ff3d4536c38465249c5309aaf2ae5d78c2da1b5f9e171ba7402c979231a8bf706842d10678099d312c754776feb7e3 SHA512 949233d84bda2a912a9efb715e76489f67c2a83840e522fc13ebc49d4e2737c09b2e25f8012e3acab9fc0c796e67c85de723532bd3e6b18b9f17d2f7f6221eb4
+EBUILD libtheora-1.1.1-r2.ebuild 2370 BLAKE2B 39365ee057c7c92ad1559e6937c16b89e7aafb5804295ac1d47b47e57fe2813ac8f20c6a3fb0b00007de4fffb608fa7f4dcd8204bb847256eb0f316a26d81b57 SHA512 1a8597942e837dd38404befe0292b2f613cc56619b58d95b76319bb926e47914f32949d1809689b710faa5a3398b8dabf9d5260560bd63a47f265fafc43a05e4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 629ecb22591f..34fe86706c51 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 4dc736bde447..e411923164c3 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
-EBUILD libvorbis-1.3.6.ebuild 1058 BLAKE2B 486d6b54fde7aa70822b87daf4cb95eaf9773ce2c677aaae48476c219c775b885cad7a78d3bed03f7b1f47f7a0cdac516fb3f6c8296d2442749d65b4b425184c SHA512 358f38b78703297b6048e30dbfc93011d27520c68f3243891a08ad8840d5aeae192ac0470426716a20fdeb13777b03380d561d99c5ef4fe3e60ecc9dfb6a4359
+EBUILD libvorbis-1.3.6.ebuild 1057 BLAKE2B 5633c69a61a40cd406d4c1e4e6b13bc37efc265af077ac12a9b560af0568ac97aac7bea6d5d0ded1360f9709bbfec0bac27dbbe56ecfaa8c683e8934f7222035 SHA512 61921c5138a00fb34a3f5a66e810115cb2eb22c0ab09a413947f8cffa7e3b04f8ccd1a7259cc228905c73852b3275b36137308b9701639fa36a164d35cdcb01a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index a30da38d9e8e..846302b72c71 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index a2099f90cde4..5e0870696286 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -7,5 +7,5 @@ EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
 EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
 EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
-EBUILD libwebp-1.0.2.ebuild 1833 BLAKE2B 20f9fe2ec32625b6f8280c6397da8d8364c4711ffad930318c785f70005709bf71d06310a6900b4cd3b521cbe345c458abb006977688e0f81fa3645e9f11a35d SHA512 7b673c9267341a003b32fa09aa3fa7b42477333facbdd308412326db118cea16b16fd117bfab85c09875eaab9ff79d8b39546b88d4d0ca19346ed4b4bfa053d1
+EBUILD libwebp-1.0.2.ebuild 1832 BLAKE2B 9b537b859f3586c02c1b3b70bc2375ed1876209f9f0e71bbc554369beb2c825f66095a45148b001f4e0e3f30723839c7c2be8ddd6b29a6b2d8ad24962ef5c632 SHA512 9bf0eedf023e66535e4156028976d55cfd8b4938279c5b247cd5d4e4f409b47cdda04aabaad3a82a866a80d755bbc67438324bf8b2eaf69eddeb5a96e71a9cf0
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index 866149ef5e02..bf12a1b1b3f4 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ffb7b7ccb2f1..5f80e07442d7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,14 @@
 DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
 DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
 DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
+DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
+DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
+DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
 EBUILD mesa-18.3.6.ebuild 13688 BLAKE2B e8738fc05efad0af1f627af3339abcb609d55bc656402f4a7cd10d0216a0bfd067ae401c357ce4d9bb7b82d81fb8df5129025840d557863a04f183c38a299ef1 SHA512 9a99c7afc94de3e259156b7e48a8059a90bf8069684ba3354e83aa599e50baf6e63ea6c87fbfd672e0f97bf8383cabe93b193d56df840d586929301fc920ae10
 EBUILD mesa-19.0.2.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.3.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
-EBUILD mesa-9999.ebuild 14184 BLAKE2B bcd4c34fb11ed167a164a0c32ea111f49133afb59c7b4f712a3cbb0e48ffe85d77aecfb6286458ab2a10f32fb4670726c76fbd9bfd914c916c04bd94bc8b902e SHA512 f1ec50382356527283948761e5555201dca490c1fb95d077cd39b02ac320003e2fcad2e88949fa4d73a09acb75178c8d228583dc01a548e84dd9448d696fce60
+EBUILD mesa-19.0.4.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
+EBUILD mesa-19.1.0_rc1.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc2.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-9999.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.4.ebuild b/media-libs/mesa/mesa-19.0.4.ebuild
new file mode 100644
index 000000000000..6e5cc0499b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.4.ebuild
@@ -0,0 +1,525 @@
+# 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 +libglvnd +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.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] )
+"
+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. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${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[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${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 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[*]}")
+		--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.0_rc1.ebuild b/media-libs/mesa/mesa-19.1.0_rc1.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc1.ebuild
@@ -0,0 +1,538 @@
+# 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 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}
+	${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[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${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_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.0_rc2.ebuild b/media-libs/mesa/mesa-19.1.0_rc2.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc2.ebuild
@@ -0,0 +1,538 @@
+# 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 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}
+	${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[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${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_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-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b8a32420fa6a..20146f77c705 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -123,6 +123,7 @@ RDEPEND="
 		!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}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 4b1a950ae132..6b835fd8e349 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,6 +4,8 @@ AUX mlt-6.12.0-rgb-to-yuv-accuracy.patch 7735 BLAKE2B 122c51cb168a4c921cb180fb21
 AUX mlt-6.12.0-seconds-digits.patch 829 BLAKE2B a696c33a9eb97ef5ca07a7d7e302f3b83ab07a46de61f32aa7b84c60bb8174b8683fe4f08ac6b6b8506fa0a3da84a611c9e06ab190774427bfb5372881772479 SHA512 b96f47dea8532c9b98112bfcd284dac521e5b91a2d852a4570adb26082870f27e2d32f567ee1e9b49ee315013f657c7c68ba61e2b8d2d8edfc8648e4f11800a5
 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
 DIST mlt-6.14.0.tar.gz 1413015 BLAKE2B 81501c0b770c0be2ccf2dfa12c4ebb893c0e9921f36722e6f5cb8f643d3eaaa4b8eaf4fd87ba05fa55d49960b7147b73ea5f2cf771a6784b587a6797466f2f73 SHA512 86b26b0c421cc881f6bebbde2c0ae9d834f190d8f878fb279ab29a1d7ac5416077b7dd91420bf63a7821fade9ca9c044a92440e02673c7b330b8ff36982a9fb9
+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.14.0.ebuild 5519 BLAKE2B 81859cf8c2fb62cb5250382f63b355e5e0b2b86e6865a89b6e5209ec02ed83b0beb0892524250fe693e3b5df9500c28fc2429f4e669b1990562e58ee2fbe6cea SHA512 2bbd8eb66fce86d24a94d98f8f1c4eb2162200068cce39773b6ab2d13a5774cff83accc4d70ea740abd19d880258c4f5934c62aa63e94597e2bda35ca8fe2d87
+EBUILD mlt-6.16.0.ebuild 5519 BLAKE2B 81859cf8c2fb62cb5250382f63b355e5e0b2b86e6865a89b6e5209ec02ed83b0beb0892524250fe693e3b5df9500c28fc2429f4e669b1990562e58ee2fbe6cea SHA512 2bbd8eb66fce86d24a94d98f8f1c4eb2162200068cce39773b6ab2d13a5774cff83accc4d70ea740abd19d880258c4f5934c62aa63e94597e2bda35ca8fe2d87
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.16.0.ebuild b/media-libs/mlt/mlt-6.16.0.ebuild
new file mode 100644
index 000000000000..6d8840ae163c
--- /dev/null
+++ b/media-libs/mlt/mlt-6.16.0.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO python3_{6,7} contrary to 6.14 changelog, still does not build.
+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="ruby25"
+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 ~arm64 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl
+vdpau vidstab xine xml"
+# java perl php tcl
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=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
+	)
+	vidstab? ( media-libs/vidstab )
+	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= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.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 vidstab vid.stab )
+		$(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/nas/Manifest b/media-libs/nas/Manifest
index 67695dc45d9e..6bbd6174caf4 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -4,5 +4,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2443 BLAKE2B ec7c32c8675d0cf7093bbbbf9fd1760c6f2dfe7076265ef6f2bd42773144012f77b0516d9078137ea5fc44129ada9b5deaff514852c9a254f19a3c64c7254fc7 SHA512 dabd29b4a00c05619175a011096fd701b583b495e8ecaf64ac264d8fed9c64f4301ad3197a3586c6d4d607f91166f89bb0c4aa152f0d0cfcbcf57bec11248d78
+EBUILD nas-1.9.4-r2.ebuild 2442 BLAKE2B 3befb3a5c7bd8e7f8c8e6405e462d21dd9885471b7e978510e1eca63ec8a3de966a4897c337b532dbd85bcba8f33811291b41be899eb47b28368db8c681337ca SHA512 20d098dc2a31b472dc8dea4af60ea8a95be0618eece1a8abbf78b52f3995132fe917333711d2b9ea944e0995b63990b2379d1848a2ec178c96343de333279b26
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 92f6289c98c8..891727056835 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 088c43068057..3b15243ff4e3 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,8 +1,6 @@
 AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6be499198c2fbfb212a47a3c08aba72a63699e725f504b18662086335513a0a177fa85f2dd019d65b18074ea5e7b19348e34dbf17bcce208fe96ba11 SHA512 e28b2ad70c35fd7018491cba84f33bcd5e6d6dd9944d47ad4cbba5852663d436be16a901e3e643b48f5e29d72d5b154c79ce83cd291075ff4ad272a1c77a2fb4
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
-DIST openal-soft-1.19.0.tar.bz2 575163 BLAKE2B 492166cccdfb0d5f35a2d731d2194ab844d89e7754ee636fc00969abe68026d9ffa1ce05c1b75f1c465ba413e1d16c1aee7e0dc86e24c97cbacb29353de20b73 SHA512 5fb8f54f271b36970f29335952173300dde15a798b4ac60e8167143b5806ed3178cc4f400e1d8da4354c2c3f57f28c90064e61740264b70d7c605d7d1b4273b3
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
 EBUILD openal-1.18.2-r1.ebuild 2087 BLAKE2B 21e2e6683182f2eb8779763cc46b682c01c33cb28b1a0828b5bf227eb9fd41c0f747ae136173eeb29b63f24d44de59293e3a5770d614dc7384a82f993bed6ca8 SHA512 24c1cd5cbadf059edc9554bf719e4318623412fc7f63bed1d0fdb15db75cac978072bec83ddee6480f14210008ed6cc85aadc3f4b439fdbe975fb25c1859f42f
-EBUILD openal-1.19.0.ebuild 2096 BLAKE2B cb10d181a01532d2c9872e9aa84f8f4fd00846372ec943a7ad3800aef7bc3aca306001312e2a5460f70134c9f34806a0b12380f71b2da5c0deb7af6ce2fd31c0 SHA512 abac1e5c860f6666938f47b897a1540a7ffe8dad41cc784378f8f703f51cba92376a16d02ce69dd76a20223ab4c80c5aca4edd502408f2e6b6d09d7955c4b729
-EBUILD openal-1.19.1.ebuild 2091 BLAKE2B b94bf4002486fe73fb480cb42ff856cf93f95060e6ddb6ea37c4b0e755fdb61d1a585194e706e66334892ea74b8b01c7c85c3ee99c249fc43ddacdf48c8c2bba SHA512 364d9ad406902047f7159cd2a4b58cd5f1b1b9f87e9700a5c130fc9f1fbd592e2f450ab8f330c7fbb3d05be468fc92bcf946cd62ea6b928e969fec1a269659be
+EBUILD openal-1.19.1.ebuild 2088 BLAKE2B aa1e2d78e7ebb6a4c1770e5e893e72c30e6013f30458a2df66618ebd01cb8b1e081ee14cfba972d5cb0742deec9aff86c8a761b78ebbf4527041c044668d1753 SHA512 63b6d8309f65e17af7034e1c872b3e955f9853246b68e209091e8125bec53d86f75345dcd8257503a10072cfcc7b4bba4bff7cf6325902e14157616710d9c5ce
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.19.0.ebuild b/media-libs/openal/openal-1.19.0.ebuild
deleted file mode 100644
index c79250a4e7e1..000000000000
--- a/media-libs/openal/openal-1.19.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_BACKEND_SDL2=$(usex sdl)
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index 76c9817a4819..dfd436080f61 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4d83d0153690..d8b51dbede74 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -23,5 +23,5 @@ DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
-EBUILD opencv-3.4.1-r5.ebuild 18716 BLAKE2B d9aecbb003f7ce23e8822f94b339ffe3b70cbc85e1d14ee1a26c06a88b5fb61be8881ba3836bff7f4318425b3c6b899bb83bc682b35e4581b2bc388a420e25c5 SHA512 621903dfa2a8f7df6aa7eee406688c76846c4df80a61cd455004fdb9a2eb55c806835dd5b1d1268790af376ef29b092ae02dabc029ee9189c04d38e21950aea2
+EBUILD opencv-3.4.1-r5.ebuild 18715 BLAKE2B 2725dc4ce46a4cbb047c5ea3aea493b3bab516bb5300f75d59859913412f694a138ae0946844ccb09dc202f53a1f558871f4d0e2ec999823daacf2f303138d40 SHA512 3016dd9480077e9b87fcdf8e9dc3fabf729b4b9e1d540173ad761499a79f6a36dd80bbed02d3ac3c101809e9c0c055e1b2752e2e324c0042547ed297563b6b9f
 MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d6b5e9464d1c..d096c1963ffa 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index cccc4a3a035c..4059a9e93ab0 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,5 @@
 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
-EBUILD openh264-1.7.0-r1.ebuild 2935 BLAKE2B b8f3c8b49051b3116f48aa76aeb36a8429a316cdc04722755e274dd4a42fd8325b3b1fb4a8ee3157e91c5315ac7fe8c4b56d2c2a81ef7921ef7c0064b38dc1c0 SHA512 caace14ab8125d8a5178a783346f9bfe79011b24b2de91ff007bbf3336eb4c4d5b0f4d011d85937f4021e84d7f51e44551bed2264dc38ed0fb3e5e19d298433e
+EBUILD openh264-1.7.0-r1.ebuild 2931 BLAKE2B 8732c3c602e9b8bf63bd88bedf760b1e44d92925413d2952a2d714917819faec918eb9c98e72f5f5d9a5274d36a103f6c723ddb9e8c7c473b8331761b7ee41dd SHA512 b62f5da6c3f00d9e5e57ad52e57ae113313a3385a0f75272837e9b317256d5e9cd8afbdfd652801a2cf3fb6d3c58eb79629204fe25ddc08adf62e398d5a21b9f
 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
index 99ef3ac52062..f79dfb2c713d 100644
--- a/media-libs/openh264/openh264-1.7.0-r1.ebuild
+++ b/media-libs/openh264/openh264-1.7.0-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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="+plugin utils"
 
 RESTRICT="bindist"
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index d8ef43a29f4d..cb4324cb3cce 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,3 +1,5 @@
+DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
+EBUILD opus-1.3.1.ebuild 964 BLAKE2B 82538fba16a8dee170c25bc980d1bb1ee7f385a5c3cab51189e9f5f99bfc0415f4c556df33867c2ba97918e8742e17eea128abda22fda92b5b0620939198b03a SHA512 715f7aad4d3abe10b3dde5bf7c5010f3a9d0eb12c5b6ccd819ce754633089c3b35cee2d51bf366ea879e22844c2c25b29128f1828b836b00dff43cef967e70ae
 EBUILD opus-1.3.ebuild 1180 BLAKE2B 1765b021157f54843049a524b645eb65b1b2d2cea298447c281a89e8c60bfedfed3197695b07b9c5f950bb1707a35c3d1dcc121a29923731410a2eacf3830db2 SHA512 d601b387e877d1b72a1672a9cc5eab1b650e595f6cf7010676e57250fbfc2a8f9a157a562cf52a8cf9ec1ef197a318e76e6e61a797ff2606f725d07c43c2820a
-MISC metadata.xml 338 BLAKE2B cf5eb32d38bb8664581bd6806c38d36d1b2c79e2db5a2256afc09b1cc2235f4580a3f72290359496b7ac0553f39146c01f46529cbfb43dcba1149ea97e1893f4 SHA512 b31305b9bf5a8b1b6d44881ac23ad8de393b068e4fd6c868d576148d8bf252b74bacf3b6ddbc501e0aa44a5e6fb598c1fe344ab8379292b45e002c9a8e8d0fab
+MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
index f3553eca22f3..434041c511d8 100644
--- a/media-libs/opus/metadata.xml
+++ b/media-libs/opus/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="custom-modes">Build with custom-modes.</flag>
-  </use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<use>
+		<flag name="custom-modes">Enable non-Opus modes, e.g. 44.1 kHz and 2^n frames</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
new file mode 100644
index 000000000000..8fef1d8dec56
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index b392df482d0d..f290a7bfceb2 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,8 +1,4 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
-DIST opusfile-0.10.tar.gz 467700 BLAKE2B eab1c5eadd13ad574590c5b6a4bf8cc7f82ec0d723c240a0ce8104e108772549a4c81dd244aa61d310f0f432b2426a6e74de3c7b06aa8ab7e2f33e1c3692a826 SHA512 302601c31ca28bff175cefa99ac16177122a786d043be229616e2c98b7ffaf4a96b8bb17ca16e31240325a92763f417315b54d8f1b2f4f63f445cb7ad43c4a37
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
-DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
-EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
 EBUILD opusfile-0.11.ebuild 1017 BLAKE2B a7990aba568dcd9ba45948d658d101b568f3dc72464e91d64a0d25460dd4eb3c575dbd46f90d6f8ecfd1459a25d7692139703137a5fa3df9e56b3e2c6a807df1 SHA512 07f8e3aab8f9dbbf911b926e0d3235ccfb8b95f4ccf74e8e8d7c0a353a1037a3c37f44a451f49dfb3df759b11733bea7f2cba5d60f9fcb4561cf9c8a311ceb43
-EBUILD opusfile-0.6.ebuild 774 BLAKE2B 524fdfebca63b5cc98d8306131210453659d905c8528952f6fe245910f84504216a6514194ffc3790f57853479e6a0eef2a515a4ffabf2b3bb3fefc2b5a8522c SHA512 8cd751db321e6e25c4ddd3028503d2621af55130a89106b44823385aedb07101c4f30d6a00d395641102bdb3efa90dd3c5b0e31269dc12fa498ee7fc12e16c79
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.10.ebuild b/media-libs/opusfile/opusfile-0.10.ebuild
deleted file mode 100644
index a71ac3c1742d..000000000000
--- a/media-libs/opusfile/opusfile-0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-level decoding and seeking API for .opus files"
-HOMEPAGE="https://www.opus-codec.org/"
-SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc fixed-point +float +http libressl static-libs"
-
-RDEPEND="media-libs/libogg
-	media-libs/opus
-	http? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="^^ ( fixed-point float )"
-
-src_configure() {
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable doc)
-		$(use_enable fixed-point)\
-		$(use_enable float)
-		$(use_enable http)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-libs/opusfile/opusfile-0.6.ebuild b/media-libs/opusfile/opusfile-0.6.ebuild
deleted file mode 100644
index 5bac349dcd56..000000000000
--- a/media-libs/opusfile/opusfile-0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A high-level decoding and seeking API for .opus files"
-HOMEPAGE="https://www.opus-codec.org/"
-SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc fixed-point +float +http static-libs"
-
-RDEPEND="media-libs/libogg
-	media-libs/opus
-	http? ( dev-libs/openssl:0= )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="^^ ( fixed-point float )"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable fixed-point)\
-		$(use_enable float) \
-		$(use_enable http) \
-		$(use_enable static-libs static)
-}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 3787ef82002b..7e126539cdeb 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,6 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r1.ebuild 1578 BLAKE2B cf5d475a87c1805262504fd1b4a954f87a2db961bd03d507908edfaf6b128e83dee0d4a4852d5d574c0a71601fe29b772181d1302c87f6cfcaef727aee113828 SHA512 64b803714dd662028a16e66b0c802cd919ede858473d5a0c8da8d68d4218b1c9608903d86587ca40e20a424f2c984c03dcd31ca9fe2b3fad6d9f365e753555ac
-EBUILD raptor-2.0.15-r2.ebuild 1667 BLAKE2B f8f4544525c5e80ebdb617bb7b0ede23761a0ba2429666314a3aa28190f6e1df7f31a2119854262301ee5702f8b5def014b1dd61f8a82c14d34ebf52e34cf304 SHA512 e6f0c918200cc3693053fac5de8ffd0cb04e222f747a7e11779f5da4bd11aaa8b2b7d590cedf40830d91d55a5636d08905c2ef4b062da8a96da492418586c098
+EBUILD raptor-2.0.15-r2.ebuild 1666 BLAKE2B 78585fc28baf38b7cb5e0dd8c1e68bec829b76ce162dde1eff8838199707cb7e04610c5558d4bca7f5db17f8c311e07a0cb2f500a71043df73bb95563e8cc0da SHA512 4d4dbffb61dbb1569fce9f899ded5d085a4b4fef2a581525cbcc4ebbceb2847b31ebf56393e6699a0a9cd4c076a09bf5dca7dc7991d5a49fd8b994ecc2c00769
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
deleted file mode 100644
index 2710505b2740..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	unicode? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=( "${FILESDIR}/${P}-heap-overflow.patch" )
-
-src_prepare() {
-	default
-	elibtoolize # Keep this for ~*-fbsd
-}
-
-src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 79bbe0b0afa1..2f77ba341816 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 993f0d796b96..3f89ea8ea2eb 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,3 +1,3 @@
 DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6
-EBUILD rubberband-1.8.2.ebuild 1352 BLAKE2B 04a7a6eff997f48d5b9089d3b190b3533b8dad41841dc10c13334efc780b39dff501b91b86900df89052096988753bf4c81b905c59aaa7ffe56f8ad153dbdd85 SHA512 421ec677d99980cf39ea070b8019d7936618b5c72eaa7cdfdb58b50160a3cd997295aefbcedb98ee28cd2c98f69cd89b0cc28c76442bf10461bc545c7e3fa09c
+EBUILD rubberband-1.8.2.ebuild 1351 BLAKE2B 61b4e4964b30f784f28660e1b71735b8620611b4be23c6cf621fed8a19f4339c8b08d3ca555bb576671385172d98c23d6ea14aebca7e1075625528c33913e1b7 SHA512 087baa2d70bcaab5c57dfc5948085b7ea99d00d544eacc23810979c3be17507a6b86b0c1758b779bfcb231ab1ff784d26f92092086192baa8a667c36b6db90a8
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.2.ebuild b/media-libs/rubberband/rubberband-1.8.2.ebuild
index 0860b6060046..2323beda7557 100644
--- a/media-libs/rubberband/rubberband-1.8.2.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.2.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
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="static-libs"
 
 RDEPEND="
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 40077afd0c15..9372baf40f12 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,3 +1,3 @@
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
-EBUILD sbc-1.4.ebuild 862 BLAKE2B 697595fbc541b3d3ad41e701b4f2a67b314c91a2aa5d8976537da77d3144074d137aebafcdc6cb6ee17d850abb0c078069588949745261b873141bd3dad13d06 SHA512 aa0b198287a1533697390dfd8f208f3e9ccf615fa3b2e0c8e275891208db0cad85a1afe337b55438242dc96af5f6ec26d90064b370789709bb1d655dabcbec4f
+EBUILD sbc-1.4.ebuild 861 BLAKE2B 572d860d22e8611e8f1498c308d9299cc6aa153081a16e140afab1dca84a7e4ca91f813c1cf3ac2dbf83c1d771e00e0459e2d0e38250605149ffde688a4826f4 SHA512 75f0e3accef30d6621409433cb7a44a0b6710aad128eed495be3e03a2d83934dd96e94d9fb9f87f548996985cc394d16ba05eb5b6f99dacd56c51f877ba9abbd
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
index 1ca770b993e9..4c3b18491e96 100644
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ b/media-libs/sbc/sbc-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 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="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index 71023b69059e..09154fae4491 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,5 +1,5 @@
 AUX soxr-0.1.1-nodoc.patch 480 BLAKE2B e7e31df74004b58e584964eed26acb18717faa912fa5eae84d03a62f40d2260e039595c33518ff6fdcf2c5db7fe0bc7f73680bc64418e387ff30f2488d0ebae1 SHA512 6c585eacc6919bfe6f158f1ab45fe5dd0b3a0b3f534ff5d2f5e07e3e8e505a7c7da3bb16d2d4b6dc2f0a361190bd21639f74ae09abd3e0209b33ae2174726017
 AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568befc1dbf671fb503c610f2b4fa05dd7361d6b8184aeb4be050d224bc534e87ae760130e1e3ce1c36e6042ff4208411fe SHA512 45206a00747d387e4bec62edf93e9fa19b04096240f567773070b7c87667713ca7bcfea2e2df665f128b6b4d4c53fdb87571bdf018e2066ff6e6acf39870b762
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
-EBUILD soxr-0.1.3-r1.ebuild 1088 BLAKE2B ad291b12e05e0ecabe8e4a08c75a9298041e5ace2224cc4defcd61ec4c22244ef756cf9f51bd6c64427b392a8bed9d7d093ce8caadb528be1bb7b2e1073d9be1 SHA512 a090569986b82be12771a9eb2e1e876afba5557d4849d174facdb0b3742a62352061d039086f90e2b8f13ccd3731d74bdcfe35ffbad45e117a5df92cb203e96e
+EBUILD soxr-0.1.3-r1.ebuild 1084 BLAKE2B 760f6338426dedcc8a77576f87fa08758e4faf911754b2103da697baa0a5167b78c93f078af0ae0c322601f6d882fd875bf818cd181652cbd578b9b7c07571b2 SHA512 4bc893ade39c131e1d855da4ad52585c06c973a21129d7b8e441b0405d47ebfcdef76856f345c18db8f440d4472387ddc27b26eb5bad3f0646127b5b4c84d3f7
 MISC metadata.xml 337 BLAKE2B 9b011942361de08f2263ad43a16d18bc8940e539b045a4907ced6c93dce455450bd754bce933ad33591b001dab99c253c781b26ffc26f0972425f75837186f7b SHA512 7f028b48874ab0d30aadbf0370e3ef5b555785aa4e7ab1bd1755ec2cb5c33d3e99e83ed166d011a94773b3c50b0e5a5403b42ed6d9d0c51ff7f7f2ddf48d064e
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index 41f19e360231..6d3d97f3ddd8 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="examples test"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 0dcddecaf204..07a4585008f0 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,4 +1,4 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
-EBUILD speex-1.2.0-r1.ebuild 1669 BLAKE2B 0eac76163de2289f185762e74a1150fa4929ef52d92373c6de543a35a1ddb5eab28a6ff04614e6f8518b88c08a595d50c01fb5b3580f514317afb9eec3d15827 SHA512 82dac11fb230cb3f397ced068a7ef8d8d2f2bbdf913814e524a793c0a53cdc8523c7192a5bd61523f5123e7aea5036b5e1a64def6e938c79e511a1760dddb894
+EBUILD speex-1.2.0-r1.ebuild 1665 BLAKE2B a36c01a68e9602909eeaf86aee736fc7d8703406c36b93f05a3adae8a951dd0dabaa60e4a744a3cce650d8a0246813c9c205f384a9315d9f5d180ff9c593d4a1 SHA512 52c5f1b69fa0a16a0e4851dbaf3b1b9bfe1eccf3e51c0007f5059b17631eec40a18fc670d8c3a12d310948e9cc01ed7fd90d0ed2c7752be286f5c0f06c757a7b
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 5350cb381f46..2a8671bf2443 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-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
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 82808406e3b0..16d4b847fd3b 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,5 +2,5 @@ AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1492 BLAKE2B 2594206881f5f0ffc3f7f486bf39a1e151a98b3667021cd967e9f2bf722c22bd5a9047950d6a852b618c908a15312807411fdeb035c8cbe6755fcdbcddd92fee SHA512 a4fe022c502380b4100460c782fb76981dc839c2b52b575152baa26e8decaca204c6252076d8e5f80df0c71d600763798691a15bd3692d93c9e5c6a9e94cd55f
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1488 BLAKE2B f3c35a20ea333108938b936fc1c1d4b483b4c0dda34ed03fac0b7e2c0caf30f780d4ecb8997187311c3e0e30ab4f58f053c9bd12c9e844bc16e075bc631cc560 SHA512 9bfb850c500785f2ee7d5c7a0b9eb7fa52bf1e2134894e4c35116de8a5d84de2d8fc07a5124366745dc80da7a9227296309eee5ee81ea8c30920656421097d20
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index 91bc287a0a9c..e010f35b0a29 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-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
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index dd192913c832..71d857189525 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,5 +1,5 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
-EBUILD taglib-1.11.1_p20181028.ebuild 1429 BLAKE2B 38af0c56fe30564d21c0658ac4fa8ccfed00b5dff3170cea2de9637848c442c7dc9864773ed01e2e48333bdcfb4a4e299c3a7d73f365553aa9e8327c2b899c61 SHA512 2f9adede95749f4a7359495f0b5bee05504091c26bb5095bb56594c86383abd8bd75e4e6f79f44ef9c71df961a423ad8efb1edef357e2134bc4a01b875f6db7a
+EBUILD taglib-1.11.1_p20181028.ebuild 1428 BLAKE2B 4fa5f30b2b22a2a0869fff9813af396fb86190e2f8d4a69d5bb40691653923599a87bb5465da3d15c3d29ff65b95f41a9fbe247a1f021a8872c6c2467e283b82 SHA512 7d42ca1c304ac2b01f89c96b684186a44c78d74ea62a3e5dd76596a0e093db181bba34a7360624ecde9f77a2b4ff897cd2a3400dfbc38872c6a77b42bc2210ab
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index 39371d8c5f68..0c375210d93a 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
 
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 0b6ae31d3e97..53d97dc613f0 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,3 +1,3 @@
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r1.ebuild 1008 BLAKE2B 5372a05fef45cb628f8bcf3e3b9e982c55d05e0908577762e34f7eabcb36543cdc4ee603f53dfb9515b247a3019e1a892648422bb86ffcee141dba1fbec1bf7d SHA512 5de39eeb34cfc6251547422b70c8612d87b1ffe3e5f344bcfff64d92df13fda90f40060bd4a88e284c0a29923901364e9ae2e050e847afb8d93329372f4e27fd
+EBUILD tremor-0_pre20130223-r1.ebuild 1004 BLAKE2B aa986fac6249ae8784be69a62bca84970a4bfc26fba8d326e30c4f1daf4ec2702052a6d839819ed8d04caa31e5eb8ad54d93794055ae61083f2d88f2c81d8f8f SHA512 1692c2e92b1aa1e35b9776c8ed10b7f7346fedeae9f750790ff6600a89021b15cbb7ba183ea9431aa4e0e6be989384ee604e18fe22ff40cf24b63cfca75bebf5
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index 6bd0fe6d3058..24edfaf465b4 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-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=5
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 6e05d89eba2d..682f2e05c2b0 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-EBUILD urt-3.1b-r3.ebuild 2383 BLAKE2B f3563b80ea4d243d4b4a5e5f5f9e1400b8a3856e817d0f430e99f67f3dd5fa88bf48babd97ee6e1527a988da96bbf2da1400011175440592682393a2d3ce615b SHA512 7c85dbf62a55a13b6faf3f3d0bb2f551439ec943dac32697b26935dc742e93bdb0414452616bad39f31f621e30070b1fb88901c3f5ff302e6625d4932cbbc7ad
+EBUILD urt-3.1b-r3.ebuild 2382 BLAKE2B fe5cfbefee4f10ffb4a23f0a1e2d768237cb9709fdc94dda0efdd199b8cce3503460cc240cc75a8c3f1d88fce97e56af237173b3c0d7056a4d0d78f790756bc1 SHA512 da5e6ff6fa96c2e2f4f5840df9c49ed0e87cecf1af78810b045f371cfc911a9ad2734c59e226e648edab621231d8ed724772646a978637507c5718d42f8f2624
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 1131ff8083d5..688cf52b1eee 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index a4e0f70071b9..ab73a6c25ac9 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1515 BLAKE2B 61708a664167fd986306e4186fc15b7255e1132da6aa53c0bbd4153c05b861d6068930445ab864a41f6a2035ac0d5180bffb34f346851b9b2eaf65ac8230e1cc SHA512 fa065b977b38fb17cdce37dea5b65bb38dc59bfc21b9e441372c67d42b93a4e4c9332bac91cd945b205613e70c0dfe04b74907af8874ecb95cc20c9293f2a6a2
+EBUILD vamp-plugin-sdk-2.7.1.ebuild 1511 BLAKE2B e26bc1b9ce527c5c6379b04eda826f5ea06a0e84b291754f7e55fc67456759dd1d80b56812da0f951e10bc3ce9f297313942b2bc2dafa1699c69eca830e696b5 SHA512 8170a4622e564a57234b2389ce57a7a6d11c5f2cec436ad59078e55d72454cacb6e19b75af3a86a2c642a8b7dc0adfbb12987ac23e4ca86296146ed3dad11d0b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
index 7b03ba466418..0791dd534036 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.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://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="media-libs/libsndfile"
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index 55c3eb055af4..26c8e42858f2 100644
--- a/media-libs/vo-aacenc/Manifest
+++ b/media-libs/vo-aacenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-aacenc-0.1.3.tar.gz 612463 BLAKE2B d75f497c9e0c8b0b962593787c1a13ce2bba095d1ac15c49b6b55235219b22f7c8116da12c2f1fb0bf1cb7e175d2f0ca212ae50333c0d9e0a4a5b77c71698b89 SHA512 c8f00dfa758270ba9cad35dd6e24905dc7cf33d7717454b7c2c56c40dbf54f682450aa010a410a0350d70119d2aaa2e5ba4471b5bbe05ccec1f9d20ab3e57853
-EBUILD vo-aacenc-0.1.3.ebuild 1152 BLAKE2B 2a26c91e6d567f1328b56b89cc5cfb96d0b306ce779eeec72a78dcbfa2a01c478d8d5b6cdac2fe518f723658afbbd1bb69bb4a691e3ad7828d44aadc431159af SHA512 cc3dddc10f5380ad088527a791413be246dcb227b91a8fbcb85f1a1cf69384283941824f35a941bee11140f7c4246cb2777e3849b746019e18a51886f3034908
+EBUILD vo-aacenc-0.1.3.ebuild 1148 BLAKE2B fa75bee9b20d90c52cd6ac7b0667c3cff6c5ea2fad26a6294d0cc83278314b87055e6ff1c80a79123250a61a9f8a01f741d736b02a24fe38ecaab8b13dc05c5e SHA512 b5263cff4478db22f02a70023ee0902594a4f2cb1a70112a7dd66fcd8a1f5b4fe41f25f7b66e445b6393380e279eccd6c13e186e47fb16c27f153620f081463a
 EBUILD vo-aacenc-9999.ebuild 1161 BLAKE2B 84778c0185a1e9149a2077a1cabd779791d9b9d314094752b89a02c24f7697f45453ae33ae65d4fcd0f144f49db7de53b096d708b07f9b493bca8fbafb7d0576 SHA512 afa103980e411ca602c59774f40c38753834336f72171a61dcf738fb1d00cf35275896f4fac4f22786064dc596c0b3aacb0405aa643eac4f671414415f88f6e8
 MISC metadata.xml 633 BLAKE2B 965a7d171a4ced000c73cee40fc2b2c752ff988668f8906bfaa2c7721d5b328290184fc8f0c1c24a21775a5b0cc066df9457e747159b4c3ec5907d6cce4b47fa SHA512 13dcd74fb4a9f1f003a8031cbf70620871bf2e3487cff75df3ec5b413e859d541f8a336b062d8cbed561e88dac51cc19a19329c3383fa7687e047236729871d4
diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
index 92e4d59fb2dc..20ed3fb06f70 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.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=5
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples static-libs cpu_flags_arm_neon"
 
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index d6cac36100de..056bcc9a79d6 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,6 +1,6 @@
 DIST vo-amrwbenc-0.1.2.tar.gz 598415 BLAKE2B b21a66010f17a6d9e55fc039e05f8ac8c35eebaada011447fbfb9710be8e82e8a10c21f16a5f0e91053c84211c85541556a9a324e928e1d1dada6c4b2b4ea70c SHA512 54be9c63d1b4c66e56dbf85cef2924c4cc564556186692182b44f199a5f72eba02c619b8cfa89f33b88add149fded81a42a392a9b96b6274ad0ad6c1f929a61b
 DIST vo-amrwbenc-0.1.3.tar.gz 608936 BLAKE2B 7283ef12c40e25d768d9d0be6cede6a514fc881cd67185700c0afe4e03c97c660d74f28fccbad436b4067ec07be574c10b73f00a162195697714ffe0c127b168 SHA512 5f132f798f00ec2c0619700ab1ce456897792b45631af4b538c866636af9c9de5600af5f79040c41c3dc69c17cf4be7032139a9518a46a4276431e091f3dd6a9
 EBUILD vo-amrwbenc-0.1.2-r1.ebuild 991 BLAKE2B 7c7430468a768527049bc8c3fcb2a1cd98e247d77b47421e907c8dfcfc1fcc895c9fa66555697848cb4c30ea33553890ee357cf6fc8375302ad8e50a95c65dcd SHA512 0790d8615adad6b0c9d37f2250ae0a3527bb98fe020e4832b7f643750a6c6dcac6aa225ef0163e8a4033ac9642c3f59133ba9662cd441411337ab33dbcec6e1d
-EBUILD vo-amrwbenc-0.1.3.ebuild 997 BLAKE2B 8f02cf140252250f7923d36fd2e52f64b3f485b653d572623cc460e461e884aa5ea8d33f62957a42fd6d48acebcfedb8f7d03bec1f2b484f5981de07f6050db8 SHA512 b64de3672b6b07a6725ae102c1a1842fbf297c913948cb53eddccb37556f4d9861765db8a63091076b9d779f3abe0178d12e96005165767b650d3e6843615ae3
+EBUILD vo-amrwbenc-0.1.3.ebuild 993 BLAKE2B 5a51dd122b095687fba94b1ef80a2c8e65737713d63cee5d81a1dc08023ac3c8c513d2870cdd9d3a746a85a08c44a4c84f451910036bd545e97a696923cf909c SHA512 cdcda9754f2a46e315ee3f86a0696c8e49ef3e40f476ac999f1be03e7d779be324e0da655889ca2b576a8c80c7cb287441c40cec92f0c5aad079742fff4272bf
 EBUILD vo-amrwbenc-9999.ebuild 1006 BLAKE2B 5d3c9d3c0b3eda1b7c4940d8623833c3ed5c213f3cecd3092664aa3e59a8ed9b87b9f04c5580390e16a59d9d9d3f09ec6ed9cad930b5ca72c840b42285f7d010 SHA512 b460a7d925760fdda6e41aa661ba83f9b251de10ec1496b60f77301c074e521544b8feeb548ee18529588cc9e79882fd0a4f02cfb4fc8b479d7f9ddb9cf1e854
 MISC metadata.xml 648 BLAKE2B e51d5f1ea7ae926d6e085eeebf7cf066dff76eba5e8ff611382093b25055f119f903eb7c8a91c28d04ecdb389a571072d8cfe6e2a456c243ec896c7bec877136 SHA512 db2c18bbf40481d5a3b2582ab07e0ace0538f629fabeff219f77a875a27ca6387884e5c3c8fc49916a11e53224b85f7fed28f4b8ec7921a0db15ee7cbd5ce951
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index 10694e977bb8..27f2a1bdd839 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.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=5
@@ -29,7 +29,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index 20bdeb5d218b..da98b148835c 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,3 +1,4 @@
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
+EBUILD volpack-1.0_p7-r1.ebuild 672 BLAKE2B be312bc5320ba58e0b10c27be211fcca474937233c12d0b0b6b64750e2b551ee9c0097974f490e32cbfd5635b83daf21703a46a1868fc6bfbfb77694ebbab05d SHA512 b83e161838144a016d45647859411a95fa668a9f76c5693166575e4ccab54b86c6460514935f59015a1f11910b369b1c072a575c388d32c4bc8019601fb7bb63
 EBUILD volpack-1.0_p7.ebuild 674 BLAKE2B b6ffa0087b0794f0baef431084a18ba6b09dbf1b733c2a38ade0838c228ea7de1f583bf3e4890c059043e5f2936bf360710d5f022a1ef7a3bd0d67848f74fed5 SHA512 29b0c08af2e942490f7a5fbd027a5725f0d33f67c9d131695e807267145bdd5c0ae6b68ac215ac40c75ee1f32b119dd969638cae659b4169b655ea8ac5aad8c6
 MISC metadata.xml 602 BLAKE2B 0c84144abaedf91f7ea53cf6e14c7b4e3c0b1b2cd49f641e4d1f816ec3443961ba2d0a5bd075694dc05e17aa3028a3a9eca82d04702963b84ea38bad397547dc SHA512 847fa128baf525bd7027a8f9c0ea6bc2d7210d488097759e74a51eb3d59dfa10fda597c6555b2d4cf8dc9edeec3d96ed249888d082ad4454a03d8966194488c7
diff --git a/media-libs/volpack/volpack-1.0_p7-r1.ebuild b/media-libs/volpack/volpack-1.0_p7-r1.ebuild
new file mode 100644
index 000000000000..f09d6eb8b10f
--- /dev/null
+++ b/media-libs/volpack/volpack-1.0_p7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYP=${PN}-${PV/_p/c}
+
+DESCRIPTION="Volume rendering library"
+HOMEPAGE="http://amide.sourceforge.net/packages.html"
+SRC_URI="mirror://sourceforge/amide/${MYP}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples static-libs"
+
+DEPEND="sys-devel/m4"
+
+S="${WORKDIR}/${MYP}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.html
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 99d2f3b0dcf8..c2989dfab337 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
 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 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
+EBUILD x264-0.0.20190214.ebuild 1823 BLAKE2B 3e58918e3f9b502f68d1b3281633c8bfbc3af6e19428e8c0efb4897ea0e9780e5cd35d26d577a8e28c1de2fe9d8a340af7ef2612707cce47980a606e83d776fd SHA512 dd82cff3e9d181ea670619abfa2d098fba67faab4530d455f70510e1595f4419e63029268a2c9bb696b06a7486e3857b066216240be1808a4290a474764ae8b0
 EBUILD x264-9999.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
index ee5e6ace2cd2..0fb247b70fd0 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/x265/Manifest b/media-libs/x265/Manifest
index dac678a20f57..678b5636404f 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -8,6 +8,6 @@ DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805
 DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
 EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
 EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
-EBUILD x265-3.0.ebuild 5658 BLAKE2B 5941d01d538a5ecc27a0af89225498d2bd681bdf15214d20449c45237ced95f20682e0ce67695ad8b44cf488cc8defe659c87534ccd25a97aba4e451bcc06926 SHA512 406cfbcb29660f1c6a3ca5d3b6bccbad68c7aff314d83c76da4db9c43cec063aaef71067c59328de42009ed299350b393287c045fdc4de49c578907587766216
+EBUILD x265-3.0.ebuild 5657 BLAKE2B eb173bf8779ed016deb3f86abdcf9c9aaa1b82e36676f82f730928f66dc0861ad6e2ada815b9269643ce8f3384429271ebe08bac82720b1cb06304de891c4fa6 SHA512 939fb4ec038b6ce4c226a0ca3e58650a9891d9b1a06f15b5276c649773454d1265c115816b3a98ab894a17363b107407e8fda71004e3f4f408e7a69062292c61
 EBUILD x265-9999.ebuild 5658 BLAKE2B 26c662197bb67c56d854ea2e3bfcbc7b81e7ae2a652acda77fac5bdbf3d4be0018812a508578ae3850dbfea28a67b2d10d18bb363dd00216c51973dcb93d8180 SHA512 37a9fa69fc45f6d6efa60e423d3f60b065c2b4c7f9ccc288e28903d38c829f88cfa6525de85f5c8063e62dbb70d6316247543ffe2613fb625ae86d57527a0f6c
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-3.0.ebuild b/media-libs/x265/x265-3.0.ebuild
index 8fff39d6afbc..d2632fb2a57a 100644
--- a/media-libs/x265/x265-3.0.ebuild
+++ b/media-libs/x265/x265-3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 2c8ef2e3025b..793244bee55f 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,3 +1,3 @@
 DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
-EBUILD xvid-1.3.5.ebuild 1702 BLAKE2B 0268da5bfbe707c4e4ddb5fd5db34c4df509f14311ae74af8692059b6e309829b6783253c78cab025fbc91e6d13f98c20df72b549d643e3fc1ab7a21345d6687 SHA512 9a45ad50e4404b112a98d0e1b82175875c257907257a92c3f631ddcc560f8b373e8da4936b84bd15b33dd5c047d6202280e85cd7414e0b249922ab56997f62ba
+EBUILD xvid-1.3.5.ebuild 1701 BLAKE2B 3cb300ef1d86c673eb4740a0223e2863b0a9f8b9ee82b82fda445944ceccf2fb30010fe3df092179e6f0354e8b35841a539f36602d2192ad1d5ab216baf0632f SHA512 c3d7c16bcfd040bc557d57baed7ebb91c6597c351a11b6ba512ce4f4bd99e8c74818c1a702c5d1003bf4f06c5d092f24199ac29e37a9b9d384211649ce86f2dc
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index be6e9ef00a34..9128d5c7c578 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.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=6
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~sparc-solaris ~x86-solaris"
+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 ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 2eb0d9a2e553..35e9331f2309 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -3,6 +3,6 @@ DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a6
 DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
 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 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
+EBUILD zimg-2.7.5.ebuild 840 BLAKE2B b93cd1f286df62b9b2317885c6bf4e955a9dc2908b50c537b2d85f5577e768b89a651e132a17ebfb3f7239ad7f0a27bd3668ac9fafe509acef5b2f3b4a9ee09c SHA512 664ea3abfe846d25ca6ba974aa78fc3418c98018aacadc044c11483309dd1abdaeb81c64ba99abee0a382091a1cacb4a21a7ce333ffadab1106324825dab7b51
 EBUILD zimg-9999.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index 1d720a336c91..93b521bee179 100644
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
@@ -19,7 +19,7 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /media-libs
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)