gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-libs
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
217 files changed, 3240 insertions, 2124 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3efd756eb5df..7e2fc3f7b6bb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 5758541d493e..4e12fc3104e8 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,5 +6,5 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r9.ebuild 1928 BLAKE2B 105c0579466197596714918f50d47df92f4f16679c6dc49a668e52f83955f5a9fe61cd38c9baeac0084c23e4646426305ae65a25b94c9583afb233f0a9bff311 SHA512 98a19e101071fef0a1e2dd9642242307e60129c26b58e4a718431b7fb605fa2e87236dad707db3a2c010ba2ad9b00896f55ad92e98bc36d0fefbc8a067218084
+EBUILD aalib-1.4_rc5-r9.ebuild 1935 BLAKE2B 3b8634417df2eec3080f90b1312cce41954da998c9e327b13baf67cd8773f60d27827611c73c34f5978f17f6fb3271773a15e714ce47f0f11bcca9357d397e69 SHA512 16b96df102859468e3b6cc3cff9c4f3d4c7b68dc6ba98ecbf00c9d1f1c8e8af4a9325540c95e7f932f5aeb3fbe888e56a70c85df780dd9eed091e27da93e366a
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 03e172822833..2b187dc03bdd 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index ffbf8d29526c..f23510264441 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,13 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
 AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
+AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
+DIST alsa-lib-1.2.5.tar.bz2 1068496 BLAKE2B 84fe4e22d4316bfc84f15f2493f40f113eb3db7722f230550586533e80daf214140164e8ddc1a399b82a3fd0fb21125ff225cfeb45eaa19320c2e2aa3997c662 SHA512 d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
 EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
 EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
-EBUILD alsa-lib-1.2.4.ebuild 2112 BLAKE2B 91c2f450e20782deda86225614a1e238135417a2154000abd6dd2a73896531694d0ecf5010bd811606152e0feaccc89bdaab311bb1df3be10391a0121c3913d8 SHA512 f93b769a808911c68284abeea0d0dec43585da9ead9151723a0706fa62400e1b4be15978b265a1944ca5c129ca397293ca2073e8965d83253bfefafb8d19f891
+EBUILD alsa-lib-1.2.4.ebuild 2171 BLAKE2B f6bb453b17e2f8e0bbdf955c361f61d485eaffba4b62363ce0454fb3c915f1721bdc03e946660d4b790d7991d3e625772b85f7622aef5d26374ebd639938864d SHA512 d56d4ec475ad8f400a96aa06e82b029c85162e5b68f4806a835d6f05d5bb8b5c1854719b98f9cff6f26ac53f4323757c8e33c6c2b005be5a5330fe1f89a08c2c
+EBUILD alsa-lib-1.2.5.ebuild 2125 BLAKE2B 30d8d6573061912979ebe2f8e8b4b2c64e01de20d52e1e8a54d02e17d2dac7ed23ff12ef86c44adb6b047c876eea37ac7ad24ede14ea4a1bfd4fd0babc650d35 SHA512 c9b53f2a8da72d1255ce967447773f52f8f3ce8c33ccf13604f2dec4da9adcc6f0d028e1cb23c46eb648f57511f6126e6114268bef0f70a9bfb2894fd686d60f
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index 17c3ec172b77..b784b7409239 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -25,7 +25,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+	"${FILESDIR}/${PN}-1.2.4-musl.patch" # bug #792570
 )
 
 pkg_setup() {
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
new file mode 100644
index 000000000000..8183119b95e5
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	if use elibc_uclibc ; then
+		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
+	fi
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
new file mode 100644
index 000000000000..54e6c0e0d23e
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
@@ -0,0 +1,32 @@
+https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
+https://bugs.gentoo.org/792570
+
+From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 22 Oct 2020 20:57:32 +0200
+Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
+ declared even for \!DL_ORIGIN_AVAILABLE
+
+Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
+BugLink: https://github.com/alsa-project/alsa-lib/issues/91
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/dlmisc.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/dlmisc.c b/src/dlmisc.c
+index c9517c55..f20eb593 100644
+--- a/src/dlmisc.c
++++ b/src/dlmisc.c
+@@ -42,11 +42,9 @@
+ #ifndef PIC
+ struct snd_dlsym_link *snd_dlsym_start = NULL;
+ #endif
+-#ifdef DL_ORIGIN_AVAILABLE
+ static int snd_plugin_dir_set = 0;
+ static char *snd_plugin_dir = NULL;
+ #endif
+-#endif
+ 
+ #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
+ static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 189b6eb96bf5..34471f52cae9 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,7 +1,9 @@
 DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
 DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
+DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
 EBUILD alsa-topology-conf-1.2.2.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
 EBUILD alsa-topology-conf-1.2.3.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
-EBUILD alsa-topology-conf-1.2.4.ebuild 500 BLAKE2B 3dcd66d24b527410c91c191b9bf3551b850559297d999e28936ea9f59d7faf7f39135dca08499ac05cac539e506feba2d87940383c723f649fa2fc005e7c87bc SHA512 0026765fbfe2dd182b1eda729624624fd36b2fdfb0ad1d9d02c60972e3c44c1539d3371f5c7227693b073e070d62dc845403f56c35481bcb06ccc4fa99468941
+EBUILD alsa-topology-conf-1.2.4.ebuild 501 BLAKE2B d365eefaa426de5d0fb3af996e4bfccb41cb55f93c8c6e5dbc75437855aa18327cd141dd3c6950752a2fbb68502156cfb611b801766e9789564de68d4d673641 SHA512 3254160b67078063e9101b8acc064de321f41ada4c32719825e3e36bb1ed35d6390408743e150fd8b0487755e5bd0d5b78914a36a0d06f50a472d3f8a5a58f6a
+EBUILD alsa-topology-conf-1.2.5.ebuild 558 BLAKE2B aea238864b62e8ba0f9b890a594a2db0a1734b85ef0eb9c487f2acbedd0b89522c67b75ba6147d4db6650ee19c8a1d578d10f3f217872f64bfbc355b05d37abf SHA512 44b7671b62ec0c1e3117cd8c2bd429f3201ad1828851efef866043702f81bd9bccfbafdae604d60132b48e73ae82f87b05cfb4c26e289e17884550c3f9b0523b
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
index 84b05683cf78..d7ed7caa0c1e 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
new file mode 100644
index 000000000000..259b34980290
--- /dev/null
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ALSA topology configuration files"
+HOMEPAGE="https://www.alsa-project.org"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+MY_P="${PN}-1.2.4.2.g15998"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r topology
+}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 63412180ea44..f7063d218513 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,7 +1,9 @@
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
 DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
+DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
 EBUILD alsa-ucm-conf-1.2.2.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
 EBUILD alsa-ucm-conf-1.2.3.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.4.ebuild 494 BLAKE2B 576963ae39b2529e38a71864f3101aa123dc1e7346c830e17d7624243d516cf121d643e6403f36cd1ec1e9f3bd21ac7c0b55d0704127cd7bfeec8ede2115e6d9 SHA512 5ba6d22fc98276d85958b5fd28dc7f56ab5d3db9eaaed54674a8ab33406e681996556d0692ad3992674ffafe87c31eb84dd9bdd280422c8766724c46caa65808
+EBUILD alsa-ucm-conf-1.2.4.ebuild 495 BLAKE2B 5a7fad73d0723cfd71638c6a3a1e3bca99daf6c37accbbfed4fee49eef8a683f5cbd75ad375034d48416bd560a5738e9b43078abc62c917534a4f709365a33cf SHA512 8c9a2c4d69e2b9e23b9c5eba95b065aa83fe82c1b306484923362241ce04e07c4db4c4a812db1fe80dff641c2f473998ed912bf8dec9ab37054ed688f7758e47
+EBUILD alsa-ucm-conf-1.2.5.ebuild 553 BLAKE2B 7a3244a22de8962e5fcc2bede58f28638a2e474f15a3b4c4596bee02c9536ce73c21197e984e7ebba053603237f68d036093be9c859b6d871d61f1e0cdfdb164 SHA512 bcdc43a3170a910718f6861adbecc64aa514aa6389b75817252334112c226d0bd736b870ebee28c9a2add6ffcff99c7c5928f416876d208169ab686080a326c6
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
index 1424e013ca8f..6c74519bf103 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
new file mode 100644
index 000000000000..2b01161620d6
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://www.alsa-project.org"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+MY_P="${PN}-1.2.4.81.g4884e"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index c20b2aea0941..d50474a1da35 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,6 +1,3 @@
-AUX exiftool-12.16-CVE-2021-22204.patch 1607 BLAKE2B 1cfcdb7c002ba24785b9a7c5e806f2d4cdd5054905858de3d322f81919f37b472f58ebaff14fbce49fb2c88e512488e26dfda603de7e271d0c8a4a1093f6539a SHA512 7a24dfc1962e10e05d14090ede26d292352d9e8d0e1eec2289527bb7577e59eb4e618c7b1b5773dd3a8295b124af10c4082a395d38a6893b5548b3e5a06bf1b7
-DIST Image-ExifTool-12.16.tar.gz 4888506 BLAKE2B d262f087b4334c01ed927945aa0b072c90eaf7322af017030ef193b8b20fc7ce7008b69c483bc83d1dbe0ceab5bcb7e894e5085cae853a1d9d74f72b9c8a360e SHA512 adfd21834ccf06277903712b3c5e328b29c56f3b30ee68f6802dca0820823b627622e55f53238690525d1d19df2a59cb57f9d80a1bb2e99da37fb7d963ee16ee
 DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
-EBUILD exiftool-12.16-r1.ebuild 606 BLAKE2B cf68bfa66a01d97d577a6e2dc3a120e2b609ea0d30c841948098b199d52860afe219f87fa3ee55899b15aad3bf7ce4c318af7ff290281d2c6dc7b236dd10edb6 SHA512 16e2e2c7a85f0848978a2388022437823dde88d82bae36c6ba0c2a543d04d94da228bc835fe9374fbf95c843b677dabe6cf8864bfb3c7839ff44d6178f67a6c0
-EBUILD exiftool-12.26.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
+EBUILD exiftool-12.26.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
 MISC metadata.xml 10039 BLAKE2B da44aad7d46d49683f89fa75db8c92230b9088cd14a5c8715a9f3a982843d8a348393f1bd10bdcc08d5d6dc4e5f2fbf0fdd517ce88df2180807796fbd5c06b32 SHA512 c4647e7055ffcae7226aa2bdff458576cc0fef14f6d782a16695902f4af96740a96f0388398eafbdca22ee76a0c808c81dafc2ccc583f8218c718f69c8fd0da9
