gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /media-libs
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
270 files changed, 1169 insertions, 2389 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2fd7f4d751e7..e9888c17b229 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 94b57e515106..fb49a2e6adfc 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -3,5 +3,5 @@ AUX a52dec-0.7.4-freebsd.patch 295 BLAKE2B a927fb15b6e7afbd52ebb75d1d99430d8d910
 AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bce240924e82ca1b903a308634b23c23acf59e606adbad54951da39b3c1c60cf95fe9c8bad87da09cb10894ac82de3e670b199cca SHA512 097f4f9cb82f01cb42e5536bfb4fa5ed6cbe85da5f4a31c19e83e1d1e73f8724a3828f0585834142f861bad3417fb9c55b21581def85733278870c3c48c2e8fd
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
-EBUILD a52dec-0.7.4-r8.ebuild 1445 BLAKE2B fdc5a4a25578dd3c7f6924b8613ee4ec349ccf94475a00f761554a7ea423b6ab342b5d72bdafd2c93cc2f853a8117e8b8b869f5f961602431325d20d2932c581 SHA512 159cf0c764796363ca591036ed86d0b6e5e7ba2d0ba577f035bdae0603a3600671a834f219d2fe967c523df13732496944fa0539637f4efc03f257fbba949a41
+EBUILD a52dec-0.7.4-r8.ebuild 1434 BLAKE2B b99e000ad9ae8b1e0d9969f31c4e0bf0bebc639c95d4cc3747269163b3164675b00a61620b3d5bb9da3655bdc836eeffa8e7b4369a18880a90ea957198243262 SHA512 8533aee54f58a206d05f34e00dde1a2a1dbeb4e657f7b432fc1dd5c7f84f07b347bf8aa3cbd3dd330ec7cd738f76bb3d5be8a3835bfd52b3e959d4717c260248
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
index 89766b3b056f..1c167e6d3811 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r8.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
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.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-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 ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 5b78f79804f9..4ec20378f452 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 1938 BLAKE2B bfa47d820f8913a17babddc10f4aeeac222de35305e86a3f147e7e09f9ee47d765d22afde9922fae668909f580779b909f7555eb89a912acd4072ecf9d6e7182 SHA512 3a75b914271043b8ad75641fb701ab5c3072318602421b34d02e91109d67ca14bc7948e7b21b1fe55edca4cec2440be2fa16ca041a1b96b4074449be22a753f2
+EBUILD aalib-1.4_rc5-r9.ebuild 1927 BLAKE2B 4d446220b6d9fe584d804dbdc526fb86f4f991680bf4161765cdf59c464298532f74972912139045e2eed1c82e85e32bcebc0ea5beb7f3dda83073edef33eda7 SHA512 9796629fd831c7ebcaa1a97a73cb2c941c8a353f2df661637c1f414749dd5d19ed02f3cace2475a27057c9ef1ba9058df4f04e433e2b38eec3c646e15d61dfda
 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 9413ec65bfc1..418f35e62be0 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.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
@@ -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 ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 700efc415cdc..90b68414ea2c 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,6 +1,5 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
 AUX alure-1.2-new-dumb.patch 954 BLAKE2B e136519eb210cc003f8e66a02a1023cd5c169998dfef99b2dcf3d46b6259a04c3c7094bd4bd892f92b4a53a48cd3ca6028da4163d418b31eb5ae5a9380270582 SHA512 27000ad19dbd9278fea67c40e037745b182c4b067b30d5853274b1cc4216813ba0d9f3e292e4d997d93b870cfc0117cfd1a9a2f5adfc77defb908765f3fd03ea
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r1.ebuild 1241 BLAKE2B fe9fd13925d2b52aaab8f145052db33486b132b7117e6a327f77d4943dad4ef5265014551fb9c4a9dd79cfc85793f5a8fc937e22438e74c78062caacd8529e36 SHA512 1c33711b317515a95dee8c1f18020982b27465a801c06b72f0a33c514885838f6ec959e0ffc226f855f19bcf77435c9d5d928e18cd9c4e91280ed26050cb10a5
-EBUILD alure-1.2-r2.ebuild 1273 BLAKE2B d7d8e3d8607c13543951a765db73cbb74c3c9ec497eb99c3cde399961deefe3b1728896111bbb0f468eefbf25453801f078e3246b36df98a6acd26161a87944a SHA512 67fcb3eec6625f6a5fcf344589c76819731d6b00b2df57aa20370fdf5496ff6d95288143a38cd206a26a8418adca5f56b53a1e739b61ac7a40f5a7ad99a06f51
+EBUILD alure-1.2-r2.ebuild 1271 BLAKE2B 78b5e63d87f75f2e5d2ed5cefa8c03e7f39d5c8f8bf228999924782ecddd1df4c53b90b4046a68b481241b7139ef41cf89546a579d418438732b0a27d72643ce SHA512 5463bdd152423375b20b8b5a392bb7a3e7bad6f6de3b290563eb3a1b27e909fe09a763d4c42c7a123ef5bac43e9f0a1c73a5d3ebcf2254a2eb18d3dc2fd2e8d7
 MISC metadata.xml 440 BLAKE2B dbe7f0e580e3b0c1b28237654dc06f8c3945ddc42ec690a254add4f5d2855fd1e60d0cfc91cf9ed62c6edd39bfdf9d2d75e3fc7fb6cbdfae3bac1e7e07026f3f SHA512 5b6106088e98c6676d01e02b99a93dc661eb24909ee8aa235e9506c18175fbac7d765c05ce95dbe085c8aa772d45a4f8f717657f281694f40ddc10dd83f1e58e
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
deleted file mode 100644
index 3053fbc78e10..000000000000
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The OpenAL Utility Toolkit"
-HOMEPAGE="https://kcat.strangesoft.net/alure.html"
-SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
-
-RDEPEND="
-	>=media-libs/openal-1.1
-	dumb? ( =media-libs/dumb-0.9*:= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
-	mp3? ( media-sound/mpg123 )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
-}
-
-src_configure() {
-	# FIXME: libmodplug/sndfile.h from libmodplug conflict with sndfile.h from libsndfile
-	local mycmakeargs=(
-		-DMODPLUG=OFF
-		-DDUMB=$(usex dumb)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DFLAC=$(usex flac)
-		-DFLUIDSYNTH=$(usex fluidsynth)
-		-DMPG123=$(usex mp3)
-		-DSNDFILE=$(usex sndfile)
-		-DBUILD_STATIC=$(usex static-libs)
-		-DVORBIS=$(usex vorbis)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/alure/alure-1.2-r2.ebuild b/media-libs/alure/alure-1.2-r2.ebuild
index 49baf11fcec3..c1299529395d 100644
--- a/media-libs/alure/alure-1.2-r2.ebuild
+++ b/media-libs/alure/alure-1.2-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
 RDEPEND="
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 7f76c08e498d..3631414a2e26 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 1398 BLAKE2B 4324f03206363cb88aaf5e9f449737d7bb47f0b7583d5ead7b6d53d9958efcd25f2d39f8d8690564e9e50e431753dda0af24729de6b3afdd30c47d7e34cc2dd1 SHA512 89c883ccea376b8f80a7260261d6fa1fc64328debab57455b76cefaaeb4541a3196445cf0b90264ae486a21f39a6d9e045235fa29233bfd030d4d7b2f6748198
+EBUILD audiofile-0.3.6-r4.ebuild 1387 BLAKE2B 2bb415bc52e875e82a6781f3b311afbfd9312203d2e832c3c6b7c4ec1d7ea1eb0da646f0d46d7b7be3ca73d7f3b2470312de479c8411f2b5d22d47723896d2c1 SHA512 1edd0f18e9345da6cd758456894aa0a2553fca236fd306df93c9f3a934f61fb3dfa0cf72ccf1da9df8738258f42a43bfcf9eb7bca83e7f9f21943b947577abbf
 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 ef83dfd17a65..f87b6e8b48a1 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.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=6
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index a1cdb408eef4..2456d226e149 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,6 +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-0.1.84.ebuild 1769 BLAKE2B 99dd5a1a097a3ab2debbcbce0ea8a7935211447c3d7a6caa8a123f7fa501d04477401d54d9615a7265335f653d296308da6bac847a054ba3a05caecb925c8758 SHA512 b2312ad947c665b29fb4a6564dced66f30e3196f9aec09cbc4c10c4d4446cbd2d29828fc4b5559bd42210a271c5798db443d08dbee7908851c2cf306ccbe7188
-EBUILD babl-9999.ebuild 1769 BLAKE2B 99dd5a1a097a3ab2debbcbce0ea8a7935211447c3d7a6caa8a123f7fa501d04477401d54d9615a7265335f653d296308da6bac847a054ba3a05caecb925c8758 SHA512 b2312ad947c665b29fb4a6564dced66f30e3196f9aec09cbc4c10c4d4446cbd2d29828fc4b5559bd42210a271c5798db443d08dbee7908851c2cf306ccbe7188
+EBUILD babl-0.1.78.ebuild 1819 BLAKE2B a68c754d5c98ad395b3d3375ccdd7daa9b42d3c3fc1ef927ebe0816dd2b4fb38b6962224b6bbd457d1bb6f5f06a086cc81e651757f023e6b6de6080e7c059ff9 SHA512 da47b65a2dfd1b81eb925f4076a79c5821512e683973729be8af0de9dae3640a26ffc0adac375b8b2b67cf9d23f06d8e20632353845a0460e25e3394ba231747
+EBUILD babl-0.1.84.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
+EBUILD babl-9999.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.78.ebuild b/media-libs/babl/babl-0.1.78.ebuild
index 3358be74af24..a0888f521ae3 100644
--- a/media-libs/babl/babl-0.1.78.ebuild
+++ b/media-libs/babl/babl-0.1.78.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 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.84.ebuild b/media-libs/babl/babl-0.1.84.ebuild
index cd9637db7829..a247b4053c85 100644
--- a/media-libs/babl/babl-0.1.84.ebuild
+++ b/media-libs/babl/babl-0.1.84.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 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index cd9637db7829..a247b4053c85 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.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 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 01a0992d7316..f0e364c4570a 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,7 +1,5 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
-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 694 BLAKE2B 1e8e0a842d057f3bb285349caa58594fa7b55eae9e9176a66455fa00b83d2dff16098726ed94d3fd8b730d7a3c3770771eba7ca31466903ef78888435a68db1d SHA512 248f4ecfa682762a20e7bcce62891580c5c7a9e8e1f286ca8542456cd1ee10a3e3de07805ee6f359282aea7966929c281ba13fbcfb0096ea30c7fce0cf311a33
-EBUILD bcg729-999999.ebuild 576 BLAKE2B 5fe0f10f4483e5873833fd05f8927622a63241f30f57f74606c553b664177f97ee84e287132ab0aff17bb315dcfe1ab1893d4f670163a6c7e8977ccbc9493e7b SHA512 bfde637d4a43ecdf4668188d0a2b6fc71a0a68cc7825fb260cc6034773b3e8a724411afba89bb7a6e74442f40370fc0f1cdfbd9eae9c2e45180bf70a286d9239
+DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc
+EBUILD bcg729-1.1.1.ebuild 1221 BLAKE2B 9d7bb232f5b2a2c159e74b6aec66d61566e893a16e9558868089f950e152d6310d75268866ac31f8de996e7fc249e33b108341eb66cef1355dba6bc8726372ff SHA512 199dc4599680259e836f86af3ed94db724dfb7bddd62d84ed249e588ff4a1e6ace63ef4c9929c21565e1b1f81e64656606c48650279c856c2c93b620740d66b2
 MISC metadata.xml 318 BLAKE2B f7971ede10d80284559e2a3a9dc9088ff06c588d993f1b0dbcb13667a10495d0390a4ebe2c4e65b8fca8d7369c8600e7f446beb280ce04ef66debf52c0f26ba0 SHA512 b2cd9ed908992ad45a31d4f15954385f5d9bfd7f4659330695aaab3b7d1d1dcac1ed56680c77ab786ea7454b8032fb70332cdd06a74f2e40c3162bdb6d4a0a31
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
deleted file mode 100644
index ce3201c782e7..000000000000
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
-		-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="
-	!media-plugins/mediastreamer-bcg729
-"
-S=${WORKDIR}/${P/_/-}
-DOCS=( AUTHORS NEWS README.md )
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index e724197e7cff..cf638a772cfc 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -1,29 +1,49 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake
 
+TEST_SUFFIX="tests-20210101"
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
-		-> ${P}.tar.gz"
+SRC_URI="https://github.com/BelledonneCommunications/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? ( http://www.belledonne-communications.com/bc-downloads/${PN}-patterns.zip -> ${PN}-${TEST_SUFFIX}.zip )"
 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"
+IUSE="test"
+RESTRICT="test"
+# Not all passing yet
+# TODO: Report upstream
+#RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( app-arch/unzip )"
 RDEPEND="!media-plugins/mediastreamer-bcg729"
 
+src_prepare() {
+	sed -i -e 's/-Werror //' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_STATIC=no
+		-DENABLE_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }
 
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	mv "${WORKDIR}/patterns" "${BUILD_DIR}/test/" || die
+
+	./testCampaignAll || die
+}
+
 src_install() {
 	cmake_src_install
 	find "${ED}" -name '*.la' -delete || die
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
deleted file mode 100644
index 5263aff5d73a..000000000000
--- a/media-libs/bcg729/bcg729-999999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-EGIT_REPO_URI="https://github.com/BelledonneCommunications/bcg729"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-3"
-SLOT="0"
-RDEPEND="!media-plugins/mediastreamer-bcg729"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
-)
-
-src_install() {
-	cmake_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 946fb4097476..08900880ac70 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,7 +1,5 @@
 AUX codec2-0.8.1-fno-common.patch 269 BLAKE2B 181d25b915a6dfc21450004e0da53a41888a04210dc944ec58adf8bab40b0216bb8a98c56f8cfcb74c88d91b18916ac05886c3471da92525d6c4bdba3789e55c SHA512 c3d691159dda7d9d398e182dc233302adddc3c21f2a2d1a92934c660021357d5378c7e17c4cae48573fc94f180d9ce5732b36e76363a74f738c9916d12b7f1b8
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
-DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
-EBUILD codec2-0.8.1.ebuild 711 BLAKE2B 0543fbc52ec2fe37b522de9941a6c29096b957dc0b306920c5d295f63f61b63bfd26b94bff62ee3ba916a2a97f3b01eba2e3f8a380a576e70b9f16cd61aae221 SHA512 20c3c9279ab95fade8ee985530a1ad5c6d82afdda375e02f4641cdf89cd810c34cfe45aa42bfd6bc85d54ff9d04ffacc35dcd3a5c243be7cfad69213ab868e66
-EBUILD codec2-0.9.2.ebuild 592 BLAKE2B c44ddecf5520c55cd79d0c9bd805d305774d7f967cc5c850cdb11bfbd79bb49c4e83c6b11146de9e44b732b20271ac99fdefb6fb575860374444accfaf84c1c3 SHA512 71118b635fcab2c31f99659cfc1b251f605da240502f25618a812f30b5bd81791e6c3c47c0af5da107547770a772a0abb1d87fb15854d729e60a1a894fc38d7c
+EBUILD codec2-0.9.2-r1.ebuild 671 BLAKE2B 526e1c54cc71b7f1700ea74d7bd6e9b922cb565d878f78bbafa73f97f6f63f798c53d9ca9d33000a9b82bebdcc1a6adc99d7bd0600f484da5025ce1d6726b74f SHA512 76b3231baf3f12383ece2889a7fdf22f2207329fe465b0bc3a47d848bfabb1a5a10e33788c04443406ffe146a464f2a2aa095370d7490f483ae6051cdccfc297
 MISC metadata.xml 325 BLAKE2B 8895125c208d04f4583087f7d5d6bcf5fb84db2800feb33ec8f0370ea2eabd36bbbf4914df33bb7d580fb966af35873bb39633d7248d9d69d48b8968a8f7776c SHA512 427760a65fe9d84a527287e815ff6e4f783bbb5ebf28fd52c225721c649eaab738edf090a6af72547b57e2c1a80fd616d8af1a2af931398819de748c4306c0b7
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
deleted file mode 100644
index 8dbf9acea974..000000000000
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unused-deps.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	if use examples; then
-		insinto /usr/share/codec2
-		doins -r wav raw
-	fi
-}
diff --git a/media-libs/codec2/codec2-0.9.2.ebuild b/media-libs/codec2/codec2-0.9.2-r1.ebuild
index f48bd59ad5dd..6d15dce3533d 100644
--- a/media-libs/codec2/codec2-0.9.2.ebuild
+++ b/media-libs/codec2/codec2-0.9.2-r1.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
@@ -11,13 +11,15 @@ HOMEPAGE="https://freedv.org/ http://www.rowetel.com/?page_id=452"
 SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
+SLOT="0/0.9"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="examples test"
+# Not yet passing, but infrastructure added to run
+RESTRICT="test"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DUNITTEST=OFF
+		-DUNITTEST=$(usex test)
 		-DINSTALL_EXAMPLES=$(usex examples)
 	)
 	cmake_src_configure
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 69bd1cd59760..f4e711192f97 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 1179 BLAKE2B bccb11579d98d4bb5594396a7c0e44b15e832e4a589f496d247d93e915b71782aefed34f9f6f34d4bb37d863e4a5d12f6f51df54e90add92ae7650db0e0c627e SHA512 98ec95a1b323dc3aaa77e0a5bad50f509e1ed99ef6cc455df51cfce74a848056b379397838290b6f1492c8f5107e906b3c48eccfac97d96901e96a1a96dd7dae
-EBUILD dav1d-9999.ebuild 1181 BLAKE2B 4438aac0f48b74545fae674b1a708e94d3c90e63e37195125f496b050b4c6f21bd52c06b5a743a1575d6f01fcf5feb34c4b371de536aa27f7dd85bd5066281ef SHA512 f7255074abf3124961d94a897413858ee8254343696902a7ec7dacad9c3fce368350ed061dc5b96c6ac3b3558dd9a3d789471f75c321298c1f8b3a472efb2c14
+DIST dav1d-0.8.1.tar.bz2 674110 BLAKE2B d1dc6137148ee59ccee727127655cc61310d220046f3f3367551153728a4057a92ed2af3298a7b099b4ef345be0f63c2c6d6cf8985fa84a9cb8ee3ee11f2738a SHA512 e882c11c4166a8ada0803a7f1f1de73b6d41fe94ea11300c89121a0551c04b6681e4e6e79d27753a990f7dca1723c35503eb1f02683cd4722db1ae055489e406
+EBUILD dav1d-0.8.0.ebuild 1175 BLAKE2B 043f3cac61cba7b31b92c3a4c7f0b6722444c66d3e0e6d82acf27841b1ca0003a816839e6a67eaf3cfa94f4795dd8e466d36c1d3681fdaed85a6de9615fbf779 SHA512 4624d5b50cb6fcb27dd7168efe7ada23f431ce7d575edc81e111488df7da4beae7d8f098332b26a19ed6a911e6b3891f10c4cd294a97fb244d24c271574936c8
+EBUILD dav1d-0.8.1.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
+EBUILD dav1d-9999.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
 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 4f306cb6db15..3c9afa7958b7 100644
--- a/media-libs/dav1d/dav1d-0.8.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.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
@@ -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/dav1d/dav1d-0.7.1.ebuild b/media-libs/dav1d/dav1d-0.8.1.ebuild
index 92d86ac5f998..38fc32f1023f 100644
--- a/media-libs/dav1d/dav1d-0.7.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.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
 	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
 
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/4"
+SLOT="0/5"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.14.02"
@@ -52,6 +52,12 @@ multilib_src_compile() {
 	eninja
 }
 
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
+
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
 }
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index abc2d61dfe39..38fc32f1023f 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.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
@@ -52,6 +52,12 @@ multilib_src_compile() {
 	eninja
 }
 
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
+
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
 }
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 61ba348d3b3c..7b432417dee4 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 1001 BLAKE2B b0780928686de2a8ebb3d7daebb8557484d61615a452c837aa02b389ffd681c392ad58f8c37e346d84bc917d499ef507add1c4c9f63de3df05b369ebc2a81ac7 SHA512 70d5358a020725b65b0d595a6bb06c70e9eb70317ee3a2e408ee0db6bfcf7bb25b9236d788471f75fc9c6bb943525895179fafe60f8f83f121fe4e81f9528c08
+EBUILD dumb-2.0.3.ebuild 999 BLAKE2B 3d5c17744cb6ade1c0ad83bafef1e7dbad27c909fb4d0883ed7dcdafcb8fee1339587b7607c82e222345ed32a4590b6804a94fe8d987049bbd347fe078b91291 SHA512 e18099555dbbe6bd911c0948a7d029ce89317ba88c14d90bf95518a9649065f6e50de6a0e1aef0a428f8bf83dddac692cf78d71d0a183083b4679e31a5c9cbc3
 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 4255606daa2b..2102f85c517c 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.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
@@ -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 687019431da3..75c64af677ac 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,5 +1,3 @@
-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 1009 BLAKE2B add59129e6bdd4dc0cacc9f343e2d14eb4d7555e31d816d37f700aa7872f2f2c80ded754156cfd5d88df3f6d022aaf13b600178215c39980c0ad239caba467b5 SHA512 d6abac3c024b28a005c752920758a8f01d52ed1abc5e9978b717beff725e05feaebf322940a8cd4392f437034e925d17e6a9a236a0b000235afaf2b93d969900
-MISC metadata.xml 377 BLAKE2B d5b3b8da105a6944f05e952ad1d7875ffe3c2af9b922e4f09e00e1a9925232ec3120b2fde4cc622c82863c7efea05b3c0ad193a93eadee58fbe1b530a4d15515 SHA512 c765854361639f7dd7f698d39dbcf19a4148afea9fa331bfe7fe089d26b0c163cd730d43bd342538436d520abf37964f3e6c8acdfde6a72fb0cf67281cb91af5
+EBUILD faac-1.30.ebuild 994 BLAKE2B d8c43384007ade7717378dfb141947dba184ebf14e85b160879407465e93977a695786eb906ea39274d23c60bb366b24976c3cda3e9f0c2057ffd005c21e079f SHA512 62f3c8cd32e2298afff38076e3e526c6824a427f3a17de1440e7399d44902b02756846716072913f848685a446033d8ddf6081c502678d556032eda2476c70c2
+MISC metadata.xml 573 BLAKE2B 73b7c56106260dbcd9039d6f9bef2e709b609eb00dbb304f08c127ce6cde28cefd61e4837f3007d318a586bbac0b88ee1051084afb507cfe765716916f1ed691 SHA512 ddb938e2c8d837eec016dc7257bb5bdf2ec0e40e5d14cd22c7afc08c2815dba22123443734d5d95a3469996c78746e304d7fd75c0645d1bb2f723859c8f40c69
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
deleted file mode 100644
index 65356e2d5617..000000000000
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
-HOMEPAGE="https://www.audiocoding.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPEG-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-static
-
-	# do not build the frontend for non-native abis
-	if ! multilib_is_native_abi; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/faac/faac-1.30.ebuild b/media-libs/faac/faac-1.30.ebuild
index dad2ee474b14..8408e4c839fd 100644
--- a/media-libs/faac/faac-1.30.ebuild
+++ b/media-libs/faac/faac-1.30.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
@@ -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 ~sparc-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/faac/metadata.xml b/media-libs/faac/metadata.xml
index 613d5985dc7e..2627521f89fc 100644
--- a/media-libs/faac/metadata.xml
+++ b/media-libs/faac/metadata.xml
@@ -8,5 +8,7 @@
 	<upstream>
 		<remote-id type="github">knik0/faac</remote-id>
 		<remote-id type="sourceforge">faac</remote-id>
+		<remote-id type="cpe">cpe:/a:audiocoding:freeware_advanced_audio_coder</remote-id>
+		<remote-id type="cpe">cpe:/a:freeware_advanced_audio_coder_project:freeware_advanced_audio_coder</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 51c9f38b1148..28bf68c972a6 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,7 +1,3 @@
 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 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
+EBUILD faad2-2.10.0.ebuild 1156 BLAKE2B 1448cf2bf914fb6376f91d17db9093eff04b50e1133f17176c41fb3d358e8df219aed365fa3771352a299a6b4761aa3b7b42c09cd1b5a030821caf31b02b3011 SHA512 a081c21fd37e082782042393ebcfede136f496bfddfb26931060ec8be13355576c282ef7097b3ef3486a74ed5303ee8ea3e5a7fe8f10630044af413859bfe71c
 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 a4d3d4b887f3..e04ebea4a3cd 100644
