gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-libs
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
156 files changed, 494 insertions, 2808 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8c470f652b7e..3249ff417aad 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 338e3ceda137..f5ad8c5283f3 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -1,3 +1,3 @@
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
-EBUILD aribb24-1.0.3.ebuild 595 BLAKE2B 168221593940647c57e4ee6737a222cf9cac13abfdb629915b312aee45df1b6260cb272f2b2df8f872a528fdd73f96b65bd051a7c3f25497fbcf7a24a567372e SHA512 edef8ed0453e595c9e71a78540144e715447f9d7b4f348d480572ec453a6bc6ee684a67413ad5ebb1065103aed70b189ed58e8120b284fcf5119c3d2ce8a950f
+EBUILD aribb24-1.0.3.ebuild 607 BLAKE2B 7c9c5cbf883c2819a21b06077e4e442b8e4d12d3a6fe14036df7da1b9a72a30d489a58b069e1230a5d92c02ee0340f3b6d0eab6d5559fc2e81cd381aedb7a48c SHA512 75e6786574f624e880d9f061d2a2f86fa3be2ec703cc5e6dec4bbdac1851894326c0bf76e0f0ba9dd96d82768d8d722701f13f4ab4448b6e9c2b7b7e7afd6082
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
index 6cfd472494c9..9b5325fa0aa2 100644
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index fb38b6b8186e..abd648a1af3f 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -16,22 +16,22 @@ DIST babl-0.1.50.tar.bz2 661756 BLAKE2B 634e5bdaf4e32fe78ed913051d7bd226de9417d7
 DIST babl-0.1.52.tar.bz2 665120 BLAKE2B 5584ba82b69151a7eb7d1157b3619dbd88db6ee50126178568db92c63c82913b3f118cb6cc8c87a8fc5d620f4fe5386a1da0c2c5289b23550b16ffe8e0b469e1 SHA512 39fddb2393e4533665c444ab77105966f86c2938a3b48ca7683ccaecefe0c1b8b08374f0028360ccd05b0d03848dfadba54c7bd9d73ef40549c4e0501e61785f
 DIST babl-0.1.54.tar.bz2 668959 BLAKE2B d12f7c7e3d3d2724d7ab797d4c4cff0ed8fa788edb376f0f25b82fbeb81fb17f68309f3aa5cbe53eecf60e4b18c1c6a26bd80790b152946066eadda34336075b SHA512 91406c4e6f3fc6167ae68760c14e391707177f6e5afde49e09fa90cb70d25cf69e71d1de9cd8e96a6944aa49a44f28deffa86821d93de79cfa3faa95ec5b174e
 DIST babl-0.1.56.tar.bz2 673080 BLAKE2B a172819342e6982249734d2e5a0014bc9feaf882788c50c72494adac7160e9cca4b8d45411c110217b8bd8642fe46689295801f1207e54de1219be5e13a475b0 SHA512 e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
-EBUILD babl-0.1.12.ebuild 1351 BLAKE2B 50c27ce6d7f983526f21965df0369955ce9b74420e5fd6d385a7e38691b155ef8c1cd85ba506f08a915dcee5b8a51a8f9f3972f40c8317c953a041ea83e0d6e0 SHA512 21b44b31d33adcde1d60ac5be573f70760904a0448a4f98a6c22d761092c43a8cbf2640f96b9833206051f1b70a6f68dbc55c48262f6c128e18dd66aff5a4fcd
-EBUILD babl-0.1.18.ebuild 1481 BLAKE2B 336ba03f35575689d0c37f85751afae557ef47679f1bde9795de9ed118520617802ec095af1ca083b94bcdb54d8dbc14c421e27b72a281199d4626b4c164f8b0 SHA512 7adb5a95a5ff64e35d0ad621c5d2cfed855a368084f4ae8e13aa54bbd6e44dc65ec79cc97a5c76083f0f8cff1f4e700f4db60718c42e30d19435f706d018878f
-EBUILD babl-0.1.20.ebuild 1489 BLAKE2B 7fb52aa0a625f450b12ee0977f0b7ab42e8a37bfe09bd008336f427acda6e98e9ead3520ce1312c91fa2686094f0b22508d2bfcf87c779253ff25e7bd2952fb7 SHA512 84a33e59a71f7a1d04d3a41b0567dc319e42c41d4258f8c506c6750aa1c6d633b99bf2d6e1a97561cb050871b9782d7b6f44dc968b3ff66852bc87e823666f8d
-EBUILD babl-0.1.22.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.24.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.26.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.30.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.38.ebuild 1478 BLAKE2B 696a8b34e6dc6f387595fd7cef247b9d596ed68352900b05f72b1611d8192119d4cecdcd094fa0d3a7b84a16ae0c78a40e0f1ca04d0f270849cd5c90fe284fae SHA512 9cd433b7ce3007dfeb6f36d9a8d17dfca2aed2e838ef91c2b98c4b593ed712c4d1a62d1d94593116ad21a6082569aeddc88aa7ec2e6797fa9d06b0c5f03d9477
-EBUILD babl-0.1.40.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.42.ebuild 1485 BLAKE2B 31de9620050981c9da6f2640124ca99f41a6766e08242b2a7d8e3bb9d5efa4393acf09244d2ee3af56644316a6a1dec13d2f03f1c0bfaa8841bb7427830fe501 SHA512 469c38a9012bae80d760bd8153d479406298990cb81be2eb176dbf487fe525a0fd94596dfcf179e3a15777e984b2ba0f9d1723326f5949304a786061415b0f79
-EBUILD babl-0.1.44.ebuild 1492 BLAKE2B aea0bd1da6b8b6507fe0f58d6e01882f142e22575346668c23d99f1e9e98568d1b2e31bd9eff0bfc6adeaa3fa737426a1ad90a69cfdec5a02a33d52f872e5110 SHA512 d39246f6858ef4baeae8c2e2ab62e8feac267b377fe15f677fcafe186343b0ff50fb3dade8d75b99238a4e82132b3a9c289f6933349e82acabee4d08692c4b48
-EBUILD babl-0.1.46.ebuild 1492 BLAKE2B aea0bd1da6b8b6507fe0f58d6e01882f142e22575346668c23d99f1e9e98568d1b2e31bd9eff0bfc6adeaa3fa737426a1ad90a69cfdec5a02a33d52f872e5110 SHA512 d39246f6858ef4baeae8c2e2ab62e8feac267b377fe15f677fcafe186343b0ff50fb3dade8d75b99238a4e82132b3a9c289f6933349e82acabee4d08692c4b48
-EBUILD babl-0.1.48.ebuild 1604 BLAKE2B cccb04c12fd60f27b69cd3a306295afd3751908cd0d93c280ee03104f5f299e2a7ac51ae198a2e9088fdc417a5fa6931a7ae319b691e41bb7783d8813da45921 SHA512 1545df1dea36e3ed17f27fdefc2083b8e6db4ff3259d6c4945f12d4403fada29272f9ee55a03d4de9e0ca4967c741d2c29a800001e0a8001b3825e7226527507
-EBUILD babl-0.1.50.ebuild 1612 BLAKE2B 6c66941c2843a165f0cdc1a0dcacd50e20a38858c948631f69d4866551a053c32f1095fa01e31c76126649be843f67081fc06233a4262f95dddf90ce1ffee2cf SHA512 69eb2cf595fd966fd43dcae7ccf42b9376d6c094864287fffed222aa8c30ec22ae5d1a1497901edb27108611be9dba3aae673f103de2421268c9d15295169ba4
-EBUILD babl-0.1.52.ebuild 1548 BLAKE2B 26c469081738a92d82a6e61628126e321c6c1914adec38db0cae108286133f94015bd7ab1391a87647ca9288a6f37c2a39587efb4876a2c6f69d68e5e5004f87 SHA512 e08d19be9be8dec0a1844be35ca7a49c7c938184c56651ee26f770d2eed6537bf90fdc555202d9687b5b88def3d81439f8d19bf651ed3365d5aeb744a6ee42ed
-EBUILD babl-0.1.54.ebuild 1548 BLAKE2B 26c469081738a92d82a6e61628126e321c6c1914adec38db0cae108286133f94015bd7ab1391a87647ca9288a6f37c2a39587efb4876a2c6f69d68e5e5004f87 SHA512 e08d19be9be8dec0a1844be35ca7a49c7c938184c56651ee26f770d2eed6537bf90fdc555202d9687b5b88def3d81439f8d19bf651ed3365d5aeb744a6ee42ed
-EBUILD babl-0.1.56.ebuild 1548 BLAKE2B 26c469081738a92d82a6e61628126e321c6c1914adec38db0cae108286133f94015bd7ab1391a87647ca9288a6f37c2a39587efb4876a2c6f69d68e5e5004f87 SHA512 e08d19be9be8dec0a1844be35ca7a49c7c938184c56651ee26f770d2eed6537bf90fdc555202d9687b5b88def3d81439f8d19bf651ed3365d5aeb744a6ee42ed
-EBUILD babl-9999.ebuild 1618 BLAKE2B 04677685f70289b48c6337c8955e7144985aafce7047c1dd221fca34c4d912b8e11eb4d72c74ee24b0adf6549624f1dc85a82752ab9bc2537cb82b9fe84ae162 SHA512 ab935365162c42a90b244d1f325c81d101b5193b8be813dc926643c46e77545b3f90be4d9207ff4d2ede0d260d85243bfa49ae44882b9333f68244c0231dbf50
+EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
+EBUILD babl-0.1.18.ebuild 1470 BLAKE2B 5e45d86ec4e9c274c66ce2bf2829a286a08c81048c36d74e96bb5c7eb4442991a75a224747b1e4e509ff08f758a0794c95d7e8968351f190076d865c49b62828 SHA512 b07a5b88eaae36f039b3f11f729b01464075bbe383c037609784b7644799adc9f1a9a3e156c1207856b2d78f4c85d7a0e39cccb26597c6f238a2712416645634
+EBUILD babl-0.1.20.ebuild 1478 BLAKE2B a7418793abc63bcd9d90d53c75e3974ceab1f02b4341546dc2cf31db369d6205bc2fcc578eab6f8a53dd3c3a923a06c81c70c736a1c778ac3b7fab3ad5e490bb SHA512 b58de665af47c0b353b0eadf02d3d593e3d7641ab1b5a3ce188b16ba871cf5c92c6289d2ff6cc2ae6cdc8d3529efd3431b8ba79ec27eddfc2dd8a218c7515440
+EBUILD babl-0.1.22.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.24.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.26.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.30.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.38.ebuild 1467 BLAKE2B 9c73dc74703e41ee62272ab89ad3ec9a23e08c9cfea16be488f064378a8c1e8f7ba02d9d016e88896c30cd195ff1530ee37e142a4a979967ed413a6e904310a5 SHA512 c0498490222b2fcd2e64fe02a0a89d8b65419035d55fbab6d711246cd1b920e1271944fc556a8ee71300746f0bfc64bfe3d2bdda480b54e4bb71a5c2d88d8707
+EBUILD babl-0.1.40.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.42.ebuild 1474 BLAKE2B b6db2477993a215dc553338deedbf49c5cf33a3f82381cc8e9fa93aee822c7551538650db9900f795862437f3c0acac863a443cd2ccf048dc9eac662b58255a3 SHA512 46fb90f891902084e49043bf6f5322b7300eeee4ad4981a3bb9680b978d21baba215b924b537ef7193645f3f7b23a530fd8fc87ad78a3fda3f16330ff6a0c760
+EBUILD babl-0.1.44.ebuild 1481 BLAKE2B a7a0126013734c58089076cb556b746450f15a81fca2a0deec96d62c3099bebeb80aa18c97583db3b45182a3c81e65978656a88b9aa7409b78a3bc8311c40752 SHA512 e39da881197a5b033cdf4a0e8d05ae7339f95ea92aad93d3a31022d46341b34520a6e837a3386a0090e876b5d5148604d34635ccf189147bf8e4e85ef90a7a27
+EBUILD babl-0.1.46.ebuild 1481 BLAKE2B a7a0126013734c58089076cb556b746450f15a81fca2a0deec96d62c3099bebeb80aa18c97583db3b45182a3c81e65978656a88b9aa7409b78a3bc8311c40752 SHA512 e39da881197a5b033cdf4a0e8d05ae7339f95ea92aad93d3a31022d46341b34520a6e837a3386a0090e876b5d5148604d34635ccf189147bf8e4e85ef90a7a27
+EBUILD babl-0.1.48.ebuild 1593 BLAKE2B e851fb93b83a2ec6a89c289b6c4d2f1497ba0fdc2a649609abca57cbd960d3e9041cf272f39ff258b50661aad6e638fe0fcc74770d11107865013a19f509f324 SHA512 0d62f5ff7b41dea54e7b94118b6cde15c099f694077de43dd01add410732a7261aa1afd29ac3400be31147cdd9e92bb3e3c2493eb0898141bf6246b5695f971a
+EBUILD babl-0.1.50.ebuild 1601 BLAKE2B 6a15120ac6cab9f573c7d15205651bb9c769f1748551599b30b68f8e971bbd1998ff02c13374fd7b710f413fdd02edfd91e718500a95ea9514a0f0579a52e25c SHA512 02a32ee9250bb2da5455cd69fe72a7acf66e8f4ca8b5e817e4d8c34891d834d6711b0ead3339f42a8853d0c0685f5656408482e05d6d41bac4342d28b34205de
+EBUILD babl-0.1.52.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
+EBUILD babl-0.1.54.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
+EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
+EBUILD babl-9999.ebuild 1543 BLAKE2B 0a8626bd9b4ce836b0d8787d05000ed037d71d8923617d444f66fd88a63b7fd8ff7d9ad256ab4197793bc68e7fd66df60d6c420e246dc940bf7ab3ca5fa9317c SHA512 ba4adc9f84430a58edc165f8bfae1685324d709dc801bffbe2c321cdeff6f2d889e5af915409adc7ee242d82dc68f2b2518afb64d967a271fbf18d27917c020f
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild
index de56674d1d37..e37de3fd818c 100644
--- a/media-libs/babl/babl-0.1.12.ebuild
+++ b/media-libs/babl/babl-0.1.12.ebuild
@@ -11,7 +11,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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm 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/babl/babl-0.1.18.ebuild b/media-libs/babl/babl-0.1.18.ebuild
index fe2607b4b63e..c4a928b72087 100644
--- a/media-libs/babl/babl-0.1.18.ebuild
+++ b/media-libs/babl/babl-0.1.18.ebuild
@@ -11,7 +11,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 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm 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/babl/babl-0.1.20.ebuild b/media-libs/babl/babl-0.1.20.ebuild
index 0c2ada87e649..78e8a69d14d0 100644
--- a/media-libs/babl/babl-0.1.20.ebuild
+++ b/media-libs/babl/babl-0.1.20.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.22.ebuild b/media-libs/babl/babl-0.1.22.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.22.ebuild
+++ b/media-libs/babl/babl-0.1.22.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.24.ebuild b/media-libs/babl/babl-0.1.24.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.24.ebuild
+++ b/media-libs/babl/babl-0.1.24.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.26.ebuild b/media-libs/babl/babl-0.1.26.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.26.ebuild
+++ b/media-libs/babl/babl-0.1.26.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.30.ebuild b/media-libs/babl/babl-0.1.30.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.30.ebuild
+++ b/media-libs/babl/babl-0.1.30.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index af1fdd5866ea..6b93a845b521 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,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 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm 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/babl/babl-0.1.40.ebuild b/media-libs/babl/babl-0.1.40.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.40.ebuild
+++ b/media-libs/babl/babl-0.1.40.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.42.ebuild b/media-libs/babl/babl-0.1.42.ebuild
index 9801080589e3..1dd188cced9a 100644
--- a/media-libs/babl/babl-0.1.42.ebuild
+++ b/media-libs/babl/babl-0.1.42.ebuild
@@ -11,7 +11,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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/babl/babl-0.1.44.ebuild b/media-libs/babl/babl-0.1.44.ebuild
index b80f164a993e..0d5b275163e9 100644
--- a/media-libs/babl/babl-0.1.44.ebuild
+++ b/media-libs/babl/babl-0.1.44.ebuild
@@ -11,7 +11,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 ~arm-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/babl/babl-0.1.46.ebuild b/media-libs/babl/babl-0.1.46.ebuild
index b80f164a993e..0d5b275163e9 100644
--- a/media-libs/babl/babl-0.1.46.ebuild
+++ b/media-libs/babl/babl-0.1.46.ebuild
@@ -11,7 +11,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 ~arm-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/babl/babl-0.1.48.ebuild b/media-libs/babl/babl-0.1.48.ebuild
index 34fc1cb37eee..ad527e14582c 100644
--- a/media-libs/babl/babl-0.1.48.ebuild
+++ b/media-libs/babl/babl-0.1.48.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit autotools
 	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 ~arm-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/babl/babl-0.1.50.ebuild b/media-libs/babl/babl-0.1.50.ebuild
index f6168813bb2f..c686e40c7eda 100644
--- a/media-libs/babl/babl-0.1.50.ebuild
+++ b/media-libs/babl/babl-0.1.50.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit autotools
 	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 ~arm-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/babl/babl-0.1.52.ebuild b/media-libs/babl/babl-0.1.52.ebuild
index 2e92ba4389f6..3fb4930af3dc 100644
--- a/media-libs/babl/babl-0.1.52.ebuild
+++ b/media-libs/babl/babl-0.1.52.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit autotools
 	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 ~arm-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/babl/babl-0.1.54.ebuild b/media-libs/babl/babl-0.1.54.ebuild
index 2e92ba4389f6..3fb4930af3dc 100644
--- a/media-libs/babl/babl-0.1.54.ebuild
+++ b/media-libs/babl/babl-0.1.54.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit autotools
 	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 ~arm-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/babl/babl-0.1.56.ebuild b/media-libs/babl/babl-0.1.56.ebuild
index 2e92ba4389f6..3fb4930af3dc 100644
--- a/media-libs/babl/babl-0.1.56.ebuild
+++ b/media-libs/babl/babl-0.1.56.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit autotools
 	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 ~arm-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/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index e065dee6a581..20dfb53dae7a 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -11,7 +11,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 ~arm-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"