diff --git a/media-libs/exiftool/exiftool-12.16-r1.ebuild b/media-libs/exiftool/exiftool-12.16-r1.ebuild
deleted file mode 100644
index b834f5c94078..000000000000
--- a/media-libs/exiftool/exiftool-12.16-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=( "${FILESDIR}"/exiftool-12.16-CVE-2021-22204.patch )
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-12.26.ebuild b/media-libs/exiftool/exiftool-12.26.ebuild
index 48300e4ce1a6..579e441d9422 100644
--- a/media-libs/exiftool/exiftool-12.26.ebuild
+++ b/media-libs/exiftool/exiftool-12.26.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/files/exiftool-12.16-CVE-2021-22204.patch b/media-libs/exiftool/files/exiftool-12.16-CVE-2021-22204.patch
deleted file mode 100644
index 1c9e7921c6bb..000000000000
--- a/media-libs/exiftool/files/exiftool-12.16-CVE-2021-22204.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix 'eval injection".
- CVE-2021-22204: Improper neutralization of user data in the DjVu file
- format in ExifTool versions 7.44 and up allows arbitrary code execution
- when parsing the malicious image
-Origin: upstream release 12.24
-Bug-Debian: https://bugs.debian.org/987505
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1925985
-Author: Phil Harvey <philharvey66@gmail.com>
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2021-04-24
-Applied-Upstream: https://github.com/exiftool/exiftool/commit/cf0f4e7dcd024ca99615bfd1102a841a25dde031#diff-fa0d652d10dbcd246e6b1df16c1e992931d3bb717a7e36157596b76bdadb3800
-
---- a/lib/Image/ExifTool/DjVu.pm
-+++ b/lib/Image/ExifTool/DjVu.pm
-@@ -227,10 +227,11 @@
-                 last unless $tok =~ /(\\+)$/ and length($1) & 0x01;
-                 $tok .= '"';    # quote is part of the string
-             }
--            # must protect unescaped "$" and "@" symbols, and "\" at end of string
--            $tok =~ s{\\(.)|([\$\@]|\\$)}{'\\'.($2 || $1)}sge;
--            # convert C escape sequences (allowed in quoted text)
--            $tok = eval qq{"$tok"};
-+            # convert C escape sequences, allowed in quoted text
-+            # (note: this only converts a few of them!)
-+            my %esc = ( a => "\a", b => "\b", f => "\f", n => "\n",
-+                        r => "\r", t => "\t", '"' => '"', '\\' => '\\' );
-+            $tok =~ s/\\(.)/$esc{$1}||'\\'.$1/egs;
-         } else {                # key name
-             pos($$dataPt) = pos($$dataPt) - 1;
-             # allow anything in key but whitespace, braces and double quotes
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index cede6101f646..1b250e792148 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,5 +1,5 @@
 DIST fdk-aac-2.0.1.tar.gz 2865456 BLAKE2B 79c66956b3c43138fb34448398cf104a021757332b2af6d4493bce8c4f9dfdf97a38d1f00c3f1a3f91ffb3b2ce2bb0bdc982e3f92a1ffe7e5f0d1c2f0ef8ca99 SHA512 08209bbd060edafe7b607c9e1394cd03df4f98df6f32b4be21d34d1ab491a7447ed592785546c040126767bd31980121ca6a31aba06eaf90558b14228e302d82
 DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
 EBUILD fdk-aac-2.0.1.ebuild 1328 BLAKE2B c4da80c35ec53c1c0a2bba5fd0dce0c766baed5bc7ce7b2f66b751ba512d21fbcb795a251c35dd4021f7479975253d5959cf8c49f133a0d5b4ca566f8c84c0d5 SHA512 eef06746f316d6e4e4e50ec17c242ce0eebdc04458747810fcb543749587e96e8534916998a8060f5c07d132c0c10d3d3647355d75431590708ab1cd563c5b34
-EBUILD fdk-aac-2.0.2.ebuild 1334 BLAKE2B f510ecb0acda1e90c1a508eb0812df2f1b18949c3033075bf871b684d68d42f6533f0b2000697caa481aeb9f424e2a928c553738e9ac59630f6f794a2c42e70c SHA512 4eb6135ff5e16a25fa741d1b59f3e5c426a3dfd1a7217f1b8ba0f3b88904ba4d4c6688b9c4c2f1353e229ead7dc068521699a2f5837b81867c2d7fcdc686336d
+EBUILD fdk-aac-2.0.2.ebuild 1328 BLAKE2B 53645e3a1085a5a9ac932600bf744b5a2c6964e51dc45fab1c2cefe50e101ace619deb7cc5cd1c55148611362e7290527d925ad03d0b7766beb476a85f6c089b SHA512 959b4333e726e664005cd5ed920eab51de7966197eaf0e02361c3498ebdb4a90f7ce48a092b8c24a75c3202fac61372cbbbbd133a6351ea80f0063900da6e362
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
index 01bbf0f08671..b003c4ad8fd4 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index dfc0ebc29bcc..df0fb0f0915a 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,4 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
-EBUILD ffmpegsource-2.23.ebuild 876 BLAKE2B dddd6ad5f8bd985620cc5cfe8433accde80b0d57548f4f07ac788d9d5de80423d43ddba3d7bd1027072b3664dd3eca72622fa0d6fbe02cd2dbff27eeb68ebb4b SHA512 2cfc73bae2563d4ec371bbc7d409230032ee978eff2dd99c40e7f1d5465d6dbdf4e3344d3d6253cc9261d83a54fb8db20bedc047b3f265ae885235203c23ff6e
-EBUILD ffmpegsource-9999.ebuild 863 BLAKE2B 537818ad3e594165ce3fa47c920379daeb87bea57663ab9080b6ca568c20cbe113971388075a0b0e01142fe448329c2333340ad3fe222b83153aaa27fbd5e970 SHA512 a824cb96fcb29e2d23de0d3c97e85199d3cf42aea540c1e4dc473b8e30bc860711a799456895a0cc55f763201ed029f16e844bfc9827bb1d8c0a2286938f6f54
+EBUILD ffmpegsource-2.23.ebuild 889 BLAKE2B d78b543265e46b59372205fe536cfbb6bb89241b50e5398b3791f118bdbed7785441f26da0343ce312a8c07026b1744030a0e8cb37ff423e3812ea2ca69d6837 SHA512 c5383f24b5aa3e15099986b01923b979c627a12e970706e1d86da64c71e7bbf57487dfd894ce753b102d79bc7b475b26eb85a1570df478e64221d139cba11b9f
+EBUILD ffmpegsource-9999.ebuild 876 BLAKE2B 0795f81616af113fb5e6851e6ccf4178970f7da7c49989297a793947110da244eccbb6e11730f1d8c17e333aa676aeafb9058fef0d03931dfc7b0eba2210430d SHA512 6ecf74c9b62a4b8c126fff5cdf11a2bc35ed36dff04325412f9b05b965bc8970072766b0dca14b5a78843e266438f6aa14877ee0d7db1535cfae5cc31fc1bf60
 MISC metadata.xml 308 BLAKE2B f8a202e4bf52b16aa495c09b7ab1341093f2bceccc0c5316b77897de97c6896720cdfebfe6078e6aa92f38624ad69070cc478c8c40cd55bb57494ddb7eb9b8a5 SHA512 7ba87927b0f446e7b47a677003380bdf9d75ada3dde1aa363f842efedc48bfaa833c5dad62ebb3a678acafd9dfb814f261beabcee6262f4b2fbbd65044951527
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index 9d58b1388ee8..4356ad9fb866 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic ltprune vcs-snapshot
+inherit autotools flag-o-matic vcs-snapshot
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
 HOMEPAGE="https://github.com/FFMS/ffms2"
@@ -42,5 +42,5 @@ src_prepare() {
 
 src_install() {
 	default_src_install
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
index 7fc91742a422..6393bcca9c70 100644
--- a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic git-r3 ltprune
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
 HOMEPAGE="https://github.com/FFMS/ffms2"
@@ -43,5 +43,5 @@ src_prepare() {
 
 src_install() {
 	default_src_install
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index c367d1612e43..9208a92b327c 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 960 BLAKE2B 75484ae600157cd48ea10e62fa7f2d9e8b2d5d23ecc0b3d4ee0e01bc29181b7cb8ff4106a3f2a7e8f0acf3a94ee199f7332ce49628cd4d2a1a14907547c71ca6 SHA512 37e92f60b0f347206d0ef04035aaa213badb77a7a65ce9b990714ff284ea1579f10c92fb7f9d6f50f54f7d67c024bd0337864e0fccc60a24cccefe0d949bf79e
+EBUILD flickcurl-1.26.ebuild 973 BLAKE2B 040d72cb444e60ad355b53853153dc62748b325dadc1e8a28588357bad6c049d61b7dd4c3cc7ba79a7bdf5e0f908b8d655ca8495f7e39da67b1216287688482a SHA512 0ac4bee946c40bdd6935c6b1c822401ab26fb6ff749f97408e776683db626fdf719aa015b30520533f88a2cd0824253770ab5a499626bd79164ff3e96bbdc0f3
 MISC metadata.xml 352 BLAKE2B b6f3d74efcfaf4e6dcfbaa16d9d85cec8969314e8cbb35803b8b47d2767ec8f5270377a4168a0142b1d19be15f46103bc6aff5b61d3529903b8bb694995b53c4 SHA512 70c66b003401b481e348eb3d94d9d6ac1d3961b1fb4e8a964b93dbf6806ac9f888076b8b3de5f0b5905d1185c044a078b0510377087056e1c3c9957ec58874ed
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index 8df4de7f976c..ae2503f8cd35 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="C library for the Flickr API"
 HOMEPAGE="http://librdf.org/flickcurl/"
@@ -40,5 +40,5 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" TARGET_DIR=/usr/share/doc/${PF}/html install
 	dodoc AUTHORS ChangeLog NEWS README
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 905bc67dfdd7..dfa52e0b94c4 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1240 BLAKE2B 9d193145a5da5afa2517a445b2061c1c51077fabf3f3ee7c6176dbfbbbc6164d336981e00efd7bc838391e81680f470a138443351775c85594a2af6cfa46871b SHA512 6e84d20a0fe8eda1b9c6485ebb2cb1760e863c89d45340566144da0236e8f4ff4f5c07042fb04b968fbddc9b507ebc64fd4d90b1c83d701949a718ad8b1bee94
+EBUILD ftgl-2.1.3_rc5.ebuild 1247 BLAKE2B 4a6145a0445a4c1c24c90306b03c1ef3e566c0ad0062918a9c5f0b5d000707e0a45c38e74baf4afeee124d80c8d36e2c9ba72c7d62a8eec02760d451a56eb931 SHA512 ca734a3990c294824434fd834bfeb2419390829db9bd580d212ecbb331378f533f13250f07bcee19b066bc92aca28e0ba9c1eed9e902283c04f31a5e28bfaf8b
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index d0df3131095d..8d9baca0cd07 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 188e45843870..4e3d438264b4 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,5 +6,5 @@ DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200c
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
 EBUILD gd-2.3.0.ebuild 2562 BLAKE2B 439023b5e0794151ac045b0fc9e7686db50b71044e7866c65a756398720473cb9c887a7323ac9914e2ff3c4339d4055af4b0100b3ab7ee9f6e3319b6169b4c81 SHA512 401ae121978ea066367e26dfbfeaa6ca98588830b60f7f0ba89c0aa95be486811f91a33c3c6922d34adf1ef1b8ca82b3df688d546760e2e91c03a1e2e29cff72
 EBUILD gd-2.3.1.ebuild 2474 BLAKE2B 330a280915eec3c018663ce118d62e6bec06d22b9e6bf99c873af74e2362451a7b1bbc2cb63401d805ad2230d94a9f93688d3269a25204e77d0c47330e22d230 SHA512 959c4948cd62837b7000f733d64575ad624bf316c0ce628eb4e1f1171d1096f303dd04c1928679a9cda2769eae71f34214a7ce4dabc67bdbcd4498c03a2a3c01
-EBUILD gd-2.3.2.ebuild 2633 BLAKE2B 6a1123155f400e9b9837b64d79f56e7bdbb5a50b11bf766ead068a8deb6274e52e23f08b6cb9243228f2333e18358332f7dcb240b4f71a928ec026b81e457478 SHA512 992ac0958f5545514deab7e9663529f747a96d7448f41cdd15766002da5af9a1636d521aed7c04508d9e0763e726a0d3561fc1a23918847218049b71792e9724
+EBUILD gd-2.3.2.ebuild 2632 BLAKE2B 00259cc220afdca4216f75ed8163831d976639d6fd4c5f3646a377ce1ff839eb55170ad3dfbd054a130f0ee3012ef7e62f1eed8011e3da744fb85bde2c762227 SHA512 d3342405cad963891c7e963e5f3de8eac4e95b94a8288f01bd84c9e156c7cfb883c04a41faf651ba11921041da347fe3326db76a0f6de9ba1314af070d961c9f
 MISC metadata.xml 1636 BLAKE2B 2f70829e07669f433893a7ecd5dc7097e3ca80c6d86ef018823723601228d5960ea4c4bf97635107306e1e0fa401c593374a3a5514b645211c05bae253a95511 SHA512 5ed6fa619ad40835ae21266222975283322ca6092f8a5ad71258f48e012fb6537b44da2aa6ea07b92043dd5fc252239af5b51f558ddb69d7f6ce1cb667bc223d
diff --git a/media-libs/gd/gd-2.3.2.ebuild b/media-libs/gd/gd-2.3.2.ebuild
index 2da3de419186..1bdcdb7031f1 100644
--- a/media-libs/gd/gd-2.3.2.ebuild
+++ b/media-libs/gd/gd-2.3.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 1309d3a29541..575edf3b0e56 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,5 +1,3 @@
-DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
 DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
-EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B f9ee602000fffb2fb5a7da96a8387abe8c5fd20349886197a88b254e43364c45ea0f66c295cb65ce77358338fd805959681bb4c175b837b1deb95427ebcee9fe SHA512 9ca34e4290ad103f6cea1769cf24dfd8df0c74c92a7d50e27e7703d02c09b990a405577cb1237b451ddb4c82761fe6e1a1e2c90719cbf3d369d9dcb35a66de49
-EBUILD gexiv2-0.12.2.ebuild 1792 BLAKE2B a540a47d039ee90ade227d35ce223de1845d13bab3de1252297d62deae99cd246ed6af9b0fc7b2e87e065d19a73725a26de9f1e1153b0f3031fd287d1283e7cb SHA512 c55a23c4286b4bd7d56bb3a99cd2be756bc7d70251cd967c868e636bfecf5f9d71e575cf915d449444556dc9796a3c64ea7f00a9d829f437c64abbad6e63faa4
+EBUILD gexiv2-0.12.2.ebuild 1785 BLAKE2B 010f63ae0f15c41e75c7ba0af5381c3c210945dae013926ff72fe41164a42b720d977c2ff584a2bf3a905effbfbd1670d5e6c1008df65a9e38de4fc8304694ae SHA512 44978f5eb7e14739e0b034f5d13d5e7b0e72d19a9a878ad8a897f53af8c118a52c83525b676b16f070cdc789cd012dab530e54919699bac29052bab8b1eec0a2
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
deleted file mode 100644
index fbd0995eab93..000000000000
--- a/media-libs/gexiv2/gexiv2-0.12.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=media-gfx/exiv2-0.26:=
-	>=dev-libs/glib-2.46.0:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? ( media-gfx/exiv2[xmp] )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
-		# Prevents installation of python modules (uses install_data from meson
-		# which does not optimize the modules)
-		-Dpython2_girdir=no
-		-Dpython3_girdir=no
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.2.ebuild b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
index 54ea8224ebf4..560f1f1b92b1 100644
--- a/media-libs/gexiv2/gexiv2-0.12.2.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"
diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
index 9a543b9317ef..d7de14736837 100644
--- a/media-libs/gmtk/Manifest
+++ b/media-libs/gmtk/Manifest
@@ -1,3 +1,3 @@
 DIST gmtk-1.0.9.tar.gz 411609 BLAKE2B 6c5c7b3390a3d7ab6593484247447f1016475b5f785cb7cf77810aac37034ce704286e9512cc5d091a04ae6362f8a0634db21599ff6bb78141aa3c5a5405db9d SHA512 61da4bbba5b74510c5ad5d6b5e10606fb99f54732cf412aa6245add2dc2b0df12b75e4e6f1474b4cab0541063ba6f95893e366f1c8b52a055521b667c182dcdf
-EBUILD gmtk-1.0.9.ebuild 1009 BLAKE2B 3277bb3ed10993193dc9078a9b8303dd076013e41d2215e07630ff5ead8044c7a063875c5c32f4535e0919bfd6e6df3b8fbced316e123a503620519389e85e95 SHA512 b73b59913ae67befc9f44d5b6bd2d73b4adb00a77e15cd80322acc63f00ce7d1bff3b4b158512ac113e53b984799e594e95987f03afd578ae449febcfeb07526
+EBUILD gmtk-1.0.9.ebuild 1014 BLAKE2B 7bb5ef24e115520f8e2d56199f65dbcbb190328f47d8c9f568f5399b9bf206367e332b094dea50b714af59e13a315e1923f27ad026f939582686cfe43108e9a7 SHA512 470288647b145c81d6b60363991c0f321fc13e43087e8e6d8744dc0e77ad1d75722c4360aa59a909f8d1f1b9c868e9489058611930edc1808cb8979c68032430
 MISC metadata.xml 321 BLAKE2B 9ee0f6f0335977fcf934de319b5c6b43c490de8c6e2e84563e962f10bf781186b04a1db77d420f2c13782723eec266b1b150b2bf72d96c55edc5aee6b4b5aa88 SHA512 e89aecb354cbcd3e1df953d02b20ade390b417179779efc7f8e5d3753a583502bb87637f26b205c883abbfca8022fe4f9119e7129f2599aaf5a434e974bc8247
diff --git a/media-libs/gmtk/gmtk-1.0.9.ebuild b/media-libs/gmtk/gmtk-1.0.9.ebuild
index 5d4b524780fc..60068053a53e 100644
--- a/media-libs/gmtk/gmtk-1.0.9.ebuild
+++ b/media-libs/gmtk/gmtk-1.0.9.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit ltprune
 
 DESCRIPTION="GTK+ widget and function libraries for gnome-mplayer"
 HOMEPAGE="https://code.google.com/p/gmtk/"
@@ -43,5 +42,5 @@ src_install() {
 	default
 
 	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/gnonlin/Manifest b/media-libs/gnonlin/Manifest
index 2e427bc0e98d..7d51eca5d947 100644
--- a/media-libs/gnonlin/Manifest
+++ b/media-libs/gnonlin/Manifest
@@ -1,3 +1,3 @@
 DIST gnonlin-1.4.0.tar.xz 404096 BLAKE2B 858f6813470893dfdd9c92d8ea84d11c511e92033588e9de2e849806727b80b9be84f0fa08265f5cd98bd701108c18f3f4fc423cc74aa4426cd2e221222a1443 SHA512 22734a8cbc648811467a3a161fdf86997fff682007b57849b253618663d30996a787734df8caff56f0b4b24e98f8cbd073d4c48557b8d09091ab27b72851b055
-EBUILD gnonlin-1.4.0-r1.ebuild 795 BLAKE2B 37bd77a1e0b29c8faaed43dd1aa3b098a6e0217aec3e8c5f78cbf03870886d90ff2db7a860dda30f73c1341705830476f47efae9624106cf9b96b12c6abe32cb SHA512 5ee06b85286e0cf09fa4d1e9207b3a2b8fd141b87f19bd64dbb6b2ad065acaffb601a248261f65febb409ffb75ebc3fd555f9a0f7779a1a72b83b36541029b57
+EBUILD gnonlin-1.4.0-r1.ebuild 798 BLAKE2B 02cd981375995d5303676ca9e7429336e509d75ff56fd2a0246c5b6db171212319f51ad7b1feaa724f738ea159ce0af8b4f6198558b9bf292590cdbb34e74c78 SHA512 bcc428941200d0fdc9694c7a11e49768fc154a53628094a1f3f24f88783f00d7543637c349e17a015044c3f755ca773f335525a8c7e6bc7b64437257111c8f6c
 MISC metadata.xml 343 BLAKE2B e7a78ebbf9982f46574fcfb05d245d073282259fa06d1cf7465c85809adf83aaac6d2a55dd6192afd421e0aed99c0cd02146b86757eb4af5a86033e3aff26d86 SHA512 3cd3d7c9e7c36388ef6b35b3510bcb828975500f4f7aeb113d104b47b644e5c2b902acda6d391ccd51e5452c63a1079a593943455c6f25ae88d1ee240583d5fd
diff --git a/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild b/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
index 9a6106c41735..1439e16f9f35 100644
--- a/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
+++ b/media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune
+inherit eutils
 
 DESCRIPTION="Set of GStreamer elements to ease the creation of non-linear multimedia editors"
 HOMEPAGE="http://gnonlin.sourceforge.net"
@@ -33,5 +33,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 54e42da3836d..6a96c0f93b12 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,3 @@
-DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
 DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
-EBUILD graphene-1.10.2-r1.ebuild 1700 BLAKE2B fd3a7f8f0b1a29113829c80a358b3e37ea268febb1159d89a5c13c2bd7941d93892720aa05a234c342e74de29ad964a34f59c69ece15f1be683480f6afe12eb7 SHA512 4ebde609e453675b004b2a6d75172cb65040e72234fd021853739ee05d2e7a52d1545d0f50dc261e0ae23d5f3f45e942eea156bedbb14a5778596c670847fcc5
-EBUILD graphene-1.10.6.ebuild 1715 BLAKE2B 39b4ec66698dc5dafc94470143325b90c84e779c1db4ece36fde40a4af1aa7ddedb1851f2c899b07a9e52a83897dbdc503aa2511abc6004d005b9fea37022c27 SHA512 85167c061fe4841016c6144afe8c7e9443ecefedb56b2f105c97699543f23b007a0643b6efe7fe05fd2ef1b598ce45549626fa730ab3b30b6ebf1882a8556c7b
+EBUILD graphene-1.10.6.ebuild 1716 BLAKE2B f92409d3e8b8af44476171b046e325bfade4e8808b349206dee1cc4374d3604afc0532ba7e0a4830a146ceede305bde2a58607522c96dcb292054cc436fde449 SHA512 b5eac806ceaecb9c13499456fae92be0d4a48ddd8941de973972bb4d32b3711e6ebe2d5ae643531f6f0671433fabe7ede95c4596e3e14292a906da46395425d5
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.2-r1.ebuild b/media-libs/graphene/graphene-1.10.2-r1.ebuild
deleted file mode 100644
index cc8be3fb7ec1..000000000000
--- a/media-libs/graphene/graphene-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit xdg-utils meson multilib-minimal python-any-r1
-
-DESCRIPTION="A thin layer of types for graphic libraries"
-HOMEPAGE="https://ebassi.github.io/graphene/"
-SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
-	local emesonargs=(
-		-Dgtk_doc=$(multilib_native_usex doc true false)
-		-Dgobject_types=true
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		$(meson_use cpu_flags_arm_neon arm_neon)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/graphene/graphene-1.10.6.ebuild b/media-libs/graphene/graphene-1.10.6.ebuild
index 74cf717498d6..50207695d8cd 100644
--- a/media-libs/graphene/graphene-1.10.6.ebuild
+++ b/media-libs/graphene/graphene-1.10.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 4bcb2428d25e..42fecbf7754e 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
 DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
-EBUILD grilo-0.3.12.ebuild 2177 BLAKE2B 83c6a3c6ef688d089661f0c57b84f886746411dab7a5b4d1ccd6ef18686f83676b82228aee7a9eaae30292afec7d83b66bc5f67413432cf707306f5eda1368b3 SHA512 c6a49bd755af487c317d9177a914e029b3945f1cea6439cf40473219373a9e06bdc22afed9c03ff7362536e15f8e0698abe73c304e27adf4a8c4248882f2c94b
-EBUILD grilo-0.3.13.ebuild 2164 BLAKE2B a410bc714f34ad9b0c7eeaee99c71ee6d2caaa141e5a3ad6edd8ca4b0839d7c29dea01d42de8f64b2eb32250bac1321386871dfb855d8dfc55f7b94c36027578 SHA512 0be573f9c1e45900f0aeb58f98548a003d5a820f21a015c411e1ef121194f023a7f4a02768a54486b7ca7a41398cab74f463dda24d81f738d72e897d9b644df4
-MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
+EBUILD grilo-0.3.13.ebuild 2161 BLAKE2B 372b97addf0c555d9b70e727439a8cc5ba88e2ff5104b018baac33caab68429b0d2dd700309560f32db934f7e69e1a488d504629e936693372e100f3e1c8f8c0 SHA512 16bc78c6094e06f80c219b0b7c6252f34052de9e6984b28b4f110c93db58f78f5e17501b9cca5f476f93b8e90074ee5ad3e6ec3b103baa96d964ce8a08ec6963
+MISC metadata.xml 619 BLAKE2B 53795b955d3e86349c48e0856af7556c4b03bfce27a6b90d963aecb62860e80463639a9235dcf5efa853b11cbcf40f2800a648d4130cf227ad68c469967e6c8e SHA512 515a4711a98f422e49e6c7204b3d07b7c8828303109b3dbd7f4fdaabe9142f769edf515a98f6fdf9560fecb930510d7ca84b729d01d7877a800d20ccb004fe5d
diff --git a/media-libs/grilo/grilo-0.3.12.ebuild b/media-libs/grilo/grilo-0.3.12.ebuild
deleted file mode 100644
index 193083ae03d8..000000000000
--- a/media-libs/grilo/grilo-0.3.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +network +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
-	gtk? (
-		net-libs/liboauth
-		>=x11-libs/gtk+-3.14:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	${PYTHON_DEPS}
-	test? ( sys-apps/dbus )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
-	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
-	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
-	# Drop explicit unversioned vapigen check
-	sed -i -e "/find_program.*vapigen/d" meson.build || die
-
-	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
-	sed -i -e "/subdir('examples')/d" meson.build || die
-
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use network enable-grl-net)
-		$(meson_use playlist enable-grl-pls)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk enable-test-ui)
-		$(meson_use vala enable-vala)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
index 954cedfd8939..19e4c81586de 100644
--- a/media-libs/grilo/grilo-0.3.13.ebuild
+++ b/media-libs/grilo/grilo-0.3.13.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index bbc62e48bcf9..c1193dfddabb 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="network">Enable network access for media discovery using
-			<pkg>net-libs/libsoup</pkg></flag>
 		<flag name="playlist">Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
 	</use>
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 1c0799371155..aa8ba0ce5633 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
+DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
-MISC metadata.xml 345 BLAKE2B 2350705c0853758df34ef4e9217585b367adfa6f7a166e884c3e40a10cb2917b6c10dcc4438f41cd404337f70a9438114cfe7f301848637dddff626d8c25449e SHA512 26921a7928b3d70098a9f9d36c3f211a6e96df6ca42473ba98e083a52b2f9ab00a71336c0298751b9b46198f2277dada4db8097c0a4b09850e5ecd1a15db5436
+EBUILD gst-plugins-bad-1.18.4.ebuild 2283 BLAKE2B e8b5e6a9e096ca4a80b2b4528e7039eff1c9452028b40940afdd3f2761a5b444c80f25553a88f9ece038b305ec03f3d7652848edbf5d65aa2c7e959c1e80d197 SHA512 7172d2c14973d58c169d2b6a9ce58111a5af2cd70007fff14421b4b316139a2009bf6484d858ea4e55ab53fa06806f810de208ff7110ed26120e62f546c7b0a6
+MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
new file mode 100644
index 000000000000..7e613b0fa6d4
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature vnc librfb)
+
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		myconf+=( -Dgl=enabled )
+	else
+		myconf+=( -Dgl=disabled )
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index ad9bf185482b..c51baf610a15 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="bzip2">Enable bzip2 encoder/decoder plugin</flag>
+		<flag name="egl">Enable EGL support</flag>
+		<flag name="gles2">Enable GLES2 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index a0a1f01b07d0..784a28ea7fca 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
-EBUILD gst-plugins-base-1.16.3.ebuild 5947 BLAKE2B 1bf307a244a86a2a2a5b6d4111aa27fcba696e56641840ea9397b428591f7c074d2c0f040fcf2ef28b14e88ad0dbebcfe8d444626e51643b0eb5806b9c27b808 SHA512 4107099a70c8a65a611ec9345caeca037d37405c812a53b483c31f8af2803fb765e3e460dcd18a39bf0cebbf2d1e34a19677f4e390d481259ee11ace0dc3fa79
+DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
+EBUILD gst-plugins-base-1.16.3.ebuild 5954 BLAKE2B 744b3bec6a4d7b6c1ad44276a6641ae960b21d3ee3b5be92a739f0798ff468564a2e776f135e16c67be42d325d6ce2806ffbce6a24b477f27bfbd50b24127006 SHA512 9ec447c3176369f521829a3b2882f73f579f1b608c4bb3c54eb9d290f9200b39f0679ab4ec5ec8d2180821f55efe7c4d89132fe7c968a51b6f1457051a3cd2ca
+EBUILD gst-plugins-base-1.18.4.ebuild 5524 BLAKE2B bb5274444be74b79b3753f562e20c82523cab2a16590b58cd1ee5526709fed07d0ca9bb0dc0719fc7a1a7f85cf74bfcd6967308187ec85722e067a6c9307fb6c SHA512 6209d47015f5be1528804a81657f7a249da00f9a61a4fb041f63165f7df1c9c017418e6a8d824f3b26dc94a25c9e8769b0f5bd14e13c662f07727087c9a6b5f3
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
index f3b1eed0e260..e80dbeb3b64f 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
new file mode 100644
index 000000000000..0f426cd99d04
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS="AUTHORS NEWS README RELEASE"
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	# opus: split to media-plugins/gst-plugins-opus
+	GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+	local emesonargs=(
+		-Dtools=enabled
+
+		$(meson_feature alsa)
+		$(meson_feature ogg)
+		$(meson_feature orc)
+		$(meson_feature pango)
+		$(meson_feature theora)
+		$(meson_feature vorbis)
+		$(meson_feature X x11)
+		$(meson_feature X xshm)
+		$(meson_feature X xvideo)
+	)
+
+	if use opengl || use gles2; then
+		# because meson doesn't likes extraneous commas
+		local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+		local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+		local gl_winsys=(
+			$(use X && echo x11)
+			$(use wayland && echo wayland)
+			$(use egl && echo egl)
+			$(use gbm && echo gbm)
+		)
+
+		emesonargs+=(
+			-Dgl=enabled
+			-Dgl-graphene=enabled
+			-Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+			-Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+			-Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+		)
+	else
+		emesonargs+=(
+			-Dgl=disabled
+			-Dgl_api=
+			-Dgl_platform=
+			-Dgl_winsys=
+		)
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 9990475d5319..dab4790fc05b 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
+DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-good-1.16.3.ebuild 1407 BLAKE2B 7709616de2741cecd718c6dd6ac66e7f427b4f8ed80b5a07085a3cb5a3e2cfcc0ac36f28adbbb5c6f6f91f0e31768483462c5f390c672311d4f1c7d308dfac86 SHA512 e31d9ff7c2a665942970da87adedcb90ce31c9c8cecba2816af2d5a15edf7b07f0fdbba7b5bd1a0fb0973f2f8f685b64c54981f601927ca8b6b68b672303b8ad
+EBUILD gst-plugins-good-1.18.4.ebuild 1106 BLAKE2B efa4ef9ed14fea51a8db9d61fed87b8042759d4c52e84a84dc750823dddfadf51a588285e2795d9b85d3b720913d243e0be927d9faa0cfeebe0b18bb09bf235c SHA512 892b86f5a09ccaa6ea64ca27aba17c31e225f20dd6e041ca4e520cadddab82493afc877dec633d2769379ffb13599a478438318b598e43ce94db8c75c5ec8ff5
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild
new file mode 100644
index 000000000000..6a038b2e26f4
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="bz2"
+	local emesonargs=(
+		-Dbz2=enabled
+
+		# gst-plugins-ximagesrc
+		-Dximagesrc=disabled
+		-Dximagesrc-xshm=disabled
+		-Dximagesrc-xfixes=disabled
+		-Dximagesrc-xdamage=disabled
+
+		# gst-plugins-v4l2
+		-Dv4l2=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 8954709ac0db..baf8a0b1f03b 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
+DIST gst-plugins-ugly-1.18.4.tar.xz 509920 BLAKE2B a7aec6ac6e5739205c9567072596a8fb6dfcabc2f56ee0800c430c9bfc9549bf7ac75cb65719dadeb84036130d5b58f9be574f2a6531992ee7a8f23e9fb32d16 SHA512 eac02000ac3e0a54a953fe1531cb29bc6bc9913a707d1508905bf64fe0a4ef92f7d01b196259fc217fac8a344f0b2d683dd6d32210ce6b8c0acab08cb3b1322a
 EBUILD gst-plugins-ugly-1.16.3.ebuild 941 BLAKE2B 2a5e299284a15b210674a41aaa998b46bc607aafed4915fb29ae253ba92840977a74211ec80fc529dd706a6de03aedc9d4a81f8342df3cd5064120130a024bcd SHA512 11e3fc097a2fe4dbf114c5ab80678144b9d3f3b7e7b35ac688d30829a63e3057de7fe82a51f716f87023ac2ccae81b65c8920bb9a33e899371154498edd59cab
+EBUILD gst-plugins-ugly-1.18.4.ebuild 700 BLAKE2B 155f419ad5c3abcd4675b5e55ca42b14bea0ffa6b5e1b1806682d67717534076589d77085e92ff0728796a6d64f4daaf8a347483099fc146c6f374dc0e149b23 SHA512 7b8a28f704001c2c07d30ed52497245da06f0a15c3dc962d134c4b03a1c5b69be5680ef901e6e1fc91fdc54fa2e09f1cb265d5b44ebc1c9618bd89da940e6764
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
new file mode 100644
index 000000000000..e04e9a0c5fe4
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 22eddc66eaeb..1e7b07b0d804 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,3 +1,5 @@
 DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701
-EBUILD gst-rtsp-server-1.16.3.ebuild 1969 BLAKE2B 573c21027d9acd09e9b15e086a1909e94e1d281ba1acb2d31612ce101a7a71bad18f943f3be9c2fe71d00c3f866c876cae134c402ec8bd2e775cde0c2d05a4ff SHA512 ceed93d572043b1f6aa49075efebad5e2e15203b6a5ce325264c9df5ab9711089ae212dc8dd933dd26d883ba6c7725fce3ff5363a58c579fe8a4fead42fa1fb1
+DIST gst-rtsp-server-1.18.4.tar.xz 358140 BLAKE2B 3c8dae60742cc35580d5dbb4bbc5175ee93de2d2bb64c0de0dd09df5137b2b1518f6a39a2538d1eca86e8bd756299cada6f26ae23f33e1af1d6317e1e30d9d63 SHA512 1cda671f43e608d89aa024a8b4a39cbe1b83e1cd822b1190c777dd18c2000b5c8370e50598821b9c3f348776a418286a26993acf4255c6ff488682e0addeefab
+EBUILD gst-rtsp-server-1.16.3.ebuild 1948 BLAKE2B 930640db6ad1288e443cc65333f9c84b175bc8bec63afd89fc947fc58737377db32c904fa427fce3b876b207ef33db73ad00d7b49726eb78b6ccedda0ae96485 SHA512 5850334f33b39fe3bbed46f48beecbecb604873d7751aaf570b0faf286b81e80027a2afa1ef1c76bac8851c6eac58b62be932d283a3145a1cb3e210c329b4a12
+EBUILD gst-rtsp-server-1.18.4.ebuild 1248 BLAKE2B 568b8a4d85963148b1621daab81984f7e5bceeebf36e2f3eacaa052427ea957535a81f9fc8a75a89bd177b97bcc6ffd685897a82fccd47d4844c461544752563 SHA512 7d0bf501f0200c23b6cef25f17ba6b79deeef089bb2093c8df94e6affe025abe44d52339115f02f55ee975677de8086150475496686c2320ec18d09dc7fc911c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
index 9eb60c01a7a8..ff4af3a6f2ce 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
@@ -63,7 +63,7 @@ multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 
 	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
+		docinto examples
+		dodoc "${S}"/examples/*.c
 	fi
 }
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.4.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.4.ebuild
new file mode 100644
index 000000000000..faa449451a40
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index d6861c2571ef..72c10c2c83dc 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
-EBUILD gstreamer-1.16.3.ebuild 2847 BLAKE2B 95b0b9dadc8f8fb3eaee2b00e973fef51cfdfcab1abe841407b0bf1296e19cf18f827f9695da188067ea49a7a589c9045a285e13aca5533ac977186e3a87e3ca SHA512 ff18be2a9d99fced7226cf997411b94bea35bf6cfe7023f615c39229aa09530be8abca7fe5905ea2fcf6ee8b263986fc231ab32f7f2b4a4840b671b92d9e22f5
+DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
+EBUILD gstreamer-1.16.3.ebuild 2854 BLAKE2B a573111c26ab04f84025d4a83e7c8f4827fec79d0e8e21b92f1fe6851c97f11b1267b0ed7baff1a910ca644fde428bc1cf3f3396aca689f0e74c721b47ac4843 SHA512 a2d2b8a8ffd4d1772c54bf1571748d0cf2150fab5442081f39de141ceaf7d5c0c17db70a2e889ba51d33586716c7ed9d0e66d0d217807ebf42ae9c39ae16a05b
+EBUILD gstreamer-1.18.4.ebuild 1922 BLAKE2B f3e4ec09155b677dce89b6a39220380f7bf0cf04fd1da86e13aa9738ed1c3078e4203173163cac4a7e04b514d59bee3a23f7902d4adaf7c9a2cb901e17dc0afb SHA512 105cdbf7d06e5ed35f2def0f8be2cf7753bf83deafdb1735b770f0531b96e9887d664bbf333d49cb85ffa35205d23f0c1c46aa8c188dba6b76c111540c4b5580
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.3.ebuild b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
index f226c18f1622..1d40ac0049c3 100644
--- a/media-libs/gstreamer/gstreamer-1.16.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
new file mode 100644
index 000000000000..02d997439af9
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		-Dcheck=enabled
+		$(meson_feature unwind libunwind)
+		$(meson_feature unwind libdw)
+	)
+
+	if use caps ; then
+		emesonargs+=( -Dptp-helper-permissions=capabilities )
+	else
+		emesonargs+=(
+			-Dptp-helper-permissions=setuid-root
+			-Dptp-helper-setuid-user=nobody
+			-Dptp-helper-setuid-group=nobody
+		)
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	DESTDIR="${D}" eninja install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 446228cd1e5c..3d64c0a5918d 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,6 +1,3 @@
-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.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
-EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B fc8447042f8dfdaaf44a3a41bb6d0421fe16d6e7931d3f45bf2e583e1b086d4df69fc13eb2f936d736ba9099eaee3a3c1c83b6e61d91e05e1f5c85810edb65f9 SHA512 bdc9205557895c1b91ac3cdd740ac558f6e5b665f863e362c24a1cfa54770c631c8c469f9c70f466753a426aca4f1d873ac2c6a5b7244eaf6d9a5103814b99e7
 EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/files/hamlib-3.3-format-security.patch b/media-libs/hamlib/files/hamlib-3.3-format-security.patch
deleted file mode 100644
index bbf2de1d17d5..000000000000
--- a/media-libs/hamlib/files/hamlib-3.3-format-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fixes build error with format-securety (bug #714682)
-diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
-index 44308cc..aab1300 100644
---- a/tests/rotctl_parse.c
-+++ b/tests/rotctl_parse.c
-@@ -1009,7 +1009,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc)
-             /* The starting position of the source string is the first
-              * character past the initial '\'.
-              */
--            snprintf(cmd_name, sizeof(cmd_name), parsed_input[0] + 1);
-+            snprintf(cmd_name, sizeof(cmd_name), "%s", parsed_input[0] + 1);
- 
-             /* Sanity check as valid multiple character commands consist of
-              * alpha-numeric characters and the underscore ('_') character.
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
deleted file mode 100644
index 556650e66628..000000000000
--- a/media-libs/hamlib/hamlib-3.3-r1.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_{7..9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
-SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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 3ea18644b586..6ab12a4b9886 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,6 +3,6 @@ DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193add
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
 EBUILD harfbuzz-2.7.4.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
 EBUILD harfbuzz-2.8.0.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
-EBUILD harfbuzz-2.8.1.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
+EBUILD harfbuzz-2.8.1.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
 EBUILD harfbuzz-9999.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index 48efc9f4fcbc..faa0655ca207 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index e31e6f7fce26..f72023e70c59 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,5 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
 DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
 EBUILD imlib2-1.6.1.ebuild 2266 BLAKE2B c9517679b79b2faff8c2da3fec6e5113c5ed1b83303ffcf4e71c0084b60bca13a29f2a913d1cd9911d0f27e1c431bcd5204688e83710bfe9a26c27792f96907d SHA512 5a2a8c8d0858da0617cfe7814e7ae15fdae1a733ed71da6230c197bc47cf2fbf915e38b21296b49414a27f374209175a9465db6f44542eacaf131c1a9007b1f2
-EBUILD imlib2-1.7.1.ebuild 2274 BLAKE2B 1ed206c08e47ee8221f809afdcbdf3771536f732436968f7084c15f97f10bc0858e08aa2a38084e2d33f34747e9bb0e44a2c5321ecd3139c5683c77d6222890d SHA512 7568e4b5ed75184c64da376377a736420f311ffbec252081f14be3bdeee62f64314a7a9932ecf4741ae014eeac313b4f73c8c792fbfac39c25d871939d10350a
+EBUILD imlib2-1.7.1.ebuild 2281 BLAKE2B 4c34fcb8a62d39e693a42689814862e2bac0c118de8b1068555867b1842a93352c8fe102af440725c91878dddf4ae2a0d671bb8a2eeabf131d7b9fbf0a0a7960 SHA512 6f523f75084ff3e34430f583ea3475ed55a484cfb066b6960e4afc6ed4c543d4e9ef2dce93da6740cdfbc28425c142cdc7911d56d279d14af98bcb3c1676dc85
 MISC metadata.xml 3007 BLAKE2B df2f5a1a31aaf3f2a9535869ce159ba896d0a2f6c4b079815e08cb61444889627463663eb0226929c7f9cbc081b44aed251de5feefa2e33306ea3daf6aff987b SHA512 773c6756e2fd5bfd63a47bfa702f306e20d12f368fd6f675cd0df835783db934608052426ab2cfd11f3cafc52c2e5be911b37367283f686a85c2edae49ca0274
diff --git a/media-libs/imlib2/imlib2-1.7.1.ebuild b/media-libs/imlib2/imlib2-1.7.1.ebuild
index 4817a18e5c5a..43edfbcfb140 100644
--- a/media-libs/imlib2/imlib2-1.7.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
 	static-libs +tiff +webp zlib"
 
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 649a56885698..a5d7a9dad621 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,5 +1,5 @@
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
 EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178
-EBUILD lcms-2.12.ebuild 1236 BLAKE2B 9c1265e1ec4d784539c3a82f582fc0ea324a98d548f106a27196cc8d6c2e575a7e6f68eaeb298460696c25625be28fba260aa0c6da232455b441bd40a4dab310 SHA512 dda347aa717613fe1ef27f936db32d1853a00ba77a39a969123ace9c425fcaa087d31b748cbd5abb1fb2da95e4699ec075115df704afc4f71a817f9e6302d4d9
+EBUILD lcms-2.12.ebuild 1283 BLAKE2B 4491db59f78ff4242cb145e0013a08d004cdacfeb16d382869f26696649adca511cd6979914b6e56948352dca7811983161136c1bfad99ae6e592f7c9713a003 SHA512 93052efb79a9102e2558a83c289aecf88c519a233cf6c7cc436aed8e2055b5e8fd858403244691293e778f892458e9e475ca5bcabc8531856c56edad391b96f3
 MISC metadata.xml 464 BLAKE2B 83de84dcbe1b9e2997c7334eb55ae601e80a4cbb8c1fd0e5f5fb5c95470354d1657d8c5fe6f5b895a6071e39bcaefe4d3216385ad70ed6e42ac58a90bd5f33b8 SHA512 c63a193bf5607356c0d48e4e840355553f4fcd61f7d1269e7cf6cb198d462b786777ef46dd1e07c8edff0ea5311c42b3e5a2c8e709adb3e0b40dd538d7f3a60d
diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
index e16e0d022282..0d89a0d3b270 100644
--- a/media-libs/lcms/lcms-2.12.ebuild
+++ b/media-libs/lcms/lcms-2.12.ebuild
@@ -21,12 +21,15 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	elibtoolize  # for Prefix/Solaris
+
+	# for Prefix/Solaris
+	elibtoolize
 }
 
 multilib_src_configure() {
@@ -37,6 +40,7 @@ multilib_src_configure() {
 		$(use_with tiff)
 		$(use_with zlib)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 96240bc4c9a5..3ed90f329bcd 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,3 @@
-AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
-DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-EBUILD leptonica-1.74.4.ebuild 1739 BLAKE2B fdd42c8ae0e6c59a9892c1d4e761a00f4f5e353fe904dbcf624eb14c5d1fe72f57668078e01524ea8a549348a6e022a5c93324836d0ea85bc89fb14afdfbe5fa SHA512 206dbadf6ffbd98c47cec1eb49b80dbc0fea5b91b7a036966ae3ebd21eda1a6decfc804008f1163c10156c59ca7e8abfa777e85b9c1f6ccdac73920379526078
-EBUILD leptonica-1.80.0.ebuild 2018 BLAKE2B 1ee023027c04abf35ea7108aee366b0ffb491a0eea9c98297dabcef9a83a33890588f038919d49402ea84c4d974398831521b41ef39e69306d8596c4c15fa457 SHA512 9fec7391ba7b2302ebb42e41f0b49b4371ac25793a7095709860bd1304d264b7da3757f87f985599f8168296cf2a9cda2b5507669acab74db44b117b24200fe6
+EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/baseline_reg.patch b/media-libs/leptonica/files/baseline_reg.patch
deleted file mode 100644
index 9ff7fe7da45b..000000000000
--- a/media-libs/leptonica/files/baseline_reg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From eab13986198098688fdeb60c3c87f77df32eace8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Sat, 15 Jul 2017 12:06:32 +0100
-Subject: [PATCH] Add baseline_reg to gnuplot-dependent test list
-
----
- prog/reg_wrapper.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index 0947990..2845077 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
- 
- case "${TEST_NAME}" in
--    colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
-+    baseline|colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
-         which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
- esac
- 
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
deleted file mode 100644
index 5b4df59969af..000000000000
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-
-DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/baseline_reg.patch )
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
-	default
-
-	# unhtmlize docs
-	local X
-	for X in ${DOCS[@]}; do
-		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
-			"${X}.html" > "${X}" || die 'awk failed'
-		rm -f -- "${X}.html"
-	done
-}
-
-multilib_src_configure() {
-	econf \
-		--enable-shared \
-		$(use_with gif giflib) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k libopenjpeg) \
-		$(use_with png libpng) \
-		$(use_with tiff libtiff) \
-		$(use_with webp libwebp) \
-		$(use_with zlib) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils programs)
-}
-
-src_install() {
-	multilib-minimal_src_install
-	prune_libtool_files
-}
diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild b/media-libs/leptonica/leptonica-1.80.0.ebuild
index ee995cad6cf1..ef081d205e74 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -8,28 +8,29 @@ inherit libtool multilib-minimal
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://www.leptonica.org/"
 SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0/5"
 KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+RDEPEND="
+	gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	png? (
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	)
 	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
 	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-
 DEPEND="${RDEPEND}
 	test? ( media-libs/tiff:0[zlib] )"
 
-ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 
 src_prepare() {
@@ -46,7 +47,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--enable-shared \
 		$(use_with gif giflib) \
 		$(use_with jpeg) \
@@ -69,6 +70,8 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	# libtool archives covered by pkg-config.
-	find "${D}" -name "*.la" -delete || die
+	einstalldocs
+
+	# libtool archives covered by pkg-config
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 840449c6d1da..dff15be53515 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,11 +1,5 @@
-AUX lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1047 BLAKE2B 9c3e11728a7edba3d3e872361d587b4442fe7324d23ce4b2358017ba860e6395c2b0a1d0095344d7449227b4659087b72c97811036e2113967d0cb8be35b818d SHA512 3f187fdcc22277756cc1e1bffdff02d998dd7610964f0bac0cbf4c276eb2a2b24175c92471866931283a72e699b4e999732c2f1bbf1c45378720199eb7406fd2
-AUX lib3mf-1.8.1-0002-Add-library-link-dependencies.patch 2567 BLAKE2B 10bae2bc7422bd35b05fcb4c016f9391035baad0ff903b628ce8d6f7e8e2e3f758360306772c6a6603e24ab037d8e98348f616da4dae9b509c2e342697e57801 SHA512 97bef547c3c5e7e25bdec1d5f907852e883b62c6e481659cefb48f3b69f8a26804ff8ee45657349345f3d6e9452251b68043767a44b6ce3b4e759d6ada2c21de
-AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd368f7078d8a7ee06d49fab001b7fdc8969d52ac1e54efd4ef2184c9b8d2947eb5ca2fe77d9a7b6369adca15e9362db09d0c55ee921bef3d04741162f71e SHA512 cf2ebd71308f75a620b9ac7f213e5d794350f9b59f7840fcc5b3a49e20b75cd323fc99a074900d751c81ca86171a5acb29191fa05ebf6c8305b0ee3fd55dae99
-AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7
 AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
 AUX lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch 5462 BLAKE2B 73ebe5037f11673232363ee4ec99aea828b37ea24469ddced15593310e8f7f7806c08bddde40583640471d2566985d5002970dcc6f8f3d64ff369cfe3a3567e7 SHA512 1f5fb5c3b0dd115da478bdcf9c47e9c269c13613604905df8b0a80fccf5b039ee2c1ce0f433c68f783b11e5faf1756fb66772f0e313bdb0ae6af3c2a5cf35ab3
-DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
 DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
-EBUILD lib3mf-1.8.1.ebuild 1082 BLAKE2B 56b7700e947b7ae6c0657e68d62c21ccd9d750695f185d19459ff68f3933285e78f0fb46a6e19dee0908b7a2349df3fb392cb85e23fec07e42c1a67796786f97 SHA512 5ad4a29703d59e659dd8563a3fa31b1fc1224296acf80c997c00aac6148739220d2e786eaff21cef2b6d2b7d61a0e01c4609153b10e239091db5d035213169cc
-EBUILD lib3mf-2.1.1-r1.ebuild 1615 BLAKE2B 6dd77c1d31063c8cc490f63d9e18d275d22b55d097b4850d8bf43a0ea31b1d958c71c8b9e20e4e563433139f689a962e98676845bb71713fc6a39f99f3baa110 SHA512 967b68df018553f947c631a3bc8c36f559aa545379191b536f1e6f9366b14e9ec916fb1b98add4b37d00fb9ec8a949f6e05adcc6c18a03f4713c24d5a85f3ddc
+EBUILD lib3mf-2.1.1-r1.ebuild 1422 BLAKE2B 2a5d1bba2b34e3aba7f8b852ed81af4056247e586ebad940d48cbf07d1b1e28b03ded6ed85c958eba45c0ee7d9b40368c57415c212b51862c92745accdf8e100 SHA512 86bd28c9587a9f081049e0fe839cd39b0dc45b7eb90e87b2494fb4855f27a056ca87b114a730160b16591c63bf75ead6229bd5305bfedb8d38ae21c3d5ce2278
 MISC metadata.xml 935 BLAKE2B e249808fd2905dc9202259b4aa0a557bfa7e04ea13f72b1dcb0d2e6b3b2c6844dd340ed8629fda53b57a0fe2ddbec55a11dc98acb1997015d118a138ffc23796 SHA512 d58e9bb490ee4b3dfa11e18bd2cb5fdc0e581e0786ca9c4435f900bfdd8b2f158cd9dc863edc9b6b4b40c89e279f96b485a4c64589ced5ed475c1ff1f7bec8bf
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch
deleted file mode 100644
index c695283cffbb..000000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d97ad4604af7998541567ec486f90dd528e839b1 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:09:42 +0200
-Subject: [PATCH 1/4] [Gentoo-specific] avoid pre-stripping library
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5453440..c867224 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,7 +104,8 @@ if (UNIX OR MINGW)
- 	# Uncomment the following to but the version info into the .so-file.
- 	SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- 	SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
--	if (NOT APPLE)
-+	# avoid pre-stripping on Gentoo, this is done by emerge
-+	if (NOT APPLE OR (UNIX AND NOT CMAKE_BUILD_TYPE MATCHES "Gentoo"))
- 		SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES LINK_FLAGS -s)
- 	endif()
- 	if (NOT WIN32)
--- 
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch
deleted file mode 100644
index de5331ae66ec..000000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 976f14e1ac26389dbfc04bcffd9f4e7e21197001 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 20:05:16 +0200
-Subject: [PATCH] Add library link dependencies
-
-If USE_INCLUDED_LIBZIP and/or USE_INCLUDED_ZLIB are not set
-add them to target_link_libaries command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt               | 10 +++++++++-
- UnitTests/CPP/CMakeLists.txt | 10 +++++++++-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c867224..df87806 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,7 +130,15 @@ add_library(${PROJECT_NAME} SHARED ${SRCS_MAIN_PLATFORM}
- )
- set(STARTUPPROJECT ${PROJECT_NAME})
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "")
--target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s)
-+if(USE_INCLUDED_LIBZIP AND USE_INCLUDED_ZLIB)
-+	target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s)
-+elseif(USE_INCLUDED_LIBZIP AND NOT USE_INCLUDED_ZLIB)
-+	target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s z)
-+elseif(USE_INCLUDED_ZLIB AND NOT USE_INCLUDED_LIBZIP)
-+	target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s zip)
-+else()
-+	target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s zip z)
-+endif()
- if (UNIX OR MINGW)
- 	# Uncomment the following to but the version info into the .so-file.
- 	SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${BUILD_NUMBER}")
-diff --git a/UnitTests/CPP/CMakeLists.txt b/UnitTests/CPP/CMakeLists.txt
-index 2fdf85d..24d32bf 100644
---- a/UnitTests/CPP/CMakeLists.txt
-+++ b/UnitTests/CPP/CMakeLists.txt
-@@ -22,7 +22,15 @@ if (WIN32)
- endif()
- 
- target_include_directories(${TESTNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include ${gtest_SOURCE_DIR}/include)
--target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main)
-+if(USE_INCLUDED_LIBZIP AND USE_INCLUDED_ZLIB)
-+	target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main)
-+elseif(USE_INCLUDED_LIBZIP AND NOT USE_INCLUDED_ZLIB)
-+	target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main z)
-+elseif(USE_INCLUDED_ZLIB AND NOT USE_INCLUDED_LIBZIP)
-+	target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main zip)
-+else()
-+	target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main zip z)
-+endif()
- add_dependencies(${TESTNAME} ${PROJECT_NAME}_s)
- set_target_properties(${TESTNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/")
- 
--- 
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch
deleted file mode 100644
index 3d79c0d4a4f0..000000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f61a4c09977097b0d456ce9e480c2630b90cdc30 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:16:07 +0200
-Subject: [PATCH 3/4] Change installation include dir to a more specific one.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 6 +++---
- lib3MF.pc.in   | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df87806..3101c65 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,9 +148,9 @@ install(TARGETS ${PROJECT_NAME}
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
--install(DIRECTORY Include/Model DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
--install(DIRECTORY Include/Common DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
--install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+install(DIRECTORY Include/Model DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
-+install(DIRECTORY Include/Common DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
-+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
- 
- #########################################################
- configure_file(lib3MF.pc.in lib3MF.pc @ONLY)
-diff --git a/lib3MF.pc.in b/lib3MF.pc.in
-index 9afb6ee..cf8cafb 100644
---- a/lib3MF.pc.in
-+++ b/lib3MF.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/lib3mf
- 
- Name: @PROJECT_NAME@
- Description: @PROJECT_DESCRIPTION@
--- 
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch
deleted file mode 100644
index edc202e83038..000000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f392342f819b59449228100b7de8c14eda3cc391 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:55:40 +0200
-Subject: [PATCH] [Gentoo-specific] Remove gtest source dir
-
-We use system gtest on Gentoo
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- UnitTests/CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt
-index 59ae773..1212228 100644
---- a/UnitTests/CMakeLists.txt
-+++ b/UnitTests/CMakeLists.txt
-@@ -1,7 +1,5 @@
--ADD_SUBDIRECTORY (googletest EXCLUDE_FROM_ALL)
- enable_testing()
--	
--SET(gtest_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest")
-+
- add_definitions( -DTESTFILESPATH="${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles")
- add_definitions( -DLTESTFILESPATH=L"${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles")
- add_definitions( -DLOUTFILESPATH=L"${CMAKE_BINARY_DIR}/")
-@@ -12,4 +10,4 @@ add_subdirectory(C_Interface)
- # Tests on internal classes of the library
- add_subdirectory(CPP)
- 
--set(STARTUPPROJECT ${STARTUPPROJECT} PARENT_SCOPE)
-\ No newline at end of file
-+set(STARTUPPROJECT ${STARTUPPROJECT} PARENT_SCOPE)
--- 
-2.26.0
-
diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
deleted file mode 100644
index a51555571c7c..000000000000
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch"
-	"${FILESDIR}/${P}-0002-Add-library-link-dependencies.patch"
-	"${FILESDIR}/${P}-0003-Change-installation-include-dir.patch"
-	"${FILESDIR}/${P}-0004-Gentoo-specific-Remove-gtest-source-dir.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB3MF_TESTS=$(usex test)
-		-DUSE_INCLUDED_LIBZIP=OFF
-		-DUSE_INCLUDED_ZLIB=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( CONTRIBUTING.md README.md )
-	use doc && DOCS+=( Lib3MF-1.pdf )
-	cmake_src_install
-}
diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index f2853dab0b21..bae4219d6bb8 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -11,10 +11,6 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-# the included ACT binary is a statically x86_64 built one
-# see https://github.com/3MFConsortium/lib3mf/issues/199
-# Keyword arm64 can be re-added after we have dev-go/act
-# package keyworded
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 4b634473967c..e28eb8bb2db9 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,5 @@
 DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459
 DIST libass-0.15.1.tar.xz 369884 BLAKE2B d5b7a4e474aa847ace6ba36085b7c2ef6de3e70fe00e3ea99be0f6c54d807969d90bb08d651357445e2158b01058f4c2995e1bb1d5f895479cdc0fb67fa3495e SHA512 e5a1cca7a72b21de7da2f83fc46db6b35e822593b67fa16563451f4121965e16e825a1665996a0e6022992e6b0365fc2b9b898932dd8086d2ee87b48851ef307
 EBUILD libass-0.15.0.ebuild 1182 BLAKE2B b38bf831d8aa357eff1c91603fc84b426b69d49ff04f94b2153927754e76d6df5e6db4e8ecac2497ecd3ac227f15ce1b30aa493483779044c15a142ec62eec04 SHA512 e68d3dcd3d020126d68d9d502d3c6f027825e4b39d4389761404b7474d394f6bf68ff2640ed2f44bef301e5c0cd67b75cbb39b34ae30617911a7b5e7ce162b55
-EBUILD libass-0.15.1-r1.ebuild 1193 BLAKE2B e017730cd29c146cb232a56d7bcc2542eb9ae8b846903f63519513119e349a2fa0ecf1a879626b6729e05a59123bb68932590259e6024ff96d92a9b5ceb353f9 SHA512 429e1cdaef9c5c03fca08d4a866ee2a694fe0aec9b46afa3362611e3e4bb0f0184f9f2f6ebea49fe199b37478124454eca9b25bcf4989165fb933b82ed6c0fe1
+EBUILD libass-0.15.1-r1.ebuild 1189 BLAKE2B d1a9181b36ffb3ecbfb6c11e432cc1b17c8deb1f559740daacba17dc16faf5b445d255e5a291956ef414d2d007519733d89b3255f3a130b6d39faf159228f2ff SHA512 1b2be62a754cd04d8f1bf562475f15f5476b6b6a1e5911849708e528a422dca62162815f2b2e3119740f70c09f6a117d433a352b75b26c0f2c00206fbb1da3ac
 MISC metadata.xml 309 BLAKE2B a2a606460c51302aa57936da38c4e15105eeaa9615c700f0df4a5454124a719377e4bf3d47a40ba876791e2d2c8aa92fa042eb9309ad2390963fd6014db5507a SHA512 d8e6dd073dd6334784f165bca935396edf8ce217f5f3495b0ed9d80ae84b784b16ab252a7ed18af23b4ea8ec9190d42b2c75aeb9467ef7c5a387d042e9d7676c
diff --git a/media-libs/libass/libass-0.15.1-r1.ebuild b/media-libs/libass/libass-0.15.1-r1.ebuild
index 56820c46a621..fc711566166f 100644
--- a/media-libs/libass/libass-0.15.1-r1.ebuild
+++ b/media-libs/libass/libass-0.15.1-r1.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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 636c322cba6d..4356a4fb7dd1 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,7 +1,9 @@
 AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da909527e5f3ea7b6f225695e35251f4fa442a640326d4e1d8cf8fe233a923fe6e171dc8b8ca8e103d22a648d3a00f4616 SHA512 fd7e9c333ce3184431af0bab84f0987094d970af1e557b16238eac06db86fe625b8d696810f14ab4940494bed96994586374c1dd501154b537a1c037b78cfb89
 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
 DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
+DIST libavif-0.9.1.tar.gz 1985366 BLAKE2B b498f00c56fe3058cf11f10cc629aad618ad297b625155ec8012f88493f8ae076933e4a4ebc7d97249019a64f01b68db34ab7ff5f9c35db0b1b74dd9048bd191 SHA512 15fa857ee40aeae2ee077d244c6e11a34193f2348e922b5dfa8579a91fa6ceff05c7146e85f9222ebaa6ef2d76e876ea050e8056990cad80850fb4d9581de9a5
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
-EBUILD libavif-0.9.0-r2.ebuild 2724 BLAKE2B a79345d45dadaccfcfa196aa69fef897f31b0e94ca30d4f77540c35d1ea6b4f4cd88d7199aace47f89f39f49ece9e673b853989083bfef597bfcece1632e218d SHA512 f27a8f3dea9f4efcf030b4ed914e8e1e95e58e1b275bf17aef2b0599356387a512e4bd44aeffb7dc01338f5b43b65e06df4edde672ab143c19203d0029aa8104
+EBUILD libavif-0.9.0-r2.ebuild 2723 BLAKE2B 897b538c7b198edd03168c70877eff541327ab439fac2f844b45dc97070e85caa2cf1cc58217225624ca0c2dd81c649f932b7cd0be05a41e23ca56ef50b0dbb7 SHA512 2e334002bbf2bba95a8182b2091ebab4a1f7ff1695cc0e098a16b56641310cddb1a0d74f28c35e258de52ece7a66fc99676db7562303ce9a21eb4f6a878632ef
+EBUILD libavif-0.9.1.ebuild 2676 BLAKE2B f7bc18c5ff496903a50754a83aa5389726a6758879e978f602221770a952b6d0e9dfc8f2642e9782325bbe9041d2c13ed4eb77e712461f2e73d6a95c794dc0e1 SHA512 bf7780568db50757782179613174d49eb89b5a9ad6f02d68ce99adb84e36e83b5543220d49dc491152b13f9457a2de850d045fa6965c803112f854b3e647916a
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild
index 74044b589094..f86be4665d69 100644
--- a/media-libs/libavif/libavif-0.9.0-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
diff --git a/media-libs/libavif/libavif-0.9.1.ebuild b/media-libs/libavif/libavif-0.9.1.ebuild
new file mode 100644
index 000000000000..5deb78827836
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 19a71f8c8ddd..f2731dc401a6 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -4,6 +4,6 @@ DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bb
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
 EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
 EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
-EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B 8b8f85f69de138fc2ce2d3e3ecaaa9ccd0d79dc1dcff733653f5d5753e549842eef35d7209463becf588773f7a3a9ffc0644857490aada84990f0e3baa65e8ba SHA512 0a0f35bbae2bd34f7296e0f073819be0794e39e73bf1277a8cdaea07984f749f426829eba911b0b5d9274a8b47f44ead1ae5186ab1dd1ad4f77255071bb0efaf
+EBUILD libbluray-1.3.0-r1.ebuild 2021 BLAKE2B c72fa1e94e150105af1cdfae38a2366f8062e214fcdb55a042673e12d5ccedd37e5bf220988a0d67d6633d4f13941a20cf337247f1de901193e4991583d4b2f4 SHA512 481d8c4178a2b0e510ac14bc9a9cc073aa7446991916ce5cb75320781dfc2fe25af56afa0ef957c293147bd15cad1f4d84142976bb9d696d57e7d806bfaabe7c
 EBUILD libbluray-9999.ebuild 2007 BLAKE2B 478fd75959be666b511ca485c1bceea124b70282273dcdb687c9ae1e6b98d0bc6c7e92fa0ccbb020a29370202c248dc7ec1a0b2b5eaf4269714db18cae12344f SHA512 5a168560da9a4db8f929596176889e3ac7d6ea34c9c9ca2f39f37550909e45502976933d08456dcfe67c815a41564105321aa5f3bfde5e4f52680814b45590f6
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.3.0-r1.ebuild b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
index 7e8ef811ae39..febd0814ef3d 100644
--- a/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index a98da86e0979..ce806446a0d3 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -2,4 +2,4 @@ AUX 3.1.0-configure-ac-use-dist-xz.patch 515 BLAKE2B 577998bdd3192e998f7859b3e16
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
 EBUILD libbs2b-3.1.0-r2.ebuild 822 BLAKE2B e9181d168cfdc9b41080765cd9dbc40d5922293e1c5b2c8f9b18cd60b4771c9f047aba90f2dc880c7c14042408e06bf34c0ea9fe08e52648341f2f22d108fd93 SHA512 4791a831b2b20d545dfefd008acf9f8edd4f6262d918e64cea59548398b26829b53e9011f5c4d57a086e7a02de9640bc5072aa75e3829cf8bc55003fbb7ed051
-MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
+MISC metadata.xml 337 BLAKE2B cf97a0e6ef65870a72025796f214ef41ac6b0d936da6ecb1cb84875ae3805fad84954121925ed5eeb888262c3d96081efa94c2c4195c812c2351da2f05c03f90 SHA512 01eed065aee1d5c761a268b129e5919328b94abbf73f81b515c340fc85b30f1a2e66a4beed61e410f98c2fdf6b375729c188421aac259ec8af5ca61a7d4d2337
diff --git a/media-libs/libbs2b/metadata.xml b/media-libs/libbs2b/metadata.xml
index a491e4e53425..1ead27f81ca3 100644
--- a/media-libs/libbs2b/metadata.xml
+++ b/media-libs/libbs2b/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>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 827812886c76..3968566050c2 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,6 +1,14 @@
+AUX 100_doxygen.diff 8299 BLAKE2B 6de98b3f9e46ba42de588c1c41bcb709fa78a7d25181593b87cc701cddd69778f1d256d37d46292145f87519eb9d071b2d22385d770ff6c036148d212a7b52c8 SHA512 540a59bc71c4d609c1db86848a73167003587ede4ebc115e6616d6f69d8f629ed12605266ef3225d51bf1910e012aff8d395c9a87da00ce7bfb6e9db7f8b957c
+AUX CVE-2018-20544.patch 1799 BLAKE2B f2eb0a1f9798c41f64f0f92d3a6d5f36c3729cef204adb4577de4d1ca98c44ab9c444935bfbd149a8d92b76bdf0ffe92ac22c4519708792a34d1a2ca371880ce SHA512 09450e15075daf7d944b7af6e7ad4a3124aa600a1cd9a5a49f8aafb8198497ae84b66a8bf84c9633007220fc39fa923aa3d300990fe7b12bcf770f9bb39a52e0
+AUX CVE-2018-20545+20547+20549.patch 1273 BLAKE2B f4a71b5e811dfb4cf43009e1dee80fbbd783bc362b27089d8a13e54eade1c8dea9239f4897eb51f18e4b41434857045c58a647c6e28256d4d712618e0bc835f8 SHA512 7d574f5e323a5b10bbe7d7287e5a353f31b9a12f3d0fa626213c053c3814ed91975884c5de51f6faf1c140b014e0657645aac2895050ec59e29f29a54f5c8dff
+AUX CVE-2018-20546+20547.patch 1211 BLAKE2B 46b96b322cd2595e6782f8ced146819394db3a9a2f9dc41e4ce102b584a5d4cbe05dcf8176ce766b781c2d1da7110efca875b498717669a434c94e2bbd40341a SHA512 9fd85f8551daac7cae3ef1025407e020fbb5233979e6894fecf561a3b59530bda0e79f9983d0778d957ffc698af37b7cfb2591bb7e811761ed16bad2b3d06ef9
+AUX Fix-a-problem-in-the-caca_resize-overflow-detection-.patch 4951 BLAKE2B c66475e9267eb7cd3b227faa82a3ebcbf20e83d31d72ffd4eeea80ee3b97c2005f54cebfb981be5cdea0ce4df006a7c37bb7c37a79ff83dea755ac78e7dcc9ea SHA512 fee4777d59b3a19f2ce8e1a6474ea0e092031d131473a5957b31a61f367f15ac8519223b4d54ab6c1cb2eb0cf24340584daf1bb6ff7d81fefa349168a9e4964f
+AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e93971baecdc808ff4cc3d9bb1801836b80d4ee97905eb474af0ab65af762b5ee7a16490fa836c2381cf7cda8dad4df35f2d3ac9bf36c6f7db646f SHA512 626e91a2af949f79438529db454f4fad0ca335dd89d6e783eabcf66b76b972a648afa54951c34b4e1ee33017e14edce9cb94d7579ae484403bfdceb08e6d32de
+AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a144ec7330532aebb7faa3076b12cc49ca82e8e127126b7d1ec8930d0a0871476e4f7632c6ebb6d10ae36146a3006040be72157d6 SHA512 9c1fc4aba3eecf94f47f296ebf11441de60ddf7a335c11bae4da4aa04e5cbbddd07d8cacf40b2b0aaf96312923c24cc0f1a3f031284cac13e8dd9c29ce36aa18
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r1.ebuild 4014 BLAKE2B 658006e7e49ef8b9d705431ef29b29e4e8d8bf307f5e371895d37323f30856229e206e5dcd7d05865986bcaff1c7213d464213cf9ec64354c551eab164ca64dd SHA512 d79418fe064ade96cd94602086720bbe46092b0cd3bcca863b7bd5cd9c2710b7a11d5dc4510895f14e1c9702f6637491120283e6b9c74a66c73fa0d5d6f9cf7b
+EBUILD libcaca-0.99_beta19-r1.ebuild 4017 BLAKE2B 09e3b339beb9a45a816779ce2b0394601b4bd687e6606bbe70ce09dcf0d91e8b82388909f657cb3de11ec4210bd06cd7bee5fe6379cae83ea023a49d38b5f84d SHA512 5c5356db2d1e3d4e0cd083d29be5261698677989c59941b1b632ce2164a23a829bcd249e4178e33589dd81ba40447b0b9fce1125cceb6bca4109cd0257c73038
 EBUILD libcaca-0.99_beta19-r3.ebuild 4162 BLAKE2B 721115dcd52859816b62ad09c2ca11e0083154fabd5cf5298b9f1ca28f908e64fb8521c5f507ef9995a8a84b3cbdaa28573b3bce777ef2ef20d5eb40c07d14fc SHA512 b2a5edc036c7b92b75a9bef4a7007ad71afb24d068adc405b11e70076a35b3bba3a0993bee9b1ed2627284c7df59aeb6e373faeca17969738aa73f57b594574f
+EBUILD libcaca-0.99_beta19-r4.ebuild 4490 BLAKE2B 47664ad6a48d3da5ad6d51e1a02f6f8339a0783510001b9105265691a043a06c662a5824bdcf6b576e1735d0214fd03184b6383af0abad7593483ec6b157ebfa SHA512 f3a531b9683a5d957001696b0984312afda4abeb1fe24389c518d296e3c407e42294d6c59fdcb9dce491484799aae83c9f88276606ad9ee6cd5475f22d882498
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/files/100_doxygen.diff b/media-libs/libcaca/files/100_doxygen.diff
new file mode 100644
index 000000000000..f537f37b6d35
--- /dev/null
+++ b/media-libs/libcaca/files/100_doxygen.diff
@@ -0,0 +1,170 @@
+Description: Don't mess with Doxygen's output
+Author: Balint Reczey <balint@balintreczey.hu>
+Index: libcaca-0.99.beta19/doc/Makefile.am
+===================================================================
+--- libcaca-0.99.beta19.orig/doc/Makefile.am
++++ libcaca-0.99.beta19/doc/Makefile.am
+@@ -28,10 +28,7 @@ stamp-latex: stamp-doxygen
+ if BUILD_DOCUMENTATION
+ if USE_LATEX
+ 	rm -f latex/libcaca.tex latex/libcaca.pdf
+-	mv latex/refman.tex latex/libcaca.tex
+-	sed 's/setlength{/renewcommand{/' latex/libcaca.tex \
+-	  | sed 's/.*usepackage.*times.*//' > latex/refman.tex
+-	cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1)
++	(cd latex &&  pdflatex refman ; makeindex refman.idx ; pdflatex refman ; pdflatex refman ; pdflatex refman ; pdflatex refman ; pdflatex refman; echo "pdflatex exit code: $$?")
+ 	mv latex/refman.pdf latex/libcaca.pdf
+ 	touch stamp-latex
+ endif
+Index: libcaca-0.99.beta19/doc/doxygen.cfg.in
+===================================================================
+--- libcaca-0.99.beta19.orig/doc/doxygen.cfg.in
++++ libcaca-0.99.beta19/doc/doxygen.cfg.in
+@@ -1,4 +1,4 @@
+-# Doxyfile 1.8.6
++# Doxyfile 1.8.7
+ 
+ # This file describes the settings to be used by the documentation system
+ # doxygen (www.doxygen.org) for a project.
+@@ -70,6 +70,14 @@ OUTPUT_DIRECTORY       = .
+ 
+ CREATE_SUBDIRS         = NO
+ 
++# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
++# characters to appear in the names of generated files. If set to NO, non-ASCII
++# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
++# U+3044.
++# The default value is: NO.
++
++ALLOW_UNICODE_NAMES    = NO
++
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all
+ # documentation generated by doxygen is written. Doxygen will use this
+ # information to generate all constant output in the proper language.
+@@ -261,9 +269,12 @@ OPTIMIZE_OUTPUT_VHDL   = NO
+ # extension. Doxygen has a built-in mapping, but you can override or extend it
+ # using this tag. The format is ext=language, where ext is a file extension, and
+ # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+-# (default is Fortran), use: inc=Fortran f=C.
++# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
++# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
++# Fortran. In the later case the parser tries to guess whether the code is fixed
++# or free formatted code, this is the default for Fortran type files), VHDL. For
++# instance to make doxygen treat .inc files as Fortran files (default is PHP),
++# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+ #
+ # Note For files without extension you can use no_extension as a placeholder.
+ #
+@@ -1242,7 +1253,8 @@ GENERATE_CHI           = NO
+ CHM_INDEX_ENCODING     =
+ 
+ # The BINARY_TOC flag controls whether a binary table of contents is generated (
+-# YES) or a normal table of contents ( NO) in the .chm file.
++# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
++# enables the Previous and Next buttons.
+ # The default value is: NO.
+ # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+ 
+@@ -1482,11 +1494,11 @@ SEARCHENGINE           = NO
+ 
+ # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+ # implemented using a web server instead of a web client using Javascript. There
+-# are two flavours of web server based searching depending on the
+-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+-# searching and an index file used by the script. When EXTERNAL_SEARCH is
+-# enabled the indexing and searching needs to be provided by external tools. See
+-# the section "External Indexing and Searching" for details.
++# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
++# setting. When disabled, doxygen will generate a PHP script for searching and
++# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
++# and searching needs to be provided by external tools. See the section
++# "External Indexing and Searching" for details.
+ # The default value is: NO.
+ # This tag requires that the tag SEARCHENGINE is set to YES.
+ 
+@@ -1774,6 +1786,13 @@ MAN_OUTPUT             = man
+ 
+ MAN_EXTENSION          = .3caca
+ 
++# The MAN_SUBDIR tag determines the name of the directory created within
++# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
++# MAN_EXTENSION with the initial . removed.
++# This tag requires that the tag GENERATE_MAN is set to YES.
++
++MAN_SUBDIR             =
++
+ # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+ # will generate one additional man file for each entity documented in the real
+ # man page(s). These additional files only source the real man page, but without
+@@ -1801,18 +1820,6 @@ GENERATE_XML           = NO
+ 
+ XML_OUTPUT             = xml
+ 
+-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+-# validating XML parser to check the syntax of the XML files.
+-# This tag requires that the tag GENERATE_XML is set to YES.
+-
+-XML_SCHEMA             =
+-
+-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+-# validating XML parser to check the syntax of the XML files.
+-# This tag requires that the tag GENERATE_XML is set to YES.
+-
+-XML_DTD                =
+-
+ # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+ # listings (including syntax highlighting and cross-referencing information) to
+ # the XML output. Note that enabling this will significantly increase the size
+@@ -1961,9 +1968,9 @@ EXPAND_AS_DEFINED      = __extern \
+                          __class
+ 
+ # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+-# remove all refrences to function-like macros that are alone on a line, have an
+-# all uppercase name, and do not end with a semicolon. Such function macros are
+-# typically used for boiler-plate code, and will confuse the parser if not
++# remove all references to function-like macros that are alone on a line, have
++# an all uppercase name, and do not end with a semicolon. Such function macros
++# are typically used for boiler-plate code, and will confuse the parser if not
+ # removed.
+ # The default value is: YES.
+ # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+@@ -1983,7 +1990,7 @@ SKIP_FUNCTION_MACROS   = YES
+ # where loc1 and loc2 can be relative or absolute paths or URLs. See the
+ # section "Linking to external documentation" for more information about the use
+ # of tag files.
+-# Note: Each tag file must have an unique name (where the name does NOT include
++# Note: Each tag file must have a unique name (where the name does NOT include
+ # the path). If a tag file is not located in the directory in which doxygen is
+ # run, you must also specify the path to the tagfile here.
+ 
+@@ -2061,7 +2068,7 @@ HIDE_UNDOC_RELATIONS   = YES
+ # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+ # Bell Labs. The other options in this section have no effect if this option is
+ # set to NO
+-# The default value is: NO.
++# The default value is: YES.
+ 
+ HAVE_DOT               = NO
+ 
+@@ -2083,7 +2090,7 @@ DOT_NUM_THREADS        = 0
+ # The default value is: Helvetica.
+ # This tag requires that the tag HAVE_DOT is set to YES.
+ 
+-#DOT_FONTNAME           = FreeSans
++DOT_FONTNAME           = Helvetica
+ 
+ # The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+ # dot graphs.
+@@ -2213,7 +2220,9 @@ DIRECTORY_GRAPH        = YES
+ # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+ # to make the SVG files visible in IE 9+ (other browsers do not have this
+ # requirement).
+-# Possible values are: png, jpg, gif and svg.
++# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
++# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
++# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+ # The default value is: png.
+ # This tag requires that the tag HAVE_DOT is set to YES.
+ 
diff --git a/media-libs/libcaca/files/CVE-2018-20544.patch b/media-libs/libcaca/files/CVE-2018-20544.patch
new file mode 100644
index 000000000000..072c1dda0502
--- /dev/null
+++ b/media-libs/libcaca/files/CVE-2018-20544.patch
@@ -0,0 +1,45 @@
+From 84bd155087b93ab2d8d7cb5b1ac94ecd4cf4f93c Mon Sep 17 00:00:00 2001
+From: Sam Hocevar <sam@hocevar.net>
+Date: Sat, 29 Dec 2018 22:13:56 +0100
+Subject: [PATCH] dither: fix integer overflows that were causing a division by
+ zero.
+
+Fixes: #36 (CVE-2018-20544)
+---
+ caca/dither.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/caca/dither.c b/caca/dither.c
+index 04b678e0..c6ebab1b 100644
+--- a/caca/dither.c
++++ b/caca/dither.c
+@@ -991,10 +991,10 @@ int caca_dither_bitmap(caca_canvas_t *cv, int x, int y, int w, int h,
+         /* First get RGB */
+         if(d->antialias)
+         {
+-            fromx = (x - x1) * w / deltax;
+-            fromy = (y - y1) * h / deltay;
+-            tox = (x - x1 + 1) * w / deltax;
+-            toy = (y - y1 + 1) * h / deltay;
++            fromx = (uint64_t)(x - x1) * w / deltax;
++            fromy = (uint64_t)(y - y1) * h / deltay;
++            tox = (uint64_t)(x - x1 + 1) * w / deltax;
++            toy = (uint64_t)(y - y1 + 1) * h / deltay;
+ 
+             /* We want at least one pixel */
+             if(tox == fromx) tox++;
+@@ -1017,10 +1017,10 @@ int caca_dither_bitmap(caca_canvas_t *cv, int x, int y, int w, int h,
+         }
+         else
+         {
+-            fromx = (x - x1) * w / deltax;
+-            fromy = (y - y1) * h / deltay;
+-            tox = (x - x1 + 1) * w / deltax;
+-            toy = (y - y1 + 1) * h / deltay;
++            fromx = (uint64_t)(x - x1) * w / deltax;
++            fromy = (uint64_t)(y - y1) * h / deltay;
++            tox = (uint64_t)(x - x1 + 1) * w / deltax;
++            toy = (uint64_t)(y - y1 + 1) * h / deltay;
+ 
+             /* tox and toy can overflow the canvas, but they cannot overflow
+              * when averaged with fromx and fromy because these are guaranteed
diff --git a/media-libs/libcaca/files/CVE-2018-20545+20547+20549.patch b/media-libs/libcaca/files/CVE-2018-20545+20547+20549.patch
new file mode 100644
index 000000000000..ff1ee48c6a67
--- /dev/null
+++ b/media-libs/libcaca/files/CVE-2018-20545+20547+20549.patch
@@ -0,0 +1,34 @@
+Description: img2txt: fix an integer overflow in the BMP loader.
+Origin: https://github.com/cacalabs/libcaca/commit/3e52dabe3e64dc50f4422effe364a1457a8a8592
+Forwarded: not-needed
+Applied-Upstream: https://github.com/cacalabs/libcaca/commit/3e52dabe3e64dc50f4422effe364a1457a8a8592
+Last-Update: 2019-04-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/common-image.h
++++ b/src/common-image.h
+@@ -1,19 +1,19 @@
+ /*
+  *  Imaging tools for cacaview and img2irc
+- *  Copyright (c) 2003-2012 Sam Hocevar <sam@hocevar.net>
+- *                All Rights Reserved
++ *  Copyright (c) 2003-2018 Sam Hocevar <sam@hocevar.net>
++ *              All Rights Reserved
+  *
+  *  This program is free software. It comes without any warranty, to
+  *  the extent permitted by applicable law. You can redistribute it
+  *  and/or modify it under the terms of the Do What the Fuck You Want
+- *  to Public License, Version 2, as published by Sam Hocevar. See
+- *  http://www.wtfpl.net/ for more details.
++ *  to Public License, Version 2, as published by the WTFPL Task Force.
++ *  See http://www.wtfpl.net/ for more details.
+  */
+ 
+ struct image
+ {
+     char *pixels;
+-    unsigned int w, h;
++    size_t w, h;
+     struct caca_dither *dither;
+     void *priv;
+ };
diff --git a/media-libs/libcaca/files/CVE-2018-20546+20547.patch b/media-libs/libcaca/files/CVE-2018-20546+20547.patch
new file mode 100644
index 000000000000..95b072bfc398
--- /dev/null
+++ b/media-libs/libcaca/files/CVE-2018-20546+20547.patch
@@ -0,0 +1,36 @@
+From 02a09ec9e5ed8981e7a810bfb6a0172dc24f0790 Mon Sep 17 00:00:00 2001
+From: Sam Hocevar <sam@hocevar.net>
+Date: Sun, 30 Dec 2018 13:18:27 +0100
+Subject: [PATCH] dither: fix integer multiplication overflow that caused
+ crashes.
+
+Fixes: #38 (CVE-2018-20546)
+Fixes: #39 (CVE-2018-20547)
+---
+ caca/dither.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/caca/dither.c b/caca/dither.c
+index c6ebab1b..b2e24e55 100644
+--- a/caca/dither.c
++++ b/caca/dither.c
+@@ -6,8 +6,8 @@
+  *  This library is free software. It comes without any warranty, to
+  *  the extent permitted by applicable law. You can redistribute it
+  *  and/or modify it under the terms of the Do What the Fuck You Want
+- *  to Public License, Version 2, as published by Sam Hocevar. See
+- *  http://www.wtfpl.net/ for more details.
++ *  to Public License, Version 2, as published by the WTFPL Task Force.
++ *  See http://www.wtfpl.net/ for more details.
+  */
+ 
+ /*
+@@ -116,7 +116,7 @@ enum color_mode
+ struct caca_dither
+ {
+     int bpp, has_palette, has_alpha;
+-    int w, h, pitch;
++    size_t w, h, pitch;
+     int rmask, gmask, bmask, amask;
+     int rright, gright, bright, aright;
+     int rleft, gleft, bleft, aleft;
diff --git a/media-libs/libcaca/files/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch b/media-libs/libcaca/files/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch
new file mode 100644
index 000000000000..5305a6bdf21c
--- /dev/null
+++ b/media-libs/libcaca/files/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch
@@ -0,0 +1,135 @@
+From: Sam Hocevar <sam@hocevar.net>
+Date: Fri, 26 Feb 2021 12:40:06 +0100
+Subject: [2/2] Fix a problem in the caca_resize() overflow detection and add
+ several unit tests.
+Origin: https://github.com/cacalabs/libcaca/commit/e4968ba6e93e9fd35429eb16895c785c51072015
+Bug: https://github.com/cacalabs/libcaca/issues/52
+Bug-Debian: https://bugs.debian.org/983686
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-3410
+
+---
+ caca/canvas.c     | 16 ++++++++--------
+ test/canvas.cpp   | 18 +++++++++++++++---
+ tools/makefont.c  | 22 +++++++++++++++++++---
+ 3 files changed, 42 insertions(+), 14 deletions(-)
+
+--- a/caca/canvas.c
++++ b/caca/canvas.c
+@@ -367,6 +367,14 @@ int caca_resize(caca_canvas_t *cv, int w
+ {
+     int x, y, f, old_width, old_height, old_size;
+ 
++    /* Check for overflow */
++    int new_size = width * height;
++    if (new_size < 0 || (width > 0 && new_size / width != height))
++    {
++        seterrno(EOVERFLOW);
++        return -1;
++    }
++
+     old_width = cv->width;
+     old_height = cv->height;
+     old_size = old_width * old_height;
+@@ -377,14 +385,6 @@ int caca_resize(caca_canvas_t *cv, int w
+      * dirty rectangle handling */
+     cv->width = width;
+     cv->height = height;
+-    int new_size = width * height;
+-
+-    /* Check for overflow */
+-    if (new_size / width != height)
+-    {
+-        seterrno(EOVERFLOW);
+-        return -1;
+-    }
+ 
+     /* If width or height is smaller (or both), we have the opportunity to
+      * reduce or even remove dirty rectangles */
+--- a/test/canvas.cpp
++++ b/test/canvas.cpp
+@@ -16,6 +16,7 @@
+ #include <cppunit/TestCaller.h>
+ #include <cppunit/TestCase.h>
+ #include <cppunit/TestSuite.h>
++#include <climits>
+ 
+ #include "caca.h"
+ 
+@@ -53,18 +54,29 @@ public:
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_width(cv), 0);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_height(cv), 0);
+ 
+-        caca_set_canvas_size(cv, 1, 1);
++        int ret = caca_set_canvas_size(cv, 1, 1);
++        CPPUNIT_ASSERT_EQUAL(ret, 0);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_width(cv), 1);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_height(cv), 1);
+ 
+-        caca_set_canvas_size(cv, 1234, 1001);
++        ret = caca_set_canvas_size(cv, 1234, 1001);
++        CPPUNIT_ASSERT_EQUAL(ret, 0);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_width(cv), 1234);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_height(cv), 1001);
+ 
+-        caca_set_canvas_size(cv, 0, 0);
++        ret = caca_set_canvas_size(cv, 0, 0);
++        CPPUNIT_ASSERT_EQUAL(ret, 0);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_width(cv), 0);
+         CPPUNIT_ASSERT_EQUAL(caca_get_canvas_height(cv), 0);
+ 
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, -1, 50));
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, 50, -1));
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, -1, -1));
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, INT_MAX / 2, 3));
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, 3, INT_MAX / 2));
++        CPPUNIT_ASSERT_EQUAL(-1, caca_set_canvas_size(cv, INT_MAX / 2, INT_MAX / 2));
++        CPPUNIT_ASSERT_EQUAL(0, caca_set_canvas_size(cv, 0, 0));
++
+         caca_free_canvas(cv);
+     }
+ 
+--- a/tools/makefont.c
++++ b/tools/makefont.c
+@@ -40,7 +40,8 @@
+  * and the UTF-8 glyphs necessary for canvas rotation and mirroring. */
+ static unsigned int const blocklist[] =
+ {
+-    0x0000, 0x0080, /* Basic latin: A, B, C, a, b, c */
++    0x0020, 0x0080, /* Basic latin: A, B, C, a, b, c */
++#if 0
+     0x0080, 0x0100, /* Latin-1 Supplement: Ä, Ç, å, ß */
+     0x0100, 0x0180, /* Latin Extended-A: Ā č Ō œ */
+     0x0180, 0x0250, /* Latin Extended-B: Ǝ Ƹ */
+@@ -63,6 +64,7 @@ static unsigned int const blocklist[] =
+     0x30a0, 0x3100, /* Katakana: ロ ル */
+     0xff00, 0xfff0, /* Halfwidth and Fullwidth Forms: Ａ, Ｂ, Ｃ, ａ, ｂ, ｃ */
+     0x10400, 0x10450, /* Deseret: 𐐒 𐐋 */
++#endif
+     0, 0
+ };
+ 
+@@ -317,8 +319,22 @@ int main(int argc, char *argv[])
+             printf_unicode(&gtab[n]);
+ 
+             if(gtab[n].same_as == n)
+-                printf_hex(" */ %s\n",
+-                           glyph_data + gtab[n].data_offset, gtab[n].data_size);
++            {
++                char const *lut = " .:nmW@";
++                printf("\n");
++                for (int y = 0; y < height; ++y)
++                {
++                    for (int x = 0; x < gtab[n].data_width; ++x)
++                    {
++                        int val = glyph_data[gtab[n].data_offset + y * gtab[n].data_width + x];
++                        char ch = lut[val * val * 7 / 256 / 256];
++                        printf("%c%c", ch, ch);
++                    }
++                    printf("\n");
++                }
++                //printf_hex(" */ %s\n",
++                //           glyph_data + gtab[n].data_offset, gtab[n].data_size);
++            }
+             else
+             {
+                 printf(" is ");
diff --git a/media-libs/libcaca/files/canvas-fix-an-integer-overflow-in-caca_resize.patch b/media-libs/libcaca/files/canvas-fix-an-integer-overflow-in-caca_resize.patch
new file mode 100644
index 000000000000..020f1a3603d4
--- /dev/null
+++ b/media-libs/libcaca/files/canvas-fix-an-integer-overflow-in-caca_resize.patch
@@ -0,0 +1,141 @@
+From: Sam Hocevar <sam@hocevar.net>
+Date: Fri, 26 Feb 2021 10:55:38 +0100
+Subject: [1/2] canvas: fix an integer overflow in caca_resize().
+Origin: https://github.com/cacalabs/libcaca/commit/46b4ea7cea72d6b3ffe65d33e604b1774dcc2bbd
+Bug: https://github.com/cacalabs/libcaca/issues/52
+Bug-Debian: https://bugs.debian.org/983686
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-3410
+
+Fixes: #52 (CVE-2021-3410)
+---
+ caca/canvas.c       | 13 +++++++++++--
+ caca/codec/import.c |  1 +
+ caca/codec/text.c   | 21 ++++++++++++++-------
+ 3 files changed, 26 insertions(+), 9 deletions(-)
+
+diff --git a/caca/canvas.c b/caca/canvas.c
+index 3fdd37ae8ef9..d07153926c3a 100644
+--- a/caca/canvas.c
++++ b/caca/canvas.c
+@@ -45,6 +45,7 @@ static int caca_resize(caca_canvas_t *, int, int);
+  *
+  *  If an error occurs, NULL is returned and \b errno is set accordingly:
+  *  - \c EINVAL Specified width or height is invalid.
++ *  - \c EOVERFLOW Specified width and height overflowed.
+  *  - \c ENOMEM Not enough memory for the requested canvas size.
+  *
+  *  \param width The desired canvas width
+@@ -200,6 +201,7 @@ int caca_unmanage_canvas(caca_canvas_t *cv, int (*callback)(void *), void *p)
+  *
+  *  If an error occurs, -1 is returned and \b errno is set accordingly:
+  *  - \c EINVAL Specified width or height is invalid.
++ *  - \c EOVERFLOW Specified width and height overflowed.
+  *  - \c EBUSY The canvas is in use by a display driver and cannot be resized.
+  *  - \c ENOMEM Not enough memory for the requested canvas size. If this
+  *    happens, the canvas handle becomes invalid and should not be used.
+@@ -363,7 +365,7 @@ int caca_rand(int min, int max)
+ 
+ int caca_resize(caca_canvas_t *cv, int width, int height)
+ {
+-    int x, y, f, old_width, old_height, new_size, old_size;
++    int x, y, f, old_width, old_height, old_size;
+ 
+     old_width = cv->width;
+     old_height = cv->height;
+@@ -375,7 +377,14 @@ int caca_resize(caca_canvas_t *cv, int width, int height)
+      * dirty rectangle handling */
+     cv->width = width;
+     cv->height = height;
+-    new_size = width * height;
++    int new_size = width * height;
++
++    /* Check for overflow */
++    if (new_size / width != height)
++    {
++        seterrno(EOVERFLOW);
++        return -1;
++    }
+ 
+     /* If width or height is smaller (or both), we have the opportunity to
+      * reduce or even remove dirty rectangles */
+diff --git a/caca/codec/import.c b/caca/codec/import.c
+index 8836fd0893e3..2dafe3cf97c1 100644
+--- a/caca/codec/import.c
++++ b/caca/codec/import.c
+@@ -61,6 +61,7 @@ static ssize_t import_caca(caca_canvas_t *, void const *, size_t);
+  *
+  *  If an error occurs, -1 is returned and \b errno is set accordingly:
+  *  - \c ENOMEM Not enough memory to allocate canvas.
++ *  - \c EOVERFLOW Importing data caused a value overflow.
+  *  - \c EINVAL Invalid format requested.
+  *
+  *  \param cv A libcaca canvas in which to import the file.
+diff --git a/caca/codec/text.c b/caca/codec/text.c
+index 358b7224fe87..94a2a4d7bcdb 100644
+--- a/caca/codec/text.c
++++ b/caca/codec/text.c
+@@ -46,7 +46,7 @@ ssize_t _import_text(caca_canvas_t *cv, void const *data, size_t size)
+     char const *text = (char const *)data;
+     unsigned int width = 0, height = 0, x = 0, y = 0, i;
+ 
+-    caca_set_canvas_size(cv, width, height);
++    caca_set_canvas_size(cv, 0, 0);
+ 
+     for(i = 0; i < size; i++)
+     {
+@@ -70,15 +70,19 @@ ssize_t _import_text(caca_canvas_t *cv, void const *data, size_t size)
+             if(y >= height)
+                 height = y + 1;
+ 
+-            caca_set_canvas_size(cv, width, height);
++            if (caca_set_canvas_size(cv, width, height) < 0)
++                return -1;
+         }
+ 
+         caca_put_char(cv, x, y, ch);
+         x++;
+     }
+ 
+-    if(y > height)
+-        caca_set_canvas_size(cv, width, height = y);
++    if (y > height)
++    {
++        if (caca_set_canvas_size(cv, width, height = y) < 0)
++            return -1;
++    }
+ 
+     return (ssize_t)size;
+ }
+@@ -431,7 +435,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8)
+             {
+                 savedattr = caca_get_attr(cv, -1, -1);
+                 caca_set_attr(cv, im.clearattr);
+-                caca_set_canvas_size(cv, width = x + wch, height);
++                if (caca_set_canvas_size(cv, width = x + wch, height) < 0)
++                    return -1;
+                 caca_set_attr(cv, savedattr);
+             }
+             else
+@@ -448,7 +453,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8)
+             caca_set_attr(cv, im.clearattr);
+             if(growy)
+             {
+-                caca_set_canvas_size(cv, width, height = y + 1);
++                if (caca_set_canvas_size(cv, width, height = y + 1) < 0)
++                    return -1;
+             }
+             else
+             {
+@@ -480,7 +486,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8)
+     {
+         savedattr = caca_get_attr(cv, -1, -1);
+         caca_set_attr(cv, im.clearattr);
+-        caca_set_canvas_size(cv, width, height = y);
++        if (caca_set_canvas_size(cv, width, height = y))
++            return -1;
+         caca_set_attr(cv, savedattr);
+     }
+ 
+-- 
+2.30.0
+
diff --git a/media-libs/libcaca/files/fix-css-path.patch b/media-libs/libcaca/files/fix-css-path.patch
new file mode 100644
index 000000000000..ce48e4fbda05
--- /dev/null
+++ b/media-libs/libcaca/files/fix-css-path.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/543870#c11
+--- a/doc/doxygen.cfg.in	2014-05-16 21:19:51.000000000 +0200
++++ b/doc/doxygen.cfg.in	2016-12-22 13:31:00.181040572 +0100
+@@ -1069,7 +1069,7 @@
+ # obsolete.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+ 
+-HTML_STYLESHEET        = doxygen.css
++HTML_STYLESHEET        = @srcdir@/doxygen.css
+ 
+ # The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+ # defined cascading style sheet that is included after the standard style sheets
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index 4c634422850e..a7e21adb2add 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 RUBY_OPTIONAL=yes
 #USE_RUBY=ruby20