--- a/media-libs/faad2/faad2-2.10.0.ebuild
+++ b/media-libs/faad2/faad2-2.10.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
@@ -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 ~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
deleted file mode 100644
index 34d597dcbe6d..000000000000
--- a/media-libs/faad2/faad2-2.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV=$(ver_rs 1- _)
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html"
-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"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	# bug 466986
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/media-libs/faad2/faad2-2.9.2.ebuild b/media-libs/faad2/faad2-2.9.2.ebuild
deleted file mode 100644
index 4c6a8bef3075..000000000000
--- a/media-libs/faad2/faad2-2.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html"
-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"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index a7488e928635..f92549bab1ef 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 1584 BLAKE2B 05bcf0f3a69c287b8c890a98ed2aec194e3226f4918c28d76a63c7150ac2a67de4f9e3e4019609c080385a553a6cf38a9e7e8d34e8ec526d96192a62e0050c81 SHA512 638bcdf92091788b2c2eab78b9b4decc5eb8d72a4a9867d364298dd012cc5c01d8e8b6da8381b2f93c1757b25aa75ec1230fa4b4f77904ff436e03aa7f985dbf
+EBUILD flac-1.3.3.ebuild 1573 BLAKE2B f7be916b09a5c039a7476293f6249e5001a88f7ec28a20eb0924bb84f879dbe77ba30435709a4e5b9933a2e0c6ce0bff6f02d9bf406c9d9473957f2afcbdcc46 SHA512 cac94617c638560ff703dde9f1998de293df1d3ed3d81d46ab9f1929f3330f9dfc2bfea36eb7b78df58cbe753358b9ad9d91d9daf1a325497f48d398a0cd37c7
 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 332bc40c5ce8..d72e7be67f3b 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.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
@@ -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 ~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 b3d83a04ddcf..db2b9352651a 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 4867 BLAKE2B 0f577175e85adff915de692364ef04077a024f781401f862e7c5498ec545cff1174048b010fa8dd18142eb2f888a1b8e99120b7ac7a4f3c0bcb4f8b973ff05df SHA512 e1d6f10aa07d0aea40564dd0ecd7e76d89111a0fc6790c04b46f35442798eb97477ff6ba12714446ca115dd217f4539f7cb29023eb7774d1411b8f1fba2f646c
-EBUILD fontconfig-2.13.0-r4.ebuild 5166 BLAKE2B a26fa62a00f519500c02e3972c9718978e163b6b27eb67c8c8ba2fbaeaa460c870ce21cc55989e29e8fd928934ff89802a65e6bda1f774faf1566072cf22670f SHA512 751d7456a010a26002ee4749cae2eb95c00476fe3916953b577d9bb75acd68632f5e65c4c51b44ce6de6ea9be4c0f93940898e63bce25f84039ddda430ca4a6f
-EBUILD fontconfig-2.13.1-r2.ebuild 5617 BLAKE2B fd658076fdb9cba13025fb6540cb52114a87cddc19119e749c8c866f0434606560e868938638c8a224bdb0aea4acd4b55cc54d930e729e821e188d0cfdfd752c SHA512 d06676988b82be2422d50f69b6f5a06ccb3bc3c8a25c4fe80036ab03ce855be43957e0595ef427ac39320baf67e51ca3a987c3259c72a2ac9316f679a28bad72
+EBUILD fontconfig-2.12.6.ebuild 4856 BLAKE2B 89422216e7ea3511433a9b804179139c1b32231ed78b73defb97e8d1a572a5076e78a8f59ceedd4698240172b4e95843d4a936a3ee52eb7b3a9c66b57a9f4dff SHA512 f743068c2b7d6e8582dc3f8005cf5dc7020e5e5da4e931ea6104f5bd3eec9f0adb99e802c95f390e40ea59adfa122aada183ae609d24d86ad5c121b8db5898a9
+EBUILD fontconfig-2.13.0-r4.ebuild 5155 BLAKE2B de35bc5b131b063d983eee820a87abcdc6d91b97e9ff09cd04aab5d856093df2a3bdd7f5f695eb1fa1368c1a1850539a1679ac3dad5ad1c76de5131273c465a4 SHA512 4757d8979ee3f2fb71510ec1168a1c31e11aa5bb8c2d70847e5e6190bcebcafde484e2d7dc0f3eb4621e25d042e83fa5a80a03aadd9a34b7b42a35102b9360e7
+EBUILD fontconfig-2.13.1-r2.ebuild 5606 BLAKE2B e56b1cff96e38c2495bbc041ba7f4a5debff6476ff2df3460ab19353876df21fa0be1af2b0dc4258e5b0c796c002ebb7b5be3dbee7b4047a062695872a39f5f3 SHA512 f45676cbe2ffb35839513cf85a76c5d9c7ead789fe4fa0be07ad1c1dc701f79caded154ce128a7da0a0a04e73e0ce8bd5665f305e935a6121d69bee1cff2247e
 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 82f8ca27e287..afb9dc10bb9a 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.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=6
@@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index f62e4924e4a0..338f391d2aed 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 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 53f7689e891b..9d01156b5ebf 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.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
@@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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 5c094fa2be2c..43446a085689 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 1439 BLAKE2B 31a356541d5694c0401192396800411c3f0fe034c74c3e593539b6a7598478277f743d6f94feaa400766f3466443536860c4e84eb24e083651937ba1ecd5adc3 SHA512 af37f93235203faed240f04ccda67f9f9ef515d3499cd97b0c05bd5faabda78b1a0fef77d74aa4f60203f5fb908ee5d55e1bbd58b9f87d6e2bbb46ef44fffb3f
+EBUILD freeglut-3.2.1.ebuild 1428 BLAKE2B d8284f119c625e9dc69c39000a058a34a2a61880f413f643bf31cde949ade2e51ea73407011d3a4bb9e5e2c6d7fba23f7e6724555792dc463c68a26c2dae6914 SHA512 c5a22c592f633facb4bac2f823b8b2afe1a27bc4576fae94f90d3e2597cfd43d1463e780ae3ab322c6137edddd2cd03d3c5d6cb2b9da4fa9684eeba28c0ddfe4
 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 717ded58b7a8..3ea22fc54f73 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.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
@@ -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"
 IUSE="debug static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index af185c045f84..a14af47ee68d 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 6764 BLAKE2B 9dfca585cdf862f983d0079316c8964dc990ce1d659063ce8a60b4ba44db75eca80184900199456d1b2e1a183a27db0901dda5b783d2741eb7349123c253fcca SHA512 5c8d11cce80fbac6e2aa54834a929872d4c1390f624143c6ce90b8a9aa5296d82f1bb91d6c93131216ad50f08ed0c7a9c5178413c8e44281dcd413139ec86f9e
-EBUILD freetype-9999.ebuild 7158 BLAKE2B 787673fdfbe4d7f9be94ee789c6686e74f7c5fd3b696ba0092b3189d570e4df99872984539ea40785b18d0aea2920211baf5f888bbb06955d005b6ca4f363383 SHA512 5d6b672e6f278277941592c906506e6a016bf984b48c4ea2d2bf262ab19c90b82e83525b73fbe2c53fcdedf47d01c6a98f7551ee11bf85735bb091e510bb6af8
+EBUILD freetype-2.10.4.ebuild 6753 BLAKE2B 7685748055452421efb82759b4f1649a3f9fdecbc113f930394f03479014b0ed25a1ad8410384aa0181bf2992005aac8fa2122e1cf7d34f42419eddc6d19c0b4 SHA512 192bfc5f7b42cf248a61caec949d862f4f8fde1192e246d9157cb2e76208e2b7a046ca4d8d42890454c54c779dd4e3cec45e2b33a06076656fcc2d0962817ae7
+EBUILD freetype-9999.ebuild 7147 BLAKE2B aacccaff4a628fbf5dd4fcd0c8b3946ffdc02a8e63c8363ae47add5301e0bf9b388d8a6218b071493fc36c4e12ff42b31a01ef488481c6d7b208b73ba71296c9 SHA512 2865efcb32a9b5671f4d3381900a1a385f60b209c53f6ffb2f0a11c197cc3d5c5360f935a5fe5e0f70734145c1be387d4d96d905f4f8646251007f16578b167d
 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 4e708d9efaa1..9f1e9603ff4a 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.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
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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 c5f10ab25ebd..a124165276f5 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.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
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index a3b1003a5cdf..1a368e5fafed 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 2544 BLAKE2B 8d3e82649163581dd53449d4ecd6f75532284073f1ddc1c83003415828a7fcc94910e9e2a6fffd720710a752416c40614cd9ca4a01a0ca1fe26152c181084643 SHA512 4a980444d7e318f39f46939a40538ddf3ef3b19322450fa1b800497bdbfbd46576e84a4f39c04bb837da7203ecf7391f98a36d6ddaf671be62a8367995f0debf
+EBUILD gd-2.3.0.ebuild 2533 BLAKE2B 9103f442e7be09521880c01f7f5cfa46a4467ce7c7eaded1cd3921538209cc13001d763b80ae8fbc10df5df64936848d85c1ee0b01481f4d4bd99a33c651b8da SHA512 2ac948043be162d0d01805853f9a7f360bf5dd0ace10b33a44d9f6c051594ca27960fc56c8bb6d3a610887c355f06f5bd267ecd03445ae1fff2c7c5d13039657
 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 153204a77e13..04480d159c33 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.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"
@@ -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 ~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 ~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/giflib/Manifest b/media-libs/giflib/Manifest
index 0f11f9b684ba..ebf46f3ff750 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,5 @@
 AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-5.2.1-r1.ebuild 1910 BLAKE2B 638db4a6276f8c05e98cdd11466286dcd0482975b8fd7886989c1d0a9eb4ab260148560a0e0feb353ce178db7cc7d3eee33ca3e614f1a81fb8801078c41c4b2f SHA512 f937e9818fa8d88a0461afdd82788a14ddfd34f3f050dec75d48ddc2f66c342d5fefd600cd7d360a8d523532947144bf77d61fb667e3209ba20d4ed6cf264692
+EBUILD giflib-5.2.1-r1.ebuild 1899 BLAKE2B 67a8f88148435a590512a9a9b02cb8111b32e9a537ef868f2d67fe28fc027b13449655b931a7ede2d814f42e947a992ffeafdd403692a228948ac4bc81ad18ae SHA512 df9c49dc327f09bbe5f0d15fb19ce3e19ee566cc0b2dbd23d2e0fd4dbd9162bc82d298f5982ec0aa9046d1aec0214e3ab40bb39ab9e72c82c25f66312d4f9cfc
 MISC metadata.xml 248 BLAKE2B 46adedd4004568ddad75971a42a14a53916a118e2df96eec2eb420a1c55009c152f5d41510e7b3030825d81d476c3db981847f12aedafa2c0b556b549666c389 SHA512 3e9d14a9f2c2e9bf88543fb580abb09dfc35c8065b8f77579bbbae2330fa105ca808f35c8542f4db4b0dc0ac4026bc26adb9f2f45ac52755b822e0b98c751532
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index 9682a89aed3e..31a7c84cf5ff 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index a52a5087fb82..06a4dca1fab8 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -4,8 +4,8 @@ DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
-EBUILD glew-1.10.0-r100.ebuild 1919 BLAKE2B 849a2bbe51e9c5a72fab2e21450ae0a2a0feedd688052d9a4782f5faca846d7edafd4102b1d96e8d0f33cce59b21aa64e67bc4fd37da574079161a5df546a9c4 SHA512 7ae0a493de5d57190aca2266f204de6e1014447090f1d21d039a441175d5991886eeaa4b77cc4146a3eaadd15bd2e9a25c378afa15cea52ce7e0e66087aec0fa
-EBUILD glew-1.6.0-r100.ebuild 1892 BLAKE2B 1919a435320a83c0b117831c4267390fa221dda016618ece17da909b2544fdbfffcd0c832fd52b88f5955a4c717c9782489e6843be4d9ec126c23e0f06b286bf SHA512 2e0267dadae76d0c59903f87d12886b4236c1d327266c5541931c75437986d565724f8e88a28df9a516b12d637b42b66ee64aef1b195fed2e1cf3ba161b17db5
-EBUILD glew-2.1.0-r1.ebuild 2496 BLAKE2B 18ea433d149081a8402030e392a215036f987357a15c7695d145516893db718e0bc89c85d25c2f1bc06c1e8ce96d0ecfe029a5bf789b079dd6ddeca6b4c38f69 SHA512 f0922f41700f98819002a5de1846650c69a5337f47a0da2c84ef7d1c7c4793b71124ece9be66e99d011eb80c89b84240b6f39e7a37b61036e54a6ae48d1ace5c
-EBUILD glew-2.2.0.ebuild 2457 BLAKE2B 5a905deb9ccf8797d9591e807916f7ac7224eca88059eea80f996662ae5a4ba3e26f21e293fc8ff21c173dae243efe0f446f8a3a3938c1620dd5904319e7f1a9 SHA512 e818f6d470bbd77741e75924519b059f2f4f0ec0d98d9646b5dcecbbf3ab6e31784989abf2853421fc246a5be72a8df63a69e41aa84094397f73d26fc13a5847
+EBUILD glew-1.10.0-r100.ebuild 1908 BLAKE2B 59364c25acda1a16267dd8cd552161edce0666c0871a1d79bd70ed1229da1ea2115e1cb8e53609a3471b534ab0a09268335ed1024578787eb857b05028682e52 SHA512 88b6c7add297fbf7b8b954b761faa14020d614e96bcabc51e48d9dcc7da98c022062173c19188d996ad5fa294d989a9df14e62fe296259bf84093bacdffcab27
+EBUILD glew-1.6.0-r100.ebuild 1881 BLAKE2B d32880f9de5e91a332f2b42e3c3649e22234ac152e1216d944cab4be1866887673a2fa14de3e0136984b13dbb89ce75d125cef8a338507651185ea9f2b25a8e5 SHA512 a628e0b5eb4e6dc1691688ad59223793686e9d899046a1713195dcc69c7a467cc8acf23ad9ed5f5018088342b9c27bb51d08b58aec9c73c0dc87781c11417e42
+EBUILD glew-2.1.0-r1.ebuild 2485 BLAKE2B c2392a9ccf544e793c9e818c6933d222a0885b848beb38b1cc45b706e12455018a756cab16d4c06d71058c58aa06650e31339b2dfb4ab71a9cad2686de5aef4d SHA512 840c78fafa0f0c533290c9a9e9cfa68f3a8a1c3ff33c7f39118b229eb433a6638fa13dc47733d5076451e213bf63b7adafcf7202d1c62932e8cac0de7dfcb582
+EBUILD glew-2.2.0.ebuild 2446 BLAKE2B df522bb082823fd231b72a622bdd81a07c9722fd491b309ef29b1a8fb4017bf0c8559d72daa80b69075d0fe37915d27573d478c735d73acc0e822fbcd19cd823 SHA512 5bece96e3a75a5c95309ec324a26e5915c7b41c18d58c78ad97ae248eca97cec5d339fd178fb9431d4e0f0466491cb490cdda370935c2b0b99fc04f62609baad
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index 56618864632d..499084faaffa 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.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=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	!=media-libs/glew-1.10*:0"
diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index 571a9bd8a66e..71bd3f0a597d 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.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=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index bc8d54cc2b6f..8688c0b15c13 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glew/glew-2.2.0.ebuild b/media-libs/glew/glew-2.2.0.ebuild
index d5d9c30c769a..940dea894139 100644
--- a/media-libs/glew/glew-2.2.0.ebuild
+++ b/media-libs/glew/glew-2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index bc664118d6e2..a04fc6c46e5e 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -6,6 +6,6 @@ DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d609
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
-EBUILD glm-0.9.9.8-r1.ebuild 1386 BLAKE2B 704298a94e2bfd0276f0c7a5c78c768cfe7a2c2baa27087ca895f3a8aa1baf2a55399a95c39e9f7c38e9529e95260c7948423396f0ad32310dd2a23973bc404b SHA512 ba2dac1166a9bfbbcb264a6aaa62de06f1f7bd8aca3b54cf3173e7c8477e35385e20760141fa8eb94d4dd69300e9f085ebcd7d08f15208924d4b1b56b378fdf5
+EBUILD glm-0.9.9.8-r1.ebuild 1383 BLAKE2B e57cd610f7e1e65b46ee1136cc2ebe564c913a69ecf5cdb811e6b8cb02acef56b89b5b7b111b118dea7ebac2866c353eedc984bab123b14dd8c8c7a0ccefcedd SHA512 ac646d109b6ca9aaea463b3c76925b6adc46ed96d81345ee7542e6e53f5e0775ca0ec7234d20fabe5fc2558c2192bba56fbd391356735ec91e1adc5db057e513
 EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
 MISC metadata.xml 544 BLAKE2B 1b51ba07aff67e963ef1fc1e9e30d40352c7f04c7c3996db73a5877aa2cb9e7150fa52017ac3a5100f1bdbc400f0ec6a392ac4352531e5a8ff893ddfcc271325 SHA512 144dfba609da46e7b7757b9173bf06248efd764e4246564321cb8c60bb9504d99cf0da62ed3d2bdc78bcc81648353c9c507aca6defff9299e3f9f99b4c3fe902
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 74788d45b6b9..10f370ff15e8 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 6ac9da72872a..bd6c36aedefb 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,6 +3,6 @@ AUX gst-plugins-base-1.16.2-make43.patch 12403 BLAKE2B e99167bbb792c5815e8bb7265
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
-EBUILD gst-plugins-base-1.14.5.ebuild 6037 BLAKE2B 7a94909cb8e237fb07c2dce50447647b92c6e1fc8fe5d859724f74468a045b8d9a04501c4dc167e8ca222f82a722e56499ed31f0534937c690737ee9ed84a816 SHA512 e9a8b42046bb5e59cc4771b7d033d3691c06ecb83f6b30b151d7f954be76e72432c37f0144d38af04771c77eefdab1b76b80a97780a81aa67e938933f7263867
+EBUILD gst-plugins-base-1.14.5.ebuild 6026 BLAKE2B 40d91d7859c85891d37a2a660c0c25a4ebe0e47ca4bf5953e4129275aac6c16afdc1f5038a4732698e44b689b1c163383d448e3e3b23d30f332c62a020971412 SHA512 bd8267b42bbbff6a3600ca0698b9c207c705213cec81d92363b3dbb02c09bac78bbde2fa91bee5a34866f302afbfc5f00594d6315d7a8f8e6bd3867b189dcb86
 EBUILD gst-plugins-base-1.16.2.ebuild 6046 BLAKE2B 1925848df988f12d58b5da0963744b5304654fa88acd78c84fd2d7a5da6c4300e368e91753e095cba4acfca0bad97a7355af87a22a148c6a4f081d55cc06d9c2 SHA512 7cf8736921c8ea16058fa84c796ab8182ddb60e90c01851cea41cc5d33de0bdd31d142192536a0925287a33a625cff7e856aeb835d391e798e5cf78646c0c6bb
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index 166bf9da9ee4..94fe04ade07a 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.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=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index d56e85f71a46..6a9c0a359acc 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,6 @@ AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5c
 AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
-EBUILD gstreamer-1.14.5.ebuild 3519 BLAKE2B 68989e70071e43baa0b35007b7b42be640a1cadff4c0f8d494ac3fd2fa2e3b13c5e2063b7bca967b4f59b86ac9b41a9fe8aa5f2438f1e44fbc9835f3f8766a9b SHA512 3b6bcd25bd60f9706820412ec58c8781e8dd9ba8955392c4cacbdf8ebad89793429859e55acd0a8b9f720d0eb04e1a2126b3fde52eda6f223f644a83402e0cc6
-EBUILD gstreamer-1.16.2.ebuild 3437 BLAKE2B 4eedab051584c70c88a465a229eac1a4466336ee3e88a044b986d084ad44d3e94626ce4c2fcc11f25f6bd47419643a8adff338c4e7e5ba3d4a0ed87a2d2426d8 SHA512 a5b14312f252b4a8f5fc9e6bc1de94512604630aaeacd4a7dbdbe447a419a600a4dcf6c70810a43d5752c5f7b226c7212e8a939883eff6a8449d8ef7cd27eedf
+EBUILD gstreamer-1.14.5.ebuild 3508 BLAKE2B f8171e213b89db5be1edad768f29fbb263e7166e639865255a4aff3300d2bb051a43b532e4431e2065d6d33ff73e5aa0c540addce0dedc4b7aead4761a825c01 SHA512 8dd402d61b9a8fc9408d8186050502c2722cd7e401e25e438021fb67b2d877f341c1a01d763833d9616d4280a8e6d71af444fff63676f17a84485291b32edb6f
+EBUILD gstreamer-1.16.2.ebuild 3426 BLAKE2B 3bfd1d6109151dbbc46bcead5d8f49230f65ead9ab227d9c16dd332abbd7afc741e904579ba5f0724e0d99135e4212d5a4e3de6e65e7e602f38e474e89b5255a SHA512 08ce0b0c6e74099c924a472eae173ce7bcdec10de34aabde9fa20fa0f21e1d3678890dd2ec2250a9ac745f30db7382665a36560999f81e21f304a3a2e97cced6
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index 043fe837d5a8..ec77d2d0c15f 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index f54203481b5f..5eab87d12d69 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7ac73b173563..d5b3b844f27c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +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
+EBUILD harfbuzz-2.7.2.ebuild 2663 BLAKE2B 2aa5402ddfe5e332a7727e7db32237aba787f7fa8c3e4585daeb8c83d106ba5afdd3841b46520e6495e1fcee5d5d0a5b04ae0266e40bfd285c713a8e89fc08be SHA512 f8bd13ee08a1737f601caa6a379f925166d0f6f3882bfb08fa5f6f572b19cf1974133f11b48d784c08c3b43321c9c5cf86bd6f41f93cc1102817a9bece56380d
+EBUILD harfbuzz-2.7.3.ebuild 2672 BLAKE2B a024b31d374e781e5994907bd809697f2c3cb23f4ffb7bbfee88eb0257524de95d3175858c571e088fd405f09434f79a61c7b7f2b78180dd8c4e57f6741552dd SHA512 ee205d223556a5b137446355de0df0fcd5ae27be13ab266fd40988940c3a03581885e333d7be2c862aee4c127a9708e1432f937a1eb6bc87b6ea39e0fd1caef9
+EBUILD harfbuzz-2.7.4.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
+EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
index 0f9b87292f7f..5cfff46530c9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.2.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
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
index 89e06e272b90..295706a33c0b 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.3.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
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index 89e06e272b90..ca0f97a63d11 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -34,8 +34,8 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -44,7 +44,7 @@ BDEPEND="
 "
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 	if ! use debug ; then
 		append-cppflags -DHB_NDEBUG
 	fi