@@ -27,10 +27,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.48-configure-cflags.patch
-)
-
 src_prepare() {
 	default
 	[[ ${PV} == *9999* ]] && eautoreconf
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 29f45636d054..65856e83c3ff 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 1462 BLAKE2B 95664cfa90ba5ed4cc0edb9a29491eccef1a55a1e4f78b10bce55ef3abbef3d073240900f6270ff8fcf9d1413c9e187ffa2da8afdaaf15e84eb15bd00cdbc436 SHA512 c4760988e86265a575ec825a443820619e6b51a163564f27eb8abd1d90fcdd793d40f59ca171b73c26045350a076e7e3ee1ef187155c3862d1ea3704a89dd11d
+EBUILD chromaprint-1.4.3.ebuild 1461 BLAKE2B a98aca3e4dfd1970f6046ca60a67a0ee3ade96cb9a036f4965e5406dc7474ddb614f8742d7e79a9b6d7906a0f516cae9412f18123aac1c12dfdef270426d622b SHA512 f61f93c6211658095672a8651f9e1abe7b93d8c65c8e55f64a159d9889b93d88defcb743227c39338d8681c233f586e9963ab171e94d665df7c41457e56d389c
 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 2d24d62657ed..47c4df6743e0 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -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/elementary/Manifest b/media-libs/elementary/Manifest
deleted file mode 100644
index fa19f775406b..000000000000
--- a/media-libs/elementary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST elementary-1.17.0.tar.xz 18491592 BLAKE2B 3b2acddec0825ee1be29cc3fdb06b478beafb03aa064137ec39d12dc4021fd61ead72aacd79bf7f7e3d82d171ce981d850c353d330a72498845aa18cf11a96d8 SHA512 60862e164770a93c0b864f35b5880f8d28f9fec520b7b440935143a14ffc9cd2dacbb650463c2abb7ce364c631509e1ddefce6eb49def1b016a752416d619065
-EBUILD elementary-1.17.0.ebuild 1474 BLAKE2B 01e5a5465870dc8feafde65eb86b96dcfb68d94887dbfabda2cdb1cb584f17e986ebc211acec413665af383f9c429d77338687206b55656dbf0628148cda3828 SHA512 f810d4aa5cfb2f06537428d304894a293480d04db2dd3bd9623b464b3b3bd2435f1f89eca11ac788eee42532a7cb931037ae04bfe5de51adab44563373e87be0
-MISC metadata.xml 876 BLAKE2B a9440a042503d015814658044343e1c628b32f6166fbb2b36ffa134e8503e6ce3d4a8e4507bddb367f576676a0e852987a9b82fa61c5b731fd1de0f8f68f8061 SHA512 4200a005ffd727307fff456584c7e3b3c5181693b4399dc4a40fce93b0745580f1755ba9c0afa5ed90e00bdf8fc06714d1d20f217257c8a5c571526a623d0a24
diff --git a/media-libs/elementary/elementary-1.17.0.ebuild b/media-libs/elementary/elementary-1.17.0.ebuild
deleted file mode 100644
index 36368b92ffaa..000000000000
--- a/media-libs/elementary/elementary-1.17.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
-HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug examples fbcon javascript quicklaunch sdl wayland X static-libs"
-
-DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]
-	javascript? ( net-libs/nodejs )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	E_ECONF=(
-		$(use_enable debug)
-		$(use_enable doc)
-		--disable-ecore-cocoa
-		--disable-ecore-psl1ght
-		--disable-ecore-win32
-		--disable-elocation
-		--disable-emap
-		--disable-eweather
-		# broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'.  Stop
-		#$(use_enable examples build-examples)
-		$(use_enable examples install-examples)
-		$(use_enable fbcon ecore-fb)
-		$(use_enable javascript js-bindings)
-		$(use_enable sdl ecore-sdl)
-		$(use_enable wayland ecore-wl2)
-		$(use_enable X ecore-x)
-		$(use_enable quicklaunch quick-launch)
-	)
-
-	enlightenment_src_configure
-}
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
deleted file mode 100644
index 22cc8cf372a3..000000000000
--- a/media-libs/elementary/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="quicklaunch">Enable quick-launch support</flag>
-</use>
-<longdescription>
-Elementary is a widget set. It is a new-style of widget set much more
-canvas object based than anything else. Why not ETK? Why not EWL? Well
-they both tend to veer away from the core of Evas, Ecore and Edje a
-lot to build their own worlds. Also I wanted something focused on
-embedded devices - specifically small touchscreens. Unlike GTK+ and
-Qt, 75% of the 'widget set' is already embodied in a common core -
-Ecore, Edje, Evas etc. So this fine-grained library splitting means
-all of this is shared, just a new widget 'personality' is on top. And
-that is... Elementary, my dear watson. Elementary.
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 380a85826b11..92e5a01967e7 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,6 +5,6 @@ AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d
 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
-EBUILD fontconfig-2.12.6.ebuild 4925 BLAKE2B 3f5cb18e7af4f0b20020b52d6804b8410fee703164ba3f62dad2993dad51b17f3572af57e3b9229f0e420235481c0c018247dd5e19bad289ddebd8cd3490f5b6 SHA512 9fff043fb6ea1445198868f96dee0d626c1cda0948893cccd05e8ea002282e3a1bdf8e05d59ac96c047a203a6ad00e17d365396188da3557d8b583c26a4bf011
-EBUILD fontconfig-2.13.0-r4.ebuild 5201 BLAKE2B 066d56a8684f2ba3fc3b1c41360a1cc75161116966eddfa078fa17ed84ca86d6e83491610f53736914fb96597bab7576629395cbce5136877b38c6f7afe89392 SHA512 fcf61644a570f56fa8173c4886f187ff8084e8cb199c7c206a31adf4535a845dcfd36531bd480564292ef910c4d4c01f3dd5601d7d108f06723cb89499eb60b7
+EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
+EBUILD fontconfig-2.13.0-r4.ebuild 5189 BLAKE2B ded56e27ec13f2787cb754c1b9b14a4ea24a0c58b421f2e5b2ee4a3498c71772d5e06f69cd7638abbb3892f5371fb4c63bd03176ea12825e6df06bbd014f9abd SHA512 bd7765995444affbb9abf894cd9758f187627c13bc24d3ed04625947450df7872c189b5199b88aafb6c89b6fdfc72d3f095de4a8b88a2b963a5febd8f68cead9
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index c65b40a2d38f..b053ccb18d9e 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 2127a830b0f3..8b205d41f809 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 03e0636a4b90..eb4c075cff50 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,9 +9,9 @@ DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42
 DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
-EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r3.ebuild 6701 BLAKE2B efd3b7e3403546b09d0537ad1efafc04f71004cc6b92ca48276300564126a36b7476361a6187f4e974116c5c13fa9421951e0c7698719d14c149db7c475b5b7f SHA512 d4c075be3fc62555704ed71fd4dbec227e947e4e0619a3bd9427bff054d05a8bb8b366676ace61727809c5130d500b908a1c4cdab3f76c31272aec6dd3d7f951
-EBUILD freetype-2.9.1-r4.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2
-EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
-EBUILD freetype-9999.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2
+EBUILD freetype-2.8.ebuild 5265 BLAKE2B 58901e3273cb5ac4554d8f647ed0c2843dad9b5d381be119c81c7d1b598d0b9b072f23eb8b3a247a87a8869b9ce35da1293221196c8dbfafab3e9952d09e5d90 SHA512 433e0d946c95f589b5242a4ebefe97102bf3f314fcbd3cd18f425cd0977159b23032d4fdb4f3ee701253f00b5dc3e9f49f7cda8d1f2780319ad34e0c9af82872
+EBUILD freetype-2.9.1-r3.ebuild 6690 BLAKE2B bf817875d28b6361d8916bf998e7e05e26301a858319a49b1c6c1f1bc2de723c138d897d6819d13377893cabcb0d3a0731ed305937cb655f6e0da49566f705cf SHA512 3583bc9bca21c740741b4a6e7d7d28402505f655482c0e0c8b14d55410a8f80f3f2781dfc1d0a95567c9d4f40a70846bfe58e994a3fcb44250385bb8124252a9
+EBUILD freetype-2.9.1-r4.ebuild 6702 BLAKE2B af94a4761e7915ac7fe330cfb8af45f9b162943675436af49ef22791b5da6519c344dc29784b5a0dde548de845b04c55328d21410ce05488f6a02d8133fa5983 SHA512 b4168030a91cd30cb9490268c28123b15e803847e35bb1abf7a728e7b90c02e800d6b2a2c176d31383700dc6dd829cc517eafe74cd6d5c4f53d008bf73c58709
+EBUILD freetype-2.9.ebuild 5277 BLAKE2B f2dfd4b1cffef00edd7a4302a6b37393e6a5fe7c1fffb3e31095876185215717e85242646519e6a39a7083d4e282f6b463032bd496bc205fc791acad9a2b5c03 SHA512 40df829bbc0bee4d3bfbe5c3cc33e04c59809fc83cd45b67bb0d263c36977998c65725e4df1f02b1e32bdc6850d429c72a38dbfdf68b3dfa97917d25f64835d2
+EBUILD freetype-9999.ebuild 6702 BLAKE2B af94a4761e7915ac7fe330cfb8af45f9b162943675436af49ef22791b5da6519c344dc29784b5a0dde548de845b04c55328d21410ce05488f6a02d8133fa5983 SHA512 b4168030a91cd30cb9490268c28123b15e803847e35bb1abf7a728e7b90c02e800d6b2a2c176d31383700dc6dd829cc517eafe74cd6d5c4f53d008bf73c58709
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index 4dfd2a7b4962..03bde330d911 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index c42122f3a8bd..e74ac0244134 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 87b22162625b..62dcbc706372 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index 4d9867d2f4f4..73c3a3236b1a 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 87b22162625b..62dcbc706372 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index b34883bd97f5..117d5443af54 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,5 +1,5 @@
 DIST game-music-emu-0.6.1.tar.bz2 171140 BLAKE2B d42a34fa531cf5da8ddd5b1d72cf7735c9edaad67bf47733d75dd74c201652d4031bdc3d634a5f64317957791db0446e96e788c4c07cbdb1c908bfffd094fee0 SHA512 06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
 EBUILD game-music-emu-0.6.1.ebuild 490 BLAKE2B ca4d490aaeb4e4a55a45fc7f42d4dc84b761c15c0b14604edfa9d428d2312a24f070fe8bfbdc569935afd77a9f38e237ce4d04a1c0aa47d5acc87e355e80aeb5 SHA512 2a5134fc33a4c54aec96b33b8dc6e695eca618b9fdc853a54aa6c792ec40c511c1578a21704f4c8a5ffaaec2a3f4ba5ef06a31ac39f74298330ea2f9617bd721
-EBUILD game-music-emu-0.6.2.ebuild 496 BLAKE2B ae0b4de6994c18a50d0e08c5fad8694f5cb068bf3a59912012ba78e6b93c3457a3d6f4b0befb06aa4b1be7154262927c6fb3fe00449488b39cbd2167a9a3953e SHA512 930a00eab07d0cdae0c194d79075dc2fa852400e70366081240fca140320692e04b696b38238af468ca453cf7b05d2a70e4d3d9794d3f6c4c62c6a0f7374be7f
+EBUILD game-music-emu-0.6.2.ebuild 492 BLAKE2B ad6bd122e469883036e8d49e2efa19431e188f4424b2e2a05bf7d3babe4725621a956bf3d0337650ba352337e3e859610e2e2292e7008766f108f9efd19c18fa SHA512 55cc63be4c6a6bc3e7b7aceb0ef7110a7f6474696d26d31c72b27c78b4c3090daffecfeeee26cd8fe2206dc137f5156525ec450ffc70329029543b2c4370eb6f
 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 f2a08154d906..aecd59343d2c 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
@@ -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/gegl/Manifest b/media-libs/gegl/Manifest
index 20a24b369b1c..5a1a8ca5c8fe 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -18,15 +18,15 @@ DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350d
 DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
 DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
 DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
-EBUILD gegl-0.2.0-r2.ebuild 4788 BLAKE2B 25850756b366f53d563d098b21036d84f7790dc0dbc1e0640f10b590d1d43be11f2b05d0cf1301e87da2522cc49dfbca09d4cc8854e02494a796f5ca60e1538b SHA512 022f22d1ed529d6061b179b4edb89cd022be4de213a2f0048fb89b760fdbe5fe2ba0b3682874577556ec92869a28683431967b73f3b6fa5369ee423e078067b7
-EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
-EBUILD gegl-0.3.0-r1.ebuild 5394 BLAKE2B 4f7d77b15440396b218ada47c88f54348aceb65daf2e7649ef2f8fc449a01146b655dbcb891d7c3f7a269ec7520452e70308dc9c205564cfbcc780bfcd254664 SHA512 a37ce2698c715dc2dce86043ee151d2dd343abe9626be5d6bde61ad439b21587e4b7d56dc7b2b4a3f287b3252811139a2486165c1e3bd1ee1013f8d512d1b4d4
-EBUILD gegl-0.3.0.ebuild 5313 BLAKE2B a54db70116335ba608d0d92ae426db6f26a813def16212e67dc74a1570ff51a97566b2839b639024a93d5bb833597ce75957d974151bcdba9d54a22cbda806aa SHA512 c763299eb10fdface131db45fa70a27ad7237590a420ab1b47d09571a04d0c6f7f8df39699b9a0abe7ce70de1c9b280344113d88f5e784047bcafefc93483882
-EBUILD gegl-0.3.26.ebuild 5248 BLAKE2B c81bdd8b3f21e7366fba4d0c642a4e59298e06cbf54f39ed52c64b95682a691a15fcdab4299281dc381fec7275d4a07aadd16a2fb066a577da65397e1a85c091 SHA512 0a46871836889886ef281c1f9fce823699a379377fce63f35c74e78fb8e05ee7f73d940eee6e47f59323fb1dc148b1123bff8805a839f91ce495e774a0d5c97a
-EBUILD gegl-0.3.34.ebuild 5388 BLAKE2B 2433c6f30d9c7fe26227bded7d2a3f36509c5e8e2e145d2b02592801c93e55c1c7b285b04bf3282f5c4c52df952456ef34144c707d3b5939231d29850b1dc160 SHA512 b7ca2e707fe2d13c37c7da224a6e1797c3ecd922bd415b34b40a86f3aae7020cd30d789ad72037a35581812cb31d3d15c0ee5ac77e0a51316e39ba23655d2c7a
-EBUILD gegl-0.3.8-r1.ebuild 5314 BLAKE2B 3af26f66e1f977500c6803191fe036b4af0a9e60f80572c89614b1029e6c8e0a3bb784200924ee54883f80462427fa6d9096141270b5f2481c99da6763f09d8c SHA512 ccd83d0e610e097612d289b6288f3f31f1f0864ef6c546edaf42291a2e2ce98fb991ee183a0f73131acc90dc463a684bc72cdb0bd1a1becf4459cc7875eaa48d
-EBUILD gegl-0.3.8.ebuild 5232 BLAKE2B 7a402b9a6a999efdef104633b00a85137f42815b94afadd1feea092fb18b524da075c03ccaab7294d10ae78105e9f17e190fbbfd1aae44a8161a4c3fee8781db SHA512 5525c1fecdd68671b7ef7d83117c63c777acfd6c7898c7fdc86cff9b3bfff845d6388fb1dfafb49a6b35da288e4e7faec1ef930ac80e72fca24ad4bca66a6195
-EBUILD gegl-0.4.6-r1.ebuild 5400 BLAKE2B 8947403f14e38fac3b7c74b5ecd330a418a10aa654c03410e90a03de8927abae6cb90619e9dad155d2d3d6e392f872aeb436b3c553c723ea4b4204beb72b4e47 SHA512 433d875085995f0e9b42a5557d92cec02931cc8f70bc630888e42027a8092a88982a0b6ab522ca4d924b4f62c7dd8ced2049e82c1e282346cb89b0f7c07aa161
-EBUILD gegl-0.4.8-r1.ebuild 4967 BLAKE2B b6c33332e3d5fd8c7fbae017179b84046871bb068400ecae3358c82aaac7fc20c84bd33b7151c781aa93bca7d8a65fa8628b263167f14c5763d62510c2d34124 SHA512 e702cb349ac0cf26450dc69b7663a37573aad5f7c3117c151e6ac0c86d3f18a3dea471ef70ecc6028926406c8ff37460f70ac65393dd7a4121f7386a2fb0346e
-EBUILD gegl-9999.ebuild 4873 BLAKE2B a529d3a58c04f36d5f2213e9eb52616f8c7db5268d6e93ad58a6b484a0533f27f3fa05e343863215e6c20b2947064b9d3e8a2b085672c37f510f80eb0a08a545 SHA512 f4f550e0f27929818bea3760ece0f6a8206192d86615d864c2b3b91a4aa42fbce195408631b2693423cca98f3664f1ac1dbc173288a349697c53c17e8edaa03d
+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.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 5237 BLAKE2B 34f89554442ca341b924a66d57b4707a465390d3f5326f0bdce0dc50e18ed2c9ce7596b904249a3683fa6794c274050df1594f741956aa4c4eefe5c152bb8145 SHA512 bd60d4c1733eaf316f9c480ef6ecba775b35208bc7b618ce0b2b7c5d5f240e250db61552744be2a21a1472ec73f2fed714a3ec58564b1fe3895907cb867f8031
+EBUILD gegl-0.3.34.ebuild 5377 BLAKE2B ac84c85d0ab0a6fab5e2176639f30cefda1081acab0bcc155915cdeb702cd681efe0d332d6ccfe29055b7e16d6b4406893f525574d702d7f2609e952c440b6bc SHA512 a7991520a562539a9f975fb7b7199b8c3129fee1415ddd1211b2b513fec29db7e4740f20109081981dbf656edc5cafac2c3cec339dc3a22e98c8bb272eb6e564
+EBUILD gegl-0.3.8-r1.ebuild 5303 BLAKE2B db41335afb65f22fedb687bdc01a8bd1f9b1b5f84905fb9ae5fc857eb83998bed60abe097abffaed97be6be992f138f431c120285f815e788821de645f476e6b SHA512 6c7d6dfb2db4f1a27d905368a0de4bc89c7a46298b134c9de7b477e73d5321684c251b7902ece0ee993f583c2c0583615a16dbc66d20ed26749e83a5400c94f9
+EBUILD gegl-0.3.8.ebuild 5221 BLAKE2B 089d15cd1924d3d859055f39b6914c2084536556aabd23835962d582cc6a6846fbe57704feefa46d6d3fea8cc373c2c56e9f33c2ae59c72eac8b63b0a7f86e65 SHA512 85ca494220c281c14dca9ca9679b84b084d95561114a761a073e871fdec072b0b1d000a9d4ba7aa8d81c2587ed9f9cb73cfe17467a6783a49d58f529b0337efc
+EBUILD gegl-0.4.6-r1.ebuild 5389 BLAKE2B 4eba81cf6624d66ceb3d3e27b9bff465f9b5702e53d12abccc6ccf8bf17e1ccbe439dbb5b9842564da374510ac3c01ffaac28be89aa3cc1b6c3b8493744c358a SHA512 4e010197d78a08ecc574975d3069a1fcfd2cb15b0cbc40f28b28494213369fc926c1e7bd082314213f823381a52b687facfc122ed000c3078b409bd406f79ff9
+EBUILD gegl-0.4.8-r1.ebuild 4956 BLAKE2B a70f0ae6ecb1811bfe12cceaaba82107687f093cc89f6b5b8f62237d067e9a3fcf8c67ce20aefb632f9da3015119f9f13f34c1b91bbe87a7148cea46555a4ddf SHA512 d1e0b286eefb8d28754dd639e6eabe0bb5ffb8c38daaf431e26796a266d2f73e741eb62fdb09a3343671034f0b8ea5e886ceded7465c513ecb41f0d222405dbd
+EBUILD gegl-9999.ebuild 4862 BLAKE2B 2c3826ec126d5dc69f2ea4d7ca2cb2dbb5604a8da8a3e6f18b6fc3fa77526a289e35d03673d392e7742dea39dacccdf09e8eb1e85ee5a63e044590d16547ae23 SHA512 5b0a2a483dbd1014f7378d74796167462444a23c1da0d66372b9659315c9bb0bb19a1e11159d63c1192dda7803a08b42cf72f3ac97330576124af3fe16ddb823
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index a22e66ed884b..f0d4ba5afc4a 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-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"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index cd6b1554809a..fff2f22ff18a 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-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"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
index 58ef27e3edfb..d3ddca6e6f44 100644
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.0-r1.ebuild
@@ -17,7 +17,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 ~arm-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.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index 51cb6d668234..e106b3ee26bc 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -17,7 +17,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 ~arm-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.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index ac4a1b49b677..77de495de66a 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.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 ~arm-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.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index fb3ea4a20d5d..f697f4fd1299 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 ~arm-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.3.8-r1.ebuild b/media-libs/gegl/gegl-0.3.8-r1.ebuild
index 2d19ea8e6edb..f0f0b701dbcf 100644
--- a/media-libs/gegl/gegl-0.3.8-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.8-r1.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~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.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild
index 1cf4f2a7b035..700033d41b2d 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.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 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~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.6-r1.ebuild b/media-libs/gegl/gegl-0.4.6-r1.ebuild
index 44652e28d58a..6e303217ef0f 100644
--- a/media-libs/gegl/gegl-0.4.6-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.6-r1.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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.8-r1.ebuild b/media-libs/gegl/gegl-0.4.8-r1.ebuild
index 1d9597985bb0..6a944b6cc89e 100644
--- a/media-libs/gegl/gegl-0.4.8-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.8-r1.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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 07ea6ab51464..b0373e1fad0f 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.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 ~arm-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/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7a3b9d2d43ed..5e63fef2f742 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,9 +3,9 @@ DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d6981959204
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.7.tar.bz2 3863545 BLAKE2B fac6a6b198fc8cc4d92ae128f9064a3c5ae71ba55891e80cbedd51e91a7df5bd1190f9d51051613a704a3c005b0a8eb850b387ca15b5ff09321ad9df23c70fab SHA512 8654b148fa6fcc34a0e2a981493901a5d93c46934861655c070a228baf136e5ed231cd8a5268948b6ff12ab551870f37d7270d9be649d35d515130540d0eeefa
 DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
-EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
-EBUILD harfbuzz-1.8.1.ebuild 3207 BLAKE2B 1dd250ac33c8b6ec4fa9fff4ba6d1746d2881cc18a6510b2848ea06b20e70fcf8b00b03e01defe0fe8888627004e4440083e611a79476856a5a40e2042715591 SHA512 30763dd7704d2b41d2b3d85aec21c9fa3ead4ab11cacea58bca739cfa3c1d0801fbb6aeec0565e25e0d8b812c51c9f57edff2d93fbcfc8f2fd360ccd18a9f68a
-EBUILD harfbuzz-1.8.7.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
-EBUILD harfbuzz-1.8.8.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
-EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.7.6.ebuild 3241 BLAKE2B 3886cc3cceb195e62d5dd5b31d4243dbbc8ed218609dc3a65455b9e83f98b5471159039f5fef106d361a240af992257da1f87b43a4ad05a1960f9410dffc051b SHA512 cbc34d68ec264add1f34e9c1c629a0b5351803df370dac7bdfd89da94aabb60b22a3be2202a566d3d31b48e187ef1d7a9bf2dd659c8ed7e203f838eede55645b
+EBUILD harfbuzz-1.8.1.ebuild 3196 BLAKE2B 1e66c1d87d91571ac977a0eb6803a9c710c6d16e3590dfc975cbfedd4924103ad7f1a733ecefaa16003aff0774ef0d31cf2cadd398e35a4faaa89b8fd5e4aa35 SHA512 0741642501ffbf7b14d82c2303b44aac104d17ed74c86ac34f5d1173e10dfef243c81b371600d56bce98eccb0a0ac1c662eba28edea9dbc1d81c23225c5d7a81
+EBUILD harfbuzz-1.8.7.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
+EBUILD harfbuzz-1.8.8.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
+EBUILD harfbuzz-9999.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index be5068b82b03..48fed010014b 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
index 1d76676999a7..689765bb6f75 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.7.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.7.ebuild
index c723137a7e55..243f2a80c86b 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.7.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
index c723137a7e55..243f2a80c86b 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index c723137a7e55..243f2a80c86b 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index c95e1670afe6..ff200860c6a4 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,5 +1,5 @@
 AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
-EBUILD jasper-2.0.14.ebuild 1910 BLAKE2B 05d1549c2bdfa612e5e6d6a9fea50414ccda754a7c7435b238902c27a26c725b9d2ce25d121dc606da7d8501ff6947a567c832b9dfe4d08465264ae318de7f3d SHA512 458ac0d43792c9ee62ab9841ea67c75d2f954f997f423279eef8d73f867628449015b229c57b3c0965ce2f5fb81b7e6b430273a9adb97ec2d01594bc1cfa97f0
-EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
+EBUILD jasper-2.0.14.ebuild 1899 BLAKE2B f9f034ecb4e7cb7362957b91ae6712853cefafad55d069adcc893a5094ebb91a7a35aeb75178d5002fa9ff04f41ceb89d9fc36c53c575addb99e9bf0d0142ace SHA512 0f6f272f0428aaebfe568fdc5d898f36c93df54ecb91001b1302344e67f7386fd11694ec652c57d8437436946e0c7bf8bf4203fbe285f978f067036d3fe3224b
+EBUILD jasper-9999.ebuild 1803 BLAKE2B eccda8d15f0ff80c4ccbba400c144f098736284f1fa26831ecc60c34dca36c74501907c6149849a9235c0c5720d803c316b691ad5b614d6200781a87445c76b4 SHA512 aa00138f755b8c929bdcaaeabeecb33b94dbfc69dae08d5de170ca169ca00f101bdcad13b84ac51f7fe4ff9cce9dc0d7d31567d56096b59b65271ea34be1521d
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index 7d10e7d801db..1a72b593b949 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index 2c5f27694b7e..ed20cb057f96 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index b60a3ab77570..fba074a2989f 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -2,7 +2,7 @@ AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be7
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.8-r1.ebuild 1278 BLAKE2B 0f0fc25defe0d0780edd98f41d9e52b01f37be57dbba65bdf9f1523bc49cc558952f97b7526e2fdea5c92f84ec84827eed4f24f9d1efcb80d7979612b1fbb5bc SHA512 e1a041d1c0dee93fd43534ef224058fb12f9ecc686a61414992a67a1cee439da7fb26872ce8b016e69cee8928e23f52e57629edeb8b8ab79ebddc0b3eea9fdad
-EBUILD lcms-2.8-r2.ebuild 1266 BLAKE2B 952439d7206db82cb2116a8bf8eb58e1bc690613131c714d8ebbe6f5293d8edf06f1fa6cb5dfb67c2e0cde947d6d0b10a69c0ab3a9b327c3938d2791f76bea4d SHA512 594167911967ab6a7a388f930cf043a0eda9f544847ed1521a6c8d5be44d4ff6e3af5c42d3109d448b4f94233bfdd71368858eafa7ecd637daa4a45936284273
-EBUILD lcms-2.9.ebuild 1246 BLAKE2B 2e1d2b85f1008ed6298fab75d41c0ae2c54e1f0b0de68bf8fbbe7a88fb7deee0f1ed12d6d780f38fdf61e36e3a3afddf913447e9555a4501443683ef1a3b14ee SHA512 e5e7fc31edef1bc31ad9354e43f60f243906d94d0adbe11ea1f019d75ec67049449dec8c2b03b040659de6aa70a494f5ed8921b8a0e29938a25e7a3650513786
+EBUILD lcms-2.8-r1.ebuild 1267 BLAKE2B 5c9a91d72bd60c968564d552552bf9df9b4b72720732debde418671cfe04d1ba233d90208171076322fdc150c4a3e4c468e759869adca1a024cf930aad74d859 SHA512 2300c3d9b5e6f9ce349893761896c572d7a179dab92af4f3082f695f2002f883518d64a12a57bd30e19fd4d216dc5dd1cb046b7fcba14b381b427e3e7bb2e0db
+EBUILD lcms-2.8-r2.ebuild 1255 BLAKE2B 6ff8f576ba64cb7beaeee3557817ecf1b472e52adeaa78d98063eaed8e65435fcd4973f3d4fd3ce0098b036f554f9dbd7b6038983f82f790a035d9cd7b3cd5a2 SHA512 f7b8fd8692bc72c1d3bf65a336c46ac820fb3750ab27c697f05b908e94494bc75f8bca27eb89c4f3bec20eb2845fecd627efba061d2d2027ba951cdbb704f074
+EBUILD lcms-2.9.ebuild 1235 BLAKE2B 133428eaf79d3afdf07bc8a002d306a5b0e5b0692e16192257678543af2ac11bcc394e3381e6f35ddc2848371b28587ce9db54c9e6e063f58deffdcdb1c1a56f SHA512 78642b5a48ea4f725711c2aed957c58c187ee4cad5fe52ebd527ba13832ae20eb852837f59c937a8900436306d4973fb84a64eaf98011742fc134d6d2481fab1
 MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
index 2e1fd225c4e1..df3cb1875562 100644
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ b/media-libs/lcms/lcms-2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs +threads test tiff zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/lcms/lcms-2.8-r2.ebuild b/media-libs/lcms/lcms-2.8-r2.ebuild
index 34c5ec63739e..e39e224c996c 100644
--- a/media-libs/lcms/lcms-2.8-r2.ebuild
+++ b/media-libs/lcms/lcms-2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index fd82da768568..920aa44bb99a 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 78106e82a005..b44c86f8c2cf 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2496 BLAKE2B c90a16d7906248fbd9d1beac69c21deb06465a6de97bd7ddc8c4076cdd3ec3ddd2d40c67d9a6b280369d1cbd489f5aa3b43bde63782609739694ff68c4a06d70 SHA512 8a6d39f0ac0e362bb7c5552c8e07b1a29637d657c82645691184d80892a91c29f3aaf90eaf569c5bd41a11362ff2650037dcaf593079eae9216e1b395f94d335
+EBUILD libcanberra-0.30-r5.ebuild 2485 BLAKE2B f1d553d7a9f4c8d9b71399fa0712c06dc6b30912671cda86e99c3ed22e19a33dd96bd137f2c4fd6adc35092d36934e3b73151c8cc8525cb5f9c5e87e17249c4d SHA512 b9a9a36d53c06fbf74fd16e10919f1295401ffb5a7141dc595d93cba2cf441713d15259f1c461134c8f4018ae3931d671a16771b41afd27906d08b91cb3eddf0
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 57a43abbd43f..029a2b7200da 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 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 ~arm-linux ~x86-linux ~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 ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 050df309dab1..7f0ffde322ec 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -5,5 +5,5 @@ DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0
 EBUILD libdvdcss-1.3.0.ebuild 796 BLAKE2B 46c60fc09583d30961b1526990b8d6f583b9d63acc4c1b2cca1ae44b621d964783ede275c2612f64bea635c2a32e1ad26294282e132e056e551db046883a0498 SHA512 84baa330a130ffd7f0246815ab3c987c9df2f26e59929f8413ea36b0208e5aca607f3865788632a348039cb5f7bcfdf179e5a2f12163ecbfc942007c100094f2
 EBUILD libdvdcss-1.4.0.ebuild 808 BLAKE2B d375b0a634b6efcde6948a5a9b749f6a02b600fa74fd01eb347bfaac5b5f2c5a028af3df89adbc829a8b225dc05247e1dc029f9de8bebb666d464d2e9544f233 SHA512 8448a153f20dca18b8ce3124ee888843525f5f14a60662573b4ce2869fdb6f38368fe62f88b815fa2a4f81f74966e889222c78a2918e638e7deec50d4550fca5
 EBUILD libdvdcss-1.4.1.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
-EBUILD libdvdcss-1.4.2.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
+EBUILD libdvdcss-1.4.2.ebuild 812 BLAKE2B 52949982156320f6ff98f7c4901fea283851a707b80d8bd2bd8a337c6100d7539609fce051c2a99fcc4e499dc2091b1b22b39b8f83a69bb12e5f55ee54d63c97 SHA512 4901810fe71c40c48e1eb2617842c8e65f71c0d45f8405323348ab4a0dc5d709013a0370d5727d1e0f4c1fc7749f45f451b5b419310c2d98a64801721a7afab7
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index bda143969dff..a59fa0f790f1 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 77f75728081f..f1c688a5303e 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -7,10 +7,10 @@ DIST libjpeg-turbo-1.5.2.tar.gz 1657235 BLAKE2B 8d26af1cf6219e02f13f8729b6881755
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.0.0.tar.gz 2158457 BLAKE2B fd4974f0500d23e72d0d0cfd31e7c4eba485779932d5c9515645eff4f7dccf97a2aff61b42be0f539905e6dcd6db2acec48cb7bb5ae61cae7152cd06902c36fe SHA512 220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.0.ebuild 2861 BLAKE2B 4110c8947b54c3959a8bcf10a57810fca35ff31e389b51d32b03d5ab15db542ebf63d931c8aa926da4b3c49d1b005031fd2468ade8a0c980714f77a76310538e SHA512 3aa56d232af1153e2c7747d7d390d11d43ff3955691420d8d3247ce104f6b959e55fa83bafa601401cb0095944504c5474b3564b98762907cf413ad504643c45
-EBUILD libjpeg-turbo-1.5.1.ebuild 2923 BLAKE2B 67850bed77be9bd0b06c1d4c4f95bcdd73430e8b26e1698409213837edaee047578f79b4f019979aab48dbfac6210272594b28aacba1d25e6237034c85e3c4d6 SHA512 13e10d81a0543f6b7cf44b185c3534aa08e2fc07bcb243aa159bc3fcd6194ed7d7e4f8bee51570acf0962731275a4f2d91cdfa931b62ec370e54f27487bf13ff
-EBUILD libjpeg-turbo-1.5.2.ebuild 2925 BLAKE2B c519f100505bcccb2d7b9192e26d5ffcc2d881b4bfc90b3e2e4f72447512686745434e4754f8393c14d4d2b7a285a6bc2d0ba0dd20a9916f00e2cccb85129023 SHA512 4e320a1a69fb0ca060ea35a9e2cc5aa7a971ad727bf661c9f64472874200a941f1502eecbe99d26642b21f06a4c1c3faf6d57885ccc63e1e9ec5edb3a7746d11
-EBUILD libjpeg-turbo-1.5.3-r2.ebuild 3015 BLAKE2B f5e9fdca33c3eb9d21da03bbfb5d6162f2db859eb273b21c4409234d43d8a45ca0fc21a2163bb221483a4a3f5b11024db74ab12cf4c46e605a96305bab8101a6 SHA512 3654b6ab0bb0ba5d1509835e43e3a3f5114bbe9484bcc4057af825f667a591117057c0a4adb565d899719a6c867ab8c5b84ac37762e47ac920619eb73f028876
-EBUILD libjpeg-turbo-1.5.3.ebuild 2935 BLAKE2B bb75f57fbc1926c3973660a52c531020c5e6a105d443b2df068f1db472d1395f4361136b56e3c9a1a88e219511706cd96025b0f44235adee2090dbd8880bf867 SHA512 cf593ba887b822db77155d348789d74435e6209e72918afb5b323085c5c1e9ea03ac8bfee2f03dd279ce477a2116539ef76159980063da2a8c83175a6dd482a2
-EBUILD libjpeg-turbo-2.0.0.ebuild 2695 BLAKE2B a7f05452a03d7cd6f61a9eccf0c282e94ea64ab9265598e4571fb24a168afbdadc89273208412f7fe9f2b80182268fd11d7b294a6fca063ccf4f5c61c2c2d369 SHA512 87ef21be051b6a99846975118930468dad06124b4599b9a20c19b8f2168f1c9c8ded5d1810970db09f98c4b8410ef55b0d876b54e15dc0e79d2ba1412ab6344e
+EBUILD libjpeg-turbo-1.5.0.ebuild 2850 BLAKE2B c96ad089f1d87d41d4188bb04eca1b2ec9efcfa40a13c41595226a6edd8bf774c7d8daf49c839e1a1bb17969ec725d91c3aea0178fe3c35147c13b690ec849a4 SHA512 6b08ca33b26b5874bb5b4b21e0d14f3476bcbbe4d6ce4fb595761d69e8fedce0a4bdf1ac1e176707c531059073aa5dfc6a51a10707e3bed2a5faf64416b5e76a
+EBUILD libjpeg-turbo-1.5.1.ebuild 2912 BLAKE2B 438a513cd6e32f64f3fea073d8c171db1fed47c73f50e8bb7cc6836edb1a59a99ffed5dca6ef9b8e470428b80e2de3053ecde210dd8b28606187fc6ae701fe35 SHA512 06a9dba84ac1c37c9fe47c370c0f3dc742a222d84b51c2b66080ad893d73b02c320bfdea249f13426927e632d5a1388b6502f46b2548f256a10b1699566ba239
+EBUILD libjpeg-turbo-1.5.2.ebuild 2914 BLAKE2B 20ab888a51ebcef64bb8e8951f98fda703eb864c2f90b16748eb00f8ff4da81245213b267fe07eb88fd3ad38356edc499bac78b6600b14803b231cd2bbf10fa6 SHA512 ae1a705f10f0e2b6e47ecc3f5809111e0d80ba6274e37faabb66509d81002bbc683867e452542c0379c79bc9408e6ee3e899957cfdb3bf82c30866746ca44d69
+EBUILD libjpeg-turbo-1.5.3-r2.ebuild 3004 BLAKE2B fab0a9e31ea6e0743869018f7714af443968e2bcc2f78aa0ca9fca3d583e3a8894151f12032ca632518ec6b4326379cb645c8a90aa8bf3ed0a331361f3019f61 SHA512 77fd61b770feb5d13620a8b5734723b0e7cc0785337e32913e777ba0d8f63367d4defc418d2bcbcf59816604faff0d9d25dce8aa446e5f88602b9ca2c85ea04a
+EBUILD libjpeg-turbo-1.5.3.ebuild 2924 BLAKE2B 1b169cba371373b286f789c9c13485987192af85e23a31026c567919e06e4ec486961d9b725759fd3f5466e0c8874a4d7849c3912fd89e89940f19a519ea427a SHA512 43e6b9232a59e3e1478b01d18a9e1485cca5d5bf76b9539d4257a0357f92d1cd1d9777bd9b9844adb2adb4e9d68390018385a20817b1fadc841fa994ba97752d
+EBUILD libjpeg-turbo-2.0.0.ebuild 2684 BLAKE2B 03cb490426cdb79d337759a008fedb6ad641bc93aabbcf850c04c78d8e8da25487f313719b6047c82f03c9ea69df1371b3616ec4410362df46a2590f3ced50bc SHA512 5971b9a7f2b167cac75802a61165b64582528e8166a0c4acfc4a2b856ccdd266ca9f3d371f1bbf49b25df9181da194c79d61a7fb2c79dcadeb7b48416f0e9e82
 MISC metadata.xml 466 BLAKE2B 989b0d905baa9ba6217f871c43b1d06f8ea718ab7250d31cce0d498b219b3d1077638b2fecfaeb747e2505f2608d73390789bd442462a9e2f410b0939e2dbb77 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild
index 81cc488f9cb4..b66d52346e0b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild
index f1cbabf444ff..4e53c39405a2 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.2.ebuild
index 3c1d695cff73..e3dabe10f78f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index 698ffe37228c..736bab35e780 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild
index db51375729b6..701a8a32225b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
index bf3a4d31b834..0e0387302326 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index dc499197df2e..e644d60dda86 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,7 +1,8 @@
 AUX libmng-2.0.2-jpeg-9a.patch 1183 BLAKE2B ef23ec070a72160a66b332ea4a834630ec45ff1420ac49423c6ed0e2c8ec4900d2632815e4ac1d23803bcc5836dfb9e664463471118268a0eac9e490dbf176e9 SHA512 f8c3b7296b046b5fdb6ef03b06f83a8d2034fb405c7fa8f61ebe06e71722bc6961ba09107080e08f0d57669eeab4b1fad70b9bb3fbdced039efa862ca53bc1d0
 AUX libmng-2.0.2-stdio.patch 261 BLAKE2B c47f9bb6aaf0df89bd5514fc3cd222f920ff721ba1af42c44fefd7fc162b0665ac4347299cd4fdd4cde289b39bd901806a75e4b4aba8042cdc53323010fe2475 SHA512 44492809618df0ff3e7a41c55561703ad1331853c8872237b828f767a07236be9630bb3955b4c3c444d9fb80440697b2a52fa99fdbbe2054bc35ca6eba065c06
+AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f94055175034b7c204f991b7773fbfcbd46417ac69a4dfab4078fd2ae11a811051f9e7b297081bb79cd2a3aa0633a SHA512 4b4fbfa226394a1ae8e33ff9db8f0a7c9754873d27beaf0a59a4e34b0d38794314f29c0a76b9e7b6b3d792d856ee8e040c8669367ee0f1e0d5d36000418d403f
 DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.2-r1.ebuild 1178 BLAKE2B 3773cc710c8193761d31f7899845b46a9034807b1035db4d3782baac2d79abf33bc993ad7c47e423a08cac435d965b9e6b28bbe1b8fdc3a66dfc8face76067dd SHA512 33f96e47638f83c69dae5860ad39ac889c079570b04ad0194390acd74a022bc9b6fcb6a67e7988988790bf8f91cad31496961a482b21d366d7a86da0533eba02
-EBUILD libmng-2.0.3.ebuild 1139 BLAKE2B f476e9fcdb4390016fb33616363432243cd3c5e41b2bffc78fae24277f446c546902f350e04dbd18e766662ae6817991edec50232ed26f983c218dd72f118607 SHA512 e0f6abd8ec06fec5904b41b68ee8946557fa952b7b5e2988ffb2635de556ca1bcbc9b3f76c40bfdfc38d97ebb53920e741de163e104431b8f808ec75f10fe180
+EBUILD libmng-2.0.3.ebuild 1175 BLAKE2B f7ab7d1743abf6afe693d037c0da55f05cce26b5f57cd2a0b4d6cd59b079cc688b4cad3b9585c3ac4146812be8227aa0ba39174ce743da13b408c398e1d01ed3 SHA512 c55845d80cb06828ba340827335f05d23a89e4a7d124b14920ed1343d715318dfd1fd743236073e82c84f09615002276326752f9b3fdb631e901f93a38825bdc
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
new file mode 100644
index 000000000000..9441f00137d9
--- /dev/null
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/520906
+
+This kludge is unnecessary with jpeg-9a and is in fact breaking the build...
+
+libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function)
+libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function)
+libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function)
+
+...because jmorecfg.h of jpeg-9a has this:
+
+#ifndef HAVE_BOOLEAN
+#if defined FALSE || defined TRUE || defined QGLOBAL_H
+/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+typedef int boolean;
+#ifndef FALSE                   /* in case these macros already exist */
+#define FALSE   0               /* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE    1
+#endif
+#else
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+#endif
+#endif
+
+2018-09-06: Adjusted for libmng-2.0.3
+https://bugs.gentoo.org/578744
+
+--- a/libmng_types.h	2015-04-20 21:17:32.000000000 +0200
++++ b/libmng_types.h	2018-09-06 22:56:57.153190623 +0200
+@@ -201,9 +201,6 @@
+ #endif
+ #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
+ /* There has been a change in jpeg-9 : */
+-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
+-#define HAVE_BOOLEAN
+-#endif
+ #ifndef _WIN32
+ typedef int boolean;
+ #endif
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 5f34855de15d..20be193b51e9 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
-HOMEPAGE="http://www.libmng.com/"
+HOMEPAGE="https://www.libmng.com/"
 SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
