gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /media-libs
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
160 files changed, 1483 insertions, 2076 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9ff940519cdc..a1fca589696e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index e9325e5ac6ff..8d04782bb9c0 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -3,7 +3,7 @@ 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-r6.ebuild 1413 BLAKE2B 45ebb82ffca81f3f3c1bb3344ecce998e1cd5a7299af97e1451cd50f43b74c45380a717e991aa0a66f20da86f918602eed72746227111d8ae915f51a8b3f9744 SHA512 50170b8a1fd4218ea832fb305fd6366ef28bcfbbd41dc4cde438e9d94ace3d476a35d845ae6204e49efb4f1b87db1baa646f202f2deead042d2cfc75bb62fe5e
-EBUILD a52dec-0.7.4-r7.ebuild 1543 BLAKE2B cbb898b79f8c8bdd8daaaff8fc186b8ca9c3f24d2f8c28cf2206298384eb84ba449903106673b02e746c5fe7f757a4639df1f218b63cc4f15746dec7adfe442c SHA512 2a93b8d533c84ad430c16fe0242317da4b09fd32fdefa550c99a2c682dacadb4ac03e96ece2cc4641a0021adcdf7a6011cfcd2226245b023ed42a02e7926706a
-EBUILD a52dec-0.7.4-r8.ebuild 1452 BLAKE2B 77c734fd419292c20f4e2676ba7390d53bf989c82238f47ecf5f52cd33fd2f208e0bdc2a941736a2287e64f246f5c750b10caef8e650ab072ae4d7464efddd30 SHA512 58e2c6eeb982ad13eb362d7a2d6f9704528120ea3bc435b33340f2ae022f829d3767eb201c4612daa4a1a3b255c4b38d05fe6e468449c63c40dea8e5f07acf59
+EBUILD a52dec-0.7.4-r6.ebuild 1414 BLAKE2B 5e8063b18c746c84b52b544aaabc75bfb49c378c457778d8888becc9c41b1bdbcb3efd19c91ec37cc38a7ac9fd985208ccaf3f308216cdd874d7c7cdcf45159c SHA512 e013229559cc7326cfccce482f6378e17e2fb73cfd65e9a07ef14617ac326dd314e97cb0925bb741a8808fcf49300586ddb21a8e1d9d30fbb0518ce26c0d4017
+EBUILD a52dec-0.7.4-r7.ebuild 1544 BLAKE2B 056731f355c76ab2591760174dfa78d932f0522b2a358a224861c523566dd553deb56b4cf6b8ea2561077c81a687ae273bb69455851491788ee197cc54ce0e1b SHA512 c8af97e615f804bb81a226f9284a102f595fa6aabf9ac1a7bf87d3e38b097354dcbfbb434dfdf69a6e2b7cceecbf576719eddb091e1abf37938b3d044a00d5e5
+EBUILD a52dec-0.7.4-r8.ebuild 1446 BLAKE2B 01e5716199c2b776d5a4b253dc73ee845ed4178ec647f1ace8dc5bbe7025b973bdda56226ce631612f3cf54458bb61821db3a9bc2ed962271b0064edb5a6509c SHA512 4904c6decc4e407e41a3d7225653e77f45f54f619ad3b88ef57f8b878f6f2547c9aebb5098d68380ae2b70939a6014cd61f56fb8620a45799be4a7e3474438e1
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 69546430db82..19ca4e2db9a2 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm 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 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( sci-libs/djbfft )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 8879829f3c9f..65720cd03138 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
index e32e97439eda..efe84a939677 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index d09bf23049c7..cf2125b7cd57 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,5 +1,3 @@
-DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 5b9395da2c9091965ddbd65d536932a925c81d2a872f790bf946b2dbb7eea0ebae3a258f88b3628a67b26022cb489aa4a4cdc98cfb4d67b3f1d83907c9f21e5b SHA512 cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
-EBUILD fontconfig-ultimate-2015.04.ebuild 3144 BLAKE2B 221307db922eec0882feeb81b1d321ff61098764108d6bfbd3a1dc48da7cdfbc58075983cdb56f57d87ddda4a491de4c11b9b4a7a1e935347041f465677748c4 SHA512 3f15be9d4612b925ef33db3d146985b7d4999651a71d0c47a5d6eb1d8106dafde7ebd863bad40189d8ca84e38b89200bc16557963f9f833341e102fa2b3aa310
 EBUILD fontconfig-ultimate-2015.08.01.ebuild 3144 BLAKE2B 221307db922eec0882feeb81b1d321ff61098764108d6bfbd3a1dc48da7cdfbc58075983cdb56f57d87ddda4a491de4c11b9b4a7a1e935347041f465677748c4 SHA512 3f15be9d4612b925ef33db3d146985b7d4999651a71d0c47a5d6eb1d8106dafde7ebd863bad40189d8ca84e38b89200bc16557963f9f833341e102fa2b3aa310
 MISC metadata.xml 341 BLAKE2B 609469836f44b2b1afcd253057bb9a2ce0a1cae6a28177d71864b50e7ce8cf320278d3b6c393fac59af62d513018ff587bf8cc8a5d251ab1ec3dfccbcd5b34da SHA512 55d47d4699c323ee47f874f74fd765211068a361b83aaa0016c7dd0b838d2d1902ed0c14b8ae264184e1501c31b10d84c87cd9e27989076b999049177b134272
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
deleted file mode 100644
index 0a217240ac46..000000000000
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo versionator
-
-MY_PV=$(replace_all_version_separators "-")
-DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-eselect/eselect-infinality
-	app-eselect/eselect-lcdfilter
-	media-libs/fontconfig-infinality
-	media-libs/freetype:2[infinality]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DISABLE_AUTOFORMATTING="1"
-DOC_CONTENTS="1. Disable all rules but 52-infinality.conf using eselect fontconfig
-2. Enable one of the \"ultimate\" presets using eselect infinality
-3. Select ultimate lcdfilter settings using eselect lcdfilter"
-
-BLACKLIST="43-wqy-zenhei-sharp.conf"
-
-src_prepare() {
-	pushd fontconfig_patches/fonts-settings || die
-	rm ${BLACKLIST} || die
-	popd
-
-	# Generate lcdfilter config
-	echo -e "################# FONTCONFIG ULTIMATE STYLE #################\n" \
-	> "${T}"/ultimate || die
-
-	local infinality_style
-	infinality_style=$(sed --quiet \
-		-e 's/^USE_STYLE="*\([1-9]\)"*/\1/p' \
-		freetype/infinality-settings.sh) || die
-
-	if ! [ -n "$infinality_style" ]; then
-		ewarn "Missing USE_STYLE variable in package source."
-		infinality_style=1
-	fi
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS=/p' \
-		freetype/infinality-settings.sh \
-	| sed --quiet \
-		-e "${infinality_style} s/[ \t]*export[ \t]*//p" \
-	>> "${T}"/ultimate
-	assert
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS/ d' \
-		-e 's/^[ \t]*export[ \t]*INFINALITY_FT/INFINALITY_FT/p' \
-		freetype/infinality-settings.sh \
-	>> "${T}"/ultimate || die
-}
-
-src_install() {
-	insinto /etc/fonts/infinality/conf.src.ultimate
-	doins conf.d.infinality/*.conf
-	doins fontconfig_patches/{ms,free,combi}/*.conf
-
-	# Cut a list of default .conf files out of Makefile.am
-	local default_configs config fonts_settings
-	default_configs=$(sed --quiet \
-		-e ':again' \
-		-e '/\\$/ N' \
-		-e 's/\\\n/ /' \
-		-e 't again' \
-		-e 's/^CONF_LINKS =//p' \
-		conf.d.infinality/Makefile.am) || die
-
-	# Install per-font settings
-	pushd fontconfig_patches/fonts-settings || die
-	doins *.conf
-	fonts_settings=$(echo *.conf)
-	popd
-
-	# Install font presets
-	pushd fontconfig_patches/ms || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-ms/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/free || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/combi || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
-	done
-	popd
-
-	insinto /usr/share/eselect-lcdfilter/env.d
-	doins "${T}"/ultimate
-
-	readme.gentoo_create_doc
-}
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index fad5e1b198a7..7a0a4d024578 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -11,5 +11,5 @@ DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 EBUILD fontconfig-2.12.6.ebuild 4887 BLAKE2B 345eb589656f00006527680240e19666e509d840c27dd1d84f5ccd1767c0ab36077f3c3eef8d0d332c23ee2a71a1593d526e162f5a6a366196bda7ae6e3a04a8 SHA512 ff4c3186c81f614de2882f4792844ffdb6b94a3cd8342fd058c3dcca2382f2dcf64450801079383eab6f145e45b8475e491794e5574e030b0bf5dc4cad93556a
 EBUILD fontconfig-2.13.0-r4.ebuild 5166 BLAKE2B a26fa62a00f519500c02e3972c9718978e163b6b27eb67c8c8ba2fbaeaa460c870ce21cc55989e29e8fd928934ff89802a65e6bda1f774faf1566072cf22670f SHA512 751d7456a010a26002ee4749cae2eb95c00476fe3916953b577d9bb75acd68632f5e65c4c51b44ce6de6ea9be4c0f93940898e63bce25f84039ddda430ca4a6f
-EBUILD fontconfig-2.13.1-r2.ebuild 5630 BLAKE2B 4c19e881acc48212c9c81310d8af0275e16d79365ccddf981f0fb201638eaaaee984f0863876e357adc48f34c2643c6c9e1e1ce4d449183acdd8ed44c6bba3a9 SHA512 025bb4ee25068ef3e3a15184196029f38e2ca65e5eb4e85ed9ff8385d3aa77e9c2d74ed8a28ea97693cf2d259c67e7de2cf93865978d0e5c5a570359bb3d40df
+EBUILD fontconfig-2.13.1-r2.ebuild 5637 BLAKE2B e3898666340089e05f9377e990a4e1c37af815b5dfb180c48600709aa497673488e2a9112113acd5238cb5d2a6e97504cda4f069145105ead7933d1bb955fa1c SHA512 95942a25dc695a86d4acc9cc5f362cfb72d1078ebe75d5b402fa389b95767afada12ef3836e26fb9314581ee859aacacfb338cd649889ec8e4d6149f930f85bf
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 70a15b893a0f..552899d93ac1 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 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 b4d9540b1c5e..234e7049f207 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 1431 BLAKE2B b0156477049621f7e2e62e45f553347bb93440f1a49c60a84443d8c0c57e5d5bae177fc25000d8c6a7886029fdc87c4965b110de2e9ab278287b0ba6853511a4 SHA512 ccdaa2112f8a275db6a6b60d020b129a9e22151ec28fd7fe7c3083b6c328af6321c4ef3dae8af104ea8e70d7c1dad11cd4ed924cb24d162d1f1c3e42ef41a81c
+EBUILD freeglut-3.2.1.ebuild 1438 BLAKE2B 4f8fe147709bf96d73ee99a4fc335c2df3523b0e32d7d6430719a35c4d926974ed3c18f70900f617bcd42d613bd7a67b338dd56b9d0e07fc5bb02557011bedcb SHA512 49921fc873c04459410babf74ed231ca68d707332323ad9a293e247ff3d1a0b523905f272090c7abb739443149ba6e50ffbecd2a192ef324f5a30cc0c2722f27
 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 e23454440be9..61691b2b02e3 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index c16afaaa2b46..7ef7974ff3b3 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -3,5 +3,5 @@ DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78
 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 6783 BLAKE2B 6fd724961b81c307b2adf945f4b18927c47cd04ecaa0f38b138a46b557dd81531e1c8f7074a030bacf99dbe1440aec5a10ced167801d45b4e965a62858fec30b SHA512 bdd92db7400516ee2622133d805c374c7668a583840c1a9c6a8c8de295ab75474bc288905fdfd97746cfe4cb36c70f56b1361150646c044125ae01c3d0f846e1
-EBUILD freetype-9999.ebuild 6792 BLAKE2B cb4d191b0847f84ce7932c5a528b0873175bd2c6f6632151b7e48e7ef4c3be2313959a1b3b7f7fcb937496333a7e4387a238699c183c054572e60328d5089b08 SHA512 b11e00a433873180df27567b23b787642ebe9517965badfb5a158fe13ec1cf119568fc11b5dd4f271a607ead2fe195b7f4581758f2ca59a4e12b93f0e875b171
+EBUILD freetype-9999.ebuild 7177 BLAKE2B 33c6d729825e16d8e8a7c4d26ced8e4a8aba09bca94ebaae442145d6daceacba600163758f7f3f86e4963d773e0ecc66de2caff40c479b0ed6a86c490f22a35b SHA512 8941208273d13daccd040db533c26f1c9d41955a519f9b0e5d8f0e0bd22f4c0a136582ad1417d4ecea060713df8384c0eb0b19d17af1ab0a4911175edf0802f6
 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index b8b52e17acc9..a57a34037502 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -80,6 +80,16 @@ src_fetch() {
 
 src_unpack() {
 	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg submodule (#758902)
+		local dlg_inc_dir="${S}/submodules/dlg/include/dlg"
+		local dlg_src_dir="${S}/submodules/dlg/src/dlg"
+		local dlg_dest_dir="${S}/src/dlg"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 07812169e19f..3a58e3cf5726 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 2546 BLAKE2B ddaa75cd04902204a36ddf712064bd542e4c2e16e59fb21e296bf081e7e13ba6311e52ed0dd2c0c36f4a83a79a35ebb83627afa815ed0d767c0a8abf730b0237 SHA512 643ba24e91561046794da0f4f9d07db97e7726cb9c61cb6b1d22a1ffd0d4c8b04cb2f4fc5a11d1d9e82c5a219e91befcbc745dbe9a619e5a730d0e81374d30b8
+EBUILD gd-2.3.0.ebuild 2553 BLAKE2B da39a7001c059f8762de0c2c45300451ee4741eee00c3143fcda9e6eef892a8332b6dcd15c004ee2fdee49f954c001636104949c6c49e1c437755ab3f16d9f44 SHA512 8b9362113f14adefaf632f06d582e5ffb74ff1921d21935c4e5a6fa4df6a10c47100f7f39119ee76a65b0ca4df8ec1397272329ac8b1420da8c89cfc82a0d544
 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 923a8390e6a0..79cfcfea4415 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index b2391298dbe5..0f11f9b684ba 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 1903 BLAKE2B 3d3784ca1f125f14444ba7b267482d5b7397e5354cc506feae1a5a2476033231ac134c3e9ea59cb884c96694ed5342bc61535318c1cf710f3de23b5d4f4cb0bb SHA512 322b8eab136c0f0917de59ea677f0584dfb64322065cfed606683cb68945a9cef41c0bb07339f0e2ce0233d758e1b907bbacafa8adf9499e5b36ad175529f41f
+EBUILD giflib-5.2.1-r1.ebuild 1910 BLAKE2B 638db4a6276f8c05e98cdd11466286dcd0482975b8fd7886989c1d0a9eb4ab260148560a0e0feb353ce178db7cc7d3eee33ca3e614f1a81fb8801078c41c4b2f SHA512 f937e9818fa8d88a0461afdd82788a14ddfd34f3f050dec75d48ddc2f66c342d5fefd600cd7d360a8d523532947144bf77d61fb667e3209ba20d4ed6cf264692
 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 74daec895cf6..9682a89aed3e 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -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 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index eec8bd98785d..bc664118d6e2 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -8,4 +8,4 @@ EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b03
 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.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
-MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
+MISC metadata.xml 544 BLAKE2B 1b51ba07aff67e963ef1fc1e9e30d40352c7f04c7c3996db73a5877aa2cb9e7150fa52017ac3a5100f1bdbc400f0ec6a392ac4352531e5a8ff893ddfcc271325 SHA512 144dfba609da46e7b7757b9173bf06248efd764e4246564321cb8c60bb9504d99cf0da62ed3d2bdc78bcc81648353c9c507aca6defff9299e3f9f99b4c3fe902
diff --git a/media-libs/glm/metadata.xml b/media-libs/glm/metadata.xml
index c07843970558..9b8121fd8a37 100644
--- a/media-libs/glm/metadata.xml
+++ b/media-libs/glm/metadata.xml
@@ -9,7 +9,7 @@
 		header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification. 
 	</longdescription>
 	<upstream>
-		<remote-id type="github">g-trunc/glm</remote-id>
+		<remote-id type="github">g-truc/glm</remote-id>
 		<remote-id type="sourceforge">ogl-math</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 4929606c1de3..b6416345bc23 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
-EBUILD glu-9.0.1.ebuild 1001 BLAKE2B 0aff6c031257de4dd78f01ad4b66b9964a741b1e8d075f9ef5d19d7967b2e17aed7a9db0cc2f0d039a64a10ca8aea14101780efd3f1b95a9961e5b1aa9bb9536 SHA512 9d9640f42b4afcc378c21423dd526192c6d6287f5b75a4e1f43956601897bbf953d27a9f1d6ec0d00c6f755157872474a5e400e99c6761abb41a42327d0746d9
+EBUILD glu-9.0.1.ebuild 1008 BLAKE2B 6008cc9f445a7284704671e7b18bc0327399d9e2da2996389c3ad240a0b24d679087fdc5b31419e31a312451cce42277a1c766f4cca50bcf17f4c5fb687b8c5d SHA512 7d3a4924a76ad435058d8173b1b0de68f8f3063a97fbb650c170f11621d3b73ac30e4e0c05b43a59601997cf38ccacf51a78ce5c30ec41c38349e388d542508a
 EBUILD glu-9999.ebuild 1010 BLAKE2B 969a6e9217035d36fa73b42e65318961b1f5c2b084d1af7720c0ad0afdba256c2f3bb1dcd88fdfc5e4e53c6b873dc4b69f1c3143e52f1e402d0dc3cc198a0c93 SHA512 5cbfce3faeb61fdfa05a950c78be9c2e60445461e28412f539195372ee0febff5dc7ef72bee80fde822dd6ad38ce2e4a85259882b259717a5021d3756ddc0cb0
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index 9a35eda71550..f17558eeb992 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
index 1193eb737442..cccd832f9f1e 100644
--- a/media-libs/gmtk/Manifest
+++ b/media-libs/gmtk/Manifest
@@ -1,5 +1,3 @@
-DIST gmtk-1.0.8.tar.gz 407790 BLAKE2B e156edc18124b8ff87dec9ad70c579fb95dcaf96a2cef5316cc2e95cf68700099ccbb1b83652cb515c9c33f27f63f81b7966ee8d6d30e5b7545b3e9be63e864b SHA512 ef2bff079df5ba41b86b52118b51bfe0343093e206dd7eca0da39f0420eca4d2f3cbb93940ecadb1526303c8ca0f9b27ff61cbd193122cc91a0fff768e6601ee
 DIST gmtk-1.0.9.tar.gz 411609 BLAKE2B 6c5c7b3390a3d7ab6593484247447f1016475b5f785cb7cf77810aac37034ce704286e9512cc5d091a04ae6362f8a0634db21599ff6bb78141aa3c5a5405db9d SHA512 61da4bbba5b74510c5ad5d6b5e10606fb99f54732cf412aa6245add2dc2b0df12b75e4e6f1474b4cab0541063ba6f95893e366f1c8b52a055521b667c182dcdf
-EBUILD gmtk-1.0.8.ebuild 1009 BLAKE2B 7b9c50381a9b454e1c63a75de37849672ae50931ab519a3fa93a8d42480f99b73905d3084bbbd6a872642fb3a9e1434a40f5278b3243b5be3f20ba96a09a63e1 SHA512 8a374b3aa1627d6e6d292df970e0e09e43602b994c96f9a758185e3222071d4bbd1ab2131ba557a700b3536530422644a98d779e39d4f68fb98173e8a2276c4a
 EBUILD gmtk-1.0.9.ebuild 1016 BLAKE2B 0f3ad5d4f7326bbbbac3579f920dd606d59ad762c47228f4563e6d40634b841136dcef32fd38bb89ad02f3a49aa3ea86ae726b20d410aebb702ba0e7e1d90540 SHA512 d756b97726b63bbeb8c57b3471b13479ebb41378abbb08575d69d354766d04b47c5ae640f59011a4d166f90004d5e85ab1e72031b0ec4d4f890b2dbe7a5e3c6a
 MISC metadata.xml 321 BLAKE2B 9ee0f6f0335977fcf934de319b5c6b43c490de8c6e2e84563e962f10bf781186b04a1db77d420f2c13782723eec266b1b150b2bf72d96c55edc5aee6b4b5aa88 SHA512 e89aecb354cbcd3e1df953d02b20ade390b417179779efc7f8e5d3753a583502bb87637f26b205c883abbfca8022fe4f9119e7129f2599aaf5a434e974bc8247
diff --git a/media-libs/gmtk/gmtk-1.0.8.ebuild b/media-libs/gmtk/gmtk-1.0.8.ebuild
deleted file mode 100644
index dc272d4de8e8..000000000000
--- a/media-libs/gmtk/gmtk-1.0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="GTK+ widget and function libraries for gnome-mplayer"
-HOMEPAGE="https://code.google.com/p/gmtk/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="alsa +dconf pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${COMMON_DEPEND}
-	dconf? ( gnome-base/dconf )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="ChangeLog"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-gtk3 \
-		$(use_enable dconf gsettings) \
-		--disable-gconf \
-		$(use_enable !dconf keystore) \
-		--with-gio \
-		$(use_with alsa) \
-		$(use_with pulseaudio)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index a9ab846bc7f9..228252384772 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 840 BLAKE2B 86ce5f9912a71a58c30cf6467d49b660f85d91b67e92388f27023ab8af62c9ff54bcb4971028b6e38ab9108af48db2eaa03b1d57c38fc27cfa36a4e3bed8690f SHA512 79ba41aaa997eae46954656e012e547f7a7f8a3b4a8eda3a916831704a0df3016f0357823e4c738c9f876f609f50263a8276d342634f40b7ddd85274f8ab5030
+EBUILD gsound-1.0.2-r1.ebuild 847 BLAKE2B b42bd8e7bc1b249ab0c8258ad58eadaf33c682712185dc8d86ea1952185992359e17d7ad404ee6b7cb794dabf37ca5d54b7cfb4623c42838ff192a86a3d46bae SHA512 c99775df1319f0b8851150f6243fa0d8dfa65de27ca352d301be70892adb4d938b4742c80c5330862a4f5c12684d39dda1161a2ee72181b6ddd130e633c22a41
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index cf05d8cf1144..bbb5fd9d2776 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index d7f3ea3b1582..f5bb6b45b667 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,6 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
-EBUILD hamlib-3.3-r1.ebuild 2098 BLAKE2B 71e21520f50d9d4edf8b6185fa7504bdac6462245f7ac13390738784fc58134f81a80985684595853b7a703cced26790f8b2009b4635e67cefb2f4e54ee85d08 SHA512 f2ef47cb0738712c29bc588ce4ebcba070ebc3d8d71ebf9649eeb1370c6f8102d7df30714f5d1f8d56badfec0919f6ce271d12fe035707a9742c3adf19e9b3da
-EBUILD hamlib-3.3.ebuild 2094 BLAKE2B 6efc59674c743530a54fc0d68e8750f5cc7eb3504d74ad1fd160a41e1dd0f3be87fb669c0d7fe6cd9de2001d55ba108cdbbbb5e62ee05c688c80f25a5db0b765 SHA512 ad1af776080acb8a0fe6dd960bbe8f1ace7feff5966b648b29b04d5e6017ba094f2ddeaecbc5b7df8e256689fcd5a4848c67db98cb02263caac66679ed4ce3c5
+EBUILD hamlib-3.3-r1.ebuild 2096 BLAKE2B 59b0a7f8e8b77e95e300dc98959ba8e6d70d0264c7d98b35368c730d085545a9c5d98b1c59954312611b835eb4c5ef3a2070731dd5323617f968582decc6e892 SHA512 01d9a0506a075d5e1e619f2431cb3f9c16dcf234f3e6a240539623ce9cbe62f98918a0408e3c82d372b36a66d45f48bbf42dd0130543ddfa351a3cfe517b0b49
 EBUILD hamlib-4.0_rc2.ebuild 2063 BLAKE2B 3462b89e1a29d30dea53432b9bfe776257bbd133e35a55fb9b882dcac064f9f086c17cde3938a029b92be8ecd27909e124d03e78a19b4ec7a902414fb86e8c09 SHA512 a75e48f521015e950695712c2d41a5c826662fcd21e9b860f203118462413ff1f4fc44d9fe1d59001e28d6e07fe033a3f2e9e7cd4cb69b56fcd8a372ffa0cb8d
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
index fba1a537a608..f5ac9c6a5344 100644
--- a/media-libs/hamlib/hamlib-3.3-r1.ebuild
+++ b/media-libs/hamlib/hamlib-3.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
deleted file mode 100644
index e1f23ef7bc6d..000000000000
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
-SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}"/hamlib-3.3-format-security.patch )
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-
-	eapply "${PATCHES}"
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 611e586afb67..eaa2750798ae 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,6 @@
 DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
 DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
 EBUILD harfbuzz-2.6.7.ebuild 3164 BLAKE2B 3898c5e563aa288fa02c933d8cec30f0eb010329345efd5fb6b13d99fe06b76d75a3b815f202a6a31729670b1f7f3f3500a783397d0a390147d4b836ce00ec47 SHA512 21869f25283685a9b56e625fe719c7922a9428c6db66181e977461f3292559796224d12708269964d5748981785dd5ce34adacfa5af12a4ec12d77b4f5b69c99
-EBUILD harfbuzz-2.7.2.ebuild 2668 BLAKE2B 044fd4a2cfd2d6fbd827b056a9bb86e07958b4ab77905346daacb9ae7862508adfb92347a0ab81c4aae6fe0a9cfe9ce218f822be9d667765f5ab074ce0ef0a22 SHA512 ae53fa7315dbda9a5c0d5c727591d4ca4a67bf43045eee8497834a4de0b8fa146a9a5304fd459848a0b89439d2280a12d6d5620c9968e3e0a097c15d549b76ea
+EBUILD harfbuzz-2.7.2.ebuild 2674 BLAKE2B 72db7468c820529e8879777a4223fae0a67e6dc61a2bdaceccedd93123f11e07f7602c1271e6cab560ed533ac30fe8df34eed1176812a7c2881b1b6578f0de17 SHA512 488c4842618955b7e3d3c08f71701fffac5d043104f0a2c9efefd3f55869d5e257ce857f511ba4b36e7bf654d2c2dbd163898df3e929cd8732367480fcff70cc
 EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
index 6d14ebf5eab7..0f9b87292f7f 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 4f9a32c9cb4f..51edb60b6cc3 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -4,5 +4,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
 EBUILD jbig2dec-0.18.ebuild 1655 BLAKE2B d1039e26d0b0a7573b0a8c1c60b109a70d8d5e0d9aa2dd3918037405e6470ac3a6ff5d2b82fbb587526efd739bf55aad54a2c4314fb6a102a23537157b4452f1 SHA512 39af2ce59fe84344f6fc8a6b366af223a3c34d27e61e0bfa2b68081386c13fadc78311554a8ba404cab9ef0c16e4adf1ce56039c6e1bfe5e8c7d5de2e92215fc
-EBUILD jbig2dec-0.19.ebuild 1563 BLAKE2B 3bb416c38484bc042a28990809c238f45e569a173909a8768a50d1a43b757ee865c08ac1fbd4dbe3ae85d4316deafe0bb5b12ef2cb0e0535a34025bc36d2f47e SHA512 1fdaf76e9f6a7635872f5104afff6c616ed98b3cb0dce64af92b76a27bf31b62789b89508952604fce29dfef8774a15128156910e988fa90427f82761ce7f050
+EBUILD jbig2dec-0.19.ebuild 1570 BLAKE2B 26644e97a37d51cb5603ab9eea104acd0e19d269101ea292625f2850204d4cd8760d15c573b5c4582c998fc1cd28ef93bd297140162ba2718adf2635a3176b25 SHA512 bb1a005ad7c6a2918867730714d793f77473c32a1a3b3a606a458a7bf6fecc34ec574eece83752727e69a7c6bd26a8e62825f898fcc311278bcd021e4adc26c3
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index 97c630ef5225..f36202846274 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 b054b2ccee2e..cf6f01ff7dcb 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 1411 BLAKE2B a510c50a2031387b774045333706999680b7ca1a3eca992db956009c5e4927f11e08fcfa3873bb96b09f3a748d03ec063ba81fc3da9ecc6dddd0436f4e43828e SHA512 83c7ce193ef786458b3788e3d231d38dda207f8325ed49d69643e12cbb29cf90c6ea84489048446877386371a0a8ae5cd77b034f9cb5a2500e8a68c049950f86
+EBUILD jbigkit-2.1.ebuild 1418 BLAKE2B 0affd21382e4094fb248deb74a226f476fcf52e14dabe8ca1a7fb15ad622f87e9f3db5880ef785ce055e0210cc9b60bfabed2f53bbc8efb860df809dbee0f15e SHA512 f52643e14962b1f412e40a8dfc36b7e89883b39a6b8ebfee5be7a52d18a94c8327f567e195d6d2c2a2b8fd9118ed5217039182f4c7f917b44112219af209c0e8
 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 2ccef4bbc46a..d6dd92874b32 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -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 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 ~x86-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/lasi/Manifest b/media-libs/lasi/Manifest
index 12c356f5b812..57f53085d71c 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,5 @@
 AUX lasi-1.1.0-cmake.patch 421 BLAKE2B 39ebb3759e055f045f406f59d9408c09f70a5496a76881f6a16621f3aa24364206360811f70f7db4b5a85f4583a525d1dd9de4fc28f45056bc8c4148cdfd6fd1 SHA512 f4218f6ed42c149dcbcefdee55e0332b83f5a6e039571cf9e0f600a60408071f9bd0d32fc0ea3286157719e164ec49221f84451353c1d3af7df5e58d7cae284b
 AUX lasi-1.1.0-pkgconfig.patch 701 BLAKE2B 50c59743897a07974e5329d1b0c039707533c4f3b0d51595b93faaf9abec034ae0407db59f4e112996210398fdabad4b4a0812f6888c1c6b83fe4b7bcb4a3854 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da
 DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
-EBUILD lasi-1.1.2.ebuild 1289 BLAKE2B 5b3662e8551c4cda3fcb38cc9a42fd0167741aa0166376bf05f6225cb9455bb22bd245a7d9acecef32f316cb5684af35cc8a22758d19e55d7710785c43de5d8c SHA512 b92229396f3f43d0bb19aa12ecf1ed89bb9c0f9961e3b0876a9d6b769b26241bc797d9ad77a0b2822b2b1db915aa1f696f19d8be43a3bb3ec9c59ec1c74ec1df
+EBUILD lasi-1.1.2.ebuild 1296 BLAKE2B b5d56d8377396591ff84f093723001dabf498b1b70258092305ea70054eeebbab72c5ef2b79ca91da517131f936fa4caacb0fa11a67315c3f219da882418799c SHA512 2d2c91e1eae07f4776ddc86f228e1edda4358fb9ebb60a6c896a98c8731bf4b592fc1a11f49f346a6ce2df6156286feebe0f57dee9e11f4222e283127b72e12d
 MISC metadata.xml 1218 BLAKE2B f6a5085f03d1bc69e88727d15754965b6db817bda61be0e71a7e7eb39262f3836de56e44498263f7c55ebdc2d58f7914e364fc23d11a1988a0ef4ca2883529c5 SHA512 c9688f2a9e74c81d7906d6609db72a7f29463c12800fb9e7922f1a4cd41db001722e5c5b102642464541e02d3a3f678fe0dd7013df9c8eace959dba3ba49ed71
diff --git a/media-libs/lasi/lasi-1.1.2.ebuild b/media-libs/lasi/lasi-1.1.2.ebuild
index 5bae3448c03c..80af78bde920 100644
--- a/media-libs/lasi/lasi-1.1.2.ebuild
+++ b/media-libs/lasi/lasi-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index acace06cc2e8..6f9f2fd4f193 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,6 +3,6 @@ DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
 EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e
-EBUILD lcms-2.11.ebuild 1175 BLAKE2B edb606f9ad9492f41a18a7580b7f35fe440af453411b68d42c75e6da04bc8b398779441c034a284d03fdc979fd9c636d0e82b9e97500412130dccf0f2312c5ce SHA512 17d45e9a6aea955ce211f8cbc609ff20e2c19694cdc354891ee9ea0c511748a2199c14216a6a3942e0e8a0fde827f93a18ada53be90fda16d2be22b551339445
+EBUILD lcms-2.11.ebuild 1182 BLAKE2B 0b6803ee8a0e2ca1c1c6bd2b7d9d0792f768f9974a04c578b47664b7577db8d28f68f36325f24ee7372f3b6ed2553e529c7c9d265a2537412d27a1cb764ba908 SHA512 3d4672279becff86d2209fb4e845a6738382d0136cb591e5c40601dc8a39bd3c21c19a3662c6e787e60d895898807e074c72bbf143458f7050b25bc79a5fcd24
 EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc
 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 ccfaaba4d2d7..663c3bb5cc82 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 69b3369ac00a..d8cb5b3be67d 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -3,8 +3,6 @@ AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca6
 AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
-EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c
 EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4
 EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5
-EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe
 MISC metadata.xml 431 BLAKE2B c469c1c5f88e5e3014221c85aa47b95ac8720257705c35e79a76945aaebbe075d559696e6941d64c9237e849969c9a369c7a8db96d24965bef78b88b85ace7d5 SHA512 09ba499ac33f3a9162ac15c23d0c262a32606c731a775579a0c8d6d2a24137687e1306aa17e4f66d4aba57d141d991ab4186716e2b7a55ace4ce7526b37680f3
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
deleted file mode 100644
index a15221ea080b..000000000000
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils
-
-DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
-HOMEPAGE="https://code.google.com/p/lib3ds/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-PATCHES=(
-	"${FILESDIR}"/${P}-pkgconfig.patch
-	"${FILESDIR}"/${P}-mesh.c.patch
-)
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
deleted file mode 100644
index 2c964c8ca157..000000000000
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_PV="20080909"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
-HOMEPAGE="https://code.google.com/p/lib3ds/"
-SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-}
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index a95497d34ecc..5aec0dda4b24 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -1,6 +1,5 @@
 AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r2.ebuild 1306 BLAKE2B 2e2dd18b57efa905dc28f9d43034e97aebc8458a695734db8c42b1135754577e8d5c6702f072ab2e981483e7ef1999ce592f45c22498c89ffcb212d6b2b5f835 SHA512 9f7352d881efb6b89020531a47e98d118bf745d1f0ca665458e9439e7e49c5b308ab0f85917c93938f5a28b12298d02496b8766b9055aba4842ee8bc36fea41d
 EBUILD libaacplus-2.0.2-r3.ebuild 1361 BLAKE2B 6600c3458974833ac33d2855b12c306e1db9cace887089daf6080eb91b1ed15fca4b4f0c2567d4b2b9aaa42430e8593e8a93d261dee4827a91f2fb55776363d7 SHA512 65484e22708fbb5129321d6e06fe1d38b89a61fe41fd42068b460b4144c99d479e3d5319c8232b01daddbddc14b355af572b82c5ace9edc160ed8f3001d66c5d
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
deleted file mode 100644
index fc5f229fa590..000000000000
--- a/media-libs/libaacplus/libaacplus-2.0.2-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=5
-
-inherit autotools eutils ltprune multilib-minimal
-
-# This file cannot be mirrored.
-# See the notes at http://tipok.org.ua/node/17
-# The .tar.gz, ie the wrapper library, is lgpl though.
-TGPPDIST=26410-800.zip
-
-DESCRIPTION="HE-AAC+ v2 library, based on the reference implementation"
-HOMEPAGE="http://tipok.org.ua/node/17"
-SRC_URI="
-	https://dev.gentoo.org/~aballier/${P}.tar.gz
-	http://217.20.164.161/~tipok/aacplus/${P}.tar.gz
-	http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/${TGPPDIST}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="fftw static-libs"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	!media-sound/aacplusenc
-	fftw? ( >=sci-libs/fftw-3.3.3-r2:3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	sed \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-		-i configure.ac || die
-	eautoreconf
-	cp "${DISTDIR}/${TGPPDIST}" src/ || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_with fftw fftw3) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 7dcb186c9544..f3a729284271 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,7 +1,3 @@
-DIST libaacs-0.10.0.tar.bz2 319890 BLAKE2B b7ea746e72028f718ee630d74360c52627360b503d739e884c213651597e719711b2dc7649ded4164ee35a56e3420de59e420c4ce8fa7b1dbebcd547f5221798 SHA512 4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e
 DIST libaacs-0.11.0.tar.bz2 324061 BLAKE2B 8faffa270580f82b7fc6ae53922a9ec15087b754adebc84f1fd216c748dbcbe6723c14908efc9ef77b891bda149d10bf5020321906a36a3654dddbf6bdc00936 SHA512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388
-DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
-EBUILD libaacs-0.10.0.ebuild 996 BLAKE2B 0b67440a4d94a4cb6908ab9b977458de835fd9ea2bc161d00a10d9604c2a085c5b1bf3d6b8d4ec4470bf85f3cb5afc4bd586859635a0a3aa3fda319486e786ec SHA512 72b9bbca677307e8a58183b8cae32eda06af8d82586c95021bcc62f99bbf2d6f2bf22ba3c31c63239e4b6d82a152bb7bbc5469928ce06cc81fcc1e763e5af236
 EBUILD libaacs-0.11.0.ebuild 988 BLAKE2B 5a6bf138f51b3bad43d2a5f015190430d59cfb7582cbd7754b411f53c28978c52e586cb6c3705f16943838c4ef829957487345a3be65d066e431a7ebf1c2ac73 SHA512 08d62edfb243c36d0f70a3d8fd171d99b4af1246cd545bebb175db1359aeb1be067fdefb5491e51d41055daec8b72433f9fd9ab7a8147569d9f0ac7b7cc99a0f
-EBUILD libaacs-0.9.0.ebuild 806 BLAKE2B 1b4852f3be27474d53b4d185defdf8f68802ca9feb0fcafcfdc1b5c39f0033a3fe13d68e71ddc4dd3ab5c6edd79f8270b1dac9588c18435225d0ab57d935eddc SHA512 f8760dbd524681a777f6ac97d003d0b35c0519e2af18231bd0285063950307f1c1583f55bcebd9a33ca400223335600d45ee35e12f39e0f4ea9b420ead6e32b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.10.0.ebuild b/media-libs/libaacs/libaacs-0.10.0.ebuild
deleted file mode 100644
index 721e0ec2e382..000000000000
--- a/media-libs/libaacs/libaacs-0.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
-HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
-SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-
-DOCS=( ChangeLog KEYDB.cfg README.txt )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
deleted file mode 100644
index 1d50bf2ab9a0..000000000000
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
-HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
-SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( ChangeLog KEYDB.cfg README.txt )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 09b1c193efb0..53ecc977b884 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,3 @@
-DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459
-EBUILD libass-0.14.0.ebuild 1327 BLAKE2B f028ea85ba3ba45567bbc89bb39d53b4512e7c277ce9d15426b1fdde06c2f736580626dd06669180ae8d2c5334868b41010754e1841bb4c9ac48d68ec81c503c SHA512 e458b290efad610799460bfdf015430c57d411e47e64ccb21e027e4b8b2b8797142dd5dfc919f63a5e8256bce10e9c62a5bdb89226cd413d8a347185c3ca8638
-EBUILD libass-0.15.0.ebuild 1200 BLAKE2B 8ea27b0eae690757fde1ebb2e2ff438cd67af2aaa359453db716b2a0a4ae8838d1ce38e4117fd404a3e15e397eee688dc31149a5ffe2b62e4794ad48e3610dd2 SHA512 43266256b2c5ff7a60b391faf93d874c40fb101dcb0e594ec0df8ca0349512508027aa50223402af95a68b1eccc6c12839c6fff63c7cdf599a5cb19bc748012b
-MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
+EBUILD libass-0.15.0.ebuild 1193 BLAKE2B f134c300241925360e95e1c7c0bf78e5b0d8303b8b3e59a959684bcc3218c2f996115fb7d3c92392b1921a39679a2be702bca22d12acda78087ebc542726b3db SHA512 aa4622c634f452c6315cddc9bd8b3c7f09ff46018717989ed7a83fce07ee2150e83f1929928ad44f70fbb1760234c9e34127b042a0617d189c6d360ea7e87a60
+MISC metadata.xml 309 BLAKE2B a2a606460c51302aa57936da38c4e15105eeaa9615c700f0df4a5454124a719377e4bf3d47a40ba876791e2d2c8aa92fa042eb9309ad2390963fd6014db5507a SHA512 d8e6dd073dd6334784f165bca935396edf8ce217f5f3495b0ed9d80ae84b784b16ab252a7ed18af23b4ea8ec9190d42b2c75aeb9467ef7c5a387d042e9d7676c
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
deleted file mode 100644
index 45a0b21a9312..000000000000
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-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"
-IUSE="+fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
-	DEPEND="${DEPEND}
-		${i}? ( dev-lang/nasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fontconfig) \
-		$(use_enable harfbuzz) \
-		$(use_enable static-libs static) \
-		--disable-require-system-font-provider
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libass/libass-0.15.0.ebuild b/media-libs/libass/libass-0.15.0.ebuild
index a2a16f40d522..c19122dc7671 100644
--- a/media-libs/libass/libass-0.15.0.ebuild
+++ b/media-libs/libass/libass-0.15.0.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="
diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index 535194aef967..790f049d7dde 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/metadata.xml
@@ -4,9 +4,6 @@
   <maintainer type="project">
     <email>media-video@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="harfbuzz">Enables OpenType shaping via <pkg>media-libs/harfbuzz</pkg>.</flag>
-  </use>
   <upstream>
     <remote-id type="github">libass/libass</remote-id>
   </upstream>
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 69e400d04f97..73ba50f858ed 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
-EBUILD libepoxy-1.5.4.ebuild 1135 BLAKE2B f8f8855faa0a23f95ed7732e00b80ae704705264448423a22c6cfee7515c12150460dbd11c91b5e44965ec09e3691a43601b01d988733b6a2afc651fe4102989 SHA512 3321969fc45aab95051f0da5ed83b83bae560d0a51339fe21d9797fa33e2c839251a9e0f00ebe605d00d1e19ca2c77fbbeaa80d7b8a8356ccd7b7f853f1f23c8
+EBUILD libepoxy-1.5.4.ebuild 1142 BLAKE2B 5cfd33bbb2c87733e6bff7f9e25f16d482aaf201d0fd179dd5e6bdd496abe2b5e7c7ba277353012ad089f722d42d8c58c76e65b4515085f83965fc58766db438 SHA512 e78b8eccbf1aaeb930803bca1927ed12d9870fda9b67f44651c93f60cb019523239474b7631edf5c526da9ea7a4cdbd596737f79dd783efbd9ed9e0cc7f99c0c
 EBUILD libepoxy-9999.ebuild 1143 BLAKE2B dd8059028b7dc955f0ea6c1b4cc49b191f35b6805023d8db3b4af5104654781065021b5898bd9b1b64433103638b66591b8a64319d91f782936f6c6d7bafffc4 SHA512 314e349c2a6c6d4aeac04764bfe50708fc482c94e3818827196dc2b8d0d0bfb2d60387c3d346164fe860b75121614f484bde039f08eaf659acbea88506debb9b
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index 0d6748e1bdbc..25a4f670ebc4 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 89ea6ad8b0ca..59b8ede05ad2 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,9 +1,7 @@
 AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e57384751ee9b708960a2a471e32c68cd5acf71fa2c649a00c9dcc4f7c5322e1a51b0ceadd793dfaf0eba0a3840485e38e2 SHA512 49f2c44f8b565edb65b625f4ca21f4751ad3b2ec8c636d0cfda4f65db75cc0382d0e06ebd7dbaeb71fc7bd478b9ffa126e13786809f8e882af0478f6a814caaf
 AUX dont-strip.patch 596 BLAKE2B 166f289c8e6027ce5c57accf6e2644afe6a275849b178993a37260dfee463b67bd7969e4b2b0365d27aba9da4239a4dc821fe4b9beb0846821312f3f04f29079 SHA512 58906ab0d472f3186f99c14d9fd3c6104b7df1ef9b20f5bb3a334ed357d6cc808ec04609108cc7aab6a1b6ed781624e728bb4f9a14cdc59a5cf84ace591268c6
-DIST libhdhomerun_20150826.tgz 49169 BLAKE2B 6b780d61624e9cca9ca6afbbcdf91377dc134782ee22752c8d92849c6eabac502a3a8a8659035b8a0fd66ae1d7404f6696f78758e0ff4484b46b84ca7282b48f SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
-EBUILD libhdhomerun-20150826.ebuild 624 BLAKE2B 118b8847494bc537d9ad5a71c06c8f3b704dc574bc0f5a85008e1099c6fa698ac338c8b03684073b1eb552e6bb44292947d02c8ee1fbdcfcfcb18b51bc0e3d8d SHA512 0d0a49bffdc67789ceb896db00191c65e40e2f02b21c9cc4aa5b312c6c1edad217f35509a61488a7d59ea7e5c55894cb67f509cf5b69a28df16c6f7918b530e7
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
 EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B 24f96b3e66c295f77841d2f6e5fd0bb50aceb6ab549925b82b87129c260eff20a8e49a85060d88a343097bdc47388dec7ef44efa4a7ce6f47744b29f2075497f SHA512 e6519e4fb53f129baef66b52c471cec82ee2380c91bcb70675221628c68792dbd330226cc44d8a5928f2d8707ee14b900713226fd42008c655863c3fc16a7719
 MISC metadata.xml 381 BLAKE2B 5ffa518c826118aec9b46d3e964d52f21ef19332b0ee956cc153b992eb5c85af27ebebfb6891156262eb19e65b0b47f076d0940b490fadb42f2b04d16889b550 SHA512 4cf06e9cd0ab6bce4c38f2b86c4875864924616746fb18816f647dfb4cacde6e7678c2f7a20c0de94194e9227d6133efded1f81ac2064b7d0532b445cf041b38
diff --git a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
deleted file mode 100644
index 5f5c3b3608b9..000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	dobin hdhomerun_config
-	dolib libhdhomerun.so
-
-	insinto /usr/include/hdhomerun
-	doins *.h
-}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index b1faeaf7e4b3..fd1b365b0f13 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,12 +2,11 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f
 AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5f6476ef539e3499d2cfafbe5be129c1a246cf2f3e7f170e71bfb33adbaebe6b3812ccdfd72d99c5961011e093f740d7182fd7c1398 SHA512 1f97899970327fb6dabe521e93029a518f1493bdf45f9a345f55e803f97af7f36b65d569e4921c1aab7478006b4cd34c4f17bf150a7ffdd3760f14d9acb5b303
 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
-AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d194bc43b7aabc1c0af7c1a362073c1e1006ef4598e92deacc1373d9645076b43f0277a777007b986e62c71bc84d9d2640308872fa46 SHA512 dbb8b6cfcc672e41af8150139a964deac3d926e7e4435e0d5125b36e7dcfdfcb3915267efeb1a7d891581b34790636ea2d1de48163d8c6ddc50e041dbd1ae140
 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 3238 BLAKE2B b249408679a3f8505ffb73ccaa448d3d3dfb94d77b74d82929422f03b7de9fc26e67d01e03bb3277800faff2b444323fcfcacb8f41d390396d236e1d6cb59248 SHA512 2d490158ce49dd55b31d1f5299282cdc632f8e18aff4d402693e28294670f1d39ef257a86bb3ec192c8b67492ea02045311e95965694597a30fb4082cad7418e
+EBUILD libjpeg-turbo-2.0.6.ebuild 3067 BLAKE2B ca3f367bf9775f6575311ca493a8e8d29c311f6d9b85ec88227f3cf945e6b8196b41ada32f23d15500015f2333efe8cbaf89d0717a9a437f653ff5bbde73a0a0 SHA512 0ead756c3ec26dcc5bf41c6180f502d4afcdf639d2884c72d4f392e0a19c5b235ff1f706781c9a76606aaacd91655731149f6b8c78277ede60582aab30c9b7c9
 MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
deleted file mode 100644
index e88ac174684d..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index 87bc33090..a8507b902 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
-  * Copyright (C) 1991-1997, Thomas G. Lane.
-  * Modified 2009 by Bill Allombert, Guido Vollbeding.
-  * libjpeg-turbo Modifications:
-- * Copyright (C) 2015-2017, D. R. Commander.
-+ * Copyright (C) 2015-2017, 2020, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README.ijg
-  * file.
-  *
-@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
-     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
-     source->rescale = (JSAMPLE *)
-       (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
--                                  (size_t)(((long)maxval + 1L) *
-+                                  (size_t)(((long)MAX(maxval, 255) + 1L) *
-                                            sizeof(JSAMPLE)));
-     half_maxval = maxval / 2;
-     for (val = 0; val <= (long)maxval; val++) {
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 ef4620715867..3637bb4413ac 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -83,20 +83,14 @@ multilib_src_configure() {
 		-DWITH_MEM_SRCDST=ON
 	)
 
-	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+	# bug #420239, bug #723800
+	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF ) #420239
 
 	# mostly for Prefix, ensure that we use our yasm if installed and
 	# not pick up host-provided nasm
 	has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
 		mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
 
-	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
 }
 
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 5747836032a2..b00efbf2db6a 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,4 +1,4 @@
-AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
-DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1080 BLAKE2B 317ad17291bc477d59d761cd15fa3facd3389777d966b42b76b408726527094e0b65cb11c0d74194795f0fb92e78a320c2ad1904270f711f6800c9a40319dc5a SHA512 f7a09d4190eb8efa296b18f27a715bb64713de375ede6b1c70745df4bab90a77709c5a2dc34bb204bd46ad0dc17d3dbba39f6c4ad218fa10f7812729e8e14d41
+AUX liblastfm-1.1.0_pre20190625-missing-dep.patch 766 BLAKE2B 87172764568e132717a88d42ce66f2c33453a2c506a1fcfa4200172d8ad88f353fa2d625397c38589fb6ee83674b4b45d64c78532e3513a3c738fd7dc7c89cf5 SHA512 d983704f7c4e10135b8399e0786f9f69974f44e0a3b5035d2b482cd2154ebfa066d4b2c874fd65c6a25b91a218518498f36aea54928603467a95c95bc5fc10c9
+DIST liblastfm-1.1.0_pre20190625.tar.gz 119348 BLAKE2B d4755d6dfe6dc8bb4c21e1f4ed94fd96165313111a553271e518ad57f08aab45980239a51416d6e99d87a86f7859c7ea04ba81fb06f6dfa61b2aa7f554935589 SHA512 ee36cc31e1f7b345e2de29ff4151acb7bbe30960bbf2528bf8eb5214a47272955efe3bd1c6e20af8dd22a4fbc510de34befdcd6c728683ae300bd45e578e5ebb
+EBUILD liblastfm-1.1.0_pre20190625.ebuild 1069 BLAKE2B 7e676bf61ed54474a790055acd1cb4f5e263fca9229ac653be61304fdafdfc88441d5077f150a5ae03881b138da8d729175bd3cdb8c90a5c41c8cdfbc4dcee2b SHA512 08465b758fe6a98cb909fee8d60588e28c8118596314557f961721a53b71d12e048579b0d9f12fd7333e7f6e2e3775c9d4a0459360787b97243c1a10d8dbb4bc
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
deleted file mode 100644
index fc0e9b8938dd..000000000000
--- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:51:42 +0200
-Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing
- deps
-
----
- CMakeLists.txt | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be88967..e628611 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
- # setup qt stuff
- set(CMAKE_AUTOMOC ON)
- 
--option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
-+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
- 
--if( NOT BUILD_WITH_QT4 )
--    # try Qt5 first, and prefer that if found
--    find_package(Qt5Core QUIET)
--endif()
-+if(NOT BUILD_WITH_QT4)
-+    find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG)
-+
-+    if(BUILD_FINGERPRINT)
-+        find_package(Qt5Sql REQUIRED CONFIG)
-+    endif()
- 
--if(Qt5Core_DIR)
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
-     include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
--        find_package(Qt5DBus REQUIRED)
-+        find_package(Qt5DBus REQUIRED CONFIG)
-     endif()
- 
- #     macro(qt_wrap_ui)
--- 
-2.17.0
-
-
-From ff32d56e5e1bd8b1f86a8e9840c778249ff19118 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:56:48 +0200
-Subject: [PATCH 2/4] Make use of FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e628611..dcdfd91 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
- 
- # installation dirs
- include(GNUInstallDirs)
-+include(FeatureSummary)
- 
- #cmake module path
- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
-@@ -97,3 +98,5 @@ if(BUILD_TESTS)
-     enable_testing()
-     add_subdirectory(tests)
- endif()
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.17.0
-
-
-From 5762278b29c1ab6559dcca7a1e8fbad1d75134da Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 12:06:48 +0200
-Subject: [PATCH 3/4] Cleanup include dirs
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dcdfd91..52589b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,10 +38,10 @@ if(NOT BUILD_WITH_QT4)
-     endif()
- 
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
-         find_package(Qt5DBus REQUIRED CONFIG)
-     endif()
-+    include_directories(Qt5::Core Qt5::Network Qt5::Xml)
- 
- #     macro(qt_wrap_ui)
- #         qt5_wrap_ui(${ARGN})
--- 
-2.17.0
-
-
-From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 15 Apr 2018 21:31:14 +0200
-Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
-
----
- CMakeLists.txt                 |  3 --
- src/CMakeLists.txt             | 63 +++++++++++++++++++---------------
- src/fingerprint/CMakeLists.txt | 20 ++++++-----
- tests/lastfm_add_test.cmake    | 16 +++++----
- 4 files changed, 55 insertions(+), 47 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52589b5..c8bc89d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4)
- #     endmacro()
- else()
-     find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED)
--
--    macro(qt5_use_modules)
--    endmacro()
- endif()
- 
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0f872fb..22ce506 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,16 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.in ${CMAKE_CURRENT_BINARY_DI
- 
- add_definitions(${QT_DEFINITIONS})
- include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
--set(liblastfm_LIBRARIES
--    ${QT_QTCORE_LIBRARY}
--    ${QT_QTNETWORK_LIBRARY}
--    ${QT_QTXML_LIBRARY}
--)
--
--list(APPEND liblastfm_QT5_MODULES
--    Xml
--    Network
--)
- 
- set(liblastfm_SOURCES
-         ws.cpp
-@@ -49,15 +39,11 @@ if(WIN32)
-     if(NOT MINGW)
-         add_definitions("-D_ATL_DLL -D_CRT_SECURE_NO_WARNINGS")
- 
--        list(APPEND liblastfm_SOURCES
-+        set(liblastfm_SOURCES ${liblastfm_SOURCES}
-             win/WNetworkConnectionMonitor_win.cpp
-             win/WmiSink.cpp
-             win/NdisEvents.cpp
-         )
--        list(APPEND liblastfm_LIBRARIES
--            winhttp
--            wbemuuid
--        )
-     endif()
- endif()
- 
-@@ -67,30 +53,51 @@ if(APPLE)
-     #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
-     #set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk")
- 
--    list(APPEND liblastfm_SOURCES
-+    set(liblastfm_SOURCES ${liblastfm_SOURCES}
-         mac/MNetworkConnectionMonitor_mac.cpp
-     )
--
--    find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
--    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
--    list(APPEND liblastfm_LIBRARIES
--        ${COREFOUNDATION_LIBRARY}
--        ${SYSTEMCONFIGURATION_LIBRARY}
--    )
- endif()
- 
- if(UNIX AND NOT APPLE)
--    list(APPEND liblastfm_SOURCES
-+    set(liblastfm_SOURCES ${liblastfm_SOURCES}
-         linux/LNetworkConnectionMonitor_linux.cpp
-     )
--    list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY})
--    list(APPEND liblastfm_QT5_MODULES DBus)
- endif()
- 
- add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES})
--qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES})
- 
--target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES})
-+if(Qt5Core_DIR)
-+    target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::Network Qt5::Xml)
-+    if(UNIX AND NOT APPLE)
-+        target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::DBus)
-+    endif()
-+else()
-+    target_link_libraries(${LASTFM_LIB_TARGET_NAME}
-+        ${QT_QTCORE_LIBRARY}
-+        ${QT_QTNETWORK_LIBRARY}
-+        ${QT_QTXML_LIBRARY}
-+    )
-+    if(UNIX AND NOT APPLE)
-+        target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${QT_QTDBUS_LIBRARY})
-+    endif()
-+endif()
-+
-+if(WIN32 AND NOT MINGW)
-+    target_link_libraries(${LASTFM_LIB_TARGET_NAME}
-+        winhttp
-+        wbemuuid
-+    )
-+endif()
-+
-+if(APPLE)
-+    find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
-+    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-+    target_link_libraries(${LASTFM_LIB_TARGET_NAME}
-+        ${COREFOUNDATION_LIBRARY}
-+        ${SYSTEMCONFIGURATION_LIBRARY}
-+    )
-+endif()
-+
- set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES
-     VERSION ${LASTFM_VERSION_STRING}
-     SOVERSION ${LASTFM_SOVERSION}
-diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt
-index 126f8d9..4a74e0d 100644
---- a/src/fingerprint/CMakeLists.txt
-+++ b/src/fingerprint/CMakeLists.txt
-@@ -26,21 +26,23 @@ set(lastfm_fingerprint_HEADERS
- 
- add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES})
- 
--target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME}
--    ${LASTFM_LIB_TARGET_NAME}
--    ${QT_QTSQL_LIBRARY}
--    ${QT_QTCORE_LIBRARY}
--    ${LIBSAMPLERATE_LIBRARY}
--    ${LIBFFTW3_LIBRARY}
--)
--
- set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES
-     COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB
-     VERSION ${LASTFM_VERSION_STRING}
-     SOVERSION ${LASTFM_SOVERSION}
- )
- 
--qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml)
-+target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME}
-+    ${LASTFM_LIB_TARGET_NAME}
-+    ${LIBSAMPLERATE_LIBRARY}
-+    ${LIBFFTW3_LIBRARY}
-+)
-+
-+if(Qt5Core_DIR)
-+    target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml)
-+else()
-+    target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY})
-+endif()
- 
- install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-diff --git a/tests/lastfm_add_test.cmake b/tests/lastfm_add_test.cmake
-index a4a1686..2f0664d 100644
---- a/tests/lastfm_add_test.cmake
-+++ b/tests/lastfm_add_test.cmake
-@@ -6,13 +6,15 @@ macro(lastfm_add_test test_class)
-     configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h)
-     add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp)
- 
--    qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network)
--
--    target_link_libraries(${LASTFM_TEST_CLASS}Test
--        ${LASTFM_LIB_TARGET_NAME}
--        ${QT_QTTEST_LIBRARY}
--        ${QT_QTCORE_LIBRARY}
--    )
-+    if(Qt5Core_DIR)
-+        target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
-+            ${LASTFM_LIB_TARGET_NAME}
-+        )
-+    else()
-+        target_link_libraries(${LASTFM_TEST_CLASS}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY}
-+            ${LASTFM_LIB_TARGET_NAME}
-+        )
-+    endif()
- 
-     add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test)
- endmacro()
--- 
-2.17.0
-
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch
new file mode 100644
index 000000000000..e36a01c15838
--- /dev/null
+++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch
@@ -0,0 +1,28 @@
+From 9264fbecf8c7e910fa038ab372376ecc9b8c403c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 12 Dec 2020 17:09:58 +0100
+Subject: [PATCH] Add missing -DBUILD_TESTS dependency Qt5Test
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4fd670..bb5a895 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,6 +37,10 @@ if(NOT BUILD_WITH_QT4)
+         find_package(Qt5Sql REQUIRED CONFIG)
+     endif()
+ 
++    if(BUILD_TESTS)
++        find_package(Qt5Test CONFIG REQUIRED)
++    endif()
++
+     set(LASTFM_LIB_VERSION_SUFFIX 5)
+     if(UNIX AND NOT APPLE)
+         find_package(Qt5DBus REQUIRED CONFIG)
+-- 
+2.29.2
+
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
index c539e6a7b1fa..e7a0b783f0a5 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686
+COMMIT=f867df52757c569d97d9755c911ac9dec146f365
 inherit cmake
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0/0"
 IUSE="fingerprint test"
 
+# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
+RESTRICT="test"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -26,17 +30,11 @@ RDEPEND="
 		sci-libs/fftw:3.0
 	)
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
+PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" )
 
 src_configure() {
 	# demos not working
@@ -46,6 +44,5 @@ src_configure() {
 		-DBUILD_FINGERPRINT=$(usex fingerprint)
 		-DBUILD_TESTS=$(usex test)
 	)
-
 	cmake_src_configure
 }
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index c9de0be3bf9c..884f729483c6 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -4,5 +4,5 @@ DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
 EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
 EBUILD libmediainfo-20.08.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
-EBUILD libmediainfo-20.09.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e
+EBUILD libmediainfo-20.09.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-20.09.ebuild b/media-libs/libmediainfo/libmediainfo-20.09.ebuild
index 617f561cf174..5ec625856e57 100644
--- a/media-libs/libmediainfo/libmediainfo-20.09.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-20.09.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 053291a350e7..98433e4b40b6 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,5 +1,5 @@
 AUX libmpeg3-1.8-impldecl.patch 559 BLAKE2B a21953fc4acd57169fbb1e6bd48aaf8d6b3d0e3deaa635cbf6f8fe1dcd73bb394820f2f66b188c7d78ae2cc07d7cbbb0176327455a3a49e44ada8c48b8a072c8 SHA512 43affdcfd54146c0623478f6b2108b28b2be09c956d800705b24dfe9eff6c50e861c83e392371a4deaff19649d61fe27edc7521c7daa703ac369c96b5f698ff9
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 BLAKE2B 8c0e18c690d70d6dc2e87428993eda57c5b67152514221b38860644c21ab4a98d6f4060f9399be5bcfddaa42de0ce6f55019a6d88ae3abfc2793b9d57a0d85e5 SHA512 9ef94c41ee943e321c9fc14a02659a839f08554aac4f5c5abcb9835e9940f0e5dc4c67c26f8124de960cba78493fa43f6c800748c0426e6dc141aa106e2aabc1
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r1.ebuild 1722 BLAKE2B 63ab983634294c090e005c9e99a1c5152f61afe1d3014bcd10c777c6f48d65ee433f57445a9434409450b41823e56f1e4ae4572e37c8e466ea1f968dae649bf5 SHA512 029278937414ef02172fddde3fd674c564ab5c6106efed367123fe6f7133b01a4e7524cabffc2916624ba3127f9c86e9bfa94b3ee029b840b27fedb94dc4b360
+EBUILD libmpeg3-1.8-r1.ebuild 1723 BLAKE2B d0a90786014d4996dda7ee26050a0ce487f91a196163b8b45c70cf41f31d415985558ca7f2253f5329d91ea4a8ce87f7e382d150c19aa65ec1db62d8120634c5 SHA512 f8f8f40676eb6fd89b385d0a0f8b873ecd4ccc59ecebad7bed2813a3c2279a3e5a9a2aadc2987cb965d45dfb43987875f6ac4145a19d19ab1a25d00822652cae
 MISC metadata.xml 309 BLAKE2B 0ff62755ba6e4b13232af28e76b191520e01ff5603517e3e50b06a3cba120b6a3dccc3aabc3c726568b13c8ee46d21d7065afd6eef3547a3a4403cea155b1e20 SHA512 f14445391f7eee4a7f0906b3c483ccb915cd64bcccdbad63780bb1da5e0eb851621abebafc70f8b88cbfabd335fb396aa3dc909f5789cd8c8eb582af923a2d63
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 7598204e2b06..1a177b2bda5b 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index ca61bb9a5a6c..1c7f8b8f5550 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
-EBUILD libmygpo-qt-1.1.0.ebuild 941 BLAKE2B 514c644ff3dc0fd8b3bedbe3a6edd44dc202a313c324fa218289cc9eaf0a239e2164dd21fd6c9f23e784568b7c0c575a3e6d5672d94836220a82e6c8e48ffaff SHA512 6fe8106826d1b409b304e253d68b0efd576244238a22f5fd4609d8a6845723d499febac138da6338de77fc86c7ef4058ae017311b38c9955d53983aa77ca0e71
+EBUILD libmygpo-qt-1.1.0.ebuild 948 BLAKE2B 5261e354486c02be3c1a8d8df3fe8c7234996aaa8eb38271f43f64c7f104d59e56ebde6df7f721229f083e0769c635079b2db5d6fd3f719abb0d72fe589c5d9c SHA512 2258cbb11dfabf600e72ee085ea8145cac244ed106336955177c3cef22854396e009f5368566d5b93da4148d5c0be0701ac0d81677c65c9ac778d4fe4814c735
 EBUILD libmygpo-qt-9999.ebuild 787 BLAKE2B 47d3d8048f378ac0f07856e97896dece83d51aae984f6cacfddc35740b864f646710504c5834bf671fb67e0cd3ba75bd00ef055fa06998970f4403e251a80347 SHA512 ba87fcc11692dfff8978caeeeefd77060635f722a924800d77117502642aa04989dddbf8aacbbc49e6594a7d3a616f8b0f12df73ba29bb2e479f30a77e1ad377
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index a133bbbcecbc..d8ce4b379feb 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index e95d6ae3ab2a..4460982d6c73 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.3+release.autotools.tar.gz 1468568 BLAKE2B 02f29f1d60aa0f318d4b478291d48487c2079001f9173420c0fb5ca8c21ac0f1b3ec02c0d2958a00d7d10e994b626a673de4b5cbe85b1900bf8f0e953616aebd SHA512 003e40a4fa5c44d38931f5008beb71fd82ea57f6989cffdf2f8687e403a244bd29d497c4de9744d594ecfb7d0dd2ba8ff17046a3987123f47bc56cd163f71d7d
-EBUILD libopenmpt-0.5.3.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
+DIST libopenmpt-0.5.4+release.autotools.tar.gz 1470690 BLAKE2B fade97324b350a4c6191b21f6e87cb1f04ac010aaf3c52ce8e66b3382e27e46bfaa99cdd044a7bc8859ea355a5ca82c53844272345439961ef50cf7a5ac1a233 SHA512 2acb5f04bbca84dc01e0aa0e002924e3cd41c0d3516d3f896705c2906d8b2f8646c45d3dca609ffc94972629b887fd63da383e3d0127b2420731de20e4590b5a
+EBUILD libopenmpt-0.5.4.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.3.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.4.ebuild
index cfb89e4fb8bc..cfb89e4fb8bc 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.3.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.4.ebuild
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 67fe3557700f..ac4c301f06e3 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,8 +1,6 @@
 AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
-DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374faf05c0920be0c9dff78c5979c553cd74aafed0591bd62d479825cb0fd7064b47b86747ecddc75cc177b54184eb42b1 SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.0.9.ebuild 1188 BLAKE2B e7b22453ca906f3543feac773220e11f5539ab53255de05d00b2a27ce097f94acabbc8b17c97f51a39e4b358db6133f1c38d3244934a2536989e45cdd0191fa9 SHA512 8d5ed9bb0a9651148b10aecd6f8b34324f10dab81e50edbcfec6435f0e597c7dcede922298de77bf9f41a85dfdce4b991594b2b7c83eeffea3bf753bf17e52cc
 EBUILD libopenraw-0.1.2.ebuild 1122 BLAKE2B 98a11c1dc9fcd2eeef188e206eed3f63447f38d1f0cf7675fdf9600ef1d9eea0862baee8543bec78b7b2859382c3f75370923ab0a488d82865f506fd976b5eca SHA512 b7b7700de3aef054478f3c87cffb47c1185a739f38abde560223072e2a81f70f0117b88ddc13217f0c09e66d9bb5785a8b0f774a97e7cb86b710b306fb622545
 EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
deleted file mode 100644
index ad423950d23e..000000000000
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils ltprune
-
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/jpeg:0
-	dev-libs/libxml2
-	gtk? (
-		>=dev-libs/glib-2
-		>=x11-libs/gdk-pixbuf-2.24.0:2
-		)"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.35
-	virtual/pkgconfig
-	test? ( net-misc/curl )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	has_version '>=media-libs/jpeg-9a:0' && epatch "${FILESDIR}"/${P}-jpeg-9a.patch
-}
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
-		$(use_enable gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 31994cd699c5..3839da752156 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,9 +1,6 @@
-AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3bc3bf4a626f1f9186ae6e5ac65dd0da517dde4461353f594a8b1d54ad4ea8974be289833984c77a49b351e1b9e0a49288ed993f9f175b097e SHA512 6fdfc0e8d4a2325389a530d166c5bb504ab71a5274d037a07b579d2855c425197bf0e88349204aadcbdfc9e8efd246f10ca3d20378055f739e1d4d8fba97d7c2
-DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
 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.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
 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
diff --git a/media-libs/libopenshot-audio/files/libopenshot-audio-0.1.4-fix-under-linking.patch b/media-libs/libopenshot-audio/files/libopenshot-audio-0.1.4-fix-under-linking.patch
deleted file mode 100644
index 18571abfee22..000000000000
--- a/media-libs/libopenshot-audio/files/libopenshot-audio-0.1.4-fix-under-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit f489d3c4ab9dc3ff6fe443a0e8a31b46ed73371d
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Sun Jul 23 22:37:01 2017 +0200
-
-    Fix under-linking (pthread and dl), fixes #3
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6c8f54..e0e2433 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,7 +168,11 @@ set_target_properties(openshot-audio
- 			SOVERSION ${SO_VERSION}
- 			INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
- 
-+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-+find_package(Threads REQUIRED)
- TARGET_LINK_LIBRARIES(openshot-audio
-+	${CMAKE_DL_LIBS}
-+	${CMAKE_THREAD_LIBS_INIT}
- 	${JUCE_PLATFORM_SPECIFIC_LIBRARIES}
- )
- 
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
deleted file mode 100644
index 3f2605c65c7a..000000000000
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Audio library used by OpenShot"
-HOMEPAGE="https://www.openshot.org/ https://launchpad.net/libopenshot"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}"
-
-# https://github.com/OpenShot/libopenshot-audio/pull/7
-PATCHES=( "${FILESDIR}/${P}-fix-under-linking.patch" )
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 3c0054738af4..2f9d470dbecc 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,11 +1,9 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
-DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 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.2.ebuild 2120 BLAKE2B 396b319d1b0e9618b9c22c18565c4466d9bef1b8a8ed0b532e54cb207cb5348d48e05da6f240c854589e19b2e40df11976671eadf513807a6004d2ad6291732a SHA512 bfa64fa1b15e8389fb9369ab1e931c60f18becc812bb42cccbd644d52701cde9f523d5b1739e81842833292d02886a0ebdc3803b4eae5df6ec212e6a2b6614ee
 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 2312 BLAKE2B ae389d16d3a383c7e2784616f3b9cf8f9d0f14d7e70753b9fbb1ed442390dbe48809e754aa808305950911629247ec900217523c351342acef3f9422b11398d4 SHA512 b5bfb0a6d88b1efc54c3d3aa3b515a46d29c161a88bb920345bbc0a6a6ef1b2c8efbc89496337d69d582522fc8958f9a3fa44ec2ab01fac4eabdc592350beba0
+EBUILD libopenshot-0.2.5.ebuild 2314 BLAKE2B 57f5e2664972250a5077a8dfbab5770e38eecfb6f88b57cb27d1029f3a45347d1bff0b50cfb9cbfd31f4358ee18bddd944797a158e8a9a5507117e5c24007a26 SHA512 a4795ea55196d630cc7c871cb2a6d6c752e6444d943b58c2e79811271ec79cc7477abc3d33f3057dbf1204fb38e33aad17d2c0e66eff03a568ea3e88ce963b51
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
deleted file mode 100644
index 36281237c364..000000000000
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+imagemagick +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/cppzmq
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	>=media-libs/libopenshot-audio-0.1.4
-	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-# From Mageia
-# https://github.com/OpenShot/libopenshot/issues/60
-PATCHES=( ${FILESDIR}/${PN}-0.2.2-imagemagick7.patch )
-
-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-utils_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)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make test
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
index 840b5fb4de84..fdfa393fcfc9 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-single-r1 toolchain-funcs
 
@@ -25,10 +25,10 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
 	>=media-libs/libopenshot-audio-0.2.0:0=
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
 	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}"
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index d262e47abfa1..11adbf70bf66 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
 EBUILD libquvi-scripts-0.9.20131130-r1.ebuild 870 BLAKE2B c9ab7b204703afa89e8d6cdd1ecd88cc1bcbd11c6e29ca1f24ba3d82cf0809a8af1d837379f7a47cf8e5ef6637c5b21282e2a02cc3f9a7dffa614ff5a85a8281 SHA512 32cb042c4abba8637d8c901e12726cdcc36a968ab40d4fc54d08d79f5a4142d2d7593a4ad8864dc5437a5d1647db92685f8079775597609d39cc3329ecd2f97c
+EBUILD libquvi-scripts-0.9.20131130-r100.ebuild 822 BLAKE2B 61cefbda384cbad0c092d13194c8d74874e3eaa3342f4d79ad38e5d0fb20fba3125b8d5265365e797219d07461e0c2c55adc23c0d8d82603f50977379811b50f SHA512 d3bcc450e6b5d2a82fe874da11822667571b0c7be1ae937893d627a2f647cefb2e7715eef7f550b06ad4af37b4416c62400c009e3d40b985692932ef55fc18f5
+EBUILD libquvi-scripts-0.9.20131130-r2.ebuild 661 BLAKE2B 5b827f6f4438bac3c6a22158a23f99ef6c1e914ac1de4be92555e73ac01f98b26d96ec317b4c0ebe613586355ac5c1578b432f8963b4de458b11c551c6eedcbb SHA512 4f39a18b321881d4dcefd95719e102a5ae4ff294bc98950f854a0e58ec15c87fc093b0562d062f8621570a7d9f2a5633fba5719e1227e9e6defba9559c727ee8
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
new file mode 100644
index 000000000000..7c2917320828
--- /dev/null
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single
+
+DESCRIPTION="Embedded lua scripts for libquvi"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="offensive"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# tests fetch data from live websites
+RESTRICT="test"
+
+RDEPEND="$(lua_gen_cond_dep '
+	>=dev-lua/LuaBitOp-1.0.1-r1[${LUA_USEDEP}]
+	>=dev-lua/luaexpat-1.3.0-r1[${LUA_USEDEP}]
+	>=dev-lua/luajson-1.1.1[${LUA_USEDEP}]
+	>=dev-lua/luasocket-3.0_rc1-r2[${LUA_USEDEP}]
+')"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf $(use_with offensive nsfw) --with-manual
+}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild
new file mode 100644
index 000000000000..ebc2c74d1a99
--- /dev/null
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Embedded lua scripts for libquvi"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="offensive"
+
+# tests fetch data from live websites
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lua/LuaBitOp-1.0.1-r1
+	>=dev-lua/luaexpat-1.3.0-r1
+	>=dev-lua/luajson-1.1.1
+	>=dev-lua/luasocket-3.0_rc1-r2
+"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf $(use_with offensive nsfw) --with-manual
+}
diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index 553f204dc453..a6be25848d4f 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,4 +1,6 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
 EBUILD libquvi-0.9.4-r1.ebuild 1269 BLAKE2B ab5329209eca8f6187a90c171e8893b7404ce6fbbd587edf3f0219ad27a08b1f60814442caf46693a8ba2ab17e08e09991072a129d2a8f36d713dcb313666665 SHA512 7cc272ff5726874c8754354e9257e9904c290eab7a29fc6be5820511c367628d4b321dec3e865a180c6be45922eeb2a53007166c4175f7007f0ca8591fcf338f
+EBUILD libquvi-0.9.4-r100.ebuild 1231 BLAKE2B 010b179f6ac462f3fd0e935313418f2a7398fc1968f6e7c58e926b67dd596f0df183166a7160ffcc9fae1863e771deda8710d7214526eef148da72a27ce1f268 SHA512 f731ab1f56c2c4c921713566dc5a0f80cefc174e6f5a7393739cd7548ee92713f3eae5d709a664186660894b1b456c974fcd6482b64b0a4583310b35c17a3df7
+EBUILD libquvi-0.9.4-r2.ebuild 1140 BLAKE2B b04ee1c72dfd7d839b2c2b3bd7ac8ba8a211b52642de8cf2f51e9fe5bde924df1d5b6097cfaffe826005142404df06dc606cdd693f33a7b09feefb7a4d675895 SHA512 39c33b798178220753872a8ad263c825be6191c13ea9955871141f03be9f4e3bba487a92d7c768916e8c02354495321a31963dd7506fd0b4aa12bd2a63e18b61
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
new file mode 100644
index 000000000000..6ef8499f4dca
--- /dev/null
+++ b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools lua-single
+
+DESCRIPTION="Library for parsing video download links"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/8" # subslot = libquvi soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples nls static-libs"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.34.3:2
+	>=dev-libs/libgcrypt-1.5.3:0=
+	>=media-libs/libquvi-scripts-0.9.20130903[${LUA_SINGLE_USEDEP}]
+	!<media-libs/quvi-0.4.0
+	>=net-libs/libproxy-0.4.11-r1
+	>=net-misc/curl-7.36.0
+	nls? ( >=virtual/libintl-0-r1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--with-manual
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+	use examples && dodoc -r examples
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
new file mode 100644
index 000000000000..d25e8694a5e0
--- /dev/null
+++ b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Library for parsing video download links"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/8" # subslot = libquvi soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples nls static-libs"
+
+RDEPEND="
+	>=dev-lang/lua-5.1.5-r3:0=[deprecated]
+	>=dev-libs/glib-2.34.3:2
+	>=dev-libs/libgcrypt-1.5.3:0=
+	>=media-libs/libquvi-scripts-0.9.20130903
+	!<media-libs/quvi-0.4.0
+	>=net-libs/libproxy-0.4.11-r1
+	>=net-misc/curl-7.36.0
+	nls? ( >=virtual/libintl-0-r1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--with-manual
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+	use examples && dodoc -r examples
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 1eb74bb90d46..7149415ac377 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,3 +1,3 @@
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.5.1.ebuild 1534 BLAKE2B a35a5fd9eb69d6bac2baa89ddb58f9237e811ae69e678ed3910ab6eb76ebf081cddde91eb7eed4e067cf593182718cc90686e492125a9c1740f627e7126e9433 SHA512 97f76cc163b0a7e43bbcbf1ca5f04e51b11c791b44af81ac97f374cda211600591ca4ba8efaf917832a5eb171167a48b93e72e1f7f5253b8d52eb39439ab056f
+EBUILD libsfml-2.5.1.ebuild 1541 BLAKE2B 5d59a9fc6342d4ba6fbeae645a37cb514a29d38034f7a808939d6c8c0ab591f472cfd60ee6c2f0c53ebc2cd489196d2e417540e612128d20f66724386c0b0923 SHA512 0e75cf34912d7a520cf081ad2fccec0db53053b1db7150a45882fec2a08487cebb7a3192c04e8839033f52c988ffedd6e3566b08fa1922f11312d632464db4cc
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index 715c1d5a2246..159102d00492 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index 9dd1373c2ef4..a56acb8799c9 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,3 +1,3 @@
 DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2
-EBUILD libuninameslist-20091231-r1.ebuild 576 BLAKE2B 45f44b9b7525657bd04a785e7f88aca22455a2ed9a6f4763e85409985320e9f1ae499af60da79b15506b96b639368892fe63f8b4a313c17a0080d06516120f90 SHA512 5d5e4a3eaac0f8dc833cacdb5c475f5cbc560ef10b74eedb969b7b52d7ca1d3c6cd725aaa59c895a83e34589f5c1288462ce90c6188404adc30f6a187b342b6e
+EBUILD libuninameslist-20091231-r1.ebuild 583 BLAKE2B e01c3a4c9be1a34ec5d75228cf4499531522f3164f0dde3ad67a0807714a730421ad24f5265e643334087b2356992ba179da27c675ec94587b35cb823919db60 SHA512 aeefc14f95dce14d40709046f7f70f7810b186e94fd3da99b8353827a054a1f16384b093c0dd6c357ade402f21af4f10f9916dbdbf2912d5a7d4ee151f575ef3
 MISC metadata.xml 418 BLAKE2B af32b153bb118f182f452c92fbe3847c3e2402647daff56972e66aabe631bfd82da9427c8a46e9ff415aa99f9df1dcefaad21f79e8119da26d95d3e798c1f631 SHA512 35b1f463cb8d9c67f640b4adf5081d16100ad1277bac95222c499b8837b8eafe6619fa0d5ef7d0089eeb43515205feaed55157e8c5412bc7a065ffe774b41e71
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index a9685bd02a88..4b87f6978b1d 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 88389569fe24..91595932b8b2 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,3 @@
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
-EBUILD libuvc-0.0.6-r1.ebuild 782 BLAKE2B 70e17b7095036c1beeea530888486fa9aea46ece43b84c93479b2c6f7242c0fb365b85a8b4a3f5d08da904e20c2b7d7ddd93d107db22bd6967ebabed5a61631e SHA512 3df82eab14ab458ec028bd11e9024ca4bb19f2d8f698d5fbee3b663387c6fbdb7724cc8d2b3679f600df437b5a26412aa7c50a62dc43153907204303f4923625
+EBUILD libuvc-0.0.6-r1.ebuild 789 BLAKE2B 7b54213b0e68a9c660ee0159c012ad7f24eb0025ae91770bd5c8395c842c1dccddf825b47fc35366631cf269b0575f79e9fa1aec46906d472af638314f37b2ee SHA512 476cce36b9c961e877329baec2b56750d631e4d5836cbd8e4d16fbdcc5de57e88a7909aea5a51520a8d0e4e1986c2b029b0b6ccc3093493517118a18d3d3a6d4
 MISC metadata.xml 446 BLAKE2B 1c36e6c623d067d28deaec19f5d5b07e7c6509fe7ec3c3a1955c5edc863c38ec6974b2c5c80487b929e64f8e3c03275e708c9a0151151b3f06f1a988af5d9714 SHA512 19c938d7b3f171395552c4758f86cd6d80941e428967c14490d8ef09f0d48b215b8458d1695f390c257e81cc376f7c401e8405f8103c6c68c2b744cafbdb4eb3
diff --git a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
index 31fa1cec60f5..881b8fc7a2fa 100644
--- a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
+++ b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
 HOMEPAGE="https://int80k.com/libuvc/"
 SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index fe28c88c6c66..413ad2026ec9 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -3,5 +3,5 @@ DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e1
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 EBUILD libwebp-1.0.2.ebuild 1844 BLAKE2B bdbf6a9a11c75afa156fd79dde7432995d12a208f473dd62cced1aad47094aaec724daff8b470acb7f2a0cc6c203bddedd21e842939d9eba40fc640b4c4d8423 SHA512 52eb96dd6d80ab6b5b02078d78ee90cc413c54b5016fc5a25db274e46d0180c7b245c4a19df456dea967bd8b33dc7056a044441324f0dec6e3266b23dc097502
 EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
-EBUILD libwebp-1.1.0.ebuild 1852 BLAKE2B a79fb48b5a141d098e38652d4da6f6b195e167faeecc78b7c14b1ff7b448fd8891de4fc10381d8a6ed3f39a6821a9aae35c77b92fa33a67b43a20d8c6f9d980d SHA512 2fbccf21e2ca844f1399a5fd0ef51f726291113708612a9639d4dcfd1f078c70cac5885f0f0c2f01cfbfd592fdfe0ef331272595fd34f4fc499841330d6477b5
+EBUILD libwebp-1.1.0.ebuild 1859 BLAKE2B afb151a7334571eaac5518eeabdac785580412bb2a579c91aee4da133865a24ffe5952ac484b32c7e136046d86ea31b5fe9290b1f2678ea33395ac26f2b59b1f SHA512 e45eecc5a7970364e3b4ac6f14550d2d979f0d77a5cf03504eb54615be510bd102126427031b7ee4bf77c4b50ff02a3de3f02a6e32ff7890c765f46bb69df9c2
 MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index 0758ca314ff4..3b81cd494ec0 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/mesa/Manifest b/media-libs/mesa/Manifest
index 2de53c2f36aa..592f492ad419 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a
 DIST mesa-20.2.3.tar.xz 13844212 BLAKE2B 53eff6d43d2e05dad051c30de624bd8d872e87d6f1d2f32b631b1c4fea657b8dd9b2d5b9702bdd9138b0d9d6c78b74d737162d3f1c76ca969ce6d9ae4f561eda SHA512 e55b57523f6fdb1199586538c119c3e7c81d1a7af86be14c90d140c514f65e54ac0c56bd341686d04b770b80d3ddd92188ee17b3bc23f243aed10c25de7e19a6
-DIST mesa-20.3.0-rc2.tar.xz 14085024 BLAKE2B c87e3e48ed1dfec2da4fa6bbb549fc925d806f8681e8dc1b3fc3b54eec4864402bb34009a95998c1fc818ddb7d1df2d51347df3d20ec9e4364245ae4f750f16d SHA512 1d94100550b60a0dc6e984d898114b11b8656e2954e946478a2732cec678d1e6a0f07bb5bcdc856facf7e274aea52cfc2b4228c064eadc7bbc00147c6b17cc0e
+DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799
+DIST mesa-20.3.0.tar.xz 14158932 BLAKE2B 13aa0829691b8cb37eafb913a9fd396637022aafe93c6c40af0c0cd3a179d75fb33c2379420bc94940d82885fb1ea3f26a832ed97b3ae842a334aa8ed1407d31 SHA512 69ee0bc1e7a69a519597dd55f4d601f35fe51ed6687d6f6beff6aef3da8d82de932220305fc187e06a52aaf0073d434a6e3458619c767b9b7932464a2cbb2cf2
 EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
 EBUILD mesa-20.2.3.ebuild 14709 BLAKE2B f32b8f3f99197ad5e7a16393929ddccb1b6fb650dcf413587a74a497531b94ea7c3ba2f0490a32b37729e33271d100e52fa480c8b6422742a16e9ddb9d756911 SHA512 5223621eaf05a7f2b7500b8f31c1b0cf0a68b729c00a57527e741eb353aa57c65e1abffeb552bedf70012338beb7d49efdadd4847626cfbabbc89f59938dc5f2
-EBUILD mesa-20.3.0_rc2.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
-EBUILD mesa-9999.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
+EBUILD mesa-20.2.4.ebuild 14790 BLAKE2B 9ca2d00b39d3bb307ac2cc68ac3b531c2413e44dd902a6510c2b8dacbf8da09765129519e2d36e8e5972315b4b2c740402a5558775d8d22b7af63710fc54b0ac SHA512 f0852f53d8810d89ad2f84d4f6d49a749305a8ae120c9d06fa4cf7258dbf0630d74fd60074f53ec871bb658ba5d78ebcd90006c72be5706a7c156a2a1a13555b
+EBUILD mesa-20.3.0.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
+EBUILD mesa-9999.ebuild 14818 BLAKE2B d196d517ea52bc878e43e96efb814f8a03a3b69746b4a6b134933c0efb5dc047909975f7bfc90882ba3b0148d09526e0992d56b8fde1dfbbab551c883dda730a SHA512 6008aac202f6b54914b637be9f6c4d25203579beb5f947b63fbd96c5b216eec58d9bd69343f913368dbe19193f2a7d0a99a4fd7d68e511f1cf096f89eeb08396
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
new file mode 100644
index 000000000000..9c506a4c2497
--- /dev/null
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="11"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-20.3.0_rc2.ebuild b/media-libs/mesa/mesa-20.3.0.ebuild
index 1da56517de7e..4a9d566b07cd 100644
--- a/media-libs/mesa/mesa-20.3.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-20.3.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -372,6 +372,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -492,8 +498,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
+		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1da56517de7e..5c410fcd9811 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -43,6 +43,7 @@ REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
 	gles1?  ( egl )
 	gles2?  ( egl )
+	osmesa? ( gallium )
 	vulkan? ( dri3
 			  video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
@@ -116,7 +117,6 @@ RDEPEND="
 	X? (
 		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
@@ -317,6 +317,10 @@ pkg_pretend() {
 	if ! use llvm; then
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
 	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
 }
 
 python_check_deps() {
@@ -347,6 +351,8 @@ multilib_src_configure() {
 	local emesonargs=()
 
 	if use classic; then
+		dri_driver_enable !gallium swrast
+
 		# Intel code
 		dri_driver_enable video_cards_i915 i915
 		dri_driver_enable video_cards_i965 i965
@@ -372,6 +378,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -432,6 +444,7 @@ multilib_src_configure() {
 			gallium_enable -- kmsro
 		fi
 
+		gallium_enable -- swrast
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
 		gallium_enable video_cards_v3d v3d
@@ -476,14 +489,6 @@ multilib_src_configure() {
 		vulkan_enable video_cards_v3d broadcom
 	fi
 
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
 	driver_list() {
 		local drivers="$(sort -u <<< "${1// /$'\n'}")"
 		echo "${drivers//$'\n'/,}"
@@ -492,13 +497,13 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
+		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
 		$(meson_feature gles1)
 		$(meson_feature gles2)
+		$(meson_use osmesa)
 		$(meson_use selinux)
 		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 8dff87bdb27b..377076b49051 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,7 +1,7 @@
 DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f
 DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
-EBUILD mutagen-1.43.0-r1.ebuild 1115 BLAKE2B d7ca29d571488db37782846860a2eca28baddf97fc40c00c17171a06d6836cff74e1b23756b0d34f6bafe6aae3d90b36ce85002aa092288368e1588fa51c8c33 SHA512 2490d6f772e52dabb34e1f317ef04cfcb1a346f58ecab47e7bd54b2efd5160359d011c2d488359043c61bedf694736ddef177094870ba5da51a5649add39c612
-EBUILD mutagen-1.44.0.ebuild 1103 BLAKE2B c9ad68730308e3a190bb5fb4e7edbd705fee179905c079ff807f3539cf9035343c50acb481e7fb922bde7c34cb09f6ecc241b9da120190857103170fed0affec SHA512 268c7cf83d7871f743c3860190595b6b54391282f0a3ee393bb0eafe4fd2bd8c6a9336a1d37549b88571e5d08e73cb9adb008942b863d6d68c0672a4740d606f
-EBUILD mutagen-1.45.1.ebuild 1139 BLAKE2B 0616c08a3b3e4e4ce380eb18ddf8b93e469ab62385dcc6f75b80b09cbab81333fe33d3598a0a7b8ba6949a6d8473ac0a7fecb7e4d57f9e26d93ffbde7c29d985 SHA512 0e017ceee75577baef06ac481fb3d84610d8cbf9a857ffe2b6b3e0b47103fcc1506da2e11950e70d6138c5ecfed0c2383007980d9401381ade4d878696160e30
+EBUILD mutagen-1.43.0-r1.ebuild 1108 BLAKE2B 57ec9398443730e0a05709495e5ded6a45a233f9affab6f49b55a63fe83a974b384e52633be49a51848f69a6d2064ef1a4bc84de246725837630aedf79932166 SHA512 c1cab0c5cf6847c8805dbc0135cf2df99d68cd110f325ab51ac4523c9874e72a59ece6647971c730375511fc8a2e72cda0b10bbff9ca3b5f26d81e3a1e24a22a
+EBUILD mutagen-1.44.0.ebuild 1096 BLAKE2B d96516ecfd8ea138290bc98ad66e957b846319b4714684fed1f1dd95e22debabcb2faead58b044fc5ec2bfeaeced58c24936eeb56a639f9b0f9873951f68c014 SHA512 baf6b117a14474225b40a8081a23a8092a6db34b3ef62d6eb315054e0fabc021a1122692806731926d7dc21f4c37297bf9f99801c83b7f75c4122ff97379d795
+EBUILD mutagen-1.45.1.ebuild 1132 BLAKE2B 3e779f9b289a20df4f75df290190d7e3ff291c6245fc81b1cfb6efd055f4a22b7d6653b554771cde1e3c37cac1791ca865a5b79ffc95bdaf03a7b4dc3e189aa6 SHA512 2a0b01963446fd8e175129160b7d1c121ef2d492c94e7b578288e0892f69c315cac5c4cc01a6072d38800821d3025718efc21358a6256deff6e07e829a8e84e0
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
index 7a24a1f153d0..cd4960aed424 100644
--- a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
+++ b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/mutagen/mutagen-1.44.0.ebuild b/media-libs/mutagen/mutagen-1.44.0.ebuild
index 2f2e567b1c03..f7b63e447466 100644
--- a/media-libs/mutagen/mutagen-1.44.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.44.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index eef29499eb0b..6ed3bcbd025f 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 2dd713c957ca..4be71e5752eb 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,5 +9,5 @@ AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e10
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
-EBUILD netpbm-10.76.00.ebuild 5231 BLAKE2B a3105e726071fab669d9f59a07df34c7adf8081d034ce778869daf1f97ab51eeb5750fb0ab7d777cb9b5c91a489f59f37565998b687a6665955e3fc4c3d62dd7 SHA512 3df139907d414150a8d3815f1b58e2d23b9faeaf5dd997a737a7af9d9629db986afb481c1edd8cd9e3865c29875047f1fe29a002eccc812c2dfdafe3a3f3b4fb
+EBUILD netpbm-10.76.00.ebuild 5238 BLAKE2B d2dc02fdf01e48e7967c3a79bf3626c94a2f730a16340b87379b5900ca6596bbddd1dad68c1bb105bfada1f33ee68880544995ba2e116d4a9031b94960dfc7f9 SHA512 af6bcc41dc8ea868ddaad86e513ab70b797c6a75b43d97a686447bb2ddff4c60e80669345359fe844c2cb38bf20f927f5ff274041588a8450ed527fcf0eae321
 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 32f9f2ae5d2b..a1fcc051cc55 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 BDEPEND="app-arch/xz-utils
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 01e7fec6a45e..b0bb23b95b57 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -2,4 +2,4 @@ AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389cc
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
 EBUILD openh264-2.1.1.ebuild 3306 BLAKE2B 430b9c0c23ac5e918a5b4c8701c7dc761fefd36c1d39f92c777decd56cae32a10141abed6e98b65f6bef21d0873e43cb7c5396c6be28bc6b805b4654a74956d7 SHA512 427ff6516341fd9d73e7c9089a15e76f223eb99fb3a9e427a5ed9148cc7b1392df140ad6deac87d1a28f8f38b5aeb2c110c39caf533d1810ee5522cb4052f8bb
-MISC metadata.xml 723 BLAKE2B cbfe3ee6a6d784293770d948a306c9dbefe11d78f1cad1fcf58a35a0c968c6c48f35e2e6f607bee6434629ac4bc4428f5cf4e195ebf800c77af414e6823170c0 SHA512 82762247dea80f68510db32609263501b20320abca844776176dc6f6439498d61b05f93a573829ebf7ca88e932cda812c296ceb351e071c401e2ea6647d55e88
+MISC metadata.xml 616 BLAKE2B 9ff00497f1c3137220f0afccedd0c2280c9772cc0ece5e47dc648794f42ce18dd25679bfbb3f10e413864dc603db9539bb02eee1839a80b69fbfde59d2272b56 SHA512 f15d0f4e48331f2c0c4b28890cc77d1402431cd120c430d6428c87dfb1c6271fe3b892507cacf45b1d0cdf14cb5ae742f0e6e3badc42b0bbd80f6f1fda7dabce
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index b3191d7ceff5..bfd902a8b2f5 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-		<name>Ian Stakenvicius</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 8dedb352c584..2d492880078e 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,7 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
-EBUILD openimageio-2.2.8.0.ebuild 3333 BLAKE2B 89179cf97ee4ecea05dcd854485c4eebd47c1b4efe42f8296d5d7afc9960ce6acc720affffb80a498df8ba20a63ba76b3963e89a34cff151191c72dd3214f6d3 SHA512 eed484e60fa85a4ecf7f4553f25459f24909e46f60fd97e21bbbedfbeec50bcd3787716ed05e05f5de9663b22b13376a2d08bf11b0c5bf57db35c7db49efb332
+DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
+EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
+EBUILD openimageio-2.2.9.0-r1.ebuild 3681 BLAKE2B fb434110b41fb72cef3ca045de9f2ca901f22c5360443de23096e2bdb6bbebf4a5ab992ebaa94f880405927a5cec73077c88f46c3bcdbea08e7a25fab6350c96 SHA512 d640bc9d6480a417c4c0192d2ffa745b306d3099488bc74522485ad09acc4fa2a5aabbc7d22a0feac3c8717ccafbb39cc60625a8d5f9f38153a3bd41c4653760
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.8.0.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
index 934cf38bd1c8..78fe460252e6 100644
--- a/media-libs/openimageio/openimageio-2.2.8.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake python-single-r1
+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"
@@ -112,6 +113,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DVERBOSE=ON
 		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
 		-DSTOP_ON_WARNING=OFF
@@ -136,3 +138,18 @@ src_configure() {
 
 	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/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
new file mode 100644
index 000000000000..cdd096fdaca6
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 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 ~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 e03166cd5998..1dbe3c4aff19 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -6,5 +6,5 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572b
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1924 BLAKE2B 9e1db8cd8f7a2e395b30c2b095e44e6fd18403b5c51cde0624db1c85e91848fecfb584e93bd815c5b9b1095e8769be8ab77545eca0f2d2ebb2b0291b310332a8 SHA512 18768a2552149908e927342dd9f5a80b423f6d5b9303c299e99bb6a4f5d50e892f7698f7b0d0c4a357d9ee89daf79d4d40a265b01fba3bf23b4f139a78e6875a
-EBUILD openjpeg-2.3.1-r1.ebuild 4307 BLAKE2B 52b1776e6dbc6d8053144e56a6ecfb3a22213eb1facf58c6ca5437eba4f814dcd8c7dfd774630442dc52cca62b303bb86f92618aa9615a9f801a2b7681af5ecf SHA512 82499a78d1c79443d0edef4c34cbb39bd095ddb2554afa3d173a07a791c7eaaa633157a8338885864b326c24c6a89a6c34da0fc0d1216e1370a4fbd5a9a1da9c
+EBUILD openjpeg-2.3.1-r1.ebuild 4314 BLAKE2B 4ed602ade7f73728ca83288e21687b4881d9a107fc96ba1470bbdd78e52ab2c7133ee304407875db6744124ab5b940536a701baa4e41293d6c2d4eddfba391bf SHA512 12e492a9d9dccaba6db177e65fff733862cf5e2498c5f66197300f13312764bb5bd5d9a0d83688d4f0a867a693b83de59898a245ab514ad46e88f55f33f7f6fe
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index fb58d28a6ca0..5d48325ab009 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -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 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index e0b8d68584f9..db4e610a1496 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,6 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
-DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
-EBUILD osl-1.10.10.ebuild 1903 BLAKE2B 80e44eeb35021b93feba3c9630e94da9167290691bccac7cef89f4df465cc6dc9e5d8e8a916fdd3fab623d60c5419a953f573458885022ee551019ad006549a3 SHA512 4ae380db765b81451e4f41c70a09aa5cbf9fb1017d98fcdd12010c25e8ef882b57ceda02edf0e4eb2ff8a8b7d1234ea8ca8a8c6dcdfaf4c5909c1a157d2e6fac
+DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
+DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
+EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
+EBUILD osl-1.11.9.0.ebuild 2132 BLAKE2B a504079bb9e6f9541154a951e102cb4007425b65b54af4e4ac96e098f6f456c8f5a8aa4c26b77d715d90071bb4e12daee7372ed2cda14307217bc60bf6ab923d SHA512 cafdaef138efa8f53ffb84096055b61ab75ddb8c800319c51305cb158afd434cf43f8dbcc71faf3781107dbafe4c833d1ba746cf3140770224c1d7ecb04299ab
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.13.ebuild
index 1b2d7c3168e0..fdab29afa48e 100644
--- a/media-libs/osl/osl-1.10.10.ebuild
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit cmake llvm toolchain-funcs
 
 # check this on updates
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
 SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/10"
 KEYWORDS="amd64 ~x86"
 
 X86_CPU_FEATURES=(
@@ -28,8 +28,8 @@ RDEPEND="
 	dev-libs/pugixml
 	media-libs/openexr:=
 	media-libs/openimageio:=
-	<sys-devel/clang-10:=
-	sys-libs/zlib:=
+	<sys-devel/clang-11:=
+	sys-libs/zlib
 	partio? ( media-libs/partio )
 	qt5? (
 		dev-qt/qtcore:5
@@ -71,10 +71,11 @@ src_configure() {
 	local gcc=$(tc-getCC)
 	# LLVM needs CPP11. Do not disable.
 	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DENABLERTTI=OFF
 		-DINSTALL_DOCS=$(usex doc)
-		-DLLVM_STATIC=ON
+		-DLLVM_STATIC=OFF
 		-DOSL_BUILD_TESTS=$(usex test)
 		-DSTOP_ON_WARNING=OFF
 		-DUSE_PARTIO=$(usex partio)
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
new file mode 100644
index 000000000000..9ab4388c8dfd
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	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="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-11:=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/pybind11
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=()
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+	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 gcc=$(tc-getCC)
+	# LLVM10+ needs CPP14+
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DLLVM_STATIC=OFF
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index ec301324ab8d..fd98ff1863c1 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -3,6 +3,5 @@ AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r1.ebuild 782 BLAKE2B 2418061653e841c61a6cb5874849636e60dd3f6ecc11f4c4fc3dafbd1a9490c4804b75e0bb54a2d54125e1ea6a62a47e77cfdc697f6c80835452f71f95c005a3 SHA512 ed05e1ed616fd53c057da8c8376006a4f10852b46eb589e30545ef2e14f88e468d5226b9366e923d8e79e521d1e22df50d66af83510a0f391ac5bff54aa2ee7e
 EBUILD plib-1.8.5-r2.ebuild 828 BLAKE2B b27bddb3996feb71f6f7f6021e8507e974e41d1874139e3f13fdf9c1ca43b628debbdf999857123c3ca9151ba75262d4cd8145dd564c6200d0496df85e7fa7b9 SHA512 ae4958b5ff7ee436565b4ed13e82804a26800ea2fc789f9ebfa1269c6b79bb589ce77cae206c594549893076b6a544a4233e8a6f3d3d1c19c525f042a615f24a
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/plib-1.8.5-r1.ebuild b/media-libs/plib/plib-1.8.5-r1.ebuild
deleted file mode 100644
index 7e32e0e06693..000000000000
--- a/media-libs/plib/plib-1.8.5-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=5
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="multimedia library used by many games"
-HOMEPAGE="http://plib.sourceforge.net/"
-SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
-
-DEPEND="virtual/opengl"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-X11.patch \
-		"${FILESDIR}"/${P}-CVE-2011-4620.patch \
-		"${FILESDIR}"/${P}-CVE-2012-4552.patch
-
-	eautoreconf
-	# Since plib only provides static libraries, force
-	# building as PIC or plib is useless to amd64/etc...
-	append-flags -fPIC
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO*
-}
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index ae139ee9fdd5..0660d116951a 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -5,5 +5,5 @@ AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a52
 AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813eca19d342ba720521da8cc2c32eaabeb8a93bd56a25e456ef8fa9523bbbc4c832dbf22fd3831324bc96523a084e SHA512 156d6feb8bf0d9a3660f0341ceb3d2728d7b044ef4e3a9c7f81adbc262e3d30c4e8769a6059ef90601006d17f50f2259dcc533f223d0bcdc7467376b11f10899
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r2.ebuild 1602 BLAKE2B f852aea6ee28d9d86d3c76606a86422526d2643c1110c19412c3416389522f518924601f9f4772d9622f00dfe35059dea6d620dd97762353f26abd9f6ee37796 SHA512 d7dc9582dd2bcca5af83a1cc722c96181afbdab1c0ba14d5441ba3e051849088fcbe64495c95ee53faf6023e04f260b78f3feaae7c54a0a23e94d56dc7958d33
+EBUILD qtav-1.12.0-r3.ebuild 1553 BLAKE2B b2ffa156e4387ca3c57a4442ff91a769d04a246f51176a5cf89af7cb199ae3030f8a598597ab02abd7203567de04a8572b4c1ea4f85e9cef3329e5dedaa92e3a SHA512 18167e0168e9a09aac1ed17deddd396ed5b084cce3a055f32b6e6432102b29f3ad52db3753e97035080b1189c5eb2036de9306bea249d9227cf789f9112de43b
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild
index e9b3bbd54aeb..2635466a5bf3 100644
--- a/media-libs/qtav/qtav-1.12.0-r2.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r3.ebuild
@@ -15,17 +15,16 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="amd64"
-IUSE="gui opengl portaudio pulseaudio vaapi"
-REQUIRED_USE="gui? ( opengl )"
+IUSE="gui portaudio pulseaudio vaapi"
 
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	gui? ( dev-qt/qtsql:5 )
 	media-video/ffmpeg:=
-	opengl? ( dev-qt/qtopengl:5 )
+	gui? ( dev-qt/qtsql:5 )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 "
@@ -50,8 +49,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=OFF
 		-DBUILD_EXAMPLES=OFF
+		-DBUILD_QT5OPENGL=ON # bug 740172
 		-DBUILD_PLAYERS=$(usex gui)
-		-DBUILD_QT5OPENGL=$(usex opengl)
 		-DHAVE_PORTAUDIO=$(usex portaudio)
 		-DHAVE_PULSE=$(usex pulseaudio)
 		-DHAVE_VAAPI=$(usex vaapi)
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 24650049a400..e62a4b34f9fe 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -2,5 +2,5 @@ AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d4
 DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
 EBUILD raspberrypi-userland-bin-1.20190709.ebuild 879 BLAKE2B 312786fded4a752e8d2a7252f9fa487e52a1bd8954a213c5e864ed4e7ba6cd76e06e1c2439afaa30bca89c084565fbffc2241ed067f9b69ddc2eeb64eff8ea4f SHA512 f453b77801bc519f69b2a332f0a029a3b9345878c63ac13b5ebe818bf90b16738cc001b4a5a01fa02f423e868d4603f30e8b298081d00877d2db19a4b5ba6842
-EBUILD raspberrypi-userland-bin-1.20201022.ebuild 871 BLAKE2B c1259a9bd3b8271cb14c77ce1b32bae3f7d977b0552212699029397f64af0d500226cd9385d475d72b327f4fd07515c940d3fa9a12b8cb0c5c1f08411f11a249 SHA512 4fa85e5de5f00b0bfadf7abe72e7677e31fefd935f4344e43cf16bcb7742cd70027ae1cbacf1eae810ce387ee82fc704727611f065416f0dcd676009d7dd1145
+EBUILD raspberrypi-userland-bin-1.20201022.ebuild 863 BLAKE2B 93a8fb6979dc8916f73a103f2591382f541fef829f8cff70e11f3d0dc99ade47a2a2aa67dbc6a87dcfb16633ff0f8e7d7468d5c08ee10e9f2ac69b80841c8d12 SHA512 2731ce73606bd16a94903d4a44adc5f1f13f231c70e7616195e19403bd3eb8c6b8177a933772095bfa507d190f2f131b850062c10a91f90fe68a95fadbd67f67
 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
index dedbb39c6c92..840a9172aa63 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/firmware-${PV}"
 
 LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS="-* ~arm ~arm64"
+KEYWORDS="-* arm"
 IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 086316bf661e..5d0a1c1e130d 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -8,9 +8,7 @@ AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112
 AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f
 AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8
 AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae584ca5b8230176f290202124cf61677b9d13deb627637f5eef230db4e4628524c2056096139a1a9311b9530d7cceaa246111f70780 SHA512 fa259fe0ea348dfe4b5718dfc27b4b18289abd10d7b160a29fd01c62b4ed95e518259adaeadb1b300e7957d2a824ce1748b9216cc7679be2aed105d6883ad042
-DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
-EBUILD raspberrypi-userland-0_pre20160424.ebuild 3280 BLAKE2B 74a7ac7e2fdaa85c45c7a6352f8d30024e33d0b6c10740082447d874bab8e59d7a04d31351b7fe8a69d89cece234709e8444207c4d9960ab20ff08f12b2c1cc2 SHA512 f1fca6c1cf73336d482c4cd400667e22d6493402fa23389e62e40af86dc605af98dddee39b5f553fc33cc03c766f40b8009f41c8af004d540e28b01a8bb24ac1
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 2163 BLAKE2B d0062c18d97543b8598cc7defc4d5d3a13237a62278e6d23a3bff8452ef472e12736fe6a4f6e5e4b2594b72c8c2c99577b13d1f5111ac8006cc09822259fc222 SHA512 2d6fc20602126da4d75acc44e80b7bfef20bb9b9cb4c099f68df9d3be094c70f07d0779569ddeb62351077598bca9347979860cbd606464dc04e95c8ab5f267c
 EBUILD raspberrypi-userland-9999.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
 MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
deleted file mode 100644
index ddbbd294d3a3..000000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Raspberry Pi userspace tools and libraries"
-HOMEPAGE="https://github.com/raspberrypi/userland"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	SRC_URI=""
-else
-	GIT_COMMIT="dff5760"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="
-	!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-
-DEPEND="
-	${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-LICENSE="BSD"
-SLOT="0"
-
-# TODO:
-# * port vcfiled init script
-# * stuff is still installed to hardcoded /opt/vc location, investigate whether
-#   anything else depends on it being there
-# * live ebuild
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	# init script for Debian, not useful on Gentoo
-	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
-
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
-
-	# enable dynamic switching of the GL implementation
-	dodir /usr/lib/opengl
-	dosym ../../../opt/vc /usr/lib/opengl/${PN}
-
-	# tell eselect opengl that we do not have libGL
-	touch "${ED}"/opt/vc/.gles-only || die
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die
-	done
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-	fi
-
-	rm -rfv "${D}"/opt/vc/src || die
-}
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 7fa3e5909284..7f27f6655647 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -17,7 +17,7 @@ else
 	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~arm ~arm64"
+	KEYWORDS="arm arm64"
 	S="${WORKDIR}/userland-${GIT_COMMIT}"
 fi
 
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index d3850680cf8a..4f81d7752846 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,3 +1,5 @@
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
+DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
 EBUILD sbc-1.4.ebuild 874 BLAKE2B e0fcc96f4f35ab375b19f3b325ce27010186792d6c9081aa7f914eb5d9d66e94e81b8bdfc7b9182f06d2fa8532dd4866469385bcc5bd829cfb4829e292550d61 SHA512 69c2f278d7ed25947b65f5a5acbf783336898d51a0df83c576b7a346ecb2230cc90157569f303b9e82a3259ce1cd651b21d896e37b99dec2f7a46acbc4599f16
+EBUILD sbc-1.5.ebuild 844 BLAKE2B 973696eaeecb53c6c062dbf5c5bde603ea16902d0b7c086fd23cfcb4cd41c0df1587b1fe09e022da75db46b1d180ff60dfe30f0cd0a420357591730c76839a7f SHA512 148764f8f823517a6014520b43a9d2732c67d1f9d939a0f873d457bc91b3c466e82985dfa2914ca6bf267fbc9f95a819e19afd5e563859c0c4d7d73cb9db475c
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
new file mode 100644
index 000000000000..65d68e49819c
--- /dev/null
+++ b/media-libs/sbc/sbc-1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
+HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+# --enable-tester is building src/sbctester but the tarball is missing required
+# .wav file to execute it
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-tester
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index d3d921b573e2..83af1d76eef5 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,6 +1,4 @@
-DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.25.ebuild 1093 BLAKE2B da17fb59a9352bd2f274228aef2f782b86fff1b957df3e8c8e949e586c633759b97c7101e2b04f442b14388004120890457a708222b17d18cdc734431a842dbd SHA512 606aa7a5da5b4c8ff97030e289e7bc7f3c39ad08676a15dc1c7b9a3e5e9856a9226ff2b54ee4e38e83780fb3811033e6a6cf1f684ee32ee217892bab72d0cc76
 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
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
deleted file mode 100644
index 3baf22df87e0..000000000000
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="Graphics drawing primitives library for SDL"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-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"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e 's/-O //' configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml -r Docs/*
-	prune_libtool_files
-}
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 6e22e493c995..71d188ab0fea 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 3218 BLAKE2B e40b9c972ac73006dd472e18bbf82a8301d4225d97f3e08bf3ca18c8c5093147233d68ebebd9ef1296972720bdfc85a0ad2de90f7b3b321b91ca0cfbc88461e5 SHA512 1808522f11d931ba69dbd3b098581b4f5cdd4b6d779d0b7dbbebed550ac3b8d148722bcde7dc99f01c9696d97d25a3ddf746e085d7a8d2aaa9e2f4bf7f5d5868
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3219 BLAKE2B 8ee820fbf4d194e97ddc9c70fe96ede7c717050b94f4a44d1a73d9e62e0c132787534d5f6228cf34951794e9d2c7ec8c5bc9bb98586cf6b5d52712acf19a3709 SHA512 7995be6780abc107127a7ceb108f21f6b3bb6a34e368b4318137f1303073d3f14352d4ffa9929dc389e13b415f07b86dc63311df374d9a1b3461964d757db5ab
 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 a677f855c5cc..3b9eec7e2a72 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
@@ -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-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/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 66e17eb493fe..fc3ac0cf5161 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -2,5 +2,5 @@ AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3252 BLAKE2B 1f894bcdb4436283dfc19a83ad70e057c7537f5240682973e24b564a1fed2b129a9a26a46c584a60de2cf1dbca0c2df0d36a0013d62dba171939ccf1d91306a1 SHA512 55a79b5c7eaca6b86017df5df83a4c9300800ee5553167fb250dac171658ec781bff5c621347e92507037139bb15e70f8ef90791ec2ef77435f34b0e1c550881
-EBUILD sdl2-mixer-2.0.4.ebuild 3271 BLAKE2B ef556afbbcd50ee12a9b7bf6b01430e96433469f60064ecf40c420cb1664034ad9b57a8880b9d458328170c1ad3fca91f0ad0cc097f7432a8881dea6b0383ee1 SHA512 5e4c12f6e78bbfc2ffbd05b119e62bc7c29396d87af00332745fdb681bb1cc6473e7a6df9d492e4adbeaa1d2780a1862b5112d0ab636ee48bae24c0360bd281f
+EBUILD sdl2-mixer-2.0.4.ebuild 3272 BLAKE2B 8b4c23205261642f4d98895971ccc09a9952a804cf8ab9626b114e2841d323209243dc704508619ab2a1b01361b90b4f0e742a68228f644e4afe3be678276fd4 SHA512 f1e6423f578cb427b203dfedd9e5b76f5367251ac132e982548b2533ae37b65eccf66bbd76c0340fc52cc07fb8ee8719ee5e4c67b126eb85c054afaf1490cf38
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
index f1e6b4c12e1c..ef18d4fafeb5 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ce0e9d87b8be..9df5adae94c6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,16 +1,7 @@
-AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
-AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
-AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
-EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
-EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
-EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
 EBUILD shaderc-2020.2.ebuild 2052 BLAKE2B 95da500f52ef178674c307872f0ea8858e9f9afd926e2c5b06cb9f243c309f7b8675abbf5645891c1008f051fd1abe478c6c7235ec5a45bc336970b90b44d43a SHA512 2464bae776ce827b30db90a398f9b096865a792061bbb699722ff9aef2eb017242ce5062f8af7ddae28eac5950d797c5b72bbb3c2a907aafe047b4fa181d72fd
-EBUILD shaderc-2020.4_pre20201106.ebuild 2165 BLAKE2B 5626b8ccc743239e7c070bf5b3deb0b2e7b84b9dd8fc0cf288ea0ae3ad968806a2ff7f62b4caa23b1ca82072431c947455a90240248166071d335fb9c725b0a9 SHA512 b2d47d0592c8df7a1f768cff7e28ce84c26ac358b8b5cb62c76af50c7732b6f59e49e2b7f041a017d79ea34d2ad25f03c24349a0f3ca9f69d35aa9625a9fc237
+EBUILD shaderc-2020.4_pre20201106.ebuild 2164 BLAKE2B c5898f422cae230cd4372b7f649468cc1042033fe16a842720990a1a4e2ed130b518f378112fbb4fbb2f68eea1c547ad868b1d652cc38feebbf8e0329a5bd1af SHA512 23917fc929756f88c026a7841d86e594a6a3b6b5e9845bcb01085f09ed2ccdab1a10bc99a828e8e22a63a339003f53b629dccc992aab11fd11afcf9b8c5f75e0
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
deleted file mode 100644
index 837303d84e17..000000000000
--- a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..b189430 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -35,7 +35,7 @@ endif(SHADERC_ENABLE_INSTALL)
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
-   glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a2..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
---- a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include <sstream>
- #include <vector>
- 
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
- 
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index ef7867f..acc172b 100644
---- a/libshaderc_util/src/compiler.cc
-+++ b/libshaderc_util/src/compiler.cc
-@@ -26,7 +26,7 @@
- #include "libshaderc_util/string_piece.h"
- #include "libshaderc_util/version_profile.h"
- 
--#include "SPIRV/GlslangToSpv.h"
-+#include "glslang/SPIRV/GlslangToSpv.h"
- 
- namespace {
- using shaderc_util::string_piece;
-@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
-       bases[static_cast<int>(UniformKind::StorageBuffer)]);
-   shader.setShiftUavBinding(
-       bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
--  shader.setHlslIoMapping(hlsl_iomap_);
-   shader.setResourceSetBinding(
-       hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
-   shader.setEnvTarget(target_client_info.target_language,
-                       target_client_info.target_language_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
--
-   const EShMessages rules = GetMessageRules(target_env_, source_language_,
-                                             hlsl_offsets_,
-                                             generate_debug_info_);
-@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
-   }
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
- 
-   // The preprocessor might be sensitive to the target environment.
-   // So combine the existing rules with the just-give-me-preprocessor-output
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
deleted file mode 100644
index 660d1bf8dfd3..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index f8ae95d..069c48a 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
- 
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
-+  glslang OSDependent OGLCompiler glslang SPIRV HLSL
-   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
deleted file mode 100644
index 991a67e2d50b..000000000000
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-7.10[${MULTILIB_USEDEP}]
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/spirv-headers
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
deleted file mode 100644
index 99087b2d869d..000000000000
--- a/media-libs/shaderc/shaderc-2019.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-7.12.3353_pre20191027-r1[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.1
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch"
-		 "${FILESDIR}/${P}-fix-build-against-new-glslang.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2020.1.ebuild b/media-libs/shaderc/shaderc-2020.1.ebuild
deleted file mode 100644
index 17392a54f21a..000000000000
--- a/media-libs/shaderc/shaderc-2020.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.3
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build.patch
-)
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
index 9a8b97deedfe..32988c5d5b75 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
+++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 577072fecb50..7f172a7914dc 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r3.ebuild 1339 BLAKE2B c75c411c5729bedc04c2520a47a12ba2216c36112b6a344f5782e09b390538fec7ccd358185c11b9bf5dd2dbb18cbaceeab9f06fa25137d85076d2566b757733 SHA512 9e6677f9a2a74544c1110f74b52456bf4c5dd719e2861652c04edb7520783028bd20e469c221865567e5864a5ad839756b8b482b61063b233782a8d69a35d264
+EBUILD smpeg2-2.0.0-r3.ebuild 1340 BLAKE2B a151fc9f571cddc010907a581e706302190f5f1005eda8cce0561edac3da9283af1da688e0245383ed62e7acfcc07e73b5f363baefcef685aed273f0074d2b7b SHA512 8620cb333224308870d3ffd6db18950c1dec6e44252272ac32fade11439c82fba66c93bd522b3f3d61fd467937f13e6b0e7c11985176723d1bbd3a2cde1bd274
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
index a2a7e3d58c80..be330d9648f0 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
 
 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="debug cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 9a20be8b5982..d8371e20d5ca 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,5 +1,5 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 EBUILD speex-1.2.0-r1.ebuild 1641 BLAKE2B 5aa08d9dc5a676c1887d2e062f2c0f679fd89fad5f9360a2c2e0acc77c19622717f652c5793b2f0f1fbeaf514941240974490f661e5fc70e8e8fae66f7996f5f SHA512 298c786b759025d3752338bd8b115d3508febf0bcb0ace2daeae6a27bfc8998445e1355dbc7513a5989c44dccc849506ab2c56db5f7c151a1b083c0ede74138d
-EBUILD speex-1.2.0-r2.ebuild 1661 BLAKE2B fc9dc12c2153cc9fe57e178617c892023d08159ee22b5e68b67318ea47dfacc41db8f0c8c4afcc07537d3d60d6f94f4b257f030dae2e876d0a699884e84ba4dd SHA512 de8457914635be6c32460cf54279fc37c25c46c68879950a6c5a17cc68d617922fd06363e1f6d5beeabd4b865a432c84e6ed9be0f3c33e885a39cb7214e0ba75
+EBUILD speex-1.2.0-r2.ebuild 1655 BLAKE2B ae2b78701122dd74c38b8f372c66e5c31f89be0179ea654fc579607b450c906ef424236d1ef0a58f1333089fd05eac1f9984e85af0b7bdec87c52734edba6d85 SHA512 ddc3436fd6a4460f6a9dd9c558a1f11b830975a0a9b4389cdbb6ca9504cb9a53aa873f562f0df5c8ec6534df1889dfa5ef7a9d7c967bb202cfbd07e3a79f7238
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index a1aeaecbc054..28948a702acc 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 3d73f1abaa2c..48af0542fd72 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,5 +3,5 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
 EBUILD speexdsp-1.2_rc3-r2.ebuild 1464 BLAKE2B 9746d51418ef2f7043c14e8a9e7c2e278806deb2a69e4a23af0d1ffb35c1756748fb8beb57cea176b0334977d0d778eea2eec2291706dbe824f10335dc278e5b SHA512 aa31f8b6965be744dc03017b4df4ef8feec264a59e01f883ac8935df7f14765b74730b6cd719e16e73e994b2192748deff66ec51b69a91996eaabce51ace2488
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1470 BLAKE2B 6c6a3a511660ec5e8630d5af68bbe26cf1ab7774a21241630275ed57ed8fddf95c4c3b80d3b1e53295704d36a72ac1ef41d8ab2dfe276e72940e3cbd08ce280a SHA512 cad7adbdaac73a9bae38dd3843b13a389a7abe0acb4de55f5c8bced0e4a03db75f1fdc860a87f5528a6b44c62ce1e0820161464eb24db6f78efc29995412b655
+EBUILD speexdsp-1.2_rc3-r3.ebuild 1464 BLAKE2B 1d9dfa46418b942e625b2aa2aa8391f338bf15847dadeae0f2c53330689b120e1e669a56bdd5535e248155545a827a70adda3df1be0e2f8b8e13fd0622ded134 SHA512 99152a7832aa11ae31c7af161710db47f5b86a8dc390e1a427a270a4d22b2c1255c1329a33c191e34f6b108b42c8c4e875c68834063bf4d54bcd404ba110ea65
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index 4e88346d0619..228a55535e41 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index cb2abb509376..5186b857f4b0 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,4 +1,4 @@
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r2.ebuild 1105 BLAKE2B cdd9133c5a4e9cf8ba70df04ff1910a221cf9c7f367fc808587033f548c77268dc9a6d60e786555032d69a5474f9fe1b686636f9330993ea203ea89d7afddecd SHA512 a1363cb7dbb0487fda39c365601b9b136a9ce4337bde2114385e848481645d611ca53f970b04e0767c3ba84fda960c40d952a8dc86c12e1d59ab64877ab7016f
+EBUILD tremor-0_pre20130223-r2.ebuild 1106 BLAKE2B 1963ff16f0059534f0776a503b7f69a1fffdca36f221a9790ca9b1635049fe6ba4dea586d26b85f19664db7ba88ef60509aa3f0f2425f4482d5bbb16aeac50ab SHA512 9351da68931373b599f1be5b4876e1f0087609236a4cc6c2837f3bafa739cdce7bfd21745ad1d8e2fa57cd15d0ddf81f98d7f7c3873d6db27dde4a993b38478d
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
index e1b1b40d875b..6b4f301c3d52 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index da63e07fbd82..049f3a429138 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,5 +1,4 @@
 AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d
-AUX urt-3.1b-build-fixes.patch 5158 BLAKE2B 06d7768168d11166c8543f7d3377ae3968520661a5dcf7f0c59f10b20a60dfff67e476aa16273e8d8578bdadaa77dcd7b0e1a951875298fe820f05e9e532c41b SHA512 baa3719b62af4580ca8636052448811c1024f102df11f04c36a1acdd69883877cd793251e8aa23d05db5762989e2544dd25ffad77174da52deaf485532db0770
 AUX urt-3.1b-compile-updates.patch 3441 BLAKE2B f3c09e7bbd8f19c9ebe949c0f030e017e84f7d4ff73d6c5e160e709d63b95dc05be6a8b8ee4ab75027192ff7c8d1850e8e8599ec2f7efc773b9af691bde01677 SHA512 aec58e4065cafeded2de5adb7c679867f7144bfc501d03a9dd8d9d65f8dcf380360f2365a1a117a933882888c17917b76e2aafe72283a363b7ebe29f1b2d698c
 AUX urt-3.1b-implicit-function-declarations.patch 1840 BLAKE2B 00c019eacc36814c0ddf8b709c510538ee2c8829498c37b899b0b107371bb09dc6e098231eab3e3384a825df4a48392d56a5286a74c1a8a409df7eb8f6754070 SHA512 91474bbfa13a9d5249ed8eeafbc3291447f97a39a085cab4b0bccd48658b41bf4e9c534b466a410aa9b91418a7bbc85dcd13a50770313747f8edfe0d00e0e137
 AUX urt-3.1b-librle-toolchain.patch 1491 BLAKE2B 6fcdae4a255cb2ab7ee9dd6a2ad7e5dde6d5b42647029ea892d67e0171c7b299dabe352f0bc920eeb09f617d1840f8c9a7ff0138b9457036853f63f2fb2ac459 SHA512 49dbf6d00e27c1bbd7f25d14427219e55c1c7fb49d209d5c940118113dfb911c57d3ccf8488182e06f9cb34224defe54fc5fa64a1e04f53746e9afd04ce65503
@@ -9,6 +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-r1.ebuild 2024 BLAKE2B 83ced9f74ef19a2c24d0c93f55f1eb8d58d7e6c9e963b7c25485ce5fdb5215e7ce4612ab47533f9d5fbf5d0283bda98d151a1371d3a8fd4ff65066d4cc77902b SHA512 7b71e6690bc1297c30550e54ae92b842748c3ad41a3a32ffd4faa05d60404c5c0b136f0332d24c9f0229a75465c675fd6fb488ea16ceea361d228fcc900fbcb4
-EBUILD urt-3.1b-r3.ebuild 2358 BLAKE2B e54f679e95e44661ad7e334196ac1a5a6631c0ca0b3da637540fe514a8b363ba941b69dbe43d9126495186d20edab9f0c2a152e1593fbdbb248f12a1d73aafd4 SHA512 dab0b1fcb0b8a6acf46b6763a4d86f8949d1b311bb66fa89bc77520b866b915e0ed286f3edbfafa342106b67a145836a9291f5aebbeff9c1d75ed67c0068a426
+EBUILD urt-3.1b-r3.ebuild 2364 BLAKE2B dd8b8c569083a95468ee3a1b112c0734acfe50b2016c9597bcc014f01e177c18bc13d2af4e1600759a25759302d405644ffac6ba7925b45bd29d891a94539ed6 SHA512 ad6eea2aa672b1814f9c7ede85dba981a6c2d5ca67328a8b67836c05f534c7c5df5c04ff65511e0ae744918e0c1e69c69bce8341981b16f6f3b8754d80b5ad15
 MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
deleted file mode 100644
index 2f801e0c984a..000000000000
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-some hosts are more anal about ar usage than others
-http://bugs.gentoo.org/107428
-
-respect user LDFLAGS
-http://bugs.gentoo.org/126872
-
---- a/lib/makefile.src
-+++ b/lib/makefile.src
-@@ -181,8 +181,7 @@
- # Rebuild the library from all the .o files.
- buildlib: $(OBJS)
- 	-rm -f $(LIBNAME)
--	ar rc $(LIBNAME)
--	ar q $(LIBNAME) $(OBJS)
-+	ar rc $(LIBNAME) $(OBJS)
- #ifndef NO_RANLIB
- 	ranlib $(LIBNAME)
- #endif
---- a/tools/clock/makefile.src
-+++ b/tools/clock/makefile.src
-@@ -6,7 +6,7 @@ install: rleClock
- 	mv rleClock ../rleClock.out
- 
- rleClock:rleClock.o font.o
--	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
-+	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
- 
- font.c:font.src makeFont
- 	chmod +x makeFont
---- a/tools/makefile.src
-+++ b/tools/makefile.src
-@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
- pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
- 	$(CC) $(CFLAGS) pyrlib.c -c
- pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
--	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
- 	mv pyrmask.new pyrmask.out
- 
- fant.out: fant.o mallocNd.o
--	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
- 	mv fant.new fant.out
- 	
- # rlebox and crop use some common code.
- rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
- 
- crop.out: crop.c rle_box.o
--	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-+	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
- 	mv crop.new crop.out
- rlebox.out: rlebox.c rle_box.o
--	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-+	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
- 	mv rlebox.new rlebox.out
- 
- # rleClock has it's own directory, must be built special
-@@ -100,7 +100,7 @@ clean:	clean-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c .o
- .c.out:
--	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- .c.o:
---- a/cnv/makefile.src
-+++ b/cnv/makefile.src
-@@ -76,13 +76,13 @@ PBMDIR = 
- # ppmtorle - ppm format to RLE
- # rletoppm - RLE to ppm format
- pgmtorle.out: pgmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- ppmtorle.out: ppmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- rletoppm.out: rletoppm.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c
- # iristorle/rletoiris - Convert between RLE and SGI image format.
- #
- iristorle.out: iristorle.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- rletoiris.out: rletoiris.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -108,10 +108,10 @@ TIFFDIR =
- # tifftorle - Convert TIFF images to RLE
- # rletotiff - Convert RLE images to TIFF
- rletotiff.out: rletotiff.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- tifftorle.out: tifftorle.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c
- # Will build with the default rule.
- # rletorla - RLE to Wavefront RLA
- rletorla.out: rletorla.c
--	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
- 	mv $*.new $@
- #endif WAVEFRONT
- 
-@@ -144,7 +144,7 @@ pristine: pristine-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c
- .c.out:
--	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- # Dependency lines.  Make sure to #ifdef them.
---- a/cnv/rletoabA62/makefile.src
-+++ b/cnv/rletoabA62/makefile.src
-@@ -15,7 +15,7 @@ all		:	$(PGMS)
- # Executables.  The .out will be stripped off in the install action.
- 
- rletoabA62.out	:	rletoabA62.o rle.o
--			$(CC) $(CFLAGS) -o rletoabA62.new \
-+			$(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \
- 			  rletoabA62.o rle.o $(LIBS)
- 			mv rletoabA62.new rletoabA62.out
- 
---- a/cnv/rletogif/makefile.src
-+++ b/cnv/rletogif/makefile.src
-@@ -15,7 +15,7 @@ all:	$(PGMS)
- # The executable.  The ".out" will be stripped off in the install action.
- 
- rletogif.out: ${OBJ}
--	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
-+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
- 	mv rletogif.new rletogif.out
- 
- # Incremental install, copies executable to DEST dir.
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
deleted file mode 100644
index 4765c23d3cfa..000000000000
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
-HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
-SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
-
-LICENSE="URT gif? ( free-noncomm )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="gif postscript tiff X"
-
-RDEPEND="X? ( x11-libs/libXext )
-	gif? ( media-libs/giflib )
-	tiff? ( media-libs/tiff )
-	postscript? ( app-text/ghostscript-gpl )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-S=${WORKDIR}
-
-urt_config() {
-	use $1 && echo "#define $2" || echo "##define $2"
-}
-
-src_prepare() {
-	rm -f bin/README
-
-	epatch "${FILESDIR}"/${P}-rle-fixes.patch
-	epatch "${FILESDIR}"/${P}-compile-updates.patch
-	epatch "${FILESDIR}"/${P}-tempfile.patch
-	epatch "${FILESDIR}"/${P}-build-fixes.patch
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-solaris.patch
-
-	# punt bogus manpage #109511
-	rm -f man/man1/template.1
-
-	# stupid OS X declares a stack_t type already #107428
-	sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
-
-	sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
-	cp "${FILESDIR}"/gentoo-config config/gentoo
-	cat >> config/gentoo <<-EOF
-	$(urt_config X X11)
-	$(urt_config postscript POSTSCRIPT)
-	$(urt_config tiff TIFF)
-	ExtraCFLAGS = ${CFLAGS}
-	MFLAGS = ${MAKEOPTS}
-	# prevent circular depend #111455
-	$(has_version media-libs/giflib && urt_config gif GIF)
-	EOF
-}
-
-src_configure() {
-	./Configure config/gentoo || die "config"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	mkdir -p man-dest/man{1,3,5}
-	# this just installs it into some local dirs
-	make install || die
-	dobin bin/*
-	dolib.a lib/librle.a
-	insinto /usr/include
-	doins include/rle*.h
-	doman man-dest/man?/*.[135]
-	dodoc *-changes CHANGES* README blurb
-}
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 04a75fb83a64..7b2d16703e9d 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~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 ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index ea2d7ac4e6fb..20e707132684 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac
 DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
 EBUILD vulkan-layers-1.2.141.ebuild 1408 BLAKE2B 5084798d4af3b3b5b63bcf16dbe971382e381ca10ce370e4c21df9d0f7752ea914142101cc70d54efc05f915226815dcab2de64c95facd857a56cc2f4b9044a7 SHA512 5f0e13a63b0f05a5af1ac17314ee6d5a04cd39985ecf65f1b08c22af95829c0202a8ef13a2cb0f5d06b5c60a3628f3a63aa7e60582319c5e90fb50c80325309e
-EBUILD vulkan-layers-1.2.154.ebuild 1498 BLAKE2B 18183368dbde81f5d194e8ae13ebb80bd6fbf85d133d9817feafd3213a234192d866b5a58d4c4b339e4dac645923f5207bb8c43a4c52a8b87c189042a254205b SHA512 fbc0d04e7bef008c49da23ef236302aeab2003ea0fcdeba4ac3ebb57c00a1cf983fc79902654528157cdad9d22ba19c91229a38daf16729064b4fab51da30e79
+EBUILD vulkan-layers-1.2.154.ebuild 1501 BLAKE2B 8ae8321731f04c384bdb32d50d6141a66138b85cb2ca73b7d456b962d427c9729ef6f96f3368bc9078599cc16e4a1463552fd9c48d374de9e8cbbbe5489fec2d SHA512 cc3a84d754771f610e47fc3ced585cca00aec21b24a4fa2030c31760ae428782592e019506507e7e76b59fc8d775f6ca7d92ab077b82b29af9ffd09c223a827d
 EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 18183368dbde81f5d194e8ae13ebb80bd6fbf85d133d9817feafd3213a234192d866b5a58d4c4b339e4dac645923f5207bb8c43a4c52a8b87c189042a254205b SHA512 fbc0d04e7bef008c49da23ef236302aeab2003ea0fcdeba4ac3ebb57c00a1cf983fc79902654528157cdad9d22ba19c91229a38daf16729064b4fab51da30e79
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
index b8f6fafe2d3d..29615fa89454 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 27ae8cc6132f..bbb4a5abb283 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
 DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
 EBUILD vulkan-loader-1.2.141-r1.ebuild 1725 BLAKE2B 9c7064acb06fef62321cab2d0290477e6d428759ad3015a620c3948ea0a42d4891befdced4bbf51b04f1c1ae1ec2395be37364e6a8c9c0119a81e150124bbb6a SHA512 a99664f8c2b9397e6d55dd695956904b20e192880e5ae429338cc5224ecf35d2e910a0c1f5d63fee1c1cb63f645d35e4a99ca09ba2e6f4287225eadda4fa2247
-EBUILD vulkan-loader-1.2.154.ebuild 1730 BLAKE2B 0d494dd4a975d178f9874da3e1d42c97c42c275d56785a834fb600818abc4546f706ae679a1fcaf8c1d85e21702fd8f77de56d1de50e72ccb79282bfef23951a SHA512 d252845fefd90b1df6f7ae572442027350bc0bb8d2a6528dcdbcfe62768273df131243c9e53f1d89d494e5263f5574a41902c00d33942781105356149ed7a785
-EBUILD vulkan-loader-9999.ebuild 1730 BLAKE2B 0d494dd4a975d178f9874da3e1d42c97c42c275d56785a834fb600818abc4546f706ae679a1fcaf8c1d85e21702fd8f77de56d1de50e72ccb79282bfef23951a SHA512 d252845fefd90b1df6f7ae572442027350bc0bb8d2a6528dcdbcfe62768273df131243c9e53f1d89d494e5263f5574a41902c00d33942781105356149ed7a785
+EBUILD vulkan-loader-1.2.154.ebuild 1733 BLAKE2B be562be463f54540d9d406d75280aab4c394b93c8999f2545aa831cf40507ba40b43e71eb0d1d49355b2bc0dcf7812470a222a4ff2da6d93630f06aea3f29b42 SHA512 3a6a7ecefae3d7ecd8f7128cd98de4d8883950cdc1feb7dd2eb876d2b72bc6da3bf6d2cf409bc2d9a3d0ea19d74c5670ede31d9ec9ede0aab712b1a2c14cf987
+EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B d0755a57d1a49f6386287648e1088c4f4378209cd671efb94ce2f2a40ffe1556ad228272805c6bfafe67cb4e2bc092d06b17b512d1d4522d6ed35d135b51562a SHA512 e55209e5da0c68ff2c74a0103d5775ae5daecc3c89f48439543ff0b1fdd6d5f05ffadca6dc1afeb25e489d2ed7c3caffec50503389c0737af992d6cb08342d5d
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
index 8807c9d94dfb..cdca9496e2a7 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 8807c9d94dfb..bb006a7a4f3a 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.154
+	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index e1d21c7230b4..ecaccb4c3cd0 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 872 BLAKE2B 88cb1931b7eab46e0e4af83ee749ddf9bce85fa3e3636e5dfdb85f5f7379c10bd3a1d6113536a3c74f9f087db7f9bd25327a8561b0f8a41d19fdf43c511cf8fc SHA512 f03a1870a99a983a5eb33d2766794b7e20ea61f0b09ff8f3fb870067e81212bb4dad2df7751629202c1d1875a8b21def2fc639b474f86edea27de3c913bf3a5c
+EBUILD woff2-1.0.2-r2.ebuild 879 BLAKE2B 850ec29373c90a0d7e7a49f4c72fa9abc421ccb352a7466bff8478b1172956f19350cf9d95f7e67e7202c10c635aa4267a6ed6fd692f8093860e90544129f8f5 SHA512 563a93bd08f4900a5b705ee1b1edfeb343634b9536de5d48c03c5a65b8124cbeb4c1f89850760caa5b39547317c51882ad3907b6bd29dd7074afe91a4151960a
 MISC metadata.xml 353 BLAKE2B 1cc153f5b5aaee1378bd1c42c3a85e0a156d853c63643e8b832b5517f8d7ff74c52552be3a11e3c0db7550daabfbb41d2618f89763baaf076ff4e327da03b7d0 SHA512 b3ceae6dd9b6556417a7633245e49463ee54759e8e8835583a15c8863c91e5669465a0fa1b22f066d99e0a1bfcd0df1537bddaba27cb6fb838ed356ca7f33a93
diff --git a/media-libs/woff2/woff2-1.0.2-r2.ebuild b/media-libs/woff2/woff2-1.0.2-r2.ebuild
index 6cf3ad9bb3b7..aa79db2f3e60 100644
--- a/media-libs/woff2/woff2-1.0.2-r2.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r2.ebuild
@@ -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 1aafe3c1a467..b5738a0bf96f 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,5 +1,3 @@
 DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55 SHA512 d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
-DIST wxsvg-1.5.9.tar.bz2 512874 BLAKE2B a81099720e8835637ca82c7c0a3738dba36d16425982aba92f72f1427787e281260b3d06a972b0739d090610f8ab487e23f056f87284251c2a87a960666fb088 SHA512 eda51832dfa646cd4a681acdbbc1282b9d82d3a0571633c1212f89093ac23cad57f8f8e03fb7c35591b956a9b18c48852d439c44204830f1efd813549bc7eada
 EBUILD wxsvg-1.5.11.ebuild 922 BLAKE2B 087912d04790f4c465a1acd3f49055f82f48a2667558701222acc902e8c5fcb5c54ad84c9366ab6e7e75a4857cbfbfe4e408f46ee1d0f2dd1bda50879eeab30a SHA512 fb07aa53048ef08778ce42e170cf47c5c287323b451943b19f7a3b20ffff2a69da60db285f5b75ae84d11c27562ed2d3de5ddf97571fc73c66ca4e4d0c1917d5
-EBUILD wxsvg-1.5.9.ebuild 900 BLAKE2B f0ec7b3b0e58cde46e0f3166d50033ddd9af38e270c3c3ee995293ee7594996411c3ef6c3916a2465b7356d45779e8a499bc1e70d15bb2b5cf432a419eb75f59 SHA512 63dd3644b50cd6f41cf79374aaf350d7308595a8d1effc76e5f1f2e3194e387ea08267b3c5fa5db25f991c97eb75ab2df76f52efd82f99cef434487d90db5cf6
 MISC metadata.xml 336 BLAKE2B 178a381a2b4cf5e5ba3d7b81e721257a354bb098ba0c5c2f2d13b66e4e9163f89ed73ed2329101263076d51267e5e9ceb6764010f6b7a6901937f0a5121587f2 SHA512 01e85d6e1cb1a4a3a717cf79df29e4eed10fc1d21fd3e3d431e7f849acf2282c2a3c85b49b3af7ad84072faab77e35ef1a91409de3ad62a21c34d2d97cd6831e
diff --git a/media-libs/wxsvg/wxsvg-1.5.9.ebuild b/media-libs/wxsvg/wxsvg-1.5.9.ebuild
deleted file mode 100644
index 89506ea43f15..000000000000
--- a/media-libs/wxsvg/wxsvg-1.5.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-inherit eutils ltprune wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files"
-HOMEPAGE="http://wxsvg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0/3" # based on SONAME of libwxsvg.so
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/expat-2:=
-	>=dev-libs/glib-2.28:2=
-	dev-libs/libxml2:=
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	x11-libs/cairo:=
-	x11-libs/pango:=
-	x11-libs/wxGTK:${WX_GTK_VER}=[X]
-	>=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog TODO )
-
-src_configure() {
-	need-wxwidgets base-unicode
-	econf \
-		$(use_enable static-libs static) \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 28cd4c131607..34f25daf2c4f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,9 @@
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
+DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.10.ebuild 5034 BLAKE2B f41eee641edac544ef230e33819c764e06d4e69ce2010f976f302598691b70e2a2cda68fbdd6234977996acdd771396f6f3e58c58dcb8d5e81f8771d1ff68968 SHA512 84e81689317d5701d28e14545af391b9760218f4664a9dbbebb173b69132dee3d9053931896513b0507211c48b2e61e8f46f10d377bf019a0fcd4f7500853ee5
+EBUILD xine-lib-1.2.11.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
 EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7
-EBUILD xine-lib-1.2.9999.ebuild 5034 BLAKE2B f41eee641edac544ef230e33819c764e06d4e69ce2010f976f302598691b70e2a2cda68fbdd6234977996acdd771396f6f3e58c58dcb8d5e81f8771d1ff68968 SHA512 84e81689317d5701d28e14545af391b9760218f4664a9dbbebb173b69132dee3d9053931896513b0507211c48b2e61e8f46f10d377bf019a0fcd4f7500853ee5
+EBUILD xine-lib-1.2.9999.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
 MISC metadata.xml 2498 BLAKE2B 949a34fcf5204424c2a565ce2329b3f878e4ef817882839bbec09a6d721a8756be6dc37eff2a0bb7e007d333e2bc4896ac6c853f7fe5b1f9c8f4ed3a66ada640 SHA512 f975a8763a3f31a27a769e4649cd7c6ecd113cb4fcd36556f5f7830b9de989be219a0c9f90db4a4df87e9ffd584d4c2e86346da084c95d32dc17adcc30f98c28
diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
new file mode 100644
index 000000000000..1b99ceacbd42
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
+
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
+"
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	media-video/ffmpeg:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:0=[-minimal]
+	)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	vpx? ( media-libs/libvpx:0= )
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libxcb
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--enable-avformat
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		--without-fusionsound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with X xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index bf3fbf83a913..1b99ceacbd42 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool
 
@@ -26,6 +26,11 @@ LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
 
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
+"
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
@@ -93,9 +98,6 @@ RDEPEND="${NLS_RDEPEND}
 "
 DEPEND="${RDEPEND}
 	${NLS_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -214,5 +216,5 @@ src_compile() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /media-libs
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)