@@ -62,6 +62,12 @@ src_prepare() {
 
 	# bug 618772
 	append-cxxflags -std=c++14
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
 }
 
 meson_multilib_native_feature() {
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index d8d692333627..ca0f97a63d11 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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 ~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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -34,8 +34,8 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -44,7 +44,7 @@ BDEPEND="
 "
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 	if ! use debug ; then
 		append-cppflags -DHB_NDEBUG
 	fi
@@ -62,6 +62,12 @@ src_prepare() {
 
 	# bug 618772
 	append-cxxflags -std=c++14
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
 }
 
 meson_multilib_native_feature() {
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 227346adfee4..e746dd50c692 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 1344 BLAKE2B a98b6538a0ffc1a6e194992053089b60167ec30b9ecc08aa289affa4b4aa3a4cf350a648df5ad60b23ac1c6b18c80c3459a3e291b4a11c5eb8cc8a654921e89f SHA512 20f9a88b23a9b93c5ef5c52ff36bac9a5f69c8f83f155bdce539daaea5d4a8c059f09dd59125dfc16d9e2bc9538d88faa767e4044529a957034cacd847a9c208
+EBUILD id3lib-3.8.3-r8.ebuild 1333 BLAKE2B fd0fce8596c54ab0feabae81d0317c8ba0f285359a1790029c8ad9596310484dc98911dcd7448911e41158c6c3749f92c5c88c35dc3ea5d61264e8eb1d8de7c1 SHA512 ab1179d19b285b5f329e3c9ebc4d6523f0f10d44de95116bc1a90cde78e1c8c67c0b6bb1bc91549433bc9b650eb6dc8c3b544ac9fb29f036a5137bc37f69948d
 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 2bbcf30c366d..0d9c789a12c8 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.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=6
@@ -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-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index d9dbe719d5b3..5e44b1205219 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 2276 BLAKE2B 1a29df305528cff62d042b32b0d642927fb9e02b0cbb88e46e43160df1ed23ab620224ae6d07dfe2f0f48163257b72ecb4e7012d8a98a19174ddc57de61a4638 SHA512 27f9b52845991f389cf1e5d54023dcc46e84e6657cf47a0074298b663a9fb957b08e36926879d359e8c96a22f0efddb14e3c6439ad43c63006fc1b9e8ebf85eb
+EBUILD imlib2-1.6.1.ebuild 2265 BLAKE2B c17d5006217501fb09a9a830dfa28701619acedbdcffde6554234ad0bf330cc7975f7866f3cb651cf82c736d0aca4c5b167cf39381d952028903861160fb9788 SHA512 63499f3825fbc49a74f0218d306e1691e0a9ca5fa908369ce250852dcd0a5d98d760cf2d9f1d07b33fb5e87205010412bb08919cb48a9c28e3d759c772e2a754
 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 393a693f3c1b..26f1343b243c 100644
--- a/media-libs/imlib2/imlib2-1.6.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.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
@@ -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 ~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 035157366eb6..661a1c843d58 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 1644 BLAKE2B d5a1cca70c0b1c55e5153901f7604c9c2f7af399dd5053df589dcbd57c2d3f9e68374b5a6fad2690eb1c42c4c4a8117d89fa69c7d1572fbed2cd510d9e7153c8 SHA512 82142a8102359e528f867d05034401b2498aab417873091d867924ff0c6b8f31548d050728be85ad409ffca7a244a2deee3fdca55e2ee2e95b32a0a184768205
-EBUILD jbig2dec-0.19.ebuild 1551 BLAKE2B 25ceb515565e0d5a0f446979955018e0101371ae914fc5999e31190fd3d6b691a5848b9d7e9844e73646ae9eaa5ee972a92b48c64e7ed2c25bfa520d81ac5409 SHA512 c5e107304ec2a012bb6b873c795f8e39264990be8866d946d9b3832c58e2f19d20ec42ea3f7c540fc9700491f3ab7beebb5c466ed0c999a7927dd798b70e1270
+EBUILD jbig2dec-0.18.ebuild 1633 BLAKE2B 672a30af0230c0efb61ce3cb2ad47457cbf29bf1f9a2009abe9dedc2a708bcc1dfd290a56c24dab4e02c0e21e5060098063afdd225bdeaef58309add0788d8c2 SHA512 05677f6df48371a4426688465520a5acaa168882bf31ed66672575f7f7c8c70af56bb85454ba51ee2540dcae12d81930a1d2256f0fb5501bb3ecc6e699577f80
+EBUILD jbig2dec-0.19.ebuild 1540 BLAKE2B 191e2b7d2482955f238347b3fa7c4ad4ea8df655e7fac471013e630faa10e658fe0878db08af96e1537e551a10ad3b74f3d610106ff3172068695c3a524481d0 SHA512 9cbe37546c37d875cdf394ae4cf526f6810337dec4b08b1fe972e103f7b20d5cfd4b3c0e1973263f577418f57ce6d881de5ae9bf5dbca4f39ce0733b48b6b927
 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 3db8579b2936..85b3fddff201 100644
--- a/media-libs/jbig2dec/jbig2dec-0.18.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.18.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
@@ -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 ~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 ~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 49deb553015d..5b86b95bee61 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.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
@@ -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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index cf6f01ff7dcb..28d5d8553cc6 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
 AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1418 BLAKE2B 0affd21382e4094fb248deb74a226f476fcf52e14dabe8ca1a7fb15ad622f87e9f3db5880ef785ce055e0210cc9b60bfabed2f53bbc8efb860df809dbee0f15e SHA512 f52643e14962b1f412e40a8dfc36b7e89883b39a6b8ebfee5be7a52d18a94c8327f567e195d6d2c2a2b8fd9118ed5217039182f4c7f917b44112219af209c0e8
+EBUILD jbigkit-2.1.ebuild 1407 BLAKE2B 250912766d153216e717e62b630af89a14003822f31e667ed5b9713391dd3153460113cf471aee4fd173c17e50b5844992f22ba7b2adaa1f95ab8aa0727df715 SHA512 a5003623970e21dd392d8c67a0636a13dd5abed2eb647affe9e30320d84900c6b8d3590dd210050d1aab231c13ea9c136fa42a23411526b8772103a101de74a5
 MISC metadata.xml 373 BLAKE2B 02b125f44ea8401eb695a1b3fff8584c38f50cf9f359cf70e209955babbd749fcfbcd14415a757281f8fd4c0970ba5efbd67b937b81b45b2152a79093d141a34 SHA512 663285ac228539d95ca401d530b53cdb58e2f01e3ee4187622afd1c8bf6ca0ae76bbbdaeb92742408502f4b55dd269464ac2f21231d987ab73f949f6abb92882
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index d6dd92874b32..aabec623cbc0 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 5bdab62f8caf..b05b6b2211ec 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 1973 BLAKE2B ef534ccde4ab83c75d76db429c7051741bb097696067fc464741e593c99a48834f16a37f2208d07a41c0b4dfe48435cd3d6c18c02a61bcae591e18b05903db7d SHA512 0af96d1909d5e06a987efbdf4c0626f2a42c00ba0a3a177d132685eea2205815c7a38981e3c03fc701d3ba20acf3f7eaffae9dd4cae4be2113b03b91c36a97a3
+EBUILD jpeg-9d.ebuild 1962 BLAKE2B d6ac1f20a5deb79b846d9c1eaf3b32094c28edbeaa285fd8542ba9623424a5d572d177f3cd9da369b7552c4c2554c4cd72cf1ce95fe0926eb88e3321476fc528 SHA512 76e8ef989401996128de2f837e7ce33bb69a2661d489ef4455af955ee2d6a3989ce811400207f0ecbd2ff9aac352d62e6b9f01d8c9c71b5c2c36262e8d213c02
 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 0c15e1887cb8..a9830591cae8 100644
--- a/media-libs/jpeg/jpeg-9d.ebuild
+++ b/media-libs/jpeg/jpeg-9d.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=6
@@ -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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
new file mode 100644
index 000000000000..bf22ea47c958
--- /dev/null
+++ b/media-libs/kcolorpicker/Manifest
@@ -0,0 +1,3 @@
+DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673
+EBUILD kcolorpicker-0.1.4.ebuild 724 BLAKE2B 5541e6a84569d0b80a8306a84e3e73f24b0a780534e052f9f64c0df40188adf784f7ccad41d180e0532f4c962d61cd2ed2b88407efd1b37a9bbcab908d8a532b SHA512 24a88a49805019249934d7c1ba874072d782ce7b604cba693d5ab4318de66ccc62d3b73ec8cbf305a5cf9f86f7923495d4dcc676169bb6cf66775c54c189d47a
+MISC metadata.xml 582 BLAKE2B 5cabe4fbc89f6b33dd2193707ce455544c8e61139ea78d03220a4acb6833d7d085c8d3470ab0031ead6072d766987b93b4e1f15694898f25b8358bf550868598 SHA512 1b722a703324f146d71a8cbcf807b1e8be67708bbb3af541dbbe1e42958c9f47d5eca36e93f967521f37a2b674068265e7d2c2c7853aaeddfb93748b83794c8b
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
new file mode 100644
index 000000000000..4867e8b9369d
--- /dev/null
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit cmake virtualx
+
+MY_PN=kColorPicker
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Qt based color picker with popup menu"
+HOMEPAGE="https://github.com/ksnip/kColorPicker"
+SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5[png]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/media-libs/kcolorpicker/metadata.xml b/media-libs/kcolorpicker/metadata.xml
new file mode 100644
index 000000000000..e8952720fcef
--- /dev/null
+++ b/media-libs/kcolorpicker/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dflogeras2@gmail.com</email>
+		<name>David Flogeras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">QToolButton with color popup menu with lets you
+		select a color. The popup features a color dialog button which can be
+		used to add custom colors to the popup menu.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
new file mode 100644
index 000000000000..6241f8fa8f97
--- /dev/null
+++ b/media-libs/kimageannotator/Manifest
@@ -0,0 +1,4 @@
+AUX kimageannotator-0.4.0-fix-static-test-library-PR195.patch 1010 BLAKE2B c296f280c851b54d3a6d7fe088ce429b9840144214617346c5e6849784eaa4e3f5b1469cbbf05407aaef812c10f61f0e693bcf3be1d5b852802280e15b2f8c74 SHA512 6baa5fc3fe31e1f9cd6422a667a4cd295783cf8c92aec5c4ff22918edafa461a90008ff4d99f8ded9f3718dbf9c667c59a6dfb280c62292a5b0915bd3b1081a8
+DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
+EBUILD kimageannotator-0.4.0.ebuild 943 BLAKE2B 3137d18a8b5fb287af5c8fbaa870e911deff13d149116fe1d11aba6fdf486c2c97b51d947ed921a8ec50592db33bc93afb749a335efb1992b981621245ba7194 SHA512 be3ac5c3f577f93e0a7091672c131af5d9cb49af90b26080635e00ba46cb74f0ebc7b327db4b2511e0f1815cc6bde07468052051a69b58305bf6bc345e7b9a17
+MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2
diff --git a/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch b/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch
new file mode 100644
index 000000000000..7944118641c3
--- /dev/null
+++ b/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch
@@ -0,0 +1,25 @@
+From 25f13f3058c79e3f4a2b1cd257b213f102931cc3 Mon Sep 17 00:00:00 2001
+From: Dave Flogeras <dflogeras2@gmail.com>
+Date: Wed, 6 Jan 2021 20:07:20 -0400
+Subject: [PATCH] Make test static library explicitly link against kColorPicker
+ and X11.
+
+This was broken when those libraries were made part of a PRIVATE
+interface by bbc2b6595 and af2ff6167.
+---
+ tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index b1ecc8a..9918010 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -56,7 +56,7 @@ set(TESTUTILS_SRC
+ 
+ add_library(KIMAGEANNOTATOR_STATIC STATIC ${KIMAGEANNOTATOR_SRCS})
+ 
+-target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator)
++target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator kColorPicker::kColorPicker X11)
+ 
+ target_compile_definitions(KIMAGEANNOTATOR_STATIC PRIVATE KIMAGEANNOTATOR_LANG_INSTALL_DIR="${KIMAGEANNOTATOR_LANG_INSTALL_DIR}")
+ 
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
new file mode 100644
index 000000000000..417b4bc23c2d
--- /dev/null
+++ b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit cmake virtualx
+
+MY_PN=kImageAnnotator
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for annotating images"
+HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
+SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png]
+	>=media-libs/kcolorpicker-0.1.4
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+PATCHES=(
+	# https://github.com/ksnip/kImageAnnotator/pull/195
+	"${FILESDIR}/${P}-fix-static-test-library-PR195.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/media-libs/kimageannotator/metadata.xml b/media-libs/kimageannotator/metadata.xml
new file mode 100644
index 000000000000..325675c5861e
--- /dev/null
+++ b/media-libs/kimageannotator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dflogeras2@gmail.com</email>
+		<name>David Flogeras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
new file mode 100644
index 000000000000..eda201abafd2
--- /dev/null
+++ b/media-libs/kquickimageeditor/Manifest
@@ -0,0 +1,4 @@
+AUX kquickimageeditor-0.1.2-no-werror.patch 836 BLAKE2B 516bbcb7e2a89d4728756694f0684bc3b5c14aa3b7d0ca9f83c507cfa6f797aeb74099257514eca9ed6cbf959b307b2f352e7252d5f5c68414525a32a0dc631a SHA512 490daac974083f9ddffc57f01b6752b2965ce2e7ca5ef45a9242846ebbf035a1913df18b27afdbfd7b713c0270c154702893d3b8403e29e2b41bf427b13948f2
+DIST kquickimageeditor-0.1.2.tar.xz 3281984 BLAKE2B bf6467dd48c6f64a9b8b8752949af3776d766e8e7076d114c7a8522616f4e36ef47b470c382906764cf56b45f40163ee658f5ba295ae33ab1e379483d4181565 SHA512 b8ffbd2b1c331203bf5e81004b5da729658ea49e6d8c49a3d65b0f397a2b3095408479e9828bc15fbbf1ad69374a7c2cf8dc728c3fe44d28d30137657e3c759c
+EBUILD kquickimageeditor-0.1.2.ebuild 666 BLAKE2B 3c4ff41fe966fe89754c18e5c202e082528d877278eac7f33ce84720a3992c8ca134cac6d834adb611aacec0d11ccd7024ccc0f86279f84a4456119356d70f4b SHA512 020995d86b214f2eef6470ca428a380440a51fc25a7f93cb59f3a7880dd237dab98cb47212708cdea79cb33efae2808e3e913072afa8ee219d5dd4da69f5f4b3
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch b/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch
new file mode 100644
index 000000000000..69448ea2e705
--- /dev/null
+++ b/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch
@@ -0,0 +1,34 @@
+From c79657496326c10f81cf80a8c9a0e55bc2ba2798 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 7 Dec 2020 14:34:09 +0100
+Subject: [PATCH] Remove -Werror
+
+It's doing more harm than good.
+
+It makes it a pain to update anything (compiler, dependencies etc) that
+may introduce new warnings. It also makes it hard to use a compiler that
+produces a lot of warnings, e.g. clazy
+---
+ src/CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 301c05e..99b0a87 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -33,12 +33,6 @@ add_library(
+     ${sources} ${pluginData}
+ )
+ 
+-target_compile_options(
+-    kquickimageeditorplugin
+-    PRIVATE
+-        -Werror
+-)
+-
+ target_link_libraries(
+     kquickimageeditorplugin
+     PRIVATE
+-- 
+2.30.0
+
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.1.2.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.1.2.ebuild
new file mode 100644
index 000000000000..eb897f7b47c6
--- /dev/null
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick components providing basic image editing capabilities"
+HOMEPAGE="https://invent.kde.org/libraries/kquickimageeditor
+https://api.kde.org/kquickimageeditor/html/index.html"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+PATCHES=( "${FILESDIR}"/${P}-no-werror.patch )
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/media-libs/kquickimageeditor/metadata.xml b/media-libs/kquickimageeditor/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-libs/kquickimageeditor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 9816b8eb8c18..4649cc0ae9c8 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,3 +1,3 @@
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
-EBUILD lcms-2.11.ebuild 1171 BLAKE2B 6230a9f921dbbe730a6426c6b26418d6d0d70a4d89151eaba748f047938dc0ee98d359c6b325e87309981098b0d947b110c7572a48a0e35ab93ba1eb90122f53 SHA512 3ab282d299f851cc3239071452094605b3912d95e1779b83c91a1a92869c584a37b9f4d20f6a489529b393b21f9251aeb59d5ef1cb178004c2b3b3c23d18a2f9
+EBUILD lcms-2.11.ebuild 1160 BLAKE2B 31a6b342cf59fee0faa0b1788f3af0ddd9c5b3a3b4c5a76774ff0818fa27a3213dc8c8171a5c2b1dcae6989001a79ec7749c0648f83190c14dadf4dbef7e7d7e SHA512 1a0b36d07060d269dd2f7a613683e1930a362489f48680351bfdcc1ae9c8d29e6d0428b3d2fb342a2f5a7d9f4ccc3b36d4ff3debf16a05f6f3bd79b9f469c5e5
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
index 813fa6ffe6e0..a7e28b7c9264 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.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
@@ -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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 38b3ce84cf2e..35f245fccc83 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 1569 BLAKE2B a478536c714b94098e1738884dddd6f7ba8ef2ab41a63e785d66efb21f1d10dd29ad3c89e7e7f534e9ddea5750cc96306ec84590fd6acb15bd257d4e90fc27a1 SHA512 00f2222a04b1428e3b4dec6f08dbed2ea401892c63d1e1efcf09c81ec6b278bf366e2dc33ddeec37c141a8582e53cf568bee1cc82267c55f71db8ffad4599a55
+EBUILD libao-1.2.2-r1.ebuild 1558 BLAKE2B 1c6e4760c76df09831031eac25c27e89e729f81491e131b3de5890a5161185cff84d18967cd4a2f84b1b68f1aa90417a90ec7429157207755e612d58b1ad0ede SHA512 0192041dca00730dbaa9411a41cd362c486be399ed5c2058c61129ca184a153a2d5cf214a6768699a7b9518dc37afcb742983b8370cbca846601bb26157e79fd
 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 ee3051f98318..587e006037fd 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.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://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-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index 414b9e1cf0a1..c3ea3d48eb36 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 1089 BLAKE2B b43f6419a05cdfe3dd1eb2a2b0b0c22a164a06276ab2e77697653efc1343f4d07d9870fadc8292dbba7d04cc53f5cd9eec65d699552a3cbae3797f3ff9047f1b SHA512 aa9230f044c9eaee7744c7325d7484e39b6d63469719d034eabcdb7e1fcd20dbb8daccd83f5685dbdffa054852b4475e91e69d5a28449f240638f888deaf9d59
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1078 BLAKE2B 10ac2c65da15c30218d0f785315dee5d73010cce9d576431f85bb6f82304612040d87e97f2bb9869a89ff7794ffdda0180f850b8480e0249ed0cce2074db367e SHA512 a60c8b14e8e143bac8ee2dc692554d89f2c4d6c1c0c42a9c77fca565a1e4cea250c6e729724a5093782c1c42071725578a1553f54a7154630944c7caf17d957d
 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 84b04d0f5c88..b08741e892ea 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
@@ -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=6
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 53ecc977b884..8646c491d887 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,3 +1,3 @@
 DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459
-EBUILD libass-0.15.0.ebuild 1193 BLAKE2B f134c300241925360e95e1c7c0bf78e5b0d8303b8b3e59a959684bcc3218c2f996115fb7d3c92392b1921a39679a2be702bca22d12acda78087ebc542726b3db SHA512 aa4622c634f452c6315cddc9bd8b3c7f09ff46018717989ed7a83fce07ee2150e83f1929928ad44f70fbb1760234c9e34127b042a0617d189c6d360ea7e87a60
+EBUILD libass-0.15.0.ebuild 1182 BLAKE2B b38bf831d8aa357eff1c91603fc84b426b69d49ff04f94b2153927754e76d6df5e6db4e8ecac2497ecd3ac227f15ce1b30aa493483779044c15a142ec62eec04 SHA512 e68d3dcd3d020126d68d9d502d3c6f027825e4b39d4389761404b7474d394f6bf68ff2640ed2f44bef301e5c0cd67b75cbb39b34ae30617911a7b5e7ce162b55
 MISC metadata.xml 309 BLAKE2B a2a606460c51302aa57936da38c4e15105eeaa9615c700f0df4a5454124a719377e4bf3d47a40ba876791e2d2c8aa92fa042eb9309ad2390963fd6014db5507a SHA512 d8e6dd073dd6334784f165bca935396edf8ce217f5f3495b0ed9d80ae84b784b16ab252a7ed18af23b4ea8ec9190d42b2c75aeb9467ef7c5a387d042e9d7676c
diff --git a/media-libs/libass/libass-0.15.0.ebuild b/media-libs/libass/libass-0.15.0.ebuild
index c19122dc7671..ad2264c782e4 100644
--- a/media-libs/libass/libass-0.15.0.ebuild
+++ b/media-libs/libass/libass-0.15.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-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 ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 6f1b4a955203..411c098220cb 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,9 +1,7 @@
 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 2021 BLAKE2B d1b06a2d5c1fe295ca36669378041f8b9944c7a641a8073e2cdb8ba4a34a99ede7f2ddd032d88f099b2df923ae24f13e2931c17dddcbce8bb99217c804f76d44 SHA512 700ba05c171ee370a20caa359b396c7f1cc0cf023283845d2386170b332d06147e961778b1934b2a31b55dc17bf4fef89fa22e9ccaedd9957fe3b2ac202e812f
+EBUILD libbluray-1.2.0.ebuild 2015 BLAKE2B c3cf6990b14304fff11405aac550c5530ba783c1c5deed300bf005d25e8c8b50f8649634886c54dd8ee65ca2c518b383955434bed59818f508101af6a193633f SHA512 410ab87bdf182df127ef572c0c08b7145b130561ff4ffd7a5f35b23ec18ac71f81d8d6a6e875c435b6037fb9b1fa7acf6a6a09e7e9df5e11aedec0c9f7c0efc6
 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.1.2.ebuild b/media-libs/libbluray/libbluray-1.1.2.ebuild
deleted file mode 100644
index 016d1a2c031a..000000000000
--- a/media-libs/libbluray/libbluray-1.1.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 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/libbluray/libbluray-1.2.0.ebuild b/media-libs/libbluray/libbluray-1.2.0.ebuild
index 69352f039b1a..5046241e54d1 100644
--- a/media-libs/libbluray/libbluray-1.2.0.ebuild
+++ b/media-libs/libbluray/libbluray-1.2.0.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	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/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index c2c866f4849a..1f33a480387d 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 736 BLAKE2B bee294919ec85e849fb8ab748f47c7b7fef7e8180c0e1d8e06e7ee706703e789a7d7497edf13b5677fa3ffa814890b1c0a0f4f3a6cab1ef2b9acd47b6cf4f8be SHA512 d71ca74fa12638c045fae6bb9bc20c7bcc1f44a45b9f714fdc8eac02bd8b9ea2e45136d2b4b4b28587480cf11b437c304e7664e9a6a17209021b0119d99ca5f2
+EBUILD libcuefile-477-r1.ebuild 725 BLAKE2B 4536eccd5a4a47daec8dcaf4c2701f2e032452b3b909a359455739eca0ae7d89fab48c54f3c035392478c01fbb8526bd7f80d3cf3f4a3fad5c51df7dd180b418 SHA512 9f69ea044435f2e5d88f204368bfc735ca522d38e0889d02727e0dbe62a708978ab8a31261f4f22c0fe380b039763b3e5db9eb7e4eb6431a124fdcde8ba2cac5
 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 b91d8f729413..8cdd5fe4c4f1 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.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
@@ -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 ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index dc1cd25a4277..97e73f41f16b 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 1333 BLAKE2B 5c79609f4c18fe0d2af9b7fac63c76cf4491f6c638843ce128c82a73c55f5fc252ec97f0d86df8b89fbe24c9b4c448824623f2b0999a3b1fff028826df757823 SHA512 e2be510f1f7c6b693cad2258232de215f865c8657f3a91c32ea608263e4986a66c0873f5ddbc2032bc8d329abca032f4048488182d5b292b7eb2c6f2f93e3c0e
+EBUILD libdca-0.0.7.ebuild 1322 BLAKE2B 72d80c5f1a3ebabffddd9d98fe78a1b219b3e4b4770d5d03748f394c930e086a583e5b0e82f5b62b5ef96dbcc23483dbf855deda398bd8ae98c1c0e9c89bd8db SHA512 50e0a63121bfe6b0fdc61be0b6c17e9a120023b6ea1c0892f9c21c4dc581024c7bcfcdd6d52e25d3f729045f0eeb71da2a5d811ab2f84c4364b15af249d689c3
 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 f284b8597bd5..177a74cd0a33 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.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
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index e3cfc5a45d11..f88d8338c505 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -3,5 +3,5 @@ AUX libdv-1.0.0-darwin.patch 1387 BLAKE2B 176cf7d2b8d8b6407615782f74a169c7d32d4b
 AUX libdv-1.0.0-solaris.patch 4334 BLAKE2B 0b1ccd282e6d5b7fbe0a9c8b08e7b256af74559c12e06f35481db64e28d44febc7ac01d0bf70de79359fb11bda31f526072fb686715dcb3f33a552ba6d58f9e8 SHA512 e9a54eb2cbd74ec22d912e868566283365e15b831596b36ed06e20abdc0c87803e5b42d0dee810c2a19f663abf6e7358fdb8335e189b75adeeac8bde7b3e8e98
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
-EBUILD libdv-1.0.0-r4.ebuild 1260 BLAKE2B 0617ff7a9b389c5ffb7a026ead56233e8ca407cd10f08934b6fe99d1d0ccbcfda436ea6a8693807be2dbad8458d87101c0c5939460ffce384675e0ea634859cf SHA512 6a6a6b92c4f96c28eb39921fff213e76a3526d147dd3fc8195fe19a5d7427e1a80fde108c170bb468f29e3fc733b11f8019116728a5d6ed234898b52a65ae640
+EBUILD libdv-1.0.0-r4.ebuild 1249 BLAKE2B 991f93d54941dec15d7d0f584b6ab6ad624787ccc1ed8e1fd1a49c99bf7c66a1af46dde7cc4ca14c644b53e4adad4851fc12a5b2ad4cb19e1d7de865e6c80ebe SHA512 f8b13440a635b27279a5aa8058d7fe2137058956519150e94bc20eb8152f0b930c6314fee85bba2f68a621f449532ebea9e6dcef211c239bb7f5deb73b3d1225
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index c981dfc7a167..d109004f9785 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.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="
 
 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 ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 99de38823ba9..cf52fc49779f 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,3 +1,3 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.4.2.ebuild 781 BLAKE2B 3b2ec9ee133e3919bb527257c70c30437c0332bd60518f01e5be89c96bf6eded9ef43fa834ac90db1961d0c3e1f9de93f0ace7c3dde22a3db017092f6f7adf21 SHA512 267a06c88a8fa15c2e7cd2497fc31b26785474d817c828243c92035e4ec9084986f04966948dd29f1f1140a4e461a8036a3df2622f71763d8bb39b99d29d96ae
+EBUILD libdvdcss-1.4.2.ebuild 770 BLAKE2B e32f48709f4d5af4b13a95dcea63a9504363fd30442b701d95c102e040b77c9325b9009c0c8e5abc1f899b8957481b9cc1454ac610c2a1705c11f111c0da2fd9 SHA512 03140bd23c096faad202ed0623dd84793b1fd3534dfca80f01b8a93a2dfadc49da610674a1506a3ce637da3f51eace9e2e4735ca9febe88cbe0b8a6a80228ad2
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index c25e633de495..300bb5732c91 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 353042168824..ae38c8dda013 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,8 +1,8 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
 DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
 DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
-EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B f2e7ca059a0bd8b545b2fb857e555827c3b5eee4f479c0bd75e4bc189b71025f628bd57b20d394fff6e55e585b96829a2ff9c31a33d1816a0488e844953f4e0f SHA512 8486624d1b0dcc2c80f9bf1acca8447c039741b225fe59e7d71bb94b63645b4ab2c1b7af733cf05df872d904334919363faa13121271f4074484d4684a25cd2b
-EBUILD libdvdnav-6.0.1.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
-EBUILD libdvdnav-6.1.0.ebuild 1172 BLAKE2B aa793ea1e8c6859f40d678bee33c92c52545a150f13ba3c16f9ef6da20c8768295eb9df1c0057fab1efe54007558348ed082990568c2cfff4dd0dafe0fe0e43b SHA512 e0eb20a2e0d443298ca4e4bf14623a4eee87c733f68031ed9780755f8fee94b597d15c562da8cc9569645fa4b68b7a5e52edac2a91acc09520de58da26598026
-EBUILD libdvdnav-9999.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
+EBUILD libdvdnav-6.0.0.ebuild 1141 BLAKE2B e70d36b38a418b7eb7ae0247c69d0623ecec9995f5e96076e7664c6408762a373535a0c999d33cd0655bdf70f6fd737806940acc52fc4e8f075390d1ecc8b7b6 SHA512 d0f0e737ac5d25ec00f342de77210ad51d225f284ace5a6d22d11b1f8c4bace5ea6f3f01270e583df69aeda6b9bbc621bdb7f057b6b8a757dd1dd1ded0c04f33
+EBUILD libdvdnav-6.0.1.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
+EBUILD libdvdnav-6.1.0.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
+EBUILD libdvdnav-9999.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index a3904ad125eb..a873e72aae53 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
index 4d90610679df..8abfcfe142cd 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
index 24b463f1a4b5..8eb352aae945 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 4d90610679df..8abfcfe142cd 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 85010c380457..dde4e13645c9 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -2,9 +2,9 @@ DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9e
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
 DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
 DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
-EBUILD libdvdread-6.0.0.ebuild 1120 BLAKE2B af5b9cf20d17d56f243d0c02d1b02a0e73138a88b021dd2ae7f8763edadb7d42a091bd713f9a3c0ea83ffaf35fb8074562017778ef9caf87321c264a12829018 SHA512 a54038c46bfbf00875e5b578d58c169a8db493777034a0fa819c5bbb804ea200e0b7a23ccefbe9a10e68a039c408c9659b88e0e41f2965c6a00fd6cb481b9507
-EBUILD libdvdread-6.0.1.ebuild 1136 BLAKE2B 33c4c015352f6022e0af35590067fb3c4e28fef3f46ee1459775b478600b3d15ab294d97e8cffa23340c96b94aaa0bba0be05fabfdb603a5167a27bc829f412e SHA512 537d8d40bd7c93f872e97c603ecf72d550aa7b2c00268a1cbc3ef070ef16f0d50193138e5ab937dd2c6fba82113787e249b42e3160e2c438c76968c3a9fa0553
-EBUILD libdvdread-6.0.2.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
-EBUILD libdvdread-6.1.1.ebuild 1163 BLAKE2B 69c0695c6cdbdc4873ebe6471b694101307e2dc897613fda42806f254b16875ea461b65f51b39893ece4cfb16386aa5d8a03984fd85291fa0d37932bbe2fe58b SHA512 7629ccc5d56f7ff6ef90905c94e759b0f422298495c91a2d518faffab1f02aac084848ba8f18b954bfd00dbb8531944b6e0ea11e4806a9e5ca5bea332f40818d
-EBUILD libdvdread-9999.ebuild 1170 BLAKE2B b1d522ff8819614362dc66d43c911f57955164692f93b197e7350177e154c860c8b84a5ae08273c3745d5a4e65f1665a523c6e97d898d24739e9387bee8321ba SHA512 daa7b0fc6c4b83604cda58d6c4e1737dc2423f99ab89652a965f65320865ddf80a8f6609c0871a3f6a302518b96f40f04a40f9af3d3b79bcac7fc35e10b8e2b6
+EBUILD libdvdread-6.0.0.ebuild 1109 BLAKE2B b23ad20e05e1e3003e387e9662b886bae8ea1d785f0fc0e05bce9307f73b8630a1b1794d935ccabc66e0a05e46d593026b38e82a8c211a767e3394f5b845f7f7 SHA512 74c433fc6d04ecdf79bb3d755de546959c58e1a8c2186e8c4d4da13ad5cfe53d3bc84a6e108fe5850cc4debe119317344ac3b7069b202641819e684cc351e7bb
+EBUILD libdvdread-6.0.1.ebuild 1125 BLAKE2B 109dd2f65640717d4a40b05eae53b19ea54c485676271f0b4a23eb7105dc776b664dcff2bd3b1f6e96a40797b0f09ff518f55b69b434a7ab7728ec296be8b25a SHA512 f787b05e1646afd5d4842ac4c5e7352509fe68f7963e5586127a04b008e43ae8b5f2afb1775e819e6583c76ce5e72746bb905bb9621604e67cc0cf9229adc9d0
+EBUILD libdvdread-6.0.2.ebuild 1159 BLAKE2B 06d87fcbc8782d87d81e0003922b3033d1d1da12dff0a08841f00edb41c95d8c4ae3dc85718f7e7cab819a32bebc255a47b9260848c1572c59e8219ac58f3d7f SHA512 cd1c0938191bc4149a10ef76fdd84ec6cea2159d6d7ac8065502a6dc8300aafc44c666528a229c538aa283efe99c66f242ddeffa636563d180a9fec0b0fc69d0
+EBUILD libdvdread-6.1.1.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
+EBUILD libdvdread-9999.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index 77d6a7081fd2..704a8b6c7306 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
index a2e6f930960a..d51b2374807c 100644
--- a/media-libs/libdvdread/libdvdread-6.0.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.2.ebuild b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
index b35ac186b9a4..c793e198f05d 100644
--- a/media-libs/libdvdread/libdvdread-6.0.2.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.2.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.1.1.ebuild b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
index 3403d3dc06a5..1ceaffdb4e64 100644
--- a/media-libs/libdvdread/libdvdread-6.1.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 1f271a77fb76..7eb3ec37c638 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.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
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index f2a0b58ae2b5..ba6d90dbc1b5 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,4 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
-EBUILD libexif-0.6.22_p20201105.ebuild 1483 BLAKE2B 8d8a642bf8719d4834dd57789ff752f3a6a25ba561308b5ed4cc10b5451392e71aa45588ad7aa0141b159c9d15ac6e81db73bf44227209ef25520f7293b93d89 SHA512 bcf891014c2824c19029cb29648e46385036a0b82b6af850bfebfdfa8876112a0aca12e6d50a0849c6093a4a602531254b8740fcd3a26b32952341de7b6eacc7
+EBUILD libexif-0.6.22_p20201105.ebuild 1472 BLAKE2B 200f622089f3d8cac1bf75e9e1963091611694ad689bdd2ced7f818e494f0dd55c6f8a85b608c95c969f48a8b8f054e88fd7b698a5e556ab7563e9b4e9f1c120 SHA512 c43b9826f17119db34e0233233e9bb7f1c42073052d23273f228607a9359e9ac42c8c5004abdf31a6a81750eeb36fd18ea51d95fd46d5bb23cd0dc7e7e738309
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 5f22a78c8499..1e9c5d0db4e8 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.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
@@ -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 ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 85b69d74699f..6532ea568711 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4.ebuild 2643 BLAKE2B f3203ee701775224cbc0fae2e8a0653c0c81cba08060ed5524cc3501bbdbdb1ab2479f485fb6fbbe68c73cca8ac1c5bd9ca7e7040d03a47a951c0b3f724d847b SHA512 e74563ba928c3f5027e6c66d7eb207f9db9e415f16d1bd3508dd609c68c0263844252d1f45fe153b45d1a1d3a4351ca6e82555401a5a16d2130f2f35ddcfe7fc
+EBUILD libffado-2.4.4-r1.ebuild 2645 BLAKE2B 6db85ed1c00907c5f9ec1e4a407aa69a0b8b0a84c46d7ce7f02b3668c9196169b48cf690a4d05b1004fad6b7b09df17f86ca5ac5580534c055e9d8d44fb39a4f SHA512 06f363d3b2c4a3ba1aee334d6fa66099715d972877632766c8053cb8dc2bfae840a527ab828d5aae310ea03d84b9a040840e4bef0292fa7f9cc4ea81f5763423
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.4.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index 71156c2cf4da..c7c5b1cf7dd4 100644
--- a/media-libs/libffado/libffado-2.4.4.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.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
@@ -29,7 +29,7 @@ BDEPEND="
 CDEPEND="${PYTHON_DEPS}
 	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
 	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
+	dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
 	media-libs/alsa-lib
 	media-libs/libiec61883[${MULTILIB_USEDEP}]
 	sys-apps/dbus
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index ba5043c448fb..125108291850 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 1652 BLAKE2B 94210b58012465ebeff56d59a159741dbcc4795d21cbd3205923d2b7360b6fe661477794399ef6a8c7c634a37eb95f014bf368e3a2181aa234ac995992085db8 SHA512 519d965a847ba2989b802422a0f1216c5a29a6aa3cd9ddce38f658d78241335bec3373091504f19fca2297086b28def03d202867e434e11c6b3057675f8f77ec
+EBUILD libid3tag-0.15.1b-r4.ebuild 1641 BLAKE2B 5e9bfc1aa7864a5d0fd299bd2a0117e38fac5ca70e3aa0978d152dbded7a0218113b8752389b7f4edd8bcb5184803176351bb6adfd338002919cbbe1d2fb5807 SHA512 4444cc1d65f75d25ce3a5739cd802dfbabccdfc2f18fc67d343fcfc57d24cfbe472e4ad21319f5c86faa868351eca2963aab744cbdf58ef88e109ce7e0da4bca
 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 68ad278075ce..538b52133549 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
index 1604d882c58b..20d480639271 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,6 +1,8 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
 DIST libinsane-1.0.7.tar.gz 964471 BLAKE2B 8c91f9799fe0f4bd3181e62a31396f2eb0670b41bc6c231da8714d87dcf854299fd6777481fc0cfb70700d1f34dbb453695451ea2e09ab180a14d601cd678197 SHA512 9c9f884fa3f99a7b04882a4cf866ab5c0b7abb1f60ac75ba921856184ad1471de41dc5a0c312eba93eb82c75d54bea9e30c76f2ee8b647904da700e013fe3ba9
 DIST libinsane-1.0.8.tar.gz 965255 BLAKE2B f87281f599b097a077b3d09457585c31d6def2b42fcf66bb4207998cdd3e609b2ae4034f6867c49869668ff411effdd150d23b1ea0e92cce45adf43e23203c80 SHA512 810a7e7005b93a4da53aefa6b3c63824800eba5fee9b945d45f64372a98e04e6fd5fd554db817f2b41c481ec78b3723b151337de6cb5784d423868e19bd36aa3
+DIST libinsane-1.0.9.tar.gz 965461 BLAKE2B ee464d8b3328e8205dbc04d779c8c55133c3bab8b5483ab151870c22311f5d5c000a535baba95ea6362d130f57b6f185e9391017f808dec4bf23a93109546337 SHA512 a3d5ef16363454956c39767968515db76d1c279035e3a4c6a7db77a3e99e409b77cdacd27ccfba0fe80f5bf36d8c37d700aed551645b6038f3b770b2eaec10e2
 EBUILD libinsane-1.0.7.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
 EBUILD libinsane-1.0.8.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
+EBUILD libinsane-1.0.9.ebuild 960 BLAKE2B 2a1a06eb5298f55876733c54b44429ae5b725fde3d58107be717d6b66f6b7b536eb3dc7f3bbbeb9605e1143075dd5d3f787c698254298df1a2a98a9085e4af0a SHA512 a5b1eb340dbeaadd6874e3dd4feef06c115bd6c0bae62fa95dd0288ffd85b45c2745a8095283f150b32bf5f8bded24755075937ebcc1d6caf3dae0bf3219144c
 MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/libinsane-1.0.9.ebuild b/media-libs/libinsane/libinsane-1.0.9.ebuild
new file mode 100644
index 000000000000..56d97e6d53c0
--- /dev/null
+++ b/media-libs/libinsane/libinsane-1.0.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson vala
+
+DESCRIPTION="Crossplatform access to image scanners"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk-doc test"
+
+RDEPEND="dev-libs/gobject-introspection
+	media-gfx/sane-backends"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-util/cunit
+		dev-util/valgrind
+	)"
+
+BDEPEND="dev-util/glib-utils
+	virtual/pkgconfig
+	$(vala_depend)"
+
+# Tests require an operational valgrind
+# https://wiki.gentoo.org/wiki/Debugging
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 1ae6084becd0..e828e93efae6 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -3,10 +3,8 @@ AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5
 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555
 DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
 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 3063 BLAKE2B 0d12c3aafee3fb13e293da2508cb3a1f8ed227e7156a2971bcd447ddc5304417f938573cc65a9e598212771fbcef38d63da5b133816a1c7e105081ce665ebe16 SHA512 18c488de7f5ad78b083ebbbb2bc9f842d2e1bff811042ddb0a2fbbe64eea08b4dda501202c13e5818162c711f867c5f1ed119bb0e6c365797c9c94185c185064
+EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2986 BLAKE2B ac2af06f2cf40f1f8ada21d841a46d8ba6fe8908ad19e9ab9e7c1f1eb607446f466e1c7aa79aedf856e08241ad6b61c7fbc5b5768b5a7ebf6d0fb481bc77332a SHA512 a6cbfbfbc7ccf0fd7f5e96935a378677f3435de7c3fd260c5912cabcb68a6820b18ade6347f8bfd9495ed4df5d7d5e4c944a0cf1f0021bcd71073925b3151cac
+EBUILD libjpeg-turbo-2.0.6.ebuild 3048 BLAKE2B 29f41776836e7ce5d7f1f88adcae28433166e5846154341e6c9237dd70b4ba0665b0c312c1027614a9906ee0995256edae47daebe189fc91d2e0891d34995ddf SHA512 ea4539ef8db05f4cf1c1b31a4bab3ebfeceb16ec8b270d1bb03b866c402815fd10dee1a22869546f90cca3f555a5ac75298270ba01d818372462f71e1be920d7
 MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
index 7801212034da..947ddfd54687 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild
deleted file mode 100644
index b56919a90a9e..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	for FILE in ../debian/extra/exifautotran; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
-	done
-
-	for FILE in ../debian/extra/*.[0-9]*; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-EOF
-	done
-
-	#default
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
-
-	if use ppc ; then
-		# Workaround recommended by upstream:
-		# https://bugs.gentoo.org/715406#c9
-		# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
-		mycmakeargs+=( -DFLOATTEST="64bit" )
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	docinto html
-	dodoc -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
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 40eb4931c2a9..7516ff286242 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.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
@@ -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"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index 61c32c290c82..b3b2e3195f33 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,3 +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
+EBUILD libkeyfinder-2.2.3.ebuild 653 BLAKE2B caca1cae9f0e66b72a8934fc05c52e448f274c8e0bd07534b1b107d9bb33326d6326c341bf31de5004c3bf15e53e552ffa25939122299d8399db0c08bc6612a5 SHA512 2788c76a06485cedbfa5eb72ef84a22538c47d330c4c353b9470c73dc9bcb95258b091630508e0cef81ab125551464b262c62a3db72e559335b9d2bde0f4eac2
 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
index 9a3be69a665b..a6032b4b6ffc 100644
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://github.com/mixxxdj/libkeyfinder"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index 33a22a2b0465..0685cbadfb77 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,5 @@
+DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
 DIST libldac-2.0.2-1.1.tar.gz 282323 BLAKE2B f8e4a05130b47e4c46070c3a9f0a085451bf480e3d90579342f66edeb77df665c89bf1c81d65d5366e704c5396335de8263ebd6ac1e1d1350714acb3775511e9 SHA512 f1aedb3edc0421b7a9d49a9d2e347d8ab19d54e37f0e77b3673f92413eaccdbbacb678e2e89a23016b22c768156148a82b7fc996bebc3a4cd4451ffb606dba3e
 EBUILD libldac-2.0.2-r1.ebuild 747 BLAKE2B e6cb9eb76663000abb0ea602b6cfad1b257a211f89685048a65fbb771001b106c294092a09eebbdf766173ebd3f44e4954366f9b4d38574ee0b69569342158a4 SHA512 034a41b665cfb4d3b6c6b7a5e7546696ccfebeebda6280e470e392d4f58d098d4f263ecfaaf0687b4bb3cbf967fffcac7ba3213b8ade8ec1a5f517493245f0e4
-MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
+EBUILD libldac-2.0.2.3.ebuild 610 BLAKE2B 11becbeb1b6b48316c6af6eebf98970ba8109d14d300bc070d5e1ff47386b732fd9a70e95de1f5471bf5eb5e4eb0b5affcaf8b98414dc93326aff924182d011c SHA512 b93edd1a69b3ee58ce159fe57011b9618260c10f9380abc8d22750c112d91997a0991ff7617740f7f992e636b27deddbaeaaa4d3b17af799eefa42855c8f5c15
+MISC metadata.xml 294 BLAKE2B b538426aee9fd5b62c00e4ff45c2ad8f1debc01fd47c73888f00bc8af07565f0d64adcaab29836efa44dc78ee286bdca31302230fb3de99e48bfcfb91be3ae8d SHA512 a0446763cd8f9d5650a05beea3fc24712565c60585b70d2f1b704bc606f9fbb62a8905da2bd392b45c0b6f3855c23d4eb6139a58c005c705aecd64212a7fd47d
diff --git a/media-libs/libldac/libldac-2.0.2.3.ebuild b/media-libs/libldac/libldac-2.0.2.3.ebuild
new file mode 100644
index 000000000000..2be002228f12
--- /dev/null
+++ b/media-libs/libldac/libldac-2.0.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="LDAC codec library from AOSP"
+HOMEPAGE="https://android.googlesource.com/platform/external/libldac/"
+SRC_URI="https://github.com/EHfive/ldacBT/releases/download/v${PV}/ldacBT-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/ldacBT"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLDAC_SOFT_FLOAT=OFF
+		-DINSTALL_LIBDIR=/usr/$(get_libdir)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libldac/metadata.xml b/media-libs/libldac/metadata.xml
index 38b28ff6e621..b4ce5e61c274 100644
--- a/media-libs/libldac/metadata.xml
+++ b/media-libs/libldac/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EHfive/ldacBT</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 333dc43316be..8ad92f9659f8 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 2262 BLAKE2B 00c5f8b97a1c9d59325c36ca40927e848bc4dc2bdfe593f77af820dde4763d8ffb86c20ba52699649f0ffc96ba5e59933aadd0d7a5d28ddb616ab742e20c60cc SHA512 8002cd398c61ccc2a3f26081a1f37db81cffe691016c827740bca694cd0ff21e67a08ee78676fa1916180f7b00eb6f915a9de50a85a1c0d8fb5185f7af05ef0e
+EBUILD libmad-0.15.1b-r10.ebuild 2251 BLAKE2B bd03028a7f5ed32b621e351f060a51bb40e2acdff0d6caf7027defd1b91891730095457d6c5e707921edac7445cae6c20b5e0d8ef6c281325f96986d713c694b SHA512 3cf65a3a1d12a509ffe799b4713fbb8d79ffe1719c61c37d675571b2b243d321eecac81a56528bfe82e3955191c1c9431469d037d33ff44037a841a143e7da7a
 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 37ae3ec4374c..62d80839b6ba 100644
--- a/media-libs/libmad/libmad-0.15.1b-r10.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r10.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
@@ -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 ~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 ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index b922521c7e78..ddc6036565a8 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 2149 BLAKE2B 4fc7ee1e7abced3c1e21a635c6e8e5c62b1042676adb876554e272669e2dcd6335e87eeb22a2d4a3616dd4ea55888ad6ea811a121fc9a23773963a70d3fde780 SHA512 100769ce98fb0a75bb6f73b599dfd17973a5a3e2aa87ed9eeebedc76314c5ea749d03e60483c5bcf65165425ed147c6034f682bf4f9caef997aa833273251e62
+EBUILD libmikmod-3.3.11.1.ebuild 2105 BLAKE2B f88b06a6786d76eee321425b518acdd79ca613e1f74a30bea9df11c50124902ee701c89d6e96844c863b390e7d85588d5e6c11c1c75b068839437499416cbded SHA512 0b30cf389006298c8ebfb2e050f8001b76dd0222c320515b1516de8daf368c00ae71e4644ecf9caaaafab440f08df4dd2f377514221e4ff39d4a6ff83775c4ab
 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 86d7055f676f..22a960beebb2 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.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=6
@@ -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"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
@@ -39,7 +39,7 @@ multilib_src_configure() {
 	if use ppc || use ppc64 || use ppc-macos; then
 		mysimd="$(use_enable altivec simd)"
 	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
+	if use amd64 || use x86 || use amd64-linux || use x86-linux || use x64-macos; then
 		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 580f9bffa1a8..9fb55763e2ec 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 1232 BLAKE2B 74dfccb86b83fed6ca05c703e3633c61b5ba02f4a1b908d4125f4da8d2b238cc53e7568e7d7335ac6a8f0d18ea27ea24405134d6a70759d9d856ac3074d1a405 SHA512 27c2c36e5e8897161faaebfd7a24f72b15559db74395ae637062247c7456112eb407aa66ae0f94999e169e735643da86a6865b284b5cc7fb39f051394840a625
+EBUILD libmng-2.0.3.ebuild 1221 BLAKE2B 0463241e6eb9f36fb561c0661d213838b100727b4e7ef0ef81ae9e903b330b365a711a23f5d70d5400d509b66c30a3d321d29bf0015999b80ff03fc93cdb6bab SHA512 739abb6ab344fa3c2f30897af3eb7ce99a9ee913863fc6784a725fc617eb0e60967c36f1624030724b98e909888f36a9532a540158bf4b1f432b92f679e8926b
 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 8a0c197faf78..cfdb8cfeaeae 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.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
@@ -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 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 97f849bcde31..b6519df7d86e 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 752 BLAKE2B bb2ed7e71a7ceeb8ca60de29d673bcb9985669478650ac61e12192acd223f930f51ffcdd28a25f97c7a9789ba5f7c8f7d384c9682414bc0c3086349e89570a9e SHA512 8403ffa385e6d44cdcafe222d7550c417162f3d2837c28d0053b4f7eaa53c13e3e2833980840dc4e4695cf6469246262275d7a5efa4cf0dbecf3b4b6f385146a
+EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
 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 30981d2829ea..82c45f86a9c0 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 06eb599f1318..a92c6f54f4d6 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 1319 BLAKE2B af8978592b6b962e69c0d77208e02004612cb49b851ff3c69dc23c8ccef517fce55c143149d13bff5c4feb9769d56b2f31e8a52683008416757603cac4aa7cb1 SHA512 9fe4e1da4d110e609fb7f28d9eda084910c7fc9026d7ac4f44468ddad76137306bc777b0f38f3cb1085db37f4b7efd3f4a4838d39e01aa3f9c698e973f8005f0
+EBUILD libmp4v2-2.0.0-r2.ebuild 1308 BLAKE2B 38d9c1eea6ba784d8c7fbe8a028b3049206cfa48beab69f0e9ab659c5983d14cabf9352ec0bd16da8136a896049a792ce110fd7052169b10b52fa4171bf98c1d SHA512 b2003f277bea9b70bce7e6cf948ad6350ded28e2614f50ba2d97fc487fa4981448cc131252e817b5d8cefe4fac26eef18e6813e72c9da61fb24c99e3d02c78ec
 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 ba95affbd221..2ecd80985870 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.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://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 ~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/libmtp/Manifest b/media-libs/libmtp/Manifest
index bd67f749fd02..6f5ffff892b7 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,8 +1,6 @@
-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 1586 BLAKE2B b8e136b01d8032154eee23d6e3e1a880bb7468b65e58cd260bc8bf2b67493a7530853132152b1e247a64a764f9c7b218ee07278d9c3e0c007abba84817ad8c75 SHA512 cf7a132424e4e3e9322fef50414fe3559219d30a69a6736d279c9d0f01c27c4b6f80a493720c86e926d3559a137eaef954d3f43dda4c269ac7df19f558c6e673
+EBUILD libmtp-1.1.17.ebuild 1582 BLAKE2B 6598ad68e51ea6071dba3cad5a51944277301b30864400eb9803b9259a2715360b9d7ed6241fc6f59142d5ccbf1c4d33595067e22c0151354f04ba35e3a86fc3 SHA512 1ccdb125a2fc6f0cce2e3a087db830a7559c094afc87cb11f291834eb42b9719cd4da57e0c41ab61e34b0dca334fd5d19fdc33282806752a052e7701759aab70
 EBUILD libmtp-1.1.18.ebuild 1605 BLAKE2B 5323e0b427108d356bd879a991f4e6d03c897d4fdff985c22ffccebd458a81c69a2492d69592f28774aac82540cb0999cd12061558592d16eac7685a84597cd4 SHA512 63a027b8b143608dbe555369d131798b5b7298f49d814265b5499af15bfaca8ebb860399fda2e8366e57793bab00ea6db5a2a842ce3741134d9fe25952914c43
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
 MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
deleted file mode 100644
index 86c08e7c28fc..000000000000
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 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/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/libmtp-1.1.17.ebuild b/media-libs/libmtp/libmtp-1.1.17.ebuild
index 073a0c5cf71c..0c0f57bd929b 100644
--- a/media-libs/libmtp/libmtp-1.1.17.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.17.ebuild
@@ -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/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index bace23cd3bc0..115b05634f7f 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 872 BLAKE2B 279c47a72be368499a14df9e862f6c5f91efbe068730081a048a8b205ddb7dc669a1b6298e69517a43253999224ec46ba5aa67a33ecce6878296b57780265603 SHA512 75b925962a07b70952ec4a7494c08e9f97a99e58e1e7e729cde6c3bf161bf5666558bf5962c73e622c8456688bfcbfed12801e62e37e0eda875b749f40aef17d
-EBUILD libnsgif-0.2.1-r3.ebuild 810 BLAKE2B 936f2efcf1336438efae13c76a90da49c4e6122ff44d1fb8961d6fefc81d7829be3efbd66d8652662a897587ddb6f6f636ac7d73f895a5773dc05cc3b86cf32a SHA512 0457e21f42650756dc989dfcc7bbf76383f648cdc26259a05df88f8b1c8b93b6eb67a8331295570f357902c542f9894f353d3c530bdce094e5ac3c780c0e6a90
+EBUILD libnsgif-0.2.1-r3.ebuild 806 BLAKE2B 9d47c9548752bd2e4f9b28cee21c6b5409677434004a0e12da3684092ea353e00c7fa38c347fef96062e4954ed9fdb4297c9655f93d19001e22f316dfb030ba8 SHA512 b782341f335db316a81a28b89a5735aeae80ec13db8e6c839c8246001424563cb08c947c5f3bd00beaff4c94d053bae6a1f188e602b85f51cc620365b68fbb63
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
index 2438890b2e76..357209f61840 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r3.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
@@ -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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 185e7a82ae22..2f2e5e60be5b 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 769 BLAKE2B 240fd389670b3d8778318b28897c43fc81dcbfffc4b12ea7156b67e6c452187a1930ffd68c368f8298fbba500f40154acd2cd32162bd44b4533c551de0dc67a1 SHA512 b3f9298c80dd64fa1301965868dbcab2a2d448d3ec3c17fc5ab715ab62c61a0cabc5766c4210aae57bf5b17f2cff25f32ceba857422e53b775108bee0c611bc5
+EBUILD libogg-1.3.4.ebuild 758 BLAKE2B d20b7f1998c1fdf3e47feacdf20aa891fb1935b60db2f889ab059c9d97e41d6948c0711af642f8790c9a4837970d02290839eb072a151509615c5357c704da98 SHA512 e3ecba0314a8006de505502e9d5ca124047c632050e2b707daed8f563c668995c4a46b7e7a101c1d3f64d7cb3da1c401ad49a959938f47726166f66a4fb5ea6a
 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 343d9f31cee5..fdaae8f84396 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.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 @@ 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 3839da752156..15f67fa5ee37 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,7 +1,5 @@
-DIST libopenshot-audio-0.1.9.tar.gz 1710939 BLAKE2B b9b117fe033c00219e9f6babd1d82dccd2f7a3754e916e5411047deca545bbda8c18ea71a1c7ef0952458ffd40b9f109a918c7c226bace569a8be1927c050bd6 SHA512 8113bf6f5747b0f72391a30560f49c97b13c68994097170797cdfeb44813791b90b073a6caffc91ba1a2153a41b86e8c1b188de0daaec3f5c785013c049c1b4d
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
-EBUILD libopenshot-audio-0.1.9.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
 EBUILD libopenshot-audio-0.2.0.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild
deleted file mode 100644
index ed11d8638bf2..000000000000
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.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
-
-inherit cmake
-
-DESCRIPTION="Library for audio editing and playback used by OpenShot"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 5e4bd0ba138d..f13ba25da2d6 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,10 +1,8 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
 AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
-DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
-EBUILD libopenshot-0.2.4.ebuild 2258 BLAKE2B 1c18783cc8c33d985ee21044d3561eaae01c26a38df21b65f0c5ef18a783fa646fe453f91eb80fe328ff248f05bb51333d4cc5da03a49b28286be38a9928bf85 SHA512 1671c4ab1ba07e01f4c5e517ff4960ea641b24fe0cfb7b82edd174592c03820aacbc39140ac7591d983ec8dd39209a1fc2c7714137d529ce858f079c2106e056
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
 EBUILD libopenshot-0.2.5.ebuild 2355 BLAKE2B 2b7225b9b3bad2843595c4c6657392ef4f77722929c2de868222cb619354d05ad4f4e1886fb63b4208835b27396a6db57b24d337f77a7e89043c17589f1bced4 SHA512 5b0c6e16eb01ad7b5858397b6e803b83d32d7c03e5bdb7b66c1d733f37136da930976b8f17e8bd540f4c9078f1b365e4d01d8ab7b00423420fc4eac45b5c3c0a
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.4.ebuild b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
deleted file mode 100644
index a8da723ee468..000000000000
--- a/media-libs/libopenshot/libopenshot-0.2.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake python-single-r1 toolchain-funcs
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/18"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +imagemagick +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/jsoncpp
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	>=media-libs/libopenshot-audio-0.1.9:0=
-	net-libs/cppzmq
-	net-libs/zeromq
-	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# https://github.com/OpenShot/libopenshot/issues/17
-	use test || cmake_comment_add_subdirectory tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RUBY=OFF # TODO: add ruby support
-		-DENABLE_PYTHON=$(usex python)
-		-DUSE_SYSTEM_JSONCPP=ON
-		$(cmake_use_find_package imagemagick ImageMagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_build doc
-}
-
-src_test() {
-	cmake_build os_test
-}
-
-src_install() {
-	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
-	use examples && DOCS+=( src/examples/ )
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	cmake_src_install
-	use python && python_optimize
-}
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 4d9e351e627e..4d8d7aec98aa 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,3 +1,3 @@
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
-EBUILD libpano13-2.9.19.ebuild 901 BLAKE2B 5f3ad769bc933c544b99876fb0f1d11d492d54a8ed5a01f20ec9c3e59032c0cabb3b9f28895ee68a1a35b4b19207d5c27b4f636588269121934492713ac6e632 SHA512 0608f468d2c6f4ac0dc57612fd183986a673e9802194f5a7f716f62bf331488070d5c8ea84746c0b4471c2144c8e442a65341170cfc7f636755487e8f4b3cd07
+EBUILD libpano13-2.9.19.ebuild 890 BLAKE2B 72b5e0e4afe75f9f1d7baaa9168ef0f68b3d8dd24ad4d6aca10c94ff16100fb3005e6fd60908f30f4a52762e8749ad2a7917a1b8cf88e58b19ef599971095788 SHA512 06542458d0a41d3ee9b8e9bd4e0f75965c219a953b7358e8903b99e2781a1827d18966d342833ea8283caf45ca3ae1e44263c5f7c5b5cda2130d4f24dc11e7be
 MISC metadata.xml 324 BLAKE2B 04d40b636b02143022e3a5e9d5733a8bb758937d86d0800faf7dcf21b501f97ff8e970e13b5e842492e74f237dfed8f07efb40ce3e952172c41a208196a4cf23 SHA512 40a9330f4bbbfdc98598c5677d7b9ce485fe13e96bfc976f3829e881c5da234e8abc6d5c9e8db7522ba32536d953b2a0daddc878bc09fb474d446139da33f3a6
diff --git a/media-libs/libpano13/libpano13-2.9.19.ebuild b/media-libs/libpano13/libpano13-2.9.19.ebuild
index 893133638724..23062ff71a96 100644
--- a/media-libs/libpano13/libpano13-2.9.19.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.19.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="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="java static-libs"
 
 DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index 15c8d4d56d55..9c80a59e9ceb 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 1721 BLAKE2B b84f1e652a1363aa58fe54b2ba2a0f0fb4b378649be6ed4c957a51797b1305fab08e5d37a3bb4dc634576a4234374d3a9db52718360c78479a2f74376f44566b SHA512 cbd4e614014bc574cd71d240843b2d7931d3c9baf616040bd1c23108011d864773f1efcc8a914a9df4c04488312460271f018c7ee16a3c124af40ed2d5f20637
+EBUILD libpng-compat-1.5.30.ebuild 1710 BLAKE2B d02f9f9768c1a7217f5d80af290f9a4c9adeeb9110fc957ef99b238fc68ca04d7d8d4aa6bd933df20b53f870bfcc65ecc5a1776fd9a796482d2d057d83d3d813 SHA512 8060fe82fbea04334e3e111344c39e7c3c6d36cb9a14c1328538f946d4e64abd52cccf2fad4314df50c433c36d90bb82679dbf82085d94382f6a385559cce3c2
 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 fd1b3b679b1c..9d75a9357442 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.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
@@ -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 ~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 ~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 e2703d207e5c..b4cafc210d35 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 1362 BLAKE2B 7694f689e4e8ab372c2eaf1aaf80d022b9ef31b91e73d93c389583193b7b9f61b295370ecd71cc93f0b3b783970dae5275b0ef9935e8b55e43a2911edb3706dd SHA512 828d4837f02241dbf2f353ca2e0e342555347157379c2a15a8c16d44453ff8569aa28dd3fda3819f49a3d5d196bb89dc22e9193cdcdb366bc5439e45e2478d87
-EBUILD libpng-1.6.37.ebuild 1328 BLAKE2B cbd6ef5105eac7309068e800a29feec477471e9e27630144a8454ba85efc4a53f74a74c9d2fa7564bcdf4aedf2c2157c37a3d9d5f2abc83579ca9e7c5d220340 SHA512 653708bb0a6ddfa3a724f919025f69b99e6612eb3eeb737b9d96d40967b8df20ffcc64a36a43e0730e5abbd3c7b111e43a8c3184038b78bf6ef9e4c5ed61995a
+EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 3bcab7762912e1002c9c43c99acbfcab3526833b91da2fcb81e48837f81e736611b41702ddd9bbc56c339688769c0f2dd1a38634dd6443e2d78909d9803680fb SHA512 26c82252134e02af455e328745c08943975d8a353d0275e804c727ec7d7758f83b5c608db1336c396d4f1cc1b67b17a7e2d6031436df143b49f796cb001a74d0
+EBUILD libpng-1.6.37.ebuild 1317 BLAKE2B 70d8454967f4c276802fafa31a698d9382e71e7423487188f7fec9cc21f7c7743ced62a96dfae60fa2c30fda0d7854d3ee0c015cb11f230cc78b2e722febcdfe SHA512 aaae192942e90c6645c3e48989555b613ab1e435b7e6772779821cf669bcb92fb1a4096a7bb6e212d6a213c2a6a28c44988a03fe412bd31e52f8765bf7d85d03
 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 3773ce34b2a3..864911bfec3d 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.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
@@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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 212b96fbf603..7a517f83dc30 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.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=6
@@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 04ecffd3727b..29c571826c8e 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -4,6 +4,6 @@ AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf91
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
-EBUILD libprojectm-3.1.8.ebuild 1364 BLAKE2B 68653f1c1a9c05a94b8090cbdbdd218b40942da410f6574248c162e90b76ce2d1a4bd85054876cf02cb53bfff24880a61fcbf9f15fd3018ebdaeeda357daf02f SHA512 bfcbaf8ea08cfa529e108812faacbdb3eabada214490e16448cb798d3153bbf29af70fcfdaf407f03c723abdb4d0b3f1cada5d819ac3bf1cbee9aaa879506e10
+EBUILD libprojectm-3.1.8.ebuild 1361 BLAKE2B 6f7877e12b001b2c77de5659989533dee96557512bf0caffdfcdf4b8e7f3bc3a24f163afffd1221ef2956e2a64ac0e2236221d9a080c0369b3ad00706ee1b7e1 SHA512 8faae2c779d66b63bf33aec82aafdde8e930ce7dadbbdd2da020e2963d2af10295ca611c9e93085b7b809138721ac7ef671a71be46f36ff599f403fe402e8070
 EBUILD libprojectm-9999.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.8.ebuild b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
index 168c60f314c7..6756ac988c2c 100644
--- a/media-libs/libprojectm/libprojectm-3.1.8.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.8.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 8832586727cf..f6258c19fc23 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 838 BLAKE2B cab0428772ea4466d9856db81704f10f53b848837eb0d3efff84f7dd396a6384fef7ef19cf12cfbcc6a6b223055ab95bab27df0beb7d8efe94b697580d3545b7 SHA512 25f6843fe280187d157726a3bb87800afffd818c871f37d7c99072f0f7a398f120b194c3514b4e51bae3fefb5b064cd5e80d0ef373fd609ba9a0399650241a41
+EBUILD libreplaygain-477-r1.ebuild 827 BLAKE2B 4be893285c22f5998ba34ff9a44ad5501506accaebfdd58eba6369ae721b9654c11742f224c36a6f45d4a718883a522c765590e35c59d830633b29edf24ff087 SHA512 bda2543c10976eab8b6eb24d92f860b0701273df7c9b38a907099c76686d7795c5f6899bf93519161664def3066e7964822d5d10e1fbbd7cd9098a15df701b38
 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 fe77c3ca1683..2014379fc9d3 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.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
@@ -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 ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index a3abd64fa73f..51b9bafd0ed7 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 1014 BLAKE2B beb4cd14dddceda5ad598c29ceb334731274e410b100ee1d015294013f4870be4b84ff44154599d51dc3c32d573305d8fb266547d3a1ecd1990fe03f45a00033 SHA512 a2cfe0b77259e52d448b90d1aa54eed95936389810d2b7846881724fe03126e49f24c933cdf34f75ccb7d27f8054854bf0c09426c1cd49998460a43e3fae15db
-EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B 500d16139947b14a359eec9ab45bfd74ec2ddf6ecd746ecbce2381f7579b8863f44772f72473008bd50a0324c11f676d6be56c3779f16bf6d9ae900d1ab7fc8e SHA512 77961d3ccdfdfe9861d4c429e3fdef3f9bbda46c37f558fd13f49a92d04d358d8f192c5a1d8f48dffdff9d00b74305a270acb1e2f03067c83d045674c05718fb
+EBUILD libsamplerate-0.1.9-r1.ebuild 1003 BLAKE2B 51b1ef8835d7725369e8358e008d0e18e63bb6750b71362244c50fcf8a9d1351e276e9b06a4bfb4ce1f4fa7929ce003ce21b4cd2db99760e607040df9bf27c64 SHA512 ce35cf2cdf645f6dab7e1e8c1c7f3507fd7e79f8d10da27e678ed234dcdb5a9aeaecd705d497573c1ae7cbe4a5301dd2a8177d2e0e635b1b28ca0181b5067e9c
+EBUILD libsamplerate-9999.ebuild 1260 BLAKE2B 93bfb41c34f1f3cdfed84a21669df2c3438a328addb0f6ff82ee3f5e34f7cf73693fc9088b1b9c81902f578921bef63e1bc1cef9b8f48c7c4ca4184a6c357f48 SHA512 80f76da5d804f8797ea6eff974fd04d12f2e419e90e5a6b39cd69ddfab07b289e2b857c3ebd6b856dada110837253b794371dd171b70014bba5cc7eb98515586
 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 70b6ee8e597e..c81aef8573ca 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.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
@@ -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"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index b763d7394fb2..96d8198f8acd 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.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 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
 else
 	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index a5c7ababb192..65b443209fe2 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,10 +1,6 @@
-AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d538748939103f4fea0f77154483e31cda7166da4a1af5305c2722faffccc5a0f98f44c83f82104ed94f7d15ad75ec8bd06807159aff4df7a0425e2f SHA512 af27d562fbf4f7be08317a97d69ae27d57618f4e6a5bc0131ce633b46a1a8f3cc24aa21ee12e427994d319e455afd8dbc3d061a6df6814958b9b787cfcb19ed8
 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.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.3.ebuild 1319 BLAKE2B 904aa7904f0cb650763e4427a2fb50a8574a5a3afdeda7b7108931d989bc3cce19907b85f0ce02be86bf946678c016361527910d9e8676b0efaecb84f4c4475a SHA512 f555c27cad246eedc31c46e5c083ce5f9cb2416b7c3d687b31d32d14129886ecda55c2e61d85dee8e98d00d2c81029636f5d4e778b43a49e72d8e81ee051f93e
+EBUILD libshout-2.4.3.ebuild 1312 BLAKE2B e409e9f703a351d6e0df5dcac4beb3ae9de6c4773257e0d2ef541ea5d3120822f7ddc7938d0f123e250c38669aa6596928c8329b15a620a67b2a422dd40a3358 SHA512 e2b159724aff657070e9fe692981e94cd73d00b7f8d57110364154575ddbf27a111953f04dbec4c2479b3db88f1806afbb5bd201fa1dd95e05547247a3945fca
 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/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch b/media-libs/libshout/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch
deleted file mode 100644
index befd16e38464..000000000000
--- a/media-libs/libshout/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 01fafc449f0de56743d08e7976933c49e2915bfa Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Wed, 15 Nov 2017 12:46:25 +0000
-Subject: [PATCH] tls: compile with OpenSSL 1.1.0
-
-The init functions are not longer required in OpenSSL 1.1 so I dropped
-them.
-
-TLSv1_client_method() should not be used because it enables only the
-TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable
-all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3
-is theoretically possible but as of today those protocols are usually
-build-time disabled.
-To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim
-to provide to highest TLS protocol version (same as
-SSLv23_client_method() but it is deprecated in 1.1).
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- src/tls.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/tls.c b/src/tls.c
-index 4562c7327077..e0e5c1a5f079 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -24,6 +24,7 @@
- #endif
- 
- #include <shout/shout.h>
-+#include <string.h>
- #include "shout_private.h"
- 
- #ifndef XXX_HAVE_X509_check_host
-@@ -61,14 +62,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket)
- 
- static inline int tls_setup(shout_tls_t *tls)
- {
--	SSL_METHOD *meth;
--
-+	const SSL_METHOD *meth;
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_library_init();
- 	SSL_load_error_strings();
- 	SSLeay_add_all_algorithms();
-- 	SSLeay_add_ssl_algorithms();
-+	SSLeay_add_ssl_algorithms();
- 
--	meth = TLSv1_client_method();
-+	meth = SSLv23_client_method();
-+#else
-+	meth = TLS_client_method();
-+#endif
- 	if (!meth)
- 		goto error;
- 
--- 
-2.15.0
diff --git a/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch b/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
deleted file mode 100644
index 55f2189e15f4..000000000000
--- a/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3f07c95482c15f151e10f06c89302d3700c6430f Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 6 May 2019 13:33:48 +0200
-Subject: [PATCH] tls: compile with OpenSSL 1.1.0
-
-The init functions are not longer required in OpenSSL 1.1 so I dropped
-them.
-
-TLSv1_client_method() should not be used because it enables only the
-TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable
-all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3
-is theoretically possible but as of today those protocols are usually
-build-time disabled.
-To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim
-to provide to highest TLS protocol version (same as
-SSLv23_client_method() but it is deprecated in 1.1).
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-
-Forward-ported to libshout-2.4.2 by Lars Wendler <polynomial-c@gentoo.org>
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/tls.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/tls.c b/src/tls.c
-index aed5bfc..d60fb57 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -26,6 +26,7 @@
- #include <string.h>
- 
- #include <shout/shout.h>
-+#include <string.h>
- #include "shout_private.h"
- 
- #ifndef XXX_HAVE_X509_check_host
-@@ -86,14 +87,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket)
- 
- static inline int tls_setup(shout_tls_t *tls)
- {
--    SSL_METHOD *meth;
--
-+    const SSL_METHOD *meth;
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     SSL_library_init();
-     SSL_load_error_strings();
-     SSLeay_add_all_algorithms();
-     SSLeay_add_ssl_algorithms();
- 
--    meth = TLSv1_client_method();
-+    meth = SSLv23_client_method();
-+#else
-+    meth = TLS_client_method();
-+#endif
-     if (!meth)
-         goto error;
- 
--- 
-2.21.0
-
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
deleted file mode 100644
index 345c937f291e..000000000000
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="https://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="libressl speex static-libs theora"
-
-RDEPEND="
-	>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=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}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/shout/shout.h
-)
-
-DOCS=( README examples/example.c )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-	"${FILESDIR}"/${PN}-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable theora)
-		$(use_enable speex)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm -rf "${ED}"/usr/share/doc/${PN} || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
index f55122b4608d..3d9eb17139be 100644
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ b/media-libs/libshout/libshout-2.4.3.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
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="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="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index bd7ad5e5ea21..885b73a355d4 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 1817 BLAKE2B 373ce5312322dcf7b4ff888d5492fd4e3b0fe95b4632c8f4a570087996f014440dad3243fec077c2fb265214f70210d32d9e442e459536daf3e1d4e0143cdc9a SHA512 6a48e61305649aaa19bc2883b13955e4d74adcf54d7c0d0eb0949529a45c0ea122259e705057f8787360b21d6c731b676d62feb4bb395dd07d63c0167d49b821
-EBUILD libsndfile-9999.ebuild 1824 BLAKE2B 5df7f55484c052a979c4f9b86858e4a9e11ee2311f802ddf9def6dadf0ea72386b481d5fc8e182eb481b4908e136aabdcd0a0ec223e3a32084d54f44f186ce4e SHA512 2fd90e525c47680d29596f6e974b34c5e1fdcd98b35898a341e69e412c3effb6061f9450632b5307cbb7d250b9850bf8f0dcf8e8d638a1c328c5b35cbb33c2d2
+EBUILD libsndfile-1.0.30.ebuild 1806 BLAKE2B 6da01f634fe9fdbcd6909a5fb2b2fbc4db1d1d5e043bd9cbe49394cc0949b21fb180b276bc3487909c0f48e14d9364da946be1b0d2865fa93f9cee6a57343ebb SHA512 1dbf804a971370d8d4c160c5df5825587ad81053de5a01a1d5c86d74b5695952f06235c11dc8cd35df72ec5721db0c22800a4802f77029330e2fd07a75120062
+EBUILD libsndfile-9999.ebuild 1813 BLAKE2B 0c4729157478fe2d9a62a708bd35692ad3d74ea342a387fa4080d00b7f6cbbef81b037a01b1866830256ea56ba826cbf13e75d5583bb2ba9f8326cbb8a0f9ae6 SHA512 0a1b8d3c656277ab726c16e0b7b22501bec3896400fd5a7b8e842065019f1d71d8fa1d46a5d7a4beab413c9fc633b3fdf48003c08a40b3606115013c356b7e0b
 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 51993bd49dfa..8a1441d4e2fb 100644
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.30.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
 	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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 4c56a90eda78..fe3ad230a792 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.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
 	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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 0ca7ffe439ff..8337d088c4b7 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 2338 BLAKE2B f529bba6046c5ddc51114abe61f4f2388fd7a53c85acbc16957583bb9abfe2d09e0ffcea7d3687b74ab5068f8ce6bf45bb9dab593ef636af7b068edcec1e2def SHA512 1a490b8f89acc79cd7f7054d9d71c8e1d69ec56b8bdcfc9a5843ab783539daf6e1454df113fa4522ef453231a229e34bbcf30d66f3ac8d336b8e36ae79de877c
+EBUILD libtheora-1.1.1-r2.ebuild 2327 BLAKE2B fc123e4fc340198e4a722b396af046eb9cac3831ced19757cdf00593808e972d3d7eb8ba8aad293e0bdfe5d234a8532b570ed0294654e07637992727547b8589 SHA512 a0450d67ad91541ffe341d1aea3680dd9894ab7be2ce45c562a9df9e014654bb9da3d80e119caf6ddba61d6890042830ef5b1ab6ec408b346f7d9e5365462a9a
 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 f668e9be0a11..0eb94f2d8ad7 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index c516403a4309..189a3aa84ba0 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,10 +1,4 @@
-AUX libv4l-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
-AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
-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 1401 BLAKE2B b4368cd37bd0e4e829c51032e21f8b242743347a31320955a40a34280d8158b2b7feababba1ffac27ac99abe19638f1187652b4f349b607ddd97eb2913d01e5b SHA512 6304a25610b7a74456e4f4e62a0cd72de5f4daa607188a410ee68bc9a58c1041b3af5f44ec1e3c9c9392f8bc673596f5efde2705a653674e1124fbacebd74660
-EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02e3f64c81221aa384353d36ab120ce1d84a331e2c833d04119d2d3a5a70982fd9f3fdfaf3d05d2c0d200a557a5 SHA512 026eb18799f282078f861a2f26f1ba81d7b3a6f3d80acfd20d93431c4507ea6f2815f976e625e84074da3f1b951c1b7335f48572d7bc0ad87436ad5eddbdb751
-EBUILD libv4l-1.20.0.ebuild 1512 BLAKE2B 5930b4a66befc417153a32a23ad808fff04061c95113210c2f98767b79b8800bc1c70e50822505cb0ffb70e4f9fd071a540cdd8cc522eacebaddcee94985310f SHA512 613f55217eb9a89d5a6ece54c4f8a5bd664667a7605a2262f7a94dac06658556d39cb5b94bf996e1dc4b7e681eb64edf121dd7d60aee85e943223614d9528317
+EBUILD libv4l-1.20.0.ebuild 1508 BLAKE2B ff1128f29189f59abe7698afa3c4f4992532a888a96b7a7ae3aaeedadb42749039879f850765bb6e731785a0bbacc6499fbe10d0ac283fd74d67252531230332 SHA512 a9511a92d5d422e6c5380b99cbb4f6a02e0ebd4f64c32465571cf8acc4884b39ee3dda813cc21b739a9b649288369691d4c8e47601db25cbe168bd900a0eba40
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
deleted file mode 100644
index 33855c682b63..000000000000
--- a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 26 Feb 2020 11:07:29 +0100
-Subject: Fix GCC 10 / -fno-common
-
-* GCC 10 switches its default symbol emission mode
-  to cause linker errors when an object is defined
-  more than once.
-
-Bug: https://bugs.gentoo.org/706756
-Signed-off-by: David Seifert <soap@gentoo.org>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
----
- lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
- lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
-index 93594b76..8c11fa9a 100644
---- a/lib/include/libdvbv5/desc_t2_delivery.h
-+++ b/lib/include/libdvbv5/desc_t2_delivery.h
-@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
-  * @brief converts from internal representation to string the SISO_MISO
-  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
-  */
--const char *siso_miso[4];
-+extern const char *siso_miso[4];
- 
- #ifdef __cplusplus
- }
-diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
-index 45aaddda..3540bac1 100644
---- a/lib/libdvbv5/dvb-v5.h
-+++ b/lib/libdvbv5/dvb-v5.h
-@@ -14,17 +14,17 @@ struct fe_status_name {
- 	char *name;
- };
- extern struct fe_status_name fe_status_name[8];
--const char *fe_code_rate_name[14];
--const char *fe_modulation_name[15];
--const char *fe_transmission_mode_name[10];
--const unsigned fe_bandwidth_name[8];
--const char *fe_guard_interval_name[12];
--const char *fe_hierarchy_name[6];
--const char *fe_voltage_name[4];
--const char *fe_tone_name[3];
--const char *fe_inversion_name[4];
--const char *fe_pilot_name[4];
--const char *fe_rolloff_name[5];
--const char *dvb_v5_name[72];
--const char *delivery_system_name[20];
-+extern const char *fe_code_rate_name[14];
-+extern const char *fe_modulation_name[15];
-+extern const char *fe_transmission_mode_name[10];
-+extern const unsigned fe_bandwidth_name[8];
-+extern const char *fe_guard_interval_name[12];
-+extern const char *fe_hierarchy_name[6];
-+extern const char *fe_voltage_name[4];
-+extern const char *fe_tone_name[3];
-+extern const char *fe_inversion_name[4];
-+extern const char *fe_pilot_name[4];
-+extern const char *fe_rolloff_name[5];
-+extern const char *dvb_v5_name[72];
-+extern const char *delivery_system_name[20];
- #endif
--- 
-cgit v1.2.1
-
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
deleted file mode 100644
index db497409d417..000000000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Mar 2016 16:56:40 -0400
-Subject: [PATCH] include sys/sysmacros.h for major() & minor()
-
-Linux C libraries are looking to disentangle sysmacros.h from the
-sys/types.h header to clean up namespace pollution.  Since these
-macros are provided in glibc/etc... today, switch to pulling in
-this header directly.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- contrib/test/mc_nextgen_test.c            | 1 +
- lib/libv4lconvert/control/libv4lcontrol.c | 1 +
- utils/libmedia_dev/get_media_devices.c    | 1 +
- utils/media-ctl/libmediactl.c             | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
-index 3c8335c..59f28b1 100644
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-diff --git a/utils/libmedia_dev/get_media_devices.c b/utils/libmedia_dev/get_media_devices.c
-index e3a2200..edfeb41 100644
---- a/utils/libmedia_dev/get_media_devices.c
-+++ b/utils/libmedia_dev/get_media_devices.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
-index 4a82d24..16dddbe 100644
---- a/utils/media-ctl/libmediactl.c
-+++ b/utils/media-ctl/libmediactl.c
-@@ -24,6 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- #include <ctype.h>
- #include <errno.h>
--- 
-2.6.2
-
diff --git a/media-libs/libv4l/libv4l-1.10.1.ebuild b/media-libs/libv4l/libv4l-1.10.1.ebuild
deleted file mode 100644
index 668f7099e892..000000000000
--- a/media-libs/libv4l/libv4l-1.10.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils linux-info ltprune multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-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"
-IUSE="jpeg"
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch
-	eapply_user
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-v4l-utils \
-		--without-libudev \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
deleted file mode 100644
index 3972a179a400..000000000000
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit libtool linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-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"
-IUSE="jpeg"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	virtual/libudev[${MULTILIB_USEDEP}]
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index c96ed7b84a5c..d92276eb4f44 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.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
@@ -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/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 67a76711f252..731085118987 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 1279 BLAKE2B 3c52c4c345c5d36af8ce5d0205d90032fe7ff0cf8a94f2c577ed97b92cdd250d6dbb064a3f9c19d1df0e710d6e74c6fdc5e7cfa7706a828a3f6eaa7cc49cd3d3 SHA512 3e4a253de8c6bc9936766b9901e6c959616d8156316822ff1532047b56bd5a543785398ca4b07faf556565ca1909d1062776bd9ee96637155ed790e60835b3f6
+EBUILD libvorbis-1.3.7.ebuild 1268 BLAKE2B 6e0d860993ed1b9a557938cd9767f016560ab73f0af4db3448aa708aa329cf2ed1e06a6fd48f5e45927e3a218b676386594dd0688a2e2a97652879135c3adc21 SHA512 bd92718c21761ffe7636d351d66583000ff9dc5c9797489068b30947eb18d5c95e8ff4cd25bc11556aeb1977b05c24401515e7c5881663482c4842e0d404b72d
 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 2d9aa828c9c5..a46c693d8a08 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-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
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index f88d89a0a46e..23156d3ab496 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -8,5 +8,5 @@ DIST libvpx-testdata-1.8.2.tar.xz 422945340 BLAKE2B 117c26e77b9cda30ca083382981f
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
 EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440
 EBUILD libvpx-1.8.2.ebuild 3436 BLAKE2B 5c78fa513348cad6d6a1560a72fc4d0c15c746ea6f52843182f3b30d8d71e1f76ee245c95291ba9356a147de1f73f65f5a7a147aa1cd6d861fdaf5831ec7fe62 SHA512 2fc98db752426b5530a3c42b9a4a03a4e38e79d2746d42be3d5ffce155c9aa5e49f6d17a28c2535bb5fbdae8bea31fd90e0e15fa74ee51dface9b90a2357ae1a