-RDEPEND=">=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	>=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
 	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
+
 src_prepare() {
 	emake distclean
-	autotools-multilib_src_prepare
+	default
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
 		--with-jpeg
@@ -31,12 +35,11 @@ src_configure() {
 		--without-lcms
 		)
 
-	autotools-multilib_src_configure
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
 }
 
-src_install() {
-	autotools-multilib_src_install
-
+multilib_src_install_all() {
 	dodoc CHANGES README* doc/{doc.readme,libmng.txt}
 	doman doc/man/*.{3,5}
 }
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index a7e76e658fbe..1eed5b6cb2d2 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -5,5 +5,5 @@ AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7
 DIST libmodplug-0.8.8.5.tar.gz 546751 BLAKE2B 6a6c246537ef5123c84548f9b1f6092a3af7384f16a5cbb3d8511546d31a25818656b0904f8944a90b0164e50293047f02607f500c77c030527c7771c6519e48 SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
 EBUILD libmodplug-0.8.8.5.ebuild 823 BLAKE2B 553ee8e443dad1688653717ffd7c8d91ed814ee0f7a8fc6936693651868cc8fb732240d7cc197d3a9b7b4e22b5c3cd700956dc892a34f0fc5f3690f466deb0f4 SHA512 4a29ff9bdd21e8248898c98e3d8b166aca6dcb24f4a1c5033093719fdb3a1ddaa80fd035435f4b4f12d313bea4cc1cc5b83662f3fde575829012bb7c38097a06
-EBUILD libmodplug-0.8.9.0.ebuild 788 BLAKE2B e1b36146b4dc9411732e001b52f3772875fbe4b0257912d29453a7215fbc29c25832a71a4bd81383ce44fbde53f6e7d7ab71a40927e95cdb8712dd6046046c24 SHA512 245a3f64b470a87f7f878b7b59b68e3b52c697186444ad85ccbc9a1f4f3477fed0f44a3f1a5936254d322fe9fe4ae26d3b07a96c2f0ab5021b605608d2d5fda4
+EBUILD libmodplug-0.8.9.0.ebuild 782 BLAKE2B d8090719c3b77b4063f63be8d0afdc251bd682948999a796fa64e1b5cd667678a9a7b9c2b6af36417aa7a00295b57b0314b6ca45f831b6873f8de69bd7297f48 SHA512 9c03fafc5f5dc0f00a78c1a32c59c6faf99c64d62aae673d72f784de22f218453f211438cdb6235a7a801e090e91de46e50abd21165761cf7e08d654040ca509
 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 b372dbc205b2..8cd19273cebf 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ba254514e8a1..397b2f353071 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,9 +1,11 @@
 DIST libmpdclient-2.10.tar.xz 261792 BLAKE2B e8200d1a8db0370417924a92a83cd7c51d788d5c054decea8bd3b968d577f80cb63682017c3b52a6523bd4bcbf3c0d72c50ab6b48910d6456326237f3fe05e57 SHA512 f54fc3501643ece4eee2f63ddbf5f3d676f3843be0859f482d70cc142b6d9dfbdebd511ccc52a9c058a644e3b80c93a680e1de19f6f3ebfc46cb197f0ddddb5b
 DIST libmpdclient-2.11.tar.xz 274836 BLAKE2B 2a3cf2a5dddb6586edc9bf28752b8575dab51e37aa13aee138ef239ca741bba844c1ec6fdf09727f25be073b3909250bb22a34602a0bf8b0d61ab4bcf09a8566 SHA512 0503db31262acfb871578278d6526e12ee2ffbbe414425ab5ebac61f27da8ad4503d948b4d192421d301bd0a29b9b460f195e82a44608f984697a8aa47b2eb9b
 DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
-DIST libmpdclient-2.9.tar.xz 253992 BLAKE2B 8a2000d508e4278899a3a5b2d92ebd3e0aeab82d3587c66b8abb63be1069fa3a0b76ecfcbec60aa9c842a927889feb8f849a2a1876e0b3a1ab272fa6af7ea7e1 SHA512 7e6af51e31a3319e6681dfe5199fda1b2c1482f6aa6854af7c7f02c999fbbeae4f369c9b157abf95402c7f022d155109454b243549185ba791df5b2457baaba4
+DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
+DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
 EBUILD libmpdclient-2.10.ebuild 831 BLAKE2B 3a08a426b6b1cf3e4649c9a7543378b32a8029422dffecfac1168d34e8a0e9262834ab0c18a2cd995f8baf63bb0dca35b4e30b701f1f1f5fb2be842b8d7bc870 SHA512 208fd408b71f171af2fd554098d237333cc12ba47708514435631f31e6176e9b672246aa75743ef06f80f74f6a68ef0236177fe198823738ddc3340a7d0b1b58
 EBUILD libmpdclient-2.11.ebuild 889 BLAKE2B ea93620dc8072273ec10a1e77c8f51cabea704e64718f0171d79e2b5453b3bb62637f9ad923f836cd878bc39695024d9b371c51112d64c2241223a1a41aa4e60 SHA512 30403bc13316be22370a183aceb28bc88ffe4187e797016b32958b6b445712a0507c2dd115b23fa1dab911f2984b52ef59406657b69bf84127dbcf95d401a443
-EBUILD libmpdclient-2.13.ebuild 1047 BLAKE2B 5d515ebf0885ab4f5c9d73fde2794a083744f7b02408b4beb415004a9d878eb67126752d7bf5985ff443c03a29079c1bc199de3c835e6e50ea54006ce2af023d SHA512 6223f857eb8316d625a1fcc7777ad25fd44e6409d4dcc57ccd369d1a1af1401334881a763436085288da8950848090d576a6e25efd43182c39e0a1236032a131
-EBUILD libmpdclient-2.9.ebuild 825 BLAKE2B 9895c4f0ab16fbc23f7e021831501ec01377bcff9490a44d4aea4c7414ab2236cfc5f39a87012253d06d0c4af605d1d971134e92edc13a3d39337a5163af5bfa SHA512 3b259d1d3313922a4de188ae5c8ffefc888cbe80b125b30d9ea9e77297dc74fed7e9f49a1814f29de61cdfab997029b6a6a8d2401b95229b88f85cfee1c1b840
+EBUILD libmpdclient-2.13.ebuild 1043 BLAKE2B 793a2a32640f23dc07764df8354d8c47218fa9a25a11218bf85aa7722da90a05bedfba6cb74c3554799d340ddfacee61f9f9eb56df9a4e5272571070f5d1e24f SHA512 31058c897eea026bcf7db00e5d563c4c4f364d7b4da61e5653bc20dc01b34a6e8f12ed66ec515158b407355af75caea283557cb4cb98209a6ed7b93c1bca92f9
+EBUILD libmpdclient-2.14.ebuild 1047 BLAKE2B 6c2b6b0a464ddc27e8362f7e9d3950de004e3f9c1d4c085a4d33582c495da2af7d9e157fad63bb897bd54991ead831c8fb3316cfd344d30cca866b7b88ba1ea4 SHA512 62d307c471460a79bf79564461debf8685504f4a02574ac373fb4db8a15f41711bc63c8211e305233770a8bcde32ec2b198460afb14d2e65617000b9f7554100
+EBUILD libmpdclient-2.15.ebuild 1047 BLAKE2B 6c2b6b0a464ddc27e8362f7e9d3950de004e3f9c1d4c085a4d33582c495da2af7d9e157fad63bb897bd54991ead831c8fb3316cfd344d30cca866b7b88ba1ea4 SHA512 62d307c471460a79bf79564461debf8685504f4a02574ac373fb4db8a15f41711bc63c8211e305233770a8bcde32ec2b198460afb14d2e65617000b9f7554100
 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
index bc62fa25d5da..7f4448f22485 100644
--- a/media-libs/libmpdclient/libmpdclient-2.13.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libmpdclient/libmpdclient-2.14.ebuild b/media-libs/libmpdclient/libmpdclient-2.14.ebuild
new file mode 100644
index 000000000000..70d69fc459da
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.14.ebuild
@@ -0,0 +1,47 @@
+# 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 ~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
new file mode 100644
index 000000000000..70d69fc459da
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
@@ -0,0 +1,47 @@
+# 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 ~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.9.ebuild b/media-libs/libmpdclient/libmpdclient-2.9.ebuild
deleted file mode 100644
index 54c33bb72d44..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc documentation)
-}
-
-src_install() {
-	default
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
-}
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 4a99719669b8..db59504bb32e 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 896 BLAKE2B 96b69519d0d5d3256f877d60afa611ec7350d1497abda55bd8cb4fd2a3a2c208f658fbe046f8b03b5dc5eb26ba0dcb0e2724a36e2868afcf532edcf536af8152 SHA512 bf30579fed95e22c8cbe74afd5bcd2a67a6f98416ae1970fe2e72a73611696ec1d1897b0efcd63dbbf7abbea7c9afed24705cd7bad33b5e270c58c2946ae6429
+EBUILD libogg-1.3.3.ebuild 885 BLAKE2B 5ca4a57ada3b5f15dcbe2ca5355ce74ab80677a54f2b9367d98c18e5b3863414e985498d78e4feb48168fe8cb7341ee26aacf98deca4deb368b8b2192bb33e0d SHA512 210383a819c2e4f93572909e58561515d42392bdcf62ded33cbad2670fd75fbcfd62759be94f55c9ff1784c07710b626b35a59a4d87cdcfb454601898bc20dee
 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 923cc5ad2022..f57e62563c05 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 ~arm-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/libpng/Manifest b/media-libs/libpng/Manifest
index 212670a1d1dc..5450cb1fc530 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -10,8 +10,8 @@ DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c728
 DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.2.59.ebuild 878 BLAKE2B bcb170292ebf723944a3ebdcdabd0978d548778d214bd1f81243fe01323eaacfbe9fcacbef1c6d4d7b84b0932e9dbd0a2c1f87c82d882d47e5fbdf1beff036b0 SHA512 225d15ed33d45e502c8201a233a0267efe5c48224f070cb74df69a8aed938a3873386379e242df3263de3b6b524335462ee15512d9d90ba0fa89dedb1f4237ad
-EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
-EBUILD libpng-1.5.30.ebuild 1660 BLAKE2B fb558f645b19a85903c441feeac99b167018e01e871049553c24638d29d1e346f08ee40145b041123e7e4edef91ac35e1457e346cb9ab31117aa6ea65fb4e3b9 SHA512 def71347be2803699ef0023dc55f1bf141433b857543d4b91d16a7bf25d983fdca25ce736fee58cbe992a44ca2f84796f7b99ddc8e1846a65a51ebcec1519e5e
-EBUILD libpng-1.6.34.ebuild 1371 BLAKE2B 95fd73fd3cc816d70f5c67c7769cd04d02a651fd90263c67127f8a58048ba7f05a9032b1b2c808aefe7dec4c8e1f54846f6867f24fd1ae646092e5a5a9cab57c SHA512 57e3acb2e8ceef43c00a95c06ebb851afaece1d37f760623236eaa1670f21e62699661cc5f19e6143613954ba3ae7ff5b4d066d5baa7a7921ece775eef329933
-EBUILD libpng-1.6.35.ebuild 1410 BLAKE2B 00db84214eae13e31302605bafc4d5aae90ec2c94689c07d83077f57af789a2f3d67029b62bb6a383a10ab5840d64809ccfa36d9a6602c2535f37671ad2fd3d0 SHA512 f0468a14a6af89f495a5c00b4e50709d675f6997353e73b7e66b66feddc0151c97cb8b5982c4bfbf1e46b7bf52e77c6e22677288d2f666f84d5fe657ddb1593c
+EBUILD libpng-1.5.28.ebuild 1640 BLAKE2B d0af71276affd9ca437a019bd0a545f09bb7e9eed44db91ac8bea73171db75d3a5670a2b9dc12b4ef137e86bdb7eb97fe88cdf11f4914c218d20c25cb6274507 SHA512 4f57dc6dec6114934d60f09aa869f358e85df7bb1f8643e05f02846955f3c26c3f9518e46e6e0a9ae4da538dcc70960d687b0467953619f62f53fdc8cff68a94
+EBUILD libpng-1.5.30.ebuild 1649 BLAKE2B fe9dc31be254ff89e5f0cc9d002f61655cf5c3594b1a380140b4c84eeab55a15e5cc547165fbb53f531ed34553427c6bfa85e0311000a6203378e8c491315259 SHA512 42b7679c08624bdac87618ced85e862f4351cea55347908b3cb590f6f664bbb4dac8552dd42195049cc181a1e5314dcda7e33319ef235440ad84474b06859b3a
+EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
+EBUILD libpng-1.6.35.ebuild 1399 BLAKE2B 895b2caf7ee980dcdd022d9d3f5cd16fe4b699c7c89a1e0e3ab7e01bdae10b712c79633f51fa59a2a6f2bde55ac10d34d618bbed2cc205bd128caee027661fe0 SHA512 67411f633cfc9883d1d9d3d7efddacba679cf370728290ffd563f7f7ff3c73c625c71ef9200c41b34215fb990218f60c87ad31fedb6abca07b65cdfd36f84881
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
index 3253bd3c65b5..9b1ea3ce7104 100644
--- a/media-libs/libpng/libpng-1.5.28.ebuild
+++ b/media-libs/libpng/libpng-1.5.28.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
index 0e1042a2c2ec..104f5902b428 100644
--- a/media-libs/libpng/libpng-1.5.30.ebuild
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 29b9b0173685..0aab745e74e0 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpng/libpng-1.6.35.ebuild b/media-libs/libpng/libpng-1.6.35.ebuild
index 2ecf29ecfe2e..7c2ae48621c8 100644
--- a/media-libs/libpng/libpng-1.6.35.ebuild
+++ b/media-libs/libpng/libpng-1.6.35.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 0d4b76c9c414..136871a032ce 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,4 @@
+AUX libqaccessibilityclient-0.2.0-gcc8.patch 3363 BLAKE2B f4e06e749d3571bbf57fa9747ab803a5862c92dd8087ddfd987bf208eb77caeac86b1ed86f9a657c78a92edbb39c62f4beb3b44f2bfdbfa70b9df1c35df7d897 SHA512 c1e8ef104b992805c62371912c7109ff6fba17fed242af821d9980bc939225423a7ffbd1486da38716b318eced18fa9496c20d257b663a025d343b5a039b0038
 DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34
-EBUILD libqaccessibilityclient-0.2.0.ebuild 703 BLAKE2B 6881be7f9673d83581794acdcdeb0b738260f37de0c277d98ddf721d539db16e9048533ca732494860baf84111f379177990857357d6bcc9b56644d4fea3b482 SHA512 6b3435f1ab30c35dfe06a3ee5e0b09931d591f1003a1c0144eaa179fafc1c9942d4f475eafc05fd1b89fa09a46c0e5b18fa2cb3eca58a998c2b7b77f36ee13e3
+EBUILD libqaccessibilityclient-0.2.0.ebuild 746 BLAKE2B e4fb414bd5debd4116197967170eb90dacdb11958d3fc2a75767f244073f425fed6c57b91f92caaa3937c327a15589cafdd248de64899dcf70494e2f35889257 SHA512 a78f29b3af374a838b4bc7cbfbcd225be1f70dc11d49e7ba8c77e32052131ef14f4bbce99a3c050473ff585f7a20a3e2f00a45bf79fe34b38cf104a3ea14575f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch
new file mode 100644
index 000000000000..74c97982e4c7
--- /dev/null
+++ b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch
@@ -0,0 +1,100 @@
+From 34f6084ff3ba1dd025cae17e5d114caff1d7fa6f Mon Sep 17 00:00:00 2001
+From: Frederik Gladhorn <frederik.gladhorn@qt.io>
+Date: Tue, 25 Jul 2017 16:27:12 +0200
+Subject: Compile with clang and make sure qHash works with AccessibleObject
+
+Clang didn't like the complicated friend declaration. To make sure it's
+not broken again, add one test to verify that we can use AO in hashes,
+since apps might want to do that.
+---
+ src/qaccessibilityclient/accessibleobject.cpp |  4 ----
+ src/qaccessibilityclient/accessibleobject.h   | 17 ++++++++++-------
+ tests/auto/tst_accessibilityclient.cpp        |  9 +++++++++
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/qaccessibilityclient/accessibleobject.cpp b/src/qaccessibilityclient/accessibleobject.cpp
+index b2b005b..b8c9d33 100644
+--- a/src/qaccessibilityclient/accessibleobject.cpp
++++ b/src/qaccessibilityclient/accessibleobject.cpp
+@@ -534,7 +534,3 @@ QACCESSIBILITYCLIENT_EXPORT QDebug QAccessibleClient::operator<<(QDebug d, const
+     return d.space();
+ }
+ #endif
+-
+-uint qHash(const QAccessibleClient::AccessibleObject& object) {
+-    return qHash(object.d);
+-}
+diff --git a/src/qaccessibilityclient/accessibleobject.h b/src/qaccessibilityclient/accessibleobject.h
+index a0d0db4..ee2e5ad 100644
+--- a/src/qaccessibilityclient/accessibleobject.h
++++ b/src/qaccessibilityclient/accessibleobject.h
+@@ -27,8 +27,6 @@ namespace QAccessibleClient {
+     class AccessibleObject;
+ }
+ 
+-uint qHash(const QAccessibleClient::AccessibleObject& object);
+-
+ #include <qlist.h>
+ #include <QSharedPointer>
+ #include <qaction.h>
+@@ -40,6 +38,11 @@ namespace QAccessibleClient {
+ class AccessibleObjectPrivate;
+ class RegistryPrivate;
+ 
++
++#ifndef QT_NO_DEBUG_STREAM
++    QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &);
++#endif
++
+ /**
+     This class represents an accessible object.
+ 
+@@ -746,13 +749,13 @@ private:
+     friend class RegistryPrivate;
+     friend class CacheWeakStrategy;
+     friend class CacheStrongStrategy;
+-    friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &);
+-    friend uint ::qHash(const AccessibleObject& object);
+-};
+-
+ #ifndef QT_NO_DEBUG_STREAM
+-QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &);
++    friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &);
+ #endif
++    friend uint qHash(const QAccessibleClient::AccessibleObject& object) {
++        return qHash(object.d);
++    }
++};
+ 
+ }
+ 
+diff --git a/tests/auto/tst_accessibilityclient.cpp b/tests/auto/tst_accessibilityclient.cpp
+index ad98c0e..c377982 100644
+--- a/tests/auto/tst_accessibilityclient.cpp
++++ b/tests/auto/tst_accessibilityclient.cpp
+@@ -75,6 +75,7 @@ private Q_SLOTS:
+ 
+     void tst_registry();
+     void tst_accessibleObject();
++    void tst_hashable();
+     void tst_application();
+     void tst_navigation();
+     void tst_focus();
+@@ -145,6 +146,14 @@ void AccessibilityClientTest::tst_accessibleObject()
+     QVERIFY(!invalid2.isValid());
+ }
+ 
++void AccessibilityClientTest::tst_hashable()
++{
++    AccessibleObject testObject;
++    QHash<AccessibleObject, int> testHash;
++    testHash[testObject] = 1;
++    QCOMPARE(testHash[testObject], 1);
++}
++
+ void AccessibilityClientTest::tst_application()
+ {
+     QString appName = QLatin1String("Lib QAccessibleClient test");
+-- 
+cgit v0.11.2
+
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
index de1d15f27a17..e18e8169c11e 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	cmake_comment_add_subdirectory tests
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 7b99bbf0fe2c..78b521dc7abc 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,5 +2,5 @@ AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25e
 AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
-EBUILD libsdl2-2.0.8-r2.ebuild 5173 BLAKE2B 03b84a9b6888a3fe83e3f689dc8f554eb612f64f1f258c15dfc7f8349ad08d38a4c4cf20a5a3a8aa3592225dfd6690db4724af32cf4d27943a97b336bf05a07d SHA512 7d7c1f59f492c7a856e947284a239d3b3a2d22a0259d80422af01fb77a0a48ddf49221faf965c46c1af9588da9bd4e08d7f24f507c816b228d729bf673bc73ee
+EBUILD libsdl2-2.0.8-r2.ebuild 5170 BLAKE2B db3b5153697a18da6f874059e77a1c3e48431db602379657a818e78eb3cf22164f675d0c8eba443abe75b368f9d89d9eb934c323606cd82481576b7d772089f8 SHA512 42f93420167a4f79975ae983ae636327d0b48e115ed2e3c5e5bedab630eb8c631f03d5a027e299c3f985e4ffadcc98404f6da21a47f4eb1f3d1d7b2888835037
 MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index 53817491c9cf..de6fc8150b12 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.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 wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 7cac883e3201..d8f95d752a62 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,9 +1,4 @@
-AUX libsoundtouch-1.7.0-flags.patch 651 BLAKE2B 92e136aaa85b88a3a90a5d966e316d48b9be3fd1637c8738173c09d10b3fdf9c5d4993162625e18b041463101d083aa43edd200269121ffb8cadf65208b84df7 SHA512 10ce7ad86d442430af3c2bee3cc1358f98e54ebe205c1eb50c817fb687da21dbfe2db4499a8b623ff5d2d2bbbf04d4d7d9c4856399bcd3934ac7f8b6b8369b60
 AUX libsoundtouch-2.0.0-CVE-2017-92xx.patch 1587 BLAKE2B 29cbb252a2a161e890a354291b6e83f0271ec83f2683bde43c56ca96eeb1dcca5eea3534777158939bfbec288acd2d4404bf8e70987663f43693c259a41dccb3 SHA512 aec797125ac6e0891baedf36552686342e83a2e362544e8d81ae960356227f275c5ec906f595f676497763dc411506b85de06a35e540f173c0d0e966451b1783
-DIST soundtouch-1.8.0.tar.gz 106229 BLAKE2B 158a1e4f8c8cbdc550e310f1c2531ace208159c986abbb25aa9787089538308940b61793acd6c26c2937cfc725b5ad3a23849e37b9958d05c09f55045493cc7d SHA512 724e6ecc1727ee4c4f2503d183717dc1503ee2017b176677da6f0268e82254a7cca3ff9a27dbb9cab59e32d002797eec1b39d2b729f741e5f2ea77a147af4d39
-DIST soundtouch-1.9.2.tar.gz 171369 BLAKE2B c60d06191a2e8268e7980bf30824676f4f3761357c5a41b1e376efa90f92153386f29447cdc9159c74acbd0a26d3cd4f8de51ee689cfe717cf422705e61f2e16 SHA512 d8f3f8970198a46ef3dc252719749bc19cbd2f8de5e00eeb2874565bfc421b60d94d400bacf702591293e595edf6c1c35917b6153fd395cad8d6b03115da7068
 DIST soundtouch-2.0.0.tar.gz 455148 BLAKE2B e38358b0b773edc03a1b227222418d1e79a97f7a1c7abd22f2cb96bb2a7e3427802214775c908329eeec87710b4d199fba819ad7b99f3d58071749cf372991a1 SHA512 c916bdd2cb3d7547f264b1caf09b739b48a161c8c6288c3893fc97379546ed6b41dafaf603b583fbf64ae91270fdeb90811e5b0df0e9c051dc9f6ddca4d319f9
-EBUILD libsoundtouch-1.8.0-r1.ebuild 1274 BLAKE2B fa21e1b1b979ed1ebb1e9db95f0b1d4567ae4a02c58d982642863c83c17de0e3c60b347503b1b70838b08e20219aa86a215dae1503000880040fd79f80ce956c SHA512 1ce547e6fadaae27978584b70efb7b9a5a1fe2fe9ec29c43d56a8f69621ce87ee045bec59c550793c71adfddffee8db72b520f6650d8354238fc54a7b75ce63b
-EBUILD libsoundtouch-1.9.2.ebuild 1385 BLAKE2B 57891bc2c877ce225b2d4a8613d2545e8f509ac29ff2bea9753877b24fdcb08d310cd16fe3b07acce63f39680ac84a7421607877b03bcc93adcb3cc96a1ecaa8 SHA512 bb278dea26b3fdc73e598b7fe05ce7af5595bd64a894eb0746b5ba36fbba90fcbfcfc3d43e43d7406b60f3f8bed5034368644dc1563a2a275103e93db87cd72d
 EBUILD libsoundtouch-2.0.0-r1.ebuild 1499 BLAKE2B 43b32e874493bdfbe22bd07a7a0f78f4952ab5cd192496d1b26bc0918f18f22f2df5b6985dd27727de5097f068897d3a612d2729392450c2f638be5344cd6536 SHA512 ec0e8a610460293f89f743f3457178475b4c4c913cb80a94cdca4ac059c60eaa079252bef940afdfb222bb2b1cb524d1c23cf2a55a2280050602c8cf00aa242b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-1.7.0-flags.patch b/media-libs/libsoundtouch/files/libsoundtouch-1.7.0-flags.patch
deleted file mode 100644
index 2b1e1ac80958..000000000000
--- a/media-libs/libsoundtouch/files/libsoundtouch-1.7.0-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- soundtouch/source/SoundStretch/Makefile.am
-+++ soundtouch/source/SoundStretch/Makefile.am
-@@ -48,7 +48,7 @@
- # soundstretch_LDFLAGS=-s
- 
- ## additional compiler flags
--soundstretch_CXXFLAGS=-O3
-+#soundstretch_CXXFLAGS=-O3
- 
- #clean-local: 
- #	-rm -f additional-files-to-remove-on-make-clean
---- soundtouch/source/SoundTouch/Makefile.am
-+++ soundtouch/source/SoundTouch/Makefile.am
-@@ -32,7 +32,7 @@
- 
- 
- # Compiler flags
--AM_CXXFLAGS=-O3 -fcheck-new -I../../include
-+AM_CXXFLAGS=-fcheck-new -I../../include
- 
- # Compile the files that need MMX and SSE individually.
- libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild
deleted file mode 100644
index 622e5152d3a6..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib-minimal
-
-MY_PN=${PN/lib}
-
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/"
-SRC_URI="https://www.surina.net/soundtouch/${P/lib}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse2 static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.0-flags.patch
-	sed -i "s:^\(pkgdoc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--disable-integer-samples \
-		--enable-x86-optimizations=$(usex cpu_flags_x86_sse2 sse2) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild
deleted file mode 100644
index a086c0f67693..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib-minimal
-
-MY_PN=${PN/lib}
-
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/"
-SRC_URI="https://www.surina.net/soundtouch/${P/lib}.tar.gz"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	use openmp && { tc-has-openmp || die "Please switch to an openmp compatible compiler"; }
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--disable-integer-samples \
-		$(use_enable cpu_flags_x86_sse x86-optimizations) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index c146f62f1c3b..6c3cb751d018 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -2,5 +2,5 @@ AUX libtheora-1.0_beta2-flags.patch 763 BLAKE2B 69058f8babeeacd7d382d173376af709
 AUX libtheora-1.1.1-libpng16.patch 512 BLAKE2B 95b35dbdfce9352e63deacef7dcaa5b6e462e90257eac78e5bb43235aea2ab2b2a8365dcb70309b4427c6ed0693f2ccbef4c92dfe0229b495162542b47ff6d47 SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276
 AUX libtheora-1.1.1-underlinking.patch 477 BLAKE2B 253ec0f7195abd532ebf3f0ec8e0009cbfe19ff6a27391cb4b899215e8a6b38cc9d4c49814de8ee487a4599edf95b9ed74afdf541da52730e35f634940517fc1 SHA512 00d02a773d5c95361d2d582d0147d4469ac4c882e62e25452908329b536261e9f09de82db8280fdc42985d0d8d5cdfa2f4866c76da03aca8f29237799b70a080
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r1.ebuild 2292 BLAKE2B 57e73b870d1829426e253490071b196c9ab10325760fa70db76e948da7f847823de4376b24b6bdb8d383e7933837c9b1dd096a4bc3ae0d97e01b12142cc1d3c4 SHA512 ce3ba04f1326ec806e852a4a3eb14f38fefb7ed76b09107bb2a2618be80f6b79f9c9682c89f8c34c4a2a4c1fede97d77db49b9ccc74678577710c00f51e802e4
+EBUILD libtheora-1.1.1-r1.ebuild 2281 BLAKE2B 07dddc9f1faf461c15a81ce1fb8d6026c0de6d103589e7f1baa61370e890b5a5fa5b467667e8e53c87eefbb865e4cf4b09ebdca843e61b1b57e82e5d32e40597 SHA512 931f75c09195a979b830a824b053db327ae5e52bd5bc5da2b23d3b1ed0acd1ec1a862b9a68d0582143e2ef0d4a4b72848454ca365b59f780f6e8bc59f16de1b5
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
index 431bf0cc0545..58995ddb75e8 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
@@ -10,7 +10,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 ~arm-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"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index f5e04a9a2b14..4dc736bde447 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 1069 BLAKE2B 8bf55a682cf50cdf2767439e6376f507bf19e540e0c6d035b4eb644423704d63f1a1c37760e509e1f220966cc6f1012d60580707db67bad49468f78657867fb6 SHA512 5c4ed5e5a4e80a61e2eb49e13ada75dc2333e402117189f6013ba73f0148f42799a7b6a920c41c49540bcea6659766855d9a5e69b48f012c593ea54871838b3b
+EBUILD libvorbis-1.3.6.ebuild 1058 BLAKE2B 486d6b54fde7aa70822b87daf4cb95eaf9773ce2c677aaae48476c219c775b885cad7a78d3bed03f7b1f47f7a0cdac516fb3f6c8296d2442749d65b4b425184c SHA512 358f38b78703297b6048e30dbfc93011d27520c68f3243891a08ad8840d5aeae192ac0470426716a20fdeb13777b03380d561d99c5ef4fe3e60ecc9dfb6a4359
 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 a18f3cc1cab5..a30da38d9e8e 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 ~arm-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/mesa/Manifest b/media-libs/mesa/Manifest
index f2f899c3da98..d627c2451e22 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,15 +1,11 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
-DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d
 DIST mesa-18.1.6.tar.xz 11142884 BLAKE2B fdd156fe7debf5223285dfa238070a2bd7d8ec684dec168afab78b9d2d38d53c10d939aaa64f34c2910e542dce3869adfca6383fca6a854c6dd03287a044b0e3 SHA512 2966210800215f5ced2720691063a8519b51ebeab9fb1e99bde4b1bd7ccc719d6395a1c29f25c88efe62d1592cf14ceafc163aca349490b1f8cee81070d46fcc
-DIST mesa-18.1.7.tar.xz 11136580 BLAKE2B a3076803dce9264e1b2138614398f046cef945a2658a13bc0447a712a45e7177291071884378a4c969e793a98680b90921c272991594957e5ef04c1087b1fb5f SHA512 697c4f441ae52bc867d9d73b103094a29102168c248a502c4ea0fc48f51bcb86b2e741da39e882f24131326d460cdb1416415604c6994d1b8c09fb8a153a5c77
-DIST mesa-18.2.0-rc3.tar.xz 11327960 BLAKE2B 7ce236d6a308904a8f76b2fda86af181ae4e422d637caffb45ffd5ce0ed427fdfbd107f44c52825bff173ec8aaf4e3a3dbae939167da9f6a1a719b7366914526 SHA512 175dbdffdcdf61c7ac0e4e1fae021daba80311fac02074ad6dea208971ab50c68bc43ba8d7b36ecf82b7081c051d301cb562f66785446973b88657d48f7bb663
-DIST mesa-18.2.0-rc4.tar.xz 11320208 BLAKE2B bf99295f462ec8162bced6ff6d8496f3d2246ef85b5b6512f1b2d6c6ac63c04a2677b0e0368e857e0becd0ea08d96c53c557a4a103bbee8e169d3e1f80dd9092 SHA512 8aa5c75567c23228c80174c36f1cbc30bea79e5a5cf93804a9ca6c6142c428c55ea256b0a76d83493a52d60d4c4ace96ae81434f01fcdfc1971151bf3900f655
-EBUILD mesa-17.3.9.ebuild 14465 BLAKE2B 9fbe7ed8fd4f46d918288fe6f8b944d56cdd470c804d2786a19ef713b65c6b609e7286425c2cdc47aa52fd509af02eb077bea83ba04fa9dc232b2e6e19e59b1f SHA512 2f09d42d19cb4ef714d6b5fc1b6526f630393428522d98d24106d351a135e93eab172a2072e11cd9968e9c9e18da82b3f96cd7f6b0dc81ab316db80d6c542e3a
-EBUILD mesa-18.0.5.ebuild 14421 BLAKE2B d1170f83f571b84a1c3906b02aff38190c9586e3a22928b3f85b16c98448c928574faa18975bc01210c524d10221af679a894c975f83e0cdbca0146b553950a1 SHA512 a9d5c7284211a34f8022388838fedf2df792bac3188cc4e12ed4a5f362a978651b39c571402d798e559bc625708a2dd3a0363c19ccc43dfed9de81eda40e22b7
-EBUILD mesa-18.1.6.ebuild 13426 BLAKE2B 0bff5bf2683d72f587f338059891d0793e46388c928889f1f87f0188bdaaac53598bf54ecd43d8df5e52eb8ca283a6ef345929c7ccefd986d8a9a88c0eb40c64 SHA512 d91efb79205c93049d00f577088dcb43e258ae85d942c65516ff404d07aad36dfdb37d4f1a791c2ce0b0fbe695e9ca7304093dfd11175bcce5bb8a19373f1bde
-EBUILD mesa-18.1.7.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
-EBUILD mesa-18.2.0_rc3.ebuild 14361 BLAKE2B fc960ca9fb0edc6c3b5069cbe78b9538bfa8e934de75964a5e13520aea452d9234d7469a654595252139dd508a74ffe5b9f0e6fa2d94ed216f91b7dd2dfe6dff SHA512 ef0d0754e18789bb297d83ac6abc1b4d626bfc1c0499854627cdce47cc36ec5421f28959b533b3d9c1171321e3b85069ad156aa9193b5c1e48c2345d67fb2169
-EBUILD mesa-18.2.0_rc4.ebuild 14361 BLAKE2B fc960ca9fb0edc6c3b5069cbe78b9538bfa8e934de75964a5e13520aea452d9234d7469a654595252139dd508a74ffe5b9f0e6fa2d94ed216f91b7dd2dfe6dff SHA512 ef0d0754e18789bb297d83ac6abc1b4d626bfc1c0499854627cdce47cc36ec5421f28959b533b3d9c1171321e3b85069ad156aa9193b5c1e48c2345d67fb2169
-EBUILD mesa-9999.ebuild 14412 BLAKE2B 9f12d63fbf9025703d11620eef373739e3040e36805dac1fae16dd5c31a7ea7f68358bd4b30a13852ddf9c1ede0ac233b37320af528ab5171ce761131c6c8df8 SHA512 35e440cc790485dbf6e898e2a8c82e79ab768b65b46434b127c0e82e0670fee9ee4f49f284a3f82b5e0d097f43dcb31a509ee294c5cea62c7f08b7ab0b31ab40
+DIST mesa-18.1.8.tar.xz 11139864 BLAKE2B bdbd6c186f79b708656a44177b352e9188b8b846c816f8457c99ff76607019f856e19f5eba1c2473d998cd020aa03e732f25f9253f1acdd7f3d9b1470f42ec9e SHA512 ab89c6d27b765d3efdf61b24dc56d863ae590d83003d2eae4bfe25ecfbeda5bee0227f21d057523bb4eceeaf3d9955df48087ffb472c41b123c100e593056cb9
+DIST mesa-18.2.0.tar.xz 11331164 BLAKE2B e4e7c65a0c3c0716451157f7d026df8836399b5a25ca7ce77746b34f82e0c14d0bfcb965732f67c979190c2c2db68f272ffafa51b49613a510f186e9e8a01c93 SHA512 e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557
+EBUILD mesa-17.3.9.ebuild 14454 BLAKE2B 52f9e0eb1ea0b2de956cd36e57838b43973d0ba4eb615680211f7708e06a91f7038338cba397dc129126bcfff22ff724c7128cd20804ffcb3ab6d611385a38ca SHA512 42d1e22328063f431ccc762914d9c6023f3302d81718703aeb75264305a060997371cb058307ebe493ff4d56cd5b1740c0b748419aa84ea9da003126379e528f
+EBUILD mesa-18.1.6.ebuild 13415 BLAKE2B eca0a2216ed420315b672a6435ccc0e05c00753851e45c26130fb0272faa3a35c845bd49be141d064d19fecf5ab90ebd4fc4e859753e8798e3f3650a95ff111d SHA512 6a0c20fee8b782a5fee56fa4c20d667d84b39d6f12cb7528a7473c73c4a2ede44f408078ace08b236cf24d8645e09efb7346573294a0241c35671f089f3220f5
+EBUILD mesa-18.1.8.ebuild 13421 BLAKE2B 75a3db046a6addf6836ccb1ccfddb340f5cb584dc8d1f5ddd47e1e8afaaeec93750160ef5d4075378b6ea73f04197de50c5e10eef5699d9bff0fab65f92d7fa3 SHA512 5d065f029ca279841cea4242c923ad2bc2937817d304ee84a20ef5df72f11b6a3442e019a38167e1fb80059a13124dae23385d71fe16b1a8e348928e2fbea7ff
+EBUILD mesa-18.2.0.ebuild 14411 BLAKE2B c2ac56941f2e981b33c8b487297ac9ff569206a532db2ec55730726d416174f1d2d3c4d383bd548fcdb22e95f6c5b57d5f52c7635a5080ae9bd658663eaedfa3 SHA512 80016fc4a6c9ba109380259c8367134bba3c24cde895829730b1250ae9759cf256c1d9b12990ca63117c62abc558261041fed4dcb31b7c4c5e1932d7bd8d075a
+EBUILD mesa-9999.ebuild 14451 BLAKE2B f2a07a106fdf43e9a0de6581b66a94b25551519263491bd1a9d8e32b199334decc9cd69cf41ab72cf5983ed1c08e560ad62c015856bf61a32f0c8d108725fdb0 SHA512 1d862b2132e4bbab6bd7562ebd140dd3cb0099c8ecfeb57e3aa50731417f1ec3f5d2f2982de14a9853db1cf554eadf77b64572857f6bb72c82f199776f5e9cfc
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index 58f8f3fe0525..d2abc9e9a640 100644
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-18.0.5.ebuild b/media-libs/mesa/mesa-18.0.5.ebuild
deleted file mode 100644
index 1fef2ab051cf..000000000000
--- a/media-libs/mesa/mesa-18.0.5.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-RDEPEND="
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-	eapply_user
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-18.1.6.ebuild b/media-libs/mesa/mesa-18.1.6.ebuild
index bb7a9cee34d2..7894f2b36919 100644
--- a/media-libs/mesa/mesa-18.1.6.ebuild
+++ b/media-libs/mesa/mesa-18.1.6.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-18.1.7.ebuild b/media-libs/mesa/mesa-18.1.8.ebuild
index fab799310391..749c5c07c8a6 100644
--- a/media-libs/mesa/mesa-18.1.7.ebuild
+++ b/media-libs/mesa/mesa-18.1.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-18.2.0_rc3.ebuild b/media-libs/mesa/mesa-18.2.0.ebuild
index 76e780a05ff7..ce53ca4e9ad9 100644
--- a/media-libs/mesa/mesa-18.2.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-18.2.0.ebuild
@@ -281,8 +281,9 @@ pkg_pretend() {
 
 	if use xa; then
 		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
+		   ! 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
 
@@ -347,9 +348,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	if use egl; then
-		emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-	fi
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
 
 	if use gallium; then
 		emesonargs+=(
@@ -387,7 +386,8 @@ multilib_src_configure() {
 		fi
 
 		if use video_cards_freedreno ||
-		   use video_cards_nouveau; then
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
 			emesonargs+=($(meson_use xa gallium-xa))
 		else
 			emesonargs+=(-Dgallium-xa=false)
diff --git a/media-libs/mesa/mesa-18.2.0_rc4.ebuild b/media-libs/mesa/mesa-18.2.0_rc4.ebuild
deleted file mode 100644
index 76e780a05ff7..000000000000
--- a/media-libs/mesa/mesa-18.2.0_rc4.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 )
-	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.93"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					app-eselect/eselect-opencl
-					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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/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 d3d9; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
-		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 d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
-		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
-}
-
-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
-
-	if use egl; then
-		emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-	fi
-
-	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=/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; 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
-		# opencl stuff
-		if use opencl; then
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-}
-
-# $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 229179f667aa..a930dcd57c2e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -281,8 +281,9 @@ pkg_pretend() {
 
 	if use xa; then
 		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
+		   ! 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
 
@@ -347,9 +348,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	if use egl; then
-		emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-	fi
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
 
 	if use gallium; then
 		emesonargs+=(
@@ -387,7 +386,8 @@ multilib_src_configure() {
 		fi
 
 		if use video_cards_freedreno ||
-		   use video_cards_nouveau; then
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
 			emesonargs+=($(meson_use xa gallium-xa))
 		else
 			emesonargs+=(-Dgallium-xa=false)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 7105f22fc4ec..91a03f99398c 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,22 +1,4 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
-AUX mlt-6.2.0-ruby-link.patch 689 BLAKE2B c28f6d337b2c272bd6e51e06ae53b01a5de6c8486cf3d774edbf5afc2c45b667fdccb971595b101a8d910aa5fa9e82aecb18a43c3653cce3b6076fd99a8b8034 SHA512 54b468fdba4cc9fd92a06e31d7b59e602c4c8541f6d227a56b8a028e7be8f580541838ce5d8e5d9b841a0ff8ab56ab96a40990c9e86e15952da51ae4ce825b15
-AUX mlt-6.4.1-glibc226-1.patch 1224 BLAKE2B 61205dd879fefe2b673b67637969981c4334de1bc0d4129dcfdb13dd47c4b4e70d47234fbed3eb727b3ab3f32471f39e37844a745224bbf16720c08877c1b1ff SHA512 d2113579e75061dbd9f873828ef115a6da3f39300dda9b02573792b1e18b0ef662b4cce58f9d6f7c1fecedbdf7fe8d74deb34cdcb90a9bf64fd1c08a89f15810
-AUX mlt-6.4.1-glibc226-2.patch 732 BLAKE2B d5fe9842f7df2896d454abebee946b985d9b11e4a9179850d21ee827741cd4765d505cb60f6c479a325adb5b1d91f61766a4e4cc5b3a8450ebd0cf5b0473b764 SHA512 3a696bb3ffbc8940b39fecf3dbee21d938a417fdd28aaf59d17b184a941bf2b45bbfde40f9b84e358517cee5db2da47e19f69488ca518a255267241c8dca7db3
-AUX mlt-6.4.1-libebur128-unbundle.patch 4162 BLAKE2B d7d3094e514f52d4fe5de2791e56df4f62d2e9f029343d70e8ebd51fc334db06b1de5179446a8e3ebe2bde0cd1d3279ed6b3de4e028e79a4842153bd0e51bed2 SHA512 70db75522fce9ba8b296cb86c4574ba499e6274eb1cab3170e0524cba76482af4fde49a2c422215461ceb6f1258c00e535914c90c177b93893c2b330ad0cd08b
-AUX mlt-6.4.1-opencv-3.3.patch 1346 BLAKE2B 686a28e6d08795919dc6bc9429f0cf3494a540ecd4f5b45018c8dca2fb7014cb9dec34177fd117a2cf58d88a0579b3e7df6eaa64d6eb12fa150c654ba1f9dd9d SHA512 5bab43be1a0e85764a7a80f58a1f211aef737a6ccbe3d9080e12103235891a0418aa8505268a71632b737834c9a5eb379bdefcb24f63862a596860dd118ee622
-AUX mlt-6.4.1-qtopengl-1.patch 993 BLAKE2B f8f84d0c2b3e08eb8f7a69b915af0e6784c4033e788df5ad6b83abe4a833839ca23fb8773761ce61bcf725dd125efad31c8075fe75ab64c46d76ce5b3097926c SHA512 4acc3ff23c286748986236211b20f6b6192828908e7177bd2056da87dcdc1f9abe93bf50f7d53e2ccac148d6ab757371619f02d4e2ac77fb6b810580804e9696
-AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b958a6df55cacf5d24a05ff2e33f1dad032ff5813aaf224d843988d511ad093b5eaa3314d306493a4d359307bd576 SHA512 dd1c0972e5b659c777a94a05a7d070e0e1ffdf1a364f24213ad7ab37bf90e9d7209711dd1e1dd106ed260721a32533fd4873d0df28e5ac683eb88ccdbbd0947f
-AUX mlt-6.6.0-gif-encoding.patch 1173 BLAKE2B 0396640a30e827b9789540db7df643a82fa64d5748e206e6a7b1dbb6fa30c45dc0c170b067c83968a0497bb2e765b5971e33d3b8d945310d7eceb4c44cc6f2d8 SHA512 2b80a8853002c8f129b376826532ca1b3147f933bb83adf9e960224f165f4078cb3a8a273f153d95a8171407da6de5549e26bc95effaa48a423242f37f071655
-AUX mlt-6.6.0-kdenlivetitle-crash.patch 803 BLAKE2B 30d8552398ffa355196dd418110cbac512f6800004c14ece7deddd4210781859c3fc81380816e06b89b0abe6b23a50d40cb17e8e44cdfd63b3331214dc26b157 SHA512 cbbf45c018419f32bc08b378369acf2af91616c569f72fcb35f20e46231f00225d533d77032c9aac3f04ac4eaf003b75ebff73b8e687c7cb13267f6b5a45bf85
-AUX mlt-6.6.0-libav-1.patch 1433 BLAKE2B 3549e44e1957e4fce9558f4d2494e430f36f2a02bbad4fed5510103141df494886561c3c722a21c94b74514d3b2b559e71ee4471fa43c57f5e7f8569a70b675f SHA512 dec1bc755f41c76fe907332aa0f5de9a3c8694b2881e9b7ab7768800343e000e0f216f341167e128b1e1763f4933df32f7e8bc805e0f4436d11eaffe838c29bb
-AUX mlt-6.6.0-libav-2.patch 1175 BLAKE2B 57753322de41f78d28178eb2bbcc5b5faca6a54561599977ed95c681186e4560454c86bc4229d326411ecbd5ccb51caff74451b957763844b6a09a80b58fddf4 SHA512 6ccf1aa9560c1e521e661c45ab5ae49ec88d4f58259cf6b5b8dadb1e17d7f3e0bfe7917f07d16405d68ab65539538f14312be5acf0688ada3975908db28cfa9e
-AUX mlt-6.6.0-libav-3.patch 1072 BLAKE2B 64d37848454714431df843327f35cafd643036e796d2045986db98f0602078b0291191c618b6be34d9a3286809af7e2a7d88cbb5d2e46f975185f729aa1bb977 SHA512 cd02085fbdd4d5a1ea78d1cda286207fdb0d9487c6db9fed8a2ee87f352e660b8ebd32593613ee8d9d93bc690a6f7d97b31fe840e921fae95f36c1898435d6c7
-AUX mlt-6.6.0-png-segfault.patch 1606 BLAKE2B 9ca96cf4477e84bcb903b64019437ce730a4619db8e04e99828dc793c67982adde32aa5d17962e6f8db48981e34eecfdb4bf9d9d469b58349b8a25865a574751 SHA512 44251f87e0d288fc9b05577f41a5c75e26813a2d95d6133a9b541825b5a73c272d1209bb678686ca84388664a22e0da2d7e3fb44507ae15c71924dbae498dc74
-AUX mlt-6.6.0-vorbis-ffmpeg-3.4.patch 1297 BLAKE2B 65b39a7ecfd4d26b3a18b044b95c2fe3e2c31298e681de4411935ee1dc8e261a8a8a3fc8ae11e3138e500dd50f1d8a97c97fb336b3d0d2d15a69f4336d09dee1 SHA512 f5a07939811b91c9490b16923aac72c172b1fb789b8c3b0e628b77cebf063d310487c39da0f47ea2d26cdba0b91fda4a7bfe2399862353fe0350b624970641ff
 DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
-DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
-DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
-EBUILD mlt-6.10.0.ebuild 5525 BLAKE2B fa6214ba97669566c07271bc4955fa3e0b9a6141cb4b569982aa2911da529c284bda7a366e144c65dbe251779b18b4ed5a1b8a5b1177a053c7a026c251657570 SHA512 42f379a1017269712108396f0af8e42df2b69c2a99cb6b2173e9df063e0399fcada88c0888eb2f1796f83a7a53f3811fd2cc83131bf2ede7bbb322db63f4e35d
-EBUILD mlt-6.4.1-r6.ebuild 5685 BLAKE2B 9785e64a795bfa740e4e70b4c4941b2be9ef3ceeb936c112137e137c19e814cbca10b168498e1da4e5e63010589c98f21c0cc06d23a60870fd645d0229679293 SHA512 f77ba0383dc88fb9f5d473fee589995a8b8a77d433b691e54e165c3785adcdc0d8dc2c6af34f7eb4e17d866769cf85e1e3f8066acacf27d3b70460ec382d19d3
-EBUILD mlt-6.6.0-r1.ebuild 5960 BLAKE2B 1fd26d86d6107d2b0231615c677922184390fa8cee8ebcad80eea72ca9cdcebbcf60442716a2e8e958638fe0b19ba12e7a7d4e69e0af4712baa3c1eca1d22678 SHA512 46eaad177bc728cde05985ddb93780a33d941fe32d4d40c99383490843a9b56ff9521ed6f92ba575654da147ab3e592563d7227186ad83e4c7843afb1785c99d
-MISC metadata.xml 1571 BLAKE2B d048070896ee31a768268cef47e8b051d24a7a48a0728a82045f8a1cccc361378945cb6d84dadb31a7c664e5f57fe15dde85e08fc579fe8f839ce5c3e64e75cc SHA512 6dbfe8206f62d5c8801e2f3a71ab409a3f3072f600d6fc935b1dbb0cc4cb67f3a0ed221a3c6a76977b3fbea60c7fb7bbf2047e55ef5a7a5aacc8bf60252fcc01
+EBUILD mlt-6.10.0.ebuild 5524 BLAKE2B 216ca60f42eb43066c1bcbf222f253b409fd4b14ae8deb83a1c6964807d9791efc144bcdbf6ab98d29f6381de9d8cc1a440806f1a61a1cf67bd51a1c87c3ed39 SHA512 61f21d98f1b972e2a5c3397567b2c88374343cb1dfada705caff553655cd463bb2aee7a00b4c851b09581fdbc1ecb32f9cd89c2e9c3e97a3e63b4fc649832178
+MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch b/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch
deleted file mode 100644
index 35341b4c2050..000000000000
--- a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The build system tries to link to installed system libraries first, which
-fails because the ABI has changed...
-
---- a/src/swig/ruby/build
-+++ b/src/swig/ruby/build
-@@ -5,9 +5,11 @@
-   exit 0
- end
- system( "ln -sf ../mlt.i" )
-+system( "ln -sf ../../framework/libmlt.so" )
-+system( "ln -sf ../../mlt++/libmlt++.so" )
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
- $CFLAGS = $CFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
- $CXXFLAGS = $CXXFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
--$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++"
-+$LIBS += " -lmlt++ -lmlt -lstdc++"
- create_makefile('mlt')
- system( "make V=1" )
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
deleted file mode 100644
index 2f486939d8f7..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Sat, 26 Aug 2017 18:31:47 -0700
-Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported by schnitzeltony on Andreas Müller.
-Patch by Dave Plater.
----
- src/framework/mlt_property.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 404d513f..043f530b 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -3,7 +3,7 @@
-  * \brief Property class declaration
-  * \see mlt_property_s
-  *
-- * Copyright (C) 2003-2014 Meltytech, LLC
-+ * Copyright (C) 2003-2017 Meltytech, LLC
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -31,7 +31,11 @@
- #endif
- 
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--#include <xlocale.h>
-+#  if GLIBC_MINOR >= 26 && !defined(APPLE)
-+#    include <locale.h>
-+#  else
-+#    include <xlocale.h>
-+#  endif
- #else
- typedef char* locale_t;
- #endif
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
deleted file mode 100644
index d992ee32e06c..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Wed, 30 Aug 2017 09:08:16 -0700
-Subject: [PATCH] Fix glib test macros to include locale.h.
-
----
- src/framework/mlt_property.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 043f530b..3ecebd67 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -31,7 +31,7 @@
- #endif
- 
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--#  if GLIBC_MINOR >= 26 && !defined(APPLE)
-+#  if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
- #    include <locale.h>
- #  else
- #    include <xlocale.h>
diff --git a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch b/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch
deleted file mode 100644
index e9aaa25cf324..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From fad1df2bc8efc2881867e510443547fddf5d620b Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Sun, 19 Feb 2017 23:35:17 -0600
-Subject: [PATCH 1/2] Use external libebur128 if detected.
-
----
- src/modules/plus/Makefile  |  7 +++++--
- src/modules/plus/configure | 11 +++++++++++
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
-index 90067a56..351e7b76 100644
---- a/src/modules/plus/Makefile
-+++ b/src/modules/plus/Makefile
-@@ -22,14 +22,17 @@ OBJS = consumer_blipflash.o \
- 	   filter_sepia.o \
- 	   producer_blipflash.o \
- 	   producer_count.o \
--	   transition_affine.o \
--	   ebur128/ebur128.o
-+	   transition_affine.o
- 
- ifdef USE_FFTW
- 	OBJS += filter_dance.o \
- 	   filter_fft.o
- endif
- 
-+ifdef USE_INTERNAL_LIBEBUR128
-+	OBJS += ebur128/ebur128.o
-+endif
-+
- SRCS := $(OBJS:.o=.c)
- 
- all: 	$(TARGET)
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure
-index fbd49807..e38464b4 100755
---- a/src/modules/plus/configure
-+++ b/src/modules/plus/configure
-@@ -16,5 +16,16 @@ then
- 		echo "- fftw not found: disable fft and dance filters"
- 	fi
- 
-+	pkg-config libebur128
-+	if [ $? -eq 0 ]
-+	then
-+		echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
-+		echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
-+	else
-+		echo "- libebur128 not found: using internal libebur128"
-+		echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
-+		echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
-+	fi
-+
- 	exit 0
- fi
-
-From 9951883b895eb920b7f67ea67a0753d8dea21a9e Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Mon, 20 Feb 2017 08:15:52 -0600
-Subject: [PATCH 2/2] Fix include directives for ebur128 filters.
-
----
- src/modules/plus/Makefile                  | 2 +-
- src/modules/plus/configure                 | 2 ++
- src/modules/plus/filter_dynamic_loudness.c | 2 +-
- src/modules/plus/filter_loudness.c         | 2 +-
- src/modules/plus/filter_loudness_meter.c   | 2 +-
- 5 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
-index 351e7b76..366bca19 100644
---- a/src/modules/plus/Makefile
-+++ b/src/modules/plus/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS += -I../.. -Iebur128/queue
-+CFLAGS += -I../..
- 
- LDFLAGS += -L../../framework -lmlt -lm -lpthread
- 
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure
-index e38464b4..59662ca0 100755
---- a/src/modules/plus/configure
-+++ b/src/modules/plus/configure
-@@ -19,12 +19,14 @@ then
- 	pkg-config libebur128
- 	if [ $? -eq 0 ]
- 	then
-+		echo "- libebur128 found: using external libebur128"
- 		echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
- 		echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
- 	else
- 		echo "- libebur128 not found: using internal libebur128"
- 		echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
- 		echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
-+		echo "CFLAGS += -Iebur128 -Iebur128/queue" >> config.mak
- 	fi
- 
- 	exit 0
-diff --git a/src/modules/plus/filter_dynamic_loudness.c b/src/modules/plus/filter_dynamic_loudness.c
-index 07551f14..99c83051 100644
---- a/src/modules/plus/filter_dynamic_loudness.c
-+++ b/src/modules/plus/filter_dynamic_loudness.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
- 
- typedef struct
- {
-diff --git a/src/modules/plus/filter_loudness.c b/src/modules/plus/filter_loudness.c
-index 8b74b5c9..0614fecc 100644
---- a/src/modules/plus/filter_loudness.c
-+++ b/src/modules/plus/filter_loudness.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
- 
- #define MAX_RESULT_SIZE 512
- 
-diff --git a/src/modules/plus/filter_loudness_meter.c b/src/modules/plus/filter_loudness_meter.c
-index 9926f945..6c81d19f 100644
---- a/src/modules/plus/filter_loudness_meter.c
-+++ b/src/modules/plus/filter_loudness_meter.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
- 
- typedef struct
- {
diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
deleted file mode 100644
index 0a3732da2e30..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001
-From: BoboopTeam <BoboopTeam@users.noreply.github.com>
-Date: Thu, 7 Sep 2017 22:14:48 +0200
-Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create()
-
-This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer
----
- src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
-index 48ffb56b..3cfc07d2 100644
---- a/src/modules/opencv/filter_opencv_tracker.cpp
-+++ b/src/modules/opencv/filter_opencv_tracker.cpp
-@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
- 		data->algo = mlt_properties_get( filter_properties, "algo" );
-                 if ( data->algo == NULL || !strcmp(data->algo, "" ) )
-                 {
--			data->tracker = cv::Tracker::create( "KCF" );
-+			data->tracker = cv::TrackerKCF::create();
-+		}
-+		else if (!strcmp(data->algo, "MIL" ))
-+		{
-+			data->tracker = cv::TrackerMIL::create();
- 		}
- 		else
--                {
--			data->tracker = cv::Tracker::create( data->algo );
-+		{
-+			data->tracker = cv::TrackerBoosting::create();
- 		}
- 
- 		// Discard previous results
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch
deleted file mode 100644
index c00e8d05615b..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d2a04ae77a6b2c82a2e12b9fb631beb8f825946d Mon Sep 17 00:00:00 2001
-From: Alberto Villa <avilla@FreeBSD.org>
-Date: Sat, 24 Dec 2016 05:07:54 +0100
-Subject: [PATCH] Move Qt OpenGL include(s) to Qt 4 specific code
-
-Only Qt 4 code references those files (QMutex and QWaitCondition are
-not OpenGL files, but still they're only useful in Qt 4 code).
----
- src/modules/qt/consumer_qglsl.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp
-index 74840602..ca0cf383 100644
---- a/src/modules/qt/consumer_qglsl.cpp
-+++ b/src/modules/qt/consumer_qglsl.cpp
-@@ -20,13 +20,14 @@
- #include "common.h"
- #include <framework/mlt.h>
- #include <QApplication>
--#include <QGLWidget>
--#include <QMutex>
--#include <QWaitCondition>
- #include <QtGlobal>
- 
- #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- 
-+#include <QGLWidget>
-+#include <QMutex>
-+#include <QWaitCondition>
-+
- class GLWidget : public QGLWidget
- {
- private:
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch
deleted file mode 100644
index 5f98f12bbb1a..000000000000
--- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6ba6cab570d824641f63c66b355ba28f0721811f Mon Sep 17 00:00:00 2001
-From: Alberto Villa <avilla@FreeBSD.org>
-Date: Sat, 24 Dec 2016 05:10:20 +0100
-Subject: [PATCH] Avoid looking for Qt5OpenGL module
-
-The OpenGL-related code needed by qimage was moved to Qt5Gui, which
-allows to safely remove the dependency on Qt 5 builds.
-
-Build tested on FreeBSD.
----
- src/modules/qt/configure | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git a/src/modules/qt/configure b/src/modules/qt/configure
-index 24803baf..7475dc09 100755
---- a/src/modules/qt/configure
-+++ b/src/modules/qt/configure
-@@ -107,14 +107,6 @@ else
- 		then
- 			echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak
- 			echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak
--			if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ]
--			then
--				echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak
--				echo QTLIBS+=-lQt5OpenGL >> config.mak
--			else
--				echo "- Qt5OpenGL not found: disabling"
--				without_opengl=true
--			fi
- 		# Qt5 on OS X
- 		elif [ -d "$qt_libdir/QtWidgets.framework" ]
- 		then
-@@ -123,11 +115,10 @@ else
- 				-I$qt_includedir/QtGui -I$qt_libdir/QtGui.framework/Headers \
- 				-I$qt_includedir/QtXml -I$qt_libdir/QtXml.framework/Headers \
- 				-I$qt_includedir/QtSvg -I$qt_libdir/QtSvg.framework/Headers \
--				-I$qt_includedir/QtOpenGL -I$qt_libdir/QtOpenGL.framework/Headers \
- 				-I$qt_includedir/QtWidgets -I$qt_libdir/QtWidgets.framework/Headers \
- 				>> config.mak
- 			echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework \
--				QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
-+				QtXml -framework QtSvg -framework QtWidgets >> config.mak
- 		# Qt4 on OS X
- 		elif [ -d "$qt_libdir/QtGui.framework" ]
- 		then
-@@ -151,15 +142,6 @@ else
- 			without_kde=true
- 			echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
- 			echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
--			pkg-config --exists 'Qt5OpenGL'
--			if [ $? -eq 0 ]
--			then
--				echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
--				echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
--			else
--				echo "- Qt5OpenGL not found: disabling"
--				without_opengl=true
--			fi
- 		else
- 			pkg-config --exists 'QtGui >= 4'
- 			if [ $? -eq 0 ]
diff --git a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch b/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch
deleted file mode 100644
index 4faecdc78792..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7c2f271170892094a0cccdb517ca1b6061208d7 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Mon, 12 Mar 2018 15:20:29 -0700
-Subject: [PATCH] Fix #284 GIF encoding not working.
-
-This also fixes DPX.
----
- presets/consumer/avformat/GIF            | 1 -
- src/modules/avformat/consumer_avformat.c | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/presets/consumer/avformat/GIF b/presets/consumer/avformat/GIF
-index f6a0cd41a..da7361851 100644
---- a/presets/consumer/avformat/GIF
-+++ b/presets/consumer/avformat/GIF
-@@ -7,4 +7,3 @@ bf=0
- 
- meta.preset.extension=gif
- meta.preset.name=GIF Animation
--meta.preset.hidden=1
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index caac488e2..c3724d131 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -71,7 +71,7 @@
- #define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS)
- #define AUDIO_BUFFER_SIZE (1024 * 42)
- #define VIDEO_BUFFER_SIZE (8192 * 8192)
--#define IMAGE_ALIGN (1)
-+#define IMAGE_ALIGN (4)
- 
- //
- // This structure should be extended and made globally available in mlt
diff --git a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch b/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch
deleted file mode 100644
index b65a63d87667..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 95f7f7bc104ec35ed3c909e52d928313fd35a48c Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Mon, 19 Mar 2018 09:20:49 +0100
-Subject: [PATCH] Fix crash with kdenlivetile caused by wrong malloc size
-
----
- src/modules/qt/producer_kdenlivetitle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/qt/producer_kdenlivetitle.c b/src/modules/qt/producer_kdenlivetitle.c
-index 67508aa33..4dc5d9c6b 100644
---- a/src/modules/qt/producer_kdenlivetitle.c
-+++ b/src/modules/qt/producer_kdenlivetitle.c
-@@ -41,7 +41,7 @@ void read_xml(mlt_properties properties)
- 			goto error;
- 		rewind (f);
- 
--		char *infile = (char*) mlt_pool_alloc(lSize);
-+		char *infile = (char*) mlt_pool_alloc(lSize + 1);
- 		if ( infile )
- 		{
- 			size = fread(infile,1,lSize,f);
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch b/media-libs/mlt/files/mlt-6.6.0-libav-1.patch
deleted file mode 100644
index 6dc5a73c7fe2..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bd59735b4f97ae9dff864debdecc2318b0cb8f94 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Mon, 12 Feb 2018 12:21:19 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/producer_avformat.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 214c8b325..7de997cc2 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -1,6 +1,6 @@
- /*
-  * producer_avformat.c -- avformat producer
-- * Copyright (C) 2003-2017 Meltytech, LLC
-+ * Copyright (C) 2003-2018 Meltytech, LLC
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
- 	return 0;
- }
- 
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
- struct sliced_pix_fmt_conv_t
- {
- 	int width, height, slice_w;
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- 		sws_freeContext( context );
- 	}
- 	else
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
- 	{
- 		int i, c;
- 		struct sliced_pix_fmt_conv_t ctx =
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch b/media-libs/mlt/files/mlt-6.6.0-libav-2.patch
deleted file mode 100644
index d29cabec704a..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 56e3affe1ff425d979ea9f2a5e086d769852c3fc Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 16 Feb 2018 09:55:29 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/producer_avformat.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 7de997cc2..2fafd00e8 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
- 	return 0;
- }
- 
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
- struct sliced_pix_fmt_conv_t
- {
- 	int width, height, slice_w;
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- 		sws_freeContext( context );
- 	}
- 	else
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
- 	{
- 		int i, c;
- 		struct sliced_pix_fmt_conv_t ctx =
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch b/media-libs/mlt/files/mlt-6.6.0-libav-3.patch
deleted file mode 100644
index fdbd5ef271f2..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 53181a4e4629e2cd22c6f5d16a459aa843f4bd65 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 23 Feb 2018 10:04:47 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/consumer_avformat.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index 6deb76df5..ba5c900c7 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -1647,7 +1647,9 @@ static void *consumer_thread( void *arg )
- 			enc_ctx->audio_avframe->format = c->sample_fmt;
- 			enc_ctx->audio_avframe->nb_samples = enc_ctx->audio_input_frame_size;
- 			enc_ctx->audio_avframe->channel_layout = c->channel_layout;
-+#if LIBAVCODEC_VERSION_INT >= ((57<<16)+(96<<8)) && LIBAVCODEC_VERSION_MICRO >= 100
- 			enc_ctx->audio_avframe->channels = c->channels;
-+#endif
- 		} else {
- 			mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" );
- 			mlt_events_fire( properties, "consumer-fatal-error", NULL );
diff --git a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch b/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch
deleted file mode 100644
index c93458a8273b..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e013fd7c2f49b40a1b482d712d531329d538da88 Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Wed, 31 Jan 2018 20:57:42 -0600
-Subject: [PATCH] Fix segmentation fault when using qimage png producer #296
-
----
- src/modules/qt/qimage_wrapper.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/qt/qimage_wrapper.cpp b/src/modules/qt/qimage_wrapper.cpp
-index 436f65d15..99b4ebf8e 100644
---- a/src/modules/qt/qimage_wrapper.cpp
-+++ b/src/modules/qt/qimage_wrapper.cpp
-@@ -229,18 +229,19 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
- 		QString interps = mlt_properties_get( properties, "rescale.interp" );
- 		bool interp = ( interps != "nearest" ) && ( interps != "none" );
- 		QImage *qimage = static_cast<QImage*>( self->qimage );
-+		int has_alpha = qimage->hasAlphaChannel();
-+		QImage::Format qimageFormat = has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32;
- 
- 		// Note - the original qimage is already safe and ready for destruction
--		if ( qimage->depth() == 1 )
-+		if ( qimage->format() != qimageFormat )
- 		{
--			QImage temp = qimage->convertToFormat( QImage::Format_RGB32 );
-+			QImage temp = qimage->convertToFormat( qimageFormat );
- 			delete qimage;
- 			qimage = new QImage( temp );
- 			self->qimage = qimage;
- 		}
- 		QImage scaled = interp? qimage->scaled( QSize( width, height ) ) :
- 			qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--		int has_alpha = scaled.hasAlphaChannel();
- 
- 		// Store width and height
- 		self->current_width = width;
diff --git a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch b/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch
deleted file mode 100644
index bdf6ea211d43..000000000000
--- a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7e0d478d161eacea015aa3d116e250e7c5f9f942 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Wed, 7 Feb 2018 16:58:44 -0800
-Subject: [PATCH] Fix vorbis encoding with FFmpeg v3.4+
-
----
- src/modules/avformat/consumer_avformat.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index 434710049..6deb76df5 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -1,6 +1,6 @@
- /*
-  * consumer_avformat.c -- an encoder based on avformat
-- * Copyright (C) 2003-2017 Meltytech, LLC
-+ * Copyright (C) 2003-2018 Meltytech, LLC
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -1647,6 +1647,7 @@ static void *consumer_thread( void *arg )
- 			enc_ctx->audio_avframe->format = c->sample_fmt;
- 			enc_ctx->audio_avframe->nb_samples = enc_ctx->audio_input_frame_size;
- 			enc_ctx->audio_avframe->channel_layout = c->channel_layout;
-+			enc_ctx->audio_avframe->channels = c->channels;
- 		} else {
- 			mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" );
- 			mlt_events_fire( properties, "consumer-fatal-error", NULL );
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 5d86c2c480dc..9cf408a58aae 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="python">Build SWIG bindings for Python</flag>
 		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
 		<flag name="ruby">Build SWIG bindings for Ruby</flag>
-		<flag name="sdl2">Build <pkg>media-libs/libsdl2</pkg> module</flag>
 		<!--
 		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
 		<flag name="java">Build SWIG bindings for Java</flag>
diff --git a/media-libs/mlt/mlt-6.10.0.ebuild b/media-libs/mlt/mlt-6.10.0.ebuild
index f3c8ddcfe776..db4f9d3f7965 100644
--- a/media-libs/mlt/mlt-6.10.0.ebuild
+++ b/media-libs/mlt/mlt-6.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
 gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
 # java perl php tcl vidstab
diff --git a/media-libs/mlt/mlt-6.4.1-r6.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild
deleted file mode 100644
index 96c925f512c5..000000000000
--- a/media-libs/mlt/mlt-6.4.1-r6.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby23"
-inherit eutils flag-o-matic multilib 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}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
-# java perl php tcl vidstab
-IUSE="${IUSE} kernel_linux"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#rtaudio will use OSS on non linux OSes
-COMMON_DEPEND="
-	>=media-libs/libebur128-1.2.2
-	ffmpeg? (
-		libav? ( media-video/libav: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
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		>=media-libs/libsdl-1.2.10[X,opengl,video]
-		>=media-libs/sdl-image-1.2.4
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-#	vidstab? ( media-libs/libvidstab )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-RDEPEND="${COMMON_DEPEND}
-	!media-libs/mlt++
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
-	"${FILESDIR}"/${P}-libebur128-unbundle.patch
-	"${FILESDIR}"/${P}-opencv-3.3.patch
-	"${FILESDIR}"/${P}-glibc226-{1,2}.patch
-	"${FILESDIR}"/${P}-qtopengl-{1,2}.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
-
-	# bug 589848
-	append-cxxflags -std=c++11
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--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 sdl)
-		$(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 xml)
-		$(use_enable xine)
-		$(use_enable kdenlive)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	if use qt5 ; then
-		myconf+=(
-			--enable-qt
-			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
-			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
-		)
-	else
-		myconf+=( --disable-qt )
-	fi
-
-	if use x86 || use amd64 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang="none"
-
-	econf ${myconf[@]} --swig-languages="${swig_lang}"
-
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild
deleted file mode 100644
index ba5ab74a1c2e..000000000000
--- a/media-libs/mlt/mlt-6.6.0-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby23"
-inherit flag-o-matic 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}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl sdl2 vdpau xine xml"
-# java perl php tcl vidstab
-IUSE="${IUSE} kernel_linux"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) sdl2? ( sdl )"
-
-#rtaudio will use OSS on non linux OSes
-COMMON_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
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		sdl2? (
-			media-libs/libsdl2[X,opengl,video]
-			media-libs/sdl2-image
-		)
-		!sdl2? (
-			>=media-libs/libsdl-1.2.10[X,opengl,video]
-			>=media-libs/sdl-image-1.2.4
-		)
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-#	vidstab? ( media-libs/libvidstab )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-RDEPEND="${COMMON_DEPEND}
-	!media-libs/mlt++
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-vorbis-ffmpeg-3.4.patch
-	"${FILESDIR}"/${P}-libav-{1,2,3}.patch
-	"${FILESDIR}"/${P}-png-segfault.patch
-	"${FILESDIR}"/${P}-gif-encoding.patch
-	"${FILESDIR}"/${P}-kdenlivetitle-crash.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
-
-	# bug 589848
-	append-cxxflags -std=c++11
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--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 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 sdl ; then
-		if use sdl2 ; then
-			myconf+=( --enable-sdl2 --disable-sdl )
-		else
-			myconf+=( --enable-sdl --disable-sdl2 )
-		fi
-	else
-		myconf+=( --disable-sdl --disable-sdl2 )
-	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/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index a8177ac34939..75addfcc6b16 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,7 +1,7 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 1969 BLAKE2B 763fbb85f393069cd6a65e37dcd339e4e037dc5472c4d422378c9da72f4fb2fb8bcfc7ad853e9020cb532659900548cd14791ca842a2d94da86e547920029fe9 SHA512 790c91af83bd3258b59b7d49b25239a8a1245af53554bfb84b5d94842b90916ff8cf09a9584e34022c4c74d721907420881b1921e0f465fbb69ff0b7e7f19ffb
-EBUILD openjpeg-1.5.2.ebuild 1987 BLAKE2B db3baed20766524d12687b9e444197c09ec49ac7937ad0deeb83f1f5a6367dbb81d44a7dedd172357a1ef188fe5823542ed6cdcbdd068b7d9f2e54f76408a981 SHA512 64f90025e0c15e7b90e2528ff96c6a18cb0e67a082e354ab994f076ed4c8d492a5e266e76eca694dd0eac6731da918685099a5656f382673f1840bde4179f65f
-EBUILD openjpeg-2.3.0.ebuild 4082 BLAKE2B 0810dfc5c27dfa27e18a9c8e75e3f74348ac68de6acf76d319cfe19a2580a6895931bd728d57d146557f9dde2df8c50db2669b77fad7d839706df30f3668c1e3 SHA512 feb8ea2332b1b60cd8a702e9bd198ccdaf4033e8a901357b278266459e7c77987446ea45b9003eb0c3f70696ce047c81447be887d9f02a8065a3217b5117a796
+EBUILD openjpeg-1.5.2-r1.ebuild 1952 BLAKE2B 9808eab663351d512cc39795b76a7f80b0ae4a9df3a05b963a331f52c4ade9f5bd504d1a06a61792c45d0c839951e184b23b7add6affc50e36dfeca662c6f362 SHA512 2daa1f1b746dc0e0dc6344322744f7bdd1577a8e535bed6a801ea5ebc90f402364fa7127a9c5879cf70182da1bec711036d7393c7a55b90a9849e87618d2309c
+EBUILD openjpeg-1.5.2.ebuild 1976 BLAKE2B bd26fc11be332bfd1fe76224f954dec1a7cece04e39f2b7efb53b8c562927ad7e8eb9805bd76764dac4199f3dde7d86fd68073618a0ed107900079c359a05f7d SHA512 fc47ec23e0b47b90a5aeff8a1c0eed45a666068fc13f3528a382958dd30fc001b5c8d924ab8d456dcb6627ec79a0489b0677ae61879ff07f653cde2314572976
+EBUILD openjpeg-2.3.0.ebuild 4071 BLAKE2B 784812951b98f3f4fd114ab22961e10422313202006b2b4ad64fc0104225ccaa7294b1f5718b2e4196da8b33d3fdf3116ec39eb7d4eeec812f4c63d48afe4048 SHA512 70aa6abd0d7be04667f3ec4ee8605637c588a436555dcbfaa63d38406a659810c5d5bb9e4ceafff6714f0d5d64bfd943e41b80f175d4abd78cc211de060460e6
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 6c08cd86a4b2..5d368bee1fc8 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/openjpeg/openjpeg-1.5.2.ebuild b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
index 929ae7fa4767..c2d195857f43 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 6f8167384493..44197fb431a5 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 6868ad4ecbc7..b707a06c39c1 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST pa_stable_v19_20140130.tgz 1504620 BLAKE2B a07ad305255db982dd719cec8b5c63b2e483c319acc7a9f316162f83f481cdce469ba17f549bbe68d4fc49378a612f22606e6e5369c043e907c504cd0e5f8920 SHA512 078adfdc2cec7fbd4019837eee65f8411b873b51064dfd7334e1c55118c26ea1fb68cb22e46ee69adb69c78d026b00a7ed973c40632e7d79703e12669a62ee3e
-EBUILD portaudio-19.06.00-r1.ebuild 1312 BLAKE2B 15e3e1ae14ea30847473371bd48c978bd92b65d527d22e4a23b898758ac8c0acbf69b9cfa55915b89a251dc2df455e85880a2bdcbf6c74bf1ae18a8195be34b0 SHA512 e16feff275f43859c97f5379c712e66475805f41fb849387a356322d1544f4e79bfec8ee791f8d8b8db3c1dd9a8d967dec513b19e5dc29112b8231e93dd2025a
+EBUILD portaudio-19.06.00-r1.ebuild 1306 BLAKE2B 4bc07dbb132ff416ab561957a993b2c2a094fb0c274e815fcec928613e0d4a0b34d0c5fa6dfd39f78fed2c5b2ff8b79f66f91135166f8d0c8a36da4bab5c3368 SHA512 940fbd5ceabd588c4c08fbe3a794e1c0b7dd87f8bd1842d0144dbd015e618206866b233ad5a5d1f9ec37bba9060c147868906f94f8e2c9cd559b217a6f5b3440
 EBUILD portaudio-19_pre20140130.ebuild 1051 BLAKE2B 598277907c68df2b8ca379ed1105fbfd42890e98af7c0294bf9c8e088abc9a2fb48bdead5fded33a5bb87bba0864fd9388d97338f9f5d9a5ee039cddced1566f SHA512 7be06963fdc78ecbbc04e1438904733d1b5a1a19ea3681fd1538c805a0fbc00090b0878143eaae1a79c480062177eef52791dca4444d68a8bf677dabd4c77e34
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 46f618d8e0a5..b312fb32219b 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest
index 1fcd26f1cd33..5c0cdeab9528 100644
--- a/media-libs/rtaudio/Manifest
+++ b/media-libs/rtaudio/Manifest
@@ -1,12 +1,7 @@
-AUX rtaudio-4.0.11-cflags.patch 977 BLAKE2B a67f7d83f1c1b44d2177510932ca5d2795ca40430de6224cae926de10462f20b16762ba0a85e0b0d97c565b4ae772a005fbf1785773a23b76611d90d689541e9 SHA512 7295c7ab58dfb2c685a5a740d338e42daa550da09969a5a1c2a8897c832b497774457b5dc1cb9f1b8203e12edc2fb56b2e1e787d0fccd21873c1c20fe843b37b
-AUX rtaudio-4.0.12-configure.patch 3067 BLAKE2B b08f2c9377c238d22dc5abcc4d6a86777ea56ef559a21e822679c81cd9e40aedc8f1aea75fb2a12f85183aa93f17405f0f416bc9f803a3173e399a5e56250850 SHA512 15b9e2855fac77a612b6a61f5005a9c5ce3f5f26b5c79be440372ddd450dbc06750fa8ea7bcc935138ee6b2511eecd2db10bc42153fc53699a7dc9db284e5ac5
-AUX rtaudio-4.0.12-makefile.patch 387 BLAKE2B 2341779589f5ec648893ea88f1218f0197cccac6b88ec6c12f63ec655301d3e216c0472eb955f2c78e790c669e25b5f4159c840c7f47731e1a00fc1d8db02344 SHA512 d9af95399ce9b76adf532c8febd7543a0aacedc6b3ba214fa0e53c0dc607ebb086762442330d07dc182c8d96e5de834c016798b9b6c4eefab8c96a06332cd207
 AUX rtaudio-4.1.2-cflags.patch 405 BLAKE2B cb495081882e3df93c29e8b4cff0d71e70a7f0ef3937338345a3956f4dfd32f8bea28d316a5ad9dfdc8a984d62942b42805df1b6e0f3e9a4575033fdf35b327c SHA512 6958533ff2a33bd5e1daf18206ffa816d279b9f39993cbd3987148228099f08910df0e243dbdd1112bdcd6e8fe554dbea9dfc79ef9217695c76996c817310375
 AUX rtaudio-4.1.2-configure.patch 3054 BLAKE2B a1ea744db19ba3f59229d738cf4ec1aefd71d38c29ede28d13d403db69ee7c4dbb72c8c91fb3048b183086e7aea08224ed7b1be5711f57a95d609e19805e0b0e SHA512 d359742fa55d7d188a0032f512165cb73300fff3e85e03221a7b30340941fab5149645fe8683cad79f26c5ebdcfcef1a591cc16d0096fb0d5a699e6e7a819ed9
-DIST rtaudio-4.0.12.tar.gz 330048 BLAKE2B 682abd5df8bd7cd4ea06c8825f11a04ee58c3adf71e019a0eeb42e4b390996ed13742328a4cfe7ae30b65d08370271b438c66d4951c5982223e73cbb221fda8f SHA512 43068cafaf460425334588775bbeee115d1651142d8fa62808880296763952159bff297c482e6d58200cfb6d382205778405993dbbb3a769e4b1228ff0aee3b6
 DIST rtaudio-4.1.2.tar.gz 682382 BLAKE2B ddfb0797db8ffef9a73b1af1864a7e9ec5028ff92473a82c8198fc0e8cce35e76ce820487b750988a91b7a519230659f446f2644288b0347c12c2f72b03fd45d SHA512 1e7f7f0f4dc451d023a7c8ab287fe63034cf6b4e18fe138bab253c307d6dd0cddb669b031f6c21325aaac0ce53002acd2a17dd1e47bd8ac2cb14e058cfce1a21
 DIST rtaudio-5.0.0.tar.gz 615284 BLAKE2B ffb21042896b868b5368708594e050773ea23638e5eca8ea4c63204ee8ad3e433e26f1cc7f359a113df3a962dcaceaff72846346357c9e134c30dde89813cf0a SHA512 390b6c454c42cf066fa94af397b784430dadc1650de320be377b7bbd09eda8705936bff3ee4327358815c3d5247a38fead81c8778cd85db30a12a6ace742c84a
-EBUILD rtaudio-4.0.12-r1.ebuild 1336 BLAKE2B 173b0c4a163a7601c2f0b43f629e046881eac486bd4b8bfc161bdac9af011e83b3417dab592cd4b6f6ce31f525a42fac11351b3f715669e63d33470bde9417a2 SHA512 e5fd5815667dee9d7eeb89134d824c3ee026a1d3bb7b7c1eccfb7b25a20adc37adce8693c9d43238c8236df6a982f2c1ded11e87b792d61241a6a7395859df62
-EBUILD rtaudio-4.1.2.ebuild 1213 BLAKE2B eafacc90519cc26a87613ed920d8c1500e4d22e24eae73e82470e7ba9b10ed864e327f9300d7229edd53b1e5cd028930fe96da1d53c274a68f51a501c9e4063e SHA512 e2a3cbe30ae1ced7693ff96d1e01ae62ce6b4aaeea6ddc908c5f8dd0ced73adb62d42c5c4c8f14c6aa9975035e552a6967e54371d774ca2bc90c800802f8d10d
+EBUILD rtaudio-4.1.2.ebuild 1212 BLAKE2B bf0dfba065a33fe12a3966773c5ec458f17e272a09d812824be939c90564f67a15b29babf73a54dc87f84fd2295fe830a342c7ee54df9d4029ccbaecfa92b7c1 SHA512 2f2da6ce17abdfcc9952cff3f99dc2f7636104b4fc1737587f5a0cbc17a7c8679c17c57555b908c68544cb884d78279016107113980204a10a77db3e9d81285e
 EBUILD rtaudio-5.0.0.ebuild 1177 BLAKE2B a5cd56683afc73425e31c913ee347b3304e4157570120f9f8e207331262da019b2c5500784e66e9240072233b86f4c277c96b83775b73aed4cc5f67e19ff8ab2 SHA512 d4675911998df6955ff8b6c06dcaf4ece06576374735963e4833fb633d7382757b113f5cd2fa46e374bd1f85767a2f964701cb0479c789b5bd43677b1eb26cd0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch b/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch
deleted file mode 100644
index 9fa657929c21..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- rtaudio-4.0.11/configure.ac
-+++ rtaudio-4.0.11/configure.ac
-@@ -23,8 +23,8 @@
- AC_MSG_CHECKING(whether to compile debug version)
- AC_ARG_ENABLE(debug,
-   [  --enable-debug = enable various debug output],
--  [AC_SUBST( cppflag, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
--  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O2] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
-+  [AC_SUBST( cppflag, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
-+  [AC_SUBST( cppflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
- 
- 
- # Checks for functions
-@@ -33,10 +33,6 @@
- # For -I and -D flags
- CPPFLAGS="$CPPFLAGS $cppflag"
- 
--# For debugging and optimization ... overwrite default because it has both -g and -O2
--#CXXFLAGS="$CXXFLAGS $cxxflag"
--CXXFLAGS="$cxxflag"
--
- # Check compiler and use -Wall if gnu.
- if [test $GXX = "yes" ;] then
-   AC_SUBST( cxxflag, [-Wall] )
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
deleted file mode 100644
index 7680f75d40d3..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- rtaudio-4.0.12/configure.ac
-+++ rtaudio-4.0.12/configure.ac
-@@ -25,9 +25,9 @@
- AC_PROG_CXX(g++ CC c++ cxx)
- AC_PROG_RANLIB
- AC_PATH_PROG(AR, ar, no)
--if [[ $AR = "no" ]] ; then
--    AC_MSG_ERROR("Could not find ar - needed to create a library");
--fi
-+AS_IF([test "x$AR" == "x" ], [
-+  AC_MSG_ERROR("Could not find ar - needed to create a library")
-+])
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -83,39 +83,46 @@
-   ;;
- 
-   *-*-linux*)
--  AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)], [
-+  AC_ARG_WITH([jack], AS_HELP_STRING([--with-jack], [choose JACK server support (mac and linux only)]))
-+
-+  AS_IF([test "x$with_jack" != "xno"], [
-     api="$api -D__UNIX_JACK__"
-     AC_MSG_RESULT(using JACK)
-     AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))])
- 
-   # Look for ALSA flag
--  AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [
-+  AC_ARG_WITH([alsa], AS_HELP_STRING([--with-alsa], [choose native ALSA API support (linux only)]))
-+
-+  AS_IF([test "x$with_alsa" != "xno"], [
-     api="$api -D__LINUX_ALSA__"
-     req="$req alsa"
-     AC_MSG_RESULT(using ALSA)
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
- 
-   # Look for PULSE flag
--  AC_ARG_WITH(pulse, [  --with-pulse = choose PulseAudio API support (linux only)], [
-+  AC_ARG_WITH([pulse], AS_HELP_STRING([--with-pulse], [choose PulseAudio API support (linux only)]))
-+
-+  AS_IF([test "x$with_pulse" != "xno"], [
-     api="$api -D__LINUX_PULSE__"
-     req="$req libpulse-simple"
-     AC_MSG_RESULT(using PulseAudio)
-     PKG_CHECK_MODULES([PULSE], [libpulse-simple], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))
--        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ], )
-+        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ])
- 
-   # Look for OSS flag
--  AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
-+  AC_ARG_WITH([oss], AS_HELP_STRING([--with-oss], [choose OSS API support (linux only)]))
-+
-+  AS_IF([test "x$with_oss" != "xno"], [
-     api="$api -D__LINUX_OSS__"
--    AC_MSG_RESULT(using OSS)], )
-+    AC_MSG_RESULT(using OSS)])
- 
-   # If no audio api flags specified, use ALSA
--  if [test "$api" == "";] then
-+  AS_IF([test "x$api" == "x"], [
-     AC_MSG_RESULT(using ALSA)
-     AC_SUBST( api, [-D__LINUX_ALSA__] )
-     req="$req alsa"
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
--  fi
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
- 
-   AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
-   ;;
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
deleted file mode 100644
index adf109de5de9..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rtaudio-4.0.12/Makefile.in
-+++ rtaudio-4.0.12/Makefile.in
-@@ -24,9 +24,11 @@
- tests:
- 	cd tests && $(MAKE) all
- 
--$(LIBRARIES): $(OBJECTS)
-+$(STATIC): $(OBJECTS)
- 	$(AR) ruv $(STATIC) $(OBJECTS)
--	ranlib $(STATIC)
-+	$(RANLIB) $(STATIC)
-+
-+$(SHARED): $(OBJECTS)
- 	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
- 	$(LN) -sf @sharedname@ $(SHARED)
- 	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
diff --git a/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild b/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild
deleted file mode 100644
index fbef5aab668f..000000000000
--- a/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O"
-HOMEPAGE="https://www.music.mcgill.ca/~gary/rtaudio/"
-SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa doc jack pulseaudio static-libs"
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? (
-		media-libs/alsa-lib
-		media-sound/jack-audio-connection-kit
-	)
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.11-cflags.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-
-	if ! use static-libs ; then
-		sed -i '/^LIBRARIES =/s/$(STATIC)//' Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# OSS support requires OSSv4
-	econf \
-		--without-oss \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with pulseaudio pulse)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	dolib.so librtaudio.so*
-	use static-libs && dolib.a librtaudio.a
-
-	dobin rtaudio-config
-	doheader *.h
-	dodoc readme doc/release.txt
-
-	if use doc ; then
-		dohtml -r doc/html/*
-		dodoc -r doc/images
-	fi
-}
diff --git a/media-libs/rtaudio/rtaudio-4.1.2.ebuild b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
index 1920e9acd349..7f19d2f895d4 100644
--- a/media-libs/rtaudio/rtaudio-4.1.2.ebuild
+++ b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa doc jack pulseaudio static-libs"
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 4b265558e302..56d59870ee8e 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,4 @@
 DIST rubberband-1.8.1.tar.bz2 177501 BLAKE2B 57ca56abc7db2f2a25ff7c900daf24f32a892a1ef27099d34ab8ad290344ea8c5884cbace9206bfdf75262ee0c30bec8d736ae5398d5aaf92f73d0d5980e6932 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620
 EBUILD rubberband-1.8.1-r1.ebuild 1318 BLAKE2B ef83174727b0932afa5aadd90c0beaf29d099d01dc259cb57803e0c717e1b367ca962034964587fa5743474b057a0a93d32c343c54cdd42d0d637b6071eaad76 SHA512 da3e700e934bec7f7b05382c277c7d6226446052729363503631562b2eedc6a9e88e62595817344f25c153462806c20e77f8d7c2daa13386521192b3d56ba416
-EBUILD rubberband-1.8.1-r2.ebuild 1322 BLAKE2B ca16c79a36c8bf3e24425e277d773d1d73e254967b798e633ed53456fcbcdfa1e4f19776dda8482e9588a7ddef5e11c52b48c50eb7044bf18da8618c251f01c1 SHA512 2947039ddb89a75bab3692fb1dd804188a546cf10d1c655caaff22ec396bd9415eca3f38c2b282e269688e9727043c3a78ae6461d7d0c9648196565eb23e5c1c
+EBUILD rubberband-1.8.1-r2.ebuild 1318 BLAKE2B 7e1d49ee60b5cafaa070504bf7f0c69531891351979ed717959021e43e983c16867f4acdd31a0cdc95e437ad69e7f2ad68cd44a8003553bb3b0fa7dca6f8cf9f SHA512 0c68d8852c432c0edcaad5dc2368481513ed34707e9c266e96a06dfa5224ac383015674021fef5256e9208d026c7a7cff549f567b162add7faeedff44f3d5453
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.1-r2.ebuild b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
index 3c5c0fc2c7dd..e8237730ca63 100644
--- a/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://code.breakfastquay.com/attachments/download/34/${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/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 169ebae5d012..03661fd9efc9 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,7 @@
 AUX sdl2-mixer-2.0.1-mp3.patch 1169 BLAKE2B d6d4a30fe303adb71de29e297ea8ea2f250b3eaf3cb8285566ec061fcc2d2a737a461aac1df21cb870ab57f5cf43eaf65bac2148724bddc55449e0b5ba7229a2 SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e
+AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
 DIST SDL2_mixer-2.0.1.tar.gz 10213891 BLAKE2B 3f6889e7cf8e4e159bdf18f1e4e9543ffc9160d325c8011fa3b4e7e1903b2b8aa013ef180847c878fe71a8639a069af440c41ae165aeb67d5259338795347a30 SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 EBUILD sdl2-mixer-2.0.1.ebuild 3516 BLAKE2B c70450723d7ad51c24d386a1dd449ec8d3831a59b9c463c6dc57c284c4ace645b85fffc047270e2c4dc74f668206f10a1ab1f8601abf0317138294f0a03c60a4 SHA512 3a2b2b35717f83e4ee71b3c7c204529e3a76f37d39bc5413b5a852d9497cf619dec2b7be90405ef0200dedcb45f6bf95fe6b465aa42ba583f667e25feeec3cbd
-EBUILD sdl2-mixer-2.0.2.ebuild 3220 BLAKE2B da25696764086144c2b5e8d48b7bcaa801692e12edb4e0af328a189c1eacf2844a82dfd6be8156b669153c4d547a78da10dc9696d1a2e78a170f8fbee545657c SHA512 8c5076ccfc6360ccb4c30e3cd19599a2279ed2ced569f09bc26dff17c1a9601aa2a84e90dac36df8ea00f37694e93c3896336ac8ad979ea9e4ba8cc0b9c9206e
+EBUILD sdl2-mixer-2.0.2-r1.ebuild 3260 BLAKE2B 107d1e139ec158899e8eee08ed47848acb2693e14536dfc867c0579994903d73c661002c56aa0d129afb3bdc2311bef4403fd896fd6cc11347d934287f9859ee SHA512 3e12e8b3e314c2cd4fffb72b2d5dbdb5f7facf681de20bfdf085ece503b3502d0a83ee5f5fb0aaa9db1c699d076492bf0c10c89f813e333007cb994bf74e5217
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
new file mode 100644
index 000000000000..1377feddb39c
--- /dev/null
+++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
@@ -0,0 +1,21 @@
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 20:47:21.691153833 -0500
++++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 20:47:30.032153222 -0500
+@@ -138,7 +138,7 @@
+         SDL_free(music);
+         return NULL;
+     }
+-    smpeg.SMPEG_actualSpec(mp3, &music_spec);
++    smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
+ 
+     music->freesrc = freesrc;
+     return music;
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 21:03:44.907081811 -0500
++++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 23:34:36.696418752 -0500
+@@ -174,6 +174,7 @@
+     int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
+     if (left > 0) {
+         stream += (len - left);
++    }
+     return left;
+ }
+ 
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
index 53e5155abeed..388f490aac11 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune multilib-minimal
 
 MY_P="SDL2_mixer-${PV}"
+inherit multilib-minimal
+
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
@@ -24,32 +25,36 @@ REQUIRED_USE="
 	mikmod? ( mod )
 	modplug? ( mod )
 	tremor? ( vorbis )
-	"
+"
 
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
 	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
 	mp3? (
 		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
 		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
 	)
-	mod? (
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-	)
 	vorbis? (
 		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
 		!tremor? (
 			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)"
+	)
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${P}-smpeg.patch )
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -89,23 +94,20 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc {CHANGES,README}.txt
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	# bug 412035
 	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
+	if use midi && use fluidsynth; then
+		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+		ewarn "environment variable to the location of a SoundFont file"
+		ewarn "unless the game or application happens to do this for you."
+		if use timidity; then
+			ewarn "Failing to do so will result in Timidity being used instead."
+		else
+			ewarn "Failing to do so will result in silence."
 		fi
 	fi
 }
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 4459770673ef..5c709d76b27a 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r3.ebuild 1288 BLAKE2B 91491e6a8e87589f6eec730426a415e42632895edcca53e091f9acde819e241e16c3caba3b3175f324365dd9480cbab3c39be553737340303bd3cd796c73070a SHA512 e57e32d74309ac5c9317adb4aec661cedd207e73bf1ec5d62df1c27e83bd659750f0756486e6a7ab1daf2e5deb89ec8ab9171a68c1d01177b21052bb4d9b0ab5
+EBUILD smpeg2-2.0.0-r3.ebuild 1293 BLAKE2B 7d0563979097859f0e974794cfe2b1f004337eeded8c0bf4e87621fd34dfc91797dee2c8093c60eb4db5c306220ca9256760e119be017908ba9c47b3ea4ac586 SHA512 aedf7c3af7958b0eb5571e35a372ab2cfc9248a2eaa8393d21bbe42ba0bab56a946b968116011a874cd888f1d517c502c3bb4d56ada4a6152bc91e24adbe37a2
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
index ed6616eae337..868cb7a0125b 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index ae841a81b750..0ca9a04c3619 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -12,6 +12,6 @@ AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
-EBUILD tiff-4.0.9-r3.ebuild 2264 BLAKE2B ec6bd649cf31a2a4a2b9125d1cd2fa9c203be954f6ff7367c6e46422d4d846928a3a48bb1b6e19147dab3680b13160c352b2cc8e3e18bdd11dccd77b047e1540 SHA512 bad10c08475e1c1a2765df6d35846c99cfefa149ebf3b5d571859b639699c740dc07264a8758c4306e1901389dbe3c7e4822f91d9729ece741499e515cf6601a
-EBUILD tiff-4.0.9-r4.ebuild 2328 BLAKE2B 2fae57ca25b717b292681a13726acdd09618fb3057cc10dfa664d666d9f16332c5451bfab80d4cba977d45e4e4e044b6e60232ea61cc4950bb7e3099da451ebb SHA512 e98adfa48131f65620e802b3cd46a9e0fba3649e90a1fbd2bcdda3aec70a1a4336797f5fe3d069155dde3f0be977dc1d674fab79a9b100464cb0b5fdd291b47b
+EBUILD tiff-4.0.9-r3.ebuild 2253 BLAKE2B e22e677bf03b5ff4ee7e3e074bb6a3c8f86aa636f3f0700326fd4a4552c4ea524711f954e32729240b43206fb2bd318de3e91d2217e730bbb85653b286c8a12a SHA512 b32c074d598f94498ee81e59e347e75dcbbf4ea7ef2b456c2e98c219b960f42e8d36cce85f8ee2e71010f8fb260ba3a86b5b993e22c1cef041a9729febc643af
+EBUILD tiff-4.0.9-r4.ebuild 2317 BLAKE2B 7552997a6fcfbd84c8a31b52700bacfcf26d6864938b15a4c8e3dff78e789112b98b7e95a41c23505761591083da57eac6c6ae68afc83c771529e0c675a94795 SHA512 1395a5972048bc8229fb484ff9280899ab2c46fd98b899e250891f2837dffa8d7fda0a8056cfcce82c7d245ca3b85c0869150ef8b6bf597e3e8d15721bf12356
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
index 4acf1197bc61..c65a11571722 100644
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
index 4787ecd348eb..f0f7306f5cbf 100644
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index c7894e8c7d24..55c3eb055af4 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 1163 BLAKE2B f9b679a2dadfb3dbc3ecb20d828b822a0e66ba84558962576e665a33bc5e2ad8aae665f8deff01cd6efa64bd4a7c0999392f7b5ac4375c9a1906fa2eb1569491 SHA512 0fb533106cd7b9d80453f822341354110c94f5e33fa7b96d2c783bfd97e4eceb00c8ef4d2c87281e7a59bd2c3914d99e6fa1340ea9e7029d33aea676bd8abc00
-EBUILD vo-aacenc-9999.ebuild 1172 BLAKE2B 3a017763ed6cc719768160e6d216bd69d73a934fa10d68195471ac47881a00342945469ff9bbc3eb5ddf6024fd680a80960a6d2c0ebc5240e77cbe3cb252b91b SHA512 2ed0b5d238e2b6fe0dfdfee6f98ea59a55752aea85c1059f1b29d036e262360b6551652d376ab2086d3e7e5f4ab39ba290427844daec9d9ec0bb676d2f9f7a8e
+EBUILD vo-aacenc-0.1.3.ebuild 1152 BLAKE2B 2a26c91e6d567f1328b56b89cc5cfb96d0b306ce779eeec72a78dcbfa2a01c478d8d5b6cdac2fe518f723658afbbd1bb69bb4a691e3ad7828d44aadc431159af SHA512 cc3dddc10f5380ad088527a791413be246dcb227b91a8fbcb85f1a1cf69384283941824f35a941bee11140f7c4246cb2777e3849b746019e18a51886f3034908
+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 cd5f549fefdc..92e4d59fb2dc 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -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 ~arm-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-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 82167222f361..7d6b2869b056 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
@@ -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 ~arm-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
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-libs
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)