-inherit autotools ruby-ng epatch eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
+inherit autotools ruby-ng epatch eutils flag-o-matic mono-env multilib java-pkg-opt-2 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -145,5 +145,5 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 	rm -rf "${D}"/usr/share/java
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
new file mode 100644
index 000000000000..7fe4815820c6
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=yes
+#USE_RUBY=ruby20
+
+inherit autotools ruby-ng flag-o-matic java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal
+
+MY_P=${P/_/.}
+DESCRIPTION="A library that creates colored ASCII-art graphics"
+HOMEPAGE="http://libcaca.zoy.org/"
+SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
+RESTRICT="!test? ( test )"
+
+# ruby? ( ruby_targets_${USE_RUBY} )
+REQUIRED_USE=""
+
+# ruby? (  $(ruby_implementations_depend) )
+DEPEND="
+	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="java? ( >=virtual/jre-1.5 )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		>=dev-texlive/texlive-fontsrecommended-2012
+		>=dev-texlive/texlive-latexextra-2012
+		dev-texlive/texlive-latexrecommended
+	)
+	java? ( >=virtual/jdk-1.5 )
+	test? ( dev-util/cppunit )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
+
+PATCHES=(
+	# Fix out of source tests
+	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
+	# Debian patches
+	"${FILESDIR}/CVE-2018-20544.patch"
+	"${FILESDIR}/CVE-2018-20545+20547+20549.patch"
+	"${FILESDIR}/CVE-2018-20546+20547.patch"
+	"${FILESDIR}/canvas-fix-an-integer-overflow-in-caca_resize.patch"
+	"${FILESDIR}/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch"
+	"${FILESDIR}/100_doxygen.diff"
+	# Fix doxygen docs install, bug 543870
+	"${FILESDIR}/fix-css-path.patch"
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use mono && mono-env_pkg_setup
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# bug #339962
+	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
+
+	sed -i \
+		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.ac || die
+
+	sed -i \
+		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
+		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
+		java/Makefile.am || die
+
+	if ! use truetype; then
+		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
+	fi
+
+	if use imlib && ! use X; then
+		append-cflags -DX_DISPLAY_MISSING
+	fi
+
+	# bug #653400
+	append-cxxflags -std=c++11
+
+	# bug #601902
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	# fix docs install path, bug 543870#c14
+	sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+		fi
+
+		# bug #44128
+		export VARTEXFONTS="${T}/fonts"
+
+		# bug #329651
+		use mono && export CSC="$(type -P gmcs)"
+		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
+	fi
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable slang)
+		$(use_enable ncurses)
+		$(use_enable X x11)
+		$(use_with X x)
+		--x-libraries=/usr/$(get_libdir)
+		$(use_enable opengl gl)
+		$(use_enable cxx)
+		$(use_enable imlib imlib2)
+		$(use_enable test cppunit)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_enable ruby)
+		--disable-python
+		$(multilib_native_use_enable mono csharp)
+		$(multilib_native_use_enable doc)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local _java_makeopts
+
+	# bug #480864
+	use java && _java_makeopts="-j1"
+	emake V=1 ${_java_makeopts}
+}
+
+multilib_src_test() {
+	emake V=1 -j1 check
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Note: broken, see bug #508564 and bug #773913
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/libjava.jar
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/usr/share/java || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 8025b087ad77..7a090c7c1152 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
 DIST libdvdnav-6.1.1.tar.bz2 367606 BLAKE2B 680e9636d407b0fb1eceb2c435d91fb5f7480b65e3c272f2750b3c9957ab5b85815ff12715fb98a5a91e5c0e4b2b2d488823525455c5ec2acd92b8dab197d518 SHA512 889bc987113189bfdfc1ebf603b256e5b228be37196455dcfdc7f66debe18e7298b82b807e86ff18a8925e491395ed4007c87cf18ba1ff1ccc213d86f5342a10
 EBUILD libdvdnav-6.1.0.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
-EBUILD libdvdnav-6.1.1.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
+EBUILD libdvdnav-6.1.1.ebuild 1163 BLAKE2B eff26f90024125955321d8c1d4f8db2138639f41a2681453187c0b580a593dbb0a92c1a6df007b59903af38ff7aad816f623b7f78bff1eb4994d96d5e6a34c6f SHA512 ac87420c5f9b82371c3a4ccc60f64e3f961aec626fc3090204939ce7183d2be03948370367ff821525552cb80253b01fa57dea954bca7de843c6390fef12b1db
 EBUILD libdvdnav-9999.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
index 8abfcfe142cd..a507dfaadae4 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 43adbe05dc2e..69d911951d8f 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
 DIST libdvdread-6.1.2.tar.bz2 391536 BLAKE2B 870f8c2bba7f1a1c0f6a010c0a75517b488a466186f76f752c67e16f87b55d8fc9450aeaa69d044b42b6a26a2fc51297290be301f5a449b4b8269f6c812f35cd SHA512 5cbee11ec701b7625d71184fd712de48a129f235b08797b499d0f5b06a1c73bfec1d0e52e897585017ab63b1d81b042257eab5ab1f19fb340b05b3e8d794f86c
 EBUILD libdvdread-6.1.1.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
-EBUILD libdvdread-6.1.2.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
+EBUILD libdvdread-6.1.2.ebuild 1154 BLAKE2B a959108455903faab9cc93bd00fe6a670a1ac23fd742e5115747e517200c029fc0497350320a8d54d4a1266618e40c91ed4e76ca7491cc158a3a2b5ec0d31e13 SHA512 edcc95f6f105612524f02e9b0098032921e69cafb450c445a328e2c8a7f00aa5532020cb5ecaba4a455de976c7b4177f7f23218997f49f7511af6ef1259407e2
 EBUILD libdvdread-9999.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.1.2.ebuild b/media-libs/libdvdread/libdvdread-6.1.2.ebuild
index 7eb3ec37c638..d08066207fe9 100644
--- a/media-libs/libdvdread/libdvdread-6.1.2.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libeot/Manifest b/media-libs/libeot/Manifest
index 00c05ee634be..e91c383685c1 100644
--- a/media-libs/libeot/Manifest
+++ b/media-libs/libeot/Manifest
@@ -1,4 +1,4 @@
 DIST libeot-0.01.tgz 38651 BLAKE2B ba8362035dca9db2adef636ce153f4fd1d75c20cf0f9671d6f1aa64e055dfbe7644811f44751e11eb4660f0902c14b66be8cdbb45c85325bfd5dd5b37e388b15 SHA512 ff8c3d92b948159171c76306d4a74758974c7ee26c801c5de48805f182b542015286b1e53cfc6dc4524494becb74fb55185701e06fc9be7c16f2d89ac0275941
-EBUILD libeot-0.01.ebuild 692 BLAKE2B 330378073ba083447521e6ad0df638e00d68d3672046cbe84f405eb610c9eedf2fe96cc2df63ddcc6e24e4b81821998259f69a1172466f1a7d27ff31a5625620 SHA512 c5fc592ea03910988818f53aa2673fdad231d0e86a1a7fb1d8e2439702468ac5395f7f200e8f7ec773d24722ecb79ed1bff30c50818b390221540122ce95bb4a
-EBUILD libeot-9999.ebuild 694 BLAKE2B 0da7f2e8f4b4628da94c3c9dc65756c6bb10934e2e6cd3421c66988a9c563c32f10d423d9aea202e32f6839f3c49a20478a1a9f47c65c8d17bb72b022d51abae SHA512 7f5b14ce36569857ed1ae14df8d927302fe2cdd3811f389ea2fd78d6deb914e584b3122a27ee8e6c4c6f39052d0109476f573c93ae2173047391a8e96f145fbb
+EBUILD libeot-0.01.ebuild 699 BLAKE2B 7907d0bfe3412b8f906f98f743fe4fa66f6ec432dc8e33516c377c194b0de2afa7f5b4348f1c9e21e915e4820b9dc4815bc6c1037b86db2bd11a81f77c1d783e SHA512 b14fa7f2a737ba48439e6de7a45973b7801bad28ed195d2ccfdfe3db735347de27910fd47369691524c3084c9b3c4d87dd34c48e720ebfd5280efeb9b958d72d
+EBUILD libeot-9999.ebuild 701 BLAKE2B f7b7bdbc3c61e3c6812fba7f02c080f8521acbfe01445eec5c6a533f537a3279aa03ca06a229167c3fb3c635d16edd89dace472973e148b89f6a1c55076ba227 SHA512 cc19cea0eb60270a72720ac199533e40a07dfdb793130c7171894c0779c6a76f085ff18fc035956f79f7a9f98beda87b030b609ccfd2685e76669cf9a728ade2
 MISC metadata.xml 337 BLAKE2B b8636ce208e245d250593a208f1a771817442b9270a374a4338769a06f17986f677339e76fd9b803944df5dfa4e7705fedfd5704bbe923e86473d04de95183bf SHA512 699d241b170761e48b15613479a695561576c49eb850e79952e920cba10c96a7cc8fc1dbb39a94095b1298c5005dc0a15e646826ea6924163b53d0c1a9eef14b
diff --git a/media-libs/libeot/libeot-0.01.ebuild b/media-libs/libeot/libeot-0.01.ebuild
index 0ed17956bad6..26beb1dbfabb 100644
--- a/media-libs/libeot/libeot-0.01.ebuild
+++ b/media-libs/libeot/libeot-0.01.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
-inherit autotools ltprune
+inherit autotools
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')"
@@ -27,5 +27,5 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libeot/libeot-9999.ebuild b/media-libs/libeot/libeot-9999.ebuild
index 735af859bb04..91859a818b7e 100644
--- a/media-libs/libeot/libeot-9999.ebuild
+++ b/media-libs/libeot/libeot-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
-inherit autotools ltprune
+inherit autotools
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')"
@@ -27,5 +27,5 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index a9a1c7dcbfd0..c83eb9874f80 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,8 +1,6 @@
-DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
 DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
-DIST libepoxy-1.5.7.tar.gz 331868 BLAKE2B 95bb7637f4254aaff051ca8c896e0aa80cfbeca6e12ae87515e97ebeb2f40a41c60c3a0a7a106d8a375eb3d5a77e363442afb4644725e1d8491a335e70998c51 SHA512 7f7cda8eeb2d93d56d5d8ad9f76e186285d024b6f9b211db89c18d5bdfd1e85e7ec08c421913877a153edc8c25ecbccc205303d57d19bb8f98f4c5f93ed492bb
-EBUILD libepoxy-1.5.4.ebuild 1141 BLAKE2B 3ab8f35d56300ea3056e3d7f97b9cf5fe95a22a7059710f87800de978b11db4448d17b61e51f5e9e86ad750005d7d113a2dde5acfb02d82d98dcd4e163315f68 SHA512 d1467370eea40684490e64712f11451ce6bfd680cd23e13304e4214825670e2e9054952f31db9c094841e35ff1eb561146850be1747e48c4e414af6e62d1ee73
+DIST libepoxy-1.5.8.tar.gz 331848 BLAKE2B 0c4bca1a551a2c5908b4edc0176809cb9aebc22c688604c372a067d93347751dbe47354de8a8b8139cd02d8f0a444fe5a3f0b88759d75e1e85f17a6ba860a00b SHA512 352ad43014841d0b03a6da968b08d98aeb0332b9c6d1357650d83ef143db1194ae0fa68d274e4f160c76bae2fb4d2230599e9d9f6cae58f36f4b7f065e9277f0
 EBUILD libepoxy-1.5.5.ebuild 1156 BLAKE2B 2bd43d9cc3e7f034d71776be9e495df858d65ada04936c042c9d228d28cdb03a56245005fdd1e6b3360c9dd21e78e6497cd5b4e97d3ad5737247bfc2daff4ffd SHA512 329b484e9f948a65845ee642c986ce5a2601e3344145a479c67e386c64dab8464dbc8efe4c20815fbd814fc8e92bb49cd5183506c8c12a10318aefea33b5271f
-EBUILD libepoxy-1.5.7.ebuild 1163 BLAKE2B a8f16a9e1d5e774dcfd3471a8a306e073f3cb80eb30aa6e39e2e8d6d05e1c4265f84a65200648d289fbef74ccf64895c8cdadbadc1a12da556ad46915c08d37d SHA512 77284e95438aa57ea62d683de5728e4833e022ce65e50aa4e1004444e9409e68f68cb51538100c25537bc7528a856ecfa53aaa1ec67160f06c577ba8843db029
+EBUILD libepoxy-1.5.8.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
 EBUILD libepoxy-9999.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
 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
deleted file mode 100644
index 51ad78cfbc58..000000000000
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Library for handling OpenGL function pointer management"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+egl test +X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Degl=$(usex egl)
-		-Dglx=$(usex X)
-		$(meson_use X x11)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libepoxy/libepoxy-1.5.7.ebuild b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
index ec9f392345c3..9b903d1590db 100644
--- a/media-libs/libepoxy/libepoxy-1.5.7.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 431af18acc00..47307cbdc170 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,4 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
-EBUILD libexif-0.6.22_p20201105.ebuild 1437 BLAKE2B f1821fe0e0394b776515360f3c69f0feb4bf772d267108d655d688cb991bced0996043085be37306ceb732d34d6a6da2183aa8035ced3ac5834dcdf6686f82bb SHA512 949d70abe76e25d9615355e4ab70cef9ee4ba04f892a17908d4682b7b630e3f8574f0e7d8a8dc6e888c157cfa8cf83a5c7fafc7a6b5352f98c6b007d005ea7be
+EBUILD libexif-0.6.22_p20201105.ebuild 1444 BLAKE2B 06eaa6fd9f35df9057b57c1b25b30358a3b295e4f365e97e7beaea46dde17dff5a0592e225c746675b2dc6e4e884a64346fc704119769a35a267ba5fc772253a SHA512 5fe208d86dfc950a0cf7b529654de444ed4513d4c38e7925756c74ccc0089d3803ae231705e25a6a25f92850c0f505b324663380e9d5e847c8e22d2c6dced904
 MISC metadata.xml 452 BLAKE2B 56e1caf3f54975d0cfaa7c7e389b2be730c5f517b832f846a83868bde8e935508d81ba78404e2475c4cb98aecebd1e83f7ac0194d9c3a29126846587ca15b1c0 SHA512 cef98a3c72aaeb3d00d80dafb30457356bcfd51c7461d6b24e1eae736bc7708b5572afd1ad0b5dfa51818aded634d0dc68bc77687265d2d4e02b32f95a7764de
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 52582a06be4e..221fff98bbf9 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 5fde51e30b2d..546be135e7ee 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4-r1.ebuild 2643 BLAKE2B e2392e18990b9f71b60d244c53f51aacb2bee2ef0e32f24fbe0c918add43b6677dbf329bd32f6c52b69bb4b45633845bfdf5a51a61f0252b729614373f5f2f07 SHA512 88cd7177fec1cf2b8df7852de6e42731351835b972bdbdf5e448f20307a089cbe66d39fe1b972c620366da2d889d566825d4ed75a4aea99688eb90f0f58dbf8c
+EBUILD libffado-2.4.4-r1.ebuild 2644 BLAKE2B b3e90f86152e3a3f4df3e582565a48f2b369f059b2f2c66f82e52ef945e3f337e691684ce7ab91b8b70618e1b56dbafc23c95b785af36dd39095f29539212d01 SHA512 d65e46ee301a29e2dfe53a353914f7d97aec77eb880ef50af97034a3289a14f44af71e2798b7dafd6774298747d73d229dc1ae5d8db11a258b9f7eec3c2745b7
 MISC metadata.xml 596 BLAKE2B 4e8cd1f78c34bc23f8f93a0e37df668e8cfb3afff1e0468ac6e5d90ddcd7bde6d6056f602ca1b6d8979223a439c2a81f99b4abf620615c7fc96d27e0e03f4ab9 SHA512 317d5a82f6594de45b1c4006d70204c4f44f085868521673ca9f92e97db4d6e6c3f02cd7aed39b772f5abfc251dc833a52d72938b2eaa4963824c7454d62c703
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index 3f65f3bf7f5f..88abda7bfe6d 100644
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 63b4703005e8..399b1d9a94ef 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,4 @@
-DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
 DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
-EBUILD libglvnd-1.3.2-r2.ebuild 1523 BLAKE2B 51e3efbd58b3cedd9ffa2a4c6dba498eceec7902b61a1c9c1e4ea46c728a2e315e76932c42e5304dd4e8d44dd1bbad2acee8044d19354101195b2ed25992eaad SHA512 02417794a77cf9e6a510bff9541d01200de9ad9b8e8b8e511165c3104c50c71a653cf923a4bbd18d6f6906249a9bc79553d31b00080aa61e077feb58ec8443b2
-EBUILD libglvnd-1.3.3.ebuild 1530 BLAKE2B 4c0bbb2f24a0a70cafe5a101cda3c953468a5b3e72999a001735ac32152649fd9ca4abcc072606f3cef24f7d426a67e63eebdfe4fc601c09df8691f464fa5d6e SHA512 ec1d543fa0525065623a86abc7b950418f601b5346257f70d603a32f3213b8fb1e4fd939405757e73f62486b0f4359a665babf7f5aefed5968937c28eb2a082f
+EBUILD libglvnd-1.3.3.ebuild 1523 BLAKE2B 18d55e6ccb70cfbd64630a25c31774d27fdbe8d452f7b31951f90798c259975ebdf9836460862ca22ba5f1d34fd96b5839d120c746bcc6601a87b34657e4e45d SHA512 3c8a6f808b8e7e55811f9d8d8e80324495273c88d971aea91b57e0e38f83c294e54a160301961c45137369bef7da63d6c061bce93d724dd829d31e5fe1ba8553
 EBUILD libglvnd-9999.ebuild 1530 BLAKE2B 4c0bbb2f24a0a70cafe5a101cda3c953468a5b3e72999a001735ac32152649fd9ca4abcc072606f3cef24f7d426a67e63eebdfe4fc601c09df8691f464fa5d6e SHA512 ec1d543fa0525065623a86abc7b950418f601b5346257f70d603a32f3213b8fb1e4fd939405757e73f62486b0f4359a665babf7f5aefed5968937c28eb2a082f
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
deleted file mode 100644
index 7f2486102e0f..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
-	!media-libs/mesa[-libglvnd(+)]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-		$(meson_feature X glx)
-	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	if use X; then
-		virtx meson_src_test
-	else
-		meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
index 00a568b16f98..b995f4c6c6ae 100644
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 3bcc816e3aff..f88218de8b17 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,3 @@
-DIST libgphoto2-2.5.26.tar.bz2 7572381 BLAKE2B 671ef19b1d427a4c9d31bb383b4b0513a6423780910a2fabbcf9d9f45e9060a833336fcda0ccc6456068a702e94f1fffeece41a6f08b882f4e1e65b317e69c52 SHA512 d05a559447ac867f4826d2e20b83831dc4b4776c1e3edc9de0867050a4d39dc45b25a33ec73806282e16f75adb1dded3b59fe428bdb1dde4365c12d7af244cec
 DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
-EBUILD libgphoto2-2.5.26.ebuild 6151 BLAKE2B 98707be43724f61f931e84fbd9da9d07afd3447ddb0403a98c64fdf35ad780a509bf6c6028c9cad7063497c249869a97002d7b11a08772e661216ba8ef99584a SHA512 b0296444ffc649971aa4c7910cac202ceffc6b162a78e626382f7760f055c1101645877045aa8d23ffddd31b7098d2c4644ebc003390268a2e0a87086aed4cd7
-EBUILD libgphoto2-2.5.27.ebuild 6158 BLAKE2B 7ccc8bc4e4eedcd708591cbe0db5427dc88cb4aad27ea8d7b45b9ff41b4c29dc02ffb0a56ab06dc4eb276ec0a17945fcaff5f49827050d443aa7695ac2ab2a9b SHA512 e26b29401d16ba123a8509bbc44ffc0d0b946fdc462ab88c0b4d3d14b9b143d009f3301de86a6a6e2127ff8d4112928db125c6462dfd6ed1cae601d891d74d5d
+EBUILD libgphoto2-2.5.27-r1.ebuild 6138 BLAKE2B 83d032cea7648fd9abab34677882082dc9589fa568e6d3451e48c63a8e35b774a41071ccd0c6249b7c3efb2d28cc4fc411827a8bd7b5a5aeeeab5f6730fdf336 SHA512 7f313d046bc0a3ae0cddb1b09b6b5ea472d14a741305bfdc9427872e8b1bcf221793ee20d0e4c86fc1bc83d61e614298efe96cf20da6e032d9d1c73e923e3256
 MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild
index 195c78aeac27..5ef1555d66f1 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -160,7 +160,7 @@ multilib_src_install_all() {
 	dodoc TESTERS MAINTAINERS
 
 	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
+		docinto examples
 		dodoc examples/README examples/*.c examples/*.h
 	fi
 
@@ -174,7 +174,7 @@ multilib_src_install_all() {
 	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
 	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
 
-	if [ -x "${ED}"${cam_list} ]; then
+	if [ -x "${ED}"/${cam_list} ]; then
 		# Let print-camera-list find libgphoto2.so
 		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
 		# Let libgphoto2 find its camera-modules
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
deleted file mode 100644
index 51ddafc86c55..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#    https://sourceforge.net/p/gphoto/bugs/643/
-
-EAPI=7
-inherit multilib multilib-minimal udev
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-# FIXME: should we also bump for libgphoto2_port.so soname version?
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} +cameras_${camera}"
-done
-
-# libgphoto2 actually links to libltdl
-RDEPEND="
-	acct-group/plugdev
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
-	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gphoto2-port-config
-	/usr/bin/gphoto2-config
-)
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	sed -e 's/sleep 2//' -i configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		"${myconf[@]}"
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		einfo "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-	dodoc TESTERS MAINTAINERS
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug #????
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 60951ed50e8d..aaa417a8eb27 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1642 BLAKE2B 51e8c4a9995cd51aa53df3db28e499e11774b49b1faed31b9113752259b437886862aefe7d7bf22527318224acb611b9198db4b15a739761549bb10d95ee8c2f SHA512 cd3d4a42fb872775ed0944871e20cb8bf9daeb73fce4d421bfcaea80e0baed9ed491aeb91918b8705e996f0990103964d7b502db26588edee5e524f48ff8f429
+EBUILD libid3tag-0.15.1b-r4.ebuild 1649 BLAKE2B 994ad52c6bad887199f6039839dbe51a966bd4b70b78bbdd38230a7a6d704e2ec1a68b5ede12aea6e8b8a5bbf9a48209dfbf31f8e8072128191b4b8e995a6a4f SHA512 18faa050ebab9e177ad4be3c64216fc46690fb57ae65c63ce845746d46b7c115f16e416a2e58c4280c13c709fac1e6775a947c7ead5dd1bedad4a64f09803668
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 58fc3dd68d63..6e6a0e634ee3 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index f4f7db5a0f33..d1e9edeee4f0 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a
-EBUILD libiptcdata-1.0.5.ebuild 1147 BLAKE2B 4ffa018e573cc36037329c9b92385e9ff48f13f5aa9ad096eabccc01a47e09c46a97a69edaf70718873d5c8d8eb8081b37287a657473e3b9dc5077a949d709ce SHA512 f1fc1cbe03b7f746af923c779c10a3516e4d8c963bae69344b406f8655e2959066416da4de2c7da6fb66ac21350b89c47fcc50619223eec037999f349e9de5e6
+EBUILD libiptcdata-1.0.5.ebuild 1146 BLAKE2B 0adee7a36e9338d2ed12b9b555722b592057b613e2ddaea8b93e67766ab92651cadf8638ef99423459af5f6baf45011008e028be1dceea055955c7ad3575cfb8 SHA512 4bae0c6492d05e9f48e860d5fb2d3c2fb1d44f46be010bf189661e3d511ebcea5bec8ffa0377ea85b71353de2366ee31caa529237b71db0588d40beaeb28ec65
 MISC metadata.xml 1118 BLAKE2B 4c21b4f165ab3ace10c2762de1e7a512c481151e9d593b1fbbec4d0694bd42e66ac7daed620481a311b5bce7614fcda4283039cd0475ee3d6b2da86edd17a203 SHA512 254be0ab245616bc7952bf02220f8f82d80b772f36f00517688580ab5af7e133602ee33668aaf80a13ec656a4e195401b2b00621410339169ed49d155b3b6953
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
index eae3fa541b66..1961327c95c1 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-single-r1
 
@@ -15,6 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples nls python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	nls? ( virtual/libintl )
@@ -26,8 +27,6 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.13.1 )
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index aec8de98a74f..e7f82a1c5fcc 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.0.6.ebuild 3051 BLAKE2B b85cb9cb4ad088928d5c8e81535c58e47948df44a0c3bcc887303fbe68e053aa2cf5c7a66c1812a4fbb60c6067f98c6b233203c6d7f5ec00ca5df53f708c6d19 SHA512 f072c13c9ad72b532b09ee3ec415a189491bb9eb0dee6f50f2b0a601cd24c952c62f8a947ec3af4e2f669c6a7353dbc8d9a5d6814e9aed45e14088e64e7e6df7
-EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3122 BLAKE2B 6e27dff735c4359e48083cb3e775c9193d786274f94ff75e3e54f40d028aad26f4b716fbe441601d200e5ed1af5de5212fa2646e078a04707d44e1446281cee7 SHA512 e55edff1b94b2409b87e01731bf250d6266f7d434bf56dffcbabe1950eae23684977e8019ffef14ae8e679d7afb1e72dd52e78b17cd4a518e6287308c59a66c3
+EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c
 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
index 58efd29d1eec..9d916f741cb0 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="java static-libs"
 
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index e1ce9cbd25d1..add64f63eba6 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,8 +1,6 @@
-DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db
 DIST liblscp-0.9.2.tar.gz 689968 BLAKE2B 1b78389a764a58e47b24676a4b4cd6ada7647ef1bc16e9d63a7fe6ad6b62870521ec39eef866b862e07fad55baacb3f0814293858dcdaa6bcd6d8a94d600e780 SHA512 e0d6f2ae3679cf41b1bc8f04910614424d3bbc046e51272a9d526429d098b0e674dccd5951482fd85832d9788a74eeefce99d1d81291e3829c077c98bcb87602
 DIST liblscp-0.9.3.tar.gz 696509 BLAKE2B a3cddd07f55522291be12f2952eafd0b9761ac8c3d38c05010d9ca6593ef9db62d9bdd7a1e8f31d74fd9cbd29cbe3ade71f3b51ffa330780a0b7feb18ff71d32 SHA512 e776b0d48a9728e69b1a198d44ab88862366ecece293d71f6552ab395fd33bfdc395dbea6f56000c2ef9897ba00e0e287b0bc042fd6b6bdc1b4864b72b20753e
-EBUILD liblscp-0.6.2.ebuild 637 BLAKE2B 248a9bc252af1529c988da6775225b3d877bc7de320ddb3e6b095b7ed0a90a73a0932870440fdb7f7f084f2dfac867796d92d0d4d0989fe4ec760730781f015e SHA512 d7f2bade518b7cd3302f6ddda469f99ecdafda4b1066d9c01a33e1837c9e22b63a4daf9db49649c90da02b13b7f0e0dbfb1e7de9b22c50e02c24feaedf034098
-EBUILD liblscp-0.9.2.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
+EBUILD liblscp-0.9.2.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
 EBUILD liblscp-0.9.3.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.6.2.ebuild b/media-libs/liblscp/liblscp-0.6.2.ebuild
deleted file mode 100644
index 42b207f10318..000000000000
--- a/media-libs/liblscp/liblscp-0.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-https://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/liblscp/liblscp-0.9.2.ebuild b/media-libs/liblscp/liblscp-0.9.2.ebuild
index 8d147da49de0..515fa9bdea37 100644
--- a/media-libs/liblscp/liblscp-0.9.2.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.2.ebuild
@@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 72fe2765f472..8c56b6c1987a 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2098 BLAKE2B 70e984687edd8f1c77fbdea16f1dba0787e4d695e61d051242543930ae71a4e7814b3a6abd42df23dbb94f86c99d3efda7930aa6218b9bed13c17c5b8eeb7355 SHA512 338f3bff6c76a52a4ce0cb6cffec814715ea5676e3460d0ddeb675f00d930285e72f72033d7c87a0fcc68079212433a542862c0426490953fbffb46d8ad614e3
+EBUILD libmikmod-3.3.11.1.ebuild 2111 BLAKE2B adf713caffb1136bf036596c345d9f4c949f7b7223faab14f39ce985faefd381c71788b74b28eab26d38064aa2fa7c2c6c6b39389c7a9dbc255c2c71fd49d32a SHA512 bf2443df180a16fcb76fb7bd372cc789ccb7c2fc5ee080eb121d2684db0109389f1ede5c13274dcb526765dfb19b13958d0789a850fae41197c3ed1292c0c4a7
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index d204242d575b..fe226c3ba2ab 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A library to play a wide range of module formats"
 HOMEPAGE="http://mikmod.sourceforge.net/"
@@ -70,5 +70,5 @@ multilib_src_install_all() {
 	dodoc AUTHORS NEWS README TODO
 	docinto html
 	dodoc docs/*.html
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 2f2e5e60be5b..8c37556c0ae7 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,4 @@
+AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.4.ebuild 758 BLAKE2B d20b7f1998c1fdf3e47feacdf20aa891fb1935b60db2f889ab059c9d97e41d6948c0711af642f8790c9a4837970d02290839eb072a151509615c5357c704da98 SHA512 e3ecba0314a8006de505502e9d5ca124047c632050e2b707daed8f563c668995c4a46b7e7a101c1d3f64d7cb3da1c401ad49a959938f47726166f66a4fb5ea6a
+EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch
new file mode 100644
index 000000000000..144557b3add7
--- /dev/null
+++ b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch
@@ -0,0 +1,13 @@
+diff --git a/ogg.m4 b/ogg.m4
+index 17235da..22956ef 100644
+--- a/ogg.m4
++++ b/ogg.m4
+@@ -21,7 +21,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
++    OGG_LIBS="-L${libdir}"
+   fi
+ 
+   if test "x$ogg_prefix" != "xno" ; then
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild
index fdaae8f84396..0814202d3a0f 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib-minimal
 
 DESCRIPTION="the Ogg media file format library"
@@ -10,10 +11,12 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-DOCS=( AUTHORS CHANGES )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
+)
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ogg/config_types.h
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 30b64ad8e4c6..c10229212e7b 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,5 +1,3 @@
-DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
-EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
-EBUILD libopenshot-audio-0.2.0.ebuild 555 BLAKE2B 5b01f9cde9ff2cb95334ec8840a4a80d6ee5f5f95de7ca5c138d9e42121c1c450b0594a8d22662467e8502795ff24bbfa7d679c706195c9991947bd890b1bb56 SHA512 ab8ab99d4f330c5f0888afa1a07ac5a9895f5ab141f2a2627fa3512027627153026a744b01129fe3f6d43cb959ff639af4ddc78c682ad80d311b1ec240fda213
+EBUILD libopenshot-audio-0.2.0.ebuild 554 BLAKE2B f5937c1896b69a32caf3425729513b3cb1525ef548166d042079901ed9ad8efd5e944a04b3b3ff580ec9b870acb4fe350201940e0615beccfd35873df4fefb2f SHA512 81d0b3ad6148f22111b9aaf709a59d6d9e8425e8526406869aa2b3c1162bfbdc723ddf146f2cf9f93ff94d61f6c0b03f4d2c4def5a73a0cf7aefebeb7f3e2bd1
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
deleted file mode 100644
index 066adc17012f..000000000000
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-COMMIT="77edb1f14dde35e1facecc309dbc4fb7f07d7014"
-
-DESCRIPTION="Library for audio editing and playback used by OpenShot"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/6"
-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}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
index 904c56d046d3..6ef7cd0019dd 100644
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/7"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index fef00c162404..29df3c2bea4a 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,8 +1,5 @@
-AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
 AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
-DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
-EBUILD libopenshot-0.2.4_pre20190609.ebuild 2411 BLAKE2B 37db8467408553053705be036b15cde984df57757f26e42272a680997806a21e3528f583c4f70ce1d58c5acbf762f3a81a10f86e381fa8d9584776b4475eba11 SHA512 a66cd503b35117daf5779ab2139683ff51e6d15dd667e933171cb6ae6a600fe4e9babb5f4f674f88d67ecf663709b0907b9713c6ea781cd54ac6b006a69d15d6
-EBUILD libopenshot-0.2.5-r1.ebuild 2359 BLAKE2B 76242572db063730fd06f42a2278870c685df5b7a932d6c20bbc57dd91fb76b097b1143c1b78025e714e074aeac38a4cb4bf1167d1e07f82bbeeb752460c713b SHA512 51e9d1621b9ab777164cb87882756d8715946a3be54ac2e31426b3ba687b9d46c7a9766a06c3b6c0cc463c0bfee119a5386eaf3853b420cea469307d1f0cbea9
+EBUILD libopenshot-0.2.5-r1.ebuild 2358 BLAKE2B 15048bc7befc3b2a4136af3b87ca1a59fc93f334ac1911c23ca054f523f90cc1fe0e21ec4db0d360f499e1b2b1fbad37345067a4bd1f97b52f75ba9ec5844d99 SHA512 ac7ad11b69bdbef10dc337a3a42a35ba119c289dd54b6a8c906db39cebd5c5458d18a3482e0945d6fa734ebe023a781b578e4ef8065c2f609409bd855dc0e4bf
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
deleted file mode 100644
index bc5f738d7f63..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nru a/include/TextReader.h b/include/TextReader.h
---- a/include/TextReader.h	2018-09-22 21:47:46.000000000 +0200
-+++ b/include/TextReader.h	2018-09-23 16:17:21.212888285 +0200
-@@ -91,7 +91,7 @@
- 		string text_color;
- 		string background_color;
- 		std::shared_ptr<Magick::Image> image;
--		list<Magick::Drawable> lines;
-+		vector<Magick::Drawable> lines;
- 		bool is_open;
- 		GravityType gravity;
- 
-diff -Nru a/src/Frame.cpp b/src/Frame.cpp
---- a/src/Frame.cpp	2018-09-22 21:47:46.000000000 +0200
-+++ b/src/Frame.cpp	2018-09-23 16:21:44.921563711 +0200
-@@ -29,6 +29,9 @@
- 
- using namespace std;
- using namespace openshot;
-+#ifdef USE_IMAGEMAGICK
-+using namespace Magick;
-+#endif
- 
- // Constructor - blank frame (300x200 blank image, 48kHz audio silence)
- Frame::Frame() : number(1), pixel_ratio(1,1), channels(2), width(1), height(1), color("#000000"),
-@@ -904,7 +907,7 @@
- 	// Give image a transparent background color
- 	magick_image->backgroundColor(Magick::Color("none"));
- 	magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod);
--	magick_image->matte(true);
-+	magick_image->alpha(true);
- 
- 	return magick_image;
- }
-@@ -926,13 +929,14 @@
-     // Iterate through the pixel packets, and load our own buffer
- 	// Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function)
- 	int numcopied = 0;
--    Magick::PixelPacket *pixels = new_image->getPixels(0,0, new_image->columns(), new_image->rows());
-+    const Quantum *pixels = new_image->getConstPixels(0,0, new_image->columns(), new_image->rows());
-     for (int n = 0, i = 0; n < new_image->columns() * new_image->rows(); n += 1, i += 4) {
--    	buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red);
--    	buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green);
--    	buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue);
--    	buffer[i+3] = 255 - MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].opacity);
-+    	buffer[i+0] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelRed(new_image->image(), pixels));
-+    	buffer[i+1] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelGreen(new_image->image(), pixels));
-+    	buffer[i+2] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelBlue(new_image->image(), pixels));
-+    	buffer[i+3] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelAlpha(new_image->image(), pixels));
-     	numcopied+=4;
-+    	pixels += MagickCore::GetPixelChannels(new_image->image());
-     }
- 
-     // Create QImage of frame data
-diff -Nru a/src/ImageReader.cpp b/src/ImageReader.cpp
---- a/src/ImageReader.cpp	2018-09-22 21:47:46.000000000 +0200
-+++ b/src/ImageReader.cpp	2018-09-23 16:22:32.330865516 +0200
-@@ -59,7 +59,7 @@
- 
- 			// Give image a transparent background color
- 			image->backgroundColor(Magick::Color("none"));
--			image->matte(true);
-+			image->alpha(true);
- 		}
- 		catch (Magick::Exception e) {
- 			// raise exception
-diff -Nru a/src/ImageWriter.cpp b/src/ImageWriter.cpp
---- a/src/ImageWriter.cpp	2018-09-22 21:47:46.000000000 +0200
-+++ b/src/ImageWriter.cpp	2018-09-23 16:22:58.380031419 +0200
-@@ -97,7 +97,7 @@
- 	std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
- 	frame_image->magick( info.vcodec );
- 	frame_image->backgroundColor(Magick::Color("none"));
--	frame_image->matte(true);
-+	frame_image->alpha(true);
- 	frame_image->quality(image_quality);
- 	frame_image->animationDelay(info.video_timebase.ToFloat() * 100);
- 	frame_image->animationIterations(number_of_loops);
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
deleted file mode 100644
index eea5ca7a14f4..000000000000
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit cmake python-single-r1 toolchain-funcs
-
-COMMIT="0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997"
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/17"
-KEYWORDS="amd64 x86"
-IUSE="doc examples +imagemagick +python test"
-RESTRICT="!test? ( 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.9_pre20190502:0=
-	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# 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_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_use_find_package imagemagick ImageMagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_build doc
-}
-
-src_test() {
-	cmake_build os_test
-}
-
-src_install() {
-	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
-	use examples && DOCS+=( src/examples/ )
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	cmake_src_install
-	use python && python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
index fefc007eaa7e..0ce3d1ebb499 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/19"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples +imagemagick +python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 290e91b97dc7..367abbec6121 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,5 +1,3 @@
-DIST libpgf-7.19.3.zip 1303189 BLAKE2B 129ec655241f0a152814b412c1ee5d40fc5b89daef172d1e73985e49f8ffec22ce87c6aa893dbf330b5176370d985ffd0c6a015adfbb9faf72131bc63cf0c94d SHA512 68f9734b51372f7bb39b35cf99425bac6f9cf29f0351dba8813742c41f62f394798c92f674803d1315456a9337c7af03479d43455a9e611c07f5cf47ab3e5b58
 DIST libpgf-7.21.7.zip 2075722 BLAKE2B 31c5ab5930ef5658ca9b320fa3df94b7d8566467a657df6d255781664a4750d6b5cb7b351c828cad7c60b42f8cb8926c51bb0271d5c51e2484426a15f18b5eb2 SHA512 dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
-EBUILD libpgf-7.19.3.ebuild 801 BLAKE2B c55364991eb98d6ee6ef594d575e65873d878645feff7c8103f25bf301a7f2705ff1913d5ec5727447d11c16a4d83a0fbd2535281ff122532900dbaee54f6b12 SHA512 d39c5a1ca845af427d53913082172fb9db2ef3b30c951849f113ff4790ed88d851af78d5abd78e4cc15e4c8df059aa424ae36fc7928ad33697be529b77d3ac00
-EBUILD libpgf-7.21.7.ebuild 970 BLAKE2B 853f2272d1672f69253a2ef3dcadf6c983bc1b3d4f13395218e8d68dd63cef58c679ad790758c7db619d942f6f4040adc7f986938e56120a303cc9f79c870a6b SHA512 951bb2435265341d6ae9191acd8f9d9d38d1e5b37fe42fdadf88775a9a4e9eeb4b40da536965ddc9be6f0b35d9db902534f32a6763861b7bfcac3539a1678dcd
+EBUILD libpgf-7.21.7.ebuild 968 BLAKE2B 4da545e6f56dfe15d1a7f0bd837076bc92b5d9614d040b88c3426ac63fe0c97c94019c8a609b8a2f703b834481207e101fd9422daafdc5df821c7af690c761c1 SHA512 64ecf531a41fd11b89534f294bef4b212e944f3b30c8a2e199fdc48cca452438e42c34e40b33b13a08221e8c6b867f39a618e48d656d802349c5c1c0f8500ca8
 MISC metadata.xml 402 BLAKE2B ce7dad4fc9e57a354e4cbd49d7c2ba2beb8c0c8e5163ef846e51f6bfe329cb2368857bf027f0c8e01f3722ca956ed809e539ec665cf48254022efa4b0cd50519 SHA512 a69578f7391678865fdedb982b780dcf8733096a1ca36219e9045708e9643e9c5a1638f59dffeace89cdc12b0ec58c7dbea271a04b8214b8cc58034e0598b29e
diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild
deleted file mode 100644
index b54109c076ff..000000000000
--- a/media-libs/libpgf/libpgf-7.19.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
-HOMEPAGE="https://www.libpgf.org/"
-SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}-latest/libPGF-codec-and-console-src.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="
-	app-arch/unzip
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/libPGF-codec-and-console-src/PGF/Codec"
-
-src_prepare() {
-	default
-
-	# configure.ac has wrong version number
-	sed -i 's/7.15.32/7.19.3/g' configure.ac || die
-
-	if ! use doc; then
-		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
diff --git a/media-libs/libpgf/libpgf-7.21.7.ebuild b/media-libs/libpgf/libpgf-7.21.7.ebuild
index 7d9af7177603..38c981e62582 100644
--- a/media-libs/libpgf/libpgf-7.21.7.ebuild
+++ b/media-libs/libpgf/libpgf-7.21.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}/libpgf.zi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 844feceb2fc1..cd919822f719 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,11 +1,12 @@
 AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
+AUX libplacebo-2.72.0-fix-vulkan-undeclared.patch 1143 BLAKE2B 54d69a48b1f1fe02c5f9ea5210cd0ee4016d4284c7995ec8b672ab932ddf9fc39e54870cc56ca9208521ce9ea6daa6d464161b2a3ea581506869dc38d94c1786 SHA512 1de6c8bb3eb4945eaa64a90f13aef8a0f069462a741f9f2656579a28ee80850639a94e03b2d4d1c6a045c9a12b74f52e8d6ba07e7634bef36b48ed34a516864b
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
 DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
 DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c01a27c5f97873ff0e5e3212d9b7cdebd98cce3d5ee5364ca8a585ec2a16d0bafc5a863ed35f6f225d86a4410b92edfd3 SHA512 6a2d3c6c053edc3a912a46f9c16d226d83c6f8880714f0b20a8b9417889616e4c1d4d41b8935b898cc580dc3b480ce974bb3921162165f0774ea91be1dfff520
 EBUILD libplacebo-2.43.0.ebuild 1564 BLAKE2B 6ad120ec3ff0fadb1619cfe39a9495e03c3dfce8b2aac9b06b18331355b16ff0a4f98708d337746fde1911947c1d61e55d5ff2358f8757be12c29eeee7607aa3 SHA512 b2ee3a9eaf533fe5d284ec3243d06c9871b526e8f82c11f58de412662703966e014cdeba3294b22a328355348fcac839a68f04c1d8da004a64b18c0af423487f
 EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
-EBUILD libplacebo-2.72.2.ebuild 1887 BLAKE2B 33b04aca370df443ea0be685beac68a201595685edb9298bc8f48540b966ad891485f11e3622d96d28c09e93dbb949aae2588d4763e820d67941e0e327041b42 SHA512 2c9fafa906884c9408a36cbd10e12ada226704431c795a2afdc0e1a122e8b2b273770e5d7181efc38beb0bec45d5e19457180e44b18242d28df2c311f0938fa7
+EBUILD libplacebo-2.72.2.ebuild 1956 BLAKE2B 6a0d3212b34738bd105298d61d85a914fbb823a02a5b83e6f3af3fd379f564d1e94b1744059880eb5011eaf34dbcabf06fff0900862952b0ef8ab7c2624e65fd SHA512 3e75fd49e50863a615e6b92c7ef0fe6212960ec4e9565eac5e95fa7223311a421582ab4d0e8f237dc6cbd57a12bb71603a66859838830c297ec1afdbb44535a9
 EBUILD libplacebo-3.120.3.ebuild 1887 BLAKE2B 918c0f6525ff7dbe46422e59f33f8d7339abb01668b7ea83f0aa0a366775a404c3b13704886de7aed923342b8bb974aa77c28ca8a3c26e3e0dda55292d8a3e09 SHA512 0afaf40e5e57d766d1aba53bfddd8affc48d064e56d82a0c27a6023a8111c1427b065452b6fe543fdec8f9c6eaefe85880b6bbf8ac8723ae7c07cc1ffecba689
 EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
 MISC metadata.xml 599 BLAKE2B 1eaf6838d56d66603411785c54a4f7aad9152cc06e57152639bfb8cb0e29f55f68a0d6df01958cc67ecef9dd1ae84cbb33f83952820f8864f63e7e31975c8911 SHA512 ec68741bb3770de0166d12a3717d97a4ddce3b6cd811ed7b7074a78ee80b8984b5c59f4807c0f984d0d3fd6a5501b482c7c351b9a9541ff1e37fbf99c718ce6b
diff --git a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
new file mode 100644
index 000000000000..15bac9718222
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/789498
+
+From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git@haasn.xyz>
+Date: Tue, 23 Mar 2021 11:57:13 +0100
+Subject: [PATCH] vulkan: blacklist FUCHSIA strings
+
+Maybe one day we'll actually figure out how to make this python script
+exclude platform-specific stuff in a way that doesn't rely on hardcoding
+a list of strings to blacklist.
+
+One day.
+
+Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131
+---
+ src/vulkan/utils_gen.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
+index a4565f3..53195f2 100644
+--- a/src/vulkan/utils_gen.py
++++ b/src/vulkan/utils_gen.py
+@@ -155,7 +155,7 @@ def get_vkstructs(registry):
+         # Strings for platform-specific crap we want to blacklist as they will
+         # most likely cause build failures
+         blacklist_strs = [
+-            'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP'
++            'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
+         ]
+ 
+         if any([ str in e.attrib['name'] for str in blacklist_strs ]):
+-- 
+GitLab
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 6dfc04687ed1..145c4fe558dc 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,10 @@ BDEPEND="virtual/pkgconfig
 		$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch
+)
+
 python_check_deps() {
 	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
 }
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index d90de8e46e6f..b45b00979a90 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,4 +1,4 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.2-r1.ebuild 764 BLAKE2B 7527e8553a597122b7a694221a1ae81600c844eb8b66a03733ff70c1c75a05528b5890ec0e24176076c7fef9de2652c7aac2a22c33acb3d49b0cbf263730aaf7 SHA512 6d9e5810c65e79fa8228fabf7aaca0992c8e23f6a153b42dc0771c188c35df1c467301cce567981203a7be7ebe7c1a8c4776284ebff1fde2b0f9cb6b67dfead4
+EBUILD libsbsms-2.0.2-r1.ebuild 777 BLAKE2B a57fac08003143c2548da453a21a2d0d64a681e9a8a519d91d517e3e58c24b76be684a139ba80009369a39c61feff9c4e50ce32f9b7751d53e02105be9991710 SHA512 ac99a488a13e16b2f304e0c66b10445a13181302518114c10814df0c98ce96466287cf333693a30f25b8df00f0c05cb4384deec3a46bcd28c4c38c882d1a5713
 MISC metadata.xml 334 BLAKE2B 27f96c580033502f5fae3be23efbde22dff9671695e36128f4e8aa1103d81383d718dd36225f1a966b0bf800a7566a89f735197aba72d4842f7162f3e7f06333 SHA512 0bdcb69cb01f3ee3734ee6374e72b0e2d6b413660067b0c63df773f61d13230d0e1b7af19ed5ffe8a31472a4f8e715c3da3b76bdb3e350cfbadab5dbb4d25a59
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index 1d5aa0a2c7df..f4f5d9217be2 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 AUTOTOOLS_AUTORECONF=true
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="A library for high quality time and pitch scale modification"
 HOMEPAGE="http://sbsms.sourceforge.net/"
@@ -33,5 +33,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 0ba8ac4c7ac3..b2579546c9ab 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -9,6 +9,6 @@ AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d
 AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66c81a70e7ab7366cedc38d11641f7ab68699d5fa2ea466a2e99c5cd778bb949114a5c5a4190e37f8fc86060962a8bf4 SHA512 e020a8d9a4fe2e74884b0aa8e69778dbbf2b60c70181767f84404038a07ca55956794b19ad8d3a4e5211bf6ecf05ec65712a588076fe9467442f21b99baca4fe
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
-EBUILD libsdl-1.2.15-r9.ebuild 4081 BLAKE2B 258b06714d6ee5783241833823da37a9a8785e96702c1de4b87c1ee7898b95137317f38784e7fd025b78462d7351ebcd25d0be122af7aff5586b9c279c5b497c SHA512 0a910fd44c84082b74b67037d6703765d50ff9d6fc36c9d5e3e3640b6b4099fcdf2d2ce9022d64fe213fb6c94af78d3871486598f1c335863928862ae2804750
-EBUILD libsdl-1.2.15_p20210224.ebuild 4949 BLAKE2B 400524ae9f36330af81fafd2d3778f10c8a435ae1a6039a9e34e459bc689bd1f5b0019070cc06d92cc50aff34c476ccd7d8a9508b55107f37b6519b5c3d2836e SHA512 783acdfc7df215863607795f6417c98c95b3032768a524c7eca497557bb7cfbfb5cbb19783a4598755c873c08283523eb6083657c5a3c1d51cd18470d5f7f882
+EBUILD libsdl-1.2.15-r9.ebuild 4102 BLAKE2B 28050b8f015ae91d8c3d21593c92a9141a2163913fe3cbfc10efe46e10b4c3ac0ddde6afd848c277d2f65953953a88cc55ef90cb766f9d20ab30cceaf6a000b8 SHA512 f8cb933c56221a56219951224d14c7f90011287a0bb0c2025c577949bcd3337647a70733f58b56f44096fcf1c76e1b520cfef04657ad5374bff0929f95dde541
+EBUILD libsdl-1.2.15_p20210224.ebuild 4956 BLAKE2B fe1c355fa17c2a419646f5ae87134e828f846eedc05d3ce0b96111cc2626468a82403cc7b187b6f395942790b8ac5357b0e97fa3612a28927697398e487f2705 SHA512 3bb2d474db34fb64b95e535109b3fd1b95fa2e995356508fbb6ca33c7f87c95dec7cdd79c96ab5fe9c3e23464346f9e6e2c8371db34f0178cb6cdde53c5cbd36
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index f4b6d7b5d092..4ec34594ed56 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools flag-o-matic ltprune multilib toolchain-funcs epatch multilib-minimal
+inherit autotools flag-o-matic multilib toolchain-funcs epatch multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="https://libsdl.org/"
@@ -127,7 +127,9 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
 	dohtml -r ./
 }
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 274c20d5e60a..a1ff73692100 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SD
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index dc7a974584ed..6252aca644d2 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,5 @@
-DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
 DIST libsidplayfp-2.1.2.tar.gz 788212 BLAKE2B 1959404d8b694e9271276bd3a7d32298747fcfc52fc96da3ebae16e23ed9c1825cda4810bff5ad39a0ca7f173300f6b86791ff589ee78bf05c9e12bc49bccaf5 SHA512 c044cc835666a7616b2c16e8f186877caa42c80c74ae2fd503868f77311ed6bc8df58cbb72e7086477adec1ba314bd4f1410a733642ff18baf1596afa1a9b22b
-EBUILD libsidplayfp-1.8.8.ebuild 837 BLAKE2B c895321c29600fd9d7a46c429606dbc1efd60c376e437a84cc5edb4c16abaf12cb02c3e3a38971be3a5684bca2ac6309c7b45d6805be36dbd71cc5a351411754 SHA512 d2452be2e98918d9fd8a694b80c5cfa60118fe9578b0b8a212b8e51deb04d22e503684865469b236a33b4db8eb0988dedf855ca0ec80d88ee5a20551ba614fe2
-EBUILD libsidplayfp-2.1.2.ebuild 747 BLAKE2B 02b40f4d38913c921db9e63cecc122a2eaf982389c35ae9e31fa2c03c7ad300ed1e0c766c9ad7d23105a72a6fc78d76402a1b2c479c03d7b0fe8ddf00ec21208 SHA512 6b92125a4ab7212433be9e8076cb036be45ca1434639b3b5dfcae331564f48b3c88c5d73079ce3169f93d7658c56a75275e58a3bd4ca4a9a80a292a56a34aeee
+DIST libsidplayfp-2.2.0.tar.gz 794840 BLAKE2B 1641808e5821f824186b0fd7108dde67ca476724dd4c554dbcca9acd2778c1384e9fbc016658c2c399dbe001100f56658b56234e23032a90aaa75a8faed92792 SHA512 29412410ba1690ad6c9e98f172a0cc49e5d1cb828329da152aa76472ef524932d8b2b35f48f831dbfad08d0c78be22440fd939a1e38b7046cf37fbd34555c683
+EBUILD libsidplayfp-2.1.2.ebuild 745 BLAKE2B b6bbf40f405931533a63166f9fd1c7a14e9c334a3911b380382227fcfd85ed45f471b045bd966651e00e3c78a4a2fbf5f51dd6f69a9a5929dcde51093b7b8a52 SHA512 e0450393b8e2c9c8db50c348a8da8e7301ef3ec475540d86de6967dd8ab828264aadfc8b8870cf727a713c4afde74f1e06ebc8e423aaed92f3a2ee2b68f4cbf8
+EBUILD libsidplayfp-2.2.0.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
index 8712fad9752d..963016b016b8 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
index 2de341bcba48..219eebf19780 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
-
 DESCRIPTION="Library for the sidplay2 fork with resid-fp"
 HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
 SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="cpu_flags_x86_mmx static-libs"
+SLOT="0/6"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
 
 src_prepare() {
 	default
@@ -21,13 +19,8 @@ src_prepare() {
 }
 
 src_configure() {
-	# relies on undocumented "uint" type in libstdc++
-	# bug 649832
-	append-cxxflags -std=c++14
-
 	econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 94ba50d344bf..df72a764d09c 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,5 +1,3 @@
-DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
 DIST soundtouch-2.2.tar.bz2 527571 BLAKE2B 0ed67604f0996a9112cbabad9eda39c314aa1f3b1b70aac2a014f76880cb5ad06aeb697f44e9229ad197c9245ce8f684f5fb9b31ce31ae631400a17fe825679f SHA512 8bc1b9aa60031145e8be7ab48d10d93da84b0f5032eb2d8cf46291d4267b6810513f284f6fa72dd6f343e30eeec03070a7485cd933f30bace2ebf995bc843143
-EBUILD libsoundtouch-2.1.2.ebuild 1520 BLAKE2B 1201cd8926d9a18249cc31bf7a59a4f2fcc7069fc4288ded072c0186c4d7e1494311080d8dec1574d0449b8b90117b8d0bc7569135cf03265a8aa08853883499 SHA512 2d8ca9157fb7e2a360a106231adf089c01ac804b0804d8197500c32e97aee60dde3289867ef7d9e0ff71b0db538dd640ec38e185256c524d39c8a0b8c70e6683
-EBUILD libsoundtouch-2.2.ebuild 1524 BLAKE2B 5dfeb54696c03bcc4d95d28798230ffd4dd60c63a40abfcf1498ff5dfd10300e84e568aff4ed7a01715d315b953f92d935182550c8cfb0d9570894837039ed08 SHA512 d8b236a447e751fbf04d45069748260efb46db7628b4e5e9e0fffcc8d86f2c8088ebecb830b6155780214bbe97ffda2bf4079d1c2398b15cd89909b0b38c5fe3
+EBUILD libsoundtouch-2.2.ebuild 1520 BLAKE2B 705d5129d3a63288122abea8678e54ef1e390dd5ff7257eec7843b4e1f41e3eeaf121922d30fac9ce0c231fd864eb6c441a2dc735d04db5786797427941cfe17 SHA512 78764152c7b4cc941422515013cc82c63c4fe992de1dfbea87213fbf81fec3122405905837ec26da80d93d7ba4dbfdf75453d0427acfa37d5a51c3bc858a39f5
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
deleted file mode 100644
index 032c08b22671..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN=${PN/lib}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
index 05a3b1ff14d0..1a94984f85b0 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 8337d088c4b7..c8cae788668a 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2327 BLAKE2B fc123e4fc340198e4a722b396af046eb9cac3831ced19757cdf00593808e972d3d7eb8ba8aad293e0bdfe5d234a8532b570ed0294654e07637992727547b8589 SHA512 a0450d67ad91541ffe341d1aea3680dd9894ab7be2ce45c562a9df9e014654bb9da3d80e119caf6ddba61d6890042830ef5b1ab6ec408b346f7d9e5365462a9a
+EBUILD libtheora-1.1.1-r2.ebuild 2334 BLAKE2B 865659be5d0835f1e84843212dc2c5a8cc26d9b821963d6c2005708574c1e1a97402d1db31f619e17315c2307ff62de744b1b444b6e09ec11b6f191c68fc0f62 SHA512 af506837dd333d95a9d4a5e10ce3f863e133beffd430c6c446eab85e34b841861e37164f760716545ae728ae3d8764ce919e9833a87011855d90c0e298850efd
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 0eb94f2d8ad7..af240a4897ad 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index 422e49d20401..6dc9af564916 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,5 +1,3 @@
-DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9
 DIST libtimidity-0.2.7.tar.gz 435691 BLAKE2B da6ac814297e9663dea44044eea640d5e4d750aac0e58e79eae0f3a9af87613ee55eeec1e3ed2ac2dd8a5d9eb2b427c6cbc66a1a58a1dd9268eb241a26f29fa6 SHA512 91ae25a18a453d4a1301f257d74a9a67ade515e182e27921549a7cd086f816770fe58e6cc9c72a06cb4a1cd2c6639c43fb902241e13baaabba1320166a337bd1
-EBUILD libtimidity-0.2.6.ebuild 818 BLAKE2B bf3e0d1b314fc1466ee5bbd466cbbee766037192d8148ea828f1d64091ea74b1b913df88980461dd4e4dd5b9d5998364f848e9b50409961d45b62dbad6f4d57c SHA512 5ccc611ccfe7b2e3b8c4e327ab90179e60aa83470b41f3195b2381e4ca3414713f7a892c01d2d764576198600c9ff68fad471efebb54d3171f53a35dca75f244
-EBUILD libtimidity-0.2.7.ebuild 823 BLAKE2B f6c4f6b4a138411f7a119f58e13130e6e90fe295dd1ae8f8df90b5ee1045989b1830471aa62210f0e356fb8afa90b3bfdfb57a3184428237192e7f78df4aeeab SHA512 cd48f0284ffeea622716693c9dbb58158017245c487d091938148a24b00a738c00d1b99e85a451f202537cbb27baaf96cd6ba41ecd5a53debbded40aca9fc15b
+EBUILD libtimidity-0.2.7.ebuild 818 BLAKE2B 6a4bf1152089f7b33e6d85c26180a643ce04ea6d4d52db296f5dcd47a686b7e5103324fed4c8741fc4b672a28d19a96fec80ffa1e5faaadc5a0aa595dd438af8 SHA512 8e1b5c88f5bd6dfeb907c3a89db86a45b878934c28b60e4cc0f0e0fdd5f06450c2af99b988f1160034f63bb72d83c798cdfc7f0b05ced9c4609c2e9ef8a09092
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
deleted file mode 100644
index 14fc66562e1a..000000000000
--- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="MIDI to WAVE converter library"
-HOMEPAGE="http://libtimidity.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="ao debug"
-
-RESTRICT="test"
-
-RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS CHANGES TODO README README.timidity )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable ao)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libtimidity/libtimidity-0.2.7.ebuild b/media-libs/libtimidity/libtimidity-0.2.7.ebuild
index 1aa2d21c7c28..82aa6184dfce 100644
--- a/media-libs/libtimidity/libtimidity-0.2.7.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="ao debug"
 
 RESTRICT="test"
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index 978a13778769..2a2d6c07a110 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,5 +1,7 @@
+AUX libuninameslist-20200413-makefile.patch 772 BLAKE2B bdb927053b364d9602dd8e3215f4bee166f331c9e996e465127ebcbab2c570251651154bd6e692de7b3da6679cc4e654a1f1779a7451a706b3d9fe29139398e8 SHA512 fbc3a3b30c89651a691db50f959edd7a18755b171b565900ab4631a8ac72588657dc1d00e83eb3d4c7116b6d629413160f5d6f6b64a4d375fedd7739e707f8f3
 DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2
 DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3
 EBUILD libuninameslist-20091231-r1.ebuild 569 BLAKE2B c6c7756ff1750da6071383171f22fdc2aba91bfb73291ba76deb5108ad24760691b9d3e75fc9a69532b82dc9590d000183b59788c533e260033d0e64d57d9e90 SHA512 94ccdd53e367cbd45c8914137d3935c1730c50bf17e6f53b56430b7442a887f9d038c2bb831cb5a0c04d104d1e6b305dcaa9a75cd590e260f56c4eeedca91c36
 EBUILD libuninameslist-20200413-r1.ebuild 598 BLAKE2B 2c00a221fdb6ecab8f83450654b0c5cc189d318749002ae8cbdcd56bf4d646e8d8fde27a1cb52520559fe836ba67e6966c6ee22aaa059443a150bb73ab1de8ed SHA512 79e1882677b8ebb5986d7ec8cf632e63f487dfa141717688b10bf6d45cf6229507b636cefa3fd40343ef8b48ffd7cf0ee5188538a437b6a6d5d5994f92a6e564
+EBUILD libuninameslist-20200413-r2.ebuild 743 BLAKE2B 614bfc8f6c34e7fce0689ba1a8c9987f0ffbd65596ffeff2a317287a38b929dd125281279b5f4b41d3592a5af94c7938d65efb2f7f418949f24c0359ac4f9230 SHA512 53c4dcc3952d7e59354ad60ee979ceb7fc63541719f83b8a07508581fa359f1b79bc673d33a3618fc39b04bd939917912692018c92ef7074937ec4bbdd08b3b0
 MISC metadata.xml 483 BLAKE2B bf0ffb6a5095fd83a532b7ac3c1b07509a88970787a9624fd82e0b577634f807f4154180c44275c97f1981cfd306f94358e19f614b00daa32b20a9b61bbe6808 SHA512 7ff44828584d7eeee4081961dd9dbdb8c54086fbed3328c21fa12298f6f8ac23e963dcd399df604956c5dccd1b1c3dc9396c063fa4f5b53ac66951db6f8edafe
diff --git a/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
new file mode 100644
index 000000000000..fc9c24329a4d
--- /dev/null
+++ b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile.am b/Makefile.am
+index 98be02ca26c8..848bc6c8269b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,6 +44,7 @@ lib_LTLIBRARIES += libuninameslist.la
+ 
+ include_HEADERS = uninameslist.h
+ libuninameslist_la_LIBADD =
++EXTRA_libuninameslist_la_DEPENDENCIES =
+ man_MANS = libuninameslist.3
+ noinst_HEADERS = nameslist-dll.h
+ 
+@@ -53,6 +54,7 @@ libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION)
+ libuninameslist_fr_la_SOURCES = nameslist-fr.c
+ libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h
+ libuninameslist_la_LIBADD += -luninameslist-fr
++EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
+ man_MANS += libuninameslist-fr.3
+ else
+ EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
new file mode 100644
index 000000000000..f83f0bcf85a2
--- /dev/null
+++ b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library of unicode annotation data"
+HOMEPAGE="https://github.com/fontforge/libuninameslist"
+SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20200413-makefile.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static --enable-frenchlib
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 731085118987..d95bd7a0af45 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
-EBUILD libvorbis-1.3.7.ebuild 1268 BLAKE2B 6e0d860993ed1b9a557938cd9767f016560ab73f0af4db3448aa708aa329cf2ed1e06a6fd48f5e45927e3a218b676386594dd0688a2e2a97652879135c3adc21 SHA512 bd92718c21761ffe7636d351d66583000ff9dc5c9797489068b30947eb18d5c95e8ff4cd25bc11556aeb1977b05c24401515e7c5881663482c4842e0d404b72d
+EBUILD libvorbis-1.3.7.ebuild 1275 BLAKE2B 8bb04176673a32320df7346b96c640e19ca57d6dc63bd7219a2e59e6df4de032b31b5ebf2fe3ecb69a5a6dea0c7d78c2d1c4ad18c27e89fdf84f18106577125a SHA512 19573c250c1403081d8341db8ba7a453acd97ec824dc5565e97b6e456eed134f861679271ec852049a432acf4bcc8847af7498b8be13073e5a19979c033e0ae1
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
index a46c693d8a08..207d84e7f560 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index 4438e48c5e13..80f95f9c21f0 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -2,5 +2,7 @@ AUX libxspf-1.2.0-autotools.patch 5008 BLAKE2B 2e0547bb6f7885304e3e4fb03e8562d8d
 AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
 AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
 DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
+DIST libxspf-1.2.1.tar.bz2 479581 BLAKE2B dccae0d88af421e869034ca5fa5c1306bfdfb0d4c6bf6e5d555cfcbb1ac6032e64d6bbd6fe7e4d6a7c0d51fe10a5dbb74fc0f8ba1e7e30ced4a961add3d5a3cc SHA512 e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613
 EBUILD libxspf-1.2.0-r1.ebuild 870 BLAKE2B 67db633d9b407008a2d7208c435e759a6242613e5aa33e88bbc357bdc74780ce42c6c58175f35ec8e82f10fcb2bbb21364c828a84002a2136f1bafdb9a631295 SHA512 de6f8d1d844c824f161c0ed3c8496b8855a632973f20f04c15078e4ede3fe6a30104a71248d3136b25db09b5f9e63dcf624382790ea5a76f7d2ea2d9f61d5390
+EBUILD libxspf-1.2.1.ebuild 700 BLAKE2B 150676b1f38529e2b09796e8d892a80f8213ba6d4e9f30bd6d09b561ec39ef5cf5ee330edad7329ad00116b1bf3d98ef91e3ffb8e86188c436de76cb1971a427 SHA512 debef3f4008bfa5baee3fe6e600d23d7cfc46483e79ecd1a00db342c8d8c3a9c0fddb7230fe1b7a4bc3a7e6cf4aa224a5f2d9eec4c057e72cd1c17325067e620
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/libxspf-1.2.1.ebuild b/media-libs/libxspf/libxspf-1.2.1.ebuild
new file mode 100644
index 000000000000..d14dc695b584
--- /dev/null
+++ b/media-libs/libxspf/libxspf-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Playlist handling library"
+HOMEPAGE="http://libspiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/uriparser-0.7.5"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cpptest-1.1 )"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-doc \
+		--disable-static \
+		$(use_enable test)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7af8cb5d210b..49912c2cf232 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,7 +2,7 @@ DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497
 DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
 DIST mesa-21.1.1.tar.xz 15169732 BLAKE2B b2c2f2fa14ebf78baeb64ca976dde2920a594bcea02b3a17820135afc169c8489f37a2869b140d637b11b618c96e37834c255ca7a92d17f70003a11e8fffd401 SHA512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62
 EBUILD mesa-20.3.5.ebuild 15063 BLAKE2B cbf593097a3b3a98f9e658f4e5e1d2bb29e7d7f977dffbb130dfd84afbfea76e10b997ec119a65450e687c101da1de199fff987f6aacfb995f4cf7551868050a SHA512 5399d4cffa57c5b1c6b089a6a0187c1aea2ee6334e8b560a8e1a7724c636538351d8d649f84fdd0d929b6c4f47c5b58cb5ebbb413a72577ca1d46db141242e47
-EBUILD mesa-21.0.3.ebuild 14981 BLAKE2B 1bcef01ce9f3df45e43f86c012249f9974e7d01b06bc5c9ba329b27efa576f699656d5b4a05025a99f991156291e5203ebfd6aa4afde4c28b2800d731589313d SHA512 7fa89a752fa2ef3b65dfed8965b76ac3a3cfe9edc9862fac408439fbeb464415084c0f253aeae524b1c92b9447e86d53fe28eaff50201090ae452329e7a39020
+EBUILD mesa-21.0.3.ebuild 14974 BLAKE2B 9e1b0d0fe9b2f0449fcd1a083bc8a01302d0cda7919fb78aa71ac2424dc06b57a1b276f51286a81a08bac86b8c6f4383cfdeb73f1fc10ac196623477d1d30487 SHA512 eeae6ca3aad46f11bea1a5d94f2d54652f5c90864b3fde1ef92fdbc379ee0c094ac197f6ac25a07235a68179d561d8794519681940c34d8d7cb165efcbc347d5
 EBUILD mesa-21.1.1.ebuild 15021 BLAKE2B 6b8ef24e6e5d64b5c22edc76157924c8189bd7be957d06bf81011ab4b8d701c1393d22ad7a5301fe280f453af6aa1191563b798e6a8ded2c67b477a1ff7532af SHA512 d57fbefed59d1328bc915fb8435457a9c09e917a86fc6c1225e7ea942ee2a41ef093965b386b8a3aa5fb1baa466162683c39ef319380e5e7c27425b958c92907
 EBUILD mesa-9999.ebuild 14981 BLAKE2B df68d9a7fa62672d81582f8a43c3ff125abdd134b83683bc5bd24c2b9c457b3fc1b925102c33777d7ba121e2be6d507febec0d7ac1a32f17b738bd1785623540 SHA512 d0385e88dd4c47e499a353beeb891fb3dad9c8008642ca325402af53bb5da42243e771fcfb8088dead4c08d6ba590cef67fa6d4b86a80e383c4fbd9a25877c40
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.0.3.ebuild b/media-libs/mesa/mesa-21.0.3.ebuild
index ebeac9698ee4..cc7b3d9f036a 100644
--- a/media-libs/mesa/mesa-21.0.3.ebuild
+++ b/media-libs/mesa/mesa-21.0.3.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 9135b89c052a..25894c44fc0d 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,3 +1,3 @@
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
-EBUILD mutagen-1.45.1.ebuild 1129 BLAKE2B bcf3eeb51a0ffcb317e24ed18e52135de527d0f12f1361764e841d1ad96c60bf6fa332f5ed0e75553fd2c7026f63ada443fcc893d2fc58b46b634390ea22bf37 SHA512 8a4397ad2fdf912d22d50104232a76382c67625dfba985b48a6106fec620e69ae274832ada15d8c7f14dd8c8e1ed95cd8626d316b9220fafbf3dbcc8ebdb8d93
+EBUILD mutagen-1.45.1.ebuild 888 BLAKE2B 24a1624088d8aa1a3ae3b786bf07a63a0ea69dfade5043ae475a1e8ee16d2673b6f691e1f5e3e6a480bb15dc1eb9148319bf9f01e11bbff12fcd8bcb976ba56d SHA512 6c96861c937a360045ecf9cad34d0cbc161cd4c20dede873b75f6175c63d2799ff7be4f241d9ca4503a46c9d49cad8151e3f054f6d1a3398d7c031b96822c0a6
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 2f34aa453892..6c482da9106b 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
@@ -14,34 +13,24 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 LICENSE="GPL-2"
 SLOT="0"
 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
-# test? ( >=dev-python/eyeD3-0.7 )
 BDEPEND="
-	doc? (
-		dev-python/sphinx
-		dev-python/sphinx_rtd_theme
-	)
 	test? (
+		dev-python/eyeD3[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="!test? ( test )"
+DOCS=( NEWS README.rst )
 
-python_compile_all() {
-	use doc && emake -C docs
-}
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
-	esetup.py test --no-quality
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-	use doc && local HTML_DOCS=( docs/_build/. )
-	distutils-r1_python_install_all
+	local deselect=(
+		tests/quality/test_flake8.py
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index ba5a1e7db82c..1729c24ba1d2 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -10,10 +10,11 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c
 AUX netpbm-10.86.21-format-security.patch 730 BLAKE2B 2957d10c75264688a47a6b42a43915c4a29e97c8c097008d30adcb9783a90575bc7526121dea02d9016eb456dfbd08bd06cb2a76d22eef36620223be266dcb06 SHA512 e7b90662d8f2bb786bc0473151c949c6cb1d467e122114b5d4c8018e4b8cf3b6b2dc49a1a8b1deae95706b81d8d61bee38506b6deb82eb30d40762d4d8e6d934
 AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
+AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e
+DIST netpbm-10.86.22.tar.xz 3696588 BLAKE2B eabc11b4928681f2d96c8b6da1e23284868d7ba2f610f496d1ddf5b6ceb34c991160780f79c69b2c905e5210b024a1a5868656b89e23d6b63e587ce0cd70a950 SHA512 5840d0e88158ac77be7dfc5430e696701a740d56c98efdaf02b3c4e92bdf10268572ef0087b3bf263937073e0fbda3183aa7ed56bfe12dba30b3a3ff382bd4ff
 EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
 EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.21.ebuild 5500 BLAKE2B f87ef16b8f85afce5d4afa89efd0fa3a9f53cc1c0ecc522676e6cd2e8d0428ca0411e7d924363be90c6b98655e480d60d421e22dd3e4a8a683f3190ee99ce2e0 SHA512 6470eab0092d68f273aff46b160d8443769e1d769244c6a8c96665b999ac208cd1dde2efa50de398974a66dc7167d2b1664fa787c0eac319e8fb10b2c0f03b94
+EBUILD netpbm-10.86.22.ebuild 5691 BLAKE2B 1ab4be7f537991854dd4407c3d5fd96c578f7f863cd14f1ea5bc04966cdd7f180c76ad93c4842e53a0eb524b3694c7372067492423fb9ea257ccc7c619b97650 SHA512 71c694a08b5ba6187c66b2653f50779787cddba3865a364baf9b3c204e7db66f7d2b7b73089c8ec7618f9c3a58e9649de3cd36617dfea87c4a4c8874192ac64f
 MISC metadata.xml 577 BLAKE2B c70497704f1a34aa7b8bcf905c05560e554957e6350b7c219ea2050815215aa926f4242ae233c9f6b11a1dd9900fcbef0956cb45d50044720769857c15808b4b SHA512 9813c0b3d04c040a54dadbcedb1e88f1d90cbff7001381f7136c84ae3909788423496c7c97242cb989c63bf5127df5196d62e75c503fb2475f14f14cfd3741f0
diff --git a/media-libs/netpbm/files/netpbm-10.86.22-fix-ps-test.patch b/media-libs/netpbm/files/netpbm-10.86.22-fix-ps-test.patch
new file mode 100644
index 000000000000..e8876120a181
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.22-fix-ps-test.patch
@@ -0,0 +1,506 @@
+postscript tests fail because of pbmtolps
+backport pbmtolps from netpbm-10.94.3, including tests
+see also bug #670362
+
+--- a/converter/pbm/pbmtolps.c
++++ b/converter/pbm/pbmtolps.c
+@@ -1,181 +1,253 @@
+-/*
+- * pbmtolps -- convert a Portable BitMap into Postscript.  The
+- * output Postscript uses lines instead of the image operator to
+- * generate a (device dependent) picture which will be imaged
+- * much faster.
+- *
+- * The Postscript path length is constrained to be less that 1000
+- * points so that no limits are overrun on the Apple Laserwriter
+- * and (presumably) no other printers.
+- *
+- * To do:
+- *      make sure encapsulated format is correct
+- *      repitition of black-white strips
+- *      make it more device independent (is this possible?)
+- *
+- * Author:
+- *      George Phillips <phillips@cs.ubc.ca>
+- *      Department of Computer Science
+- *      University of British Columbia
+- */
+-
+-#include <string.h>
+-#include <stdio.h>
++/*=============================================================================
++                             pbmtolps
++===============================================================================
++
++  Convert a PBM image to Postscript.  The output Postscript uses lines instead
++  of the image operator to generate a (device dependent) picture which will be
++  imaged much faster.
++
++  The Postscript path length is constrained to be at most 1000 vertices so that
++  no limits are overrun on the Apple Laserwriter and (presumably) no other
++  printers.  The typical limit is 1500.  See "4.4 Path Construction" and
++  "Appendix B: Implementation Limits" in: PostScript Language Reference Manual
++  https://www.adobe.com/content/dam/acom/en/devnet/actionscript/
++  articles/psrefman.pdf
++
++  To do:
++       make sure encapsulated format is correct
++       repetition of black-white strips
++       make it more device independent (is this possible?)
++
++  Author:
++       George Phillips <phillips@cs.ubc.ca>
++       Department of Computer Science
++       University of British Columbia
++=============================================================================*/
++#include <stdbool.h>
+ 
++#include "pm_c_util.h"
++#include "mallocvar.h"
+ #include "nstring.h"
++#include "shhopt.h"
+ #include "pbm.h"
+ 
+ 
+-static int prev_white = -1;
+-static int prev_black = -1;
+-static char cmd = '\0';
+-static int pointcount = 2;
+-
+-#ifdef RUN
+-static int run = 1;
+-#endif
+-
+-static char 
+-morepoints(char cmd, int howmany_pbmtolps) {
+-    pointcount += 2;
+-    if (pointcount > 1000) {
+-        pointcount = 2;
+-        cmd += 'm' - 'a';
+-    }
+-    return(cmd);
++static float        const MAX_DPI           = 5000;
++static float        const MIN_DPI           = 10;
++static unsigned int const MAX_PATH_VERTICES = 1000;
++
++
++struct CmdlineInfo {
++    /* All the information the user supplied in the command line, in a form
++       easy for the program to use.
++    */
++    const char * inputFileName;  /* File name of input file */
++    unsigned int inputFileSpec;  /* Input file name specified */
++    float        lineWidth;      /* Line width, if specified */
++    unsigned int lineWidthSpec;  /* Line width specified */
++    float        dpi;            /* Resolution in DPI, if specified */
++    unsigned int dpiSpec;        /* Resolution specified */
++};
++
++
++
++static void
++validateDpi(float const dpi) {
++
++    if (dpi > MAX_DPI || dpi < MIN_DPI)
++        pm_error("Specified DPI value out of range (%f)", dpi);
+ }
+ 
+ 
+ 
+-static void 
+-addstrip(int const white, 
+-         int const black) {
+-
+-    if (cmd) {
+-#ifdef RUN
+-        if (white == prev_white && black == prev_black)
+-            run++;
+-        else {
+-            if (run == 1)
+-#endif
+-                printf("%d %d %c ", 
+-                       prev_black, prev_white, morepoints(cmd, 2));
+-#ifdef RUN
+-            else
+-                                /* of course, we need to give a new command */
+-                printf("%d %d %d %c ",
+-                       prev_white, prev_black, run,
+-                       morepoints(cmd + 'f' - 'a', 2 * run));
+-            run = 1;
+-        }
+-#endif
++static void
++parseCommandLine(int                        argc,
++                 const char **        const argv,
++                 struct CmdlineInfo * const cmdlineP) {
++/*----------------------------------------------------------------------------
++   Parse program command line described in Unix standard form by argc
++   and argv.  Return the information in the options as *cmdlineP.
++-----------------------------------------------------------------------------*/
++    optEntry * option_def;  /* malloc'ed */
++        /* Instructions to OptParseOptions3 on how to parse our options.  */
++    optStruct3 opt;
++
++    unsigned int option_def_index;
++
++    MALLOCARRAY_NOFAIL(option_def, 100);
++
++    option_def_index = 0;   /* incremented by OPTENTRY */
++    OPTENT3(0, "linewidth", OPT_FLOAT, &cmdlineP->lineWidth,
++                            &cmdlineP->lineWidthSpec,    0);
++    OPTENT3(0, "dpi",       OPT_FLOAT,  &cmdlineP->dpi,
++                            &cmdlineP->dpiSpec,          0);
++
++    opt.opt_table = option_def;
++    opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
++    opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
++
++    pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0);
++        /* Uses and sets argc, argv, and some of *cmdlineP and others. */
++
++    if (cmdlineP->dpiSpec)
++        validateDpi(cmdlineP->dpi);
++    else
++        cmdlineP->dpi = 300;
++
++    if (argc-1 < 1)
++        cmdlineP->inputFileName = "-";
++    else {
++        if (argc-1 > 1)
++            pm_error("Program takes zero or one argument (filename).  You "
++                     "specified %u", argc-1);
++        else
++            cmdlineP->inputFileName = argv[1];
+     }
+ 
+-    prev_white = white;
+-    prev_black = black;
+-    cmd = 'a';
++    if (cmdlineP->inputFileName[0] == '-' &&
++        cmdlineP->inputFileName[1] == '\0')
++        cmdlineP->inputFileSpec = false;
++    else
++        cmdlineP->inputFileSpec = true;
++
++    free(option_def);
+ }
+ 
+ 
+ 
+-static void 
+-nextline(void) {
+-    /* need to check run, should have an outcommand */
+-    if (cmd)
+-        printf("%d %d %c\n", prev_black, prev_white, morepoints('c', 3));
+-    else
+-        printf("%c\n", morepoints('b', 1));
+-    cmd = '\0';
++static void
++validateLineWidth(float const scCols,
++                  float const scRows,
++                  float const lineWidth) {
++
++    if (lineWidth >= scCols || lineWidth >= scRows)
++        pm_error("Absurdly large -linewidth value (%f)", lineWidth);
+ }
+ 
+ 
+ 
+-int
+-main(int argc, char ** argv) {
+-    FILE*   fp;
+-    bit*    bits;
+-    int             row;
+-    int             col;
+-    int         rows;
+-    int             cols;
+-    int             format;
+-    int             white;
+-    int             black;
+-    const char*   name;
+-    float   dpi = 300.0;
+-    float   sc_rows;
+-    float   sc_cols;
+-    int             i;
+-    const char*   const usage = "[ -dpi n ] [ pbmfile ]";
+-
+-
+-	pbm_init(&argc, argv);
+-
+-    i = 1;
+-    if (i < argc && streq(argv[i], "-dpi")) {
+-        if (i == argc - 1)
+-            pm_usage(usage);
+-        sscanf(argv[i + 1], "%f", &dpi);
+-        i += 2;
+-    }
++static void
++doRaster(FILE *       const ifP,
++         unsigned int const cols,
++         unsigned int const rows,
++         int          const format,
++         FILE *       const ofP) {
+ 
+-    if (i < argc - 1)
+-        pm_usage(usage);
++    bit *        bitrow;
++    unsigned int row;
++    unsigned int vertexCt;
++        /* Number of vertices drawn since last stroke command */
+ 
+-    if (i == argc) {
+-        name = "noname";
+-        fp = stdin;
+-    } else {
+-        name = argv[i];
+-        fp = pm_openr(name);
+-    }
+-    pbm_readpbminit(fp, &cols, &rows, &format);
+-    bits = pbm_allocrow(cols);
++    bitrow = pbm_allocrow(cols);
++
++    for (row = 0, vertexCt = 0; row < rows; ++row) {
++        unsigned int col;
++        bool firstRun;
+ 
+-    sc_rows = (float)rows / dpi * 72.0;
+-    sc_cols = (float)cols / dpi * 72.0;
++        firstRun = true;  /* initial value */
++
++        pbm_readpbmrow(ifP, bitrow, cols, format);
++
++        /* output white-strip + black-strip sequences */
+ 
+-    puts("%!PS-Adobe-2.0 EPSF-2.0");
+-    puts("%%Creator: pbmtolps");
+-    printf("%%%%Title: %s\n", name);
+-    printf("%%%%BoundingBox: %d %d %d %d\n",
+-           (int)(305.5 - sc_cols / 2.0),
+-           (int)(395.5 - sc_rows / 2.0),
+-           (int)(306.5 + sc_cols / 2.0),
+-           (int)(396.5 + sc_rows / 2.0));
+-    puts("%%EndComments");
+-    puts("%%EndProlog");
+-    puts("gsave");
+-
+-    printf("%f %f translate\n", 306.0 - sc_cols / 2.0, 396.0 + sc_rows / 2.0);
+-    printf("72 %f div dup neg scale\n", dpi);
+-    puts("/a { 0 rmoveto 0 rlineto } def");
+-    puts("/b { 0 row 1 add dup /row exch def moveto } def");
+-    puts("/c { a b } def");
+-    puts("/m { currentpoint stroke newpath moveto a } def");
+-    puts("/n { currentpoint stroke newpath moveto b } def");
+-    puts("/o { currentpoint stroke newpath moveto c } def");
+-    puts("/row 0 def");
+-    puts("newpath 0 0 moveto");
+-
+-    for (row = 0; row < rows; row++) {
+-        pbm_readpbmrow(fp, bits, cols, format);
+-        /* output white-strip+black-strip sequences */
+         for (col = 0; col < cols; ) {
+-            for (white = 0; col < cols && bits[col] == PBM_WHITE; col++)
+-                white++;
+-            for (black = 0; col < cols && bits[col] == PBM_BLACK; col++)
+-                black++;
++            unsigned int whiteCt;
++            unsigned int blackCt;
++
++            for (whiteCt = 0; col < cols && bitrow[col] == PBM_WHITE; ++col)
++                ++whiteCt;
++            for (blackCt = 0; col < cols && bitrow[col] == PBM_BLACK; ++col)
++                ++blackCt;
++
++            if (blackCt > 0) {
++                if (vertexCt > MAX_PATH_VERTICES) {
++                    printf("m ");
++                    vertexCt = 0;
++                }
++
++                if (firstRun) {
++                    printf("%u %u moveto %u 0 rlineto\n",
++                           whiteCt, row, blackCt);
++                    firstRun = false;
++                } else
++                    printf("%u %u a\n", blackCt, whiteCt);
+ 
+-            if (black != 0)
+-                addstrip(white, black);
++                vertexCt += 2;
++            }
+         }
+-        nextline();
+     }
+-    puts("stroke grestore showpage");
+-    puts("%%Trailer");
++    pbm_freerow(bitrow);
++}
++
++
++
++static void
++pbmtolps(FILE *             const ifP,
++         FILE *             const ofP,
++         struct CmdlineInfo const cmdline) {
++
++    const char * const psName =
++        cmdline.inputFileSpec ? cmdline.inputFileName : "noname";
++
++    int          rows;
++    int          cols;
++    int          format;
++    float        scRows, scCols;
++        /* Dimensions of the printed image in points */
++
++    pbm_readpbminit(ifP, &cols, &rows, &format);
++
++    scRows = (float) rows / (cmdline.dpi / 72.0);
++    scCols = (float) cols / (cmdline.dpi / 72.0);
++
++    if (cmdline.lineWidthSpec)
++        validateLineWidth(scCols, scRows, cmdline.lineWidth);
++
++    fputs("%!PS-Adobe-2.0 EPSF-2.0\n", ofP);
++    fputs("%%Creator: pbmtolps\n", ofP);
++    fprintf(ofP, "%%%%Title: %s\n", psName);
++    fprintf(ofP, "%%%%BoundingBox: %d %d %d %d\n",
++           (int)(305.5 - scCols / 2.0),
++           (int)(395.5 - scRows / 2.0),
++           (int)(306.5 + scCols / 2.0),
++           (int)(396.5 + scRows / 2.0));
++    fputs("%%EndComments\n", ofP);
++    fputs("%%EndProlog\n", ofP);
++    fputs("gsave\n", ofP);
++
++    fprintf(ofP, "%f %f translate\n",
++            306.0 - scCols / 2.0, 396.0 + scRows / 2.0);
++    fprintf(ofP, "72 %f div dup neg scale\n", cmdline.dpi);
++
++    if (cmdline.lineWidthSpec)
++        fprintf(ofP, "%f setlinewidth\n", cmdline.lineWidth);
++
++    fputs("/a { 0 rmoveto 0 rlineto } def\n", ofP);
++    fputs("/m { currentpoint stroke newpath moveto } def\n", ofP);
++    fputs("newpath 0 0 moveto\n", ofP);
++
++    doRaster(ifP, cols, rows, format, ofP);
++
++    fputs("stroke grestore showpage\n", ofP);
++    fputs("%%Trailer\n", ofP);
++}
++
++
++
++int
++main(int argc, const char *argv[]) {
++    FILE *  ifP;
++    struct CmdlineInfo cmdline;
++
++    pm_proginit(&argc, argv);
++
++    parseCommandLine(argc, argv, &cmdline);
++
++    ifP = pm_openr(cmdline.inputFileName);
++
++    pbmtolps(ifP, stdout, cmdline);
+ 
+-    pm_close(fp);
++    pm_close(ifP);
+ 
+-    exit(0);
++    return 0;
+ }
+--- a/test/lps-roundtrip.ok
++++ b/test/lps-roundtrip.ok
+@@ -0,0 +1 @@
++match
+--- a/test/lps-roundtrip.test
++++ b/test/lps-roundtrip.test
+@@ -0,0 +1,22 @@
++#! /bin/bash
++# This script tests: pbmtolps pstopnm
++# Also requires: gs pamdepth pamscale pnmcrop pnmpsnr
++
++# The ordinary round-trip does not work because of the way ghostscript
++# renders: a line is considered wider than a single pixel and all pixels
++# it touches are set to black if the output is PBM.  To work around this,
++# we tell pstopnm to output PGM at a high resolution (=large dpi value).
++
++
++test_pgm=${tmpdir}/testgrid.pgm
++
++pamdepth 255 testgrid.pbm > ${test_pgm}
++
++pbmtolps -dpi 72 testgrid.pbm | \
++    pstopnm -dpi $((72*12)) -stdout -pgm | \
++    pnmcrop -white | pamscale -xsize=14 -ysize=16 | \
++    pnmpsnr -target=30 - ${test_pgm}
++
++# ghostscript version 8.71: pnmpsnr lumina 33.14dB
++
++rm ${test_pgm}
+--- a/test/ps-alt-roundtrip.ok
++++ b/test/ps-alt-roundtrip.ok
+@@ -1,3 +1,2 @@
+ 2425386270 41
+-2425386270 41
+ 2916080186 235
+--- a/test/ps-alt-roundtrip.test
++++ b/test/ps-alt-roundtrip.test
+@@ -1,21 +1,24 @@
+ #! /bin/bash
+-# This script tests: pbmtoepsi pbmtopsg3 pbmtolps psidtopgm pstopnm
++# This script tests: pbmtoepsi pbmtopsg3 psidtopgm pstopnm
+ # Also requires: gs pnmcrop
+ 
+ 
+ # This script is for testing alternative (or minor) utilities that
+ # read/write Postscript and encapsulated Postscript:
+-# pbmtoepsi, pbmtopsg3, pbmtolps and psidtopgm.
++# pbmtoepsi, pbmtopsg3 and psidtopgm.
+ #
+ # We keep these tests separate from those for pnmtops and pstopnm
+ # which are far more popular.
+ #
+-# pbmtopsg3 and pbmtolps produce output that require pstopnm for decoding.
++# pbmtopsg3 produces output that requires pstopnm for decoding.
++#
++# We used to test pbmtolps here, but moved it out when gs changed its
++# rendering formula.
+ #
+ # Failure message
+ ## If ps-roundtrip.test succeeds and this test fails, it is most likely
+ ## a problem with one of the alternate Postscipt utilities:
+-## pbmtoepsi, pbmtopsg3, pbmtolps or psidtopgm.
++## pbmtoepsi, pbmtopsg3, or psidtopgm.
+ ## If both tests fail it indicates a problem with pstopnm or gs.
+ 
+ # pstopnm does not use libnetpbm functions for output.
+@@ -33,18 +36,8 @@
+ rm ${testgrid1_ps}
+ 
+ 
+-# Test 2. Should print: 2425386270 41
+-testgrid2_ps=${tmpdir}/testgrid2.ps
+-
+-pbmtolps -dpi 72 testgrid.pbm \
+-     > ${testgrid2_ps} && \
+-pstopnm -xborder=0 -yborder=0 -dpi=72 -stdout \
+-    -quiet ${testgrid2_ps} -pbm | \
+-  pnmcrop | cksum
+-
+-rm ${testgrid2_ps}
+ 
+-# Test 3. Should print: 2916080186 235
++# Test 2. Should print: 2916080186 235
+ # Output is pgm maxval=1 with black and white inverted.
+ #
+ testgrid_epsi=${tmpdir}/testgrid.epsi
+--- a/test/Test-Order
++++ b/test/Test-Order
+@@ -183,5 +183,6 @@
+ 
+ fiasco-roundtrip.test
+ jpeg-roundtrip.test
++lps-roundtrip.test
+ tiffcmyk-roundtrip.test
+ yuv-roundtrip.test
diff --git a/media-libs/netpbm/netpbm-10.86.21.ebuild b/media-libs/netpbm/netpbm-10.86.22.ebuild
index c729f0b7f70f..048c6e3162e1 100644
--- a/media-libs/netpbm/netpbm-10.86.21.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.22.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.21/${P}.tar.xz"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
 	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
 	"${FILESDIR}"/netpbm-10.86.21-format-security.patch #517524
+	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
 )
 
 netpbm_libtype() {
@@ -92,10 +93,14 @@ src_prepare() {
 		sed -i -r \
 			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
 			test/all-in-place.{ok,test} || die
+		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
 		sed -i -e '/^$/d' test/all-in-place.ok || die
 		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
 	fi
 
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test
+
 	# Do not test png if not built
 	if ! use png ; then
 		sed -i -r \
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 32ccd534eb03..10c27070d181 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -14,8 +14,11 @@ DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527
 DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
 DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
 DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
+DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
+DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.1.2-r3.ebuild 18312 BLAKE2B 39fb4c39c4635128d31dcd5954136316eddbeb442c7331818a12d8cbe1615df0f0c2413be84ae32eb4e24b07a87fcfc7664c490b3b70049ae26fdc63d77bb268 SHA512 7d33490fefc27f8a565e714f686635902a4dcb2b99072da88c58e1ebb9d39e76b328345e035d2171b5a21ceeed7e3fafe81911273a0b090aaa7a3a6020d1bea6
 EBUILD opencv-4.5.0.ebuild 20509 BLAKE2B f0c9cdab62f516faf0b992bc7feb508c2889f552bbc520cc93f564782f54583ad6816ef9db9b1ad812dd84f75dd99a3d8fe5412b27fb3b659f6aa141abc4c4a3 SHA512 78ca91218694de32ba693650225e0fd84ba0ebe9451be348dde52bac27972d87449b49633f318333dda838e31a5d043351493531e88ff88945a41460f50011a5
-EBUILD opencv-4.5.1.ebuild 20599 BLAKE2B f901afa70907bf457fc327a169418b4b436204e5a84d247017bf336393d0616f8eabb1c4ccdcea9844f2cac04915ea4b633347bfff019d259820db0f025462c9 SHA512 48b466cbd40c9248276870f2a3cffff1f400a0a4d1f01381c11d20a4706d3f55c18347f4409b7d86a4aace412d505aebbcde3fc64f9ec956d45281977d45333d
+EBUILD opencv-4.5.1.ebuild 20597 BLAKE2B 16df762ec0679f647f727b284038fdc8bbb45979f5b6c6711de9c05f9fd33b2b4d7a2c386c53c38ae3c5a35bda1028ad701eb982bdc58b15f29dc91aa9bc280c SHA512 bba66694474b3be717af472567d26e9d1c164315dd360f24ebff34e95aac9ad7dc10463776154c82d7d50c44795a23f7fef9a39e4aa9b88107e33ab0bb1802ec
+EBUILD opencv-4.5.2.ebuild 20601 BLAKE2B f065985f61e9519b12a9900fc115358f1769dd8dffbb57dd3a3d1aecaf4352df18d647d0d4525266e9ac75dc838d6a45bc7f879f024d2bbdb45fbefa86033604 SHA512 8af05e9ea0ed6795f9259eb1d5b83d2bb0462ee3e7c608d4aea207058ec6c1e5ef15689dd851ad0ac33f1c77dbbf77a0d3962d10f73e92a77b10579a3f925985
 MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index c2dc01d988a9..077c53780285 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
diff --git a/media-libs/opencv/opencv-4.5.2.ebuild b/media-libs/opencv/opencv-4.5.2.ebuild
new file mode 100644
index 000000000000..1fee51d33a51
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.8:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+	eigen? (
+		|| (
+			>=dev-cpp/eigen-3.3.8-r1:3
+			<dev-cpp/eigen-3.3.8:3
+		)
+	)
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index 8ebeaf265d59..0b8bd189e0b3 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,5 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r2.ebuild 857 BLAKE2B fbe17196f0da875927236d27143a27d70e1e40e660e81b124784029f9029607bbb7e6921e8d829d35530c0e246755e93496504014c2da533fd45a4cad6b8e84f SHA512 0af04e0b4f3acb52e6d12cde62916be34c4bf667cfcd958276395ff748c6c2e9270fb56c381761b8923c4888994b834ce6891fa11ea09f0e313213fc2f1e26bf
+EBUILD openexr_ctl-1.0.1-r2.ebuild 870 BLAKE2B 28f8814c3d6f9864d121937bac5403018e1857bc70199b152804cc6f0d0bb506fa51702540423f232a386c9ea72862b9142bdaabe068b756720b1f82c99b1d60 SHA512 50193eeae532f1a62a1addc0598160ea9ad90e33499b9e874f46dc90e9a0c0f81cdf3e048364f70a388c1b7fe1e0e75b9307fb8227c43701e576f7f664cf7cd7
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index aa79521623c1..dcec21bc9cf3 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools epatch ltprune
+inherit autotools epatch
 
 DESCRIPTION="OpenEXR CTL libraries"
 HOMEPAGE="https://sourceforge.net/projects/ampasctl"
@@ -36,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 27b36a518b44..8efbc03a050c 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,3 +1,5 @@
+AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r1.ebuild 1058 BLAKE2B 3e8943a6ff0645b769327754a0369e5eaa5dcc78319af56623bff5100017c29915932cd6a54390a2dd9067378f82fcad65f522699656365f9071f0bc8960f1da SHA512 03ebe2113ca9d3392aefb1a36f2b9906e0ba05055d307e0ada16a480bde30b85cf6fc6c9abaeb3700f1e3e99e150eff4b8570031c2bcdc70d0661818b77ed7e5
+EBUILD opus-1.3.1-r1.ebuild 1074 BLAKE2B 4d6be4549fe213a1b4b96459e5d857ba914dcaf6ddfdc8d75cdd76aa0d1263dbc4a22c0fbe1c58429ad0ca6be90c73d0fa942efce2b4b208225fa9c78294410a SHA512 af67ca539e73422a6b9e0d96e6a0cc3dcca168214409a4f9711e737a6bade78786594f2284807718a54b659e9d90e2d3507f9c3f69306173fa7819acc9f07a2c
+EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B 68e5e037c067e594dffb053e58492549a2d0c41239c69e0956a8e10bb8d9e2e7e30d8dab251982dfe450dcf78a55ddb13f3b9080f7e52e07353ebe7785d7ad3b SHA512 98a45aeba77ed536c3e43197910e64763820a43e53a13662ce784aca590f7a6784767a76193dff5dd8cb5a04a7e6c89cb1bde197c4fd2d223e46c3b78ab7226c
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/files/opus-1.3.1-libdir-macro.patch b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
new file mode 100644
index 000000000000..4f57e54ddf00
--- /dev/null
+++ b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
@@ -0,0 +1,11 @@
+--- a/opus.m4
++++ b/opus.m4
+@@ -22,7 +22,7 @@ AC_ARG_ENABLE(opustest,AC_HELP_STRING([--disable-opustest],[Do not try to compil
+   elif test "x$opus_prefix" != "x" ; then
+     OPUS_LIBS="-L$opus_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OPUS_LIBS="-L$prefix/lib"
++    OPUS_LIBS="-L${libdir}"
+   fi
+ 
+   if test "x$opus_prefix" != "xno" ; then
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index 257b3a7fb6f1..9f336ce55ee1 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,9 +26,12 @@ multilib_src_configure() {
 		$(use_enable doc)
 		$(use_enable static-libs static)
 	)
+
+	local i
 	for i in ${INTRINSIC_FLAGS} ; do
 		use ${i} && myeconfargs+=( --enable-intrinsics )
 	done
+
 	if is-flagq -ffast-math || is-flagq -Ofast; then
 		myeconfargs+=( "--enable-float-approx" )
 	fi
@@ -37,6 +40,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	default
+	einstalldocs
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..137c39a1d91e
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+
+	local i
+	# We want to disable intrinsics if no flags are enabled
+	# (This is a fun Bash construct to do that!)
+	# bug #752069
+	for i in "${INTRINSIC_FLAGS}" ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics ) && break
+	done || myeconfargs+=( --disable-intrinsics )
+
+	if is-flagq -ffast-math || is-flagq -Ofast; then
+		myeconfargs+=( --enable-float-approx )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index bca7765f8981..a34ccacf3b35 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,4 +1,4 @@
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 753 BLAKE2B bb011080c9aebd848256c1957682d89e6a9879c6365a64cd0bc8b3ccbc5aa927fe1706d7e867327cd654617001d6fe21fc673ea432ce76fb9cd173ed82c5724a SHA512 f4af423e952313c527f6a31b507e0c1bfcc5fde581b6af014682bde2380bdef2f6570db1df700de855faa3d23505450e444025f95e13adeb0b01bc8841ef5b4a
+EBUILD phat-0.4.1-r1.ebuild 760 BLAKE2B 9292934b4f85b5d9af8a963d3f492ed876f961a8875dc261bf0226afae4d909a66b9c592283601429a08fa1b736ab48204bb9a6ce6c2c6811b6ba2049fb5227e SHA512 5994d5edd43e4f5b893e3d89e8f1d00d4337bc7657d8e3afee492e9d8f1bb8aa34edc27d2dd4473e3dbc5cf8919e436c206b4566da324fbd829e8d160887e9bb
 MISC metadata.xml 335 BLAKE2B 738611cc2556b28fe188331b8f79cc70d597fe6e0bc1840163690062674b4c97f1e51a7230d4ef0aef7e6355307e853261ee21ffcb7383665a06bd46387a5536 SHA512 ec33ba62442191f9943c431fb9313a4dd94ccc2630e0b37deec07ad945e65de3927e0d8e1d75a438fe9419353ac2cf7f1a4e392f13c1fd087280d9d3e72588b1
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
index 3ed4ae455362..b7854f4f01a6 100644
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ b/media-libs/phat/phat-0.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="PHAT is a collection of GTK+ widgets geared toward pro-audio apps"
 HOMEPAGE="https://sourceforge.net/projects/phat.berlios/"
@@ -38,5 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 9f7b6dbfac77..2fc883d9ef8d 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -4,5 +4,5 @@ AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1
 AUX plib-1.8.5-shared-libs.patch 9520 BLAKE2B 1bfb85c5065e33a9c8be14861f4fd8978e1dcacf4c045c9b1e30dfd2715873ac1b953bfeed5e298e1140264f8c0d191bef28b6631e2bb98f4d7228c7576aaf9c SHA512 0fb342e726412885531188a05e3b05b2076398b1ec8eaaf22ba3e20f48248351917d5418a7086b1b8eeb0bfccae049e8cfa0f5d05cbd4bb7c20c3e69685065b5
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
 EBUILD plib-1.8.5-r2.ebuild 829 BLAKE2B ccf66bea4824b818c08a421975d5b89dfc9403e36504dddd66b41b0119e47b70b30cc1727464ff9545e591b0a3cbf679dad89048f634173e15ef190d5ac31c86 SHA512 9c2810449ce8aa529a360dabbaf7d8bff92dccb9def0bff12cf3e580517e0c297391e3a32e0009d93bfd2b806e895761b96b4fbb94adc521b56294c5bbbc6105
-EBUILD plib-1.8.5-r3.ebuild 931 BLAKE2B 51588a228414d77dd489d565034b0fd9dcecae5cae5806986e8a6effbf579f975db822fd3aa1807009da95d217dd0218e5770e23e05658858eca3a17b369e391 SHA512 da983d8417348d980d4d3e205e269808c37faa1b42778f3229e5a93fd5fbf9c85ef8ff2f715c9011700921d63466bd9f613abace807d0e386baf8f006344dfdd
+EBUILD plib-1.8.5-r3.ebuild 927 BLAKE2B bedaeeabac3ffd43ec0c75ad8e5c9adf5b6e4f330565aecc0ee7554ffcc9bf2977cb2e88ae28ac62c1037962d14fd2d16bb03d44d34fdbef74c8633d05fb1b1c SHA512 2409a27ca687ade0da9e7c1c1fbe665354139837e1c17d3955fd4159a28eea570a83a304fa85c670cb015c0cca655daa67e4762143e61456994cb09fe0e9063f
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/plib-1.8.5-r3.ebuild b/media-libs/plib/plib-1.8.5-r3.ebuild
index 21af7bffc8de..90f35921162f 100644
--- a/media-libs/plib/plib-1.8.5-r3.ebuild
+++ b/media-libs/plib/plib-1.8.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 
 DEPEND="virtual/opengl"
 RDEPEND=${DEPEND}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 2ba4030d35d3..ead350074e31 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,8 +1,5 @@
-AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
 DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3211 BLAKE2B a1db7a1a0fd4c8c5a49f205ee4cd2c6b5689bbf65c1538817c2440663140ca57c6e462b324832392efaadf6d852bdd55b0c8930716bf09302cb2de9d1d828f82 SHA512 d65ec75185e97a7d040eaa6e1d99ec4a03155b9667d893d6b47cf9c2d2cb2bfd928aed484075b49d7f4740c28b3391ae16f212dd2a1cc9dbc05407579656c29e
-EBUILD portmidi-234.ebuild 3318 BLAKE2B 9bf2367d177564a0fdbbea027860a57019f9090540a1bc94e323a357d6cc0f154913edfd10f9521acb9b88d14674b9241d2ca4e37fa7b75fe3cb668e34ec53f5 SHA512 6384c0fecb52db5c6922a3205e3e2a37f64cae7be5794542ea2377bee42bcebd564494d839ed349c127f14eac598b4a068a82ee0baa0b32c2af24d072760f302
+EBUILD portmidi-234.ebuild 3311 BLAKE2B 7eed7609f74534778b2b6418e68036c902dd33f50d21aaa7229f8056f6c5f64e630769eae71651ee8d53709a308a433b5b3f32275dd466c76649c57ae597d98b SHA512 df5b8eba368e02c8791e1eb0ae0e71def202dbb315888b87c7d3be6f2670649a856fb90114a014ab477e4d70ba723c6ec257539ae1ec241cc4814dbf67b1e5f2
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/files/portmidi-217-cmake.patch b/media-libs/portmidi/files/portmidi-217-cmake.patch
deleted file mode 100644
index 7618ee5af952..000000000000
--- a/media-libs/portmidi/files/portmidi-217-cmake.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4919b78..9dc6e58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,12 +9,11 @@ if(UNIX)
-   set(CMAKE_BUILD_TYPE Release CACHE STRING 
-       "Semicolon-separate list of supported configuration types")
-   # set default directories but don't override cached values...
--  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY 
--      ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "executables go here")
- 
- else(UNIX)
-@@ -68,10 +67,20 @@ endif(UNIX)
- include_directories(pm_common porttime)
- add_subdirectory(pm_common)
- 
--add_subdirectory(pm_test)
-+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON)
-+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF)
-+option(PORTMIDI_ENABLE_TEST "Build test programs" ON)
-+
-+if(PORTMIDI_ENABLE_TEST)
-+  add_subdirectory(pm_test)
-+endif(PORTMIDI_ENABLE_TEST)
- 
- add_subdirectory(pm_dylib)
- 
- # Cannot figure out how to make an xcode Java application with CMake
--add_subdirectory(pm_java)
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JAR_INSTALL_DIR share/java
-+      CACHE STRING "Define directory name for jar installation")
-+  add_subdirectory(pm_java)
-+endif(PORTMIDI_ENABLE_JAVA)
- 
-diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
-index e171047..d23442d 100644
---- a/pm_common/CMakeLists.txt
-+++ b/pm_common/CMakeLists.txt
-@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -62,19 +59,23 @@ if(UNIX)
-                              ${COREMIDI_LIB} ${CORESERVICES_LIB}
-         CACHE INTERNAL "")
- 
--    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
--    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-+      set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    endif(PORTMIDI_ENABLE_JAVA)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
--    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
--    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-+      message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -88,10 +89,12 @@ else(UNIX)
-     # /MD is multithread DLL, /MT is multithread. Change to static:
-     include(../pm_win/static.cmake)
-     
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -99,29 +102,43 @@ else(UNIX)
-     set(PM_NEEDED_LIBS winmm.lib)
-   endif(WIN32)
- endif(UNIX)
--set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- list(APPEND LIBSRC pmutil portmidi)
- 
- # now add the shared files to make the complete list of library sources
--add_library(portmidi-static ${LIBSRC})
--set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
--target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
--
--# define the jni library
--include_directories(${JAVA_INCLUDE_PATHS})
--
--set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
--add_library(pmjni SHARED ${JNISRC})
--target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
--set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+if(PORTMIDI_ENABLE_STATIC)
-+  add_library(portmidi-static ${LIBSRC})
-+  set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi")
-+  target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
-+endif(PORTMIDI_ENABLE_STATIC)
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  # define the jni library
-+  include_directories(${JAVA_INCLUDE_PATHS})
-+
-+  set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-+  add_library(pmjni SHARED ${JNISRC})
-+  target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-+  set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
--  INSTALL(TARGETS portmidi-static pmjni
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+  if(PORTMIDI_ENABLE_STATIC)
-+    INSTALL(TARGETS portmidi-static
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_STATIC)
-+  if(PORTMIDI_ENABLE_JAVA)
-+    INSTALL(TARGETS pmjni
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_JAVA)
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- #  INSTALL(FILES portmidi.h ../porttime/porttime.h
- #    DESTINATION /usr/local/include)
-diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
-index f693dd6..c0e1449 100644
---- a/pm_dylib/CMakeLists.txt
-+++ b/pm_dylib/CMakeLists.txt
-@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -63,7 +60,8 @@ if(UNIX)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-     # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-     # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-     # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-@@ -75,11 +73,8 @@ if(UNIX)
-     # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
-     # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
-     # because JAVA_INCLUDE_PATH2 is pretty obscure)
--    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
--        CACHE STRING "where to find Java SDK include directory")
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -91,13 +86,15 @@ else(UNIX)
-   if(WIN32)
-     # /MDd is multithread debug DLL, /MTd is multithread debug
-     # /MD is multithread DLL, /MT is multithread 
--    
--    include(FindJNI)
--    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-+      set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
-+
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -106,7 +103,10 @@ else(UNIX)
-     # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
-   endif(WIN32)
- endif(UNIX)
-+
-+if(PORTMIDI_ENABLE_JAVA)
- set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- set(SHARED_FILES pmutil portmidi)
-@@ -120,8 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-dynamic
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
-   INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
--    DESTINATION /usr/local/include)
-+    DESTINATION include)
- endif(UNIX)
-diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt
-index a350620..9cbee1c 100644
---- a/pm_java/CMakeLists.txt
-+++ b/pm_java/CMakeLists.txt
-@@ -5,43 +5,24 @@ if(UNIX)
-     # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj
-   else(APPLE)
-     # linux
--    set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class
--    		       JPortMidiApi.class)
--    set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class)
--    prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS})
--    prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS})
--    set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2})
--    # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES})
--    add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
--        COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
--	DEPENDS pmdefaults/PmDefaults.java
--	WORKING_DIRECTORY pm_java)
--    add_custom_command(OUTPUT pmdefaults/PmDefaults.class
--        COMMAND javac -classpath . pmdefaults/PmDefaults.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
--	DEPENDS pmdefaults/PmDefaultsFrame.java
--	WORKING_DIRECTORY pm_java)
--    add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--        COMMAND	cp pmdefaults/portmusic_logo.png .
--        COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
--		pmdefaults/*.class portmusic_logo.png jportmidi/*.class
--  	COMMAND chmod +x pmdefaults/pmdefaults
--	COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND rm portmusic_logo.png
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
--	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
--	WORKING_DIRECTORY pm_java)
--    add_custom_target(pmdefaults_target ALL 
--        DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
--    # message(STATUS "add_custom_target: pmdefaults.jar")
-+	set(JAVA_CLASSES jportmidi pmdefaults)
-+	add_custom_command(OUTPUT ${JAVA_CLASSES}
-+		COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java
-+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+		DEPENDS ${JAVA_CLASSES}
-+		COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+		-C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi
-+		-C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults
-+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+	add_custom_target(pmdefaults.jar ALL
-+		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar)
- 
-     # install the libraries (Linux only)
--    INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--      DESTINATION /usr/share/java)
--    INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
--      DESTINATION /usr/local/bin)
-+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+      DESTINATION ${JAR_INSTALL_DIR})
-+    INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults
-+      DESTINATION bin)
-   endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
-diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt
-index b89074b..236ff49 100644
---- a/pm_test/CMakeLists.txt
-+++ b/pm_test/CMakeLists.txt
-@@ -10,10 +10,12 @@ if(WIN32)
- include(../pm_win/static.cmake)
- endif(WIN32)
- 
-+set(CMAKE_SKIP_BUILD_RPATH TRUE)
-+
- macro(make_a_test name)
-   add_executable(${name} ${name}.c)
--  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
--  add_dependencies(${name} portmidi-static)
-+  target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS})
-+  add_dependencies(${name} portmidi-dynamic)
- endmacro(make_a_test)
- 
- make_a_test(test)
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
deleted file mode 100644
index 403557873b8c..000000000000
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL=1
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Library for real time MIDI input and output"
-HOMEPAGE="http://portmedia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	app-arch/unzip
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
-"
-CDEPEND="
-	media-libs/alsa-lib
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )
-"
-DEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	# fix parallel make failures, fix java support, and allow optional
-	# components like test programs and static libs to be skipped
-	"${FILESDIR}"/${P}-cmake.patch
-
-	# add include directories and remove references to missing files
-	"${FILESDIR}"/${P}-r4-python.patch
-)
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install wrapper for pmdefaults
-	if use java ; then
-		cat > pm_java/pmdefaults/pmdefaults <<-EOF
-			#!/bin/sh
-			java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\
-				-jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar"
-		EOF
-		[[ $? -ne 0 ]] && die "cat pmdefaults failed"
-	fi
-}
-
-src_configure() {
-	if use debug ; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	local mycmakeargs=(
-		-DPORTMIDI_ENABLE_JAVA=$(usex java)
-		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
-		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
-	)
-
-	if use java ; then
-		mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
-		pushd pm_python > /dev/null
-		append-ldflags -L"${BUILD_DIR}"
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-
-	if use doc ; then
-		doxygen || die "doxygen failed"
-		pushd latex > /dev/null
-		VARTEXFONTS="${T}"/fonts emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
-
-	use doc && dodoc latex/refman.pdf
-
-	if use python ; then
-		pushd pm_python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		newdoc pm_java/README.txt README_JAVA.txt
-		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
-		make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;"
-	fi
-
-	if use test-programs ; then
-		exeinto /usr/$(get_libdir)/${PN}
-		local app
-		for app in latency midiclock midithread midithru mm qtest sysex test ; do
-			doexe "${BUILD_DIR}"/${app}
-		done
-	fi
-}
diff --git a/media-libs/portmidi/portmidi-234.ebuild b/media-libs/portmidi/portmidi-234.ebuild
index 6713a99ef2f6..c8634feae893 100644
--- a/media-libs/portmidi/portmidi-234.ebuild
+++ b/media-libs/portmidi/portmidi-234.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index 81b9e8da9ec8..ff1da4b75ae5 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,3 +1,3 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
-EBUILD quesoglc-0.7.2.ebuild 1065 BLAKE2B 1f8ee6d32820bc68d31d3a05567fe673058fe63fb344f14e8883657a92337ba0f19fa10e9b74e437fa562c59b69c1eba2f70cc0f7779dc05c8531fc29aeaceb7 SHA512 45dbf16a62132419c41b6a9bff808b391957541c5137a54fcc00efe088f0b1559086ffe37050d09a1ecbab11f3042637aa81269bee6003cf430720ccefe3b906
+EBUILD quesoglc-0.7.2.ebuild 1070 BLAKE2B d47799a691ff92458be513ceb7c3cb450a536eb9bf5083ab1af805d8d52666ba6c5fcdfbb1a17ea7eb84a6e434e8a36ba2d664f55002e59ddcf9e29276b08829 SHA512 2d718bd3914ffb01fe1e4453ce6198754b2ffb67cfb6ff6863b457bdfc1b6d1832d57e8c2d6dd451bc2c39a94c42e271ad7592acf24ef55aeb65864f0153932f
 MISC metadata.xml 331 BLAKE2B ceaba043139669fa90e55b48c5b21bd1dcc7bcec0eb8fc8bd5d3ff4ed16a3c7bc29c63dfb12b5eb7b9041e918da1b79f9cfe34b27554f9ba83efae51d6c704a3 SHA512 ca843d6a3a6abbe8148dfd89cdda0a8b1335343f77b2f12fc6ac3760bbfa893c30db593ca6730674784fe60b3c1d31addfbafc6561ed415035880b09ca5df52b
diff --git a/media-libs/quesoglc/quesoglc-0.7.2.ebuild b/media-libs/quesoglc/quesoglc-0.7.2.ebuild
index e552499f88e4..e96995d0f8e6 100644
--- a/media-libs/quesoglc/quesoglc-0.7.2.ebuild
+++ b/media-libs/quesoglc/quesoglc-0.7.2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit ltprune
 
 DESCRIPTION="A free implementation of the OpenGL Character Renderer (GLC)"
 HOMEPAGE="http://quesoglc.sourceforge.net/"
@@ -52,5 +51,5 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.c
 	fi
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index c5570bb15caa..aafc38b33e66 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
-EBUILD sdl-image-1.2.12-r2.ebuild 1538 BLAKE2B ae23e1cf3fab15f0cc216ba1cbf99c9189ace20defcdc87c46af5ffa3bb91eaf6295304121cb3d13d144443006f4ccf5bce05662f5cad25c0e9f03b998517425 SHA512 ee2b0b91d4393e660e13815b08113c683e79756f7f9e832b09cd726cd61e78c7d8bd231b4d88440135be2190e0d3d1006749b13df7c2b926f3322d8762c0f701
-EBUILD sdl-image-1.2.12_p20210314.ebuild 1614 BLAKE2B 87dcb398db953ef226f9d738b3289cdc3d77a30a561920dac2897ee6c051fcdab1105fa2e25b43d33e7a805d150f0f6a8cfe3307615b314310429585d541178f SHA512 cc83ca8ea6b7a9639a90dabb814a1ebc2630d2915c8e7fb80b0307760f3e2d103b23d1b06cf981ce3c182737e77600412ee88f70db899d27fdae9dd647981c82
+EBUILD sdl-image-1.2.12-r2.ebuild 1559 BLAKE2B b1bd7587bed9297003c76d78673cc222cc7fc514cd07773da8b58a5be3c61692eac84f8a58eb9c06819b0c1c9a9703e894efd119858c584ba6c500cbb6c32dd0 SHA512 7f22b5126dc94ada6f684878fe0ccda4120a4c7e937f84e68ee3d44bd53b4bd23b55a4dff04550e0e2148975227f59f2c14a854887d91cd3440d822ae0a11ba5
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1684 BLAKE2B 40f6f1bfc85cf11c45e830fd6b9047b5911f24df512245ed2e4b4210e7d672adea3d3c9c818111452bf1830356c90b825ae2c977e29faece5f46c0c2516d16f3 SHA512 07a150119ec412e6a666e462dd31a2f58f8573f7e6fb70e2a58561fbb30cc281adf954133c69f339c415b2e63b5c2ba0c158c2ff2f641b0927218d9ed9e543e6
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index 014efeb9eef9..f7919bd482e6 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="image file loading library"
@@ -54,5 +54,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc CHANGES README
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
index 4095a856d531..a0fda97a89c1 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 MY_COMMIT="5d792dde2f764daf15dc48521774a3354330db69"
@@ -48,6 +48,10 @@ multilib_src_configure() {
 		--enable-xv
 }
 
+multilib_src_compile() {
+	emake OBJC="$(tc-getCC)"
+}
+
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 	dobin .libs/showimage
diff --git a/media-libs/sdl-terminal/Manifest b/media-libs/sdl-terminal/Manifest
index dd2d8797eb6d..2245c6da4d73 100644
--- a/media-libs/sdl-terminal/Manifest
+++ b/media-libs/sdl-terminal/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-terminal-1.1.3-nopython.patch 620 BLAKE2B 059ea3c8bb08f3649983c70551d1fff5017dea5e87d3f2d13b6d530826d1b6bd67f1fc716cb5ab50dfb16345cb57e307db776088cf96bf2bb5a34a209bca6776 SHA512 0e7aede86affef6041c0fb76d84b9a76a5b00c6e6ea68cb6669e12d5d50c162360660ee720e072451913166417e7fe24823da24be6eaa1deebe2009ccf6f75a2
 DIST SDL_terminal-1.1.3.tar.gz 466321 BLAKE2B 49c8a8262fd4a9dd14ce987e9128ece958e0357e8da3877516a9e139951d04ef779a414b15ab7748de679c053b8b14d461dbd4575b7aea62fe12608889a88c23 SHA512 be6e74430ac9467e58fde6048b042db319940e564061b6e537f45dcbd54148f5df593dd0b8a28d866ae298d0f1c8f3a113bf23640c25213c6784ede5233882ef
-EBUILD sdl-terminal-1.1.3-r1.ebuild 793 BLAKE2B 25c5d45b31fa83d201426f54d433ead1669794469ef020ed4e4e8daf194492b037bfd09246b9ee480f904f231c018610ced63f58d81de7437f6a1309390f6b68 SHA512 c2f4a25cad76adc000d4a81e0cb8e4412e68bb214d12039c36224e70104d968699d3d951fd23b49770323961b366354faca814971e190f982a5dc20adb9691fc
+EBUILD sdl-terminal-1.1.3-r1.ebuild 806 BLAKE2B 52d80e2cc533a86d3f977deb82907ccdf3022a807d54882312b0a68432ea94120187c8bb5592d5f2f084983c8a922c800588a421aaa7cf3bb29b8cbb94af6df6 SHA512 59c8f94d58c928334a413c1962516b8122f6f05a85c0ee0826b99e3df641bf4d84d4e807fd28296344380769b9f560dae204aff771f584a916a496da3e377ce1
 MISC metadata.xml 335 BLAKE2B 23c8a9d4276dffe28dec3f816a59fd1656899118fdcb9ad438b72d7f9510da23199ceafff70951389cb025abc060e5ade878e59858633d91c14e36c66f568c3d SHA512 d6e3731ff8357267d1571c5e9976614985e7f98ce43b5c1f46df66b60e4f7023c5d377d35a1ea5149f891c354acdca2038425a9f619876586af4470b4b61002c
diff --git a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
index ac16bb3b20c5..bd3598f12cc7 100644
--- a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
+++ b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit epatch autotools ltprune
+inherit epatch autotools
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that provides a pseudo-ansi color terminal that can be used with any SDL application"
@@ -34,5 +34,5 @@ src_configure() {
 src_install() {
 	DOCS="AUTHORS ChangeLog README" \
 		default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4a15ec6ee49b..4753b0fe4c83 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,8 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
 DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c
+DIST shaderc-2021.0.tar.gz 220308 BLAKE2B 7178b99ce726f73e4eee2eb1b81b9575cf5a97a1d29bf0ed6a64ffde1095f91e14ae2c7f62d21f33bf2f7551e94b6d3e3c8fd149446899276a67d7df33a8e679 SHA512 cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c
 EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
 EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
+EBUILD shaderc-2021.0.ebuild 2155 BLAKE2B 0923a326dbb4ade19457254aebb3d245e48c0121675c93cd637e696e88313200bd4b863280fba80da6b3784b1ac06dc0107767399ed2fab162058247a5765418 SHA512 f2a5b2b1c698b42f1cc133dc5c1b3706a49aae36b757f6e8ae2297aece4719d4dc2e44caedaf5309692bcc0f75fc417b1e0c817e29fb657f1b8c5f3d5eac48e9
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2021.0.ebuild b/media-libs/shaderc/shaderc-2021.0.ebuild
new file mode 100644
index 000000000000..0cd81867acc0
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2021.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="bdd134d1b7eca01925c1919d2ea05fd3cd6843c7"
+SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-11.4.0[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.5.4.2_pre20210526
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+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_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 51beaa34e20b..84aee896b490 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2052 BLAKE2B 0d3c923073866aa7436285b9bd576405523d8bfccb9b8d3dc06a3ad3b998d35bdb61728bdd8b259a445fe4ef5d5a0397af991705b861573bac03e0a5ea373c94 SHA512 8c59cb8ff0cacd5e79733b5982b02782e126227778f6749adbd9ee88e358142258f872894b5ceee5692262edaf69edd6bc49460d8a95b5224c5205df5098a3b7
+EBUILD smpeg-0.4.4-r10.ebuild 2079 BLAKE2B 93b766c2825d23e4624d1cd8e9c6af891bc0f59d8d007609e311a5e67871f97f790da9dda29010d469e03da60bb103622ba5bccc32b6a4bdf5df9fa48729076c SHA512 36dcdbbbb3c40c987320b7639b50d5ddcb120b5286bad751e2bb16f198530ee002739b9527b5fa9463de474028d824f4f2d1e046548e4dee65e6b7cbaf937c7f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 9ce094aca830..410c6a7db189 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools epatch flag-o-matic ltprune multilib-minimal
+inherit autotools epatch flag-o-matic multilib-minimal
 
 DESCRIPTION="SDL MPEG Player Library"
 HOMEPAGE="https://icculus.org/smpeg/"
@@ -69,5 +69,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 456deafbef5b..24370ad8fc9a 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 1324 BLAKE2B d65ab20e5e093a33c94ff92e817cdc35e452d16fe3290750402315dddc970327b79e25d3cc2834495bb487caff58a366a87e4ad45fdb99b2e1a2970713956ecc SHA512 7fa9a384df8563f7a557f71f1911f7bd4aa727b6f118d8aaa72082e20ae0b03f16bc29e77abf029d29e1892f8117625cac1abadf934ea79e7ef89bb58388e57e
+EBUILD smpeg2-2.0.0-r3.ebuild 1351 BLAKE2B d9bbba882d9e765495ce653ed2cb37023f7abe1088c1dcd8e5b19f9b168de0dfb362f3a70062324058a076c7ac89d7008c086f117d305b2e46e1a51bd1199851 SHA512 7e57e72f115bc2d2f779b0dbf41d240577ffb0ec637a65245fc6cdb0b7ae2511252e052424a7bdf5f354f3a12a84b0fb16f313c6c4bddecd0fe826cbde873644
 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 d4dc5e3a6527..d6b423f907b8 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools epatch ltprune multilib-minimal
+inherit autotools epatch multilib-minimal
 
 MY_P=smpeg-${PV}
 DESCRIPTION="SDL MPEG Player Library"
@@ -49,5 +49,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index db67906b1a67..60b8a3eed710 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,3 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
 EBUILD spandsp-0.0.6.ebuild 1990 BLAKE2B 7665e0a1e4003e7f6c70331fdee881615df879f1f32272dbc8ff81ec53a4931a65cd458febf6e03ca700c4392f820858a7ca0b8f73f9f059e620266e3417a93e SHA512 9502da0b5fd038cdb6ed8e4f368ae1e6fc45d78ebe106f324653ed70b3be613da6f86a7b003050fcf920dcb52be4b6f63cf7a37662f12071fb0cdcf574a9af61
-MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff
+MISC metadata.xml 243 BLAKE2B 1c8dd50b66886f9a3aa710f670d54595f119dfa8aa4244fe90a80d90a98eb3c4697406044c00824225a6fad5c3be85793919da7d7c5490b94620429c1739b8a6 SHA512 04158dfabea134e7c2db76da2d5bbc8d0b607d347c2c38d9295103ea9eee6dc5b5183ed07779d1999d8c8da2591a985eb54b1859860c0a72c5b653bbe50fcf88
diff --git a/media-libs/spandsp/metadata.xml b/media-libs/spandsp/metadata.xml
index 747778779369..6bade1f65cbd 100644
--- a/media-libs/spandsp/metadata.xml
+++ b/media-libs/spandsp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="fixed-point">Enable fixed point support</flag>
 	</use>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 810610bd5198..4ffa4c941e74 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,5 @@
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
 DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
 EBUILD tiff-4.2.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
-EBUILD tiff-4.3.0.ebuild 2057 BLAKE2B cddf05f09143cc28fe2c0976bc470839b5751755e548b2d243ff0f227439be6e19bb91b0fb50528dcb8a4cafca9cd1c0a381063eaf32aeaba64f4f5fed0f7201 SHA512 c9b8412855f06e5b4883240d00017312dde09ade494276b6f298cc4ddee26059bbf39e169d24eb7f1851d317b822cb72e2faa9428430b92e3fe5854eae897d2c
+EBUILD tiff-4.3.0.ebuild 2051 BLAKE2B 7c3633f5676f86d456728bb2d0f3a604e323a09a987f79d932af337bf1b160a6e1dcd7c4b6dd9e68dd01f7e0675e72f1ae7dee8a52428eed44b6706eda2d3ea5 SHA512 2a500fff7bc1e8513d414ec2286cfaba4f6b63ff26fd654ae159cbffa91e60d9aa37fdb50161d5a0ec2cbb2e1890b19725fe952c6b111239870dd4358434eb06
 MISC metadata.xml 614 BLAKE2B 65a0c3386b69b69a980f6f6c9d2e18cc2e98c0f5a319af7e61763cea5a584a456715360e2106330b439981e09375701685ddc94f5062c7e206245944282a7b84 SHA512 f7b29a08c37621126390ddb9d8dc42a757da0d228151d725625fe603a26751294895d8795ebfa851ee36863f459c67d04c235a953304d48dca429d24de72761a
diff --git a/media-libs/tiff/tiff-4.3.0.ebuild b/media-libs/tiff/tiff-4.3.0.ebuild
index 49ce9bf164b9..9d512e54335c 100644
--- a/media-libs/tiff/tiff-4.3.0.ebuild
+++ b/media-libs/tiff/tiff-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 5186b857f4b0..93a7862348b3 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 1106 BLAKE2B 1963ff16f0059534f0776a503b7f69a1fffdca36f221a9790ca9b1635049fe6ba4dea586d26b85f19664db7ba88ef60509aa3f0f2425f4482d5bbb16aeac50ab SHA512 9351da68931373b599f1be5b4876e1f0087609236a4cc6c2837f3bafa739cdce7bfd21745ad1d8e2fa57cd15d0ddf81f98d7f7c3873d6db27dde4a993b38478d
+EBUILD tremor-0_pre20130223-r2.ebuild 1113 BLAKE2B f7c80c12c8947a239f92a875ca809f0d6d9ee14cfbc35c7f3b56afc4cc47c3d5e6fbc3854aaf8210a72c8128ea061719dc32de2f43fcfae61c864fc1bc4355c8 SHA512 8f61d94aa6054781662493206023b0c197e11d0eb49c4c2412970f72f47e4f802f94e60d6365f0e120141bc6b1830af349c87b8cab76348186d7a7710a51a2c5
 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 6b4f301c3d52..dd8a83316d28 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~riscv sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 93b8182abe46..c7d7829e6321 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
 DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b121586ebbd4e5375189f38715c52afc24b1bed04b1a4f05e17875b15fee3815492c357ad84316ea0abc359a97026418b490d SHA512 199e64c6d2ca34a604bb611fd231bfccf4608078a777369039597dadc209a23b7e7ea4ce71dc8b48826bd7874a7ea623d8af7dc47945914405fd99ce8bdf8de6
+DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-9999.ebuild 1490 BLAKE2B ba45d1e33f4a005e4dfac11f93ccab9cb1938234b4b7c84e2492456d565cd06d5dfc763900c1cf83fa78fdfe61fc9887b991fff48f4ad59658dc6bed399776e1 SHA512 8c152efe16a791615d5156c5abd588f425f87b5d1823b8e0a5d1a9aab999eef9198fa32882cf1744129c20cc0e7ecb09985c4b0119724088f8c70f300a77e02e
+EBUILD vulkan-layers-1.2.179.ebuild 1501 BLAKE2B 71ff0726d0fee9cb437de7ed4cbe09826bd03c8194ed66e65e48299099d8d53eacc990cbba18b942a2f008666549623f311a7744661c57ade81d044125694003 SHA512 7c7c996f3bbc2751c690f45c0305ffea4077b8c310e9f9f5ad999327f60668613ddf0df531c17ff73cf0222ef2f77524974a769f93b26d888cc0cd85e0ad2070
+EBUILD vulkan-layers-9999.ebuild 1482 BLAKE2B dec0bead5a4c7cbdffc429cfa352f82ba3233c5cb0c94476815dbe6dea75f34a586454c128837ead1f44bc9a12f56c098ff3a22ffa555f4ac6f2d5c3d4358051 SHA512 0fd1f1695bab45ebbdac3868caaf259845f8c11300fa8320c059a6f81389e5ad6f75bf95453272613a72d61558b870dc8b076d36e1fb37e918f7663fdd016126
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
new file mode 100644
index 000000000000..2950360f4c72
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	dev-cpp/robin-hood-hashing
+	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]
+	>=dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 1d652e22f4e9..f00991f25ee4 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.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 ~riscv ~x86"
+	KEYWORDS="~amd64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -27,8 +27,9 @@ IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-11.2.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2021.0_pre20210327:=[${MULTILIB_USEDEP}]
+	dev-cpp/robin-hood-hashing
+	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 99827e0643b1..e5f8546f79ca 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1,9 @@
 AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
 DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9ceb3c4d21d380061c9442cf6c3c07412e5568f7d4653591bf53128088b928d7db8050782e9a90441b66e12ba12135e5c242 SHA512 b9512c8b30b68799a6cc2905e7a5593a1c03214edae7a99fd7bc27b1761f17ef70a61f422fc318dd805ac089bbfc6cf18dfe69d1b8a91789a1774ee396058747
+DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
 EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
+EBUILD vulkan-loader-1.2.179.ebuild 1718 BLAKE2B 06a770aff1a8f1687ac393d9cb1f6e18ed4418133eaaf182631f17f9e6fbe53cd9f2b09caf8279c31678b0f8927f29eefe95b5c9f3c7f753e8051de78deb9cc4 SHA512 ef42dc550fd44f131972a10eb223810709b656d403fc853bc9f2f4a4ea9cd80cb71add8474669016f1b271144d6762098816f83b90818c1c736ff34865d94da0
 EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
new file mode 100644
index 000000000000..79d96bf973de
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_LOADER=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 7c1adbcb910b..7e47ea61ab8b 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,4 +1,6 @@
 AUX zxing-cpp-1.1.1-gcc11.patch 612 BLAKE2B 661ce79b9d44667225b33480c2dcabeaa771acb35a8b908c76ca78571f360576c36889c1629a3eb22af316fcedbaece3a68713a39f3d6a8ec17f34d09ec19b0f SHA512 647f862468764b902fe7204c304e1e2d838efcfa226468027662942a7a6286dfdf5884bfae6d4f14e325d13ba40a20671a3ba72ec46db4417b451654c2806a09
 DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
+DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
 EBUILD zxing-cpp-1.1.1.ebuild 625 BLAKE2B 460b22d28d1458b4affdb2be9e4b5cd71b849eabecbd05fbb0c486117bc5836fa73e05ee2895b701c2775155f9d1746085f522ced874f1f9c5a55a3fe650bc6a SHA512 73532b0a7fe4f8dc31b24d45cf173de9284c92344dae15981fdb9c0575acdb8f7da42cd640323a56f38ed3a27dd9012118d88b3bfa2a08782a35d3ab0044bd4a
+EBUILD zxing-cpp-1.2.0.ebuild 584 BLAKE2B 65aefae471ff07450929f721de6cc05bd5708aaf7b9b0d494bac8e48404ab3fe4d084314d76c89da01d40ffe050a870e2522f76cb5a7054ddbbf2f97079e2fbd SHA512 923352211f3d91a6c72c88cef11a785512c5eef398ca44cdb7e3844227a01612294d77706584e825d3e8ddc10bb9472788ba39affd0b87d7c2e43ce14a288972
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
new file mode 100644
index 000000000000..8f32a4b24e1d
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
+HOMEPAGE="https://github.com/nu-book/zxing-cpp"
+SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF # nothing is installed
+		-DBUILD_BLACKBOX_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-libs
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)