-EBUILD libvpx-1.9.0.ebuild 3588 BLAKE2B 68be1ad2b8b07d1be985be6de43808084460bdd5b46cf40400900f69e070e1e139731f2a29b242785e75fe3e61f6a728e8fb0c4e36ae55f66b1b97fbd73215ab SHA512 1a2ed43e8a0b45dfd97b08ed90a7b217cb1b747991d1f3b8ffc51411e3cc2a1cc36b00038068f747b5708de025fe637f2e5875fc379a6f41cd4bfb859fe266d2
+EBUILD libvpx-1.9.0.ebuild 3587 BLAKE2B 496795027a8ac8f291940f036720bcc88f6c2260e81b110256245235367fecef8640121734c78ba6eb915e934794a9c05e340381e0175e9b30498274accaefcc SHA512 9f6a96cba0f09bd1571eb1730fe90aaa48b973b165f083250b325a768465a8835ea26410574a05b102e4783278f8786c06f9c0e6a6d54ec46b1815a39484bd4c
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild
index 7263b998acd0..7fdb393a5c9b 100644
--- a/media-libs/libvpx/libvpx-1.9.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.9.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"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc +highbitdepth postproc static-libs svc test +threads"
 
 REQUIRED_USE="test? ( threads )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index b91646f7424f..d3701544510d 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 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
