gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /media-libs
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
332 files changed, 2351 insertions, 1529 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 58fe79bece7e..2fd7f4d751e7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 6998b1053298..5b78f79804f9 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,5 +6,5 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r9.ebuild 1937 BLAKE2B ea727b328dec3effde3bf2aa207ea1b4d92e3e2710921e417f8d3eca6513004eaa090b208b123339746b11990677d43705b7fd8ffd6548445450d66e276c8187 SHA512 695f9d2782ce5c17f67ca2deb7ef02e134fe23d4aa401f1ab031ff756090e7857882106b41edd5304794137ee624292b4a5ca863c2b44ac0895e8459bd821ec3
+EBUILD aalib-1.4_rc5-r9.ebuild 1938 BLAKE2B bfa47d820f8913a17babddc10f4aeeac222de35305e86a3f147e7e09f9ee47d765d22afde9922fae668909f580779b909f7555eb89a912acd4072ecf9d6e7182 SHA512 3a75b914271043b8ad75641fb701ab5c3072318602421b34d02e91109d67ca14bc7948e7b21b1fe55edca4cec2440be2fa16ca041a1b96b4074449be22a753f2
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 2a50b63d0e58..9413ec65bfc1 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 45ff95389106..a6b0b8d8b274 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,7 +4,7 @@ AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d01
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-EBUILD alsa-lib-1.2.2-r1.ebuild 2167 BLAKE2B a8be7297ee529e0d99df9086bf54f1f357faaf6fb69fb1217511fba8c10128f6e20fd66ea46959eb1ab2d55c6b0b24a8baabd33f255ca80ea4efdf35dce3b921 SHA512 c90194937d98a4e740aef62d79b38f75ca9b606e37809040f9dfc410c29aa2bef2a8f52decc4510fb7ad5f40a5fc3829087cddc2237e44bbcd48a879f05e3c4c
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2104 BLAKE2B 8df2a9e988563fdc9c7f49ebbb6c3ff723f38feb2e9cc69bb9346dcf062955c7c2d6ae2c92302ca6c9738b64892ad5d18de730d2c27769ad032b992af40cbcc8 SHA512 94dcc4f606a06423ae30995d4736a1fcf0e19631dca736b697d26f7304b24e7cd3f1f5ffe339129463c9be75e23b06873b5b3fd11bab3a2b81b5192e45ef013d
+EBUILD alsa-lib-1.2.2-r1.ebuild 2168 BLAKE2B 1d3273b0b8a45678ee5740130c684398d234479ce46f60648127f6ef029b158ce4a6ff8d225d79637edcf4b7837122afc447f2e6e3b644678f36dcff1f06d7b1 SHA512 d9f9441425caa11c3105cf48db2c0e43bbf376db788274e1c78be014d5cb195c6abc459c2bce08bae6812909cc65aab30066611f18b1e70245eac1d2cf9bcddd
+EBUILD alsa-lib-1.2.3.2-r1.ebuild 2105 BLAKE2B fcacdf2ae688478c64b25513dd8481f8e1f26edf20f089688ec952aca24250302552c7a36b7094c80f2b160958de196d1c26d6a63d792d3fac09a8034a048f76 SHA512 31559370c76269d35b062257fa6ade631630b8f0bd02c681afc580ea0f3aa1af52ffa4cd88c1abcc4522144372f6d685da7c60647092dc7b8361245e8868e44e
 EBUILD alsa-lib-1.2.4.ebuild 2112 BLAKE2B db57cf3e7d6353c6ff1cb5c824cd6b3504faaa1c0160b596384fe84020267e49ea4dd68c572126a4de3947d14f3150a4c30032a7ac8b0de3a7c63ed6a928e6e7 SHA512 f510ce16df02a18412e3395866e7361ed7abf205aab0f34648af18ae2f1b37910633c3033177b32412a929ca5bd002f70cfe325cdb1eff0bea5829bf14992a99
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 5ba025398039..c87f725d9c82 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
index d7b63f0c237b..5239b6635174 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index ad79fc94f5b6..3092f65a12f4 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,4 +1,4 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.1.8.ebuild 1033 BLAKE2B afeae94ecabf2e00bc90652c3ecbe417084ff2d8d076b16d8fb4793ea5dc3430d54ffdfa69c8872273a0cc28883e83ad312c2137f8c45c6ff961aa3e3565b319 SHA512 2b7b17bb871985f663c2b5d97024f1d0e10f983816b748d1f2d2628d420c5a66df55397d9048d93a031f57110a2785c0804aa6b178e29f938ef2c9f7210ac588
+EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B f2aacb25b617553d2710a501717b2ad8a7990a3f4f706fbb9c58b3b81bf258c336687babb1f26600061e7888ed83818152c73d840c9897ed982ec88d5fb8b618 SHA512 1acad998b4c323e392f5522a997718768a10028faeb2506d270dc0a7d451d6566340935da6b202e37c29fdda0a40d5c59da52ef29c012f6d2c1651c41f31e7df
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index 7c45869f2f1c..d82463055d1c 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index e17597bb710d..189b6eb96bf5 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,7 +1,7 @@
 DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
 DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
-EBUILD alsa-topology-conf-1.2.2.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0
-EBUILD alsa-topology-conf-1.2.3.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0
+EBUILD alsa-topology-conf-1.2.2.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
+EBUILD alsa-topology-conf-1.2.3.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
 EBUILD alsa-topology-conf-1.2.4.ebuild 500 BLAKE2B 3dcd66d24b527410c91c191b9bf3551b850559297d999e28936ea9f59d7faf7f39135dca08499ac05cac539e506feba2d87940383c723f649fa2fc005e7c87bc SHA512 0026765fbfe2dd182b1eda729624624fd36b2fdfb0ad1d9d02c60972e3c44c1539d3371f5c7227693b073e070d62dc845403f56c35481bcb06ccc4fa99468941
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
index 449bf3a78093..f912f7fefcca 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
index 449bf3a78093..f912f7fefcca 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 4d1054627d7f..63412180ea44 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,7 +1,7 @@
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
 DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
-EBUILD alsa-ucm-conf-1.2.2.ebuild 486 BLAKE2B 456d70f97a19fd26cb183e365f926cbeb4b5e457b60086a385db8f694bced10d6ad9370b6b4860790c4742fb9c1d70398e170c702231827c20a70dddc2f724be SHA512 d013fe3c77ebd5e6680938d4464d0dc8730ec395321450f93b2ca3c186541a65b82df77dfc454479148915cc2971268c8202bf7e88996f48466380a1b200f1bc
-EBUILD alsa-ucm-conf-1.2.3.ebuild 486 BLAKE2B 456d70f97a19fd26cb183e365f926cbeb4b5e457b60086a385db8f694bced10d6ad9370b6b4860790c4742fb9c1d70398e170c702231827c20a70dddc2f724be SHA512 d013fe3c77ebd5e6680938d4464d0dc8730ec395321450f93b2ca3c186541a65b82df77dfc454479148915cc2971268c8202bf7e88996f48466380a1b200f1bc
+EBUILD alsa-ucm-conf-1.2.2.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
+EBUILD alsa-ucm-conf-1.2.3.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
 EBUILD alsa-ucm-conf-1.2.4.ebuild 494 BLAKE2B 576963ae39b2529e38a71864f3101aa123dc1e7346c830e17d7624243d516cf121d643e6403f36cd1ec1e9f3bd21ac7c0b55d0704127cd7bfeec8ede2115e6d9 SHA512 5ba6d22fc98276d85958b5fd28dc7f56ab5d3db9eaaed54674a8ab33406e681996556d0692ad3992674ffafe87c31eb84dd9bdd280422c8766724c46caa65808
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index 0a96f25d98b8..d85f2a03a32a 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
index 0a96f25d98b8..d85f2a03a32a 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index 138909be739a..3227b926aa11 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,5 +1,3 @@
-DIST ampache_browser-1.0.2.tar.gz 73592 BLAKE2B 5b73d7e043bed38a4655de5bf6bf42229f8794d53bbee9a0f1df331957d3246954faad16f817ec8961e85bb1f147d20f901f4c6a6e1081c30fa3405e94f870f7 SHA512 c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b
 DIST ampache_browser-1.0.3.tar.gz 73608 BLAKE2B 057143939fba168e55e450bf7a702eb9f0093432191de5103117b0bd661618704183d40bf468aea08368cab2f0a3eab63c7ca016a305793cf922d03f02380058 SHA512 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c
-EBUILD ampache_browser-1.0.2.ebuild 568 BLAKE2B a370b965616e0775cf5a30983fcaa9b296aba0da0e2b2ccb0bf65de485cf6aac852a31fc3cd2785a7cc8f589985fc3eafd9e312a071b601f4ca954820390c435 SHA512 218a484d44a176adfb004e9d2230388b085d44bda6a657fb1660893971d8f182da3d90e3cb0242e19fa018f2221c36430045991884d2184de3cb15feb2182be4
 EBUILD ampache_browser-1.0.3.ebuild 607 BLAKE2B 1b22490b3989ea447cecf7d3e026f93e3ee8ead1f37441cfff1fd408caf5baeb9ef9357709fad3d11d8d4f29bf5e01e1880936422bcbf38fd19a5b1366c0ea96 SHA512 8c806aaa54a8e27171c9519e200e062f0b53dd39b27adab2268adfa10194fb62e59a774708b39208fb13644d0759a195ef7ae0eadb1a9ce23f576b8d74502c50
 MISC metadata.xml 470 BLAKE2B bd5d864586a58f4f52c781bf056cdfe0f3ba9dee7544c2e89a050b5c07534257b6d464fc5ee85c3da6e8ca3b4ab8a840682e3e3e874c221834fb5921e8a5c2e9 SHA512 08a104211da6abdd2eee64dd4a24647f838a324d3a20a430d9ce676df02e5a0785562c34a06c7d0be43a9e3225ef767ae320d401e2199f0633948823e6377429
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.2.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.2.ebuild
deleted file mode 100644
index 25ffd0c29623..000000000000
--- a/media-libs/ampache_browser/ampache_browser-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Ampache desktop client library"
-HOMEPAGE="http://ampache-browser.org"
-SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug nls"
-
-RDEPEND="dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_NLS="$(usex nls)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index a2a4a813c95f..7f76c08e498d 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -4,5 +4,5 @@ AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r4.ebuild 1397 BLAKE2B 5f35ee3ba598940564fa6b5078639a366f416848c05cc91f1793c5f563feefef80a1f8cb971c96b235c54222aa03b8a280bea5ca0944ea9b126fe1f3a26e7710 SHA512 33dca7098c96442a50ac204fcb3519a1d77218e3f74b1af6b954eb16c9d64f6256579596a3b00f8a151b60f56c4ae1462b2c40428d3ad5d61c9b5a5bf3fe1fc3
+EBUILD audiofile-0.3.6-r4.ebuild 1398 BLAKE2B 4324f03206363cb88aaf5e9f449737d7bb47f0b7583d5ead7b6d53d9958efcd25f2d39f8d8690564e9e50e431753dda0af24729de6b3afdd30c47d7e34cc2dd1 SHA512 89c883ccea376b8f80a7260261d6fa1fc64328debab57455b76cefaaeb4541a3196445cf0b90264ae486a21f39a6d9e045235fa29233bfd030d4d7b2f6748198
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
index 38fab4a9ed85..ef83dfd17a65 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://audiofile.68k.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index b88c6246a318..ff053b7c7c1d 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,4 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
-DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
-EBUILD avidemux-core-2.7.4-r1.ebuild 2215 BLAKE2B 27e7a203449549ce221ca94a989c7193afe94a06dca4449be207c3def5086be0f49a83da73b7b01e27051493f2cec9b2906da1ebb99322b07d438fa82db0bc4a SHA512 06e396e9846311382249e76fb447818307bb54f3562a8047acda0d8609ddc170adf46c774b769bf69482c5b1afd39356e1f4220f617649f7e98d594059f420e4
 EBUILD avidemux-core-2.7.6.ebuild 2581 BLAKE2B 19866bbb3d2636cddf0b2f1b2b3258b144aab9265d73a209981b60d372904b3f5e2b549f21a81f5cf61341970dac6e13e3fbab315db99e2ebe7b9e5921130bed SHA512 983515082d8c4517947c8266d9a0edc94fde1402530318f27f746178d1ea69a4722d37c2970ed788805d48a2b8494471d16f6ac2b93ef8bef42bbfadcad0dd08
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
deleted file mode 100644
index b069b81af165..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
-	nvenc? ( media-video/nvidia_video_sdk )
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0= )
-	vdpau? ( x11-libs/libvdpau:0 )
-	xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
-	!<media-libs/avidemux-core-${PV}
-	!<media-video/avidemux-${PV}
-	nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because
-		# it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove bundled ffmpeg."
-
-		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
-			buildCore/ffmpeg || die "${error}"
-		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
-			-i avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -e 's/include(admFFmpegBuild)//g' \
-			-i avidemux_core/CMakeLists.txt || die "${error}"
-	fi
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DGETTEXT="$(usex nls)"
-		-DNVENC="$(usex nvenc)"
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 6f9c19d378a0..4b312bdebc96 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
-EBUILD avidemux-plugins-2.7.4-r1.ebuild 4213 BLAKE2B 47e9d1404c405c726862e9bed64709e376a06fd7a1437db73efe2bd9807c0189597ca76409b3889ff4b058fef38d0f0923e1e46f76f185fca6c8f84f249c408e SHA512 b167d0b557d1e274b96e1895ff8e61e1238593df6e05fef3875a272dc1f19e68993c7b588bee7e5fd4e37fde465dc6067ee60cb99d19dc41cceb37e762b04c68
 EBUILD avidemux-plugins-2.7.6.ebuild 4221 BLAKE2B 9a1e7991f8bbfc928a2aa5d8afa14fdc1b1b2184ddbf0422d26ccb46e8ae224f172ad7bb9abd6237c602b065a561946f02c1663e68787c764afd7efc0f7aff77 SHA512 61b79694874224d165567fe18880b299c6799e0888724218f2ab08cd58faaf3c6b7f76b10e786a90c2bbe62a80d0ffe382761e51304731ab1668a5e7b886312a
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
deleted file mode 100644
index 94533197c2bf..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	dev-lang/spidermonkey:0=
-	dev-libs/libxml2:2
-	media-libs/a52dec
-	media-libs/libass:0=
-	media-libs/libmad
-	media-libs/libmp4v2
-	media-libs/libpng:0=
-	virtual/libiconv
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dcaenc? ( media-sound/dcaenc )
-	dts? ( media-libs/libdca )
-	fdk? ( media-libs/fdk-aac:0= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi )
-	jack? (
-		virtual/jack
-		libsamplerate? ( media-libs/libsamplerate )
-	)
-	lame? ( media-sound/lame )
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:0= )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)
-	xvid? ( media-libs/xvid )
-"
-DEPEND="${COMMON_DEPEND}
-	oss? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
-
-src_prepare() {
-	default
-
-	# Don't reapply PATCHES during cmake_src_prepare
-	unset PATCHES
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
-	done
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-
-		local mycmakeargs=(
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			-DFAAC="$(usex aac)"
-			-DFAAD="$(usex aac)"
-			-DALSA="$(usex alsa)"
-			-DAFTEN="$(usex aften)"
-			-DDCAENC="$(usex dcaenc)"
-			-DFDK_AAC="$(usex fdk)"
-			-DOPENCORE_AMRWB="$(usex amr)"
-			-DOPENCORE_AMRNB="$(usex amr)"
-			-DLIBDCA="$(usex dts)"
-			-DFONTCONFIG="$(usex fontconfig)"
-			-DJACK="$(usex jack)"
-			-DLAME="$(usex lame)"
-			-DNVENC="$(usex nvenc)"
-			-DOPENGL="$(usex opengl)"
-			-DOPUS="$(usex opus)"
-			-DOSS="$(usex oss)"
-			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-			-DQT4=OFF
-			-DFREETYPE2="$(usex truetype)"
-			-DTWOLAME="$(usex twolame)"
-			-DX264="$(usex x264)"
-			-DX265="$(usex x265)"
-			-DXVIDEO="$(usex xv)"
-			-DXVID="$(usex xvid)"
-			-DVDPAU="$(usex vdpau)"
-			-DVORBIS="$(usex vorbis)"
-			-DLIBVORBIS="$(usex vorbis)"
-			-DVPXDEC="$(usex vpx)"
-			-DUSE_EXTERNAL_LIBA52=yes
-			-DUSE_EXTERNAL_LIBASS=yes
-			-DUSE_EXTERNAL_LIBMAD=yes
-			-DUSE_EXTERNAL_LIBMP4V2=yes
-		)
-
-		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
-		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_install
-	done
-}
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 9ec7f591fe1c..a1cdb408eef4 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,4 +1,6 @@
 DIST babl-0.1.78.tar.xz 298920 BLAKE2B 654baf0ed09fbbad54578bf8bba60f45152e446d8b3d3ee49ca57084f220d22ed9478bc95851c5c1b17deeacdacfc14a39ab4d6e3f0448012eb212eef8b357b2 SHA512 d40f68cbd3d7703066a8985958b6cc49eaefe842c0fb3b7bbf6a5d6e6198642b55c4f95bdbf0d25a29d24a975c9b94acfd084792c60b18ec5f66260dfe54893b
+DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
 EBUILD babl-0.1.78.ebuild 1830 BLAKE2B d1a5f6804b582a1295f4a11032feb5a513a78e814e1331813c3bbac36e886928efc5ff6eb9ba5f9d20285e116d936816c1073f7c1af2b71dbb6d344a70649879 SHA512 32973d22dd5cb1856c34f68b4c24b412f1449974f898fb6229a5fa4a1fe265777abe542d5c9d5f85fa7707425c419a99f0397acd9d084520fb8d9c8a487c4e2b
-EBUILD babl-9999.ebuild 1834 BLAKE2B a5a53b664afa763c5f66852e38a42eb3bbea1e7b8794f216a4b680770d11c4ce054bfb9d63e51fb2a4a09826ed97f39dc26b8a2fe8773849dc1f7f0e6b348220 SHA512 4243a2a95562ff36dece54832cf87c16f6976debed6d1c41eb60c7f4fa2a776f6da272226596c52c4d3afb8e1929c228d439ed4aec79c2121315750ebc2b61d3
+EBUILD babl-0.1.84.ebuild 1769 BLAKE2B 99dd5a1a097a3ab2debbcbce0ea8a7935211447c3d7a6caa8a123f7fa501d04477401d54d9615a7265335f653d296308da6bac847a054ba3a05caecb925c8758 SHA512 b2312ad947c665b29fb4a6564dced66f30e3196f9aec09cbc4c10c4d4446cbd2d29828fc4b5559bd42210a271c5798db443d08dbee7908851c2cf306ccbe7188
+EBUILD babl-9999.ebuild 1769 BLAKE2B 99dd5a1a097a3ab2debbcbce0ea8a7935211447c3d7a6caa8a123f7fa501d04477401d54d9615a7265335f653d296308da6bac847a054ba3a05caecb925c8758 SHA512 b2312ad947c665b29fb4a6564dced66f30e3196f9aec09cbc4c10c4d4446cbd2d29828fc4b5559bd42210a271c5798db443d08dbee7908851c2cf306ccbe7188
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.84.ebuild b/media-libs/babl/babl-0.1.84.ebuild
new file mode 100644
index 000000000000..cd9637db7829
--- /dev/null
+++ b/media-libs/babl/babl-0.1.84.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	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 dynamic, any to any, pixel format conversion library"
+HOMEPAGE="https://gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index b812702c3144..cd9637db7829 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 REQUIRED_USE="vala? ( introspection )"
 
 BDEPEND="
@@ -55,7 +55,6 @@ src_configure() {
 		$(meson_use cpu_flags_x86_mmx enable-mmx)
 		$(meson_use cpu_flags_x86_sse enable-sse)
 		$(meson_use cpu_flags_x86_sse2 enable-sse2)
-		$(meson_use cpu_flags_x86_sse3 enable-sse3)
 		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
 	)
 	meson_src_configure
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index b0913fb4dbb7..01a0992d7316 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -2,6 +2,6 @@ AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
 DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
 EBUILD bcg729-1.0.4-r1.ebuild 773 BLAKE2B 6d4bbbd387848015bff76c14c53c584f57b25061682edb2e7f39154bf6473f840badb8536f602b7e19bdf81701944b818ef8df9bdec541613adb3b7d4ee8b6f8 SHA512 5a10a6452874531186ddd133ace537037b0e6df4203cb283cc77f6603c08c2be3a182cc75a83232e38b24474c8fd6996526fd1ee5cbddebf74156766ed914480