+EBUILD libwebp-1.0.2.ebuild 1822 BLAKE2B ac80ecab45b8414ca3357b9282e96173cb8e690676cf5ed22ccdd95e6423c74bf0bb6fd733a21bc95f3c46c7427fe50c7b1c4e60b48c3c6797d3b015f2304f7e SHA512 4bf4df61a1b35e822e72dccc9dd94d7269fb30c1919389452561fc1c71ffd39968f9e1028910059c6a2c2342f4d79db7034006834680d7125b030cea50c07a4b
+EBUILD libwebp-1.0.3.ebuild 1839 BLAKE2B 1e189eade016fc3a9ec3c8a443bbbfb6b3d3720139d7a9c80d17f27b2f70c3992e1554085c1d624177cf5d062a60344265c91c052d06ef4e89db95aa48be5462 SHA512 b5d06ad1f77e7921bf3eece13085f40cda8bdfe5508c21dfd6cc2cb3f603b9f5de97e93da666f414996fcd902baa6248ed138731fa2b4401a4f06f8c86863280
+EBUILD libwebp-1.1.0.ebuild 1837 BLAKE2B a112fcc370eec9a5a69d75101b0c6e3b27f1553a0a9bf07297c2f840e8ba179a80a0cb4b8879ec89433a3fbf00b291c5aaf5ab43b26d285fcf60615c3c2451d4 SHA512 46c5b6ec590c13f48d9667fc89dea65ebe93fad63a80a4f807106b271dd0944a80d492d4d7d201972999dbef082e5dbe6b633b5b49ffb5cc2924414085091185
 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 3d2f83d51380..929b6b18c47e 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.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="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 ~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 ~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 ee454f576d65..0d01423636ea 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-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="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 ~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 ~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 0c93532eaf1f..0802570c55e4 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.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
@@ -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 ~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 ~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/libwmf/Manifest b/media-libs/libwmf/Manifest
index 80c5b3da4a6d..635d2f3b8a4a 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r8.ebuild 2534 BLAKE2B 22f478389050d29484c2587a46e365eb858c15d9128909b239c158307444102f3a4df480a6af07bbaa4118826509e550c7cf1bd9697e2a98952255c51f35b420 SHA512 664c24ddca51f60c01a457c4393f18c8fbc793fa6e147cf77e3c118579a9d1eed125744b1f957c632a3be82fb2d7bfceaf073a20f7ba9ce1c636910b5d32c799
+EBUILD libwmf-0.2.8.4-r8.ebuild 2523 BLAKE2B 18186312150f3ac23a07019cb528838d6de6dad22269a8f5271b120dbb40fe4a4aeedd42b0cb5ab033ddfc647a7544fb84348d1c61acdfe5b59dfa686fdd1531 SHA512 651d96430285b8652c417aecdda8d7c90b04d814f946a65dd82b9fa8c58c4405ffc4d4ee4621ad22fead52a0ef3069b5e8e06a7cc2dbcbda4edbf6c2494d75e1
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index c26a907b2c09..d281f1d619df 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.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=6
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-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 ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index 7d1a1f0144c8..9eeed641ee33 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -2,6 +2,6 @@ AUX libxspf-1.2.0-autotools.patch 5008 BLAKE2B 2e0547bb6f7885304e3e4fb03e8562d8d
 AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
 AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
 DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
-EBUILD libxspf-1.2.0-r1.ebuild 884 BLAKE2B 54c0cb49b176e75e92c3f2e4dea41558d9458773d8598dc3a3117c49dd2f01e5b7965cfc0eb5bada9d7acefffc599f3b837a81add64a70e9fcfcb1114016fa02 SHA512 67babeda397457faeaefe65741fd98b109481fc34bfe840ace9dda094dfe596ef6a623e70d5f59dc3f1302c173381235c8ae5150ee9ac618e39916feca360607
-EBUILD libxspf-1.2.0.ebuild 1041 BLAKE2B 66287fd7d64a97a8f7d40059a33333468326f791f61416864013fca4f72f4b95736196ba0355c3e9bba4f3ee34cf0a88bb64fadcbb827517c56a681f19673f1e SHA512 e6ac22c36827be2507382033a0f9ae7fd58aff3640b2bd4275c3c425054acd9deafe2a76236963559e729dd709682640e35e0029b8b8591eebf1f6bff68bb060
+EBUILD libxspf-1.2.0-r1.ebuild 871 BLAKE2B ec941c6aafef183a890fb57ab0c9b11f7d5fd4fcf5d099c5c59b4280d851132ae34bff70fa7c9fb4ce22ab1bbdede6505c2b063f041d7bfe480a412289043f85 SHA512 ae2fcb25dd95dfed477917e6a68c30e73d936e5e0477b02a8db1f741dad1e1b66e35f847789f1ae6a2012a71524bf8f010122ec5a4ae83cc8a32fd0c2666ae3e
+EBUILD libxspf-1.2.0.ebuild 1030 BLAKE2B b7ca86066c1ab47e11e1dac05b0c6dca79188cfebf8f7e70d8cc5b4acaf55793f5b455c63bf207238bd52777ba806578be86170fe3d5d0cabf3b04f806182655 SHA512 097e928c7595464e5fb578aed75d9f8b05928e894644000ab57f6deff0f6e5db2bc3051bd724bdeb90947b6e98a20160cce5f97b4068b625038ce8ad1d1235da
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
index 7912dd3d9ca6..d551573562ed 100644
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index 14c675757897..088fadf47a2c 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index cdb9c31110df..ad06d2da8c50 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 1038 BLAKE2B 4eb9131911f238f8c065aa82cebce3c010b9d90bb486b96d1fc3684acf56528376ae2362c5037f0cc25f84af8119705c065ca3b48d63cfaf04ebac20672778e2 SHA512 8f5a7a7c50eb6588340c9d38bd8596d7aad8ce84d8c1c6f540645dd2fd1ad07ac7d1871830e59332f7b3411c7d1fa9e8aa718b628f07c66cb36d73d5877556c6
+EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
 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 aa0573ed136b..5a71e0a3425b 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/mlt/Manifest b/media-libs/mlt/Manifest
index 47b775358ea6..1649570cebae 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,6 +4,5 @@ AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee
 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
+EBUILD mlt-6.24.0-r1.ebuild 5323 BLAKE2B fe6e06c8b47aaea654668fc835b3bc95981ff948ccbeaf6569bf68f876db1f1e4b0bb91c1fe9e886fe2447a1800c001c340441a86cfe6e188f10340cc6727842 SHA512 9d4772005fb5a0e7bbd497243939a15d9d298ea4d2d9700564edacebd99ad614d9d34d128b7e3666ae1c606f7fb0d2099ea00e2f890c49c83e2f53e7ea305ecd
+MISC metadata.xml 1673 BLAKE2B ab376b18df6085a95490cfe541fd0cd0af07b0d221aa693132d8f5ae4ec67e468df2e823943edc871c97ad15848a43acaf92c9fb341f07c9fdfcf504896ac23d SHA512 ddfc34505aa0ed7b32b2e6af160929e45aa508b5aad3e42178976836b784f10d6de8c820bb40e0f1be3e62d5723fe93459fdd53579aa65dc996bca4a14dc6c7a
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index dae5f6d74dd8..0a18c2e2c883 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video Project</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
@@ -16,8 +17,9 @@
 		<flag name="melt">Build the melt commandline tool</flag>
 		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
 		<flag name="python">Build SWIG bindings for Python</flag>
-		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
-		<flag name="vidstab">Enabled video stabilization with <pkg>media-libs/vidstab</pkg>.</flag>
+		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag>
+		<flag name="rubberband">Enable audio pitch-shifting using <pkg>media-libs/rubberband</pkg></flag>
+		<flag name="vidstab">Enabled video stabilization with <pkg>media-libs/vidstab</pkg></flag>
 		<!--
 		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
 		<flag name="java">Build SWIG bindings for Java</flag>
diff --git a/media-libs/mlt/mlt-6.22.1-r100.ebuild b/media-libs/mlt/mlt-6.22.1-r100.ebuild
deleted file mode 100644
index 1645da008141..000000000000
--- a/media-libs/mlt/mlt-6.22.1-r100.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# 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
-	"${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.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/mlt/mlt-6.24.0.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild
index d9701907cf5a..1f6ac4939d80 100644
--- a/media-libs/mlt/mlt-6.24.0.ebuild
+++ b/media-libs/mlt/mlt-6.24.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit lua python-single-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 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"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
+ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
+qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
 # java perl php tcl
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
@@ -67,6 +67,7 @@ DEPEND="
 		>=media-libs/rtaudio-4.1.2
 		kernel_linux? ( media-libs/alsa-lib )
 	)