-EBUILD bcg729-1.1.1.ebuild 698 BLAKE2B cbe4ebced262e909cff565d1fbb85a9a76f5ff195ed620a097db389ea46eef689420eeeeee6b894dc8ec511d4e425ebbed699fad90d70d46c49f008487fe80cc SHA512 0c7655f48fd72fec94ff20588d27448a048b48606c9758dbe71aee203f4425767586eecb9e796b76cf746db2acf82bb39e24152962c366c2ff6a207194a608d0
+EBUILD bcg729-1.1.1.ebuild 694 BLAKE2B 1e8e0a842d057f3bb285349caa58594fa7b55eae9e9176a66455fa00b83d2dff16098726ed94d3fd8b730d7a3c3770771eba7ca31466903ef78888435a68db1d SHA512 248f4ecfa682762a20e7bcce62891580c5c7a9e8e1f286ca8542456cd1ee10a3e3de07805ee6f359282aea7966929c281ba13fbcfb0096ea30c7fce0cf311a33
 EBUILD bcg729-999999.ebuild 576 BLAKE2B 5fe0f10f4483e5873833fd05f8927622a63241f30f57f74606c553b664177f97ee84e287132ab0aff17bb315dcfe1ab1893d4f670163a6c7e8977ccbc9493e7b SHA512 bfde637d4a43ecdf4668188d0a2b6fc71a0a68cc7825fb260cc6034773b3e8a724411afba89bb7a6e74442f40370fc0f1cdfbd9eae9c2e45180bf70a286d9239
 MISC metadata.xml 318 BLAKE2B f7971ede10d80284559e2a3a9dc9088ff06c588d993f1b0dbcb13667a10495d0390a4ebe2c4e65b8fca8d7369c8600e7f446beb280ce04ef66debf52c0f26ba0 SHA512 b2cd9ed908992ad45a31d4f15954385f5d9bfd7f4659330695aaab3b7d1d1dcac1ed56680c77ab786ea7454b8032fb70332cdd06a74f2e40c3162bdb6d4a0a31
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index 4ff2047c3db0..e724197e7cff 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 
 RDEPEND="!media-plugins/mediastreamer-bcg729"
 
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 50d8d31c7a08..b0c0088a1ea0 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,3 @@
-DIST cimg-2.9.0.tar.gz 11213143 BLAKE2B 88f463990e1210221361be8d93bcad3abf19ba1f83440c102581417e66ebc771176a457d9516b4fe160e1640d3a996006aa64b218359397d75a204a3c34797fd SHA512 c3a45bdbf19a0598a7865920cc738deb71aa95351734d9bac9d77514dc6d5252433a28d4a8fe27aeb06b5c2557dc4e7a10e67cf788bcef2e52bf5038aa876031
-DIST cimg-2.9.1.tar.gz 11215948 BLAKE2B e655ddea292bdfede79cc93785aeb98890fc5c76697127ca53e2a2542ae4d2acef1d77f33464553e95b2fd6b224b6da671d554000463059a3cf307cd6bc9ec77 SHA512 9407a5f0fd68d03d164e07b0c41a4ee948605f656a1d4cb942cdc5b357515e5132e071036598b38ab56387c5cc6e574133357eacd4aef65a97b7fc1d605dae27
-EBUILD cimg-2.9.0.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
-EBUILD cimg-2.9.1.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
-MISC metadata.xml 294 BLAKE2B 3fcd6df8ac7918baa264a1c474264a924204f4308a0786d45a200e4644f3424e36e167683e0ef01b0a799cded28721a807dc2289b93a546640f9c495c4c7cb2e SHA512 d6441a30bb7dce111cdcc911a732e6ba35530ade8c5974f77dca51974688e743fbc7592dbaa0312b77a480ab8d9548db3d8282f8e8bfd4608b9ed4d5f4967b0e
+DIST cimg-2.9.3.tar.gz 11222797 BLAKE2B c2135a0219305dafde642198888f5a813f7c73a34dbb015b271cbfd601a4265fe0495cbd74a0ac502cbbd1b8ead49687a945d35d7eaffe5127cbdc9c67664c14 SHA512 038cfa0dbb8beeffa53cc84491988bfee27b0e3e74c3f802185669be5ddc85f0ab002a6bce0e57e3692aa6380715436078cbcccadb0e2b34442db50fc19c1aed
+EBUILD cimg-2.9.3.ebuild 593 BLAKE2B 7d3fd078b3e4fb53417890cda8f0fe2d10c0039624b6b869e4a5293e1b8493c4a29f287a6735b2d58c6274394e13534d4dd0979161acdf5c8f50ba85f6eaf531 SHA512 d46574e2abddd014711353891bb004545a8951ad5206fe9a6c6d89199a6fa272aeb71814b98acfa81238c657e508af5c1325dccc84cb45acd5f3b02e42c4cc56
+MISC metadata.xml 347 BLAKE2B 003171906a29013e9cbfc66c32a20dcae01bccb6bdf39c3025f062b9fd548d86faaa50cad729a89803f99dac95e05353f0c1fb0004295070eab7c10dbb427c40 SHA512 098223c55a1a1a8ce9d9ac5093e881573ebec9aaae6e37c2bbe0ee62ea56873295acde9e341ba77b697e92fb47d6312be852a0858dde4f8a917df35ba5bb444a
diff --git a/media-libs/cimg/cimg-2.9.0.ebuild b/media-libs/cimg/cimg-2.9.0.ebuild
deleted file mode 100644
index 3205e035da6e..000000000000
--- a/media-libs/cimg/cimg-2.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-S=${WORKDIR}/CImg-v.${PV}
-
-src_install() {
-	doheader CImg.h
-	dodoc README.txt
-
-	use doc && dodoc -r html
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-libs/cimg/cimg-2.9.1.ebuild b/media-libs/cimg/cimg-2.9.3.ebuild
index 3205e035da6e..ab8c2c93c64b 100644
--- a/media-libs/cimg/cimg-2.9.1.ebuild
+++ b/media-libs/cimg/cimg-2.9.3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-S=${WORKDIR}/CImg-v.${PV}
+S="${WORKDIR}/CImg-v.${PV}"
 
 src_install() {
 	doheader CImg.h
@@ -21,6 +21,6 @@ src_install() {
 	use doc && dodoc -r html
 	if use examples; then
 		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
+		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
 }
diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml
index decc730ae1c7..f43d173e0eba 100644
--- a/media-libs/cimg/metadata.xml
+++ b/media-libs/cimg/metadata.xml
@@ -5,5 +5,6 @@
 	<upstream>
 		<remote-id type="github">dtschump/CImg</remote-id>
 		<remote-id type="sourceforge">cimg</remote-id>
+		<remote-id type="cpe">cpe:/a:cimg:cimg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index b717296c101a..dc0aed6acbc2 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
 AUX compface-gentoo.patch 1415 BLAKE2B cac49f8b6cb2680df1ef46a811a3dfaf1f7c170b69f3eeb91daa784e885fd75925169a85e6716944056b9f0fa4d29df96c795c3d16f1a1b89d54468faf555c17 SHA512 e966f02c7566a657751ad4ecd30805c5cb77e9fd76a458d639ff3291d0bd3c4e886bfc37106a755b1387c5ceee331eee1921595249e07175918bb218cd449a10
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 605 BLAKE2B 6906a5ab5cf3b0289c64e3e5de891861d9df1507529dff3fc81aed1452537f207a957cfb0884b5320aaed5aa9c8ac9315a788b7b9bcd722f966d41f3a14c664f SHA512 55a6b92feebdb1280b0d814378c35b724da7db237b1e79df859aade31273ff8c779b26b2671333ac559d19f9077a3e87338864a7d390df7f3937f487baec5b69
+EBUILD compface-1.5.2.ebuild 606 BLAKE2B 0b77c294392af1123a21da57d85f099ef85464b5f4cc51715eff12c557add525766a88a261d7180989dd90f24f29c27b66766fc03f2459f39d190dc64f4de98b SHA512 82c15d3c13109a840f726c501d28857c6d46eda3ed70acc46fc8eefd97a397ed5cc561730cba2167f3a9e9f4dded6f6d88712ef7851cafeb90bbabfc6e7bc256
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index d82aa2010964..f7360109f376 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index de549570c2ad..cd339f471c77 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,5 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 705 BLAKE2B 10fc9c7d06778cf1a2fe078065d7e218db0b031d6d3e411def5bb43f9724818d920cd37dc6e5785d2ada560c8a8c2b0bcac0da340e71afc728d153c911d2556f SHA512 16b163eaa25d9880157ae23412fe11e0c7a493af2b5a34d483986a8d246cade9b54796a2e70318b25e800c610e826da4282f0b61997fda9c96403ff522ee66c8
+EBUILD ctl-1.5.2-r1.ebuild 706 BLAKE2B 74b550d14ba621f757559e9e7e3b4040271bf91e3969f43d60ddbe145aa47633d059fd1f8e63285a1307f982a77d899fe78865aff2c83e6ac8a534a5fbc39b37 SHA512 17d50cf67b8a191834c6376f8f5844c6dad46f2e0005ac07a28697ce8aa9fecb8fa4df051daa9ebd93967817f7633c5fe84d7b1ad6a4ea6fc78e0ed7ca97eab6
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 7505abacbbc8..5fdac91a0ddb 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index daffe01c5901..69bd1cd59760 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,6 +1,6 @@
 DIST dav1d-0.7.1.tar.bz2 644556 BLAKE2B f3539d73b2731be882c71a0e8e90c4382282a650ff9e0aa2bb1142f59a823bbe00011e384c65ae86b8b617054a167b8c90b83d96591ad5c133b7de336c30c753 SHA512 7db0f2eb5f6cbf2809ffb9ebaa18bf1331df00dc6e9d571380b2524143ce3bfdd2e7df1a31e82a52640e7ac81b2712127a395e857d061118845011a1e5fb4751
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
 EBUILD dav1d-0.7.1.ebuild 1175 BLAKE2B c22a14777ab513828543133397ee75aef8ffd765ffdd1b1c6ca90f21304727617e6689e4251e1ccd97db34c908c4ec981927634f9609c33db2d0486ed4960233 SHA512 1a0fd0605c5383d5a8d4094c3cf7e74d8fd369b2cbafba952c391655f20d23db5f513e4cee3597a92c432855911e4671a4efaf45dce750842bb7ee11fd8d9bec
-EBUILD dav1d-0.8.0.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14
+EBUILD dav1d-0.8.0.ebuild 1179 BLAKE2B bccb11579d98d4bb5594396a7c0e44b15e832e4a589f496d247d93e915b71782aefed34f9f6f34d4bb37d863e4a5d12f6f51df54e90add92ae7650db0e0c627e SHA512 98ec95a1b323dc3aaa77e0a5bad50f509e1ed99ef6cc455df51cfce74a848056b379397838290b6f1492c8f5107e906b3c48eccfac97d96901e96a1a96dd7dae
 EBUILD dav1d-9999.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.8.0.ebuild b/media-libs/dav1d/dav1d-0.8.0.ebuild
index abc2d61dfe39..4f306cb6db15 100644
--- a/media-libs/dav1d/dav1d-0.8.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.0.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 0b29173113cf..61ba348d3b3c 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -4,5 +4,5 @@ AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-EBUILD dumb-2.0.3.ebuild 1003 BLAKE2B 0c32918861f4423087bc1d88dca6359df5ed921f56699f08992b565c23f426a8df85c99b8418319540680a00c8ad8154365caac20f060409de2383ed3f840377 SHA512 89edb432c9c2c8021ec29407356c4ee968dba4f347eb69bb6cec6a5790e5272f0856cdb5533fca1b47e1af9a78083e045cdeb15ebddd31783f3736e6ff1c0660
+EBUILD dumb-2.0.3.ebuild 1001 BLAKE2B b0780928686de2a8ebb3d7daebb8557484d61615a452c837aa02b389ffd681c392ad58f8c37e346d84bc917d499ef507add1c4c9f63de3df05b369ebc2a81ac7 SHA512 70d5358a020725b65b0d595a6bb06c70e9eb70317ee3a2e408ee0db6bfcf7bb25b9236d788471f75fc9c6bb943525895179fafe60f8f83f121fe4e81f9528c08
 MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
index 7d3dde441790..4255606daa2b 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="DUMB-0.9.3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="allegro cpu_flags_x86_sse examples"
 
 RDEPEND="
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index a40831ca2ce2..687019431da3 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,5 +1,5 @@
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
 DIST faac-1_30.tar.gz 241750 BLAKE2B ee3cf1ad44c14ec289036c9a6f087df3a1cf81c9b0f60b6a2121f5badba3f3cab983001437bb6051ab2306c0e5e14ee8e3c9439116bd82c370f808d912ce2c13 SHA512 8582cd580dba2a347d15dc4fab42020d7120d0552c54ab74cfaf59ba1b270abb94c67e39d42459a14cbc6e98f3fd00cbda589e1b4f0c7278e41bdef6ae7b6554
 EBUILD faac-1.29.9.2.ebuild 924 BLAKE2B c29474242f93437e0299c5099852e78c9d26ad0e979882b4ab144743db9df780848eff2fad017aa95dffd293a807330cf762e633c7598cc1c174b33d3661c8b8 SHA512 39e82de5fa15d3c87a2b366535c4e84deb8be0f9b11fd8a3e1590b4ec47512dc5e66332c81e758b23a744ce2147d311f33509eb20baf04363769580c749aae67
-EBUILD faac-1.30.ebuild 1012 BLAKE2B 6be41b767f72bf9fd2885cfb4363474b1fb070650d92ffb4de817bc45412d15040c7594d90441005e38798d3ae00eb5027e0d131bc214904bc3e7cbe8d7bdfcd SHA512 ea6cc14e5e848ab24b9c01b8dfc85c4fb474cdf248e4081a217ba80eb94808cec71076c394e54fde88573ba5151f49b8323ef28ec9f2562a0bf15e7bb58c2a05
-MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
+EBUILD faac-1.30.ebuild 1009 BLAKE2B add59129e6bdd4dc0cacc9f343e2d14eb4d7555e31d816d37f700aa7872f2f2c80ded754156cfd5d88df3f6d022aaf13b600178215c39980c0ad239caba467b5 SHA512 d6abac3c024b28a005c752920758a8f01d52ed1abc5e9978b717beff725e05feaebf322940a8cd4392f437034e925d17e6a9a236a0b000235afaf2b93d969900
+MISC metadata.xml 377 BLAKE2B d5b3b8da105a6944f05e952ad1d7875ffe3c2af9b922e4f09e00e1a9925232ec3120b2fde4cc622c82863c7efea05b3c0ad193a93eadee58fbe1b530a4d15515 SHA512 c765854361639f7dd7f698d39dbcf19a4148afea9fa331bfe7fe089d26b0c163cd730d43bd342538436d520abf37964f3e6c8acdfde6a72fb0cf67281cb91af5
diff --git a/media-libs/faac/faac-1.30.ebuild b/media-libs/faac/faac-1.30.ebuild
index 25180e0e80f6..dad2ee474b14 100644
--- a/media-libs/faac/faac-1.30.ebuild
+++ b/media-libs/faac/faac-1.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/faac/metadata.xml b/media-libs/faac/metadata.xml
index 76160dab072f..613d5985dc7e 100644
--- a/media-libs/faac/metadata.xml
+++ b/media-libs/faac/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">knik0/faac</remote-id>
 		<remote-id type="sourceforge">faac</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 6f3fd268536f..51c9f38b1148 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,7 +1,7 @@
 DIST faad2-2.10.0.tar.gz 803225 BLAKE2B 73ecbcbb3fce93e8ceb88f6f7669bb681d2329935018cc2a23929cf6672959a0678b47c830cfdcf8e716709ce5252a02178737a7af09de373f7c8b54f38f3d9d SHA512 92c8b5e79f85b7a7caac9e7954959c26d74ef148a658dcb37e2c1b303fc2fcc5a0d12f21e7bd476870498109bdd03916a56c13f578186a69d6eceb103222e771
 DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
 DIST faad2-2.9.2.tar.gz 803100 BLAKE2B 093c629b81d976db760f02dc7945ae8caee66e2dc6d859499696e4978d4832c9592c2868bed575a39c778fd62f0b74fe5ee3a17b6ab22ec5c148b0dbcd7946c8 SHA512 996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2
-EBUILD faad2-2.10.0.ebuild 1174 BLAKE2B cd3eb9cd8c8e1fce5c72fde2bb0791dcd1e779a682f573e6df8c66cd0fc08e6efe91fed76f781c2fb0da173ea87cdb548fe6d2d8d2b5fd439d6198ab7ca119cb SHA512 1d76863099b6103571aa1cf2f112ec3a678cea54594348bb0da78dca76d3118fe0c78c0e0f00af3a18f041b98ec6de1f58be7d17b0c9d6028a1894f062701a6f
-EBUILD faad2-2.9.0.ebuild 1238 BLAKE2B 92be2a701af77f07abbbcd765080f2f8e823153cb9fda5f2e019691c818e2320f062de5bf5f429cc7bf34aca3d59d66fe7baa1aa940ec349e2b9f79e3cb725ce SHA512 3d78a589987f0e3e3c9b996cbc1eb23584975249862e55f1943ceb0c59af3c6e4a606500716fad32d52e58a4871137fd97277e50999abff48bf32f409e8d2cf7
+EBUILD faad2-2.10.0.ebuild 1170 BLAKE2B fd78872aa59bd3b07936eab61b431f6be6c3d9eaf4feb6241259a944aa3b5e99bb3b77438bd4c334fc14851433990a6c68d29ccea878cdc3204e5f4dafa86954 SHA512 20f7d74002dd50380367d76bf05679a5f40fb61dffc7fe375dcd407264129ff93c1795a672e6093a99025c4628b5d421a0c5423debd45ff97508a56298462657
+EBUILD faad2-2.9.0.ebuild 1239 BLAKE2B 51468976d855993a95d0b91ecff2478404a5d1f52b11fb5f4a10cd860108355be0971306a093fb2d92162c04e8776c81ebb312ac2b248d392f07f11f405a3a4b SHA512 c43636b72b1c7871b3b195a337cc62407e5367e450ecc59acbc836fdcad7119538afd9e9c0352371e2d2d6b4d9e51cb0366f7f188b1c9217594929892acfe9bf
 EBUILD faad2-2.9.2.ebuild 1174 BLAKE2B cd3eb9cd8c8e1fce5c72fde2bb0791dcd1e779a682f573e6df8c66cd0fc08e6efe91fed76f781c2fb0da173ea87cdb548fe6d2d8d2b5fd439d6198ab7ca119cb SHA512 1d76863099b6103571aa1cf2f112ec3a678cea54594348bb0da78dca76d3118fe0c78c0e0f00af3a18f041b98ec6de1f58be7d17b0c9d6028a1894f062701a6f
-MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
+MISC metadata.xml 672 BLAKE2B 7a596dc10b925376781d43d1a3175b213d3ff02443a01d8e5ccc6c30bb12f9bf35961f9270b8316e321eff32e4680d505ffd652dcce32d770477c3137a3e67ce SHA512 d7f0fb4df63e5e0cf15d17044d723f2b94a476fa9efee3907354f7a7de45fe7f623839cfc739e90ab5581101addd86bb950e96e8d34a3fc379e7eecc22c175cf
diff --git a/media-libs/faad2/faad2-2.10.0.ebuild b/media-libs/faad2/faad2-2.10.0.ebuild
index 4c6a8bef3075..a4d3d4b887f3 100644
--- a/media-libs/faad2/faad2-2.10.0.ebuild
+++ b/media-libs/faad2/faad2-2.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/faad2/faad2-2.9.0.ebuild b/media-libs/faad2/faad2-2.9.0.ebuild
index d7fd7fdc49ec..34d597dcbe6d 100644
--- a/media-libs/faad2/faad2-2.9.0.ebuild
+++ b/media-libs/faad2/faad2-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/faad2/metadata.xml b/media-libs/faad2/metadata.xml
index 0ed127787371..56ee2097662f 100644
--- a/media-libs/faad2/metadata.xml
+++ b/media-libs/faad2/metadata.xml
@@ -10,6 +10,7 @@
     <flag name="digitalradio">Digital Radio Mondiale (warning: disables other decoders)</flag>
   </use>
   <upstream>
+    <remote-id type="github">knik0/faad2</remote-id>
     <remote-id type="sourceforge">faac</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 1fef82bc59d1..a7488e928635 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,3 @@
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.3.ebuild 1583 BLAKE2B d5017a48bf262cc777aeb691f4b4006af17628f6b5de4fb891724b288103d523e74dc9dc015e8e76e14ad6fd1fa08bdd3e7dfee556c121301b8faed8bce764b9 SHA512 4272970d89cd6518bbb92868c37e38de6212207fa1528efe7ca1b0d9136997a85459aa1324a94a4cced19345345e5eecb65c23ff8885f3ea8091fa5e246c78e2
+EBUILD flac-1.3.3.ebuild 1584 BLAKE2B 05bcf0f3a69c287b8c890a98ed2aec194e3226f4918c28d76a63c7150ac2a67de4f9e3e4019609c080385a553a6cf38a9e7e8d34e8ec526d96192a62e0050c81 SHA512 638bcdf92091788b2c2eab78b9b4decc5eb8d72a4a9867d364298dd012cc5c01d8e8b6da8381b2f93c1757b25aa75ec1230fa4b4f77904ff436e03aa7f985dbf
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index 35bc0961f2f9..332bc40c5ce8 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7a0a4d024578..b3d83a04ddcf 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,7 +9,7 @@ AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98f
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-EBUILD fontconfig-2.12.6.ebuild 4887 BLAKE2B 345eb589656f00006527680240e19666e509d840c27dd1d84f5ccd1767c0ab36077f3c3eef8d0d332c23ee2a71a1593d526e162f5a6a366196bda7ae6e3a04a8 SHA512 ff4c3186c81f614de2882f4792844ffdb6b94a3cd8342fd058c3dcca2382f2dcf64450801079383eab6f145e45b8475e491794e5574e030b0bf5dc4cad93556a
+EBUILD fontconfig-2.12.6.ebuild 4867 BLAKE2B 0f577175e85adff915de692364ef04077a024f781401f862e7c5498ec545cff1174048b010fa8dd18142eb2f888a1b8e99120b7ac7a4f3c0bcb4f8b973ff05df SHA512 e1d6f10aa07d0aea40564dd0ecd7e76d89111a0fc6790c04b46f35442798eb97477ff6ba12714446ca115dd217f4539f7cb29023eb7774d1411b8f1fba2f646c
 EBUILD fontconfig-2.13.0-r4.ebuild 5166 BLAKE2B a26fa62a00f519500c02e3972c9718978e163b6b27eb67c8c8ba2fbaeaa460c870ce21cc55989e29e8fd928934ff89802a65e6bda1f774faf1566072cf22670f SHA512 751d7456a010a26002ee4749cae2eb95c00476fe3916953b577d9bb75acd68632f5e65c4c51b44ce6de6ea9be4c0f93940898e63bce25f84039ddda430ca4a6f
-EBUILD fontconfig-2.13.1-r2.ebuild 5637 BLAKE2B e3898666340089e05f9377e990a4e1c37af815b5dfb180c48600709aa497673488e2a9112113acd5238cb5d2a6e97504cda4f069145105ead7933d1bb955fa1c SHA512 95942a25dc695a86d4acc9cc5f362cfb72d1078ebe75d5b402fa389b95767afada12ef3836e26fb9314581ee859aacacfb338cd649889ec8e4d6149f930f85bf
+EBUILD fontconfig-2.13.1-r2.ebuild 5617 BLAKE2B fd658076fdb9cba13025fb6540cb52114a87cddc19119e749c8c866f0434606560e868938638c8a224bdb0aea4acd4b55cc54d930e729e821e188d0cfdfd752c SHA512 d06676988b82be2422d50f69b6f5a06ccb3bc3c8a25c4fe80036ab03ce855be43957e0595ef427ac39320baf67e51ca3a987c3259c72a2ac9316f679a28bad72
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 7ee4930332c7..82f8ca27e287 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 552899d93ac1..53f7689e891b 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 234e7049f207..5c094fa2be2c 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +1,4 @@
 AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-EBUILD freeglut-3.2.1.ebuild 1438 BLAKE2B 4f8fe147709bf96d73ee99a4fc335c2df3523b0e32d7d6430719a35c4d926974ed3c18f70900f617bcd42d613bd7a67b338dd56b9d0e07fc5bb02557011bedcb SHA512 49921fc873c04459410babf74ed231ca68d707332323ad9a293e247ff3d1a0b523905f272090c7abb739443149ba6e50ffbecd2a192ef324f5a30cc0c2722f27
+EBUILD freeglut-3.2.1.ebuild 1439 BLAKE2B 31a356541d5694c0401192396800411c3f0fe034c74c3e593539b6a7598478277f743d6f94feaa400766f3466443536860c4e84eb24e083651937ba1ecd5adc3 SHA512 af37f93235203faed240f04ccda67f9f9ef515d3499cd97b0c05bd5faabda78b1a0fef77d74aa4f60203f5fb908ee5d55e1bbd58b9f87d6e2bbb46ef44fffb3f
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index 61691b2b02e3..717ded58b7a8 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 0f0951eb121a..22b754f90376 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,6 +1,7 @@
 AUX freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch 6242 BLAKE2B 3deb724b2cd5c125a41885787e9165434047bc8710861fade7741c67c6fd6e7f21cafae07b36cbe81fc7a372cb2c470ca44b02f06ac8c0004473aaf00b39365e SHA512 eb658babe27289ce24cd23bbcac52de7a351cc52a9c62cb561925ea17b8e476b03c1e2202b042fac4a60fae805e1a422333db4203d2bcc20319789a689a38125
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
+AUX freeimage-3.18.0-libraw-0.20.0.patch 1912 BLAKE2B 56892466e8c8c4a1178c66ba24fa0da0b4218ac883a21eee47ac87044a5cb300182d33c04e91e9ed30a0e3b03c34cd447c0400bb2b6045f96866bb583aeaee06 SHA512 6fde3ee5e0219bdb6cf897e1898dfd0e06dbfceb67f06a935776b96c4688b27e11075958c339c417c3d3490d5778e802b1eafb4c92360c342acf0a2b7ff6345e
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
 AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e
 AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4
@@ -8,5 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r1.ebuild 3052 BLAKE2B a013e1053090f810136410e9bcadbe09d5610cf6896160fc4cbe00223adf0e386c8f294c70848f4c7da4194e8ffa5c766393bd8bb76a956cfe9aa3f5997ad96a SHA512 3b587b0c14a81c752f7c5f669aaf2f32ac077a72e98a957b3bce7458ddb6ad5d4fc3ae189224bddae1739e9cd103b0c1bbeafd01d6ec2b22564fdc77509e747e
-EBUILD freeimage-3.18.0-r2.ebuild 3118 BLAKE2B 935dc4697e66fbc10ce178dab9971ef17bfc565c54d74e2ed56dd748bf88db519e95a5d61d5effba914f53b2a34b814e4ee5f0484711bae5c9f7ae1801898e06 SHA512 918d059e44653da0c6f040c8fee0e6bbf84791689a1b8e0922170b22ed5eaa74fe8be1a92981f86d6fc468ba9bccf8d261d9e236a446d98fcc0ce1d85f4da6e1
+EBUILD freeimage-3.18.0-r2.ebuild 3166 BLAKE2B a2a37f66d3e57fcf0c62bfff9a8f35ba3f98140a0f59faf00a951608921a5cd49ec4056f154ee0a4c8d009c328eff43557b38499b3987dd79abefecc33f44491 SHA512 40bfdcd3257cab417ab798664e4048051fca196ce99dd2b858bca82b5a48b4436cdd3ae43db8f446b5cdd8dfdc7df5d90e1f8fbc1a1e22519f1c745ba9304650
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.20.0.patch b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.20.0.patch
new file mode 100644
index 000000000000..dc108b567c4e
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.20.0.patch
@@ -0,0 +1,71 @@
+https://bugs.gentoo.org/734724
+"FreeImage now uses LibRaw 0.20-Beta2 (GIT patch 2020-05-29)
+git-svn-id: https://svn.code.sf.net/p/freeimage/svn@1842 f6e0daa0-2725-47c6-9c0b-5e6e9cdd0720"
+--- a/Source/FreeImage/PluginRAW.cpp
++++ b/Source/FreeImage/PluginRAW.cpp
+@@ -59,21 +59,18 @@ public:
+ 	}
+ 
+     int valid() { 
+-		return (_io && _handle);
++		return (_io && _handle) ? 1 : 0;
+ 	}
+ 
+     int read(void *buffer, size_t size, size_t count) { 
+-		if(substream) return substream->read(buffer, size, count);
+ 		return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle);
+ 	}
+ 
+     int seek(INT64 offset, int origin) { 
+-        if(substream) return substream->seek(offset, origin);
+ 		return _io->seek_proc(_handle, (long)offset, origin);
+ 	}
+ 
+     INT64 tell() { 
+-		if(substream) return substream->tell();
+         return _io->tell_proc(_handle);
+     }
+ 	
+@@ -83,19 +80,21 @@ public:
+ 
+     int get_char() { 
+ 		int c = 0;
+-		if(substream) return substream->get_char();
+-		if(!_io->read_proc(&c, 1, 1, _handle)) return -1;
++		if (!_io->read_proc(&c, 1, 1, _handle)) {
++			return -1;
++		}
+ 		return c;
+    }
+ 	
+ 	char* gets(char *buffer, int length) { 
+-		if (substream) return substream->gets(buffer, length);
+ 		memset(buffer, 0, length);
+ 		for(int i = 0; i < length; i++) {
+-			if(!_io->read_proc(&buffer[i], 1, 1, _handle))
++			if (!_io->read_proc(&buffer[i], 1, 1, _handle)) {
+ 				return NULL;
+-			if(buffer[i] == 0x0A)
++			}
++			if (buffer[i] == 0x0A) {
+ 				break;
++			}
+ 		}
+ 		return buffer;
+ 	}
+@@ -104,7 +103,6 @@ public:
+ 		std::string buffer;
+ 		char element = 0;
+ 		bool bDone = false;
+-		if(substream) return substream->scanf_one(fmt,val);				
+ 		do {
+ 			if(_io->read_proc(&element, 1, 1, _handle) == 1) {
+ 				switch(element) {
+@@ -127,7 +125,6 @@ public:
+ 	}
+ 
+ 	int eof() { 
+-		if(substream) return substream->eof();
+         return (_io->tell_proc(_handle) >= _eof);
+     }
+ 
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index d8b629ca9c1f..e833f947fde1 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-raw.patch
 	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
 	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
 )
 
 src_prepare() {
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f3966f1fe6ef..af185c045f84 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -2,6 +2,6 @@ AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6784 BLAKE2B c7dbb4aa208c41c59460d8285c6672db29f4e2f92034d4bbcc1f5764967970c92fa23f796d6ab01c3d71280defe1ef2cc52a5615bf87fc8fba39eb08af15e1d9 SHA512 b544411885b29a86d52b50c34dd31852fb77a0d45c9ffdabb01177adaeee900f0aba4d50925bd823f223613133b00d3b4534b4d256bce9d63d551bd32bbcf2e6
-EBUILD freetype-9999.ebuild 7178 BLAKE2B fd0e920976c8498d08b34ce23faa87583ea7a905220a509594ac1b537ff51562f92d656b2e1f315ccca468250013156605e4fc9ac089c44e2749a5c14a23056b SHA512 063f7cce33be577a7ae54c871c1ca2b05df4425b8f57346b90c600ec009f96c37550a5b4ad71bb0ff1d5999abae3116b360e3778f17eff4d5645cb0241b64ecb
+EBUILD freetype-2.10.4.ebuild 6764 BLAKE2B 9dfca585cdf862f983d0079316c8964dc990ce1d659063ce8a60b4ba44db75eca80184900199456d1b2e1a183a27db0901dda5b783d2741eb7349123c253fcca SHA512 5c8d11cce80fbac6e2aa54834a929872d4c1390f624143c6ce90b8a9aa5296d82f1bb91d6c93131216ad50f08ed0c7a9c5178413c8e44281dcd413139ec86f9e
+EBUILD freetype-9999.ebuild 7158 BLAKE2B 787673fdfbe4d7f9be94ee789c6686e74f7c5fd3b696ba0092b3189d570e4df99872984539ea40785b18d0aea2920211baf5f888bbb06955d005b6ca4f363383 SHA512 5d6b672e6f278277941592c906506e6a016bf984b48c4ea2d2bf262ab19c90b82e83525b73fbe2c53fcdedf47d01c6a98f7551ee11bf85735bb091e510bb6af8
 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 4ac276e1db9f..4e708d9efaa1 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index ea7f1fae817a..c5f10ab25ebd 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.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 9f99c5f074e8..446b34c1e2e0 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1238 BLAKE2B 7c11341b962fb85d4cd68c98e114151fca6c7eecfd46bf14caf034122d5e9e92e446c3d023c0976f92825966a3811d35216e711c81292ff1f44bc06ecd555a80 SHA512 9bc05a662dfef9cb509a66b36d87e428ae28d5dc86eb73b584dc1bdcb523b4436941f69c6cdeff033639581978b7056f766d89717c6d9441727324e5bd1f54b3
+EBUILD ftgl-2.1.3_rc5.ebuild 1239 BLAKE2B 0d4bec1e3f1a6ecc06bedbd3a7c06778daa2746d60047c0938a19fd205d803bcd290623d5bec1f6a6a5c96507fe711414088d26babbc99e8620bf43b0eaac2b1 SHA512 913908774dff4dd726dfa84d7b6da9176cfa083b546a7c973a2f9ad3b85b1e3d88b15a93645d39043731664a2bcf02e91c8fef28cf89014068113dbd6f05693b
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 93fcaebd0f1b..4edfdff9cffa 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 6a8d5590163e..14b96e24ec34 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,4 +1,4 @@
 AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a4117cb9bf8b5be988e98b78dc13f7d62079c43ce0d5a6ecf894590ee6dad2f2071541a43b221411 SHA512 c143704ef537a1a151a7778f84c51ca2e098648c7c50f8c17ed0e2ee625acdfa95d9d3462ebd1323fe1be1fa4b72524c219becab320bdb9f2eaa06ad2744d581
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.4.0-r1.ebuild 1089 BLAKE2B c6d284504cb16bdd3321c2ba6e0152ef50a6e5226ea9e814bf61515ed972af9dd087ce3116f16f822bcbe5f74c16c891b16b6e84d139a3c2e8fa09eaccf8f27d SHA512 bb18d6c0f9013f3cf07a6c1e2fd9b7d1470430e68c47c47eff7e76215bf5b3b95ec4e4a0aaa0750cb1a8c78c3024771ca61ba848d369180842b1e6667a2d21a4
+EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
index ce77e57baf85..1fff889bcf13 100644
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 3a58e3cf5726..a3b1003a5cdf 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,5 +2,5 @@ AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd
 AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
 AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-EBUILD gd-2.3.0.ebuild 2553 BLAKE2B da39a7001c059f8762de0c2c45300451ee4741eee00c3143fcda9e6eef892a8332b6dcd15c004ee2fdee49f954c001636104949c6c49e1c437755ab3f16d9f44 SHA512 8b9362113f14adefaf632f06d582e5ffb74ff1921d21935c4e5a6fa4df6a10c47100f7f39119ee76a65b0ca4df8ec1397272329ac8b1420da8c89cfc82a0d544
+EBUILD gd-2.3.0.ebuild 2544 BLAKE2B 8d3e82649163581dd53449d4ecd6f75532284073f1ddc1c83003415828a7fcc94910e9e2a6fffd720710a752416c40614cd9ca4a01a0ca1fe26152c181084643 SHA512 4a980444d7e318f39f46939a40538ddf3ef3b19322450fa1b800497bdbfbd46576e84a4f39c04bb837da7203ecf7391f98a36d6ddaf671be62a8367995f0debf
 MISC metadata.xml 1415 BLAKE2B eebc7a74a8d70d6d8c8eda0f59a752ce1f2589dfa0ab0df358a1fc0fbb843b285a270e626d1cd27f29b51ea46825184dfbfc9c4c252baed5092d2ab8cc33c0a4 SHA512 38aef9d6c1ad8b510a28aa54ed7d93c96d755fddc7a2693a6ab4667a38667ab37ba5eddce534f52e43c1ce9abe576ab4adefb2c17c64ff90ce1d24f44ae58cb6
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index 79cfcfea4415..153204a77e13 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 5f3219d28529..d3dd839a9e3a 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -2,8 +2,10 @@ AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773
 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
 DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
 DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
+DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
 EBUILD gegl-0.4.24.ebuild 4722 BLAKE2B 768487bbd09552408a209b26b9e1684b4cade9a90d83bafaf4d15ba199b38f6b82ab5a6cd885683eba8a4561200d91b8a809bb42dfa41c6619839b0f34258519 SHA512 7d0a8adbebd7abf090db4b760d015af7d5e296fd71f3412b20fa2a223a00448443e6ecbd73841aa72cc1825c1496f58e800bc00fa5dd72829479c2b31161a58d
 EBUILD gegl-0.4.26-r1.ebuild 4924 BLAKE2B e60c73eac7e641d730961ba9688f96bb5e8d065bf73a05f18c6ca81a76b9f464137f8456dbfd694f2e3c968028aa551005d2d13712ea1a84fca04c25aac81fab SHA512 59f470fd33ce8c446cd19cd6a32f9d7c357cb2f32754e1bcd3e82d7b808fcb927e00c1f3c3076cf66e5b3926ed37ce82f84c986cb9fdd18ff5eae3b45c6e3c35
 EBUILD gegl-0.4.26.ebuild 4728 BLAKE2B 1c88d9b6bc615b2f3a2f653437184e0a639514656c32cb8aa42be46b66be46f4724d82583e83d36aa460d11c0e1d53254984f0db4fbae40c3bcaf816813dd9d0 SHA512 43c1769f377855207d3f5c7f240f2c91d89477aebbefa3746c3abffb048d5e68df1072ed51979e0d80b996e718213d2f216d226d668a56af62d3559e5eef0816
-EBUILD gegl-9999.ebuild 4336 BLAKE2B 3b3970328fd942cdaaf6e720382f92c2738d264961f92958ad360f182ac68c60ec9fc03c9c8457b5370741ba7cbbdb26b116567d161cfb4b24cc61c567c578cf SHA512 0d86d9e36014717402d8e15dbb6ce40e0d19ac3edd2b379712cb0f0bd5f24b558c9060a91603e1501f4bb03b239c10328c93999bbdc4da627948882e8a086bfe
+EBUILD gegl-0.4.28.ebuild 4924 BLAKE2B cf3e83d2ec4405b5e53085b2b1a279b5d0bd394d89fafa33ca309c311e8edfedea08b54262375762e2ffb0f01865f8dca8a67ae684234d592dab1e256363d99c SHA512 18a07a6e16afa0cd7759529231bf5f9d98d3ac665240482871cc0791ddfc5de570623247fa35418f189491bf26b74e702c9eda160b9cfa7129a0bfaa208d6c6b
+EBUILD gegl-9999.ebuild 4336 BLAKE2B d7562c27de25191e057a343de2bab84fa7132d7ab62f63f4a1356b5a955ba00f00dba34ae0bd687d9f21053bd4444aa8ec3b9b8e05bb983c0f2dbaeb605dee1a SHA512 55d2b2d1a1c6ee8852285737d20a1faf1aedb7ba736572ee43bad3101ac3b5efe8d8e1ff91f4b2fa93a4de37815cba59745977d7c0a839584b1ad7d901485e5c
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
new file mode 100644
index 000000000000..b6103513bd3d
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="https://gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
+python_check_deps() {
+	use test || return 0
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [ -f "$file" ]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index ad877bef7420..c8dd9cebd2d4 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -38,7 +38,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
+	>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	>=sys-libs/zlib-1.2.0
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index b6416345bc23..76c3baa7fc2d 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
-EBUILD glu-9.0.1.ebuild 1008 BLAKE2B 6008cc9f445a7284704671e7b18bc0327399d9e2da2996389c3ad240a0b24d679087fdc5b31419e31a312451cce42277a1c766f4cca50bcf17f4c5fb687b8c5d SHA512 7d3a4924a76ad435058d8173b1b0de68f8f3063a97fbb650c170f11621d3b73ac30e4e0c05b43a59601997cf38ccacf51a78ce5c30ec41c38349e388d542508a
+EBUILD glu-9.0.1.ebuild 1009 BLAKE2B 7341081e9ec058682a78116744e884005a6922f69641bdc90d8d4278916162fabf1a0096825c2ef3bcf55efc6ff4937cb5a3c4d8afcf623d3eb77f1ff0add4d4 SHA512 f056a5959a1c3fffcc1be2e3064d29bc427fdbd3c5a9d3b43b07816a791fc20b99731925c32608faa390e3603807bf231e099ca5edb106f9dff0070ba2c7ba75
 EBUILD glu-9999.ebuild 1010 BLAKE2B 969a6e9217035d36fa73b42e65318961b1f5c2b084d1af7720c0ad0afdba256c2f3bb1dcd88fdfc5e4e53c6b873dc4b69f1c3143e52f1e402d0dc3cc198a0c93 SHA512 5cbfce3faeb61fdfa05a950c78be9c2e60445461e28412f539195372ee0febff5dc7ef72bee80fde822dd6ad38ce2e4a85259882b259717a5021d3756ddc0cb0
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index f17558eeb992..f173ada5ae1c 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index f7a9e8ec3ff2..7bbab08c57ed 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,6 +1,8 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
+DIST hamlib-4.0.tar.gz 2242857 BLAKE2B 458a5cadc36f8f434fefc73b6230b08c858a741a685805e8d8ab1e2bd74aef9667d6b3d006aa493516830a6fc8af19e77b4d92736198bb920797aecfac605f41 SHA512 6c097f503d1050dca4e5ab9091cd9885f8db8b0e4b2fb26af570f1871f2da713ac3fe10e3629d20ebfc2927768555ad277e68cc38821f4a905900b8d3a5ba8c9
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
 EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B 75d926706a9eaed1efbb4ffb0c26b3054e8819a15696b07be955fab735de6aeb61190d76a609a1200db0d808fe093fc06f94280d7e05ce88cfdc4f8597d28341 SHA512 373d355fb656b23964ad7ffb4f56b66090285e55f79c410af777d508c8f1f16628a11b7629f6a195f21f2c8a996056a0743730106b975ae3b66cb74f71cfcf38
+EBUILD hamlib-4.0.ebuild 2042 BLAKE2B f675e09692b84298d47ce723ae85fb172ce2e958e31b82e71c157d5576ee028084417e134bcba045b529110ff1738f38d98454ea0c3021dd57310190f1419e02 SHA512 e3443b10b36b4dd558887d39cc8f3e50f4e3e0a03d20db4c7d28206ec056cbf470de9f732fc634f69f8ed59d793ec2f1885faa29b0a94c98178d1d41c68de616
 EBUILD hamlib-4.0_rc2.ebuild 2062 BLAKE2B 89b7a4d0f6956c79ac5da98a6588a06a85c377633fe844c5c660374874a98523c677095730927b9faaf55587ff418cf6bc9246e15153d22447f28eed490fbb35 SHA512 f9bb0de8a699b6b672ce32e86b8045f3fee703b13fe3edb59f01db5c5d04accf97017f7e79652bf2deb71334c158a72d067c755431a7eebd618f73f46dfbd579
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.0.ebuild b/media-libs/hamlib/hamlib-4.0.ebuild
new file mode 100644
index 000000000000..d52c7828e6ad
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.org"
+SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND=" ${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 358e18e002a9..7ac73b173563 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,8 @@
 DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
 DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
+DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
 EBUILD harfbuzz-2.7.2.ebuild 2674 BLAKE2B 72db7468c820529e8879777a4223fae0a67e6dc61a2bdaceccedd93123f11e07f7602c1271e6cab560ed533ac30fe8df34eed1176812a7c2881b1b6578f0de17 SHA512 488c4842618955b7e3d3c08f71701fffac5d043104f0a2c9efefd3f55869d5e257ce857f511ba4b36e7bf654d2c2dbd163898df3e929cd8732367480fcff70cc
 EBUILD harfbuzz-2.7.3.ebuild 2683 BLAKE2B 0d77179666616c88ab26ce02a7f3bc3da2da986ecc35896054072fac75cf3555dfe045290da40f383aace1493ddc1903442b1aa882b5357a167761b8a039ad68 SHA512 64b73de5828d32f3f413bfbe37e0cc129c5bc8077cc8062d0b6dbae40a0b89807d9896c4a9ce3949beb1505ef7e2a70ea860557b41f839705d98d4f98d506477
+EBUILD harfbuzz-2.7.4.ebuild 2683 BLAKE2B 0d77179666616c88ab26ce02a7f3bc3da2da986ecc35896054072fac75cf3555dfe045290da40f383aace1493ddc1903442b1aa882b5357a167761b8a039ad68 SHA512 64b73de5828d32f3f413bfbe37e0cc129c5bc8077cc8062d0b6dbae40a0b89807d9896c4a9ce3949beb1505ef7e2a70ea860557b41f839705d98d4f98d506477
 EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
new file mode 100644
index 000000000000..89e06e272b90
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+meson_multilib_native_feature() {
+	if multilib_is_native_abi && use "$1" ; then
+		echo "enabled"
+	else
+		echo "disabled"
+	fi
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local emesonargs=(
+		-Dcairo="$(meson_multilib_native_feature cairo)"
+		-Dcoretext="disabled"
+		-Ddocs="$(meson_multilib_native_feature doc)"
+		-Dfontconfig="disabled" #609300
+		-Dintrospection="$(meson_multilib_native_feature introspection)"
+		-Dstatic="$(usex static-libs true false)"
+		$(meson_feature glib)
+		$(meson_feature graphite)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 12014c74f95d..227346adfee4 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -7,5 +7,5 @@ AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180
 AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
 AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1343 BLAKE2B 21b283b30632c0d5d643fbbcd0ae52ce5bb2b9898a7edc9f604824a72bb58c0d5a492f7e514318627b6be0c8fedf3a9f05a035272bf64c8530d0bd50adfbab8f SHA512 ad1f459fed49361d66b4ad8c4c538a0c15b0746f45f2291bf4accd0a720549ce41e93a1aba55a1b7a2b542816e69fa8aa255b42ee6f4bf225fb5f3e82be12174
+EBUILD id3lib-3.8.3-r8.ebuild 1344 BLAKE2B a98b6538a0ffc1a6e194992053089b60167ec30b9ecc08aa289affa4b4aa3a4cf350a648df5ad60b23ac1c6b18c80c3459a3e291b4a11c5eb8cc8a654921e89f SHA512 20f9a88b23a9b93c5ef5c52ff36bac9a5f69c8f83f155bdce539daaea5d4a8c059f09dd59125dfc16d9e2bc9538d88faa767e4044529a957034cacd847a9c208
 MISC metadata.xml 339 BLAKE2B 7edd7b91c817463342d9d8123d07014bc77b8d1342a1bbf17811ec54ed2c749441de32f6d518b30ab718459a3edde8b1f4953b7202df294407da192f33c669b7 SHA512 e5d02d27394556f17ac426d2c87cc19aa8c603913d9c5ca3641154e87b54f5de6768dfa4334c371d3a65af5c39f265f561b1bac6ab497ed5b41ad10891d5a800
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index 685c0d631f35..2bbcf30c366d 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index ad78f3d333f0..70b94d8d7efc 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -3,6 +3,8 @@ AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b
 AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
+DIST ilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
+EBUILD ilmbase-2.5.3.ebuild 1213 BLAKE2B 8b0e2e2c88ee683ac4e3323f7426a8af607b4d202e87f51ef5378937ecd7c8dc29673b4c236c64f640deff36f9e780cb4636a6fd813229de9a2e4322fda04ccd SHA512 acf16266005658c10a63aefd2c6bd51f03fc4980de20037c1765277a154708455843c1886a6b28562fd3985723b36c21b7840d2aac6272541a015b597ae245a5
 MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
diff --git a/media-libs/ilmbase/ilmbase-2.5.3.ebuild b/media-libs/ilmbase/ilmbase-2.5.3.ebuild
new file mode 100644
index 000000000000..907a133973e8
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DILMBASE_INSTALL_PKG_CONFIG=ON
+	)
+
+	# Disable use of ucontext.h wrt #482890
+	if use hppa || use ppc || use ppc64; then
+		mycmakeargs+=(
+			-DILMBASE_HAVE_UCONTEXT_H=OFF
+		)
+	fi
+
+	# needed for running tests with x86_32
+	# see https://github.com/AcademySoftwareFoundation/openexr/issues/346
+	if use abi_x86_32 && use test; then
+		append-cppflags -ffloat-store
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 61a1c335e0d1..b3f514ef42b9 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -10,5 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c
 AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c
 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e
 DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
-EBUILD imlib-1.9.15-r5.ebuild 2138 BLAKE2B 7b8c0a3d1054c42e649b886e8d3794b6f0645cbfc6f5dd552b0a8944c816c54cbfb7bf9a14bbc1eedbd8b7159c505c448a974fa2018fc38a2b59cba0e5fdc6d6 SHA512 45b61ba2ef4aaa51b38bd2e5ea05b90de6ef4b08a2974794a6402ccee5cb952f6c7947844d2b4b9dcda0b3709e888737f3c0c44c6aef54ba565a2078a7bd4621
+EBUILD imlib-1.9.15-r5.ebuild 2139 BLAKE2B c9a89a74b66b6cc50ba454f6a48d6077cc7fdf57287d115156b7487ca8ede1136944883df43391b1435f42149d837551bfd137f96910b966cc548412a5eb509b SHA512 dcf9c97d784e85866c7c8bddad1e4c14d9bee96cd98abd5b29e073a2142e4e01cb58a2ed2ac736b30b96ebad038ebdb3bdb15d8158062ce9b3d5b3ba743ba6b6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild
index 45cb8e441425..90044b6e28b8 100644
--- a/media-libs/imlib/imlib-1.9.15-r5.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index f2a43b081e73..d9dbe719d5b3 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
-EBUILD imlib2-1.6.1.ebuild 2275 BLAKE2B 06fa9966bc91ebd279d1c3d2066934aa4cf6b116de2dcc273b607061fc35ce26513b31afc9ace51b1f38e69ef2532b1202441b88b7ec19317971275ccf600b7d SHA512 3c4a341c524684e6ccb73e0640e999c54cbfdbdc47bf3db0ec1128d75d2b5a28e1af37e024e1505ae6a80b115abee5d43a33a133e2681a09ef67bad31c994598
+EBUILD imlib2-1.6.1.ebuild 2276 BLAKE2B 1a29df305528cff62d042b32b0d642927fb9e02b0cbb88e46e43160df1ed23ab620224ae6d07dfe2f0f48163257b72ecb4e7012d8a98a19174ddc57de61a4638 SHA512 27f9b52845991f389cf1e5d54023dcc46e84e6657cf47a0074298b663a9fb957b08e36926879d359e8c96a22f0efddb14e3c6439ad43c63006fc1b9e8ebf85eb
 MISC metadata.xml 2922 BLAKE2B b79d10aeace227cd55be0bfa26085fcb96fbc3272d4a529ce787bfceb9c88284b5e4a39744576b801d818c8b0247acf67cc94f2a07eee3f917552645e7504594 SHA512 e3eb78a927ec99b3dca515c66f927813082158b9269ecf18577cae1ae390eaf45adc41d655934f332410933e7287ca7173f951a245de5f3e2138fddef7596dd7
diff --git a/media-libs/imlib2/imlib2-1.6.1.ebuild b/media-libs/imlib2/imlib2-1.6.1.ebuild
index 9b654b459db2..393a693f3c1b 100644
--- a/media-libs/imlib2/imlib2-1.6.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
 	static-libs +tiff +webp zlib"
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 8d5679bf3d94..035157366eb6 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,6 +3,6 @@ AUX jbig2dec-0.18-overflow-IAID.patch 1285 BLAKE2B d2733f588b57af91ea40844750a88
 DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45
 DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
-EBUILD jbig2dec-0.18.ebuild 1655 BLAKE2B d1039e26d0b0a7573b0a8c1c60b109a70d8d5e0d9aa2dd3918037405e6470ac3a6ff5d2b82fbb587526efd739bf55aad54a2c4314fb6a102a23537157b4452f1 SHA512 39af2ce59fe84344f6fc8a6b366af223a3c34d27e61e0bfa2b68081386c13fadc78311554a8ba404cab9ef0c16e4adf1ce56039c6e1bfe5e8c7d5de2e92215fc
-EBUILD jbig2dec-0.19.ebuild 1562 BLAKE2B d60323071299652ff8679e8746f261818222e18a3b58b1e57db2ab87059fcd27fe2094f13d40bb1982549b4789d8fa559eb222d094214003ee622edfa6fb4275 SHA512 7bb1b7849245afec3d9e55e5f097a99333ed4a791874ddd17aaa806d72337b9efa689bbc3bb2d270ad8ade6e08084a214dafb2aec043e5739b551c9b79771e4a
+EBUILD jbig2dec-0.18.ebuild 1644 BLAKE2B d5a1cca70c0b1c55e5153901f7604c9c2f7af399dd5053df589dcbd57c2d3f9e68374b5a6fad2690eb1c42c4c4a8117d89fa69c7d1572fbed2cd510d9e7153c8 SHA512 82142a8102359e528f867d05034401b2498aab417873091d867924ff0c6b8f31548d050728be85ad409ffca7a244a2deee3fdca55e2ee2e95b32a0a184768205
+EBUILD jbig2dec-0.19.ebuild 1551 BLAKE2B 25ceb515565e0d5a0f446979955018e0101371ae914fc5999e31190fd3d6b691a5848b9d7e9844e73646ae9eaa5ee972a92b48c64e7ed2c25bfa520d81ac5409 SHA512 c5e107304ec2a012bb6b873c795f8e39264990be8866d946d9b3832c58e2f19d20ec42ea3f7c540fc9700491f3ab7beebb5c466ed0c999a7927dd798b70e1270
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/jbig2dec-0.18.ebuild b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
index 44a2bb95f724..3db8579b2936 100644
--- a/media-libs/jbig2dec/jbig2dec-0.18.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index b68cc580ae51..49deb553015d 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index ced1c32f1b58..5bdab62f8caf 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,5 +1,5 @@
 AUX jpeg-7-maxmem_sysconf.patch 1313 BLAKE2B 7289891453e5b4ecb474ab7b77a107f7d2446ac34362f53327353e29719500cf8eaf420886114a04b052e0d38ef81a3b2cf7e2ee2ff00b7d30cb4cb948c40165 SHA512 42a3bccf20db20d1b0e9dee3b5a8b1733b81b5d3dcda83aae8e910d023af0fcbce920c010d11dc8b637935886eede05161393d8e594f48189f72a346f3f8fed8
 DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-9d.ebuild 1983 BLAKE2B 4bd96d7634c43435e9ab200c364a6be807d637e32055da5f85876b95947aeb85d5856b05067976aef1b8b6bf99f082d3984cb4193f168b8c9512b47ae2a4f07d SHA512 cd12c2be6d222d954129fdb93ab0129e2f29c136fe4fcebd4dc27f9e37f7c2866865b01a255a6188acd805f949e9cd5cec12a11d184d494c90eeec95704ba855
+EBUILD jpeg-9d.ebuild 1973 BLAKE2B ef534ccde4ab83c75d76db429c7051741bb097696067fc464741e593c99a48834f16a37f2208d07a41c0b4dfe48435cd3d6c18c02a61bcae591e18b05903db7d SHA512 0af96d1909d5e06a987efbdf4c0626f2a42c00ba0a3a177d132685eea2205815c7a38981e3c03fc701d3ba20acf3f7eaffae9dd4cae4be2113b03b91c36a97a3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild
index 8839bf4b7e74..0c15e1887cb8 100644
--- a/media-libs/jpeg/jpeg-9d.ebuild
+++ b/media-libs/jpeg/jpeg-9d.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 0dbd90e9baa5..f5d778c5d438 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,4 +1,4 @@
 AUX ladspa-sdk-1.15-properbuild.patch 3933 BLAKE2B bbddaddd99c24db14306443b82106c17a096aee2ec684b717c8fccb76dd028e62f0ac8a575777450a0037cc154ea6e1515a6e732dd9822ddff39980afeb0c154 SHA512 bc276c02b9f23643616372477d5b2e9d186977ae1f3aef3a984162d46c362df06dd6e0b8a3156f1eb7e37dc66cbb4db8768cebcd0879ba6b36ab0245db2dbb9b
 DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
-EBUILD ladspa-sdk-1.15-r1.ebuild 1217 BLAKE2B fb03fbc09269fafd6e3826ce6f17292688d86320cb69534ef9a5be44e57a1d2f32e6002dd15423b0be190d7ae05a3aaae5c00e6e186c4442ac96ab851c388021 SHA512 2fd6c4d25bf61ff3a9263010942d618a851a43224915c98c1f57da08aad463c23dc9a6e30dfe2904316c8ac5ec3fbbd4a4bcfc9a311ca6fe6d1ef45f987f1a4d
+EBUILD ladspa-sdk-1.15-r1.ebuild 1218 BLAKE2B 50933e309e744900add5f2603bec284378dea620eff51b03923dee4985625e3d4dfd3b888d4dc951891b991d0f8977222d199b729600d988858d8466a40f0732 SHA512 fb4827b2de81701d7c0b99ca53d1a9b8246ec2e3e7b994bd89ad4f117c9a97b7bfa44a209aa7ba6889af0b969ddd06376792f7a776b9912768a85bbe9b650358
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
index 923942c9b990..91eb5ff0dede 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index aa2e43c197bc..9847f276116d 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -1,3 +1,5 @@
+AUX lastfmlib-0.4.0-string-conv.patch 510 BLAKE2B 088c8deb83ad96450b21e1d7a8e99d34a5421ccaa72ad75e102f89f011d494ee4e54c9799a1a6296543f7d230dcb41dec48a083d4c0a09a8a52f87744c7256ab SHA512 cd212e173559822586c97fe175791b7ca2ca7239cc511d5b4d07ff7dfc9ec87b5f3a126acf58c4bd95a7cb19cfc04b067ecb99fab6cb1815e59f56fe9c70ee4f
 DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748
+EBUILD lastfmlib-0.4.0-r1.ebuild 714 BLAKE2B 345ecabe9615c4587e878086f07795032406a2f93bb83be60bfe26bd4c30585751c66e6d0cc58fed544c569614438a5da85a9564bd30a72ce4c56dbe37e0381c SHA512 b981d9273d217d4e59aeb9035c8f692d5fb9b009e9e3106321b7c43403dba84aa7413cf42f6d2b140a8d8d2ceac3cc25dd6d79e4d667734968b4e4f163ec0fcf
 EBUILD lastfmlib-0.4.0.ebuild 664 BLAKE2B 3a0cf60999baa26e7d202fc3ef50bbe6e49d02c5ed328523abd05b78442ee8d7fbfb79376fe7504eac58a7a91fea97a1677c76e4dfa2d63511e5c328ad2e556c SHA512 2b263e34261d74d174fec0270d2b7510484514c497089a23d5a504d85a500052065030d5dcf5420f80ff4d5097b43092f3b71c11325f40c45de9a6f749c4f17d
 MISC metadata.xml 335 BLAKE2B dabbb4b4997e73611fb77582fbb5b2f07bb0f41106dd68de366039342d2d1de1021e5d2133dc606baa6cc7f0510f7e532a955740c1735377d122f2387883fb9d SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f
diff --git a/media-libs/lastfmlib/files/lastfmlib-0.4.0-string-conv.patch b/media-libs/lastfmlib/files/lastfmlib-0.4.0-string-conv.patch
new file mode 100644
index 000000000000..381e731d9f62
--- /dev/null
+++ b/media-libs/lastfmlib/files/lastfmlib-0.4.0-string-conv.patch
@@ -0,0 +1,20 @@
+# Fix string conversions
+# Author:  Steven Newbury <steve@snewbury.org.uk>
+# Gentoo Bug: 664760
+--- ./lastfmlib/utils/stringoperations.h~	2020-02-27 11:50:53.000000000 +0000
++++ ./lastfmlib/utils/stringoperations.h	2020-02-27 11:55:49.228128570 +0000
+@@ -53,14 +53,6 @@
+         ss << numeric;
+         return ss.str();
+     }
+-
+-    template<typename T>
+-    inline std::string toWstring(T& numeric)
+-    {
+-        std::wstringstream ss;
+-        ss << numeric;
+-        return ss.str();
+-    }
+ }
+ 
+ #endif
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..f10290636479
--- /dev/null
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library to scrobble tracks on Last.fm"
+HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases"
+SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/lastfmlib-0.4.0.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug syslog"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-string-conv.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		--disable-unittests
+}
+
+src_install() {
+	default
+	find "${D}"/usr -name '*.la' -delete || die "Pruning failed"
+}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 6f9f2fd4f193..9816b8eb8c18 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,8 +1,3 @@
-AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
-DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824aa1a083f258f72a63553c0576ba8ec29fe8c3bc46cb80047818bb8ac97765ae7de85b689ac2eb950516531c6 SHA512 3c068e7b2aff4a9aee720ced7afc6bc8b6ec6bf1f2bf0697d486cd68648104882f36b94201dccbf8cb448282998d27986b881c6b784fd9fef86ae72325fcf20d
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
-DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e
-EBUILD lcms-2.11.ebuild 1182 BLAKE2B 0b6803ee8a0e2ca1c1c6bd2b7d9d0792f768f9974a04c578b47664b7577db8d28f68f36325f24ee7372f3b6ed2553e529c7c9d265a2537412d27a1cb764ba908 SHA512 3d4672279becff86d2209fb4e845a6738382d0136cb591e5c40601dc8a39bd3c21c19a3662c6e787e60d895898807e074c72bbf143458f7050b25bc79a5fcd24
-EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc
+EBUILD lcms-2.11.ebuild 1171 BLAKE2B 6230a9f921dbbe730a6426c6b26418d6d0d70a4d89151eaba748f047938dc0ee98d359c6b325e87309981098b0d947b110c7572a48a0e35ab93ba1eb90122f53 SHA512 3ab282d299f851cc3239071452094605b3912d95e1779b83c91a1a92869c584a37b9f4d20f6a489529b393b21f9251aeb59d5ef1cb178004c2b3b3c23d18a2f9
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/files/lcms-2.9-BE-test.patch b/media-libs/lcms/files/lcms-2.9-BE-test.patch
deleted file mode 100644
index 577c77cc2b84..000000000000
--- a/media-libs/lcms/files/lcms-2.9-BE-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/638192
-
-From 8aca404f486429e2304bd6572c2a6fb89e43cf2d Mon Sep 17 00:00:00 2001
-From: Marti Maria <info@littlecms.com>
-Date: Mon, 20 Nov 2017 21:59:38 +0100
-Subject: [PATCH] fix for big endian MLU bug
-
-Thanks to Sergei Trofimovic for the fix
----
- AUTHORS        |  1 +
- src/cmsnamed.c | 20 ++++++--------------
- 2 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/src/cmsnamed.c b/src/cmsnamed.c
-index 95dc18b..773e4d2 100644
---- a/src/cmsnamed.c
-+++ b/src/cmsnamed.c
-@@ -183,27 +183,19 @@ cmsBool AddMLUBlock(cmsMLU* mlu, cmsUInt32Number size, const wchar_t *Block,
- 
- static
- cmsUInt16Number strTo16(const char str[3])
--{
-+{   
-     const cmsUInt8Number* ptr8 = (const cmsUInt8Number*)str;
--    cmsUInt16Number n = (cmsUInt16Number) (((cmsUInt16Number) ptr8[1] << 8) | ptr8[0]);
-+    cmsUInt16Number n = (cmsUInt16Number)(((cmsUInt16Number)ptr8[0] << 8) | ptr8[1]);
- 
--    return _cmsAdjustEndianess16(n);
-+    return n;
- }
- 
- static
- void strFrom16(char str[3], cmsUInt16Number n)
- {
--    // Assuming this would be aligned
--    union {
--
--       cmsUInt16Number n;
--       cmsUInt8Number str[2];
--       
--    } c;
--
--    c.n = _cmsAdjustEndianess16(n);  
--
--    str[0] = (char) c.str[0]; str[1] = (char) c.str[1]; str[2] = (char) 0;
-+    str[0] = (char)(n >> 8);
-+    str[1] = (char)n;
-+    str[2] = (char)0;
- 
- }
- 
--- 
-2.15.0
-
diff --git a/media-libs/lcms/lcms-2.10.ebuild b/media-libs/lcms/lcms-2.10.ebuild
deleted file mode 100644
index ad5b020df94f..000000000000
--- a/media-libs/lcms/lcms-2.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-src_prepare() {
-	default
-	elibtoolize  # for Prefix/Solaris
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_enable static-libs static)
-		$(use_with threads)
-		$(use_with tiff)
-		--without-zlib
-	)
-	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
index 663c3bb5cc82..813fa6ffe6e0 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
deleted file mode 100644
index ba47e182ac4e..000000000000
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-PATCHES=("${FILESDIR}"/${P}-BE-test.patch)
-
-src_prepare() {
-	default
-	elibtoolize  # for Prefix/Solaris
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_enable static-libs static)
-		$(use_with threads)
-		$(use_with tiff)
-		--without-zlib
-	)
-	ECONF_SOURCE="${S}" \
-	econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 41dcb26acd1e..ed5eefe56660 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -4,4 +4,4 @@ AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd36
 AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
 EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247
-MISC metadata.xml 710 BLAKE2B fabae078a873406cac5a29263385aea4801c30cd8d5740f824cc2440c66fffda375ff91c0c1a47a3fd74d874dde848564f268776d4bb8f31997ac7750e094f34 SHA512 d89c5b35348d6c2deff3c1409c0c111d2bdfa280c150d00afceaf9cf9eb6e91210e7566e21ac1e915523e2d7240a40e98c56295bc22918df5901742cf63dc575
+MISC metadata.xml 685 BLAKE2B 7b7536c5194d917ca2f84ba3086e72fab27c6b0432b735e3f9fa49d66389727865eca0c8fbed6596ae8f2d4f90e736ecd7e2023d272581f91c0896bf430d42ff SHA512 c3ba47f888cd0a649734cc6d27e2f295fcd915c2173e8dc9350c29ae718e3be748258b93ace4753c43b50663ce6c1ca691de9f36a44e414ca4875d06b8daaa2e
diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index ca7507f06ed5..8d7147cc063d 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
-	<description>Gentoo Proxy Maintainer Team</description>
+	<name>Proxy Maintainers</name>
 </maintainer>
 <longdescription>
 	Implementation of the 3MF manufacturing file standard from the 3MF
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 5aec0dda4b24..0a6228c2a7a5 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -1,5 +1,5 @@
 AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r3.ebuild 1361 BLAKE2B 6600c3458974833ac33d2855b12c306e1db9cace887089daf6080eb91b1ed15fca4b4f0c2567d4b2b9aaa42430e8593e8a93d261dee4827a91f2fb55776363d7 SHA512 65484e22708fbb5129321d6e06fe1d38b89a61fe41fd42068b460b4144c99d479e3d5319c8232b01daddbddc14b355af572b82c5ace9edc160ed8f3001d66c5d
+EBUILD libaacplus-2.0.2-r3.ebuild 1362 BLAKE2B 75d53d3b89f6fcc0a90e02411c44781f3fe4794f7593f7bb0423645e4e51ff86ea5adbbcae9407d584f930bfe33b2fa11a18d88a7d559c31a7d15f07c512a6e0 SHA512 5b80ccddd6b17502cc3600b950eb7c9b77b8a7083b0cdfce58163b00b9e2181463fafc4693ce0b503ee66f19bce059f5dd444fda5f58398dad2fd5c1fef098f2
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index 38b35990c7b0..5cc97a7bfb8e 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 0d8e552a0d1c..122a609053bb 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -4,6 +4,6 @@ AUX libafterimage-giflib5-v2.patch 11725 BLAKE2B 92ffc58146a513bb7aa0789d24ca3f3
 AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db14062021d4886bd4258da8e034cc6982086f532ff53fb0c2ed1cee7557ddd53be6d6baa9ccf6cd8f603d7d356e372fef594ec SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
-EBUILD libafterimage-1.20-r2.ebuild 2677 BLAKE2B 11e03ebca7704654ef89913c03d47db7aac1b4fcac83d2b447176e8a93ef5c27ecf8907ea0f5c5116064e245800ed1372722330575ef7895aa55e8e9281554d7 SHA512 ccf0fdb3e0ee20598ef698097ddf8af8fcbfa950c719b1c1618f2d850632807694ea1e863198b50b1c1918a299f8e67ab10bb8bfee7e0189d4b70f49745af7e5
-EBUILD libafterimage-1.20-r3.ebuild 2615 BLAKE2B 82356462b7ff564e7df66c612fb1c435625f5de0dc7cc3821e4d6ffabc47c76748af329326bb285dc7c5cf2a87253ab245c81096b2caeb1131f53f87d4d5a991 SHA512 18075ace60477dc13eaac68ecb342d045bebbcea59c895484fffe4aaa750b34228479cefae4c5cf31ee28e538f1e63177f739464ab11449b46825eb5c1e93891
+EBUILD libafterimage-1.20-r2.ebuild 2678 BLAKE2B 5f72651d27ca2f1b341da4ba11bb724e8d835523c9d91a0af5ac1621b112676c0d6552314d6e8bd6c518cfc9d83691275622b3b425c39a212b55098ea7550e0d SHA512 171b53140e5ef261fa7a3214e79aa93960b0cd3818bda22a6fdaa81007a306a2491da74d70e0cfc46e1f3bfe5e6cd05bcce4c6c63476f2589aa26399d223795f
+EBUILD libafterimage-1.20-r3.ebuild 2616 BLAKE2B 5a675b26535616567447720dfc1c11d989b3cae58e2a63c04754231ed0eea52585dfe1778cb037d0fd3bdaf24fb73cb39db99c5d92e3f7848ae312d3759a614a SHA512 55328dd6dd1fe6aa5c5d74ce08ddb2b5312725ae177226d1d85f9575c3e3f518c24eee081d8dac93abd2ede943f2411a4f2bc8f3b62783b09b9553162172ff55
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index d9c93f66af96..f66921efd7c1 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
index 32473658394b..026e4af1c4ab 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index a3b9ea8f6b48..38b3ce84cf2e 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,4 +1,4 @@
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1568 BLAKE2B 811b4280ef55faf29b54d8cbb54f98fa63948f1b3bda769beb3fa1751c2986cff50bf413424b12b720386fbe67a131a602b7860580ad30930ba3b3d1731c8e5a SHA512 d1c7352b42b631619e1112b6e576096aa7190c3f429da97eda07ae06e4782f881c5dd1dc0589ed1781a8a69234e712ae62dc78221015f7de02a6fda8c14e41eb
+EBUILD libao-1.2.2-r1.ebuild 1569 BLAKE2B a478536c714b94098e1738884dddd6f7ba8ef2ab41a63e785d66efb21f1d10dd29ad3c89e7e7f534e9ddea5750cc96306ec84590fd6acb15bd257d4e90fc27a1 SHA512 00f2222a04b1428e3b4dec6f08dbed2ea401892c63d1e1efcf09c81ec6b278bf366e2dc33ddeec37c141a8582e53cf568bee1cc82267c55f71db8ffad4599a55
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
index 53094134fdd6..ee3051f98318 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index 916188f8e608..414b9e1cf0a1 100644
--- a/media-libs/libart_lgpl/Manifest
+++ b/media-libs/libart_lgpl/Manifest
@@ -1,5 +1,5 @@
 AUX libart_lgpl-2.3.21-crosscompile.patch 2007 BLAKE2B b5a1ab145e5f33ea33d23ca6eace0dfbb156056dd82a195ed72e853cbcba4bd0d774425f8cfc0f8c7658302a5113c9deb9364b1cd0fa702d3e165d92e5e58e67 SHA512 d7710f23972b309b08a318a76ef58c0bb2303c52f1348e817be01298466b894e2b7ab3cc666ef94e8cc3571b5d0fdf543139a24d2c85cecab16a01d5af124ff0
 AUX libart_lgpl-2.3.21-no-test-build.patch 535 BLAKE2B b7752c0b0a84a56164bcca9fb30b10f5810112dd4829571185a5d759151de59473f8ee9621718440d29e5becd593d50ca819d26db7f88175fff55296ea917f1a SHA512 17baab4a8f572812d49a25abe6a455c3cf6637bb03833e8f4bd662e96d30a74a15cbc70bc2eb78b0d23d6f2448a8f272dc9317841f6dc9f27caee06933ee8e42
 DIST libart_lgpl-2.3.21.tar.bz2 329102 BLAKE2B 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b SHA512 8a632a6a4da59e5e8c02ec2f5a57e36d182b325b46513765425e5f171ff9ae326af1b133725beba28f7e76654309e001aee9bace727b5b4c8589405256a3c020
-EBUILD libart_lgpl-2.3.21-r3.ebuild 1088 BLAKE2B 998ec786a0a0a3bab2387778025046e89b603268bcc8256a65dbb4658f598c6366ff7bf9bc69bd04d9f10fcc36a66cb750338560e9fb8c538e848b8a979fcc27 SHA512 691f68dd3abc264409a44e732f6e428c6e7767e05330629ec2d7175900cc775fc618459dc5dbbb164900d7d033cb0ef822da748c35abc23aec78ef970997a0df
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1089 BLAKE2B b43f6419a05cdfe3dd1eb2a2b0b0c22a164a06276ab2e77697653efc1343f4d07d9870fadc8292dbba7d04cc53f5cd9eec65d699552a3cbae3797f3ff9047f1b SHA512 aa9230f044c9eaee7744c7325d7484e39b6d63469719d034eabcdb7e1fcd20dbb8daccd83f5685dbdffa054852b4475e91e69d5a28449f240638f888deaf9d59
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 087d0d390219..84b04d0f5c88 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index ab45b24bd1e6..6f1b4a955203 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,7 +1,9 @@
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.1.2.tar.bz2 745779 BLAKE2B 04803f67d9b0732df54e85d960539280ce26755c5874ae90cc8d787036ad279fca8c508695ea0607eed1183eea7b0be9326999dda473dc864fa4da131a27af40 SHA512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
 DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54 SHA512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
+DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a SHA512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
 EBUILD libbluray-1.1.2.ebuild 2015 BLAKE2B 7868fbdee506dfe595682abe6c973f25b01738372b7d993a6ed5fba63b23cee19edc1346ef222fe867c4b40275dd7461c567e2f9fe35651ecafe50a78f4e451f SHA512 4ffd3f4ee84ac1302c4a1c1f3d1fe965db06f6c1dd4ef57b607b5284ec2f3cbd2a2a15b9b67141600b409d610785258c96d6048cc90690f646b7cfa6c1f230cd
-EBUILD libbluray-1.2.0.ebuild 2022 BLAKE2B 1a36cc160a632da7342e1b6b8d5fbcccd2f44053a7edefe1a68459d5a1470026a3e5a0788dbc09447eddf542e3f26d76d67f9025eb05d027848899f2c3aa3ad6 SHA512 3a8282cee39504ca4eee2e6f0748e603806010fdb6887a10dfa1e78ebe64c940185106d25df845f6f2c1bac00243393fab83c56a8c1c8f92db37097573b008d6
+EBUILD libbluray-1.2.0.ebuild 2021 BLAKE2B d1b06a2d5c1fe295ca36669378041f8b9944c7a641a8073e2cdb8ba4a34a99ede7f2ddd032d88f099b2df923ae24f13e2931c17dddcbce8bb99217c804f76d44 SHA512 700ba05c171ee370a20caa359b396c7f1cc0cf023283845d2386170b332d06147e961778b1934b2a31b55dc17bf4fef89fa22e9ccaedd9957fe3b2ac202e812f
+EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
 EBUILD libbluray-9999.ebuild 2022 BLAKE2B e4809bc9c8afb1eca5917ebd4958c6d60133e5a4cb75971f6def95432cc1d055674ab91515ecf1df74b9b2797d54be9afbc1ca1bb25f60a7c0547676f071c1ae SHA512 9ebfd3ca32b2bdfb487714c382e73263c916803a1d25d5c01efd03dfeb8a0c8c929c3b6a0b86209c068ed45480ed09a32489b56bb852addcc39d95f15805a294
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.2.0.ebuild b/media-libs/libbluray/libbluray-1.2.0.ebuild
index a977ea88e85f..69352f039b1a 100644
--- a/media-libs/libbluray/libbluray-1.2.0.ebuild
+++ b/media-libs/libbluray/libbluray-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libbluray/libbluray-1.2.1.ebuild b/media-libs/libbluray/libbluray-1.2.1.ebuild
new file mode 100644
index 000000000000..f8e57cc06fb2
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.2.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV#9999}" != "${PV}" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+	ChangeLog
+	README.txt
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use java || unset JDK_HOME # Bug #621992.
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java &&
+		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index 5563badcf3ed..071b59cacf0e 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,4 +1,4 @@
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
-EBUILD libbs2b-3.1.0-r2.ebuild 709 BLAKE2B edd2aee11c00b24691932ce67427936d53c5622ee9a99048e16e18d6811f98cd1a0d92799d91e490afc3400973944a6eccea9f544b56449a00611bbc912514d8 SHA512 911d88a964b8429a31e7e5624715cb3c1e87d4f820a5d70ddcf010597d2faddc7f034d981a6bcc73765c1f5710e55bc372b2b49d8f0851775d8f2255f6a4fe63
+EBUILD libbs2b-3.1.0-r2.ebuild 710 BLAKE2B 9dbdb14546577689f4b530b193a72686da9e34c217d6a3ffbd384a9b6f6f8660d04d43d298edb97caf367016ca5891bc06e5f915e21a442a241bbf551f2d1612 SHA512 502ca5844e971f5b80cb0fbc584215652098d975bd56a29c1cc0904e4c7c2c5e9b942cd9f5108e22e4c0ae25af9040c913419e2b6efe6566bdd740b2e582b983
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index cb640251cfb5..ab48410eb3f9 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 9f35deed22ba..cf27342404b3 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,5 +1,5 @@
 AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r1.ebuild 4005 BLAKE2B 0d6707bf7cc8ce0f90e0f4fabb783483365b63fc18e2286c6d794df27e4ba51f09e554c5d054ef84809a2391a365bfeb084954b181d4ae141c45b77e2c9a4e7c SHA512 8bf0cc7f495f480b8e59053f37b5c43b6865374ab26d92432a90fc6ddddc9494b90f2359063038a92eb60ca054cb02c36aceacbd1541ebb76e892308d3c7deec
+EBUILD libcaca-0.99_beta19-r1.ebuild 4006 BLAKE2B d5a7e3f99356162b1998288dfd99a12329144bce68bb7818378df3b87a92fa90af1b466666cc59ac1a6786f13573c4af57b4b7392208ec8d56191e0647c1ef4f SHA512 3ab0b1fc10d7e2b549c0a9e1227a5d5973c6b075a657ad4d2f98e59ad6d56515522797a25b2f9a337c4c76f25c63497eabc4dd4c580f3e2a28eebc2bfd7949a7
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index 0bc4e2321bd1..b368ed8f2360 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=""
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index d31c4d7e0cef..dc0b56f08469 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 2465 BLAKE2B 5f2ded905dc3f815cc5a2d0275c278157ffce61f27dcba844e3873415a9fc837aa8f629f16ee652f8bc3490c76afab1bd31daa809cd9bcec8ffe02290336e1f4 SHA512 2b74a3b27618a1a02bcc6e71890df282107b966e318d880a7c9bae68a81ea15ac8a10ff30755db14b36e4d50f204036cb1626878c2884bfa4fec7984e969ba45
+EBUILD libcanberra-0.30-r5.ebuild 2466 BLAKE2B 043cbfe9b05aeb14966b9f5cd9e21f97de2826e5cb22ac9fd3b6282aba31153ffcbe247d903de91302aeca8646a32521909a601449fe6ef964f44d4ff3303f20 SHA512 a18c327f0ab13328f3ada80f27cb67a80225e49da4fd9c6dded7e92a93d579358620844999b7fcb6ea3020d93b2a7af727c578a8da1f3610d91897a5ece48c66
 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 001f19beccf5..dd0bace15bfc 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 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index e1c275402d7c..ccc54b328036 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,5 +1,5 @@
 AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a251a71d134f36365125879384bc638a4f7ae19308041658f98e27570b7e5255f945a504f520401fed44ceceb581f31abd335 SHA512 75c95893f64bb599e00ef96c303b8daad1e8d02f017deb428eb934fa1716f6736a3388e11ff5474103b1b5afafb89aff5e0ed038c8c93e90f5be0f97585c3ebb
 AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
-EBUILD libcdaudio-0.99.12-r2.ebuild 590 BLAKE2B 60de172dca7ac8dfb91fe058943d5f80c22d586b48935cf3bd668781bba41873eb9f319fd883dea40a6b2a2581274bf5df7f0e373013024000fea5b3a9735cd9 SHA512 f4121b5efc22ebf0122636431d3ccf538216f923e752266fe8aa2c25e654a7a002da3cb0b247dbe492c6c0032345b0505b4f6b0cdc131a539771b8009af2a303
+EBUILD libcdaudio-0.99.12-r2.ebuild 591 BLAKE2B 0094a01615a1dea1a743b6f04e4627c76329e3276e59d3aa88e8e9576f76d99f851b6d8f01777448c648b3f742eb8a025744f6ee0241054be9ad008d29ec5f0d SHA512 b37623127810c9998f5f0aaf59ee5847ddac519012d29f825f88f63d3f0bbf6955313d92d00979edebca06a948e0fbc5533e0cee1cec686bc965b075a9b22650
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index 982289b9478e..9c81c3f40ba8 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index 6fbe1eb87c19..54d3e8c5ba62 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,3 +1,3 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 1205 BLAKE2B 0ae70b3aa111f95641b4089de2a1e781b3dd5616fbdba2d9c736c4da4f91e86033acff1826caf164d34149857780d780b17ac10fd2829174b4f3d9709609ccfd SHA512 3729f7eb3f98a9e5ad90955793cd3d6069a01c3796e7eb0bf69e71df360d97942d9e880ff76dc6688e131bb0b11300502862d04e6f8a36ae0dd0df7a3f4a45bd
+EBUILD libcddb-1.3.2-r1.ebuild 1206 BLAKE2B 22a47208d98dda257f7ddb8c72a13e73b57e33ac0fe7e9fd9d3b8ca57ff584d5af594be85f4b931d885d7afa87da0d582f30e2e556dca57af5005266f5e00876 SHA512 9c3c613101139032fe53f8c0771d9da64c44d7a0514cb442652cab36bc65a87840b0a628cb4ce098b577a835ce7695d8c4285259e63b3359ea6a945abf4b4255
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 527e22390ba0..0ea671150776 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index b00266dd508c..447d9a117e63 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,3 +1,3 @@
 DIST libcue-2.2.1.tar.gz 24177 BLAKE2B 478f897567aee006c9e835bbf6e54373351b6b4e4bb68154c94f13107b38bdb670fa032d69744e7dbc51132d86dbf276cbf9701c9d7da0882820b71adae53362 SHA512 32e476cb09ed2cb2d64aaba1342fb91e77e448391b493a3a794a8d2a6723a0e6097a90b11c6ad82998cb7f270f4f18c2578d7b8575f6929c2a35502e09ebc964
-EBUILD libcue-2.2.1.ebuild 441 BLAKE2B 2c7b200e27b38f098986ef2e3f3dfd3b4b7ce0a1200ddfc844f01e1aab0a8bcd5df909e725d63796fe65e250eba581eeafd9a20e2c02c8e9eda865ef76ecade7 SHA512 a53b88a265977e4634cff5d244e4199fbef61cce1fc99e2ea51655eb0c0da2461aad612f9874cded49219ffb81d6e89e6856978094e26c3639a5a95fae258e3b
+EBUILD libcue-2.2.1.ebuild 442 BLAKE2B 21eba0d1540c733efd473b81584053e075e40b658b643059e1aa7520b961557a96eeec49578e9b3ff572a1bf9162316ab11a41f61ebf244a56b733b0e99d2efd SHA512 77e3d5fd4136b6be27a7c17e206274b63df04fcbb2292036827fb9e593dd606939e0b86e873e36249dd0296f9a460dfd65408b7bfb5523ec0039ab428925b3b6
 MISC metadata.xml 333 BLAKE2B b53c2f4525fc5364906575900f0792aab5c4a6d21bf2559b9e830f9881815ee49bdaa70cd3a751edfe1dbaf9c7f5d14489d02752d5d19046cb5c7c4f071838c4 SHA512 80d51540185719f20f9a9fc16180ae49806ef5db4a5bec9e39d54785c98773e3ed2301aa9dcf2c646d028fa814d62e98daabddd2293c471eab8a4d93d301a3cd
diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
index 8a6d13611105..434ba06d062d 100644
--- a/media-libs/libcue/libcue-2.2.1.ebuild
+++ b/media-libs/libcue/libcue-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lipnitsk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index 2a287b910e4a..c2c866f4849a 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,4 +1,4 @@
 AUX libcuefile-static-libs.patch 1299 BLAKE2B 488f99588881a9b24471b1a4c02b090147125ebe4fc2865ce2bca5e03891d6ea46530a9c265df77c5663e4f99d0a841844c0ccc3c918fc36bfc973fa8bda5fe1 SHA512 efe0d8d04acbb73e666411780283e35567b87233c70c8383404965f1dc6fceed7e1b28ce5f77d8085821df70062eaa153161cd5212dd18246920d2dff2699c94
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 735 BLAKE2B 82b81cc4840ef4fdd1b62a77db19925dfbde5c306c237aaa9412ee51fd3d356563b322f1daefd226313d0f8600cd0677e48919cc12a0677a2b04bbb6d2eca8ec SHA512 c8d4b166a77f2d0f0c1162ce8a6c928762aed598ba4479b34192e4a36bb99d80257ce21b21ed5ff51b0e41f07253e35bf80f85bd12f37ac938b8250dd0ca42a1
+EBUILD libcuefile-477-r1.ebuild 736 BLAKE2B bee294919ec85e849fb8ab748f47c7b7fef7e8180c0e1d8e06e7ee706703e789a7d7497edf13b5677fa3ffa814890b1c0a0f4f3a6cab1ef2b9acd47b6cf4f8be SHA512 d71ca74fa12638c045fae6bb9bc20c7bcc1f44a45b9f714fdc8eac02bd8b9ea2e45136d2b4b4b28587480cf11b437c304e7664e9a6a17209021b0119d99ca5f2
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index ebe24d60469f..b91d8f729413 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 0fd4a4ae0ea6..dc1cd25a4277 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -1,5 +1,5 @@
 AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
-EBUILD libdca-0.0.7.ebuild 1332 BLAKE2B c5d519fd41ed30953cd3bcae13daf96894e2c44afb60c6b9364be41c09e4501fff3f88747b53e6686f687d378875b316abc15ca5b840154b36ed48dae0e7c654 SHA512 5fed62a9d3dce9960940c78dc787ee081b5c84375b862b65fddf6a67691b4c147179345c7beb00d52981ecf2f127032acd1657e82f278fc0056ab366432f851d
+EBUILD libdca-0.0.7.ebuild 1333 BLAKE2B 5c79609f4c18fe0d2af9b7fac63c76cf4491f6c638843ce128c82a73c55f5fc252ec97f0d86df8b89fbe24c9b4c448824623f2b0999a3b1fff028826df757823 SHA512 e2be510f1f7c6b693cad2258232de215f865c8657f3a91c32ea608263e4986a66c0873f5ddbc2032bc8d329abca032f4048488182d5b292b7eb2c6f2f93e3c0e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 2761963fd5a7..f284b8597bd5 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 146e3ade4c21..2dffd8001e4b 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -2,7 +2,9 @@ AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6b
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
 DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
+DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
 EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
 EBUILD libde265-1.0.5.ebuild 2498 BLAKE2B d001976ca0ac8a6e043d282b673365de75992b25bff06ace079745782db15a94333e3a0a650b4cb23d33710d3e3a49b6ef1eb8dcf24578cc8e107ff58d94ed93 SHA512 c13211859fc8dd695c6e9effd04d15f4771c1be321fb0f8b09c64b8a9c3cdd03c84ab9169a82b507936d76bfcab577906d6c7776fd1c4764e11eab26a3236a87
-EBUILD libde265-9999.ebuild 2496 BLAKE2B 645c7f8d7d267eee7b3cbf376ccc12463ca3fb0f3fd823f1a91016021b047f3b60726886e711006640f28843ac8883b64662740c0cbdd0820e44400b72b0f191 SHA512 b33524c9cc21c9cce9b71b29c2de42b248725aff4d790f8bcd2a2da517584b3b9ca641ab51e5a3bae5ce365b3cb6695d624c01db4ac706d70a96c5cf0ee37df7
+EBUILD libde265-1.0.8.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
+EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
 MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
new file mode 100644
index 000000000000..29c28d991c82
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
+	)"
+
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-qtbindir.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# without this, headers would be missing and make would fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-log-error
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
+		$(use_enable debug log-info)
+		$(use_enable debug log-debug)
+		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
+	)
+
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools
+		rm "${ED}"/usr/bin/{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm "${ED}"/usr/bin/{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm "${ED}"/usr/bin/acceleration_speed || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm "${ED}"/usr/bin/* || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	einstalldocs
+}
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 1b591f16c364..29c28d991c82 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -5,14 +5,12 @@ EAPI=7
 
 inherit autotools multilib-minimal
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
-
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
@@ -20,14 +18,14 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+IUSE="enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
 # IUSE+=" sherlock265" # Require libvideogfx or libswscale
 
 RDEPEND="
 	dec265? (
 		sdl? ( media-libs/libsdl )
-	)
-"
+	)"
+
 # Sherlock265 require libvideogfx or libswscale
 #RDEPEND+="
 #	sherlock265? (
@@ -40,12 +38,13 @@ RDEPEND="
 #"
 
 DEPEND="${RDEPEND}"
-
 BDEPEND="dec265? ( virtual/pkgconfig )"
 
 # Sherlock265 require libvideogfx or libswscale
 #BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-qtbindir.patch )
+
 src_prepare() {
 	default
 
@@ -57,16 +56,16 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--disable-static
+		--enable-log-error
 		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
 		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
 		$(use_enable cpu_flags_arm_thumb thumb)
-		$(use_enable static-libs static)
 		$(use_enable debug log-info)
 		$(use_enable debug log-debug)
 		$(use_enable debug log-trace)
 		$(multilib_native_use_enable enc265 encoder)
 		$(multilib_native_use_enable dec265)
-		--enable-log-error
 	)
 
 	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
@@ -79,21 +78,19 @@ multilib_src_install() {
 	default
 
 	if multilib_is_native_abi; then
-		# Remove useless, unready and test tools (Why package ever tried to install them??)
-		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
+		# Remove useless, unready and test tools
+		rm "${ED}"/usr/bin/{tests,gen-enc-table,yuv-distortion} || die
 		if ! use tools; then
-			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
-			rm -f "${ED}/usr/bin/acceleration_speed" || die
+			rm "${ED}"/usr/bin/{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm "${ED}"/usr/bin/acceleration_speed || die
 		fi
 	else
 		# Remove all non-native binary tools
-		rm -f "${ED}/usr/bin/"* || die
+		rm "${ED}"/usr/bin/* || die
 	fi
 }
 
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
+	einstalldocs
 }
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index 5968e60a54ae..35ec4208f2db 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,3 +1,3 @@
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
-EBUILD libdiscid-0.6.2.ebuild 593 BLAKE2B 706018f8cd63740355b396e39f4ce0ac9cfc5d2375938a0748bfa6c616204c650a40f29e17a9acc2701240a96e2dc405b72a822087c90ff29cf0dce93d4698a8 SHA512 9aafc27faf46c79015ded55d289122ce27547757eb666fa665a8d66eb1750ba51d038e1fda799a0aa41f1bca3cb5e6a79da4135f8e91ab8944b0017e9720411c
+EBUILD libdiscid-0.6.2.ebuild 594 BLAKE2B 243eceb4e57217f8f79cb6a4ab71cc9b18a1c6564ae2b95da0a5a959d246ff789e29f15336cbe908d8d93f5c7ba2c8f9efc514da59c5f5ccc338916aabdd3277 SHA512 68b0d7cb053e090816c0b7737008eda44857ee52cc15df0d9d6ef908f781fc9d9daecdab9f3acf098bbdfa866d270a5cfb3a81e6aecaf8bac3388193b3a4ddac
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index 1c9e122c303b..8b59b17f04b2 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index f3a5b7e14339..46821872233e 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,4 +1,4 @@
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
 DIST libebur128-1.2.4.tar.gz 23140 BLAKE2B 4095a11b976109c82ffbd133d5e509b60a2fa27871982d4a81c1927cb23783e89f907bcce52e78d3c743d1e41d1bd823b9b7b510792137649e4b3b680c93eca7 SHA512 d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
-EBUILD libebur128-1.2.4.ebuild 998 BLAKE2B e449227731761b2b020dc9110e78cc1f28046da0ce86e29e94a69d33dc03fb26700242f6e15bbe3eb33272d322e9ef544ad32989d470dc6fd7fd7d6d182d6027 SHA512 9104bbab0eeb955bc8044e451b567408c24509cec22a04e1da85462cfa59cc71433d6b07848cfb50bcf29c7f6afa2ecd462a701ce190469f9cbd552687f02b98
+EBUILD libebur128-1.2.4.ebuild 999 BLAKE2B febcd841988f5d74572a2650aa9988d6b9c4fc4437f0173d4a126d68b911662be02101563cf9eea82681004378509fa6152d3b172a60113c164ce0eed886e79f SHA512 01e7974db9c780d5653dead79759463680f75bbd84b590aca82bacb2d465f01b20bc5971befb10bf9568dd632b85058891d7970587b0ebf5f20a91e549bb5159
 MISC metadata.xml 613 BLAKE2B 2c03f77d7bfec26a031ccce628f06d91621870a1f557c9dd09cb8ca85443523268a6ee87ae7048efbce6f934c0e1f4424886e453727b150e2e5570d63167bec2 SHA512 58133a2f99fd62b3fb5da2be5351648d12dc3e8046dcc9a4cb65211db9990f7c5fc46a728e85a588c859fc2ce1dd452fe83d3b677e59631ebaff47a5cc67439e
diff --git a/media-libs/libebur128/libebur128-1.2.4.ebuild b/media-libs/libebur128/libebur128-1.2.4.ebuild
index 44cd45723ef2..bbea82445b4f 100644
--- a/media-libs/libebur128/libebur128-1.2.4.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index a514fc15dc68..10a9380aa4be 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
 DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
-EBUILD libepoxy-1.5.4.ebuild 1142 BLAKE2B 5cfd33bbb2c87733e6bff7f9e25f16d482aaf201d0fd179dd5e6bdd496abe2b5e7c7ba277353012ad089f722d42d8c58c76e65b4515085f83965fc58766db438 SHA512 e78b8eccbf1aaeb930803bca1927ed12d9870fda9b67f44651c93f60cb019523239474b7631edf5c526da9ea7a4cdbd596737f79dd783efbd9ed9e0cc7f99c0c
-EBUILD libepoxy-1.5.5.ebuild 1158 BLAKE2B 68b5ac5939cbaab14250785f47614e01e695182b43130fa60cf24cc6b4cd065fa90293d55a879e670031f5c003bc8fe1ad82c20afd46202c1bab035ebcc0bcc4 SHA512 6e9b681b237afb62ec589302281a0e1e7a31a3eada3a6174cb6f13ea6342969b3eb5f07e2c6ffc0e3676e13826356f23ead3462b410d9e415285089f4c8af2a6
-EBUILD libepoxy-9999.ebuild 1158 BLAKE2B 68b5ac5939cbaab14250785f47614e01e695182b43130fa60cf24cc6b4cd065fa90293d55a879e670031f5c003bc8fe1ad82c20afd46202c1bab035ebcc0bcc4 SHA512 6e9b681b237afb62ec589302281a0e1e7a31a3eada3a6174cb6f13ea6342969b3eb5f07e2c6ffc0e3676e13826356f23ead3462b410d9e415285089f4c8af2a6
+EBUILD libepoxy-1.5.4.ebuild 1143 BLAKE2B 6fddc9a0360c70d5d37d5c6f36e179a764cffe5c97d45b8afed25bce52bf8027d202bb69d4ff495116b8e524df8c7373d112058b638efdfbce8bc22ed16f0d51 SHA512 c07b59155cb32f7c9c37d4e79ba07b22a5dc76bb1981c3189edc201e76601060364781294bb287d85365892046733dd303960811a03ca032a6ac850013254db6
+EBUILD libepoxy-1.5.5.ebuild 1165 BLAKE2B c33e2336ce342f17878a96688cea1348fd094793b9cc6ab6e99e05ff785f0953407f00952f66770ffb9b9f50d1582197906ab9d7e18c09a8f833dae3bca0b355 SHA512 23a397a61deb40eb80e5e7a3645e82d393f807e6d3306dd88a960a7932432a5310e7b1a0f7c7cdf3e4bc79ef194f3ef2320ea63e0457ff392226bc8f825eeef4
+EBUILD libepoxy-9999.ebuild 1165 BLAKE2B c33e2336ce342f17878a96688cea1348fd094793b9cc6ab6e99e05ff785f0953407f00952f66770ffb9b9f50d1582197906ab9d7e18c09a8f833dae3bca0b355 SHA512 23a397a61deb40eb80e5e7a3645e82d393f807e6d3306dd88a960a7932432a5310e7b1a0f7c7cdf3e4bc79ef194f3ef2320ea63e0457ff392226bc8f825eeef4
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index 25a4f670ebc4..88bf7a87cdff 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index ecd6c30c4964..6ffc5543022d 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index ecd6c30c4964..6ffc5543022d 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 8c595cf688fc..f2a0b58ae2b5 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,6 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
-DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
-EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397
-EBUILD libexif-0.6.22_p20201105.ebuild 1482 BLAKE2B baaa877a0a09a2b918bb10c436d2ad4f5e60377cae2a43691c9012ec8d787e4c91c11705153627c4a1615c1491c6af04b1d2f08bbdcf6845e54aaf2c7a50ef57 SHA512 0c63015b81f2dafb0f0604712d2affca333822d5526adc978fe400be939c7798db39e5c4b18a39fb800505bdfceccdd06be9abc7f69657eb6a3d20bca5199715
+EBUILD libexif-0.6.22_p20201105.ebuild 1483 BLAKE2B 8d8a642bf8719d4834dd57789ff752f3a6a25ba561308b5ed4cc10b5451392e71aa45588ad7aa0141b159c9d15ac6e81db73bf44227209ef25520f7293b93d89 SHA512 bcf891014c2824c19029cb29648e46385036a0b82b6af850bfebfdfa8876112a0aca12e6d50a0849c6093a4a602531254b8740fcd3a26b32952341de7b6eacc7
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22.ebuild b/media-libs/libexif/libexif-0.6.22.ebuild
deleted file mode 100644
index a1b021eb878c..000000000000
--- a/media-libs/libexif/libexif-0.6.22.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index de9a5e1eb9c7..5f22a78c8499 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index d6123f393815..13752b83410c 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -2,5 +2,5 @@ AUX libfame-0.9.1-gcc43.patch 1190 BLAKE2B 7f99db82fe87c5f024ae68b7ddb68124cdf5a
 AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88f69b502a08d46b462f0d16206e878d836cef89f7bfba260a468600ffc36506a22630c5910822c7d9f11c074cc6a8119a436d2e SHA512 9632ad664682bf420eb4b30c25f4979215e172aaa81fe7ad09b714b36edf124bb3c60d56f63e55267345bd8be52b0ea35f40ce54421d1fc58ca8542915180db2
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
-EBUILD libfame-0.9.1-r2.ebuild 994 BLAKE2B 071b935bff08fce8f822f8de5b6b9ac00ac48dfdc51d3c56c389ee4532eb4f2acd36b2235caa869075e49291d96a15f70976ece1d4740652d00c4713e9052d0a SHA512 ffa924e8e126f31dcc1385d5685603e10e028ba22aa5d4a77215198fe7c65403759111a01a19a9aa5f6f0b8670d93afe9e4fe526b348c51ebcec4b6d8f31669f
+EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r2.ebuild b/media-libs/libfame/libfame-0.9.1-r2.ebuild
index e3f20551907e..8a30205fd66e 100644
--- a/media-libs/libfame/libfame-0.9.1-r2.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 PATCHES=(
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index c0e0f240c079..19e20e93713d 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1355 BLAKE2B daafa88f9ff9202bcf7db88cd67b070d03297540a916fa2ff66308555141abbfbe33feb64731a10618b1cc669f7a3039caf8c4bb48f383466aa1cb3c50299f79 SHA512 c7fea7b466624f44feb68bbdf0f6d4ca4d5215ac85a0bb152ccc18100ef7f0a681d5db220a100e4ac4a710037ee544aa869c2a6f894dc4a1b6c4662e1120b713
+EBUILD libggi-2.2.2-r1.ebuild 1356 BLAKE2B ad7c721fe537ad910d702c4224e98f6234da8b62f878f5231f412dd1f657b2d9f58134b26ad40712a7ec50eef155465c092ffe3eb008c27db26b8cf4a8d07018 SHA512 d3beb9b702d4e796907b71438178d4a90b169bc34f945c8688586a726d836bd443e4320485fce79889f13fc892073c9c42a44a065c9a7dfe02f28cb49e5cf2d5
 MISC metadata.xml 484 BLAKE2B ab01b03cd27a489e6665bef5c38e2468415ef4790cf785cc77dcecf7cb449efe72b13df3fe29743ea37efb7d09d2d371f8dd4a26b9dd1489f06c6c8ef3281507 SHA512 3473e065599be786c0707dad290283abef3e977b74d7559c81b607a4ad9daad2a392d306ec83b9edc4720310983483e9d30f5cd4492ba0f367ecd9b0d477c41d
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index 0082df27cf2d..0602ea31a216 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
 
 RDEPEND=">=media-libs/libgii-1.0.2
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 4f911e6d38e7..c2751dd76d7e 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,3 +1,3 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2-r1.ebuild 750 BLAKE2B 0670ed69c8b3ab8524d56dfe59d064681991c46570d1fd1a63b1f8bd3cb2d8c38c9b1c2a9b6e6c87e04014b1baf0e4a5ea5dcab59cea072be6b0e2878fe21cdd SHA512 159eed8c7f02724231f1fe2ab03b3a1ed8213e6850b538be01f0b368250d6ff0922f14578350fbe1f06c5878838d4a54f2e071818c07f97e31e08b3629260a15
+EBUILD libggiwmh-0.3.2-r1.ebuild 751 BLAKE2B d2bd984fed1a075ae0b0497ed16c4f90130c31ca1b44ce529b81dfe218b875002cf6bfdcf469c476178afad8dfe005cde03c271e93d85d3e8b7e458bef7cdaf1 SHA512 8f28a5479e7aa60d875f1f22b34ced3168ea0ad1cb01cfea71d742c11b8e2054a78fb7bce8af6cf85e6f83a382f919f4a867e3da435d2814ca6552cdd77cf314
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index 6b1a09cda17f..699e643a96bd 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 37cd49158657..f2af46c76e30 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,5 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r2.ebuild 1235 BLAKE2B 7d1bfbec66985faae693fe6a0108e4693ec0678b4369a081cb57fb1dc1e508feda3a0fcef12ef6c15e1dba6047accdecdf617e37fa430bdbf352249e642d34d1 SHA512 a8fb2046e85f81c19b94795aadf85e2f24d625f5eb7ebba8349215e67162b0211daeb3317141e63bdede62494a2fb543a2f1cdb510dee5690b266ec0e4c05594
+EBUILD libgii-1.0.2-r2.ebuild 1236 BLAKE2B dfe71a6e6063be5589c54aee3ffeb4c5ed7c50c6a98bb7c8eea1d5ae61e4aa8f72826227436705213fea1cdd905c1632e26c4bdeb192183dff6f178ac1e69663 SHA512 9370d35f9d69dacee8e90f0cdee71de35fa10ed560a899b798008abb3d4a57de22eb6af81070474d6122af4867a4e81a9eb49265a998e30a2a241a51ea571e4d
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index 6e58e382f2f3..4226a2bf0ddf 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 42c52581a34e..10f5cbf72d4a 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
-EBUILD libglvnd-1.3.2-r2.ebuild 1527 BLAKE2B 6dc5864dcf4ed749e6d6f07f392beb955c6c65bdb2582dd67eeddc8ea4a2212889596018953ece75451862b05f0dbf3771c01aa2bdbe6b6931fdbd9c36724fbb SHA512 007f3b17e2cfab1d20aa56e9ccf3ad8875de1290c7f49e440895d2e2f41020e9d5d70c5ed2c78ced5dc9e1169b13bd9344ff2587997941d80ceda05fd8c3c976
+EBUILD libglvnd-1.3.2-r2.ebuild 1528 BLAKE2B 8dd8327d39f1879b4d254644ae9260dba2fd8038ae37bd65a5f520d102c77484daa7b1666320caab10f0de58cbc922ff87e48b70fc0e34deb62ae4521c22f013 SHA512 51316d6b757c339b5adf8155bc1f7a0d3cc68e5dcdd4789fcd632fc2b4e7268c717f70d1bae600080ae3e63f297d570f2a87306b80500fa8dd442602e042549a
 EBUILD libglvnd-9999.ebuild 1535 BLAKE2B 58ddbb76e270935587fd4baa48985b015c037c8f3cff87297cd6f784fc343494f05d376a72500aed41eb440618fd3939e31acea0002d1a94a251bfbd959996cf SHA512 933168d07eb2ce996b1c32d27ddf3bca35595f0b98fb9abc204fa31e0c378c5ddc493e26dae88eae13675143220fbf5eb2f2e524a67028c55f1ff5c2d6adc47e
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
index 2f410a3443a5..75649abb043e 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 74b7de16df5a..ba5043c448fb 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1651 BLAKE2B e4d65473ef928ce973081d6aa6342703bf528269ece73d86c07869b3c417bb6459842ecc5f67efb3bcbbd209bbca659bfca8bcf7df384d6cb6b8c4d3305f23f2 SHA512 a5b29c36d88e83855d24f66fce17508a57fcc2f2d3b824b634b43c7606a4cb700abbe5904aae79bacaf416da342934b76670b54a2cce24b2d1d777fae06b3ed2
+EBUILD libid3tag-0.15.1b-r4.ebuild 1652 BLAKE2B 94210b58012465ebeff56d59a159741dbcc4795d21cbd3205923d2b7360b6fe661477794399ef6a8c7c634a37eb95f014bf368e3a2181aa234ac995992085db8 SHA512 519d965a847ba2989b802422a0f1216c5a29a6aa3cd9ddce38f658d78241335bec3373091504f19fca2297086b28def03d202867e434e11c6b3057675f8f77ec
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index abdae64b852d..68ad278075ce 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index abeb75eb88f4..8b1bab1566a8 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,5 +1,8 @@
 AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
+AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
+DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
 EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
-EBUILD libilbc-9999.ebuild 832 BLAKE2B 905b3fbac3be812a69d44755949e950c234b84704e95f1527f35df46e162901b7852b74f24fc7de02a9d955da4da42c02c50c3d6e33a68fbf2df8675d493522f SHA512 b95d46ab5544775cd3be4d4a361de4c662df82de9c848499c30d8e1d3c0a302fe4ec491063b77b6a4129f16bdd5b42e713c03647f288f31c5577b21bc58a9061
+EBUILD libilbc-3.0.4.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
+EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
new file mode 100644
index 000000000000..feb3a2255e10
--- /dev/null
+++ b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cda8105..b766ec2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,15 +52,15 @@ set(CMAKE_CXX_STANDARD 14)
+ 
+ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+-    set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_C_FLAGS_DEBUG "-g")
+-    set(CMAKE_C_FLAGS_RELEASE "-O2")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
++    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_CXX_FLAGS_DEBUG "-g")
+-    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
++    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ 
+ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
new file mode 100644
index 000000000000..9f2f31bf171f
--- /dev/null
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
+else
+	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
+HOMEPAGE="https://github.com/TimothyGu/libilbc"
+
+LICENSE="BSD"
+SLOT="0/3"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-respect-CFLAGS.patch"
+)
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index 1d00bd81c2f7..9f2f31bf171f 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
-	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -17,22 +18,8 @@ DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
 LICENSE="BSD"
-SLOT="0"
-IUSE="static-libs"
+SLOT="0/3"
 
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-respect-CFLAGS.patch"
+)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index fd1b365b0f13..1ae6084becd0 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd8
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2997 BLAKE2B 07eb75644ba9322de5b9c926c25f7f14b88cec9c331be79dc94c93f4b85492335ac5b4bcad08cc1400e63c58345b7e18c47d3efd25c4b4df631f2900fc23ccbb SHA512 27a1dc6d9c3f23af59d16e63a78b45320aac8be1feca9dbff4714b183ff2bf5b615856cba2f06f9aa45bae65e069708564763710afea2c1a5f4e2f13488da077
 EBUILD libjpeg-turbo-2.0.5-r2.ebuild 3004 BLAKE2B f5ee859c4da49f85b3519625d1b9e0756c052a8e6a2616560a6ca6d4061915c91489d8c23ae7a1017e377355b5a55be386b673b793dd3c01284d3825d355b258 SHA512 6ae05da3888ede7bb888dcc6c2a7d78701e14df4942f1f63384e391b6a1108e2fea8593ead06cd676de4150beb43eda0540383e00d4086c3f8f8cf836dcfa0e0
-EBUILD libjpeg-turbo-2.0.6.ebuild 3067 BLAKE2B ca3f367bf9775f6575311ca493a8e8d29c311f6d9b85ec88227f3cf945e6b8196b41ada32f23d15500015f2333efe8cbaf89d0717a9a437f653ff5bbde73a0a0 SHA512 0ead756c3ec26dcc5bf41c6180f502d4afcdf639d2884c72d4f392e0a19c5b235ff1f706781c9a76606aaacd91655731149f6b8c78277ede60582aab30c9b7c9
+EBUILD libjpeg-turbo-2.0.6.ebuild 3063 BLAKE2B 0d12c3aafee3fb13e293da2508cb3a1f8ed227e7156a2971bcd447ddc5304417f938573cc65a9e598212771fbcef38d63da5b133816a1c7e105081ce665ebe16 SHA512 18c488de7f5ad78b083ebbbb2bc9f842d2e1bff811042ddb0a2fbbe64eea08b4dda501202c13e5818162c711f867c5f1ed119bb0e6c365797c9c94185c185064
 MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 3637bb4413ac..40eb4931c2a9 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~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/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
new file mode 100644
index 000000000000..61c32c290c82
--- /dev/null
+++ b/media-libs/libkeyfinder/Manifest
@@ -0,0 +1,3 @@
+DIST libkeyfinder-2.2.3.tar.gz 117373 BLAKE2B a6d3ff64f26e0842c95dea125ae86f3c642db101fe934bf0a54a3586276cea1f2ee427e480e4f375067b80b2c9d9623f9276110371cc91c8b8d9319c92fd91d3 SHA512 7617bb7305854790e2d5fba5e401387612cad4fa61e9209a6af45301ee8dcc990c116e478c70a5d845d12fc6dfaf63362dca608f4774640bc6c29459ca192f45
+EBUILD libkeyfinder-2.2.3.ebuild 660 BLAKE2B 6ddf66219df22391777c4d31fef5c4f08c3cf5823f3d1bd47b4429f5562da39d89c59a32bd12551f3968e64a164b74f146ad880d62d84e03f3a6a6b2e5d7d377 SHA512 09a890f568d3e5c60fff418dd5f55637432d80a177e2c651b435822aa8a043739782b59ea550213a6785a7bdffcde1338f2be1e415746753b3233ea4e6a93df7
+MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
new file mode 100644
index 000000000000..9a3be69a665b
--- /dev/null
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Musical key detection library for digital audio"
+HOMEPAGE="https://github.com/mixxxdj/libKeyFinder"
+SRC_URI="https://github.com/mixxxdj/libKeyFinder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-libs/fftw:3.0
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/libKeyFinder-${PV}
+
+src_prepare() {
+	sed -i -e "s/NAMES fftw /NAMES /" \
+		cmake/FindFFTW.cmake || die
+	sed -i -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+		CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/media-libs/libkeyfinder/metadata.xml b/media-libs/libkeyfinder/metadata.xml
new file mode 100644
index 000000000000..e1df46e39c20
--- /dev/null
+++ b/media-libs/libkeyfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index d8b7ffbb89a5..333dc43316be 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -4,5 +4,5 @@ AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8f
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 AUX mad.pc 213 BLAKE2B c2ff4ab93b4acf0022690a74ef9c88a2b924fe8918f39a225c7684336d43cd061ec5932ccd76185d5c12fc670180d2b2d367759d166fb3b07c20d20035731b40 SHA512 0b667f39e329732d539f2f01fe9a843b1210d41dbed67e5917fdc173058f32ad0826b3657e1940c7968e073a732a6b462a75d6b8bc32dcd490bd74bb16ee7605
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r10.ebuild 2270 BLAKE2B e7940d0ee46dd00b4d74c34b3011a200a2fec7bad0502449edfa211fc2062ca929255703dd2224f5d563c45cf56e981ee5f502d1c5e9330545896e454116d090 SHA512 73904c47475f5d490a86a3e69e774123be6dbf7f4c364e7cb0fe706cff640b3f2136e975528edbcd09b33435c08e1b36bccb5a7e41a7b381b8fa8083790c95cf
+EBUILD libmad-0.15.1b-r10.ebuild 2262 BLAKE2B 00c5f8b97a1c9d59325c36ca40927e848bc4dc2bdfe593f77af820dde4763d8ffb86c20ba52699649f0ffc96ba5e59933aadd0d7a5d28ddb616ab742e20c60cc SHA512 8002cd398c61ccc2a3f26081a1f37db81cffe691016c827740bca694cd0ff21e67a08ee78676fa1916180f7b00eb6f915a9de50a85a1c0d8fb5185f7af05ef0e
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r10.ebuild b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
index 285cf5467f48..37ae3ec4374c 100644
--- a/media-libs/libmad/libmad-0.15.1b-r10.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index f4ffe8242cfc..b922521c7e78 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2148 BLAKE2B 5fc885015eecfeb1c704152ea2d50ccda597541991c54ebba89908543d76863e5ec6e9179e08dd950c202cbb5e8f6388d46b39dda9b2249051be4385befe1e55 SHA512 809d36cc3e2bbec9087181f4a6503811863fcf4a234abdab589bec0e759895dbfc621e5c8a264c93efae4e01fa3207656b932708a058de6bc221a7bf42430862
+EBUILD libmikmod-3.3.11.1.ebuild 2149 BLAKE2B 4fc7ee1e7abced3c1e21a635c6e8e5c62b1042676adb876554e272669e2dcd6335e87eeb22a2d4a3616dd4ea55888ad6ea811a121fc9a23773963a70d3fde780 SHA512 100769ce98fb0a75bb6f73b599dfd17973a5a3e2aa87ed9eeebedc76314c5ea749d03e60483c5bcf65165425ed147c6034f682bf4f9caef997aa833273251e62
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 4d8452039c26..86d7055f676f 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 6ec24c157497..979c6934cf67 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,3 +1,3 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4.ebuild 635 BLAKE2B f111807d7a3bd2fdb55df4b90190b0c2f1dd4f155fdccb0860b1292529ffcfd4cada2eb0adb360f9359329079e0faa38486d42e0ffd31cf09e8cb9ead8ceb36c SHA512 0ee6297597dba083c8156f5446f9c65a797d72df8ac85e0f799072de90581b167e26b3634af5db37881c1f497609abca234028921a5decc64ac1a502855567e5
+EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index 83acbe2e4b4f..89ae2449c679 100644
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 91e218d8f009..580f9bffa1a8 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3.ebuild 1242 BLAKE2B b1e9f532c5e79d363bb1c1ba9cd8c491f55ce714e799c2cb6ac2ba15f5a36fc7e6960cba99a2c9ebe5eb4b755b3b3e6e24abf30f0e23ab573c8af5b36a5d4959 SHA512 3879386da773b73accf45372cc9c514f1b6ef09e9bebe4336b7cb140948384be4b9f4d0e1c18735fd9c38caf74fff8a9d2b53517e8d542d6113ef4d0bbcffdec
+EBUILD libmng-2.0.3.ebuild 1232 BLAKE2B 74dfccb86b83fed6ca05c703e3633c61b5ba02f4a1b908d4125f4da8d2b238cc53e7568e7d7335ac6a8f0d18ea27ea24405134d6a70759d9d856ac3074d1a405 SHA512 27c2c36e5e8897161faaebfd7a24f72b15559db74395ae637062247c7456112eb407aa66ae0f94999e169e735643da86a6865b284b5cc7fb39f051394840a625
 MISC metadata.xml 243 BLAKE2B 1bcbf4a3c9842a0c6f19c77c1bb17f80a5ab562decc5f4eeb25133e967062740c401fd4b8be8edd9a1e346827ebdbcff2e5b94d6b3d3411786c90cd0300dd9c7 SHA512 bf875271b80f39360a138083a69ef53ab64ce04d52e0155de091fe8f2f4742dafbea353833549bef28b43599e91e5a3f3f3dd79801c2fd3302e7cf65007d95d4
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 766e9a921b3d..8a0c197faf78 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 64096f8e01c3..97f849bcde31 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,5 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0.ebuild 751 BLAKE2B 504ed03183809c260fabfb275bc849f1336c30561f4a3e80971b7aa130b38fc9ef95dd380234dacdd38ac51d168f5661aa4b5ad116005d75f027d8f59b9e1e24 SHA512 7524c5f5651b75caa93d926d987ba95bbb2beaab9b16eda8d50f53c42d24aa81bbc7e06b0a1a0f08c6a33637117dec9bf96e039586b61d07419ba07cddaa66e0
+EBUILD libmodplug-0.8.9.0.ebuild 752 BLAKE2B bb2ed7e71a7ceeb8ca60de29d673bcb9985669478650ac61e12192acd223f930f51ffcdd28a25f97c7a9789ba5f7c8f7d384c9682414bc0c3086349e89570a9e SHA512 8403ffa385e6d44cdcafe222d7550c417162f3d2837c28d0053b4f7eaa53c13e3e2833980840dc4e4695cf6469246262275d7a5efa4cf0dbecf3b4b6f385146a
 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 33043e6c0ca8..30981d2829ea 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 701e4b57da44..06eb599f1318 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -7,5 +7,5 @@ AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6
 AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
 AUX libmp4v2-2.0.0-unsigned-int-cast.patch 2922 BLAKE2B 660ee262d6a21540b9646aa87f911373042c1f1f879b18a913d07fd267fa2275556f8a0e18e86c28ce4a737f136d53c2dbd21602635b12b490535f3e8d8e0ef7 SHA512 89cb78624096e4182056c4e9099cc13cb6251330d741ccaabe557eeb21c2df77d71367da21c16d2c33b1a7dde49429f57c7673d49be0e9a459af491a00305f37
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
-EBUILD libmp4v2-2.0.0-r2.ebuild 1318 BLAKE2B eed852a942178767e833f91e257adb72b4ad058d0fe2628dd3398a51384e6f0a60ab4a8ad1b162999f415e0f8838fe8beaa0de895b529738bf1071e72e665998 SHA512 e1a541178103a8fca2c40b6e19ae84f8f272009090b854fae0abbdfb14155cd137ef3b682c25a186028bd8c430a8a3f6dc71480822532d03e4de10f3d585339e
+EBUILD libmp4v2-2.0.0-r2.ebuild 1319 BLAKE2B af8978592b6b962e69c0d77208e02004612cb49b851ff3c69dc23c8ccef517fce55c143149d13bff5c4feb9769d56b2f31e8a52683008416757603cac4aa7cb1 SHA512 9fe4e1da4d110e609fb7f28d9eda084910c7fc9026d7ac4f44468ddad76137306bc777b0f38f3cb1085db37f4b7efd3f4a4838d39e01aa3f9c698e973f8005f0
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
index a4b0e6492b9a..ba95affbd221 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs utils"
 # Tests need DejaGnu but are non-existent (just an empty framework)
 RESTRICT="test"
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index ba3cc5cce3a3..356775a86ff4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1478 BLAKE2B 3e456778c49672c5f91fed74a6ba5a3bc54773be10ca59c6dae701afb117bdecee0eddfa543d2798e57810c95aa88467b2334b6fe48c2ac81cb5df260455de71 SHA512 2be47207e29565d66f2a29501774349c332934831ec1b99d126e2360a245fba146103a6ac7386284e219a49f1fd5570d1a144bd1a265b2b8b1b61e0133c6be9a
+EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index 2c5fab14fa59..a19f50792e15 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 7f735b348b02..bd67f749fd02 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,8 @@
 DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
 DIST libmtp-1.1.17.tar.gz 829529 BLAKE2B 7e7393aaf0e988029382d30e260d651ad1166a89a2af32a3da544cdb85eeec1a026eaa40d131096eaec0686b92c4e25663ec5cfbe3916a522ebafd38f107744e SHA512 f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2
+DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 EBUILD libmtp-1.1.16.ebuild 1582 BLAKE2B adbb02fde31badb613d08a69909160eecf1ed440421227b0234f529255a12ce9e699d16e12517f66b9a686c78f5dbe1c56055e4ee2794d51f1cc68398a72917d SHA512 dea94b3ab47e7ce227a550a3fb2f895dd5c46e54107b0bc1e58eb3fd965d8aafe7a4fc5bb2f7e48761b12a8d8cafcac44ef4784c6624093d21f111e26b012b89
-EBUILD libmtp-1.1.17.ebuild 1587 BLAKE2B e76c9874b13d9681d48b48237de230b642133a8948fd0e8ae380f197bcfd8f84b29f960d4785ea56000c8b85b1c22e41ef8bfe9c21907a2bc75289c50ea92d29 SHA512 28c04af5d34ac81e2ce4e3d5874c7c71d0579f29890cd0b0221381bdc62cb94e770dda5b3553890d9eaf68b29618abed509e404050bebdae078e262e500316be
+EBUILD libmtp-1.1.17.ebuild 1586 BLAKE2B b8e136b01d8032154eee23d6e3e1a880bb7468b65e58cd260bc8bf2b67493a7530853132152b1e247a64a764f9c7b218ee07278d9c3e0c007abba84817ad8c75 SHA512 cf7a132424e4e3e9322fef50414fe3559219d30a69a6736d279c9d0f01c27c4b6f80a493720c86e926d3559a137eaef954d3f43dda4c269ac7df19f558c6e673
+EBUILD libmtp-1.1.18.ebuild 1605 BLAKE2B 5323e0b427108d356bd879a991f4e6d03c897d4fdff985c22ffccebd458a81c69a2492d69592f28774aac82540cb0999cd12061558592d16eac7685a84597cd4 SHA512 63a027b8b143608dbe555369d131798b5b7298f49d814265b5499af15bfaca8ebb860399fda2e8366e57793bab00ea6db5a2a842ce3741134d9fe25952914c43
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
-MISC metadata.xml 394 BLAKE2B bf7cc1e63c4f81e160cdb34f21a1c9412f917c3183d3728da53c11830413ccc23c835d13798fd4c09d5b9d5424d8e711f13a0d3dd39acea3e5370dd26beca355 SHA512 48695d6eda543de340c36dc778647b753cce9000fde558de1932cf8a0533266d2300993c605d2d340c96f665e4782f62aefca45390322c1614a9dbdcbab44e35
+MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.17.ebuild b/media-libs/libmtp/libmtp-1.1.17.ebuild
index 6bd41c26145b..073a0c5cf71c 100644
--- a/media-libs/libmtp/libmtp-1.1.17.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
new file mode 100644
index 000000000000..e9755bfc4201
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.18.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="
+	acct-group/plugdev
+	virtual/libiconv
+	virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README TODO )
+
+src_prepare() {
+	default
+
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm ChangeLog || die
+
+	if [[ ${PV} == 9999* ]]; then
+		if [[ -e /usr/share/gettext/config.rpath ]]; then
+			cp /usr/share/gettext/config.rpath . || die
+		else
+			touch config.rpath || die # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt mtpz)
+		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
+		--with-udev="$(get_udevdir)"
+		--with-udev-group=plugdev
+		--with-udev-mode=0660
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 7b15a68479f9..18b68008be9b 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libmtp_project:libmtp</remote-id>
+		<remote-id type="github">libmtp/libmtp</remote-id>
 		<remote-id type="sourceforge">libmtp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 98efbd3cd7af..1cfa050f007c 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,3 +1,3 @@
 DIST libnsbmp-0.1.6-src.tar.gz 463348 BLAKE2B 546f26c0ebbc2b93aec3002424c8e6d5aaeaa06f06fea13712675dd33c71b431c7f6d296c55a4d091cba7c9d5eaf053960b3d7e16e24b0832e42f8f4881f675d SHA512 7e987a47d56216b2e2a795c1233c63599d474fdd9dd495f31bc9a902f92072078ae79e73323da457fd5059908a65f44bacc6c8742f92f0950af80196a4bb4732
-EBUILD libnsbmp-0.1.6-r1.ebuild 670 BLAKE2B a83f57ebb3bf8499b04675dac740cb556f1b6ccee5304045b8a8858778d7ff3629dec3118db6f608afe7e01cf911021a22ccf3509290493855f8b7bd363c3ce2 SHA512 355339a4bf7146dda2c04452a24a72ea6e0a2372f2ef3d431cd54caf39981f62803646aef4a29e51c72ef27c9878d48a20adc03209e63527d1108e2ce0e9d5cb
+EBUILD libnsbmp-0.1.6-r1.ebuild 659 BLAKE2B 1a82637902063f0b6604a71cc7c9af253373d9484c934b8953f04689b2a8fa3844498488d61e90da2e45b3915b9255cbcaf12d6cd1a6af4e6f9653c604220016 SHA512 6e84fed4a6dfd845f84a9e2368f7ed7fa5db6a73989bac0b06ff1cbadc966378bbde3109420f11336e6756060586a7ba97d1ec294c104b489b6deb4d121c2348
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
index 81c8075d558d..f2da283bd6ac 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 65a022279721..bace23cd3bc0 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,4 +1,4 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
-EBUILD libnsgif-0.2.1-r1.ebuild 883 BLAKE2B 3cb9521d197a236c202e156bb9ba595589f57532c3ed4e0ed2f18ab3e85a5eb5c1aaf884c2eb71684695b871730eadb8a4f5c781ad392ce84adce33a9031d038 SHA512 a50a9179fdc4811f4b97431ebf5e3d76bff815612f07934abd4810d8c3609b2f735821b1d5a3e7db481176cf3019cbe2d20d1471468467d777490c24f43c8a17
-EBUILD libnsgif-0.2.1-r3.ebuild 821 BLAKE2B cd2120c7114771e70c1595d52b0408f6e64113511efc2cb6a8bdc774322c8ee3c4c140e5c150c1adfca85cf8d3e817e3e221816a82990de191ce90b3b5173df9 SHA512 aab128848e18e193974b1e74b1520c3acf3d6324289ca97bca299ff50589f99bde289db4b55b8d6f637ebfef01adc5aeacb7663421a9f6add1564bddaab98e9c
+EBUILD libnsgif-0.2.1-r1.ebuild 872 BLAKE2B 279c47a72be368499a14df9e862f6c5f91efbe068730081a048a8b205ddb7dc669a1b6298e69517a43253999224ec46ba5aa67a33ecce6878296b57780265603 SHA512 75b925962a07b70952ec4a7494c08e9f97a99e58e1e7e729cde6c3bf161bf5666558bf5962c73e622c8456688bfcbfed12801e62e37e0eda875b749f40aef17d
+EBUILD libnsgif-0.2.1-r3.ebuild 810 BLAKE2B 936f2efcf1336438efae13c76a90da49c4e6122ff44d1fb8961d6fefc81d7829be3efbd66d8652662a897587ddb6f6f636ac7d73f895a5773dc05cc3b86cf32a SHA512 0457e21f42650756dc989dfcc7bbf76383f648cdc26259a05df88f8b1c8b93b6eb67a8331295570f357902c542f9894f353d3c530bdce094e5ac3c780c0e6a90
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
index 230b3b8aac27..f5ce7cdc1e6e 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
index 8478ddc00902..2438890b2e76 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index e10584463ae2..38ab651c0f17 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,7 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
 DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.3-r2.ebuild 660 BLAKE2B 1c61886e5bfd90cb9eddccbe6a283f498da984330b3a4aad26e86ccc0115ffeb2d6293aafb940a6e4cdc6784261bd604d2427a1b3153140227b941eda7f48b33 SHA512 1c7378c13da02fdc15e202ae6bde0e3bcef55fe6dcd1914380daf74c6a5fd3d1974957588aae82100ca83ed0d2db5832e3aab40ddfbe9daccc89463996b112ea
-EBUILD libnspsl-0.1.5-r1.ebuild 661 BLAKE2B d25718b28467c756d00dc011204af06cf614018a4039d90ef277cc3c3d33e2890ea14a5eb5a3482027f3cbbf2caa2170dc418eafbd01820aecb6efd06640fda8 SHA512 5119a462a08efb130423b14cbac976fa87fa9da403467d9581c609a96f1f91242fe86673c1de5e4ec1552a59cfaf389ba8c2404cb7a7f1f4e0b7209a94a9de76
-EBUILD libnspsl-0.1.6-r1.ebuild 637 BLAKE2B a7da2993a5d76c99f7dc143f9160cd234ef88b6d0f743bfb4034a78f59e335d91d5b064b6d27e03b77ac02d72308cb3eb2988b4553bacabe4890a563b77269aa SHA512 0513d7610641efc165fcc7e8c48ee78068fddc04d0f376f21df65aae00389ef653717d02ddcaea0ba6a639eaa9d2454995a9a70495a18c3aca87afa5c1d9a01a
+EBUILD libnspsl-0.1.3-r2.ebuild 649 BLAKE2B c41050281a2dde479892680c3ae04871b547461cf8a67c8f6fab3cf06ffa76288463ff304150551703fc5b9eb09a4841c2305a39ab92794b74e5a2450ce32ba2 SHA512 7c865ae990c5537faa9debf990fbd3cc6002e1089ddd1428f5269ef60de7ebe80a715b116cd3f3b29270545d0dc1ef53e1b48a506cb6d4f9a0bc23221ca177fa
+EBUILD libnspsl-0.1.5-r1.ebuild 650 BLAKE2B 4a4f71ce652858187906b093f5f4871aeff8efdac62025fffc51202e32ec51e63cf695e5a7329e5a2ebdfc93d7285fce4de849df649d8386d8090799fc899633 SHA512 34cace588eb7fd1c61395abac61042e12e825a4d8c2390c63065f84180c46c7a14f24d30fcad5ae19067889bbfa1840be1e5370732fd7ef62412643c9d3527c1
+EBUILD libnspsl-0.1.6-r1.ebuild 626 BLAKE2B 961ffa3b20fee692d06e07c7e642d83e960c3447a15a61bb4bab846893b6cd56efd7d6fe73a0f2b3eca745b799f641ec1e7a64a70dee7e3bb551ac9864f697aa SHA512 6a5eb8efc5269cd2914d03b7706fcf640621ece48007d5efbdd8c5507e584e8f4caf4e52b887ec2f4ea4b4de6ea8e6815fc5a58e1140f1baac7c0a92e0409151
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
index 2d2bcaa165a1..cc0ffae7908f 100644
--- a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
index 01b50983133a..79f812a2e741 100644
--- a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index c6381ffa9d9b..dc77fa36d30a 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index 3255eace59f1..dad8af249117 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,5 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5
 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r2.ebuild 1100 BLAKE2B 09e62176601e4afc3a011c5ce9eea501d1b19ec22357fc99ce7261b3d09b0456017d7f139761f79a9b2d843bf0296929ee63a861df388bfcfb8de535d0434b82 SHA512 c4296b28df2676e4b0b57dee6c5195d77dfba2dd37f27fc4dd2bf326a5ba637e26bb93378efdf213c9d736660121d1cb1a105b8d96ddf5fd1f5ef8df4ec7122f
+EBUILD libofa-0.9.3-r2.ebuild 1101 BLAKE2B 1cf591312665df67601c4b4fbc3519587499ca2e1ea51625d5dc167bf35b4746206dad7f230fbf5ebf5b6a6986c7b833f2aceeae8d7206aa4b29f8d3716e5458 SHA512 8a1af349afbae4eb5abcad7aeb508976f8a08b7a2bf02e60391da7dddbf93b1999b9ac0c8180adb4e65326b4ede42221f95f7d7d088b73591177d2f36460af7d
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index ebefb6806c18..322a921d97d2 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( APL-1.0 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 50d4bd50a9e5..185e7a82ae22 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,3 @@
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.4.ebuild 768 BLAKE2B f63d0df73de4e297216279e35cf8eee80b91fceb240dfb6cae2036872a92e3a36253d3b440bbabe6bc0114373e4a4130aa863e7f41df9f0fabf46dbce86538f3 SHA512 0f09703446fad72e4f5c534dbeb5b2cf8433e48159bb44cfaebc8d30f5249ca18be2fe9217aaeffcf58ea2e3a5bbf5f8121455d553de7d34dfaba6509371294f
+EBUILD libogg-1.3.4.ebuild 769 BLAKE2B 240fd389670b3d8778318b28897c43fc81dcbfffc4b12ea7156b67e6c452187a1930ffd68c368f8298fbba500f40154acd2cd32162bd44b4533c551de0dc67a1 SHA512 b3f9298c80dd64fa1301965868dbcab2a2d448d3ec3c17fc5ab715ab62c61a0cabc5766c4210aae57bf5b17f2cff25f32ceba857422e53b775108bee0c611bc5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index bf5e5c860249..343d9f31cee5 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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/liboggz/Manifest b/media-libs/liboggz/Manifest
index b35f5b0d1d4c..07a4c3c937d4 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
 AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 971 BLAKE2B c53f4092e7fd7aa6aa31b63f2f109b3a230f8d20cd14ab29cc5680577c0a6b495eefa0e8726989c11155baa2c464c1e28363a5fa1c9c3aeb509176db4f42414a SHA512 376b4b65c4d3030d81ec76188de5ffd1caf179e666f4cef760b1bb82130581ee130ed38e1401f581247c3df45fe9e5df7a99599a1f4ee5d3aeb6b7a515d0e385
+EBUILD liboggz-1.1.1.ebuild 972 BLAKE2B 6e568b2878239ec68fa95a88d72f45fff3a7f74469281c5a0f1a0b026204c0830847eb0968831c67a68af4f24fe4f7265e4eadd0626621ca97e53a8b3bd0f43c SHA512 20035b845d178a50ca28b413aed0c4e4bde7de269d410fa8db6e96f118d500e123a73d66ff6c8e058411a772efd7b149fb28227555b74934b901bf3870d89700
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index 8ad510f3e0ee..99c9083902df 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index ac4c301f06e3..7ab172ec7c5d 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,6 +1,6 @@
 AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.1.2.ebuild 1122 BLAKE2B 98a11c1dc9fcd2eeef188e206eed3f63447f38d1f0cf7675fdf9600ef1d9eea0862baee8543bec78b7b2859382c3f75370923ab0a488d82865f506fd976b5eca SHA512 b7b7700de3aef054478f3c87cffb47c1185a739f38abde560223072e2a81f70f0117b88ddc13217f0c09e66d9bb5785a8b0f774a97e7cb86b710b306fb622545
+EBUILD libopenraw-0.1.2.ebuild 1123 BLAKE2B 4cbed60099d06ae4a7743a1e0b51ec96cb46056c9c6edd297780ea1e2b381d5a982d5eead5638e427af6915e159637997f5779e1791a9ce0d55b69e1103a55b3 SHA512 22d5fab05fb48453bcb7af6b752d4aca51e6574369795b8188fc0375476b82e7953aab98fedc87756175a96b98ea267d779fc68c87f32b662deb2f1048a31835
 EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index c3d64a8fac40..1b84536a906d 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index ee2b182dd511..15c8d4d56d55 100644
--- a/media-libs/libpng-compat/Manifest
+++ b/media-libs/libpng-compat/Manifest
@@ -2,5 +2,5 @@ DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff2890
 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 EBUILD libpng-compat-1.2.59.ebuild 900 BLAKE2B f0cdaf25bd129a47fe60229973497b3d45d772eaefc6eac9406947d0acd72969e49bb9cfaf838a4798a9ca4edb00ff612c805a1e8b563ba99ed08a5b4c1ac6e7 SHA512 810dc61ed8cf6e17e6be2e3b3f9c4f8232dce3c20a32f7680a641f09b28e188130158a95f147405aafb9e164c43a44608c79d604517c022c5e3bbd59044d33e4
-EBUILD libpng-compat-1.5.30.ebuild 1732 BLAKE2B 985e98e1017f1664f28a038a672c7c06f177d9c4de08b0b704324405cc0b620f9db3e432bc4430ba63b3f45b33c5782bb9aee6a4892204058aede53b3430e235 SHA512 0ed6f0bd11602456fbadb528b2a2d4d6a4f853b1ed4e4a2625d116c82b874b8315683389259d26345583074c83461f309e90569dad29c671bbfddd790741c72f
+EBUILD libpng-compat-1.5.30.ebuild 1721 BLAKE2B b84f1e652a1363aa58fe54b2ba2a0f0fb4b378649be6ed4c957a51797b1305fab08e5d37a3bb4dc634576a4234374d3a9db52718360c78479a2f74376f44566b SHA512 cbd4e614014bc574cd71d240843b2d7931d3c9baf616040bd1c23108011d864773f1efcc8a914a9df4c04488312460271f018c7ee16a3c124af40ed2d5f20637
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index da883b36c4f1..fd1b3b679b1c 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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/Manifest b/media-libs/libpng/Manifest
index 671b9a3bc8b7..e2703d207e5c 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,5 +1,5 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
-EBUILD libpng-1.6.37-r2.ebuild 1382 BLAKE2B 059db01af5e4a013b5e661c366d1fe410790e8799b908a0ac069c4eb59ed35a663a60d9571ebe7ccfe4ec4f979a16b5cd50b41516d446c1cf8c187be7424b1b2 SHA512 f4d8e77ca255fbc604593c0bd716873119ff4191473560c478ad04dd5d8ca8975d149778893e98cc9325aacdb768440118474a1a8d5119250fd4a2f225626f78
-EBUILD libpng-1.6.37.ebuild 1348 BLAKE2B a601cfa4e2705faccad25cb20901e0836e1554aec89b591bb7b76e32a0feaa76668de13f92299bcdd259df1fd332bebbeee75e46343f5a8018f20dcce2922a6f SHA512 ed90229aeb5e79924459332419966f84c59fc8dce3e43d3246783ccadbb5963815fb640e41319056521201db4eece9ad78a00c4f9844817c6f43303ed43f8398
+EBUILD libpng-1.6.37-r2.ebuild 1362 BLAKE2B 7694f689e4e8ab372c2eaf1aaf80d022b9ef31b91e73d93c389583193b7b9f61b295370ecd71cc93f0b3b783970dae5275b0ef9935e8b55e43a2911edb3706dd SHA512 828d4837f02241dbf2f353ca2e0e342555347157379c2a15a8c16d44453ff8569aa28dd3fda3819f49a3d5d196bb89dc22e9193cdcdb366bc5439e45e2478d87
+EBUILD libpng-1.6.37.ebuild 1328 BLAKE2B cbd6ef5105eac7309068e800a29feec477471e9e27630144a8454ba85efc4a53f74a74c9d2fa7564bcdf4aedf2c2157c37a3d9d5f2abc83579ca9e7c5d220340 SHA512 653708bb0a6ddfa3a724f919025f69b99e6612eb3eeb737b9d96d40967b8df20ffcc64a36a43e0730e5abbd3c7b111e43a8c3184038b78bf6ef9e4c5ed61995a
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 608079236331..3773ce34b2a3 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index 3f68834e21e9..212b96fbf603 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 098b114007f9..8832586727cf 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,4 +1,4 @@
 AUX libreplaygain-static-libs.patch 1145 BLAKE2B e90da6268c258998ed333cbc89918f62f0cb2d5454c98af700cf6b9b3d62d780e4e4ce931f9d5bfff4a74cce8770c308525b895b3de163725cb8fd07445cd330 SHA512 738b50523dd527781fa7f1df1bf3f0ffe26925684ab3ae1b14b1c7cac9e150384deceab0de70c05cda474f4e3781c83ff0335255471c92dc06edfdfef330e898
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 837 BLAKE2B 4f9cda41e5dbd8932a6e9fb94943df7b9a2fb40ae43131804937619f61120a0a246d5a1dab857fb8420e9b30285236dcc8ebf6a050ce7ca6f36aa79b9bff24e5 SHA512 19b1241dac1e2677adcecde38ffd618b4aaecc9bd5999192e0c704f61227e48e2ab6dbcdc31847f413a095ef835806daf121c9e81a40a3b92bcc6b36345c3967
+EBUILD libreplaygain-477-r1.ebuild 838 BLAKE2B cab0428772ea4466d9856db81704f10f53b848837eb0d3efff84f7dd396a6384fef7ef19cf12cfbcc6a6b223055ab95bab27df0beb7d8efe94b697580d3545b7 SHA512 25f6843fe280187d157726a3bb87800afffd818c871f37d7c99072f0f7a398f120b194c3514b4e51bae3fefb5b064cd5e80d0ef373fd609ba9a0399650241a41
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index 171546eb7957..fe77c3ca1683 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index f2b38bdec059..09e1f3121984 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,4 +1,4 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
 DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
-EBUILD librosprite-0.1.3-r2.ebuild 677 BLAKE2B 96625032829cce9f9ab6576a8231f13d00a73c01e89b0d90ea6522f00cd422ab0c588f73d1a55b6645c1353086dc4a49eb4a08dfccac28ebca957c1d1a9a6f0b SHA512 b5c1f29d857100f5d91f21b1640b11098be28d60efc9de0e027cbbb95607020f3fc3657b0b86a056250e82e885bc6febf67a1fb55ecf78c3d7a566c5386f9e9d
+EBUILD librosprite-0.1.3-r2.ebuild 666 BLAKE2B c217426ac0c9f0c6173e331a043746e515e1bdf862f8e354f8a86c88717fadc6517a2b7792a27a913768772a1b657e5707dd5e1593616a35b51871faccaa637d SHA512 d25feb83373087be94eeb15d33ea355cef39321b331ae923c4c0d534c50ee2bb717fb35c4a6442151d13bb461cc53e09599cebef9f9db6e40a5bc263c4bc265c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
index d412b3c188e0..7079dc81f265 100644
--- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index fe815e73e72b..a3abd64fa73f 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -3,6 +3,6 @@ AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf84281
 AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
 AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9-r1.ebuild 1013 BLAKE2B deb44cc36e4978db093ebf4d142d6e3d7cc5b3dd5a35cde28993c0ffd2707244ae03784be4526740bbfdc8c102a75831be4533fe78416e980f8bdbc6bb7c3202 SHA512 47aed1364dc168f51f594a7617097fb32722417fa201df8e9a0fcd224690a9f30a80478b188a8e89101475dd40e001f24ddf4cedd25271488d98fc96eb552691
+EBUILD libsamplerate-0.1.9-r1.ebuild 1014 BLAKE2B beb4cd14dddceda5ad598c29ceb334731274e410b100ee1d015294013f4870be4b84ff44154599d51dc3c32d573305d8fb266547d3a1ecd1990fe03f45a00033 SHA512 a2cfe0b77259e52d448b90d1aa54eed95936389810d2b7846881724fe03126e49f24c933cdf34f75ccb7d27f8054854bf0c09426c1cd49998460a43e3fae15db
 EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B 500d16139947b14a359eec9ab45bfd74ec2ddf6ecd746ecbce2381f7579b8863f44772f72473008bd50a0324c11f676d6be56c3779f16bf6d9ae900d1ab7fc8e SHA512 77961d3ccdfdfe9861d4c429e3fdef3f9bbda46c37f558fd13f49a92d04d358d8f192c5a1d8f48dffdff9d00b74305a270acb1e2f03067c83d045674c05718fb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
index 9243a4f7f2a4..70b6ee8e597e 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 3d21a7bb838c..1916fc822276 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4085 BLAKE2B f94280485dbbd739bc9508aa91005264d7fe16ad7df719606a2539987c163f7a7f77a38b70d91159be8ff379cbfbe2ea64b3e7c2a6c2c91185710dad498f552e SHA512 64caca4c951a38f70085f3d1096cc0711b15c5536fbd7a06ef50ea7ebc30e041a5a29a76f6b20d2744d235ce6ce4a25edaa09a1f99e7b915f6c0d8572e88406e
+EBUILD libsdl-1.2.15-r9.ebuild 4086 BLAKE2B c4af74cde55f18b5a4201088bfc3ab8ddf182b2759350d955dc2788b8fdf8c73073a2f0c6e0241b7577c7860aa25c251a66fdb1aab6d7b1be7fc896e81831a90 SHA512 63ae62e1a2e8ce3fbbf714ab71d20675241efab3e417655565cd891ff03b8c67eb12acf1e0b6bab855eba193de12da263b1f0b0804beda5a30921d1b401b16a2
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index e50406371f5f..af5d4bf883f5 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 3a64cc02be10..07a9edc0838b 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,6 +6,6 @@ AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
-EBUILD libsdl2-2.0.12-r2.ebuild 5895 BLAKE2B 8b5485517c3222740bc97a2a71430d6724e61fdfeaa96145b9b1ae734a5fea662855aaa9fc1cda568a1bc85dc9d442cff2d925a0a1966c10de7da2d8100a61ed SHA512 1461736190d0e6271d73074448193139d47c3ebf0f9ae9d302e781bab200b91835ac09647b45182d7d865d36bf562396035e650851d934d49dd18ff767ab6493
+EBUILD libsdl2-2.0.12-r2.ebuild 5896 BLAKE2B 233c8d1ee14e2c95d6bb09eef0c62644c9688c7d51baff25db7bf94148f1465591e32873516fd74ad7a1af552054f7161d5d132656ee3560d4ec69ec3bb8353a SHA512 777603ad7137c73b7fdccbf56c4a27766c8394f43a1df52751766d2f445a1e51b03dfbb83b32274cd982f5ebaeaa0cd80e9caca215e352996dc802c98a05d0dc
 EBUILD libsdl2-2.0.14.ebuild 5934 BLAKE2B b7fcd558236452186bad549772be1b46e9291637024bcfb484fb0d3e16abacabae634e7713db2d149fdc236cb3922739b4ad27a236366b08422fd59de2da1ba6 SHA512 1d376fa674a998be10673400d0ffe65c8a0cc9387f3c412c5f57129285b7f737cd189403b05fc245050fe1abeaec5184a7aeec90bcaff1dbb2fb83c3ffdc3928
 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
index 3566aa574734..b5fe12b57ec3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://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="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 5e6412a13735..a5c7ababb192 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,9 +2,9 @@ AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d53
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
 AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f0771d64e644fe9884202d63bf198a0c3627e4dc5912258c45c9b5fc0143c9fe956ba0adc47dbc20744417d031175a3bbe6430f0fbea967f4fc0b1a4 SHA512 973a96892244934143f901d4469036ffe5fef46ea4e44d1c321d9ab888cb7865d59546aa6211b3268672355491d6876faebe57bb8cb1c0915cc692e66958cf0b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
-DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
+DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341
 EBUILD libshout-2.4.1-r2.ebuild 1396 BLAKE2B 53e9e648a586d0abb1857e4364278b83365a5d1ebc5e0bb5d2c6bde6f72e0410f4e1dda0827601b713bee93ad8258c80db8aead1a4a086f15a29a0e5ee6f3c57 SHA512 bb887a8f8a04a8671a7e8e3429bd60745e8941339920653b1e105202402e846a99ca87495c1a88f76b0e28e923aa16ee1d55b3aee8dfcc84fe5f06c14c9c4a30
-EBUILD libshout-2.4.2.ebuild 1383 BLAKE2B 5c5567a62579400731e1e1ce748c01629a66d063757eb3d012a6cd9def0cbc14b40929f8f39c53260f2893f4cb614a82e00084826a0e7cc0d604acd60e0aec87 SHA512 39df9f891ac2b163c6cb60c20dc5b4ee2ed41aded6785bf0ae531fd606cc6ea1016d862d5dedf87c25237fcf9be8810be35019363ebbdddbef346b9d6303c6c6
 EBUILD libshout-2.4.3.ebuild 1319 BLAKE2B 904aa7904f0cb650763e4427a2fb50a8574a5a3afdeda7b7108931d989bc3cce19907b85f0ce02be86bf946678c016361527910d9e8676b0efaecb84f4c4475a SHA512 f555c27cad246eedc31c46e5c083ce5f9cb2416b7c3d687b31d32d14129886ecda55c2e61d85dee8e98d00d2c81029636f5d4e778b43a49e72d8e81ee051f93e
+EBUILD libshout-2.4.5.ebuild 1239 BLAKE2B fa5f6d92546093610e66effe944268b5472b78ead66111a368bdc0aa3d3b1c73ee97d210e34c3ecc285b37730fd179c85eb54113fe888e486e93e7eb39ffd5b7 SHA512 6682d7d2c0015e971ad676c0b76a41b1a7a1c3a1f702cca7b0ec14f06a23336623d4da4f26dfe99a89cb10fd0616353e157dee5cb5dc3e021394476b6815ab78
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.2.ebuild b/media-libs/libshout/libshout-2.4.5.ebuild
index 4a18881e6e10..76d212702972 100644
--- a/media-libs/libshout/libshout-2.4.2.ebuild
+++ b/media-libs/libshout/libshout-2.4.5.ebuild
@@ -19,8 +19,8 @@ RDEPEND="
 	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
+	speex? ( media-libs/speex[${MULTILIB_USEDEP}] )
+	theora? ( media-libs/libtheora[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -30,11 +30,6 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/shout/shout.h
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-	"${FILESDIR}"/${PN}-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
-)
-
 src_prepare() {
 	default
 	# Fix docdir
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 139bc794b071..f1c54fcd6537 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -8,6 +8,6 @@ AUX libsidplay-2.1.1-gcc6.patch 906 BLAKE2B 8d9682c5a3a9ee2b44547d1ce2091c6f727f
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
-EBUILD libsidplay-1.36.59-r2.ebuild 758 BLAKE2B 1fdbd373caef672f3f59a84517834342fea352ab57a8b186a42173783a6b84fa1bfbd8565e60be7f29f3ae3e54968450e45d6f40d1451fd02d3504b781cb00d5 SHA512 8585c2f9d8d10ea6777f234fc607cf316b1372f5705d323785f5e103495b73169e20ae722db3b27e155448ca5e80b8ef49c6d4d3c8b27ba7c15e663505956997
-EBUILD libsidplay-2.1.1-r5.ebuild 1225 BLAKE2B eeec5a4426c022f07d7b993a2f873fe86eb356bb1fa51082a4895f903c997b52f69ed5a1fbaebafcf8a705afeeb7b8d0ab6dad8a24bf0a4a5284e695b1c61b91 SHA512 03f0860ababe98bc5e06b09273357fda8c45547586e8a685bb3520120277d0a6e2a0d1aa15aa9b659cfcf16536897dd395dde96504e7b535b8959596bcddb922
+EBUILD libsidplay-1.36.59-r2.ebuild 759 BLAKE2B 64d56fe12f76e1bbc0719affe2acc3606bed7a25fb2e6eff42d85a619db7ab3b36a88197ee84dd8aa24cc1f9a81561147ee2ad076867206d65908cc0e579496f SHA512 561422d81e7315e338df6497f478ff793d6efc6be94d3584f2957edbc16d465c53f8172a7f91067d93883ca18dac37c588ac74f648468d0144b9975303fa8944
+EBUILD libsidplay-2.1.1-r5.ebuild 1226 BLAKE2B 8c2619d65decde6f27869e57526d7998574e1b69412e6f1fce11c31337396539c3f3230b442644e90bc9eea79f8be020b3320346f1ad44925f3893ccdc36d9d0 SHA512 2275b4e531ed2555803bf31ce4e66dafff2c22bf0409fcf6065caafa5b529aa915458bbee787968ca5acff8db96bc14b87681ea939e664d611466999aca3cd8c
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 6c3522069f71..6182ef65844f 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
index 5347221f70ee..c084a8959811 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 22f8ed410744..bd7ad5e5ea21 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,4 @@
 DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
-EBUILD libsndfile-1.0.30.ebuild 1816 BLAKE2B 58bb0d82e821e2b44724574531c2c7128edf8c953a5c3dc1745079e6c4bb139e13ad149f067b59ba9c3ab711cba924568ad02257640b6eb144bac8421a554980 SHA512 a2a4329b515d6ff3a67fa3955350744648b91af14579ed94b2e0cce39f1b98d4de96f4a7492dee3d1bdb4b1f20958f12f24801f585e8d3a24d86d73109a4682c
+EBUILD libsndfile-1.0.30.ebuild 1817 BLAKE2B 373ce5312322dcf7b4ff888d5492fd4e3b0fe95b4632c8f4a570087996f014440dad3243fec077c2fb265214f70210d32d9e442e459536daf3e1d4e0143cdc9a SHA512 6a48e61305649aaa19bc2883b13955e4d74adcf54d7c0d0eb0949529a45c0ea122259e705057f8787360b21d6c731b676d62feb4bb395dd07d63c0167d49b821
 EBUILD libsndfile-9999.ebuild 1824 BLAKE2B 5df7f55484c052a979c4f9b86858e4a9e11ee2311f802ddf9def6dadf0ea72386b481d5fc8e182eb481b4908e136aabdcd0a0ec223e3a32084d54f44f186ce4e SHA512 2fd90e525c47680d29596f6e974b34c5e1fdcd98b35898a341e69e412c3effb6061f9450632b5307cbb7d250b9850bf8f0dcf8e8d638a1c328c5b35cbb33c2d2
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
index 21a2ad8712dc..51993bd49dfa 100644
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
 else
 	SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 5cad6209ef12..fb633d8a2a97 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,3 @@
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
-EBUILD libsoundtouch-2.1.2.ebuild 1519 BLAKE2B 64671d9619467f9961d0ed67043702c6da96ac7be8a3e1a7107ec449c8ec21d4634f939f4e90f257675192ffa03d69dda637a1e7d48b7910bb8344a6b094d469 SHA512 2d44591f900413402cdf3b0dc6760b6d5ed113cd561a7bd085501eea1d761ce257cceb178550f568a71a83d484837e104bf4f49fd580931fa6a9ee873af874bd
+EBUILD libsoundtouch-2.1.2.ebuild 1520 BLAKE2B 1201cd8926d9a18249cc31bf7a59a4f2fcc7069fc4288ded072c0186c4d7e1494311080d8dec1574d0449b8b90117b8d0bc7569135cf03265a8aa08853883499 SHA512 2d8ca9157fb7e2a360a106231adf089c01ac804b0804d8197500c32e97aee60dde3289867ef7d9e0ff71b0db538dd640ec38e185256c524d39c8a0b8c70e6683
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 19a363b2ee95..032c08b22671 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index b690f76ace83..1ae8c150f2ba 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-EBUILD libsvgtiny-0.1.7-r2.ebuild 815 BLAKE2B 7a58fdf05eba0487a50d1facc9bbe29656ab92519f19ece3cbdb3b88e9b1b7216e2b0f4f0bbd97f3a076a5fb2ce61df7450222e39f37ff9fd4b67ecdb6666529 SHA512 fa27d6ed25c442e60324c89062a16db65a7828c9371be4e36e8a1f08a245798254d9e27a0b6e18131d141f224f0f204c77847d22916dbfaf42406608ae897cea
+EBUILD libsvgtiny-0.1.7-r2.ebuild 804 BLAKE2B 595b50f60e311aa82af7af137e9a5d2dc848bd37890c0acdd2d2db28b18c783a0b14849b102ea013049f29e6bb5f927875689dc57c7a0ddddd58fc17767ee8f0 SHA512 d3efbfab4ca05957b677acbae9e34699ac4531cb97296cad31052b15ee034b920e397bf5d5a1be613c2d6153471034c3e2808f8d45643c7e84df7b5086b42a5e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
index 062d7f57930a..c326a787bba0 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 8eb871366021..0ca7ffe439ff 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2346 BLAKE2B c3f651ebb914fc540392353f8f87274f86b5b118a7a256bf16edb55a845590546630599f382ea9dafb4ae45c0b85cde7969ff6523ac6427ab8b54a96b5d1e208 SHA512 1e19f79106bcece6a73618374239fd11588f661d9e8970fdbff6211a845a8af38f8a99b49eeb0109ef939e83dcca85752e122ccc2ccf9faef1f1e18d021c664f
+EBUILD libtheora-1.1.1-r2.ebuild 2338 BLAKE2B f529bba6046c5ddc51114abe61f4f2388fd7a53c85acbc16957583bb9abfe2d09e0ffcea7d3687b74ab5068f8ce6bf45bb9dab593ef636af7b068edcec1e2def SHA512 1a490b8f89acc79cd7f7054d9d71c8e1d69ec56b8bdcfc9a5843ab783539daf6e1454df113fa4522ef453231a229e34bbcf30d66f3ac8d336b8e36ae79de877c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 78bffd1a60bb..f668e9be0a11 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index 8cdf001c1a80..b7f0a7606f78 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,3 +1,3 @@
 DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9
-EBUILD libtimidity-0.2.6.ebuild 817 BLAKE2B 752f8bb3647f5a6a04766131ccded968b7c76b2f984d3fc324d019116fa213bf056946acc21df7fef6295755dcc41785b6dc9602bb669b5682c00ec7eddb62a8 SHA512 b59d7ba2d7e87d147d38e2a621a26aa2c247ef09aed7c3bf47f508a41f561a88f46037c39068a8d23fc8183df36d0acb249069ee8a26738653c30ba03548fe4b
+EBUILD libtimidity-0.2.6.ebuild 818 BLAKE2B bf3e0d1b314fc1466ee5bbd466cbbee766037192d8148ea828f1d64091ea74b1b913df88980461dd4e4dd5b9d5998364f848e9b50409961d45b62dbad6f4d57c SHA512 5ccc611ccfe7b2e3b8c4e327ab90179e60aa83470b41f3195b2381e4ca3414713f7a892c01d2d764576198600c9ff68fad471efebb54d3171f53a35dca75f244
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
index d54cd5746268..14fc66562e1a 100644
--- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="ao debug"
 
 RESTRICT="test"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index b4bd205472fa..c516403a4309 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -4,7 +4,7 @@ AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD libv4l-1.10.1.ebuild 1400 BLAKE2B 0a109cf4ce02b5698a9eaa3021bb12b462f520ee22fbc3c56a3e4cb2831020db862759b0e0a1b43d2bbb36d89a6b31a3f097415e8939f34b350c263726888cc0 SHA512 2232d3dce5dfb8b2a2d4ffa368e20d920a9c438ed7cdfb850e8e0f1c4c5e20186b5f2f3e30be6d945c8e704d0734dc4dbb411582e8758e2f571841b9a1f23379
+EBUILD libv4l-1.10.1.ebuild 1401 BLAKE2B b4368cd37bd0e4e829c51032e21f8b242743347a31320955a40a34280d8158b2b7feababba1ffac27ac99abe19638f1187652b4f349b607ddd97eb2913d01e5b SHA512 6304a25610b7a74456e4f4e62a0cd72de5f4daa607188a410ee68bc9a58c1041b3af5f44ec1e3c9c9392f8bc673596f5efde2705a653674e1124fbacebd74660
 EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02e3f64c81221aa384353d36ab120ce1d84a331e2c833d04119d2d3a5a70982fd9f3fdfaf3d05d2c0d200a557a5 SHA512 026eb18799f282078f861a2f26f1ba81d7b3a6f3d80acfd20d93431c4507ea6f2815f976e625e84074da3f1b951c1b7335f48572d7bc0ad87436ad5eddbdb751
-EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 584560890dc0e683597d2911f896e10ba6dedbb550483f9dbfd464eea4f00a622d0451b7bce3375e19ec3709ac750b8ce8b47d877ad5e7bffe9e8e95a21f9eab SHA512 8d2342aaeded0fe008f4d6be287926fdea178961900ecfda56c6b7652b3e4768a72603ef4139240d15ef696399ef112326668233d6207c2ab8284597f4ffb485
+EBUILD libv4l-1.20.0.ebuild 1512 BLAKE2B 5930b4a66befc417153a32a23ad808fff04061c95113210c2f98767b79b8800bc1c70e50822505cb0ffb70e4f9fd071a540cdd8cc522eacebaddcee94985310f SHA512 613f55217eb9a89d5a6ece54c4f8a5bd664667a7605a2262f7a94dac06658556d39cb5b94bf996e1dc4b7e681eb64edf121dd7d60aee85e943223614d9528317
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/libv4l-1.10.1.ebuild b/media-libs/libv4l/libv4l-1.10.1.ebuild
index 0a77d9b02677..668f7099e892 100644
--- a/media-libs/libv4l/libv4l-1.10.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg"
 
 # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index 9c2ddcdbbd2e..c96ed7b84a5c 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index e6419ca2d951..067024cf9188 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -4,5 +4,5 @@ AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1242 BLAKE2B d15f933d83a3d259f40203dfadeed3054d2089a90cd3700aa2d53f81c997d83d8dc59f05e9fe92fd8c8d83bbedcf4aad5b721ccc14e19dbf2376a3bf8ed7c389 SHA512 50fddaff8738fe44fc7d30a9d0b5784fbbd094b5832a0989c62eca54aaf9256a3df6c6fee730fa873d74d9c1525e01da4b99b98a9e0c0a4736a344759121c367
+EBUILD libvisual-0.4.0-r3.ebuild 1243 BLAKE2B a051f52f5e024a969c9510681931b802c4da13e8863b8f015eebb0f0c5417468ea74dbf124223f8da68d93f797eadbd77cb8ed56de712a0dc084702ad07faca4 SHA512 73c142f1b1d60fb0c3af64f02885420b73ade90c71a62df4cc257246f8d507aa06cd2fc31fecb1b5948c6dfa174fae7fb3638679c75f75015666b0ede1731803
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index bc2a53c276ad..50f3ac50b8e7 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug nls static-libs threads"
 
 DEPEND="
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 5c47013a72e9..67a76711f252 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
-EBUILD libvorbis-1.3.7.ebuild 1278 BLAKE2B 159ba106fbc40ba26bd86c638c4b75568a87636fe7216e41aa792a5feeb73577c8943cf041898e9080e1f008df5dbc562ce722a7d462d4e2dea678752d7b6c58 SHA512 352d684a3e99cd70caae468f746d6bbf951373a11a50bf6cb8a5362d67f5928f5177d79382afaad894338db53d8dc4ad96fd52c539bd5c6f49c113537e5d181b
+EBUILD libvorbis-1.3.7.ebuild 1279 BLAKE2B 3c52c4c345c5d36af8ce5d0205d90032fe7ff0cf8a94f2c577ed97b92cdd250d6dbb064a3f9c19d1df0e710d6e74c6fdc5e7cfa7706a828a3f6eaa7cc49cd3d3 SHA512 3e4a253de8c6bc9936766b9901e6c959616d8156316822ff1532047b56bd5a543785398ca4b07faf556565ca1909d1062776bd9ee96637155ed790e60835b3f6
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
index 19b5f9e138a3..2d9aa828c9c5 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -10,7 +10,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 413ad2026ec9..b91646f7424f 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,7 +1,7 @@
 DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
 DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
-EBUILD libwebp-1.0.2.ebuild 1844 BLAKE2B bdbf6a9a11c75afa156fd79dde7432995d12a208f473dd62cced1aad47094aaec724daff8b470acb7f2a0cc6c203bddedd21e842939d9eba40fc640b4c4d8423 SHA512 52eb96dd6d80ab6b5b02078d78ee90cc413c54b5016fc5a25db274e46d0180c7b245c4a19df456dea967bd8b33dc7056a044441324f0dec6e3266b23dc097502
-EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
-EBUILD libwebp-1.1.0.ebuild 1859 BLAKE2B afb151a7334571eaac5518eeabdac785580412bb2a579c91aee4da133865a24ffe5952ac484b32c7e136046d86ea31b5fe9290b1f2678ea33395ac26f2b59b1f SHA512 e45eecc5a7970364e3b4ac6f14550d2d979f0d77a5cf03504eb54615be510bd102126427031b7ee4bf77c4b50ff02a3de3f02a6e32ff7890c765f46bb69df9c2
+EBUILD libwebp-1.0.2.ebuild 1833 BLAKE2B 63530f57ae68ac7127994e62eec1046a32d3f34905c8aaab3cc6c69af86e806a20c2537573844b3fbbfd33136b55de65cf8e5934fe9901dd19248c99a058a7be SHA512 75309bf73e9a188ceba1e494604aebfdb2fa52e042451641aab4a85aa604b651ad7b2ecb8437a96b217502781801a26682bdef9dc032fe29f10dc08912cb7b7a
+EBUILD libwebp-1.0.3.ebuild 1850 BLAKE2B b0416c7ce6c7f9042d3608dc14d8861b6d924f7d6ee8b581d5dfdb8ae8744c13d8b226fbc8c9d2bc728628f2fbb634e20f92171a1297d584dd52adafef1e60e8 SHA512 c897df784fa80050d9b257605d721ef5bb882c48fd5a3c855ac5ebb30e01242acdd2514a893179275fb49a0f832b7bb30e09d8b62d0a54c5fc12901aa9f5709b
+EBUILD libwebp-1.1.0.ebuild 1848 BLAKE2B 363267a43d9fa07f7dcfb553babc20176cddd4be672c8548c7f18a5fa01eebd23efc69f006a36ed7106ec75083ef77b3580b13fdae091a6580cdeccd4f6fc6d5 SHA512 2ef694436cbce599853015570b5834346edc4fded98e73e05f55772b5501ee6b7f0c3bc614030e3b2150041c6559e22fe61a89ad8cc17407f85921f669233705
 MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index c1cd92da52cd..3d2f83d51380 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwebp/libwebp-1.0.3.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
index 7c952320c635..ee454f576d65 100644
--- a/media-libs/libwebp/libwebp-1.0.3.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index 3b81cd494ec0..0c93532eaf1f 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index 92334016edc6..2391e83177a9 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,3 +1,3 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3.ebuild 613 BLAKE2B cf6349bea018107efaafd6f072f174bcd8d032dc0e02395f124b6d07f099f00eed98457b7c9d97c0dcb21ddfd68617a29651d6863c2e99614972f63d04bba8dc SHA512 f78ff716061df535fb3fac90f7ea773fce4e5a932062d253b5f9260bcae86ea5147a557e9132c07393064cde9df361fca0ef95b63d6652120028bc6581e96a2a
+EBUILD libxmi-1.3.ebuild 614 BLAKE2B 14b43337437614721d4ce91bf120dce2df33efef6c1fe2330a627e3a09d0e4e530959f8bda76382a94f310f77fb661994c3e0ab26d87af5389288ed6858f1293 SHA512 d95bc3984fcccf56c3135381203084d80eceafc72104aee623371ac5a82589245bd96e1d04e07417f86f1d000c64c115d7630d9be981859fa3700d3609baf0bf
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild
index 86bded44f556..8b2d6b65194c 100644
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ b/media-libs/libxmi/libxmi-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="!<=media-libs/plotutils-2.6"
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 760ad9bb0177..0f9e726fe871 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,3 +1,4 @@
 DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
+EBUILD lilv-0.24.10-r1.ebuild 1794 BLAKE2B bedb0bd319674b705999cb548ffd1a17135b5fe85a40e4c953ada86466aef9a959e0bfd409fa5e05f387ae40ea1794973f20f78a6d39fccf5890f36456e546c2 SHA512 380cca73ca22954f3ed8f84d7c0e1ce35abaa063b6e463fdab792aaa90bccdb6b9862725303684cf3b425df83e143b11986efe140c158be628d42cad865f1983
 EBUILD lilv-0.24.10.ebuild 1667 BLAKE2B 9c6ebef150f1927f98b95a0976dfdf8a14cb1ecb00e8f5c3b310ae80d896a3803a69535eb9ea1be0d148f68eadc5ed689cc01b870b0ac5c7ef8be463c5b988cc SHA512 f152ae9d5acd264b9c0dbd8be22429e13e42a5ca7149004d7d62561eb760ee3bb29e0f73f5308cb01142a568fe20cecb933c9a05f88aea882b5845ba64ca13b4
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10-r1.ebuild b/media-libs/lilv/lilv-0.24.10-r1.ebuild
new file mode 100644
index 000000000000..3763f8181396
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.10-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="doc +dyn-manifest static-libs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/serd[${MULTILIB_USEDEP}]
+	dev-libs/sord[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/lv2[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/unittest2[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 9b93753fa127..cdb9c31110df 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -4,7 +4,7 @@ DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9c
 DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
 DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
 EBUILD lsp-plugins-1.1.10.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
-EBUILD lsp-plugins-1.1.22.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+EBUILD lsp-plugins-1.1.22.ebuild 1038 BLAKE2B 4eb9131911f238f8c065aa82cebce3c010b9d90bb486b96d1fc3684acf56528376ae2362c5037f0cc25f84af8119705c065ca3b48d63cfaf04ebac20672778e2 SHA512 8f5a7a7c50eb6588340c9d38bd8596d7aad8ce84d8c1c6f540645dd2fd1ad07ac7d1871830e59332f7b3411c7d1fa9e8aa718b628f07c66cb36d73d5877556c6
 EBUILD lsp-plugins-1.1.24.ebuild 1060 BLAKE2B ef1bc5e9dd6e1c5cb9ac4db76fbb51ad50825a77137951782233d708a69e904c43ceff1545b3447dc30c6d70c0f892b731b282c9f53c6d6b713898efeed43aae SHA512 d9a30e986c92e0afded3abac9bb1340e53ba20412318f9c139170c911b3bb3d1cdde0241919728e7a79223a6720a9fbe5560bb07ff17bb9068e70cdf31340955
 EBUILD lsp-plugins-1.1.5-r2.ebuild 1260 BLAKE2B 31d54fbcb2d2a175e8ab93eff26535f9e62c151d4e9dd0d22f1092d7e83fccd11da864aa89a95df86da9eccd8434c623716b48d27cf6f3990d326e554543304e SHA512 2d09fc21ca51ddaf084461b664139a2855dc23a8863ea73c58da57e808fcd1d29a47054a0c83adbc4c10b0bff006239f5a426bacdf8b8bc1007262c2eeee2b8c
 EBUILD lsp-plugins-1.1.7-r1.ebuild 1037 BLAKE2B cd70d7c20ac3e6abc074780b15dc24a5c7f0f19eb8dbc54239e6ae4977fc5ac04ffdeb29f105cbf1b71975a029f5ffaefa182903820c8ae1f57754c2256dc7e1 SHA512 cb9256462b87742bc44663d6888f385fec69f4ac8776434574e305ef3526a0befcc8b737ca94d5d931b4337682195a2f4ee8990e86e4254266230896ff0a1a61
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
index 3e66062b835d..aa0573ed136b 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1aacb666a845..e9d219d150ec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,8 @@
-DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a
 DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
-DIST mesa-20.3.1.tar.xz 14176916 BLAKE2B a557949f5cddedee1ee157d982ff74330984c8e1f3a60731397234a2154ee908d1fd38b6f436ea139ba28ba7b45b597bfcd99d1cebd1a0a84bce4c071e591fd6 SHA512 06638b8d2d866b5e27024c58a2ca03a73869221a7d536f7a8f1679d73708e5c1713446c8fedc594844b95596ae817bfceb88ace6b42423328189778e5036edf6
-EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
+DIST mesa-20.3.2.tar.xz 14194120 BLAKE2B 545073b7f3f9dd54e087402b599ffa55e37a6a0b2422a52fc22cbe8de0b91a88603bd2241e2308f6891cdab731f0e01c9c9683028819aebcf3251ef3ae3db9bf SHA512 0cabf8ddfd20b56098c8f4c081a3c2d4741ef42f40c929645e74284db99cf2a81137d7d279b7b6a0c15dea83905119ddf612411b36344dc22a488de9f311f5ed
 EBUILD mesa-20.2.4.ebuild 14787 BLAKE2B 3fcf8c3aaf4a1604f5f9740e86209bd39afb5ac75d3a235e158f69018992d1a5d9615cbfa7dc60c3ec2ed8056d8fb6a233137f827c034d706979960f339091e0 SHA512 b538f732c70f7ba100b3b2938e7071b34d98ad5c2db4b46395005daae744165602d6cf4cc2a1778b8adeb236c3f86b285c2927677304b55ca9458874ea6177be
 EBUILD mesa-20.2.6.ebuild 14794 BLAKE2B ab5f4a04e055c761db7bd0757b62d5e75d87288972780d5d24fed1d6da6cd17ae79f1427c2190a629b8c6b78471991f5d43dfe88a159416a6788b97ea33db11e SHA512 02e10dbb2a6e0e4542771ef543fd04cbca5d0bb6394382db6aced502e34955556ae00df2b62a8a0bc437f64668ab1f099fd71243c26f965a7e734d5b49ad1b95
-EBUILD mesa-20.3.1.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
-EBUILD mesa-9999.ebuild 14825 BLAKE2B 9e2c13ca384c3cad4dfe19309bb4699c5795f2936e9b7c9e7645827bbaf71703c0db0db6bd6d7899546ae38f341739590a2071c193f981d58e16615de0ee46d1 SHA512 4260da1939ecb2492cf444911181ba423f5420ee02e91f74aba972a7e52793df43debe41cec89bd279b59a67d686b97152a4199c8ec1f2d39df813809c4af1c5
+EBUILD mesa-20.3.2.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
+EBUILD mesa-9999.ebuild 14788 BLAKE2B 3dc2eada6db840d106b3fb21bff2d842338189e9c49da9424673f95061dd5ff1de22bde773114bf6c8d4b33cff43e5774e77ea218eefb88f36e9e283071873d4 SHA512 2a06fe70afeeb6cb060a59ed936c44618fb6d85b19ddbd84529f4cf6e5347a5603eb65b8993a693d99b367a78aba5682adf9d860575a967041b56874121e87a0
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.1.10.ebuild b/media-libs/mesa/mesa-20.1.10.ebuild
deleted file mode 100644
index f83e05fef141..000000000000
--- a/media-libs/mesa/mesa-20.1.10.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${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? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		$(meson_use zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.3.1.ebuild b/media-libs/mesa/mesa-20.3.2.ebuild
index 4a9d566b07cd..4a9d566b07cd 100644
--- a/media-libs/mesa/mesa-20.3.1.ebuild
+++ b/media-libs/mesa/mesa-20.3.2.ebuild
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a83701ae097f..152e9ea51a87 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -351,8 +351,6 @@ multilib_src_configure() {
 	local emesonargs=()
 
 	if use classic; then
-		dri_driver_enable !gallium swrast
-
 		# Intel code
 		dri_driver_enable video_cards_i915 i915
 		dri_driver_enable video_cards_i965 i965
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index bdbedd4dd366..47b775358ea6 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -2,6 +2,8 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8
 AUX mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch 1093 BLAKE2B 12bf9abd2053868945df5e185a2a111118bfe886d3987070f75683be2f5c00bb5b6325119a99c2ed9f20e8f91b9dda8e90a712e05170c435bfc04cfa02d12306 SHA512 4869580800b3de0e68669d3ad6c4d7ae1c994d2cef7de444a130625c3ec806d9691973b0bc921a52c39361e35f11d319377a3330fbbecc7cf51afb62f1fcd99b
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
+DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
 EBUILD mlt-6.22.1-r1.ebuild 4814 BLAKE2B 7750e214aa0052178da1defe96742d7a67092c45d01a565ab0d049e625ca7d31fe9c8a5be7cc985d00565cd407937f6c8754380f618c1a14aba75a0b61cde912 SHA512 2d2a6e0d0e126a281b3ad07b9ae6df2feb8958e9e548bab4b83c5b8e5ddd477362369b61479381eae631432671f0513e145c0f42eb23fbd747c67d8a4ee27ab4
 EBUILD mlt-6.22.1-r100.ebuild 5411 BLAKE2B 1e2d57368378f4be08bc460f1a6ae40c03b5ca4dab0204f9047fc92da5faea7697ec8b5ae4d9b61eaacfdf3a5ffc6264074078497b643df11bdbd98d9bf15038 SHA512 b7accc9d4c753c94aa579815985fecb54eebcff50bdde2ac05df3b73dfbc02899ebba253a0b8e6a0745e3b798bfe860ea65d4e0975504ee12cf9060c24355a7b
+EBUILD mlt-6.24.0.ebuild 5342 BLAKE2B 2cd7777b287ca59bd1c790350088f932588bb88e6bf77fc03214587b088d2931d370b176694c7fc898e3aaf6db5153bd4c010c4422670d403fbafb5607e542ea SHA512 32c77d93f58523e9e4d0dac84a3a2ee85f124efa6373ae2da89187b4198dc793e1e0f0f7532b13e0b6aeab3f02d49b395a73b718d8a8889ceabed0698ffb1439
 MISC metadata.xml 1539 BLAKE2B ce738031471a08f5d3969af421d214c79b8c8581daa3a40cd6bc0d04d5884d7c5c64551e18f3262ca0539663d63ea1a35e85e57bd5861816eea5c295c2430517 SHA512 2b9b1cdc067811cee0bb3a242fe3985217e223d8d2defeae9161fb187e50934e765c03d6899f121ad4a6fa86fcbdd01392ae875b65331efe2ab64f0c4f1ced61
diff --git a/media-libs/mlt/mlt-6.24.0.ebuild b/media-libs/mlt/mlt-6.24.0.ebuild
new file mode 100644
index 000000000000..d9701907cf5a
--- /dev/null
+++ b/media-libs/mlt/mlt-6.24.0.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit lua python-single-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
+fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
+qt5 rtaudio sdl vdpau vidstab xine xml"
+# java perl php tcl
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+#	ruby? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+"
+#rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( ${LUA_DEPS} )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.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
+
+	use python && python_fix_shebang src/swig/python
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-gtk2
+		--disable-kde
+		--disable-sdl
+		--disable-swfdec
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable ffmpeg avformat)
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable gtk gdk)
+		$(use_enable jack jackrack)
+		$(use_enable kdenlive)
+		$(use_enable libsamplerate resample)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable qt5 qt)
+		$(use_enable rtaudio)
+		$(use_enable sdl sdl2)
+		$(use_enable vidstab vid.stab)
+		$(use_enable xine)
+		$(use_enable xml)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	use compressed-lumas && myconf+=( --luma-compress )
+	use ffmpeg && myconf+=( --avformat-swscale )
+	use vdpau && myconf+=( --avformat-vdpau )
+
+	if use qt5 ; then
+		myconf+=(
+			--qt-includedir=$(qt5_get_headerdir)
+			--qt-libdir=$(qt5_get_libdir)
+		)
+	fi
+
+	if use amd64 || use x86 ; 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=()
+	# not done: java perl php ruby tcl
+	# handled separately: lua
+	for i in python; do
+		use $i && swig_lang+=( $i )
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang=( none )
+
+	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
+
+	sed -i -e s/^OPT/#OPT/ config.mak || die
+}
+
+src_compile() {
+	default
+
+	if use lua; then
+		# Only copy sources now to avoid unnecessary rebuilds
+		lua_copy_sources
+
+		lua_compile() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
+			./build
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_compile
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use lua; then
+		lua_install() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			exeinto "$(lua_get_cmod_dir)"
+			doexe mlt.so
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_install
+
+		dodoc "${S}"/src/swig/lua/play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
+		dodoc play.py
+		python_optimize
+	fi
+
+	# not done: java perl php ruby tcl
+}
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 93fdefef2923..c958d7a1012c 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -5,5 +5,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2453 BLAKE2B c774cff40be416f75b4ce9a8e5b4c8d94bb5a4df38f1a9fbe2ef525eb22b522087b59381764b9adc2350a7facc2dda561b86cfa57fad13457ec9e8b9429b2b47 SHA512 7133590ecd846dee2b73f5b0a7e2e6e43332f6e3fc952ac1f4c95b102053c4352ee345bca7b83bceec39884276c2f5c7754cb67c6176acfe2ab276a6871e4e1f
+EBUILD nas-1.9.4-r2.ebuild 2454 BLAKE2B 9c8f919b8511a96c58e5661a0c1851932d34291adb5af7934d05feaf4789cd51265e0f99ce014afa29eb3b98dc9850f8e31732eb6884ba785b8c4d02ef95b3a0 SHA512 01bbff49655f81db5a7a8fde93d6c0754d634a36904014f8a8bd5423395dea14a8553629885e46ef5f387bbfd1e683bb0518dca0b280350f8a568f881a6d153f
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 2965f1bf3de9..6364aaca1aa4 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 2b3a5d07de4e..d5dc8145af8e 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,7 @@
 DIST openal-soft-1.20.0.tar.bz2 587550 BLAKE2B 4ce0b520db65e0298d334bae104dc0e38c2daf41680e40c259451741f7d4c8b06948f00b96efb31aec528e18b65e3f7099ea8b2fbc4cef963cf9a912f51c276a SHA512 7b103ffeeb8a6541d4bd31245ca5e34fec27d121fe04c21655480fb3907604f4171f912411f1e49622ec27db79d6cb85eb452ed78523abc906f18af57ffb755e
 DIST openal-soft-1.20.1.tar.bz2 512971 BLAKE2B be0abb32698d5ea77e8667e1b00fb123673325b0361c711d6c232d96d1add6d5c9a3e2ba7a3d04afcad27fe4f18ae803f690b14c98d198b77c75f1865679081f SHA512 a8a03a2162b5d35e66adc079e81d7fa075b83a3ee1cec3412cb40f7789263ed8bd005beefb7ef995f464dfa43aac22ea0f547b752dfc7533ed9120a95fb92513
+DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
 EBUILD openal-1.20.0.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
 EBUILD openal-1.20.1.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
+EBUILD openal-1.21.0.ebuild 2099 BLAKE2B d4886ca2095016d92081ceb4e65cdb0229775726960536e34235825a541eaf703be3f86922d0c46e982b14db925e5a5d889ff93b6e87942d8af68e5972f1309d SHA512 c284b17706eba849ce9827d5649e8f208994947913783d1f95cab2cc2f814f8cd8b4f7ad0cdee263e3ef1c35077714ac84fcfdd5e03323f04c389bdb0af98e7e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.21.0.ebuild b/media-libs/openal/openal-1.21.0.ebuild
new file mode 100644
index 000000000000..049cee97b811
--- /dev/null
+++ b/media-libs/openal/openal-1.21.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
+			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
+
+		cmake_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index f5702a101d13..108f4715a8e1 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
-EBUILD opencore-amr-0.1.3-r1.ebuild 536 BLAKE2B 5600304d99b7209fa6d66edff43388ae077ebe58ab0aba308c9691df44e9921b2158d810db29ed78bd0807c6254d28959d614c1853a4d10c12b57243022705d5 SHA512 c5bf27226f0eb55a0e703170575b4eee0bd6c3cee981a5e3dc039e5feb146e9efb3b8c81374b67378cd98b499da4cc1b875b87ff0c4a7c58e900143142e430b3
+EBUILD opencore-amr-0.1.3-r1.ebuild 537 BLAKE2B 4a96ba92138c6613d402951ea36204670eb01a6b15e0c943dadb167326ae19f161d73724914b4d433487a1d21c0ff5fa1dfc41ae5a1f8fa5bcd276b62d75cb05 SHA512 dec4ea6128dc2dc6720e16d8cb95e5510dda8adae33c0ee15090c960ea36bade3b4de22e3298e582356fdad46b6f9114ca598d5743b988ca8e9c3e6986e96e9e
 EBUILD opencore-amr-0.1.5.ebuild 542 BLAKE2B bf8b4f3d6c4e2caa304141c15eef6c435f8c8cfeb2af8302ed9689242f3c588613a558497afbf4b8550b0d1350367796efa773647c3921f55ea95d1ae0256212 SHA512 255b8a0f793af921ad6b80d45388a08d964288d294a0b52b9496c1beb2b333b564b43e4e1854376e1f5c31cb19c500f1f4443a52de36bb2ebf2e7f847943d0b5
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
index 5e53f34ee11e..f9906c0ff9e2 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4349225e55d2..c632b006640b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -9,13 +9,13 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
-DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb
-DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b
 DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
 DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
 DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
+DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
+DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c
-EBUILD opencv-4.4.0-r1.ebuild 20301 BLAKE2B 822f7c3d46de91b998481fbf26731ea1ca5d134c73ff22dd0cf0f8a325a9e58208ad99ce545f56ab97de1e2c17fd15d61dffbe72093be93eb2150be6beaec161 SHA512 ed3ab5ad91c438a383b5037ec35c1713244dca7bd20fb0c770ca27d4cd8afe3516be6b76f5be3f383765a9064ef974b4a85dfe77538127375966ee873ab1536a
 EBUILD opencv-4.5.0.ebuild 20529 BLAKE2B 67363a3f10feeeacf0b24156257acb65004939c15b700381df5729f275450c3d440cda7779f9db1a5cab676308b2e26177391c08f74a71ef655fba5dbbf14cf0 SHA512 04cc308127b2c80996e651028ed8ddb015a44c3b05dfc3515b146292542e604e5267b2a6bb30e4a8f4d66ff59725baf80b9dde1142114d6a499a2937fea27c82
+EBUILD opencv-4.5.1.ebuild 20619 BLAKE2B 37816ee00830521386c22dde3976ae18b0a02f50e07173fe959930cccb8743532503eb05e76c2a059faa05380d1420465320b5fadc641bb7b3c94191352e7d04 SHA512 a7e85cc1d0720e893a16c477b82e8ef0856c7e07d1bf1c35d642e920c764a7bc4493e24e693c3ee195d5307a9b5208868116bbad0b9905c254b5a1dd0456af46
 MISC metadata.xml 3132 BLAKE2B 7a499ebf8678ccae68c4947075f925b439ecdcca8a56c77c8a57895d57ffda6ecaade65e1124d12a78bbdf15eef8f9c4524c921bc53009aeb7defd5c489396a6 SHA512 ff59cff9b8f41e69f421bee8d2680eb655c3336f2eafa8c3567ec0d0509707bf9cd0ba41190a8012564d43d87ac5b35e5dc2c827167ed6d315e422a53a13900a
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index df2a210f927d..311c9925d594 100644
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -12,14 +12,14 @@ HOMEPAGE="https://opencv.org"
 TINY_DNN_PV="1.0.0a3"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
 	contrib? (
 		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
 		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
 		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
 	)"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
@@ -59,6 +59,8 @@ IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
 REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
 	cuda? ( tesseract? ( opencl ) )
 	dnnsamples? ( examples )
 	gflags? ( contrib )
@@ -70,6 +72,7 @@ REQUIRED_USE="
 	contribovis? ( contrib )
 	contribsfm? ( contrib eigen gflags glog )
 	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
 	java? ( python )
 	opengl? ( qt5 )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -111,7 +114,11 @@ RDEPEND="
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+		virtual/lapacke
+	)
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
 	opengl? (
@@ -274,6 +281,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
 	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
 	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
 )
 
 pkg_pretend() {
@@ -289,7 +297,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	rm -r 3rdparty || die "Removing 3rd party components failed"
 	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
 		-i CMakeLists.txt cmake/*cmake || die
 
@@ -305,7 +313,7 @@ src_prepare() {
 	fi
 
 	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
 	fi
 
 	java-pkg-opt-2_src_prepare
@@ -463,7 +471,9 @@ multilib_src_configure() {
 	#===================================================
 	local CPU_BASELINE=""
 	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
 	done
 
 	GLOBALCMAKEARGS+=(
@@ -535,7 +545,7 @@ python_module_compile() {
 
 	# Regenerate cache file. Can't use rebuild_cache as it won't
 	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
+	rm CMakeCache.txt || die "rm failed"
 	cmake_src_configure
 	cmake_src_compile
 	cmake_src_install
@@ -543,7 +553,7 @@ python_module_compile() {
 	# Remove compiled binary so new version compiles
 	# Avoid conflicts with new module builds as build system doesn't
 	# really support it.
-	rm -rf modules/python2 || die "rm failed"
+	rm -r modules/python3 || die "rm failed"
 
 	python_optimize "${ED}"/$(python_get_sitedir)
 }
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index b43af04ac0c3..870076a61e0a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -11,6 +11,8 @@ AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f4
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
+DIST openexr-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
+EBUILD openexr-2.5.3.ebuild 1618 BLAKE2B 0d7f5d99b104274c4f68a96d20f99c2a155f19ad90ce584dbc2077ee889a07045f258661a103ba65e304015756ddc4098a1715bea381e7ef9faed2a97ffc64e2 SHA512 ed1b8f2d2e9834037cbd58ae16b4dad45c29bf5ef2c01fd7fd9c7f6e6d0b38a319d1ced1fca0ccde8ce0d722e2239478d7e6a12b776bb33676bc637807793b21
 MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
diff --git a/media-libs/openexr/openexr-2.5.3.ebuild b/media-libs/openexr/openexr-2.5.3.ebuild
new file mode 100644
index 000000000000..d1288a27aa58
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/OpenEXR"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_OPENEXR_DOCS=$(usex doc)
+		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON				# default
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		DOCS+=( doc/*.pdf )
+	fi
+	einstalldocs
+
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index b0bb23b95b57..d2541bca435e 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,5 @@
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
-EBUILD openh264-2.1.1.ebuild 3306 BLAKE2B 430b9c0c23ac5e918a5b4c8701c7dc761fefd36c1d39f92c777decd56cae32a10141abed6e98b65f6bef21d0873e43cb7c5396c6be28bc6b805b4654a74956d7 SHA512 427ff6516341fd9d73e7c9089a15e76f223eb99fb3a9e427a5ed9148cc7b1392df140ad6deac87d1a28f8f38b5aeb2c110c39caf533d1810ee5522cb4052f8bb
+EBUILD openh264-2.1.1.ebuild 3307 BLAKE2B 6049b929128ce9611ab727cdc2365bc7810c605e1b3dc87bfa189da28e49beb6835a417abf4eb1d5db4f1a2b478a627043b0fa927b48bdea27718b44d9280e34 SHA512 3874a6a20403decbd2cbdf4b912d036df771f4d119d6773c131c9700731c0a516e7e50b2e1a3cb10bc88ae033797def856a96d2031faa8e1b21e32df0a1fa0b2
 MISC metadata.xml 616 BLAKE2B 9ff00497f1c3137220f0afccedd0c2280c9772cc0ece5e47dc648794f42ce18dd25679bfbb3f10e413864dc603db9539bb02eee1839a80b69fbfde59d2272b56 SHA512 f15d0f4e48331f2c0c4b28890cc77d1402431cd120c430d6428c87dfb1c6271fe3b892507cacf45b1d0cdf14cb5ae742f0e6e3badc42b0bbd80f6f1fda7dabce
diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild
index 604607fa52b7..43bc28dbfd90 100644
--- a/media-libs/openh264/openh264-2.1.1.ebuild
+++ b/media-libs/openh264/openh264-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
 LICENSE="BSD"
 SLOT="0/6" # subslot = openh264 soname version
-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_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1ae8199db3de..1b29de196f54 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,3 @@
-AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
-AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
deleted file mode 100644
index 970ada64a1f8..000000000000
--- a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:03:40 +0200
-Subject: [PATCH] Find Boost_PYTHON
-
----
- src/python/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index e58d372d..98d91c48 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
- if (NOT BOOST_CUSTOM)
-     # Finding the python component for boost is a little tricky, since it has
-     # different names on different systems. Try the most common ones.
--    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
--             python${PYTHON_VERSION_MAJOR}
--             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+    foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
-+             python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-         find_package (Boost QUIET COMPONENTS ${_py_lib})
-         string (TOUPPER ${_py_lib} _py_lib_name)
-         if (Boost_${_py_lib_name}_FOUND)
--- 
-2.22.0
-
diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
deleted file mode 100644
index d5cef06d38db..000000000000
--- a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/OpenImageIO/oiio/issues/2732
-
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 1240f22..5cc5a2e 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -227,6 +227,14 @@ endif ()
- # allow this to be overridden to use the distro-provided package if desired.
- option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
- if (USE_EXTERNAL_PUGIXML)
-+    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
-+    find_library (PUGIXML_LIBRARIES NAMES pugixml)
-+
-+    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
-+    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
-+    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
-+    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
-+
-     checked_find_package (pugixml REQUIRED
-                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
- endif()
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1dbe3c4aff19..1783845a97b9 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -2,9 +2,13 @@ AUX openjpeg-2.3.1-CVE-2020-6851.patch 1240 BLAKE2B 440efbd4960def0c98cc5d1874c2
 AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd372b625bcddb01e532cbe418b718560729a09e332eefc066da05b1169feda056d9a518858cce4b252b28a2005ca6763d5b3d7 SHA512 9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc
 AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
 AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1
+AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
+DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
+DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
 EBUILD openjpeg-1.5.2-r1.ebuild 1924 BLAKE2B 9e1db8cd8f7a2e395b30c2b095e44e6fd18403b5c51cde0624db1c85e91848fecfb584e93bd815c5b9b1095e8769be8ab77545eca0f2d2ebb2b0291b310332a8 SHA512 18768a2552149908e927342dd9f5a80b423f6d5b9303c299e99bb6a4f5d50e892f7698f7b0d0c4a357d9ee89daf79d4d40a265b01fba3bf23b4f139a78e6875a
 EBUILD openjpeg-2.3.1-r1.ebuild 4314 BLAKE2B 4ed602ade7f73728ca83288e21687b4881d9a107fc96ba1470bbdd78e52ab2c7133ee304407875db6744124ab5b940536a701baa4e41293d6c2d4eddfba391bf SHA512 12e492a9d9dccaba6db177e65fff733862cf5e2498c5f66197300f13312764bb5bd5d9a0d83688d4f0a867a693b83de59898a245ab514ad46e88f55f33f7f6fe
+EBUILD openjpeg-2.4.0.ebuild 4480 BLAKE2B 666d0c0d20279eedf2f85630fc96623c60ee79aaef15ce54538857bcb2f825301c43400a9e2e747fe9fa40c046540458bb58f1c0b68d2e84e4a7b02b0f92287e SHA512 a83e2c89977cd280ad069fdfff163d392c87f80c989faf0f7e6737b30f66993dcb5f38367960cb6ce2a75b4d938bfe54b1d887c570f1e67415f7ab8df83e7d34
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
new file mode 100644
index 000000000000..82ad4075a942
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
@@ -0,0 +1,435 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+(Later rebased by sam@gentoo.org for 2.4.0)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -105,58 +105,27 @@ endif()
+ # --------------------------------------------------------------------------
+ # Install directories
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
++include(GNUInstallDirs)
++
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+-	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
++	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+ endif()
+ 
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+ 
+ include (cmake/OpenJPEGCPack.cmake)
+ 
+@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ endif()
+ 
+--- a/cmake/OpenJPEGConfig.cmake.in
++++ b/cmake/OpenJPEGConfig.cmake.in
+@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/OpenJPEGTargets.cmake)
+ 
+-  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
++  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
+   get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
+ 
+ else()
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
+ 
+   # install HTML documentation (install png files too):
+   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+-    DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}
++    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+     PATTERN ".svn" EXCLUDE
+   )
+ else()
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+   if(OPJ_USE_DSYMUTIL)
+     add_custom_command(TARGET ${exe} POST_BUILD
+@@ -83,6 +83,6 @@ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ #
+ endif()
+--- a/src/bin/jp3d/CMakeLists.txt
++++ b/src/bin/jp3d/CMakeLists.txt
+@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJP3DTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+--- a/src/bin/jpip/CMakeLists.txt
++++ b/src/bin/jpip/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
+ # Install exe
+ install(TARGETS opj_jpip_addxml
+   EXPORT OpenJPEGTargets
+-  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
+   # Install exe
+   install(TARGETS opj_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endif()
+ 
+@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
+   target_link_libraries(${exe} openjpip)
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endforeach()
+ 
+@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   else()
+     # opj_viewer (simple, no xerces)
+@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   endif()
+ else()
+--- a/src/bin/jpwl/CMakeLists.txt
++++ b/src/bin/jpwl/CMakeLists.txt
+@@ -57,6 +57,6 @@ foreach(exe decompress compress)
+   endif()
+ 
+   install(TARGETS ${jpwl_exe}
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+--- a/src/bin/mj2/CMakeLists.txt
++++ b/src/bin/mj2/CMakeLists.txt
+@@ -43,5 +43,5 @@ foreach(exe
+   endif()
+ 
+   install(TARGETS ${exe}
+-  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
++  	DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endforeach()
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
+ 
+ #
+ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
+ 
+ include_directories(
+   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
+@@ -114,21 +114,21 @@ endif()
+ # Install library
+ install(TARGETS ${INSTALL_LIBS}
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjpeg.h opj_stdint.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
+ 
+ if(BUILD_DOC)
+ # install man page of the library
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ endif()
+ 
+ if(BUILD_LUTS_GENERATOR)
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp2
+ Description: JPEG2000 library (Part 1 and 2)
+--- a/src/lib/openjp3d/CMakeLists.txt
++++ b/src/lib/openjp3d/CMakeLists.txt
+@@ -34,12 +34,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENJP3D_LIBRARY_NAME}
+   EXPORT OpenJP3DTargets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjp3d.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+   COMPONENT Headers
+ )
+--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp3d
+ Description: JPEG2000 Extensions for three-dimensional data (Part 10)
+--- a/src/lib/openjpip/CMakeLists.txt
++++ b/src/lib/openjpip/CMakeLists.txt
+@@ -74,9 +74,9 @@ endif()
+ # Install library
+ install(TARGETS openjpip
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
+     PROPERTIES COMPILE_FLAGS "-DSERVER")
+   install(TARGETS openjpip_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+     )
+ endif()
+--- a/src/lib/openjpip/libopenjpip.pc.cmake.in
++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpip
+ Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
+--- a/src/lib/openjpwl/CMakeLists.txt
++++ b/src/lib/openjpwl/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
+ # Install library
+ install(TARGETS openjpwl
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpwl
+ Description: JPEG2000 Wireless library (Part 11)
+--- a/src/lib/openmj2/CMakeLists.txt
++++ b/src/lib/openmj2/CMakeLists.txt
+@@ -53,12 +53,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENMJ2_LIBRARY_NAME}
+   EXPORT OpenMJ2Targets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ #install(FILES mj2.h
+-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
++#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+ #  COMPONENT Headers
+ #)
+--- a/wrapping/java/openjp2/CMakeLists.txt
++++ b/wrapping/java/openjp2/CMakeLists.txt
+@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
+ )
+ 
+ install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+-  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+ )
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
new file mode 100644
index 000000000000..835a389bc405
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0-gnuinstalldirs.patch" # bug 667150
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	# Cheat a little bit and force disabling fixed point magic
+	# The test suite is extremely fragile to small changes
+	# bug 715130, bug 715422
+	# https://github.com/uclouvain/openjpeg/issues/1017
+	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	local myctestargs=
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	echo ctest "${myctestargs[@]}" "$@"
+	if ctest "${myctestargs[@]}" "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+			# Should never happen
+			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
+		fi
+
+		echo ""
+		einfo "Note: Upstream is maintaining a list of known test failures."
+		einfo "We will now compare our test results against this list and sort out any known failure."
+
+		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
+
+		local ARCH_SPECIFIC_FAILURES=
+		if use amd64 ; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		elif use x86 || use arm || use arm64; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		fi
+
+		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+		fi
+
+		# Logic copied from $S/tools/travis-ci/run.sh
+		local FAILEDTEST=
+		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+		local HAS_UNKNOWN_TEST_FAILURES=0
+
+		echo ""
+
+		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+		while read FAILEDTEST; do
+			# is this failure known?
+			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
+				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
+				continue
+			fi
+
+			eerror "New/unknown test failure found: '${FAILEDTEST}'"
+			HAS_UNKNOWN_TEST_FAILURES=1
+		done < "${FAILURES_LOG}"
+
+		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+			die "Test suite failed. New/unknown test failure(s) found!"
+		else
+			echo ""
+			einfo "Test suite passed. No new/unknown test failure(s) found!"
+		fi
+
+		return 0
+	fi
+}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index e82652f07b23..27b36a518b44 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,3 +1,3 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r1.ebuild 1057 BLAKE2B f4cacf3dfc8eeb21f4e5c873a25b1a5b14e0c559b01b92d4f5742447405d21fe67ffc136b9a01cd1f1eb7a37dc2a974a26d55768eef9aa3c22ff4f8647bc6390 SHA512 aea7979015a90853da761e949b2c8f0c0e0f5de5df437c06b4550116f1c40e54332a07ffe99ee28bffa490e3a7e94c059c0ede83bd65fd1ea378928ff9139ea5
+EBUILD opus-1.3.1-r1.ebuild 1058 BLAKE2B 3e8943a6ff0645b769327754a0369e5eaa5dcc78319af56623bff5100017c29915932cd6a54390a2dd9067378f82fcad65f522699656365f9071f0bc8960f1da SHA512 03ebe2113ca9d3392aefb1a36f2b9906e0ba05055d307e0ada16a480bde30b85cf6fc6c9abaeb3700f1e3e99e150eff4b8570031c2bcdc70d0661818b77ed7e5
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index d012b9cbb222..257b3a7fb6f1 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index e990930adfea..895578173032 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,6 +1,6 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
 DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af
-EBUILD opusfile-0.11.ebuild 974 BLAKE2B 23facf93877b58c8c7d2142bcd999a9417d5395b642dbf1834a9bc4e433a6aa9db2048be09310912028a4e5e8c7a95b05940a61546c8061bb58301e630b1d86f SHA512 eae0ec22a2aabd2839e45804776d5541bcfb7ae6578b497b698970736af76fd0ed8c32c9f60c6dcf451ea4a20ac227fee30565d47b275349fdeadd769bf7deb2
-EBUILD opusfile-0.12.ebuild 934 BLAKE2B 3fefb2db80db74773c3841d46e68abbfef0418515b814cb776ef4a4429433211cfdb08926cc36087f50bd1fefeee5540ac59541bfc32e0bcfb7175a051f3cef1 SHA512 f7b71e9d2a8a39ff8fea0fbec5e7c11d55a142a93cfac9e8bebab2cf4e1477f1fa33a9c8149ef6a7f55e1c1eaf03ec8a1915026f7207cabeea8e8255a06ca6a2
+EBUILD opusfile-0.11.ebuild 975 BLAKE2B d1d45f642892ec7cdc39c69a996f4bb47fc75914b6aa29602465f6b0191b2a6f22347b5c57b96bea05e8b929e547b9583cee725326b749d77a97be87a276da4c SHA512 75481cbddbd7d962e2bfda4ae14a41f367e6e8c3384998e314c5853abc584f7b2d4f183c17b4c4fa1f903c210c904828058d7212f1a6870117bfd15e63420c1f
+EBUILD opusfile-0.12.ebuild 930 BLAKE2B 890f8722a8457520bef61d7282b23a8b79d25bc91ce717af81256dd79f7398237d19f6a7caff63d3c85e77300761689662249df3df3cc9081d1a1a093a2f3dc4 SHA512 8948b3340eb5dec762eef0d7b6b92c411921d63066d882286f2aade30a3d357163c08ac29e66f2c2e6c81b2a504c6404f000fecfd5563409c100c6d66971ed6c
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 030f705e9832..f8f7409434ec 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/opusfile/opusfile-0.12.ebuild b/media-libs/opusfile/opusfile-0.12.ebuild
index 18795c965e1c..835914262b87 100644
--- a/media-libs/opusfile/opusfile-0.12.ebuild
+++ b/media-libs/opusfile/opusfile-0.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index fd98ff1863c1..560cd26248bd 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -3,5 +3,5 @@ AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r2.ebuild 828 BLAKE2B b27bddb3996feb71f6f7f6021e8507e974e41d1874139e3f13fdf9c1ca43b628debbdf999857123c3ca9151ba75262d4cd8145dd564c6200d0496df85e7fa7b9 SHA512 ae4958b5ff7ee436565b4ed13e82804a26800ea2fc789f9ebfa1269c6b79bb589ce77cae206c594549893076b6a544a4233e8a6f3d3d1c19c525f042a615f24a
+EBUILD plib-1.8.5-r2.ebuild 829 BLAKE2B ccf66bea4824b818c08a421975d5b89dfc9403e36504dddd66b41b0119e47b70b30cc1727464ff9545e591b0a3cbf679dad89048f634173e15ef190d5ac31c86 SHA512 9c2810449ce8aa529a360dabbaf7d8bff92dccb9def0bff12cf3e580517e0c297391e3a32e0009d93bfd2b806e895761b96b4fbb94adc521b56294c5bbbc6105
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild
index 3e94919f26f6..8f5e07ec690f 100644
--- a/media-libs/plib/plib-1.8.5-r2.ebuild
+++ b/media-libs/plib/plib-1.8.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 
 DEPEND="virtual/opengl"
 RDEPEND=${DEPEND}
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 0c689cf9ad2c..cd87fb91e3b6 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -4,5 +4,5 @@ AUX plotutils-2.6-libpng-1.5.patch 579 BLAKE2B b2c4b5f2fcae4a44f6817f61d92ba0462
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r2.ebuild 1948 BLAKE2B cfdd285b014f4224327d00868a11f6bdce5ee4764f4aa044603a316a5629f07ecabcc71c0780f57a8857dd35329b9c4262fb26fe247860ef938e9181340823b7 SHA512 a8872ec92957124f5896ac054362c2ee6063a2aea9ae5b991f87eadab5baf0bd54412018dfddab2a51bdf866a54f7980029b3b7eea7235ddfd54017208fa27b4
+EBUILD plotutils-2.6-r2.ebuild 1949 BLAKE2B 040a1479cbd428285a62304161539e19ffffa04a29bfba58849e4bda4eaabd5910e838bde718662d12233004f1a048f5b7dcbb70822d6a78691666cdef616980 SHA512 7380a537c772bc051110d3d0fa14628ec7664c8835c216ca5369fd38553c744a285153b52821137fa06f76f2024f866033d5eab7cf51382b8875134acd1edf81
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index 19f52b52bf56..daeaf19ac6bd 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png X"
 
 DEPEND="
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 1700ac22012d..71e67b844726 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,7 +1,7 @@
 AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r1.ebuild 1285 BLAKE2B 319c55d024d2ae68eb5f2b3a93c47c999ef5eed32d9836f5a96812a44a719b0243018d0688231afdbe1bcac92a4d3d60fc2b2f51f34205e9da0054d4b3d31629 SHA512 afb626dfa7b4b2cee075aef3a6c4a479882bc16bb79747f8e0f47f15537de6b8f55b523ef18b557609a7f4eb87b4d2ae5d5ea62089a7541778e81b2a62f98107
+EBUILD portaudio-19.06.00-r1.ebuild 1286 BLAKE2B 449dff6cd1dc31470c9df4ba136feb0ccd12b68e4a5e240abaee0e3d53bda5b7e1489ff53152f4a61a9a987ee371685d189b07274744be1401f46eeb0dfab3b9 SHA512 5a8cb9fc3d689d41031fe25758c97d07ef4415cc65f72f9724822a6189f753584576cdeb6f2b3acd6ada5181083a9d4ee534e8673a785202439ef30ea985c09d
 EBUILD portaudio-19.06.00-r2.ebuild 1531 BLAKE2B 581984a97619f43f1a92091021bc3b814d3d9484ff4e50ddf4c4f971ddedcd090fdcc57287c415a520cc60527e05f46e52f7f59503f5883a8e7523a2eb340bfb SHA512 1fa626365aca15516489cb564f8014267dfba7ee0119821e96c860e6e76d5bb1c91afe0a9a8b74bb2a86b19e25b7b2e9504673e6056a4e42093c1bbff4e71307
-EBUILD portaudio-19.06.00-r3.ebuild 1650 BLAKE2B f3769c0948f6e4a2c40f7ac4ac48bfd62b81eae2cd4381d64a15a9745f60a4acfb0cb410894b1f06a9cc8b4bb997995d55547401a7700c53e4724c1d3c350a9e SHA512 6640b50b0041de0062e8a8872c7407e20dd219510e682321af122fe8c3d68fae3c122f9c089d67bb720679b7c44dc87287fc0e62a0334fbd65924e6c35ad848e
+EBUILD portaudio-19.06.00-r3.ebuild 1646 BLAKE2B a714cf1b94cd25962bde429e48065cdf69cc09cfaa7ca2ebd23d691898929d0ebc926c1eb9a65a98d3ed4c5215a7dcd8705765e6c4189dcf5b79595a978173ab SHA512 33221c2696bfc05619bb8c39e4877beeee21eb49d650c9b9a89c13f3c4987878a42cefb0f63ed2786d584dae1d25c0cc73e0eaa30fa527681f0f15c2f3480064
 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 6f7c43db301d..e3930a341f3f 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
index 5664a73ea98f..fdc4eb6bd0d4 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
@@ -11,7 +11,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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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/portmidi/Manifest b/media-libs/portmidi/Manifest
index 04c5ce791221..d0cde985bc92 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3212 BLAKE2B 26aa2863990e5875fc2b508c282077f908fd09e95a4d94c2047305ddd5f8737b559225dd0d700557927a6940211c4cc57d75c239bbe712446fb9687e6e28642e SHA512 6e246262678e0e84a801aaf1e67cb1e2592347dab84def2addb0f26a11baff9d306c7f4d96bb31b075e5886f280c5f08f0300c5b74e0f6763e416c9f74fdcecf
+EBUILD portmidi-217-r3.ebuild 3213 BLAKE2B fb850ebfcefa7a22d025e29cf9c3062d2c6751a3d5d0a633ea65677de6dbcc3e6528bdf4d26c126a76201234da3662cfb0a4ab8f6591afe86066b59984749c62 SHA512 49dd8f34050961e85314e5f2fcab131ea6ba755bd186eee1e27a98a9397b3a6fca055c8781647a02a0651babfb473e2f70dd3239593ac7bbc3970769f62f304f
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index 64ede18f90a3..d6cdce8febe9 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 840b6217ef66..705ca78fc042 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,5 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r2.ebuild 1644 BLAKE2B f50c6e49ab654507c0413a5b87a1fa0ecafc7a19a8e3954bc8684e0602d1efed64d5d04087dbd34c51cf546e6b58f54b47b6b92a94e4f46a8ccfb1e736cdf640 SHA512 8177d2fe097bb60e90bd635522db896b6d27a7a145208377c21d4ad07836b2fdb11fcf7197a9a45c9af911696b2352266867585ea2dcaa368e750943fb3d2ed5
+EBUILD raptor-2.0.15-r2.ebuild 1645 BLAKE2B 031fa44703b053e5fddc11a0b779b5daf53e2bd01389664ac591e194d2e4b750ecf19cbdafe4a8ecfb49a847a1137b56b4c34c9166224b81eb801fc3d0c0ca1e SHA512 e1c93b0a58baa9245b28d66168b9038f5f744d752500df2da69459b6f628f47c71a814bbce8c105063919ddc21b588b3baba38d8ea838a8247b8c4284b21a938
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 7e4bf5d393da..f6c647face28 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index e62a4b34f9fe..3defca2d3a7b 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,6 +1,4 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
-DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
-EBUILD raspberrypi-userland-bin-1.20190709.ebuild 879 BLAKE2B 312786fded4a752e8d2a7252f9fa487e52a1bd8954a213c5e864ed4e7ba6cd76e06e1c2439afaa30bca89c084565fbffc2241ed067f9b69ddc2eeb64eff8ea4f SHA512 f453b77801bc519f69b2a332f0a029a3b9345878c63ac13b5ebe818bf90b16738cc001b4a5a01fa02f423e868d4603f30e8b298081d00877d2db19a4b5ba6842
 EBUILD raspberrypi-userland-bin-1.20201022.ebuild 863 BLAKE2B 93a8fb6979dc8916f73a103f2591382f541fef829f8cff70e11f3d0dc99ade47a2a2aa67dbc6a87dcfb16633ff0f8e7d7468d5c08ee10e9f2ac69b80841c8d12 SHA512 2731ce73606bd16a94903d4a44adc5f1f13f231c70e7616195e19403bd3eb8c6b8177a933772095bfa507d190f2f131b850062c10a91f90fe68a95fadbd67f67
 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
deleted file mode 100644
index 336f6354c109..000000000000
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Raspberry Pi userspace tools and libraries"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-MY_P="raspberrypi-firmware-${PV}"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="-* ~arm"
-IUSE="+hardfp examples"
-
-RDEPEND="!media-libs/raspberrypi-userland"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/firmware-${PV}"
-
-RESTRICT="binchecks"
-
-src_install() {
-	cd $(usex hardfp hardfp/ "")opt/vc || die
-
-	insinto /opt/vc
-	doins -r include
-	into /opt
-	dobin bin/*
-	insopts -m 0755
-	insinto "/opt/vc/lib"
-	doins -r lib/*
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	if use examples ; then
-		insopts -m 0644
-		insinto /usr/share/doc/${PF}/examples
-		doins -r src/hello_pi
-	fi
-}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index fa82100df269..ef02519e000c 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,4 @@
 AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3
 DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
-EBUILD rubberband-1.9.0.ebuild 1789 BLAKE2B 70ba2c20e0d04fbdb0068b9dbddab4f3dd8f6d8d0a83c67eadaa564139eb017e8bde6ff67b1678771fee5c47c960fc143849494ec1a4beee6f3e7049f7a04902 SHA512 fc713cab853d49ccb554a22179e5cfc9f6df396cad558e294ba41da5873a5b9b480e4cad56da849b720e33b0d8b00df76df6126e1175e3770e8f5c457f571639
+EBUILD rubberband-1.9.0.ebuild 1790 BLAKE2B 24e0049a4d43e50ee0a6f7daa723649ee0eca5950d077a8346ebb52dfd9e27c32683c72bad74f052c599fcf7ee9719ad98dac584cd7288a84e97fe0871718cab SHA512 71a2a8c41387c86f250e5a69031c2a5c267daf24f5eb4b4b7f5e3d72014f5000ba5ee9620e249563b593bdef7509683693f9a52fcaef622894e094211e8e0e8f
 MISC metadata.xml 415 BLAKE2B 316ab3a0d89221f5db790350e3d6fb609656ffac3ab36ab1d53b1ea56d537005f41d5d4fec24e14000ba8dd32a094da7d05c1e814fba77bb4e209599129c685b SHA512 7b34bb720df7941a22d174b9f83407071110c9421b4207471f44a74c1bdb5cb6ef7b085386277c3d1f852ba48fc749e665337bc5d3b9fe862e76378a6d7ad4a0
diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild
index cbc15608cb7d..3a6cfca0a2c9 100644
--- a/media-libs/rubberband/rubberband-1.9.0.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="ladspa static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 4f81d7752846..a0469caaafa3 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,5 +1,5 @@
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
-EBUILD sbc-1.4.ebuild 874 BLAKE2B e0fcc96f4f35ab375b19f3b325ce27010186792d6c9081aa7f914eb5d9d66e94e81b8bdfc7b9182f06d2fa8532dd4866469385bcc5bd829cfb4829e292550d61 SHA512 69c2f278d7ed25947b65f5a5acbf783336898d51a0df83c576b7a346ecb2230cc90157569f303b9e82a3259ce1cd651b21d896e37b99dec2f7a46acbc4599f16
+EBUILD sbc-1.4.ebuild 875 BLAKE2B 42fddd2460c78eb9f19ad8d9f8bcbb8c85445aba1047f74e31280650058d30cc8446bcaecca6f2580c0d8645939bcdc858e59e9eefd15d093a0e864a1a633328 SHA512 f079230625d2221aa87ba9ab43ef564052916ed86ca9be200b71739c472818272e497129cc3bfbb351cc49f03731ddaf3baa7a4f0d57e596a6d240fb25e8d45d
 EBUILD sbc-1.5.ebuild 844 BLAKE2B 973696eaeecb53c6c062dbf5c5bde603ea16902d0b7c086fd23cfcb4cd41c0df1587b1fe09e022da75db46b1d180ff60dfe30f0cd0a420357591730c76839a7f SHA512 148764f8f823517a6014520b43a9d2732c67d1f9d939a0f873d457bc91b3c466e82985dfa2914ca6bf267fbc9f95a819e19afd5e563859c0c4d7d73cb9db475c
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
index b5c77ae683dc..9b8ceb6391fc 100644
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ b/media-libs/sbc/sbc-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 87ed89146814..9ec8df7f324a 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1555 BLAKE2B 48dcc45420194590c592e1aef1d1b5af022889d8495d078aee40e76305ac4e5ea0e0dfdf21989452ff0dfe3c5d41f21be3bf324767200c2c0db35366a42a5018 SHA512 dc8b6eb3d834d898e859b5e9f525b481738b7f6ce6b11f4f0d643338e8ea76e58227fba134bbdb65369892a2b2d0fe03542ab361538b011db319ed796250eb32
+EBUILD sdl-image-1.2.12-r2.ebuild 1556 BLAKE2B 397a9d4638a7e0a6a7d2395049d0199f2f7a3a36f65dccfe9e0c20fd37d2ac0c0da6cbe6d6931385b12ff5e32e9d0a7f251e6dff8ed0e46f4ef6e0144b493743 SHA512 72500336f6b5e5ec1cc37e1fb3f2330fa8f07a28c5bda8b4c6648611984b1abacbada4dd0a7cde9c8c433182e9b414f961e9869b217ec522f0dcd0a6529e56bc
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index dddcac22bc62..b36388c1a9d4 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 8fb5269f8c98..04b0675bafbf 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1238 BLAKE2B d70ebe277b493ea193a62fc728962aec587d994d4afc68cdd117e14ea54f04477476292702ca1571fac00e25aa631f195f87099e03a12c16c835ad2ee755669c SHA512 c7c88b863b1a194d2886a926ddbce7dca7b3e4d40fa360ff8092c89cf6820b4f2fe7ca7a9d321f77a03b5a4f0d20257ba70c64ec5b564a472ec01f53e80281a2
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1239 BLAKE2B 2c3735cfaa4503cc32a70424cb341dd88bcce28223f91ad4e06bb3ffea2e315707b715fcbb08efabc1a502b87950f539d88e6c3a64d5f7d3c4fa2519fdf69f8d SHA512 22481e7410fce094f23492dcc966719728582fac4394f97b9b08607a24b301692d02b19de49dc96525ef1f08ce0cf469e598b854d1a09fea9bda915edb3494d6
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 7770cdaccff0..be598a7c4c22 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 4d125b517203..25b17b9bd9f9 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
 EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5
-EBUILD sdl2-image-2.0.5.ebuild 1584 BLAKE2B 653d6e9b79c8906f8c03d39865c1ba0dd2da39c3f6492631c6dfbf5a2d5752f33b565a832483b0e6f701fa37efcebc2c82c93e5858e713b5f7ebf2bf6789ee6d SHA512 351ec6a571921e80b8c8c69b49cda21e8fa47f43295806117ea214d60e0f3e5a8bc8036b6cad4aee2d361924f8e182e5af3058fce9b5feb693592f79a9448ac9
+EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 24238b783885041ebb9de56ea9be3281dca5dbbae6f9b16bc38a9974f579ce782da76146cece2df7e75dc4f59eae131c303999b6983a432fc464e36ba37a6ac4 SHA512 c82415323ab8efa95a5b79c4ef2f89deb9577da201d88a6c946d0eb4d09381c1ee901fc404cf4839db7300529074e5e3d87fec356aee161bc65adfbef6130435
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
index a78dc03bac3a..2989d03dc40a 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 2031cb5b2239..b51332612a2c 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -2,5 +2,5 @@ AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066
 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
 EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
-EBUILD sdl2-ttf-2.0.15.ebuild 1005 BLAKE2B a7f2a9466f2d350f0d3791b4f73438aef9573eb84a4a83cd7a6842d581845d04a10929a6764ec8f1004330ece1320ac2bac03d58a0aac164e93824a184ded201 SHA512 97641eb0996cbdc93d1536e3f1e670ea5e7d5eda0c3a951f23d8a5c75154d1f10776d415bb5e2d89b1da8d1d45f01731f840f015da83a44a3d2d094da1e250ae
+EBUILD sdl2-ttf-2.0.15.ebuild 1006 BLAKE2B 094ee32c485d67fc19a98f1d9697d656e4b037ed0c9474fd56341d0641b7fd19a60eb22cd159b04009de559d49038e9777cc2730b1375325af23da72be76b43d SHA512 be39cfa034f6fcd1a052eb3db609b96900b986e6ccf52800fd1bd8d8c5c49b8140da395d353db6700bd20313dd2a7dcf4bdf0bc401f04fee849607b89c3d4a4c
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
index 78b516456a7e..03758cf1562f 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/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="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index edbc9ed69cb2..ea49eab4be02 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2066 BLAKE2B 6ebfa4596f30540d8dced9b86a0f394c36ddf9f9b8f590a42b4662023acdb244ead0e3607e332bb72c239b8ae0156461043b7a0590fd48560d42dfed7b14bf58 SHA512 885182fb55638396cde587a539d262cb98b80324485c39da93510f0ecca06a250b2154e29011c23b63eb3bd1c1d558fd0e9f6aedd957fd3b1a30f6c3dd7141f3
+EBUILD smpeg-0.4.4-r10.ebuild 2067 BLAKE2B f6ddf54805a2c2ce1ec21ea842ee0827c81b60a0aeb3123e958fbc68473caabd435aa9db85cb7618a2e057f970ebd7fda7184b200ec681abcd23f92d01e0c55f SHA512 2a3518dfb30ddeed12ec3b25cb44a3f1e4a2f87c947c66013b99e94b24db089e04f518e0e60ed241a23fa5ae7623b2a205110b74acf6bdf956cca5355951d573
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 0669c52959c4..0952de8f1b64 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index b0cfef20bb52..175e57b02f90 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,3 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6.ebuild 2007 BLAKE2B af6d226e8e40a84be7de1b4c066cc681c78dc466c47f69ffe3792f9bd45b7a024b94704011904f41ee657182256acd766b277d9e71d9b64332dcd42c0778f29a SHA512 dab3ee85736a468f1cdcc7ebc606658f2d1b7d76028e547600360dfede15d40d3e48e35984ab5b89bfd721fde476cec04bac3038d5a69ee975f939be2b519a36
+EBUILD spandsp-0.0.6.ebuild 2008 BLAKE2B 35b8989abf82705f22aade783833e51c4e123b745f0a493034f63456f5270f032916c0938aaff8080dcbd61b1c7b16512966f9a17b428694b4b9d9be3e30dc78 SHA512 0ea943f719b67cf2dddbc4769bec04b3101254531d116a800659dcba99d00063c55db5b4893e0418b85c6ebdaa3f66110d13042944b340fe699e000c011c8dce
 MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
index 5c8946bb5fe2..26ce3e472a7c 100644
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
 
 RDEPEND="media-libs/tiff
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 205af35e75ea..961f6cc26649 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,5 +1,5 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
-EBUILD speex-1.2.0-r1.ebuild 1641 BLAKE2B 5aa08d9dc5a676c1887d2e062f2c0f679fd89fad5f9360a2c2e0acc77c19622717f652c5793b2f0f1fbeaf514941240974490f661e5fc70e8e8fae66f7996f5f SHA512 298c786b759025d3752338bd8b115d3508febf0bcb0ace2daeae6a27bfc8998445e1355dbc7513a5989c44dccc849506ab2c56db5f7c151a1b083c0ede74138d
-EBUILD speex-1.2.0-r2.ebuild 1653 BLAKE2B 49c6edfbd5a26681f534804659d295f3a4bd407dd05b893c34841e4b1e21f80f6ad92aac4c158c7aaf6ef9156821e73dd829c412f7a5085c0233693dd8acabd5 SHA512 403e997aa639b8143572aa27fe5ac14c4c16c062588c06ca71933f222bc5b38b90a6275b95065130c036197752c37a393a0d91bf409020ba491764294d748ff9
+EBUILD speex-1.2.0-r1.ebuild 1642 BLAKE2B 24a85880616bf5f9cb9a9f95edfff736311089fc999b83af73f483e0484cfffc69ea8f2bf1ec31eb13e8376f92ac2135ba91979507871fd1f749c38e99982f6f SHA512 b95511ab9aab45284bb57a97493f0e6425739108808d5ea6fc059756abe7c6fb9e21317fafe5beed44fea46f8078d860bba9779b45c4fd652e8c668f01599091
+EBUILD speex-1.2.0-r2.ebuild 1654 BLAKE2B 102f56c3b8f176914d55d48c6392077f6ffdcc5afeda4b9ac866a5c43dc895ba69c41aad6aab23b18b395c621e1de01708cd1e897f8bafa66a4d3142c9ea34ea SHA512 e2a87b73f1216d3d6a48c19e356a2b9d4d9453676acc4d4d08e7304b5116a3d454bc971c7476e4ea38551880105b766813c3d9738dedb7031629415743b2331e
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 1ab221fe3f63..341b33f9e000 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index 4a46ec58cd0c..c6d40ee3ccb8 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 38c53cec9cc7..695e09722e17 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,6 +2,6 @@ AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1464 BLAKE2B 9746d51418ef2f7043c14e8a9e7c2e278806deb2a69e4a23af0d1ffb35c1756748fb8beb57cea176b0334977d0d778eea2eec2291706dbe824f10335dc278e5b SHA512 aa31f8b6965be744dc03017b4df4ef8feec264a59e01f883ac8935df7f14765b74730b6cd719e16e73e994b2192748deff66ec51b69a91996eaabce51ace2488
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1462 BLAKE2B e5327ecbe9baea69d8659d4a0f291329d10a9bf8c79876cc199d57fb6be28dbef3cc49be1253daef36bcb86493b3a46df2de8dfb42ea63a1e8baf2465d316feb SHA512 73a7665281e8d5c6b92f3da2642c8e31d879d165a13f5f0a3db73732684ba0c9e1add7919a5d3fe4c91d2a1abd2873118b94512148f186a350d364dddffd012d
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1465 BLAKE2B 79983f70ef6d952c2457b4f66dfb3e296312330d2d9a5473fc64dc61ca948bb361cfc9e83df19801fda51ff64c81b60ac9cf8bf90324a3a6010db7490ae98b97 SHA512 54f0bdb6f89fb681dbf456bf6f40a0dffe189eb6c88ce5cee98028c7901bc75f0df8b12826954dc0a9df7ed676b914b2c1949ed0b4cb1a648d21d2dbc1d11a85
+EBUILD speexdsp-1.2_rc3-r3.ebuild 1463 BLAKE2B 457eabce7049a8df49aada2424b3dfb492d02ccb4c2096e1b857693a227dfa45ab530902d69b5847433e63fd1d96d1253ff9b1dea736468de1d545c018484ce2 SHA512 ef11f99e2d007e0ef992db48f77fd5f2d192b9b519ca387c554a17a242e70af422c1e21caab5e984dbd1579c0515d3c308934cda73751f41c41639368d086d58
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index 262e7f4a7730..277bc25c4a18 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index abc7431a1101..c529f672be52 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 4b30f9a7e3b7..312b8be7637c 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -5,5 +5,5 @@ AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r2.ebuild 1807 BLAKE2B 6f6ac23daa35576b7ea4e0185323d318239540b0d96adddc173e8a9f0cb6224d0f30a222d8e99feb371b8487df7522b2a80a285176a84f98a8420be9c0f0882c SHA512 ff1bf9e63d4d22f9cdd1b8b091eff45aa5644e8a980f89fd02910b80e1429248546e803b266ab246396b88e6cc98c3cf876436c5f603c3a993c7e8fdb65eea7a
+EBUILD t1lib-5.1.2-r2.ebuild 1808 BLAKE2B 54c518b6a525d336e7110233de46dc58ba09a164f696bb2f0d5e59f96b56e8bb55c74aca1171e0b9122a6073f6e1ecca799d16b64c18886addd35cdf0252fc80 SHA512 51ab15f793df26df5bf49abd4ea1c7b1aa85d6fa563e9465308dc26c18931bf6e11b6ab930d8a1324a1f8aa30edfe5ee61ec8d459ba477004f4ee8dc26de98c2
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index 731b3110d63d..3c3e36fbb46d 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 0ed57b40cd8b..7e1bb16a80a2 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -2,5 +2,5 @@ AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6
 AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1327 BLAKE2B 2304ae98d6670be27c245e3ceec71b0f8f73b5965e6874f16030ff6b6ae585f66bd9235684affd89847900dca5a3e8c0663baa7dbaa8eed550152325c1307ab7 SHA512 1b3c546ce8397b53153b32d43a6d513337ab4f79a346b670ed162d61254a75d3ea17e696fe3d82aec2b4098cbfec771f70089a3801e1a069f8b7258cc9b44483
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 43e1d33fa7e6b77bfab239ccfb2ba01c46ee9feb9977839e8525ed465f7c3eb4d4f1fdb61c6885d7873b76fb7cb6057c5c68ee51a5079e5852dcf98c24f863c5 SHA512 477b4ed7c0665740e450c346e9b5bcf3be976181490ce443d10aed7bae1114984848342774a2f7a2c3cec1cad006ba89d7a361c2cf4d4e84eae6a68b5e25a982
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index 9f2da54374af..a79a5c9b8e23 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index b1e7e50893bc..5543d32e1f8b 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,5 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
-EBUILD tiff-4.1.0.ebuild 2078 BLAKE2B d2e050f9cd2d476534d583b920405d64bdaf0ed8dbca65f34cbcbee76f4a402ffe70bb10683bd2e26381d6d42e88e606bc80a285a25e71491e74bf45eda28019 SHA512 e87617f33a745bc88675157a77622525a7c78c7527d6e67744217320a3111eaf1dd3b37f2d2125b5de9f9416703621d8a690368fe7f9c7ef02a6568d07bc8d68
-EBUILD tiff-4.2.0.ebuild 2087 BLAKE2B cc81205d05fcb47145c1132e6b9ac2a1d8e2bfb6f7cb1a7f538cef67df5b35db2d5a0547b186d89d9a90e685532dc9029b0da8dc7b359673893c009d7e0a18b8 SHA512 cd25c17e934bb0a4155424a7f88d1db2ca1bf5d5bac5b678d90d307776474e4c0451fe3607602a06e0200ad0e779b01f81b223a2501a76d846ec7a8c0af5ae8e
+EBUILD tiff-4.1.0.ebuild 2067 BLAKE2B 83ffce8986b694acd48cafeadc924283c749a1e7d50d5adedefb2fc78d0eafeed711c29d2b1f787b2db558e0741a4400c2d316ff353f82961bee2f2dd97d3989 SHA512 293b3eb402c0c91930b62d98f38422d7ec851967dfbaa10c3c5141b5c6cbec3c08da7a2093d0f7840932455c4004a51d8f28ce0fc793432a4757e80f83b1f774
+EBUILD tiff-4.2.0.ebuild 2076 BLAKE2B 5102db0af8ce91de447aaa0c089ea330e3a5a214881b0711f7e91a18399153e1dde2e31024812b46da1e2ea7ddc94a72d5a208badf65138d4a0cdb14e139a4e7 SHA512 bf71bdc5144d3a828d460499f189543e69ae31e783147a40884d98ddc7ac486d0c2476635738682783abb3cffdb1cfd69ac0f6493c5a2aca84985f57036d8e8f
 MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
index 987f758314ed..689ec492b499 100644
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ b/media-libs/tiff/tiff-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 0b3eac297a91..50fe86d87d4a 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index d6c94603edc8..33bee3c6ba1d 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0
-EBUILD vamp-plugin-sdk-2.10.ebuild 1706 BLAKE2B 26de3c8c996d4fcc6f27ad731638b35caeeab630ecb7da5675a3e779b9820a70c4666181a6105ec922b8e12b2c3808e40f0a1fd2118c50ef23b4910a420ca51a SHA512 e76d38037a41f2292b061f2859ef51c2e131aae3f17440d4a03c9fe3c7e16285cb04b9f8d1a546d6bbf659f21705a2ed3119dc0bcd9cace4ec8986e473023d84
+EBUILD vamp-plugin-sdk-2.10.ebuild 1707 BLAKE2B 9a4f2a71f35141d4e5da11ac8128a21980349c2b51ce99a3dc6fb89726e5e66ad63a089eac9ca5cc3e152df3c690a1eebb8c95e4c936d0c84553fd16fc7ef2d4 SHA512 0ed16465a1018de572c3793fac4d4ffd940cbe7ebdef43619361d8a448c77c3cab96f2f0f2915c8ffbc7d1127107c326152a6ad1d56841cd1b39fad5ca7b1960
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
index 60194e585c58..60acc9e4dd18 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index 47fd1c5dd1b1..bf2624bfc2ff 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 1063 BLAKE2B b5d85a19a7e4e67773112c6fef92abff53cbcfb6865b2daa42d2ea7e62f9df7039a3778996af537ba8b9bf3914076cbc0f8d7f978a75bdd33f0f04c3da93a93b SHA512 bd0e5520eda32d4801096cceb95f2ef5cc38e892e30716262bb863df00011ba7aa7e5c888ce4596f9e088b674a09e4723b86892e4cfb130ec8a8729bc7c9f7b2
+EBUILD vo-aacenc-0.1.3.ebuild 1064 BLAKE2B b63e171687f1b5c1432d3bd7c627c24bd4e387a026aa596c1724e1cfd762cb89435683eaf1f4055a15ab49fda55389f16ae3dc377ea3a3f962865e852222b48e SHA512 e23638578119f3b86b5bfec4367e4af9be17b0780cd41708dc3ef7f8b97c297a2e200a506a49e24ee622886fa9a6d59a899a893a72e0e7d450e943e2bd414bc4
 EBUILD vo-aacenc-9999.ebuild 1071 BLAKE2B f034673910f20d3638f4c2607491dfe913b099ac65bb856f40215ecf5131b22489f16b42c96b1804f353b592d875c9d6fbf4c7309d12394b6019fe5ad8ed6b5e SHA512 711fe84ab777dfb5ce1d098cdc14e31f518bcdea62bae96785be4a7723af60a5fbe96dd1d439f0c4ff0c9aea99a3852ad6207d3acb6a53a091fb6f271e1c7c57
 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 37f6be4cdb30..b69bfc681de0 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"
diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index 3943b6af8e67..c94277f8296a 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-amrwbenc-0.1.3.tar.gz 608936 BLAKE2B 7283ef12c40e25d768d9d0be6cede6a514fc881cd67185700c0afe4e03c97c660d74f28fccbad436b4067ec07be574c10b73f00a162195697714ffe0c127b168 SHA512 5f132f798f00ec2c0619700ab1ce456897792b45631af4b538c866636af9c9de5600af5f79040c41c3dc69c17cf4be7032139a9518a46a4276431e091f3dd6a9
-EBUILD vo-amrwbenc-0.1.3.ebuild 874 BLAKE2B 3434b67181945cc3eb543cf258041f4cbb57934d6082b11240638bbda23747bd10f54122b32861bb148eedb1a7a99baa2feaac5a16b06be377f72301cf4a29e5 SHA512 e1acd090942f465dba42c7441405d3ce6d812c01774d3fba3f613fafa1adb4993dd8670d1ba13e60d65d04d178b7eb8a306cb20642a672bc7b18b1f11240cba4
+EBUILD vo-amrwbenc-0.1.3.ebuild 875 BLAKE2B f4625cd2998a72c9ed2568ef08bf1d9ac67058fc5fbbb2780cd69c401c348b816f46f1ef5c79a92091450788d478c2eb25f7f5cd7c25d13b32f39d76f35419ca SHA512 8f420f0cd155f4fdc07b10cb18a38aa531dc9d20fa055eb711a5e3b11a6e9eef8e992d072c8c578b6a4d2c9b4cf21743bd5398e3c2b568214d20739d1829343e
 EBUILD vo-amrwbenc-9999.ebuild 882 BLAKE2B 3a780e442e889b3d613488a1b6ecd568d94d31fddc594fab3e6c6da4343c7d3375fa62c866774f9c1581d554f9fa95be29f30db5466d1972d1872ae337d52572 SHA512 33b53fa43a749f029547c309f46d96c5db2afdcd219ca2d13cbc17430c2f517ca8311cba43a59f5ab8d43caf62317d4baea59b930f4ef70fd26753bda0c595c9
 MISC metadata.xml 648 BLAKE2B e51d5f1ea7ae926d6e085eeebf7cf066dff76eba5e8ff611382093b25055f119f903eb7c8a91c28d04ecdb389a571072d8cfe6e2a456c243ec896c7bec877136 SHA512 db2c18bbf40481d5a3b2582ab07e0ace0538f629fabeff219f77a875a27ca6387884e5c3c8fc49916a11e53224b85f7fed28f4b8ec7921a0db15ee7cbd5ce951
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index e66f5895c100..80547d38819f 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index a970cb729d16..065107d1c328 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -4,6 +4,6 @@ AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdd
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
-EBUILD x265-3.4.ebuild 6369 BLAKE2B b476c34e45602fc01b3259befd48f20046cbf12b3bed72852b21fb8a31d7f20d63f89c31b5c3f9132a1c9c8ce58914139397a807de7d2cc6545216054dacf384 SHA512 310f626b73fd325acd2468e8b71f3192982401af3d08998e632767035949d3ff7da88252e766888eba24a946f4556b7b5ac40f9f1e4bc2b6a57bad294b8b2c5e
+EBUILD x265-3.4.ebuild 6370 BLAKE2B a3c2d028f58871382d8f2f8440bb8b3f4f88acd1573fbf319f7ffe786c4ff2ad007cde5e7ee5500ab297f3a69f3b3c1b0ae8f6f6dcbe599ef32ea5e000b6aa08 SHA512 2431ae3e83a6b35d709517f816b84a46c0141f411a9ff0435ce46073dbd280cbc92b2abeb27046d223ddc35c9f2a218982eafe78e1100387e60be2df6d64f47e
 EBUILD x265-9999.ebuild 6296 BLAKE2B f1f2dfb04c6667c37dfd2681570237364441f73cc7325680376d0aa805581ed722970ea8060b9e4fee7e34b21dabed95da2cdedd62f130cff2a646747a7298a6 SHA512 55b83ca021856960b849dd893ad34d3153acc93f389a2185492cea8377657027f9bd89b0ff12823763f4e34b4d19f6a51b2abe04dc15ab1d70793486262dfe1a
 MISC metadata.xml 621 BLAKE2B afdaa9cc6deae7cb65a9b3242abe446201ec8f53f0c19b866f63c8f26011b7f6f0ea5561ff56b0ea2c4832bfc5f6d95c14a8526f4bfaca2d7ee7fa807dfa1db8 SHA512 9862b540eca3b214ad9ba049c9f6721fbb6559bb00b82208eec63e05e81b1805e498357e8689be1b4042c51202030e4c62125599b0736358c4fb7e566dba1809
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index beb228bbbe55..76b1480fcc04 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 4aeb17523c8f..b89bd91105c9 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,6 @@
 DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
 EBUILD xvid-1.3.5-r1.ebuild 1749 BLAKE2B 524b85ade8e5b1102227cc13912f6162e78a43e4ba91d17dfb4240e5bb2db8762dd9ecb9605ed02121936038ad716f497b2a85b4fa78d6f894d881f413143c97 SHA512 3be60bb77595d630dc186942bd9786653871b175473c4fba5809f6804db45bc5394e2ea4827d3cfd25ff5cb77a2369b168df623a0c28e3b3e7e6e25927a7f3ee
-EBUILD xvid-1.3.5.ebuild 1670 BLAKE2B ce06176a07776e33b5a34b1774b1a2aafd0678ad85e5bc9f9e12611449aeda401440244679d8a00d40975d0adc9206d644798a86d2fa3c6b90fe2dcdb8d4707c SHA512 4b81bf15e6599c3feb608e1a7fece487c9e1f531cdb02cb3ca2a36af6516f7b94fe7f970ad7a02c63e32b40836031a0a827b7096c1d7dfa855c54838a9a7f653
-EBUILD xvid-1.3.7.ebuild 1750 BLAKE2B 6f5305f7caae6afadf61832c4008b1984dea4d67a0bb50b4311974b47e4b8ceb3dee21cad53096ea625cefe3993f15da6749f3871c4d8192b4dcefa21194a6f0 SHA512 5d8be6b1885097ebf7b6426462c6f718b553ef6002266a1cc794c49200255191c2eeb62e43f3309d41de702b83985d09b1cf472b37116a416248ba4b67342d60
+EBUILD xvid-1.3.5.ebuild 1671 BLAKE2B 1e0a92fabe7f932e3b8056132ed976183020a51c4f31a82e4dd365f5798e517cbebaa777c2bbc5e3f7bd9db5f6a7d0e7fcf02d97da818674130acf2203950586 SHA512 11c910115ea186c7175b1e4fc9a45d08a3524973fb30359a3c8135a834ce6c705f1d7f478316b68ee52579e90c8f6fcca750a6010759a3fb90a17a96ae310d80
+EBUILD xvid-1.3.7.ebuild 1749 BLAKE2B dafc72de747f4d0db3b6a8bceccfc67af04e4ab7db77d9e7a65805bc2d16b7c040e0ad0d8812ebb36730da8a519f15feb656daaf38be85c72e04c78fd5b2f60f SHA512 b647dd4403a4477f7735ae7615aed35e81f5eaa6cd88bd06ab8294a0c1cfc7473409929ad0bbf5dcf5e8b30a7cc43d93ec6c8f549c528a77e69ff391fe51a9eb
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index d8aad26db4b8..1b896fd798fe 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
index bfd41066754c..9149c76fa1b6 100644
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ b/media-libs/xvid/xvid-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 53e04ce37bee..d8d04d3906eb 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -2,8 +2,8 @@ AUX zimg-2.9.2-gcc-10.patch 462 BLAKE2B 1066a231f220c6c114447065b4c0ad97f38e48fe
 DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
 DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
 DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe386ade6b7a5c1b86db696dd50ff72ff40e1edbd38ee9a8a10dd429f207061fdb2ea326018396dfb92707053 SHA512 ae117399772d2c35ffa61b8cf5d156edf4ed65e9ffeb2e9e0688c88244fdd1a89c098bd842e3795b33fb0951da97f844fb6ffe27045e3234720f70f842356936
-EBUILD zimg-2.8.ebuild 779 BLAKE2B 97d1f82f229dd14f97acf6f3795e41a73f478be284846de2b43668486905f8c6a72a20c8f789bb6208e5d3d02a6456cc8e5eda170f6c9c67bb9d968d115b03bd SHA512 66dc003de7278b24ec293250746d0d0a32b2d35ada27c150c5b7d4d784b632f5d046a77cbe56393abb63f568ca4cf96e7dedcda4e2c53194c43d84a1950c4a5a
-EBUILD zimg-2.9.2.ebuild 887 BLAKE2B 084cd79a5168ce2e98b9dccc61aa707058f78ce3fd581dac91851c23cb37dc23b0af0f79a2c8b4272f6e31af667fee900c33cd4e6e1e4035ca2f4652b2c554d1 SHA512 43ef2e3164f76f8d521946f28c9edce9e78d8317955dc92e3fedf37183053369e9b0bb299a6182f1f1018d7b1505b0655b2beb0f54e57b8f09b91934c7652e87
-EBUILD zimg-3.0.1.ebuild 783 BLAKE2B 15ad8bd1c1fea38a7a367d497d6bcf04019dc53fdfc866ba779a59b59d7f59202544d9e68e2a110559819297e1684c56f8a716e1dfb55b38e576a694252a3af3 SHA512 0fd908ecd7e65b12d1012d3f1c1f4deff2c13d94a215a50dc756f9138f6402f3cc35d59bf785b0d851116868b40087941051e00201c3768f8dd074d70f0a1bf8
+EBUILD zimg-2.8.ebuild 780 BLAKE2B 669349915a2a8b6f40ce82cd229e97e90c091812cd2da6d9802fccb2479c55e2393a9fd4396ea893e777e0d0c3dcbc1c93caa018b67f983c919390a07428ac91 SHA512 d503c46a7ddbf0dcba73e506aa8ba925b0f1f4095c4a0d431462317676b0f7dca1877427aa49c50d1cce56b7650657b4fcaecc35b065a464e82884abe7c1255a
+EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d613ee779ae72114bc95b9e53344c8b2e75c1865eb90ee8710ad8c01cffdbc28afef92032dfc4b4d6721bf5 SHA512 51fcd2adae236f6083ac1ec669b78c8c4e190081d16d6afa2616e47980c20e41423662c4845b4f174f730c669bd30428f4088cb1fbe5fdd74506c07e6989847c
+EBUILD zimg-3.0.1.ebuild 782 BLAKE2B ff5573d664abc9559d019a068d14d312a92747255ec0f6be560abe59d2b534202b7c0ee54662309c76c92e331c39e9a9afa3ea0deef3f794c43599a778071d5f SHA512 aee920866a76890c515bcd96c84220df96e1715b67b44198cf95b631d933ac6031a89c307f382b63b394005392d1cdb0e916b1e32d9eb66168be4466ca2b1c4a
 EBUILD zimg-9999.ebuild 783 BLAKE2B 15ad8bd1c1fea38a7a367d497d6bcf04019dc53fdfc866ba779a59b59d7f59202544d9e68e2a110559819297e1684c56f8a716e1dfb55b38e576a694252a3af3 SHA512 0fd908ecd7e65b12d1012d3f1c1f4deff2c13d94a215a50dc756f9138f6402f3cc35d59bf785b0d851116868b40087941051e00201c3768f8dd074d70f0a1bf8
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild
index f03e6895713f..bbb930d05633 100644
--- a/media-libs/zimg/zimg-2.8.ebuild
+++ b/media-libs/zimg/zimg-2.8.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zimg/zimg-2.9.2.ebuild b/media-libs/zimg/zimg-2.9.2.ebuild
index e962d7a4b5f7..4342fa094947 100644
--- a/media-libs/zimg/zimg-2.9.2.ebuild
+++ b/media-libs/zimg/zimg-2.9.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zimg/zimg-3.0.1.ebuild b/media-libs/zimg/zimg-3.0.1.ebuild
index 306320548ba3..2e10103e346d 100644
--- a/media-libs/zimg/zimg-3.0.1.ebuild
+++ b/media-libs/zimg/zimg-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index ce40cb109dc9..b363745ea67b 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1302 BLAKE2B 7b16a8f5798c97311c047ad763a6813f99c3142caf8f3438b9e7256517f9f8b1866eb89a15cab22e0fcaf0b8745b3fc2c6ed0dcf761f98db00317f324b177781 SHA512 70428cb11d3f07b38538a69d967b8167287ed9b663cf54c350d8842cd2a710acaf358fc639c92570119139c1583051b9e95dcba948ec9260ec5dccb25ae9aa19
+EBUILD zvbi-0.2.35-r1.ebuild 1303 BLAKE2B b1ea4f7a5d8e98a5e43336c8d5066c4b15d4cc1fb13f0fbf1689ace8a6403889a769cffa20bd5561cb2cf7694592589db07f48ea53034eae118cc7dea4ea8259 SHA512 cb9979831b5d908fc0feacf81fc799417dbd2bcdf7e8b8c3fb661ddf4a5ec57ce2e369ab5d24ca0a3d7bd41619dcddcfbab2ff482c7042a5ae50f81bdc0c990c
 MISC metadata.xml 244 BLAKE2B 55571cd41428f715036d3a2362fed34732d4e7508383a83799d507ec234175db13ca329b3c7b53487a3775149a8f16d26ea027ce67eba4bd8015a74810082cb1 SHA512 af9d2d89aee60846c292c11e0b2615eaedac9dddde3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 178e1e41570a..459e9441d5b1 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-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="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /media-libs
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)