+	rubberband? ( media-libs/rubberband )
 	sdl? (
 		media-libs/libsdl2[X,opengl,video]
 		media-libs/sdl2-image
@@ -110,6 +111,8 @@ src_configure() {
 	local myconf=(
 		--enable-gpl
 		--enable-gpl3
+		--enable-kdenlive
+		--enable-melt
 		--enable-motion-est
 		--target-arch=$(tc-arch)
 		--disable-gtk2
@@ -124,13 +127,12 @@ src_configure() {
 		$(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 rubberband)
 		$(use_enable sdl sdl2)
 		$(use_enable vidstab vid.stab)
 		$(use_enable xine)
@@ -156,10 +158,6 @@ src_configure() {
 		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
 
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 108f4715a8e1..0b38e014360a 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 537 BLAKE2B 4a96ba92138c6613d402951ea36204670eb01a6b15e0c943dadb167326ae19f161d73724914b4d433487a1d21c0ff5fa1dfc41ae5a1f8fa5bcd276b62d75cb05 SHA512 dec4ea6128dc2dc6720e16d8cb95e5510dda8adae33c0ee15090c960ea36bade3b4de22e3298e582356fdad46b6f9114ca598d5743b988ca8e9c3e6986e96e9e
-EBUILD opencore-amr-0.1.5.ebuild 542 BLAKE2B bf8b4f3d6c4e2caa304141c15eef6c435f8c8cfeb2af8302ed9689242f3c588613a558497afbf4b8550b0d1350367796efa773647c3921f55ea95d1ae0256212 SHA512 255b8a0f793af921ad6b80d45388a08d964288d294a0b52b9496c1beb2b333b564b43e4e1854376e1f5c31cb19c500f1f4443a52de36bb2ebf2e7f847943d0b5
+EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
+EBUILD opencore-amr-0.1.5.ebuild 531 BLAKE2B db1903c4469ca455eb7bdf16f657cb23753040d0f0f29c644142245c8a08331e5d4ab10664126501696b1f6a9b28d481ebec5def2e2e9409ad8aef0b2e195550 SHA512 b2a7962211823dee5bd458ac476f2296f79ff9315efa3bcf9c028784b6305e48411d287af039eccc9a38cf08591c6106eb2c8027e7b4e0ef70585574cf001463
 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 f9906c0ff9e2..8a641b8694cd 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
@@ -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=5
@@ -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"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
index be5c14df63c2..f8b44aa51d41 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 DOCS=( ChangeLog README )
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1b29de196f54..d9e48e93f3f1 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,7 @@
+DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c2878c58ca005eef5fdc4a0c60825ba5c29dd37a543551e9427fda99d859d3cf3cab9cb8c459b47e2b8935e8b7730a09e19de1 SHA512 79f412bd3f7ad4cf6cb57d99293c02fa71478ece102478a6b93a8c5b8c4c56d1313595d24753f9ae1714039ac6aa1be4ae37461233203bac217fe6c0667fbf3b
 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.10.0.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
 EBUILD openimageio-2.2.9.0-r1.ebuild 3688 BLAKE2B 649081db83330abd7e0b3cdcc8832f5d505d1d472c5cc6c597d96ad5093c9d8a52ec6006121cfa7dee593bd486a1dd3c466426d07ff4fbe75364831c3c8e6376 SHA512 6ff1a5b43cdfba2b3278ff973389005161048c77398bf435e12f8f798a5a1822eb076f65ea8c3a4263a498c432503e334d01f40a5771bcaa8e675f0a7c70dd31
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.10.0.ebuild b/media-libs/openimageio/openimageio-2.2.10.0.ebuild
new file mode 100644
index 000000000000..8eb2ae36862a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.10.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1783845a97b9..244690f60adb 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,7 +8,7 @@ DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f67
 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
+EBUILD openjpeg-1.5.2-r1.ebuild 1913 BLAKE2B f4c33d64895d505111a21aced86118570dae58387e042183be1117e95d39e32a34b57e78ea7f31ea1f09d6c2163842530a627a1e153a59a92a827db79693445e SHA512 5c36a1e56c4ddb66ec92c8e3044b23123fb3218d425af5143330d1684b8ac8c42fbf91891342e6f3c7efb785134d29409206789b53f85b0cfcb2e2d9f06c4b2d
+EBUILD openjpeg-2.3.1-r1.ebuild 4303 BLAKE2B 956343edd893fa16c00d6d4306f8a74453af590ce932c78f9f0e7b72a0b95ef184c897ce850840b03f9dabcc984321ac38f93ca9ca36b9a95e00fae0bb24dbed SHA512 6ae0ef7e1380aed0d218d933e8d4fa0e43208bdaf45da43198964f1cafa72f8a0eaf70f19ef7199ef4a2157a8f59684d8e4e6b1ed500e3f6eb150fc50ae7dc3c
+EBUILD openjpeg-2.4.0.ebuild 4463 BLAKE2B 3c047be61cf552fdc8729c9c1c56fa6be8f25caa16473d3b3d883ff639367fe1e47f2adfc72cdd355179169d3540635cc26b27e1d7d02589bbe15d5984a0ae60 SHA512 8b8950746c87fb0734b6d1c307cd4c9d3a2b3c0bf4cbae47d46c65d56df3f32163baa3cffce2b8f7eb2d60e497cde5bf91399268e102ee01751bb48eddfb6621
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 2ef40a90123c..59ab4ced81a1 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 5d48325ab009..07ed6a38acd1 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 835a389bc405..5aaab89871bb 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 895578173032..08a32b6455a9 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,6 +1,3 @@
-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 975 BLAKE2B d1d45f642892ec7cdc39c69a996f4bb47fc75914b6aa29602465f6b0191b2a6f22347b5c57b96bea05e8b929e547b9583cee725326b749d77a97be87a276da4c SHA512 75481cbddbd7d962e2bfda4ae14a41f367e6e8c3384998e314c5853abc584f7b2d4f183c17b4c4fa1f903c210c904828058d7212f1a6870117bfd15e63420c1f
-EBUILD opusfile-0.12.ebuild 930 BLAKE2B 890f8722a8457520bef61d7282b23a8b79d25bc91ce717af81256dd79f7398237d19f6a7caff63d3c85e77300761689662249df3df3cc9081d1a1a093a2f3dc4 SHA512 8948b3340eb5dec762eef0d7b6b92c411921d63066d882286f2aade30a3d357163c08ac29e66f2c2e6c81b2a504c6404f000fecfd5563409c100c6d66971ed6c
+EBUILD opusfile-0.12.ebuild 927 BLAKE2B 54f11de54ca7f62c918762b3be291b85c2267f7d43ab7817163769be0318c41243e87d3107b7e16afc07d600ad13f334066eaaecddf39cb71c2c96d274a4e352 SHA512 f08f9a3e25f8cd078d0e6ea7fe385ec361cd76cb1c6621d403e991088ab179a82f40b58a0748fd2ba4514b451cc8a34947b26cfb6dbae41a99cc91cb1b34d2fe
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/files/opusfile-0.11-libressl.patch b/media-libs/opusfile/files/opusfile-0.11-libressl.patch
deleted file mode 100644
index 72d807623a8c..000000000000
--- a/media-libs/opusfile/files/opusfile-0.11-libressl.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 27ab318babb96e10a9f007b7c7936fd42425f488 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Thu, 27 Sep 2018 04:53:29 +0300
-Subject: [PATCH] http: fix compilation with LibreSSL
-
-LibreSSL defines OPENSSL_VERSION_NUMBER to 0x20000000L, but its API is
-compatible with OpenSSL 1.0.1.
-Therefore redefine OPENSSL_VERSION_NUMBER to 0x1000115fL (1.0.1u) if
-LibreSSL is used.
-
-Fixes: #2327
-
-http: use new API with LibreSSL >=2.7.0
-
-LibreSSL is not yet fully API compatible with OpenSSL 1.0.2 and later,
-However many APIs from OpenSSL 1.0.2 and 1.1 are already implemented in
-LibreSSL 2.7.0 and later. Old approach works in newer LibreSSL version
-as well, but it's not nice to force deprecated functions on LibreSSL
-users.
-
-Add additional conditionals for new LibreSSL versions to use the
-available new APIs.
----
- src/http.c | 27 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 8ba9b28..a47648f 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -358,6 +358,11 @@ typedef int op_sock;
- # include <sys/timeb.h>
- # include <openssl/x509v3.h>
- 
-+# if (defined(LIBRESSL_VERSION_NUMBER)&&OPENSSL_VERSION_NUMBER==0x20000000L)
-+#  undef OPENSSL_VERSION_NUMBER
-+#  define OPENSSL_VERSION_NUMBER 0x1000115fL
-+# endif
-+
- /*The maximum number of simultaneous connections.
-   RFC 2616 says this SHOULD NOT be more than 2, but everyone on the modern web
-    ignores that (e.g., IE 8 bumped theirs up from 2 to 6, Firefox uses 15).
-@@ -1530,7 +1535,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){
-   return ret;
- }
- 
--# if OPENSSL_VERSION_NUMBER<0x10100000L
-+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
- #  define BIO_set_data(_b,_ptr) ((_b)->ptr=(_ptr))
- #  define BIO_set_init(_b,_init) ((_b)->init=(_init))
- #  define ASN1_STRING_get0_data ASN1_STRING_data
-@@ -1538,7 +1543,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){
- 
- static int op_bio_retry_new(BIO *_b){
-   BIO_set_init(_b,1);
--# if OPENSSL_VERSION_NUMBER<0x10100000L
-+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
-   _b->num=0;
- # endif
-   BIO_set_data(_b,NULL);
-@@ -1549,7 +1554,7 @@ static int op_bio_retry_free(BIO *_b){
-   return _b!=NULL;
- }
- 
--# if OPENSSL_VERSION_NUMBER<0x10100000L
-+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
- /*This is not const because OpenSSL doesn't allow it, even though it won't
-    write to it.*/
- static BIO_METHOD op_bio_retry_method={
-@@ -1570,7 +1575,7 @@ static BIO_METHOD op_bio_retry_method={
-    proxying https URL requests.*/
- static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream,
-  OpusHTTPConn *_conn,op_sock _fd,SSL *_ssl_conn,BIO *_ssl_bio){
--# if OPENSSL_VERSION_NUMBER>=0x10100000L
-+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL)
-   BIO_METHOD *bio_retry_method;
- # endif
-   BIO  *retry_bio;
-@@ -1583,7 +1588,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream,
-   ret=op_http_conn_write_fully(_conn,
-    _stream->proxy_connect.buf,_stream->proxy_connect.nbuf);
-   if(OP_UNLIKELY(ret<0))return ret;
--# if OPENSSL_VERSION_NUMBER>=0x10100000L
-+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL)
-   bio_retry_method=BIO_meth_new(BIO_TYPE_NULL,"retry");
-   if(bio_retry_method==NULL)return OP_EFAULT;
-   BIO_meth_set_write(bio_retry_method,op_bio_retry_write);
-@@ -1606,7 +1611,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream,
-   /*This shouldn't succeed, since we can't read yet.*/
-   OP_ALWAYS_TRUE(SSL_connect(_ssl_conn)<0);
-   SSL_set_bio(_ssl_conn,_ssl_bio,_ssl_bio);
--# if OPENSSL_VERSION_NUMBER>=0x10100000L
-+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL)
-   BIO_meth_free(bio_retry_method);
- # endif
-   /*Only now do we disable write coalescing, to allow the CONNECT
-@@ -1635,7 +1640,7 @@ static struct addrinfo *op_inet_pton(const char *_host){
-   return NULL;
- }
- 
--# if OPENSSL_VERSION_NUMBER<0x10002000L
-+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
- /*Match a host name against a host with a possible wildcard pattern according
-    to the rules of RFC 6125 Section 6.4.3.
-   Return: 0 if the pattern doesn't match, and a non-zero value if it does.*/
-@@ -1893,7 +1898,7 @@ static int op_http_conn_start_tls(OpusHTTPStream *_stream,OpusHTTPConn *_conn,
-   SSL_set_tlsext_host_name(_ssl_conn,_stream->url.host);
- # endif
-   skip_certificate_check=_stream->skip_certificate_check;
--# if OPENSSL_VERSION_NUMBER>=0x10002000L
-+# if (OPENSSL_VERSION_NUMBER>=0x10002000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL)
-   /*As of version 1.0.2, OpenSSL can finally do hostname checks automatically.
-     Of course, they make it much more complicated than it needs to be.*/
-   if(!skip_certificate_check){
-@@ -1956,13 +1961,13 @@ static int op_http_conn_start_tls(OpusHTTPStream *_stream,OpusHTTPConn *_conn,
-   if(OP_UNLIKELY(ret<=0))return OP_FALSE;
-   ssl_session=_stream->ssl_session;
-   if(ssl_session==NULL
--# if OPENSSL_VERSION_NUMBER<0x10002000L
-+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
-    ||!skip_certificate_check
- # endif
-    ){
-     ret=op_do_ssl_step(_ssl_conn,_fd,SSL_do_handshake);
-     if(OP_UNLIKELY(ret<=0))return OP_FALSE;
--# if OPENSSL_VERSION_NUMBER<0x10002000L
-+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
-     /*OpenSSL before version 1.0.2 does not do automatic hostname verification,
-        despite the fact that we just passed it the hostname above in the call
-        to SSL_set_tlsext_host_name().
-@@ -2314,7 +2319,7 @@ static int op_http_stream_open(OpusHTTPStream *_stream,const char *_url,
-     /*Initialize the SSL library if necessary.*/
-     if(OP_URL_IS_SSL(&_stream->url)&&_stream->ssl_ctx==NULL){
-       SSL_CTX *ssl_ctx;
--# if OPENSSL_VERSION_NUMBER<0x10100000L
-+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL)
- #  if !defined(OPENSSL_NO_LOCKING)
-       /*The documentation says SSL_library_init() is not reentrant.
-         We don't want to add our own depenencies on a threading library, and it
--- 
-2.19.1
-
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
deleted file mode 100644
index f8f7409434ec..000000000000
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A high-level decoding and seeking API for .opus files"
-HOMEPAGE="https://www.opus-codec.org/"
-SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc fixed-point +float +http libressl static-libs"
-
-RDEPEND="media-libs/libogg
-	media-libs/opus
-	http? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="^^ ( fixed-point float )"
-
-PATCHES=( "${FILESDIR}/opusfile-0.11-libressl.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		$(use_enable fixed-point)\
-		$(use_enable float)
-		$(use_enable http)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opusfile/opusfile-0.12.ebuild b/media-libs/opusfile/opusfile-0.12.ebuild
index 835914262b87..36ad0401dcc6 100644
--- a/media-libs/opusfile/opusfile-0.12.ebuild
+++ b/media-libs/opusfile/opusfile-0.12.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
@@ -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/portaudio/Manifest b/media-libs/portaudio/Manifest
index 71e67b844726..fe6e9c604950 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,7 +1,5 @@
 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 1286 BLAKE2B 449dff6cd1dc31470c9df4ba136feb0ccd12b68e4a5e240abaee0e3d53bda5b7e1489ff53152f4a61a9a987ee371685d189b07274744be1401f46eeb0dfab3b9 SHA512 5a8cb9fc3d689d41031fe25758c97d07ef4415cc65f72f9724822a6189f753584576cdeb6f2b3acd6ada5181083a9d4ee534e8673a785202439ef30ea985c09d
-EBUILD portaudio-19.06.00-r2.ebuild 1531 BLAKE2B 581984a97619f43f1a92091021bc3b814d3d9484ff4e50ddf4c4f971ddedcd090fdcc57287c415a520cc60527e05f46e52f7f59503f5883a8e7523a2eb340bfb SHA512 1fa626365aca15516489cb564f8014267dfba7ee0119821e96c860e6e76d5bb1c91afe0a9a8b74bb2a86b19e25b7b2e9504673e6056a4e42093c1bbff4e71307
-EBUILD portaudio-19.06.00-r3.ebuild 1646 BLAKE2B a714cf1b94cd25962bde429e48065cdf69cc09cfaa7ca2ebd23d691898929d0ebc926c1eb9a65a98d3ed4c5215a7dcd8705765e6c4189dcf5b79595a978173ab SHA512 33221c2696bfc05619bb8c39e4877beeee21eb49d650c9b9a89c13f3c4987878a42cefb0f63ed2786d584dae1d25c0cc73e0eaa30fa527681f0f15c2f3480064
+EBUILD portaudio-19.06.00-r3.ebuild 1643 BLAKE2B 6a0aa9824a5facd8bad84d4ce4255121d128673a8a330b42416c9011a12d2bf53fedc138713f032665f05eb0c1e60cc8c88d2d7464ecc858a2765bc1c280be21 SHA512 5dd1e9534fc80211e082d568ad24a2f6287d0a4f8a37be0ce51de977699b713ca0a9f6edb49c51b585c5945d6910e06e3eab208deb4b4a4a83fb192344667304
 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
deleted file mode 100644
index e3930a341f3f..000000000000
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune multilib-minimal
-
-DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
-HOMEPAGE="http://www.portaudio.com/"
-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"
-IUSE="alsa +cxx debug doc jack oss static-libs"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.txt )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with oss)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# workaround parallel build issue
-	emake lib/libportaudio.la
-	emake
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
deleted file mode 100644
index f1945f99dd24..000000000000
--- a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
-HOMEPAGE="http://www.portaudio.com/"
-SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
-	https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> ${PN}-19.06.00-audacity-portmixer.patch"
-
-LICENSE="MIT"
-SLOT="0"
-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}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.txt )
-
-PATCHES=(
-	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with oss)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# workaround parallel build issue
-	emake lib/libportaudio.la
-	emake
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && dodoc -r doc/html
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
index fdc4eb6bd0d4..d7d2cd1ee3e4 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.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
@@ -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/qhull/Manifest b/media-libs/qhull/Manifest
index fb070692fc94..139d9b28499f 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,6 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
-EBUILD qhull-2015.2.ebuild 1030 BLAKE2B 1ebd62b67e88bbb50f13a5db2b6d95e81520bc420ea1e48fb7b022f2a7b6ea90d0f7256f84072dd8c854e5d8aed0e5edab723323e60f498e6235551b70e84837 SHA512 56e25c635906fe3a7c03403cbbcc716b230166b7ad1a7b1570ae6bf1c99f9461a4b5e15e062731a081a93da39f4e0dcf1ff227a18d0d8227d2bd87b9f4475ea7
-MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
+DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
+EBUILD qhull-2015.2.ebuild 1021 BLAKE2B c123f9b2fbf062da2aedd57bda3610dd13a48d772944082a5f56dcb2b9337ddc9a824587240ee52e237d990182ffa7a1d255534ee7c1e692ddecae5001e8c3c0 SHA512 bb1fae2412eb9359ae384019ab0388b951f0a3cd97ae9e7520a219fe41c417828edc30f2d8fb519b10e994f5ed199eb6d94dee89db65207274302351cb9af8de
+EBUILD qhull-2020.2-r2.ebuild 993 BLAKE2B 4ed1de690460bd343503f1086b5e624f61a882d839d4f9dcd114bb74032e464dbbbbee150ed0759807bdd6eca8f264faef9efc85115bf727527400ad5948fe34 SHA512 8c20dc26b55b436409857a2d992d432de5045917171c72ef0659104a274db78c32407ee4362596f38d9e8fa1e6889f599ed3bbf01f697c2bbde4b81858d7e0eb
+MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index c6a69293d768..429d8032e635 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/metadata.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Qhull computes the convex hull, Delaunay triangulation, Voronoi
-  diagram, halfspace intersection about a point, furthest-site
-  Delaunay triangulation, and furthest-site Voronoi diagram. The
-  source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
-  implements the Quickhull algorithm for computing the convex hull. It
-  handles roundoff errors from floating point arithmetic. It computes
-  volumes, surface areas, and approximations to the convex hull. 
-  Qhull does not support constrained Delaunay triangulations,
-  triangulation of non-convex surfaces, mesh generation of non-convex
-  objects, or medium-sized inputs in 9-D and higher. 
-</longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription>
+		Qhull computes the convex hull, Delaunay triangulation, Voronoi
+		diagram, halfspace intersection about a point, furthest-site
+		Delaunay triangulation, and furthest-site Voronoi diagram. The
+		source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
+		implements the Quickhull algorithm for computing the convex hull. It
+		handles roundoff errors from floating point arithmetic. It computes
+		volumes, surface areas, and approximations to the convex hull.
+		Qhull does not support constrained Delaunay triangulations,
+		triangulation of non-convex surfaces, mesh generation of non-convex
+		objects, or medium-sized inputs in 9-D and higher.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/qhull/qhull/issues</bugs-to>
+		<remote-id type="github">qhull/qhull</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index 4539170beac6..667e3483d460 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.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=6
@@ -9,9 +9,9 @@ DESCRIPTION="Geometry library"
 HOMEPAGE="http://www.qhull.org"
 SRC_URI="http://www.qhull.org/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
-SLOT="0"
+SLOT="0/7"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/qhull/qhull-2020.2-r2.ebuild b/media-libs/qhull/qhull-2020.2-r2.ebuild
new file mode 100644
index 000000000000..1c60a003a251
--- /dev/null
+++ b/media-libs/qhull/qhull-2020.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Geometry library"
+HOMEPAGE="http://www.qhull.org"
+SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/8"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc"
+
+DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i \
+			-e '/^install(DIRECTORY html/d' \
+			-e '/^[[:blank:]]*index.htm/d' \
+			CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-DLINK_APPS_SHARED=ON
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	cmake_src_compile libqhull
+}
+
+src_install() {
+	cmake_src_install
+	dolib.so "${BUILD_DIR}"/libqhull.so*
+}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 705ca78fc042..8ea11306d5a4 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 1645 BLAKE2B 031fa44703b053e5fddc11a0b779b5daf53e2bd01389664ac591e194d2e4b750ecf19cbdafe4a8ecfb49a847a1137b56b4c34c9166224b81eb801fc3d0c0ca1e SHA512 e1c93b0a58baa9245b28d66168b9038f5f744d752500df2da69459b6f628f47c71a814bbce8c105063919ddc21b588b3baba38d8ea838a8247b8c4284b21a938
+EBUILD raptor-2.0.15-r2.ebuild 1634 BLAKE2B 15757b722752da142e88e0224b77725c1ec60479f5610521aff75145cc3dfba266b78da064d381fcbd1ae48006538008edddf4e5587acbb73986727d0c59517f SHA512 4fb565b6dfe1f35206f535051fb7f8c067d328ada3872ab27ed54c6dedd4b1c933e17b93d33eafa0c9566ded69c6249fc17c01f37b99036cf1f22be8d747f1f6
 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 f6c647face28..e2a831c99843 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.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
@@ -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 ~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 3defca2d3a7b..26183f780035 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,4 +1,6 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
+DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
 EBUILD raspberrypi-userland-bin-1.20201022.ebuild 863 BLAKE2B 93a8fb6979dc8916f73a103f2591382f541fef829f8cff70e11f3d0dc99ade47a2a2aa67dbc6a87dcfb16633ff0f8e7d7468d5c08ee10e9f2ac69b80841c8d12 SHA512 2731ce73606bd16a94903d4a44adc5f1f13f231c70e7616195e19403bd3eb8c6b8177a933772095bfa507d190f2f131b850062c10a91f90fe68a95fadbd67f67
+EBUILD raspberrypi-userland-bin-1.20201201.ebuild 864 BLAKE2B f0136b2b79a2bb8d2a5e189bba7b513f36c641e7f4ff65536b9d43c8191ad51f45d5aa46ad0b8f416fa53b4b9088bc1d267bfcae90e02f7fcdf1fc28bf252071 SHA512 01e962b667b3ab4516f75cdaf4e1f66c54b7b80204fd89af81fef5a35f73ed78122041cbdb569c926f627c97395f350d0113c15987f8b9a734d923b39e5cff11
 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
new file mode 100644
index 000000000000..9ce4a8fd7918
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="raspberrypi-firmware-${PV}"
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/firmware-${PV}"
+
+LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS="-* ~arm"
+IUSE="+hardfp examples"
+
+RDEPEND="!media-libs/raspberrypi-userland"
+DEPEND="${DEPEND}"
+RESTRICT="binchecks strip"
+
+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
+		docinto examples
+		dodoc -r src/hello_pi
+	fi
+}
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 83af1d76eef5..28ad40ad59f8 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,4 +1,4 @@
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.26-r1.ebuild 1205 BLAKE2B c16b4bd22a9cff9db800c4e0a9496bf0ab0a7d27729cd4f6876b266c79fc60519a3a88245569ff7f5e0afcda4c585508b3877dec104367b48ecd73ee2035c353 SHA512 f5a723b7405eeb12d47fdbe06db5dbf92d6684dc93ea65ce364bb193e4684b9b71ebfdcfc91e1b4994b54b19eacb5c66ddce15242d04bd453793d9d9dbecc269
-EBUILD sdl-gfx-2.0.26.ebuild 1178 BLAKE2B 17142db946bbea88c24da66cc2d9408b22a2ee4bbdf0c04879498740709b6e77d6d042f7bd1038b5f7756f4b103039e7f761999c884a9dda019481d506ad07c7 SHA512 ae49f5ea61fe6616f4986b41bf8d719185dfd18802da0a1dea0def0718ff0d1793b9b5a21449014e4ebdac57e3968aadbf1452f0cfbdf3f2ea21eab9ffc81fdf
+EBUILD sdl-gfx-2.0.26-r1.ebuild 1194 BLAKE2B 89d995b1dc114637f04adf91dcc4d788f2e2748fc69cde248ec804e94c464ccac73b3c0dec8e2640ab08bb55152690e2f190f6655085e2abd658a6a02e7b932f SHA512 fa55cc2565ddadd22b0561f1ab683fe9fa435e7014ce67a0d8235da26d2eb7015c99fbd3d09519c67935e8d762252f346c2d64339aba5242a0056b5098c61963
+EBUILD sdl-gfx-2.0.26.ebuild 1167 BLAKE2B fd021b412999dac8556766918270164ff961c7e3b249c12a0b3cf36be6c3cdf654a893ed12697158d658f3c3c158037fbdc89a129586d08d69ffebb95b57f934 SHA512 91ab8a68fafbad85b960cf1c7fc137bdad2834134d4e04aa30b5c447d7e1e596eaa38ed64920078817fc09b455ad43e63451824bcf98b069bbe6a5d9842db7b6
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
index 87355eea9721..69cfd9504e43 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-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-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
index 25a871326f1b..373fb1ac374f 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${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-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 9ec8df7f324a..da68eaf8ad2d 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 1556 BLAKE2B 397a9d4638a7e0a6a7d2395049d0199f2f7a3a36f65dccfe9e0c20fd37d2ac0c0da6cbe6d6931385b12ff5e32e9d0a7f251e6dff8ed0e46f4ef6e0144b493743 SHA512 72500336f6b5e5ec1cc37e1fb3f2330fa8f07a28c5bda8b4c6648611984b1abacbada4dd0a7cde9c8c433182e9b414f961e9869b217ec522f0dcd0a6529e56bc
+EBUILD sdl-image-1.2.12-r2.ebuild 1545 BLAKE2B 477a011823f1a1d58bf6e5a6dd02df27bf1b21f5062984d4d200960412209efda27e3ca1cc172d5ae70e3ecc73b8e19c37229e1177d85436dd77d377e8e5b8d1 SHA512 ce89a0f8e90958c616123197acdb0cef937ae4679a6212c9607efac0aa4779ae8154037aea8c25f10fedf09e06125f1c87452b564bc63270d77e61cd6ca75019
 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 b36388c1a9d4..a6ac4ca4c190 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
@@ -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=5
@@ -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-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 71d188ab0fea..0b6c7332c17c 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3219 BLAKE2B 8ee820fbf4d194e97ddc9c70fe96ede7c717050b94f4a44d1a73d9e62e0c132787534d5f6228cf34951794e9d2c7ec8c5bc9bb98586cf6b5d52712acf19a3709 SHA512 7995be6780abc107127a7ceb108f21f6b3bb6a34e368b4318137f1303073d3f14352d4ffa9929dc389e13b415f07b86dc63311df374d9a1b3461964d757db5ab
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3208 BLAKE2B f950b8364eb337806b9abe4e408ef4a506b19f909c170d3d9598851172aa0723db740ad14826b6adc3cf762ba47c4c059c0176057235b20b1221d1c76437c1eb SHA512 42fdb78570cfaf776a3cbc16c5dcf12928a80c829e45972f961cdc411d6598b578a289efb6861f8c6dc5218b2079843e4249c9226d657762373c381ef5533350
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 3b9eec7e2a72..d9efb2a003f1 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/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-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 31cdcfc6a90e..c16671bb5824 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r1.ebuild 961 BLAKE2B 4bcf1a8be2454295978dc570d267f0d971d886bdd9886d572d2cefdcf9619dfddadbe0d67020b9c7b819ee01e83c1f899554e41c9fa06783a71a626dd8ee6413 SHA512 85f9ff241670a49ce9a8ce5186f82e664793669132dd702b4ab8a2436d1e2bc77bf1c34a4e4be1bfc4068ed7dc75af79a7ab8b1de2ee8b6a158bbc733fd368a7
+EBUILD sdl-net-1.2.8-r1.ebuild 950 BLAKE2B eace10eddbb039153f4de12e426cc8e7f170857541a4e4502522140bce44786e45c1e214b724fe3a57df25350bbfdc0e9447e5a8683decc72480cfa3c488b440 SHA512 5e8c3e5cf9112b614a082c9f5420cfcbae3af78fd011967fe4b2f6b81c4fa76a682a3b955eb96df2d0c72bcc14ca13bffb38e7b29c71b9fcea16b58fb04b07dd
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index 1dca6da800c7..62739e45cf2d 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 04b0675bafbf..28cff2b8ec44 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 1239 BLAKE2B 2c3735cfaa4503cc32a70424cb341dd88bcce28223f91ad4e06bb3ffea2e315707b715fcbb08efabc1a502b87950f539d88e6c3a64d5f7d3c4fa2519fdf69f8d SHA512 22481e7410fce094f23492dcc966719728582fac4394f97b9b08607a24b301692d02b19de49dc96525ef1f08ce0cf469e598b854d1a09fea9bda915edb3494d6
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1228 BLAKE2B 25d908fa3a09098f8ef65ba1f8e95b797b9b0b33b19a7804da72ade4fe4890d24663330cb815dd155e440ed5f5fe21fe611330e744750b6597902cd47fb83449 SHA512 30599dd12fdd9b2fffd11f6c0a35882b589315f3c62ab5b4c566b6711c25820c6d171c4bb1974d1ad01f2f2203cd5763b821a3c5961153092417246bf83a4b91
 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 be598a7c4c22..9b59a5446ed4 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
@@ -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=6
@@ -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-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 961f6cc26649..ecb40218d52f 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 1642 BLAKE2B 24a85880616bf5f9cb9a9f95edfff736311089fc999b83af73f483e0484cfffc69ea8f2bf1ec31eb13e8376f92ac2135ba91979507871fd1f749c38e99982f6f SHA512 b95511ab9aab45284bb57a97493f0e6425739108808d5ea6fc059756abe7c6fb9e21317fafe5beed44fea46f8078d860bba9779b45c4fd652e8c668f01599091
-EBUILD speex-1.2.0-r2.ebuild 1654 BLAKE2B 102f56c3b8f176914d55d48c6392077f6ffdcc5afeda4b9ac866a5c43dc895ba69c41aad6aab23b18b395c621e1de01708cd1e897f8bafa66a4d3142c9ea34ea SHA512 e2a87b73f1216d3d6a48c19e356a2b9d4d9453676acc4d4d08e7304b5116a3d454bc971c7476e4ea38551880105b766813c3d9738dedb7031629415743b2331e
+EBUILD speex-1.2.0-r1.ebuild 1631 BLAKE2B 0da32c8e941b6ae2868d5fe3c631d0e2f58e342f01de15e8f448b606c671dde24b8d2351a249fc6c59869ac57c2a0f247d7235ff1560524790948436ced4ed8e SHA512 1fa0e55c24172852c15ffbf8934abd62a15bb27ac2e086e40ab3c90db8a5f1e64ebde5138f5bc241c0fde583806d00598ee5fb886fffb221bb84b6ed17c8f50c
+EBUILD speex-1.2.0-r2.ebuild 1643 BLAKE2B 52102721492f7a96d4c985f9555a9600d1b88a3cd3c07f12c21ade8b3beccd7f9cff511608cc4271fa579401965c6b56cc56aa015fb7f83e9b7c89050062959c SHA512 0b141213db7c624cf3b07613c9ad65de43e36337dd30747ee6d6bcf72fde430664cb71806258d8c9a7dc79740940999072b093b54e195df413ed766c5020f7e5
 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 341b33f9e000..0500c2876781 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~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 c6d40ee3ccb8..6ab5df260cca 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.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
@@ -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 ~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 695e09722e17..067e5907fe23 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 1465 BLAKE2B 79983f70ef6d952c2457b4f66dfb3e296312330d2d9a5473fc64dc61ca948bb361cfc9e83df19801fda51ff64c81b60ac9cf8bf90324a3a6010db7490ae98b97 SHA512 54f0bdb6f89fb681dbf456bf6f40a0dffe189eb6c88ce5cee98028c7901bc75f0df8b12826954dc0a9df7ed676b914b2c1949ed0b4cb1a648d21d2dbc1d11a85
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1463 BLAKE2B 457eabce7049a8df49aada2424b3dfb492d02ccb4c2096e1b857693a227dfa45ab530902d69b5847433e63fd1d96d1253ff9b1dea736468de1d545c018484ce2 SHA512 ef11f99e2d007e0ef992db48f77fd5f2d192b9b519ca387c554a17a242e70af422c1e21caab5e984dbd1579c0515d3c308934cda73751f41c41639368d086d58
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1454 BLAKE2B ad3a0ef2f13c116583c0508a12cab79c0a4dd9a67589fa23389faba5e0be78e6e2518e795d5e984c3cbb7e2502b4e6caf55cabfaba2e6c431c5c3b54a66da0a1 SHA512 656122f0134ccc30e4d96fcd6da39f8f3544330d1b62935fe1688564edbac317a0e2e00701b1ec18ebaac1240f263d5c8b54ae415c9df96a49ec5457982cc015
+EBUILD speexdsp-1.2_rc3-r3.ebuild 1452 BLAKE2B fb1c74522d2ede3f6c2e85c31259beb4fa6f62173f57a2e457ba2b31a7602501094c15616d025d18262710cc9890d3190951e37dfd26d9f5f3ef6b2d3825abb5 SHA512 e830cc39bbacf1af828553f4beb987055975de1574bb0089662232d82a469046750977d271958b6119ade46528b3518892845dbfa23cc6e9f90b3904c0f75b6d
 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 277bc25c4a18..d547a5fe0691 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 ~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 c529f672be52..6d75678b32b3 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.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
@@ -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 ~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/tiff/Manifest b/media-libs/tiff/Manifest
index 5543d32e1f8b..b900d7f9e4c2 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 2067 BLAKE2B 83ffce8986b694acd48cafeadc924283c749a1e7d50d5adedefb2fc78d0eafeed711c29d2b1f787b2db558e0741a4400c2d316ff353f82961bee2f2dd97d3989 SHA512 293b3eb402c0c91930b62d98f38422d7ec851967dfbaa10c3c5141b5c6cbec3c08da7a2093d0f7840932455c4004a51d8f28ce0fc793432a4757e80f83b1f774
-EBUILD tiff-4.2.0.ebuild 2076 BLAKE2B 5102db0af8ce91de447aaa0c089ea330e3a5a214881b0711f7e91a18399153e1dde2e31024812b46da1e2ea7ddc94a72d5a208badf65138d4a0cdb14e139a4e7 SHA512 bf71bdc5144d3a828d460499f189543e69ae31e783147a40884d98ddc7ac486d0c2476635738682783abb3cffdb1cfd69ac0f6493c5a2aca84985f57036d8e8f
+EBUILD tiff-4.1.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
+EBUILD tiff-4.2.0.ebuild 2065 BLAKE2B b3bcffdb906e86a1dca65698502e6ee2ab5648c8095a2575c25aceee267887627af8f7849de738b59c9692cf370993ce22b0fe61ff84b199c26067a9bbd0bf81 SHA512 767198b75bb5a11d10b6cb90605e0641a35ff9cf9cb3420613a46c9964aa688ad1aa55d07c40a3ffce2af3fbd4c8ae1294609bf0e53aeb2170cb0d725aa61a3b
 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 689ec492b499..69bb47338e2a 100644
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ b/media-libs/tiff/tiff-4.1.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
@@ -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 ~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 ~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 50fe86d87d4a..60b651ee59a5 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.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
@@ -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 ~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 ~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/urt/Manifest b/media-libs/urt/Manifest
index 049f3a429138..3909419aebd2 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -8,5 +8,5 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r3.ebuild 2364 BLAKE2B dd8b8c569083a95468ee3a1b112c0734acfe50b2016c9597bcc014f01e177c18bc13d2af4e1600759a25759302d405644ffac6ba7925b45bd29d891a94539ed6 SHA512 ad6eea2aa672b1814f9c7ede85dba981a6c2d5ca67328a8b67836c05f534c7c5df5c04ff65511e0ae744918e0c1e69c69bce8341981b16f6f3b8754d80b5ad15
+EBUILD urt-3.1b-r3.ebuild 2353 BLAKE2B 316dfaa5a398aebfb3e1d4e827530d80864f643cfc5b858ba6460ac60acdfed56b9c434ce72e0cc3caf267b226fa72625132e36f7b17276cee45505458afa23a SHA512 700c7d707b308ebc8c3e70ca1deb7ad93038f93980e9de654bd3cc17b72ba291a757af62129927dcf4afd9f00f309c15cf4518d53c8c7bedd20459684c55563a
 MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 7b2d16703e9d..2670c6df6421 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.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=6
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index ecaccb4c3cd0..ff0e3416c61a 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,4 +1,4 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r1.ebuild 700 BLAKE2B 4dc0e4f28277c72609ed71dd30ed372fcd7727a2fb578b3547711a3f879b7c5248d559b906c72c0bd4fc08efdeacb0b16e95bc8b6501516c66a2cefb83b39576 SHA512 d4143c71529cbed6cb8cd21b08cc2d88767358dfed32223b832caaefbd0af6faba20c76a5d12865cda026d7830b2225c305ffbf18266acf28d47ea2dad87d190
-EBUILD woff2-1.0.2-r2.ebuild 879 BLAKE2B 850ec29373c90a0d7e7a49f4c72fa9abc421ccb352a7466bff8478b1172956f19350cf9d95f7e67e7202c10c635aa4267a6ed6fd692f8093860e90544129f8f5 SHA512 563a93bd08f4900a5b705ee1b1edfeb343634b9536de5d48c03c5a65b8124cbeb4c1f89850760caa5b39547317c51882ad3907b6bd29dd7074afe91a4151960a
+EBUILD woff2-1.0.2-r1.ebuild 689 BLAKE2B 1f496a686fafd55d47285288b45e7423bf5fce6468eb9d452ab70bb87aa1546967964292b4de0db9362cf0eb029d6843ff83fab163fe7ca44ac16fe255377cee SHA512 6252e4766e398cefc87a723a56f0dc31181ffc729ff6d2007e1e3507ca96e47b9d2aabb1d4b13fe8dcf21fe424caa127ab6e38edfe13e3780e74a90fbfe05fcb
+EBUILD woff2-1.0.2-r2.ebuild 867 BLAKE2B 0542268db763515f23b3a30123a2bc7e07a7e60c9dc3accb773c7fb6b9182432d88cf21a26416f3ecd3411b084a04fdea6e875fa2f17844172bb0dd002ca1162 SHA512 de641114e11ef3ba7a55364df86258c08c3353d5386cf72a18560f58caae8230de02df54a6c909fc8aad69c9a841e72066c26ac1452f49746c4e1f06f2cf4411
 MISC metadata.xml 353 BLAKE2B 1cc153f5b5aaee1378bd1c42c3a85e0a156d853c63643e8b832b5517f8d7ff74c52552be3a11e3c0db7550daabfbb41d2618f89763baaf076ff4e327da03b7d0 SHA512 b3ceae6dd9b6556417a7633245e49463ee54759e8e8835583a15c8863c91e5669465a0fa1b22f066d99e0a1bfcd0df1537bddaba27cb6fb838ed356ca7f33a93
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index 80d5309e93f9..3384b62d7908 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/woff2/woff2-1.0.2-r2.ebuild b/media-libs/woff2/woff2-1.0.2-r2.ebuild
index aa79db2f3e60..5daf8980d92a 100644
--- a/media-libs/woff2/woff2-1.0.2-r2.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 2bc2a8be3cb6..a627ba03479e 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,5 @@
 AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
-DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-0.0.20190214.ebuild 1884 BLAKE2B fe190deda34255198c87b57d9a76e31f17ae16c0ee335b1e44932ace7621241ee32f9a6e80396d33d4eb338abbb9af3f9bda8666226198cef043d8de86173721 SHA512 3a3ed08326895cf6440046b4c6c657f68b58e8ef74db5af01d9a11c28cdd29640371e52f5f6c752b9f61480d05a2389f90248e8fc65877418afb28b9c6deec62
-EBUILD x264-0.0.20190903-r1.ebuild 1994 BLAKE2B c85b99cbac31e266ffdc113ad15881de429c4f52509c37cddb1537e7c3cbc4a3d9b56f0377db1be5957b72357de85dad207c36e65845e6c9d72e5b0d8d0de629 SHA512 544dd345416341ba1da893ce38abe96a6940bf6f14c5ae9c73badedab46f2dcd033cbb24afe0ecb3b2948b2b4686e89f15b28c9a0e6d1933315ebb7212595869
-EBUILD x264-0.0.20190903.ebuild 1919 BLAKE2B b1a45067ddc6e6398f71a34a67063e0fa6a9570342b13345689575eef976a774385b3e32fdce0ecb0e04db45f233bf035419becb19883bfb68ba01fa1d551b53 SHA512 2016f61381b48f31c100eae9b1b76553e084f513b2f95b27eebad839850af7d8efe363dbd5a8fa1cb54800a9e0c2f8db86fa90bdf9ef1ec4a6b2df3601d79d71
-EBUILD x264-9999.ebuild 1950 BLAKE2B 92e966552fcd1b4f93a78e4d4f277d78cf5fa8110f88cecdcf6a13f07184e658e4a73f0f6de81f09f29d667e3da32dcab52cdbbf8f6cbd25672aecf7d2dae28c SHA512 ba759fa7ac7b3b44b5d75f9ce4970934d2817b3a3e7af6b10390388926816de0144b43cb320330cf49bcd8f39fc8ba1ed41fdb8c09a9d0edb16f6ad8082fcd04
+EBUILD x264-0.0.20190903-r1.ebuild 1976 BLAKE2B 670edd905818b87f93771a7cb937c114043d82f173bc652c5b4ccc3ef84c896ef5d7b95208e87fedd62a2386a386ac02bfb9cb419154d289b98e4908f4d52221 SHA512 c8aa7ded99d57af9f1d1e128b7a76e14198961cf93b6093b6dea9815f2d564a4b66e8d1f3c9b7d65ce8a39f8c91906b947550fb3413b59cc2a3e248d77e32899
+EBUILD x264-9999.ebuild 1939 BLAKE2B 62087c6fde37550720193888c3e2772318eebeb46d93943b04300aa53a0c283bc24fa339e69ab1e1f2816950efa4b9ce1ebafc5bba53d2d11c98b1c03ac99652 SHA512 2429fc13b78e1c283ff5b9f7505f5890c4fc109aee4fb064324a41095e086ab753901fa1294a1de345814c42cc87154f573a6ab7a17cf2b3b3f2d6861510e37d
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
deleted file mode 100644
index 7868773a08dc..000000000000
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0/157" # SONAME
-
-LICENSE="GPL-2"
-IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-multilib_src_configure() {
-	tc-export CC
-
-	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
-		export AS="nasm"
-	else
-		export AS="${CC}"
-	fi
-
-	local asm_conf=""
-
-	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
-		asm_conf=" --disable-asm"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-cli \
-		--disable-avs \
-		--disable-lavf \
-		--disable-swscale \
-		--disable-ffms \
-		--disable-gpac \
-		--enable-pic \
-		--enable-shared \
-		--host="${CHOST}" \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex opencl "" "--disable-opencl") \
-		$(usex static-libs "--enable-static" "") \
-		$(usex threads "" "--disable-thread") \
-		${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
index 453ed7982ff2..61fae4057df8 100644
--- a/media-libs/x264/x264-0.0.20190903-r1.ebuild
+++ b/media-libs/x264/x264-0.0.20190903-r1.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 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
deleted file mode 100644
index 1a64a1a46129..000000000000
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0/157" # SONAME
-
-LICENSE="GPL-2"
-IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-multilib_src_configure() {
-	tc-export CC
-
-	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
-		export AS="nasm"
-	else
-		export AS="${CC}"
-	fi
-
-	local asm_conf=""
-
-	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then
-		asm_conf=" --disable-asm"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-cli \
-		--disable-avs \
-		--disable-lavf \
-		--disable-swscale \
-		--disable-ffms \
-		--disable-gpac \
-		--enable-pic \
-		--enable-shared \
-		--host="${CHOST}" \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex opencl "" "--disable-opencl") \
-		$(usex static-libs "--enable-static" "") \
-		$(usex threads "" "--disable-thread") \
-		${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 98ce78b4c8e5..b2963fe3f360 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.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 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index b89bd91105c9..dd0fd952579e 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,3 @@
-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 1671 BLAKE2B 1e0a92fabe7f932e3b8056132ed976183020a51c4f31a82e4dd365f5798e517cbebaa777c2bbc5e3f7bd9db5f6a7d0e7fcf02d97da818674130acf2203950586 SHA512 11c910115ea186c7175b1e4fc9a45d08a3524973fb30359a3c8135a834ce6c705f1d7f478316b68ee52579e90c8f6fcca750a6010759a3fb90a17a96ae310d80
-EBUILD xvid-1.3.7.ebuild 1749 BLAKE2B dafc72de747f4d0db3b6a8bceccfc67af04e4ab7db77d9e7a65805bc2d16b7c040e0ad0d8812ebb36730da8a519f15feb656daaf38be85c72e04c78fd5b2f60f SHA512 b647dd4403a4477f7735ae7615aed35e81f5eaa6cd88bd06ab8294a0c1cfc7473409929ad0bbf5dcf5e8b30a7cc43d93ec6c8f549c528a77e69ff391fe51a9eb
+EBUILD xvid-1.3.7.ebuild 1708 BLAKE2B 6b95f8745a9e11cf92b8277a9f5044642ce15628bb36cdb75ae4409d33e63182bdfb3fab566a07ffb44a9d5b734a930bb10aa1bdbabec81faa88fbcd33bb1619 SHA512 589de775c65d3e8448f77baff8dddb922580a2f7cf88419bd8590987b1670da5b4fbe899c228fdf8ac27220e100da3fa77742d461ebfe252387cc2866f668f89
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5-r1.ebuild b/media-libs/xvid/xvid-1.3.5-r1.ebuild
deleted file mode 100644
index 4f98d5f3a9d1..000000000000
--- a/media-libs/xvid/xvid-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://www.xvid.org/"
-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"
-IUSE="elibc_FreeBSD examples pic +threads"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-BDEPEND="sys-apps/grep"
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-macos? ( ${NASM} )
-	x64-macos? ( ${NASM} )"
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-e '/\$(libdir)\/\$(STATIC_LIB)/d' \
-		-e 's/\$(BUILD_DIR)\/\$(STATIC_LIB)//g' \
-		-e 's/info \$(STATIC_LIB)/info/g' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
-
-	local myconf=( $(use_enable threads pthread) )
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
deleted file mode 100644
index 1b896fd798fe..000000000000
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://www.xvid.org/"
-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"
-IUSE="elibc_FreeBSD examples pic +threads"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-DEPEND="sys-apps/grep
-	amd64? ( || ( ${YASM} ${NASM} ) )
-	amd64-fbsd? ( ${NASM} )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-fbsd? ( ${NASM} )
-	x86-macos? ( ${NASM} )
-	x64-macos? ( ${NASM} )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
-
-	local myconf=( $(use_enable threads pthread) )
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
index 9149c76fa1b6..ee6cc488d233 100644
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ b/media-libs/xvid/xvid-1.3.7.ebuild
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
@@ -22,7 +22,6 @@ YASM=">=dev-lang/yasm-1"
 BDEPEND="sys-apps/grep"
 DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
 	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-macos? ( ${NASM} )
 	x64-macos? ( ${NASM} )"
 
 S="${WORKDIR}/${MY_PN}/build/generic"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index d8d04d3906eb..bd68f0be922a 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -4,6 +4,6 @@ DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea
 DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe386ade6b7a5c1b86db696dd50ff72ff40e1edbd38ee9a8a10dd429f207061fdb2ea326018396dfb92707053 SHA512 ae117399772d2c35ffa61b8cf5d156edf4ed65e9ffeb2e9e0688c88244fdd1a89c098bd842e3795b33fb0951da97f844fb6ffe27045e3234720f70f842356936
 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-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
 EBUILD zimg-9999.ebuild 783 BLAKE2B 15ad8bd1c1fea38a7a367d497d6bcf04019dc53fdfc866ba779a59b59d7f59202544d9e68e2a110559819297e1684c56f8a716e1dfb55b38e576a694252a3af3 SHA512 0fd908ecd7e65b12d1012d3f1c1f4deff2c13d94a215a50dc756f9138f6402f3cc35d59bf785b0d851116868b40087941051e00201c3768f8dd074d70f0a1bf8
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-3.0.1.ebuild b/media-libs/zimg/zimg-3.0.1.ebuild
index 2e10103e346d..7f15ccb3f4ff 100644
--- a/media-libs/zimg/zimg-3.0.1.ebuild
+++ b/media-libs/zimg/zimg-3.0.1.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/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index a2a57d22a669..7b7826f541a5 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,4 +1,7 @@
 AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992
+AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431d7956cf66774e50549f8a7e8d6351d370778b5c3b75c98880a1260f2ac98b812f1fc51cf97f7f86d38ebf7f147714cd3e7b1d SHA512 4487230e87df2b165abb6e59fad6929fecc72c44509a60162976d5d1b54a2a584f04713c7f8cf77e9792213495656eeb45606c330d3c16be05084d4429cc9f84
 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
+DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
 EBUILD zita-resampler-1.6.2.ebuild 899 BLAKE2B ab844529d67e9284f42fbd8a7e7a6ba536188ace3e778c370e30c39d46fd8de400869d6093cfbc6cb461008667a7cd9f253ab4e4634adaaa6d3326631f9e99f1 SHA512 deaf05a05be70b4d72f07495a64a880cab200d259315314736c192528efe6a502918cd074f7750dc48344b468907ea4727d10faad3d1f761f36149762f8cb091
+EBUILD zita-resampler-1.8.0.ebuild 1011 BLAKE2B 4fc04d354cd69f216003c0e2f46ae9ce3f9af98eaf5def7569ba8b02772e7813c2dd2e33b9517de72f1946d81f70e8daa8c47c838b3dc0049569cf46f221a0c7 SHA512 30f1a438ac17b3c891928053f39262d376d3510e5de4bacd30ff2b91bc040820d04a8351e6056ba4cd9554ed7422ceb91f1a40ace92ee679b3049f2688058af1
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/files/zita-resampler-1.8.0-makefile.patch b/media-libs/zita-resampler/files/zita-resampler-1.8.0-makefile.patch
new file mode 100644
index 000000000000..860e199a51de
--- /dev/null
+++ b/media-libs/zita-resampler/files/zita-resampler-1.8.0-makefile.patch
@@ -0,0 +1,91 @@
+diff -urpN zita-resampler-1.8.0.orig/apps/Makefile zita-resampler-1.8.0/apps/Makefile
+--- zita-resampler-1.8.0.orig/apps/Makefile	2018-08-23 12:52:50.000000000 +0300
++++ zita-resampler-1.8.0/apps/Makefile	2021-01-05 20:27:20.816636061 +0300
+@@ -23,18 +23,17 @@ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= /usr/share/man/man1
+ 
+ VERSION = 1.6.0
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2  -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I ../source
++CXXFLAGS += -ffast-math -Wall
+ 
+ 
+-all:	zresample zretune zresample.1.gz zretune.1.gz
++all:	zresample zretune
+ 
+ 
+ ZRESAMPLE_O = zresample.o audiofile.o dither.o
+ zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zresample:	$(ZRESAMPLE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
+ $(ZRESAMPLE_O):
+ -include $(ZRESAMPLE_O:%.o=%.d)
+ 
+@@ -42,25 +41,18 @@ $(ZRESAMPLE_O):
+ ZRETUNE_O = zretune.o audiofile.o dither.o
+ zretune:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zretune:	$(ZRETUNE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
+ $(ZRETUNE_O):
+ -include $(ZRETUNE_O:%.o=%.d)
+ 
+ 
+-zresample.1.gz:	zresample.1
+-	gzip -c zresample.1 > zresample.1.gz
+-
+-zretune.1.gz:	zretune.1
+-	gzip -c zretune.1 > zretune.1.gz
+-
+-
+ install:	all
+-	install -d $(BINDIR)
+-	install -d $(MANDIR)
++	install -d $(DESTDIR)$(BINDIR)
++	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zresample $(DESTDIR)$(BINDIR)
+ 	install -m 755 zretune $(DESTDIR)$(BINDIR)
+-	install -m 644 zresample.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zretune.1.gz $(DESTDIR)$(MANDIR)
++	install -m 644 zresample.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zretune.1 $(DESTDIR)$(MANDIR)
+ 
+ uninstall: 
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zresample
+diff -urpN zita-resampler-1.8.0.orig/source/Makefile zita-resampler-1.8.0/source/Makefile
+--- zita-resampler-1.8.0.orig/source/Makefile	2020-12-28 23:09:24.000000000 +0300
++++ zita-resampler-1.8.0/source/Makefile	2021-01-05 20:19:47.951831754 +0300
+@@ -31,9 +31,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ DISTDIR = zita-resampler-$(VERSION)
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CPPFLAGS += -DENABLE_SSE2
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -ffast-math
+ LDFLAGS += 
+ LDLIBS +=
+ 
+@@ -47,6 +45,9 @@ ZITA-RESAMPLER_H = zita-resampler/resamp
+ 	zita-resampler/vresampler.h zita-resampler/cresampler.h
+ 
+ 
++$(ZITA-RESAMPLER_SO): $(ZITA-RESAMPLER_MIN)
++	ln -sf $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_SO)
++
+ $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O)
+ 	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
+ 
+@@ -58,8 +59,8 @@ install:	$(ZITA-RESAMPLER_MIN)
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(ZITA-RESAMPLER_H)   $(DESTDIR)$(INCDIR)/zita-resampler
+ 	install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+ 	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO)
++	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ)
+ 
+ uninstall:
+ 	/bin/rm -rf $(DESTDIR)$(INCDIR)/zita-resampler
diff --git a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
new file mode 100644
index 000000000000..b23f36961060
--- /dev/null
+++ b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ library for real-time resampling of audio signals"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 tools"
+
+RDEPEND="tools? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+HTML_DOCS="docs/."
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.0-makefile.patch )
+
+src_compile() {
+	tc-export CXX
+	if use cpu_flags_x86_sse2 ; then
+		append-cppflags "-DENABLE_SSE2"
+	fi
+
+	emake -C source
+	if use tools; then
+		emake -C apps
+	fi
+}
+
+src_install() {
+	emake -C source DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
+	if use tools; then
+		emake -C apps DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	fi
+
+	einstalldocs
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /media-libs
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)