gentoo resync : 29.01.2021

176 files changed, 1357 insertions, 3724 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7679719b1d66..e595a4bd4b99 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 7b432417dee4..6dd20585008b 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -4,5 +4,5 @@ AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-EBUILD dumb-2.0.3.ebuild 999 BLAKE2B 3d5c17744cb6ade1c0ad83bafef1e7dbad27c909fb4d0883ed7dcdafcb8fee1339587b7607c82e222345ed32a4590b6804a94fe8d987049bbd347fe078b91291 SHA512 e18099555dbbe6bd911c0948a7d029ce89317ba88c14d90bf95518a9649065f6e50de6a0e1aef0a428f8bf83dddac692cf78d71d0a183083b4679e31a5c9cbc3
+EBUILD dumb-2.0.3.ebuild 998 BLAKE2B c2ee6188812d133ae338971effd0cd819325a40031fcc8867f9657430bbd7aef22ac6ef07d50af764ee408dfecbdd70d9dc91e0f28afbeb296d6e1324eabb6e9 SHA512 694296195f43adeb76d63f95668971a76c35af56b32e48df5dad1b0c52695c83effaaf52ea380d9e7cbadf2e46ce1a79751845b250c219ea06c6e387131e6eac
 MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
index 2102f85c517c..ee4149c06893 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="DUMB-0.9.3"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="allegro cpu_flags_x86_sse examples"
 
 RDEPEND="
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 4783da0edce3..38889f2e0011 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,5 +1,5 @@
-DIST Image-ExifTool-12.05.tar.gz 4836500 BLAKE2B 92219a9d808bd075ae3bb9c98f519cc183cfb6513724a8a8c9d914822cfcc6d1aaf56ef06887c60f5153aee758bafadbaf5ccaead1d296f916cb2e34ce5e8c33 SHA512 0d36e3a9dd96378ac5951779a16b194cabf3cd52197ee916ff56c2a8f2a4c00392845d9675eaad1f3f08c2ba669d8802ad7bbbe754e649ac1bba315d8fbb04a4
 DIST Image-ExifTool-12.08.tar.gz 4842868 BLAKE2B 0ad8228f5b40bf51f1e29e4676ecd012de2dec6229452f7655adb543d44e59825a21311f2d09ece5190fdda06b21fbd8cc6a697b164cf6aae94c401d082459e1 SHA512 66e445fe1aca640d4b984cfacb4972f2bc64bcab61dbb014a0486a7d04612ecbd249a2691bcff704957c93467533b383c53883bb409a2064bb8c839ae7c2d4a5
-EBUILD exiftool-12.05.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
-EBUILD exiftool-12.08.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+DIST Image-ExifTool-12.16.tar.gz 4888506 BLAKE2B d262f087b4334c01ed927945aa0b072c90eaf7322af017030ef193b8b20fc7ce7008b69c483bc83d1dbe0ceab5bcb7e894e5085cae853a1d9d74f72b9c8a360e SHA512 adfd21834ccf06277903712b3c5e328b29c56f3b30ee68f6802dca0820823b627622e55f53238690525d1d19df2a59cb57f9d80a1bb2e99da37fb7d963ee16ee
+EBUILD exiftool-12.08.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
+EBUILD exiftool-12.16.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
 MISC metadata.xml 10039 BLAKE2B da44aad7d46d49683f89fa75db8c92230b9088cd14a5c8715a9f3a982843d8a348393f1bd10bdcc08d5d6dc4e5f2fbf0fdd517ce88df2180807796fbd5c06b32 SHA512 c4647e7055ffcae7226aa2bdff458576cc0fef14f6d782a16695902f4af96740a96f0388398eafbdca22ee76a0c808c81dafc2ccc583f8218c718f69c8fd0da9
diff --git a/media-libs/exiftool/exiftool-12.08.ebuild b/media-libs/exiftool/exiftool-12.08.ebuild
index 58ee12770a1c..579e441d9422 100644
--- a/media-libs/exiftool/exiftool-12.08.ebuild
+++ b/media-libs/exiftool/exiftool-12.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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/exiftool-12.05.ebuild b/media-libs/exiftool/exiftool-12.16.ebuild
index 556e4d04a9d2..48300e4ce1a6 100644
--- a/media-libs/exiftool/exiftool-12.05.ebuild
+++ b/media-libs/exiftool/exiftool-12.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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/flac/Manifest b/media-libs/flac/Manifest
index 35d21eb0e10a..5987c00bc9b9 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,5 +1,4 @@
 AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
 EBUILD flac-1.3.3-r1.ebuild 1644 BLAKE2B 511e2666915aba97d5cf0d23729bb4cd081325f2b5939fa8428e633d4aaef60d736968c0600749428c0cb41948f0866b0fb1779c39dce188d38d438aaf159785 SHA512 9621ba9081de2673dcafb26d6d84aa38e36cce5c3aee314ad658e8cab87851b2a05d57494d8dfe2ea70b706a11b4295dd9b7c1bd861da55a69b2eaf9a0c54a31
-EBUILD flac-1.3.3.ebuild 1573 BLAKE2B f7be916b09a5c039a7476293f6249e5001a88f7ec28a20eb0924bb84f879dbe77ba30435709a4e5b9933a2e0c6ce0bff6f02d9bf406c9d9473957f2afcbdcc46 SHA512 cac94617c638560ff703dde9f1998de293df1d3ed3d81d46ab9f1929f3330f9dfc2bfea36eb7b78df58cbe753358b9ad9d91d9daf1a325497f48d398a0cd37c7
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
deleted file mode 100644
index d72e7be67f3b..000000000000
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="https://xiph.org/flac/"
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( dev-lang/nasm )
-"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	!elibc_uclibc? ( sys-devel/gettext )
-"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-doxygen-docs
-		--disable-examples
-		--disable-xmms-plugin
-		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_ppc_vsx vsx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cxx cpplibs)
-		$(use_enable debug)
-		$(use_enable ogg)
-		$(use_enable static-libs static)
-
-		# cross-compile fix (bug #521446)
-		# no effect if ogg support is disabled
-		--with-ogg
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	if [[ ${UID} != 0 ]]; then
-		emake -j1 check
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 14b96e24ec34..7ab3bea9344c 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,4 +1,5 @@
-AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a4117cb9bf8b5be988e98b78dc13f7d62079c43ce0d5a6ecf894590ee6dad2f2071541a43b221411 SHA512 c143704ef537a1a151a7778f84c51ca2e098648c7c50f8c17ed0e2ee625acdfa95d9d3462ebd1323fe1be1fa4b72524c219becab320bdb9f2eaa06ad2744d581
+AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
 EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
+EBUILD gavl-1.4.0-r2.ebuild 1365 BLAKE2B 8ca3082c11cf88f7aca766ba98fcd0f6920e3e7a21d501a5c80aa01fae03102bdb6b76ea760ad41d90f489a15811e9c7b80fb1d52f5d3f9d49996e4bd0989046 SHA512 1d09dbfb300546447139d8e130704a107b973339c25b9b9bd3204196b43cd84b87871e2b683e4634255d2eb692acd09255fec7ba0fac1ef69bd2f67d5dfd4bfa
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff
index 4b510a550699..5c742779cdbb 100644
--- a/media-libs/gavl/files/1.4.0-x32.diff
+++ b/media-libs/gavl/files/1.4.0-x32.diff
@@ -6,8 +6,8 @@ r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines
 
 Index: gavl/cputest.c
 ===================================================================
---- gavl/cputest.c	(revision 4208)
-+++ gavl/cputest.c	(revision 4209)
+--- a/gavl/cputest.c	(revision 4208)
++++ b/gavl/cputest.c	(revision 4209)
 @@ -69,6 +69,8 @@
       int rval = 0;
      int eax, ebx, ecx, edx;
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..c314b13cff40
--- /dev/null
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for handling uncompressed audio and video data"
+HOMEPAGE="http://gmerlin.sourceforge.net"
+SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${PV}-x32.diff" )
+
+src_prepare() {
+	default
+
+	# AC_CONFIG_HEADERS, bug #467736
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:-mfpmath=387::g' \
+		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
+		-e '/LDFLAGS=/d' \
+		configure.ac || die
+
+	export AT_M4DIR="m4"
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-libpng because it's only used for tests
+	local myeconfargs=(
+		--without-doxygen # does nothing.
+		--disable-libpng
+		--disable-static
+		--without-cpuflags
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r apiref/.
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 1a368e5fafed..d7dc9640fc88 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,5 +2,5 @@ AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd
 AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
 AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-EBUILD gd-2.3.0.ebuild 2533 BLAKE2B 9103f442e7be09521880c01f7f5cfa46a4467ce7c7eaded1cd3921538209cc13001d763b80ae8fbc10df5df64936848d85c1ee0b01481f4d4bd99a33c651b8da SHA512 2ac948043be162d0d01805853f9a7f360bf5dd0ace10b33a44d9f6c051594ca27960fc56c8bb6d3a610887c355f06f5bd267ecd03445ae1fff2c7c5d13039657
-MISC metadata.xml 1415 BLAKE2B eebc7a74a8d70d6d8c8eda0f59a752ce1f2589dfa0ab0df358a1fc0fbb843b285a270e626d1cd27f29b51ea46825184dfbfc9c4c252baed5092d2ab8cc33c0a4 SHA512 38aef9d6c1ad8b510a28aa54ed7d93c96d755fddc7a2693a6ab4667a38667ab37ba5eddce534f52e43c1ce9abe576ab4adefb2c17c64ff90ce1d24f44ae58cb6
+EBUILD gd-2.3.0.ebuild 2561 BLAKE2B 916cc3bc7b44afee22557e424d8296890e0d5bd8d009eb939470e7fb6c5750b2d0347b909e872aabbc88551ee71005ab9d59de2fe8b85c5e68145127d4ecdfe8 SHA512 2605629f9c96f1c9b0121639d989888f422b37611066deb73ad76843d4a7cd5fcfc093c3492f76169faa27872e6e66cf9405f1c75aac0251cd1a3881df4b2529
+MISC metadata.xml 1444 BLAKE2B 39e3cd90d98350aa1c4d1ff96f3633db5084f181fa0b01c280d88b4dc87d425090f720c329543c42af9b92a03c27ca823e890190bbb92e5feb492fb69e7cf20d SHA512 76e5dfdfcd85ca4dbec0736b145cde370d692c805297fcf82636dd1dc3915690c895db5d4da319e1cf16c21ff27e5b9d40b11efac60386360fcb04e31fb39e50
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index 04480d159c33..4824a477708f 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -8,16 +8,21 @@ inherit autotools flag-o-matic multilib-minimal
 DESCRIPTION="Graphics library for fast image creation"
 HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
 SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
+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"
-IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
+IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
 # fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
+REQUIRED_USE="
+	prefix? ( fontconfig )
+	test? ( png )
+"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
@@ -26,10 +31,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
 	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index c476739e6bdb..f341db0625da 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
 	<longdescription>
 gd is a graphics library. It allows your code to quickly draw images complete  
 with lines, arcs, text, multiple colors, cut and paste from other images, and
@@ -23,7 +26,6 @@ and so forth.
 	<upstream>
 		<remote-id type="github">libgd/libgd</remote-id>
 		<bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
-		<remote-id type="bitbucket">libgd/gd-libgd</remote-id>
 	</upstream>
 	<use>
 		<flag name="webp">Enable support for the webp format</flag>
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 3b62ebe78cef..9574fea86b21 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -2,4 +2,4 @@ AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d29357
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
 EBUILD giflib-5.2.1-r1.ebuild 1877 BLAKE2B 474ceab5ed2fb23b04eee2cd993a6cb7db178426e89740362bbf418479c155a0bcdf2c712a226f9e5cbe4dd7acc653d97ea609ca552fa2b4574340cc8d4087b9 SHA512 4cbfdf5f939135c77c22fec1ea42bb3b8ad8b2d1c83e366f99e6b065d2df508e0bf672816432924e45ec72e857f45536b92f25eb38291e25ec6ac0a8d7914b84
-MISC metadata.xml 248 BLAKE2B 46adedd4004568ddad75971a42a14a53916a118e2df96eec2eb420a1c55009c152f5d41510e7b3030825d81d476c3db981847f12aedafa2c0b556b549666c389 SHA512 3e9d14a9f2c2e9bf88543fb580abb09dfc35c8065b8f77579bbbae2330fa105ca808f35c8542f4db4b0dc0ac4026bc26adb9f2f45ac52755b822e0b98c751532
+MISC metadata.xml 339 BLAKE2B fcc496083e6e0543691af5864bc363ef47c1d155c5499b86c2356b46db7945e146833436577e831d09e3fa0f5405feb29413a5035f3d414a6d377f390bbd58eb SHA512 21b44038fe54a7ec9b6a8e9fd33020b029d0d7cb8f99bd4bf63ec7a59335e9ae70accb9dc224be3569e1a4e7df0c8c2dec3827a0fe5986537a2ac954c2e5c917
diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
index bc534d2f74eb..0471d8c2adb3 100644
--- a/media-libs/giflib/metadata.xml
+++ b/media-libs/giflib/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>codec@gentoo.org</email>
+    <name>Gentoo Codec Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">giflib</remote-id>
   </upstream>
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 90bea64e21ee..fc0880287784 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,5 @@
 DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
 DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
 EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44
-EBUILD glfw-3.3.2.ebuild 912 BLAKE2B 91b4b9abf6369e450a1a7ece4eece6563985c88352e8fe4349afc1309bffd072281cfdb55e3d08ccad589785ece93da561edb0034793b455bce5e486ef2f35af SHA512 1060070fdfc189c7ceadc9b5cd27992ca23a605a63d0e3d0ea3fce91a3f8d750b7c59f531d5f1b12e870ecaad4131d35c63faa2841dbf7e1a9adbb1ab7e21a48
+EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.3.2.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild
index f265b08bf58b..126bde0fc027 100644
--- a/media-libs/glfw/glfw-3.3.2.ebuild
+++ b/media-libs/glfw/glfw-3.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 70b94d8d7efc..a3161e8f6bec 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,10 +1,11 @@
 AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
 AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486
+AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST ilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
+DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
-EBUILD ilmbase-2.5.3.ebuild 1213 BLAKE2B 8b0e2e2c88ee683ac4e3323f7426a8af607b4d202e87f51ef5378937ecd7c8dc29673b4c236c64f640deff36f9e780cb4636a6fd813229de9a2e4322fda04ccd SHA512 acf16266005658c10a63aefd2c6bd51f03fc4980de20037c1765277a154708455843c1886a6b28562fd3985723b36c21b7840d2aac6272541a015b597ae245a5
+EBUILD ilmbase-2.5.4.ebuild 1069 BLAKE2B 997f8797c66364f7bf2007128b0010c7561c011b42cb1eeb1bfe3225ba6a5a921661c9405787122aa65df6e033156c831baeafa12accb16f2dd1c0de22b6fee4 SHA512 dd4878bbc6bbe31f39e2102a0bb42d809627c211d544292ee07e4b18ea77643cb680e1e18592c3f223058e1312f0af85734fc867c1505266cf683f0a23f361b8
 MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch b/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch
new file mode 100644
index 000000000000..e22ae13c4bb3
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch
@@ -0,0 +1,24 @@
+From a5e853655daf9e6a8ca8d8b7b5040809d4d9fded Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 2 Jan 2021 22:07:05 +0100
+Subject: [PATCH] disable failing test on x86_32
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 759f359..6fab418 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,5 +56,5 @@ if(BUILD_TESTING)
+ 
+   add_subdirectory( HalfTest )
+   add_subdirectory( IexTest )
+-  add_subdirectory( ImathTest )
++#  add_subdirectory( ImathTest )
+ endif()
+-- 
+2.30.0
+
diff --git a/media-libs/ilmbase/ilmbase-2.5.3.ebuild b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
index 907a133973e8..f7961017b7aa 100644
--- a/media-libs/ilmbase/ilmbase-2.5.3.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.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
@@ -7,7 +7,7 @@ CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
+HOMEPAGE="https://www.openexr.com/"
 SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
@@ -20,6 +20,16 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/openexr-${PV}/IlmBase"
 
+DOCS=( README.md )
+
+src_prepare() {
+	if use abi_x86_32; then
+		eapply "${FILESDIR}"/${P}-0001-disable-failing-test-on-x86_32.patch
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
@@ -28,18 +38,5 @@ multilib_src_configure() {
 		-DILMBASE_INSTALL_PKG_CONFIG=ON
 	)
 
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		mycmakeargs+=(
-			-DILMBASE_HAVE_UCONTEXT_H=OFF
-		)
-	fi
-
-	# needed for running tests with x86_32
-	# see https://github.com/AcademySoftwareFoundation/openexr/issues/346
-	if use abi_x86_32 && use test; then
-		append-cppflags -ffloat-store
-	fi
-
 	cmake_src_configure
 }
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 28d5d8553cc6..47445caea970 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
-AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
+AUX jbigkit-2.1-build.patch 8829 BLAKE2B f50d73770d13dff06f2627026f2b2d75bb5d4ef5cc7c4785f0b31e83c5a5057371b4334c0ae6b39fa49a1f1e46ca4db711e0d92cbe275093a228471eb90302c4 SHA512 2cdf2f93c91835880166198a1eed0e2f6438c52f4f7ee5f4370ac417613f7425f0db3420e44f8afe384867d330ee6433a14d9e12a5f6e0143f7311f9255aa926
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1407 BLAKE2B 250912766d153216e717e62b630af89a14003822f31e667ed5b9713391dd3153460113cf471aee4fd173c17e50b5844992f22ba7b2adaa1f95ab8aa0727df715 SHA512 a5003623970e21dd392d8c67a0636a13dd5abed2eb647affe9e30320d84900c6b8d3590dd210050d1aab231c13ea9c136fa42a23411526b8772103a101de74a5
+EBUILD jbigkit-2.1.ebuild 1367 BLAKE2B 1a87e64bb111bd0c8523f3e946949d5a7a82437f0a05e84a1630da691eac182fa33d4c11cf413b2eebe377520710009cfb4805cac233369c6d393ee74da4e6ea SHA512 4b1776141a70b5664e4e676102e44df5ca54ae4011c546a70316aa6811086ddb70fb986c22bab265345f2f613c90d347b901d9e122f136fbcba904010ae74653
 MISC metadata.xml 373 BLAKE2B 02b125f44ea8401eb695a1b3fff8584c38f50cf9f359cf70e209955babbd749fcfbcd14415a757281f8fd4c0970ba5efbd67b937b81b45b2152a79093d141a34 SHA512 663285ac228539d95ca401d530b53cdb58e2f01e3ee4187622afd1c8bf6ca0ae76bbbdaeb92742408502f4b55dd269464ac2f21231d987ab73f949f6abb92882
diff --git a/media-libs/jbigkit/files/jbigkit-2.1-build.patch b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
index a7bc7ae761de..087ac3c544d8 100644
--- a/media-libs/jbigkit/files/jbigkit-2.1-build.patch
+++ b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
@@ -1,7 +1,7 @@
 This patch has been mailed to upstream. No reply at this time. Status unknown.
 
---- libjbig/Makefile
-+++ libjbig/Makefile
+--- a/libjbig/Makefile
++++ b/libjbig/Makefile
 @@ -1,28 +1,58 @@
  # Unix makefile for the JBIG-KIT library
  
@@ -70,8 +70,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  
  jbig.o: jbig.c jbig.h jbig_ar.h
  jbig85.o: jbig85.c jbig85.h jbig_ar.h
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,10 +1,10 @@
  # Unix makefile for JBIG-KIT
  
@@ -94,8 +94,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  	tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION)
  
  release:
---- pbmtools/Makefile
-+++ pbmtools/Makefile
+--- a/pbmtools/Makefile
++++ b/pbmtools/Makefile
 @@ -1,11 +1,11 @@
  # Unix makefile for the JBIG-KIT PBM tools
  
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index aabec623cbc0..58cb0a9b89a1 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib toolchain-funcs multilib-minimal
+inherit multilib multilib-minimal toolchain-funcs
 
 DESCRIPTION="data compression algorithm for bi-level high-resolution images"
 HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
+SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
 	multilib_copy_sources
 	tc-export AR CC RANLIB
 }
@@ -27,9 +31,7 @@ multilib_src_compile() {
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		$(multilib_is_native_abi || echo lib)
 
-	if use static-libs; then
-		cd libjbig && emake static
-	fi
+	use static-libs && emake -C libjbig static
 }
 
 multilib_src_test() {
@@ -42,8 +44,7 @@ multilib_src_install() {
 		doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
 	fi
 
-	insinto /usr/include
-	doins libjbig/*.h
-	dolib libjbig/libjbig{,85}$(get_libname)
-	use static-libs && dolib libjbig/libjbig{,85}.a
+	doheader libjbig/*.h
+	dolib.so libjbig/libjbig{,85}$(get_libname)
+	use static-libs && dolib.a libjbig/libjbig{,85}.a
 }
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 698ed04b5505..797972da33c6 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,3 +1,3 @@
 DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673
-EBUILD kcolorpicker-0.1.4.ebuild 736 BLAKE2B cd45dd2b5d00729be89d8de3d89eb01452675961b1a472bebd5b0a0f5b2c09a713c2cfc09195955fdc5103005873665c50f1537f3ac65408d687678463f6974e SHA512 574126d929e6bbb8774a1d1e4b9dae5a88ff3e5c14ba8ea04dff08a745cada0e45fc8d4ee8530bbeff838ee4197fef33889c158f7e1867ef12c34f1ad751ebf4
+EBUILD kcolorpicker-0.1.4.ebuild 743 BLAKE2B f14f659014ccf0f984498f0a84c4459e26711c3952a3b37099280dc95b5c0d9f110a70858f56a78f8ef6fd99cfbefe086cbe6239032226a1c9dc0ef0506d76d8 SHA512 2abb05fc432dcc5bac30a45b7211d251090c039aa50ca396b4c0ccd1a4336205efa1040d724ac333c76fbfb65071097c2ad343649a56a4a6b39a57edbcfbadb8
 MISC metadata.xml 582 BLAKE2B 5cabe4fbc89f6b33dd2193707ce455544c8e61139ea78d03220a4acb6833d7d085c8d3470ab0031ead6072d766987b93b4e1f15694898f25b8358bf550868598 SHA512 1b722a703324f146d71a8cbcf807b1e8be67708bbb3af541dbbe1e42958c9f47d5eca36e93f967521f37a2b674068265e7d2c2c7853aaeddfb93748b83794c8b
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
index 5f6f7d835dde..497f088f00b4 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 68746e3acfd1..56c73835531c 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,4 +1,4 @@
 AUX kimageannotator-0.4.0-fix-static-test-library-PR195.patch 1010 BLAKE2B c296f280c851b54d3a6d7fe088ce429b9840144214617346c5e6849784eaa4e3f5b1469cbbf05407aaef812c10f61f0e693bcf3be1d5b852802280e15b2f8c74 SHA512 6baa5fc3fe31e1f9cd6422a667a4cd295783cf8c92aec5c4ff22918edafa461a90008ff4d99f8ded9f3718dbf9c667c59a6dfb280c62292a5b0915bd3b1081a8
 DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
-EBUILD kimageannotator-0.4.0.ebuild 955 BLAKE2B e38e7482bdfdd5dc7aecfd60ed4fbb1276efe78a8a1cf908ca267ef8343297bf7c7ecd4b0623dc56859ecb33b49ceed9b5c31f4e7b91435ef5fe43b076720ccd SHA512 5d9a8196fee811344e3986b6a98ea5a9426c6d57c75bd734769b468889d13dd2f4ed9f50148e677e23a246d6ca13f1ffb90e1261f5c47e46a7edbb609313fce8
+EBUILD kimageannotator-0.4.0.ebuild 962 BLAKE2B b5e381ba97888b47ddf9bc3ad10acec68252bdc8c3b2fed0bcf8dd2f73e7b6e13341c5413c164d0cf5c565fb9673a78058d2933bdf9d301809c5c632abb70ed0 SHA512 5800ebc6e15b18f0f50cd47d386a6204cb91888fa4a960738984eb7c9e07e63364f4ed4a6f1ad715fd5fc0ee2fc7c7c8ba59f941dd5f0e7b092d4df0d4a8f19c
 MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
index c2ab3376cc97..35a7aa80a670 100644
--- a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
index eda201abafd2..bb4cfb552f60 100644
--- a/media-libs/kquickimageeditor/Manifest
+++ b/media-libs/kquickimageeditor/Manifest
@@ -1,4 +1,3 @@
-AUX kquickimageeditor-0.1.2-no-werror.patch 836 BLAKE2B 516bbcb7e2a89d4728756694f0684bc3b5c14aa3b7d0ca9f83c507cfa6f797aeb74099257514eca9ed6cbf959b307b2f352e7252d5f5c68414525a32a0dc631a SHA512 490daac974083f9ddffc57f01b6752b2965ce2e7ca5ef45a9242846ebbf035a1913df18b27afdbfd7b713c0270c154702893d3b8403e29e2b41bf427b13948f2
-DIST kquickimageeditor-0.1.2.tar.xz 3281984 BLAKE2B bf6467dd48c6f64a9b8b8752949af3776d766e8e7076d114c7a8522616f4e36ef47b470c382906764cf56b45f40163ee658f5ba295ae33ab1e379483d4181565 SHA512 b8ffbd2b1c331203bf5e81004b5da729658ea49e6d8c49a3d65b0f397a2b3095408479e9828bc15fbbf1ad69374a7c2cf8dc728c3fe44d28d30137657e3c759c
-EBUILD kquickimageeditor-0.1.2.ebuild 666 BLAKE2B 3c4ff41fe966fe89754c18e5c202e082528d877278eac7f33ce84720a3992c8ca134cac6d834adb611aacec0d11ccd7024ccc0f86279f84a4456119356d70f4b SHA512 020995d86b214f2eef6470ca428a380440a51fc25a7f93cb59f3a7880dd237dab98cb47212708cdea79cb33efae2808e3e913072afa8ee219d5dd4da69f5f4b3
+DIST kquickimageeditor-0.1.3.tar.xz 3281972 BLAKE2B 314d492f841f1786d8e958f0b925a5485d8ee4644488e26fefaaf67bd9388403d5b88c7fc52826555ca91b762ec6caec79ae6a363a2c1d688d26076287a6e72a SHA512 ce04ca71aa6232cde2303a07dd800db9bc590a3fafda8c3843d46e994a37858934ee98914dde4c29e03cd01a247059b577375e57ac5d1449f9029d4865eae4ef
+EBUILD kquickimageeditor-0.1.3.ebuild 618 BLAKE2B 53c04e70a12762679ea82bd1e512c6d7393b8f55586693b18f87962bb36210834a104a70000ca62d7f7539ad5c41b1c5832d3c2d20993dcdb08a8bedd7e699e3 SHA512 7f246a24bbdc2014f4f447838fae2910ecb2ec887d3884c562f077acfd982b527c2f46ca2ebd7356bb76b7b4160fdd79abda1bdb4dd2186740eb6bfd4dcc949e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch b/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch
deleted file mode 100644
index 69448ea2e705..000000000000
--- a/media-libs/kquickimageeditor/files/kquickimageeditor-0.1.2-no-werror.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c79657496326c10f81cf80a8c9a0e55bc2ba2798 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 7 Dec 2020 14:34:09 +0100
-Subject: [PATCH] Remove -Werror
-
-It's doing more harm than good.
-
-It makes it a pain to update anything (compiler, dependencies etc) that
-may introduce new warnings. It also makes it hard to use a compiler that
-produces a lot of warnings, e.g. clazy
----
- src/CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 301c05e..99b0a87 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -33,12 +33,6 @@ add_library(
-     ${sources} ${pluginData}
- )
- 
--target_compile_options(
--    kquickimageeditorplugin
--    PRIVATE
--        -Werror
--)
--
- target_link_libraries(
-     kquickimageeditorplugin
-     PRIVATE
--- 
-2.30.0
-
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.1.2.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
index eb897f7b47c6..639fb3296722 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.1.2.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
@@ -19,8 +19,6 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="5"
 
-PATCHES=( "${FILESDIR}"/${P}-no-werror.patch )
-
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 "
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index 33e87d2c3f09..0b29c9bcb853 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,4 +1,5 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
+EBUILD libbdplus-0.1.2-r1.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
 EBUILD libbdplus-0.1.2.ebuild 878 BLAKE2B 831c09aab8f391d25826ca803514f464f02c516e45bcb056b22f8abd09eb3d19f00295a88d1b911942a5698d23ac856e2c24abe5c88cfcc6d1052cd752005f06 SHA512 52a573e72e3f73be093a99582cdd4f5b1284f140502b9fffeea3d625483e89db0eb23cbcd9e17450dfd3c30c7d4f1aaac380faf8aeb099a72a25be5a5d5d514d
-EBUILD libbdplus-9999.ebuild 864 BLAKE2B c0edddfcb68340cfaec615269079d71ebd873f7c4c720cc194fee6be460f928053852f9d278064ae27685cfbf7beedb198c4f17fb8a30100e21717571f2f4ec2 SHA512 ddd680235bbdc7d40b7fb6da460680aca623c4caa28742e7700380eaf232d71b8dc5d7e6f6fe67b25fc2f84c851e8e83f97ac0d68f601194e3b8b31585027afa
+EBUILD libbdplus-9999.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
 MISC metadata.xml 346 BLAKE2B 7a42d692f3ccc8badbed9bc2d06f4b06891f0fc46d53501de443dbff04b71c6db74f78a310cd484945be3b2035ae001804443bff1a18dcd5b0ef24474453910e SHA512 c45e738ea1fa2ff40738465bcafc8b6c89e7d5dfd3c89250118bc3c531120ee14022c04fe0a2bd5cbe950dd66935be35254239fc61eb947b597328809735693f
diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..8bffc8107314
--- /dev/null
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Blu-ray library for BD+ decryption"
+HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aacs"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-optimizations
+		--disable-static
+		$(use_with aacs libaacs)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libbdplus/libbdplus-9999.ebuild b/media-libs/libbdplus/libbdplus-9999.ebuild
index 5525e10aec4f..8bffc8107314 100644
--- a/media-libs/libbdplus/libbdplus-9999.ebuild
+++ b/media-libs/libbdplus/libbdplus-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib
+EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
+inherit multilib-minimal
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"
@@ -17,19 +18,30 @@ HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aacs static-libs"
+IUSE="aacs"
 
-RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+RDEPEND="
+	dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
 	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
-	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
+	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}"
 
-DOCS="ChangeLog README.txt"
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
 
-src_configure() {
+multilib_src_configure() {
 	local myeconfargs=(
 		--disable-optimizations
+		--disable-static
 		$(use_with aacs libaacs)
 	)
-	autotools-multilib_src_configure
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index e9e1e3a8c2dd..389fcabfcae5 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,5 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
 EBUILD libdmtx-0.7.4.ebuild 545 BLAKE2B a652c7ba1f0bc395581510b58fd9ed9b2ac4059a0f2636aac42655693950bf5a24bbe8e9d67cd3c7db3815e7ba3593ba3c3064ed001c00c9fe35121e7b22dff4 SHA512 ae786eef5934488ee79d96d6eae5871d27cae72db072926a44285f86f9c90eaffb923cb1e5c43bcb1983ac55b24048d5770dc11c5087dd3c3eab15aa3c9d5212
-EBUILD libdmtx-0.7.5.ebuild 657 BLAKE2B 87133f4c0003df800d767d4be55a2510e23ffab6a0893a1ae2e01e0309d930482827a4dedbf52a4e903e0f81f48182343b412997391422bd09daa17eb077b0f0 SHA512 737b972df330f0de017ff3d8d8f6a01fdc0b08f02f1fb2e45165043c9f6830ec101a4eeb4c0c1a3359ac711865009082b18b999fafc3c4d18cd10f6962345e57
+EBUILD libdmtx-0.7.5.ebuild 623 BLAKE2B 3b3797413f1f92bd104523cd3af61bd093077637fc33efececd056dc6a25bc042826b37a7d70a03e83d95491669a34b6ffba85e35482cc219b1ee0c57067dcbb SHA512 4c2ab07031785aef3fb82f5c4f38d1ff70e59fefaa0a2e685e5a7b84408862cb7ab771ca825452f1c803a3cd6dbbc1c6e3ff74c174d4f6f22ae3c0f18f95a113
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index 7d934c512600..250f89d2d4dd 100644
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~x86"
+IUSE=""
 
 src_prepare() {
 	#bug 663346
@@ -24,7 +24,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index cf52fc49779f..04c4b41d393e 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,3 +1,4 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
+EBUILD libdvdcss-1.4.2-r1.ebuild 772 BLAKE2B ed9944139fced667c00cd6718fe2efcc61bb1c41d2ce0ecbaa0cd0f19afbf82b657731f64f105199b0e17eeeaebc465453deb62556d08709e94a34cb78628e81 SHA512 062a64e54bfeb707cee6eee099215c154bef292fbdde2cfb44fc6a97049a3b4d11d16676fe2c672088158d24d03649ea509c713bb41ab8cebd8ab3e221258f6c
 EBUILD libdvdcss-1.4.2.ebuild 770 BLAKE2B e32f48709f4d5af4b13a95dcea63a9504363fd30442b701d95c102e040b77c9325b9009c0c8e5abc1f899b8957481b9cc1454ac610c2a1705c11f111c0da2fd9 SHA512 03140bd23c096faad202ed0623dd84793b1fd3534dfca80f01b8a93a2dfadc49da610674a1506a3ce637da3f51eace9e2e4735ca9febe88cbe0b8a6a80228ad2
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..5da3b6069678
--- /dev/null
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="A portable abstraction library for DVD decryption"
+HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
+SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--disable-static \
+		$(multilib_native_use_enable doc)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index ae38c8dda013..7eed131b98e6 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,8 +1,4 @@
-DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
 DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
-EBUILD libdvdnav-6.0.0.ebuild 1141 BLAKE2B e70d36b38a418b7eb7ae0247c69d0623ecec9995f5e96076e7664c6408762a373535a0c999d33cd0655bdf70f6fd737806940acc52fc4e8f075390d1ecc8b7b6 SHA512 d0f0e737ac5d25ec00f342de77210ad51d225f284ace5a6d22d11b1f8c4bace5ea6f3f01270e583df69aeda6b9bbc621bdb7f057b6b8a757dd1dd1ded0c04f33
-EBUILD libdvdnav-6.0.1.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
 EBUILD libdvdnav-6.1.0.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
 EBUILD libdvdnav-9999.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
deleted file mode 100644
index a873e72aae53..000000000000
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libdvdread-5.0.3:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
-
-DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
deleted file mode 100644
index 8abfcfe142cd..000000000000
--- a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-# To get pkg.m4 for eautoreconf #414391
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index dde4e13645c9..29bf4066809f 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,10 +1,4 @@
-DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
-DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
-DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
 DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
-EBUILD libdvdread-6.0.0.ebuild 1109 BLAKE2B b23ad20e05e1e3003e387e9662b886bae8ea1d785f0fc0e05bce9307f73b8630a1b1794d935ccabc66e0a05e46d593026b38e82a8c211a767e3394f5b845f7f7 SHA512 74c433fc6d04ecdf79bb3d755de546959c58e1a8c2186e8c4d4da13ad5cfe53d3bc84a6e108fe5850cc4debe119317344ac3b7069b202641819e684cc351e7bb
-EBUILD libdvdread-6.0.1.ebuild 1125 BLAKE2B 109dd2f65640717d4a40b05eae53b19ea54c485676271f0b4a23eb7105dc776b664dcff2bd3b1f6e96a40797b0f09ff518f55b69b434a7ab7728ec296be8b25a SHA512 f787b05e1646afd5d4842ac4c5e7352509fe68f7963e5586127a04b008e43ae8b5f2afb1775e819e6583c76ce5e72746bb905bb9621604e67cc0cf9229adc9d0
-EBUILD libdvdread-6.0.2.ebuild 1159 BLAKE2B 06d87fcbc8782d87d81e0003922b3033d1d1da12dff0a08841f00edb41c95d8c4ae3dc85718f7e7cab819a32bebc255a47b9260848c1572c59e8219ac58f3d7f SHA512 cd1c0938191bc4149a10ef76fdd84ec6cea2159d6d7ac8065502a6dc8300aafc44c666528a229c538aa283efe99c66f242ddeffa636563d180a9fec0b0fc69d0
 EBUILD libdvdread-6.1.1.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
 EBUILD libdvdread-9999.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
deleted file mode 100644
index 704a8b6c7306..000000000000
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+css static-libs"
-
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_with css libdvdcss)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
deleted file mode 100644
index d51b2374807c..000000000000
--- a/media-libs/libdvdread/libdvdread-6.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+css static-libs"
-
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_with css libdvdcss)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/libdvdread/libdvdread-6.0.2.ebuild b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
deleted file mode 100644
index c793e198f05d..000000000000
--- a/media-libs/libdvdread/libdvdread-6.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/7" # libdvdread.so.VERSION
-IUSE="+css static-libs"
-
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_with css libdvdcss)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 3e847fce5d83..431af18acc00 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
-MISC metadata.xml 366 BLAKE2B c9412873f5846ca7f8b8465063dcacc021e8e181f2c2f8382e68fd3fbf492b1b6ec361adb19e8c8e565497df7e564670f1ced283bbf70009fd70a465f34f2065 SHA512 7d174956f37394f2687f811a17815e3167cbf82e513ce6e146b77ce62f8aeff4d97413fc6e0d3cc96570f8b256450861ab92769c64cdf085805536beb6116c02
+MISC metadata.xml 452 BLAKE2B 56e1caf3f54975d0cfaa7c7e389b2be730c5f517b832f846a83868bde8e935508d81ba78404e2475c4cb98aecebd1e83f7ac0194d9c3a29126846587ca15b1c0 SHA512 cef98a3c72aaeb3d00d80dafb30457356bcfd51c7461d6b24e1eae736bc7708b5572afd1ad0b5dfa51818aded634d0dc68bc77687265d2d4e02b32f95a7764de
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index dd7cee55e09a..14fb686dc139 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
 		<remote-id type="github">libexif/libexif</remote-id>
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 13752b83410c..adacd331c51e 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -3,4 +3,5 @@ AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
 EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
+EBUILD libfame-0.9.1-r3.ebuild 1040 BLAKE2B a48ab48a7c0cbae8cf48b9c481222c2210bf108389c4cea9d5e71ef2d8ed6787993d49e869a98f5b2a2f6045b8b70064c0b0a31e5c2df1e122326e61abd82519 SHA512 387b6ad99913bd226d48e5b08e8696e1c607e1232c5d70e5ba0313f5f76eb5c29601333663f5e920b4a5c4838f4d6411af2a3eaaf99e7ebdd33bae22634e02e6
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..a2ead699e72b
--- /dev/null
+++ b/media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
+HOMEPAGE="http://fame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx"
+
+PATCHES=(
+	"${WORKDIR}"/${PV}
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-mmx-configure.ac.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	rm acinclude.m4 || die
+
+	# Do not add -march=i586, bug #41770.
+	sed -i -e 's:-march=i[345]86 ::g' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable cpu_flags_x86_mmx mmx)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 6be4e633d120..0fe62daa5db2 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
+DIST libheif-1.10.0.tar.gz 1681115 BLAKE2B d9dc8c630f76d0f8df33e644fbbd589a92aab62927b72f7cc49b0ac9b65141979250c7fecbc4f119d62e5cc4386803580bff10accb3a0a4a04aa9c74ada9a146 SHA512 85550afe4d2c4a0af16213f51b7c9e9478f87199941d125aa7622ee42e5473a2344f3460d9c684b1805d45f903a98b77b4081f539d5b8c445fbf9443c8341629
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
+EBUILD libheif-1.10.0.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
 EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
-EBUILD libheif-9999.ebuild 1597 BLAKE2B 7cc9e56415e52d885e159897fee4ef8e1da9d8d8e3a545d409692f64d01f0cc23da0dbc994d725afd7090051dc790fc8e1e466bebfcbc9df7e53a336c1879f0f SHA512 5b9b509908870e681e34c7f037fec5682d1b18deefe3cfbbbbbfd73f9e1c0da6fb731c5aa0436c0f70544fbfaec4ec93e8ef85c7b807b7d285bb3d82bb75aea6
-MISC metadata.xml 686 BLAKE2B f28565928ef395759abf7b1cbc0bafede7f9299f74b8748534135379d1778f24af394dde234e6d727cbead1a345d2c86c7dc3d93cabf81441ff072a38e7c571a SHA512 b06a9e574156521aa7ef763aae5fb2a83c20aa7265043f3992a9b4acae775f747d7ffbbe2fe5ef57e5e04dc89906c71c9ea1c7bc8ed76f94c347b78d7115ac4f
+EBUILD libheif-9999.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
+MISC metadata.xml 1008 BLAKE2B efdcb0e8e478a1c4959b60f942b45feb79f9209157e29b8be19ca862a1f19b4ffad223a531fbb400351650db09285e12007a4d5f55c7762806496cdd8d520e72 SHA512 fd7c1bf830f32c9a9d13cd2471c403ce889dda643027b191e36cc6c1dd9fac4c481946c221cbf186b380bf26cb816b7f8695ea3aa5f57fde15a366c21197203d
diff --git a/media-libs/libheif/libheif-1.10.0.ebuild b/media-libs/libheif/libheif-1.10.0.ebuild
new file mode 100644
index 000000000000..d68ecc0dddea
--- /dev/null
+++ b/media-libs/libheif/libheif-1.10.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.10"
+IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local econf_args=(
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable libde265)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 20821993904a..d68ecc0dddea 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools xdg multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
 	inherit git-r3
 else
@@ -17,23 +17,23 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.9"
-IUSE="gdk-pixbuf go static-libs test +threads"
+SLOT="0/1.10"
+IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
 REQUIRED_USE="test? ( go )"
-
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
-	>=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}]
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-"
+	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -49,10 +49,14 @@ src_prepare() {
 
 multilib_src_configure() {
 	local econf_args=(
+		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
+		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
 }
@@ -63,5 +67,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index 5ae142ce31e4..1b9b2ce7ad74 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -10,8 +10,12 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
 	<flag name='gdk-pixbuf'>Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
 	<flag name='go'>Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
+	<flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag>
+	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
+	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/strukturag/libheif/issues</bugs-to>
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 87b1d64ac6bc..c053f0ea6020 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,3 +1,5 @@
+AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
 EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
+EBUILD libiec61883-1.2.0-r2.ebuild 852 BLAKE2B f7d22bdfecf206cb51aa9949ccc8f5b7c3ef1d3081a4458f7858bcb56a6f3d9694d0d4db1f910383c3b884755e7505eb907db47abcd7f1accdc3388249ddf50e SHA512 597ad031760c27aa1d39139ba60bcd1b5f8515674e16d97d8c2c60ff45359f7895de49a56914a6c88025146390bd83183a665c43e331e4a74da0091f267028ff
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/files/libiec61883-1.2.0-examples.patch b/media-libs/libiec61883/files/libiec61883-1.2.0-examples.patch
new file mode 100644
index 000000000000..9e19151d700f
--- /dev/null
+++ b/media-libs/libiec61883/files/libiec61883-1.2.0-examples.patch
@@ -0,0 +1,28 @@
+diff -Naurp a/examples/Makefile.am b/examples/Makefile.am
+--- a/examples/Makefile.am	2006-09-24 15:34:12.000000000 -0400
++++ b/examples/Makefile.am	2009-01-15 10:29:02.265594991 -0500
+@@ -1,6 +1,6 @@
+ 
+-noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs
+-bin_PROGRAMS = plugreport plugctl
++noinst_PROGRAMS =
++bin_PROGRAMS = plugreport plugctl test-amdtp test-dv test-mpeg2 test-plugs
+ man_MANS = plugreport.1 plugctl.1
+ EXTRA_DIST = plugreport.1 plugctl.1
+ 
+diff -Naurp a/examples/Makefile.in b/examples/Makefile.in
+--- a/examples/Makefile.in	2009-01-15 01:33:33.000000000 -0500
++++ b/examples/Makefile.in	2009-01-15 10:28:57.088402078 -0500
+@@ -32,9 +32,10 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
++noinst_PROGRAMS =
++bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) \
++	test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
+ 	test-mpeg2$(EXEEXT) test-plugs$(EXEEXT)
+-bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT)
+ subdir = examples
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..a987fe211306
--- /dev/null
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Library for capturing video (dv or mpeg2) over the IEEE 1394 bus"
+HOMEPAGE="https://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883"
+SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	use examples && eapply "${FILESDIR}/${P}-examples.patch"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index b3b2e3195f33..260b393a5545 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,3 +1,5 @@
 DIST libkeyfinder-2.2.3.tar.gz 117373 BLAKE2B a6d3ff64f26e0842c95dea125ae86f3c642db101fe934bf0a54a3586276cea1f2ee427e480e4f375067b80b2c9d9623f9276110371cc91c8b8d9319c92fd91d3 SHA512 7617bb7305854790e2d5fba5e401387612cad4fa61e9209a6af45301ee8dcc990c116e478c70a5d845d12fc6dfaf63362dca608f4774640bc6c29459ca192f45
+DIST libkeyfinder-2.2.4.tar.gz 79053 BLAKE2B 4d30931451625b00e1ecc2bfb6349497887ab805b5a986e05dbc51fb007a2aededcefbf9fc18c1beb7a7bc4e368c763a658979b5c5c6f7e91f4a21797ad414d7 SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56
 EBUILD libkeyfinder-2.2.3.ebuild 653 BLAKE2B caca1cae9f0e66b72a8934fc05c52e448f274c8e0bd07534b1b107d9bb33326d6326c341bf31de5004c3bf15e53e552ffa25939122299d8399db0c08bc6612a5 SHA512 2788c76a06485cedbfa5eb72ef84a22538c47d330c4c353b9470c73dc9bcb95258b091630508e0cef81ab125551464b262c62a3db72e559335b9d2bde0f4eac2
+EBUILD libkeyfinder-2.2.4.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.4.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.4.ebuild
new file mode 100644
index 000000000000..b102bfc23bfe
--- /dev/null
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Musical key detection library for digital audio"
+HOMEPAGE="https://github.com/mixxxdj/libkeyfinder"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-libs/fftw:3.0
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "s/NAMES fftw /NAMES /" \
+		cmake/FindFFTW3.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/liblqr/Manifest b/media-libs/liblqr/Manifest
index 84c9c66e6a44..e708279eaa2f 100644
--- a/media-libs/liblqr/Manifest
+++ b/media-libs/liblqr/Manifest
@@ -1,3 +1,3 @@
 DIST liblqr-1-0.4.2.tar.bz2 344739 BLAKE2B 90ae891603dc525d460b1f180342b2a998ef3081a7504c642d0ddbbc5feef1ceb512a046a5366311d2a86869c8988f24f03faaafd3e7c77b1ff1f82b8a23acc0 SHA512 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
-EBUILD liblqr-0.4.2-r1.ebuild 597 BLAKE2B 8d432a1a9d55cd385fb53df4f1c7aa7c4607d9bc836c93b2c510ae00b9e3bc90f4ef84a984bcb74abd9ccab6834b8a1f613c1b7c4d6302d0434f3185bf904ab2 SHA512 f2c53ad1725e21d2d7c561684f28a0619b8895722c263c5e2216d2c4fef51275ac94d719be7a37ce054457fa231f5b4d56d87becda21bde5519f271685dccbcf
+EBUILD liblqr-0.4.2-r1.ebuild 568 BLAKE2B 9f5f7bbf771c936a84b6fea62649add70dc9738aab77be5eafd3dd37cfed96a6b85b7c0d4b444659cef832b1fda0b5c38acdd82965339ab26be590a887e8079f SHA512 b08afbd12c0b7945c49718b0d833a1efc4047c9fba11fd8168e77ad5cc641efa67ac7cda54c5374075f9795fc94c53d040b682c393cd49f54dcea39712b53272
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index 92e8ad55728a..99053158003a 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils ltprune
-
-DESCRIPTION="An easy to use C/C++ seam carving library"
-HOMEPAGE="http://liblqr.wikidot.com/"
-SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.tar.bz2"
+DESCRIPTION="Easy to use C/C++ seam carving library"
+HOMEPAGE="https://liblqr.wikidot.com/"
+SRC_URI="https://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86"
 
 RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-1-${PV}"
 
-src_prepare() {
-	epatch_user
-}
-
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 24ade6c93d9f..287123c02cc4 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,5 +1,3 @@
-DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
 DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
-EBUILD libmatroska-1.5.2.ebuild 629 BLAKE2B aaf34a4ca644f26de0d426c9757457f0b96186319cf6b1f8463c5ed695c2e0723ad7b5c3319c93a09dbed57bd102f51df39cc65c83af8d1a55aa84c89169176f SHA512 9f822cd754e842f9f3f5e240e28ec65f063795007190f8f6ff946ba881fb2bf9c473ff10a75ce5d10186bb9979e71b9a3412bf7dc874192ffa8872c8e047e540
 EBUILD libmatroska-1.6.2.ebuild 629 BLAKE2B ac32392e700a32fad8bf0c12f43a6a784d77590370a94286b76dfbab95636c2db91d3919eda79c5a3f862d3f0c9a39518ec80d927d1b4d83b488c31b7ed42788 SHA512 250be02d4b44d04d462f336cc5f0850ac3d7464ea89ea3c4f413d44ea8a0458f7eedd54dd88dd33616094397a59d4243f90badabdf2a5220029226031a0c602a
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
deleted file mode 100644
index f2cb4f7601a2..000000000000
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libebml-1.3.9:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake_src_configure
-}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 884f729483c6..c7045da8c3ad 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,8 +1,4 @@
-AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
-DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0e9e1d5393fc60bdb128045e11947873622f1d78f79eba7a4abd46e4537001b66e41f79008ff895680a016e22c5855fc SHA512 c68b7eb906eac2af7b6f588910824ea9a9bd32d4e7b4f8af3579b0e388f5c547583be0ebd1491cdef52dbdb0eca7e2b2731662e48fc66baaddc1e1ca76f385ff
+AUX libmediainfo-20.09-pkgconfig.patch 229 BLAKE2B 98a35093f464be14204ab1f722eb6a0a227cc8224f325227c05b19233723c03c1aae4b13c7f57293c7a75052c7e0f9110a01b5d144e2d1056c1c9f36f6533b96 SHA512 809af5bb16d558504b7abcbab7012101f5723fe08e0020fe4d91b558c04941a943384d5be8e076d672ba62e31aaeb0ae2fafd6fb2d31c7072939dd940feab12a
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
-EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
-EBUILD libmediainfo-20.08.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
-EBUILD libmediainfo-20.09.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
+EBUILD libmediainfo-20.09-r1.ebuild 1795 BLAKE2B ebc2af15dffb2639a0074e57e0f0c822e7931fa85170412b919dd5ba36924cb971a1c337e80402eb97766537a1d2c389c22ef0e9ec4c9be7693af377c65afe68 SHA512 2df425e3944cd74d61f4eaa0b0e189ff58b78595052472fdac0532c73b736563f96dd551cbfbea07b2b26376bcd104c6309dbef9427d3cd961665152cae9ac75
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.63-pkgconfig.patch b/media-libs/libmediainfo/files/libmediainfo-20.09-pkgconfig.patch
index f8e19216f209..4d88ebae78a5 100644
--- a/media-libs/libmediainfo/files/libmediainfo-0.7.63-pkgconfig.patch
+++ b/media-libs/libmediainfo/files/libmediainfo-20.09-pkgconfig.patch
@@ -1,5 +1,5 @@
---- MediaInfoLib/Project/GNU/Library/configure.ac
-+++ MediaInfoLib/Project/GNU/Library/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -28,6 +28,7 @@
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
diff --git a/media-libs/libmediainfo/libmediainfo-20.03.ebuild b/media-libs/libmediainfo/libmediainfo-20.03.ebuild
deleted file mode 100644
index 5ec625856e57..000000000000
--- a/media-libs/libmediainfo/libmediainfo-20.03.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmediainfo/libmediainfo-20.08.ebuild b/media-libs/libmediainfo/libmediainfo-20.09-r1.ebuild
index 5ec625856e57..9da3548cd7e6 100644
--- a/media-libs/libmediainfo/libmediainfo-20.08.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-20.09-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic
-
 MY_PN="MediaInfo"
+inherit autotools edos2unix flag-o-matic
+
 DESCRIPTION="MediaInfo libraries"
 HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
 SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
@@ -13,25 +13,30 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
+IUSE="curl doc mms"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
 	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
+	>=media-libs/libzen-0.4.37
+	sys-libs/zlib
 	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
+	mms? ( >=media-libs/libmms-0.6.1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 
-# tests try to fetch data from online sources
-RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
 
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
 
 src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
+	default
 
 	sed -i 's:-O2::' configure.ac || die
 	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
@@ -42,18 +47,18 @@ src_prepare() {
 src_configure() {
 	econf \
 		--enable-shared \
+		--disable-static \
+		--disable-staticlibs \
 		--with-libtinyxml2 \
 		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
+		$(use_with mms libmms)
 }
 
 src_compile() {
 	default
 
 	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc || die
 		doxygen Doxyfile || die
 	fi
 }
diff --git a/media-libs/libmediainfo/libmediainfo-20.09.ebuild b/media-libs/libmediainfo/libmediainfo-20.09.ebuild
deleted file mode 100644
index 5ec625856e57..000000000000
--- a/media-libs/libmediainfo/libmediainfo-20.09.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 979c6934cf67..11174cba485d 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,3 +1,4 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
+EBUILD libmms-0.6.4-r1.ebuild 689 BLAKE2B 250d851e73222c460ab8bdb7e2e3728b7f8b04a3bf33177de2944699dae457ebc28a4750635446e5508a1e4bbe8bae5cb5ef3585fce6e98806a243546ecc289d SHA512 37948ee11e75fb649b8992b94c29fa5bfe9895f9619b4c52756076a6ad4a30a5ffa18b1351c4f1c721b09881f6cb6852778e21c68ad66b3536b818990436e672
 EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..d84708f7339c
--- /dev/null
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Library for accessing Microsoft Media Server (MMS) media streaming protocol"
+HOMEPAGE="https://sourceforge.net/projects/libmms/ https://launchpad.net/libmms/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index b6519df7d86e..664abb513942 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,6 @@
-AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
-AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
+AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
+AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
+EBUILD libmodplug-0.8.9.0-r1.ebuild 835 BLAKE2B fe4236775a86f5cf224948a9e6bd5a8a1a2920ac44ad3e893d63f11107ebbb228b86f4b2a9db2ef757f96b3f0a4aff74904bc369997b30a8bf50464081855ea1 SHA512 6b74b820caf4b777afb70c027d2b7d3ab8ad25d6e5bc6f52079f2292003293bd15d18198e2944115d0f4c910a55442e79937afd236124dca49e93979c85b637e
 EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch b/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch
index 87150effb3e9..cb5d56006102 100644
--- a/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch
+++ b/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch
@@ -1,7 +1,7 @@
 Index: libmodplug-0.8.4/src/load_pat.cpp
 ===================================================================
---- libmodplug-0.8.4.orig/src/load_pat.cpp
-+++ libmodplug-0.8.4/src/load_pat.cpp
+--- a/src/load_pat.cpp
++++ b/src/load_pat.cpp
 @@ -53,8 +53,8 @@ typedef UWORD WORD;
  #define PATHFORPAT	"C:\\TIMIDITY\\INSTRUMENTS"
  #else
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
index 51f0d9d2d495..83bf8d9a8e30 100644
--- a/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
+++ b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
@@ -1,6 +1,6 @@
-diff -uNr libmodplug-0.8.9.0.ORIG/configure.ac libmodplug-0.8.9.0/configure.ac
---- libmodplug-0.8.9.0.ORIG/configure.ac	2017-07-26 22:39:07.461198820 +0100
-+++ libmodplug-0.8.9.0/configure.ac	2017-07-26 22:39:53.284622741 +0100
+diff -uNr a/configure.ac b/configure.ac
+--- a/configure.ac	2017-07-26 22:39:07.461198820 +0100
++++ b/configure.ac	2017-07-26 22:39:53.284622741 +0100
 @@ -31,7 +31,7 @@
  AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
  AC_CHECK_FUNCS(setenv sinf)
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
new file mode 100644
index 000000000000..ce0affd3f679
--- /dev/null
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for playing MOD-like music files"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
+	"${FILESDIR}/${P}-no-fast-math.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 9217db18d2fc..005cce1a992a 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,5 +1,6 @@
-AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
-AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
+AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
+AUX libmp3splt-0.7-libltdl.patch 676 BLAKE2B 144528812f340517d4da52eeefb35054b31363d5c24eb0fc1fa74be7c39008a9d27fd61a9c412aeddf5698df1469975101fec74de5f65b17bdc2a9d727017cf0 SHA512 50e9c6472b79b2dfcb43764828e26ddacc3b1b747a6264291385d6173de51608188d4fd865ac20dd2ad63ddb9d3191eb62f872ddead15564d7400b31dc5bca66
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
 EBUILD libmp3splt-0.9.2-r1.ebuild 1252 BLAKE2B 7743cafa4f00af8ac3ad23691e18b74b0314a017d433bfea07bc045d1ac67fa079b358701881fc6866a674ebcfa4a5a185ea26f72e0480cf90206aa39e534469 SHA512 94668060ca959377fdda7d65f179141b5b6e29f30e4ada17e4af18c3e3a569ea3681671c99bc8a1db82ff2b56614f232999f33a156acab44f1e2c4e166d34bf0
+EBUILD libmp3splt-0.9.2-r2.ebuild 1296 BLAKE2B 651cf7b1e2a36045b5c510b22c2a8e9b2075e7e53ba6de173a7ab3bc6954e86071a4bb257bb05e43e43566756eb9c866a2e5b0badaca14521079c77a08f75b55 SHA512 0445bee289b3eecaeaaa732059b28ac57af86e29bcce2897593fe0a45d60d41674f748b5b79ac68c14b784477d898b0613efdc6eb9aaf2ffe5e3f94493c966f7
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/CVE-2017-15185.patch b/media-libs/libmp3splt/files/CVE-2017-15185.patch
index b31a92d0c452..82090f430069 100644
--- a/media-libs/libmp3splt/files/CVE-2017-15185.patch
+++ b/media-libs/libmp3splt/files/CVE-2017-15185.patch
@@ -1,7 +1,7 @@
-diff --git a/libmp3splt/plugins/ogg.c b/libmp3splt/plugins/ogg.c
+diff --git a/plugins/ogg.c b/plugins/ogg.c
 index 50cc495..57745f1 100644
---- a/libmp3splt/plugins/ogg.c
-+++ b/libmp3splt/plugins/ogg.c
+--- a/plugins/ogg.c
++++ b/plugins/ogg.c
 @@ -212,26 +212,36 @@ static splt_ogg_state *splt_ogg_v_new(int *error)
      goto error;
    }
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
index 95650f87a078..0755fe79af92 100644
--- a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
+++ b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
@@ -1,5 +1,5 @@
---- configure.ac	2011-08-07 00:14:06.723806363 +0200
-+++ configure.ac	2011-08-07 00:14:02.405860340 +0200
+--- a/configure.ac	2011-08-07 00:14:06.723806363 +0200
++++ b/configure.ac	2011-08-07 00:14:02.405860340 +0200
 @@ -68,16 +68,13 @@
  # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
  #################################################################
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..32c19c64fdbc
--- /dev/null
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for mp3splt to split mp3 and ogg files without decoding"
+HOMEPAGE="http://mp3splt.sourceforge.net/mp3splt_page/home.php"
+SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc flac pcre"
+
+RDEPEND="
+	dev-libs/libltdl
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	flac? ( media-libs/flac )
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/findutils
+	doc? (
+		>=app-doc/doxygen-1.8.3.1
+		media-gfx/graphviz
+	)
+"
+
+DOCS=( AUTHORS ChangeLog LIMITS NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7-libltdl.patch
+	"${FILESDIR}"/CVE-2017-15185.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cutter # TODO package cutter <http://cutter.sourceforge.net/>
+		--disable-optimise
+		--disable-static
+		$(use_enable doc doxygen_doc)
+		$(use_enable flac)
+		$(use_enable pcre)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 356775a86ff4..ebbf041652d4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,7 +1,8 @@
-AUX libmpeg2-0.5.1-altivec.patch 688 BLAKE2B af134d34d30b1c090f9437171b2493c5c9e3b661ae3aa8f9acde681a2ebd019296784ea5c7765923e6fea2935fadcaee142696b2cf6954b8cc25360bfd0fead4 SHA512 4b8166c5c1cea6e62a78808cf5d86baa7dd10688f8fbaf89a0f78904ef0e69d4dc9a31afb33b9eddf011fd077edf4205707544f71e407eef4b2078ac1cefef51
+AUX libmpeg2-0.5.1-altivec.patch 616 BLAKE2B 29a1501c28d708e756ef5d96a09cd8f4c9804b5e63ff45958bef365b7e0971d34a43763878be54b9f1b284efec8474416018977289e85ee469c5f3c4d31ef2dc SHA512 574b7667c9498d612af906aa35a6f6c52011c1ca47f1ac83c29db69389f948782b555c319e50ea520e43f96a93d79143c7e4fe3671d3874417d5b71f7b216b53
 AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbfdde4dd616369eeed807fc072e7acafdf3ff978c4274b698b6af0063991e99d1d022cae7dfe1068f0777849992bd14a0110cd5403c4 SHA512 334e4e0b1e2877311503d2907f4f65c26d6a83ee79308c49697b2f3d2b8da9ac665e19ab419d85a944eaa34e1d43f512d1418a372cd444381d66f71df2a92c83
-AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
+AUX libmpeg2-0.5.1-armv4l.patch 566 BLAKE2B 3c3c87dac145bb4f447cc0657da3eb703c61c8be2cc84623808b6ec48f9a4a3d334cfa92b53c4fccc7fa09fb0960518a350c8ca354af0cdd450f4aac1e0ad22b SHA512 3705438a1aed3a5f30cb04f4a5b6c128b22b9e4d6af949c6ad1244ec26e2302807c99e81866d08349ee2056ec66ce820747d265bd41cd0e300cd5ef667dfd53a
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
 EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
+EBUILD libmpeg2-0.5.1-r3.ebuild 1320 BLAKE2B 3936f3938d686c569f52c05414f38a44cfe0d1d92744fe1f15f69d1b18570327c775469fbb79ea7b4147517f206980dabe116aaac1c99e2b6a6a5a0419e099b9 SHA512 0e24bf88a4d4a5eb40042e52d73f01a70193a1d192569ce9ed83f0058c7556f3189960ecdfedde127254f1d96caabc76d941df59747857f600455651f00cbb35
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
index 617fe7509951..42fb201eb424 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
@@ -1,5 +1,5 @@
---- configure.ac.bak	2010-05-25 17:12:14.756245990 +0000
-+++ configure.ac	2010-05-25 17:11:51.629581723 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -79,11 +79,10 @@
  		 CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
  		 AC_MSG_CHECKING([if <altivec.h> is needed])
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
index bd9561e0c46f..48b1648f49c3 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
@@ -1,6 +1,5 @@
-diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
---- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
+--- a/libmpeg2/motion_comp_arm_s.S
++++ b/libmpeg2/motion_comp_arm_s.S
 @@ -19,6 +19,16 @@
  @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
new file mode 100644
index 000000000000..19f464944a6b
--- /dev/null
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for decoding mpeg-2 and mpeg-1 video"
+HOMEPAGE="https://libmpeg2.sourceforge.io/"
+SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="sdl X"
+
+RDEPEND="
+	sdl? ( media-libs/libsdl )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXt
+		x11-libs/libXv
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-altivec.patch
+	"${FILESDIR}"/${P}-arm-private-symbols.patch
+	"${FILESDIR}"/${P}-armv4l.patch
+	"${FILESDIR}"/${P}-global-symbol-test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		--enable-shared \
+		$(multilib_native_use_enable sdl) \
+		$(multilib_native_use_with X x)
+
+	# remove useless subdirs
+	multilib_is_native_abi || sed -i -e 's/ libvo src//' Makefile || die
+}
+
+multilib_src_compile() {
+	emake {MPEG2DEC,OPT}_CFLAGS="${CFLAGS}" LIBMPEG2_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 115b05634f7f..63e5667df639 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,4 +1,3 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
-EBUILD libnsgif-0.2.1-r1.ebuild 872 BLAKE2B 279c47a72be368499a14df9e862f6c5f91efbe068730081a048a8b205ddb7dc669a1b6298e69517a43253999224ec46ba5aa67a33ecce6878296b57780265603 SHA512 75b925962a07b70952ec4a7494c08e9f97a99e58e1e7e729cde6c3bf161bf5666558bf5962c73e622c8456688bfcbfed12801e62e37e0eda875b749f40aef17d
 EBUILD libnsgif-0.2.1-r3.ebuild 806 BLAKE2B 9d47c9548752bd2e4f9b28cee21c6b5409677434004a0e12da3684092ea353e00c7fa38c347fef96062e4954ed9fdb4297c9655f93d19001e22f316dfb030ba8 SHA512 b782341f335db316a81a28b89a5735aeae80ec13db8e6c839c8246001424563cb08c947c5f3bd00beaff4c94d053bae6a1f188e602b85f51cc620365b68fbb63
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
deleted file mode 100644
index f5ce7cdc1e6e..000000000000
--- a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	>=dev-util/netsurf-buildsystem-1.7-r1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/lzw.c || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index b4cafc210d35..caba64073660 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,5 +1,4 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
 EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 3bcab7762912e1002c9c43c99acbfcab3526833b91da2fcb81e48837f81e736611b41702ddd9bbc56c339688769c0f2dd1a38634dd6443e2d78909d9803680fb SHA512 26c82252134e02af455e328745c08943975d8a353d0275e804c727ec7d7758f83b5c608db1336c396d4f1cc1b67b17a7e2d6031436df143b49f796cb001a74d0
-EBUILD libpng-1.6.37.ebuild 1317 BLAKE2B 70d8454967f4c276802fafa31a698d9382e71e7423487188f7fec9cc21f7c7743ced62a96dfae60fa2c30fda0d7854d3ee0c015cb11f230cc78b2e722febcdfe SHA512 aaae192942e90c6645c3e48989555b613ab1e435b7e6772779821cf669bcb92fb1a4096a7bb6e212d6a213c2a6a28c44988a03fe412bd31e52f8765bf7d85d03
-MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
+MISC metadata.xml 950 BLAKE2B 148894d74c766c80be02d1c6d48946ac8b3fa1d59cc6a28515f50a3aebd2f46da99c67dc324ff3fc99ffee5147b25c3848d6e39e8a57d864140160747c8480e1 SHA512 b26758a5222f261eab2a7a5388798120fd4170cbf1f495ba44d73512c2a9676892b9ad669e96a35b84df354de8baa83d259f5ffdd8de7c09285f0f50a805dad2
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
deleted file mode 100644
index 7a517f83dc30..000000000000
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng2"
-SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse intel-sse)
-		$(use_enable static-libs static)
-		--enable-arm-neon=$(usex neon)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 973c824aaa41..34fc4dce7b8c 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -5,6 +5,10 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Codec project</name>
+	</maintainer>
 	<use>
 		<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
 	</use>
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index 11adbf70bf66..b925bea10a61 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,5 +1,3 @@
 DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
-EBUILD libquvi-scripts-0.9.20131130-r1.ebuild 870 BLAKE2B c9ab7b204703afa89e8d6cdd1ecd88cc1bcbd11c6e29ca1f24ba3d82cf0809a8af1d837379f7a47cf8e5ef6637c5b21282e2a02cc3f9a7dffa614ff5a85a8281 SHA512 32cb042c4abba8637d8c901e12726cdcc36a968ab40d4fc54d08d79f5a4142d2d7593a4ad8864dc5437a5d1647db92685f8079775597609d39cc3329ecd2f97c
-EBUILD libquvi-scripts-0.9.20131130-r100.ebuild 822 BLAKE2B 61cefbda384cbad0c092d13194c8d74874e3eaa3342f4d79ad38e5d0fb20fba3125b8d5265365e797219d07461e0c2c55adc23c0d8d82603f50977379811b50f SHA512 d3bcc450e6b5d2a82fe874da11822667571b0c7be1ae937893d627a2f647cefb2e7715eef7f550b06ad4af37b4416c62400c009e3d40b985692932ef55fc18f5
-EBUILD libquvi-scripts-0.9.20131130-r2.ebuild 661 BLAKE2B 5b827f6f4438bac3c6a22158a23f99ef6c1e914ac1de4be92555e73ac01f98b26d96ec317b4c0ebe613586355ac5c1578b432f8963b4de458b11c551c6eedcbb SHA512 4f39a18b321881d4dcefd95719e102a5ae4ff294bc98950f854a0e58ec15c87fc093b0562d062f8621570a7d9f2a5633fba5719e1227e9e6defba9559c727ee8
+EBUILD libquvi-scripts-0.9.20131130-r100.ebuild 817 BLAKE2B 9747d9cecba4eeef689ba34bbfc5a4f5c175d494a43a86d54ee7901fbb387a51827a759a1f1effe21de7359b624e3ef98a4b372bac14568b49582d3d1c9cd304 SHA512 11ec05193f1814834771789c2a452e482daf764cf287b54757864711c2069beffd1bee00007b46c97594b8abf90e229b6ce37037c735b0079d71438c0e4ca2ae
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
deleted file mode 100644
index d4abf353873b..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# note: if pkg-config lands in /usr/share, multilib-build with Lua module
-# RDEPs will be enough.
-inherit multilib-minimal
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1-r1[${MULTILIB_USEDEP}]
-	>=dev-lua/luaexpat-1.3.0-r1[${MULTILIB_USEDEP}]
-	>=dev-lua/luajson-1.1.1
-	>=dev-lua/luasocket-3.0_rc1-r2[${MULTILIB_USEDEP}]"
-DEPEND="app-arch/xz-utils
-	virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_with offensive nsfw) \
-		--with-manual
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
index 7c2917320828..e2e8f663759f 100644
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="offensive"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild
deleted file mode 100644
index ebc2c74d1a99..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lua/LuaBitOp-1.0.1-r1
-	>=dev-lua/luaexpat-1.3.0-r1
-	>=dev-lua/luajson-1.1.1
-	>=dev-lua/luasocket-3.0_rc1-r2
-"
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf $(use_with offensive nsfw) --with-manual
-}
diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index d752d5cb0704..52f89907619d 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,7 +1,5 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
 AUX libquvi-0.9.4-autoconf-2.70.patch 359 BLAKE2B de87ca7222d1073da64337eed378a8d231da4ccd99cffa48dac377fac040b93df752977c7cbf9fc872c5547a599cdeeedb25832c9102c0df39b991f5b0669e58 SHA512 a6c1a853013ff7cc128d8ec1599e9847c4f5ec94bd9eab389c589696d0af8ab5704a9c2861186fa51d84a18dac67000af9c20c0fcedb1af1f0ba6fd64cbd1d00
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
-EBUILD libquvi-0.9.4-r1.ebuild 1272 BLAKE2B f3d2d6088b4da79b5cd4a8957b0ea260368ade1f8984ffadbf6228c551c6021b661099dafc04e782abbae49df416293cc048dbca9eeb0dac28c78764dc789579 SHA512 3e2388d3a61e5f1fdeb83616e100acefdc89da45ba975b63d8818c3eec9c4c011440a61b97033f9819b334da7763a8bbd2cda90516d1f4404b4082a4a080890d
-EBUILD libquvi-0.9.4-r100.ebuild 1287 BLAKE2B 661e1cb938df16ecc9ede714b7b6c0f80040b7fdac6a1cd04834b5b40d397b23bab7fe2daceffcb774a72e35ca2737ff7941dbe773b23da76fa6c43b99f4dc2a SHA512 3d025522b33548ee63d647d3cfd48964c0ff734dac0ef1bf23b91493b16440536a855d13866bfce8e4c81a2d843f5c49f054a5fc9f3a12776b8974215026f925
-EBUILD libquvi-0.9.4-r2.ebuild 1196 BLAKE2B 2f85382337e83f5b47b9b346db7110b5bae74b37caf94a5a5ff8d9d5d442e7b586571f6ab421d0383b6daf41b725d62fce513ca2961ef3a6035a43050285051d SHA512 001db44e174c076311a08adce359eacfd50850712b1d5fbd19555f3658b72b9ae0330d039800e1ac02f8ab27679a516bbfbf9a512754b917e27693fe3d69c33e
+EBUILD libquvi-0.9.4-r100.ebuild 1282 BLAKE2B e71315f932cdad6736b7b803d29c0fff5191eb5d8da13afdc625386ce58e03301a8c24f68cfb02fedfea2e763a811e1815b287b817ddc68302aa527716f7324d SHA512 e99c3cd8e0a2613a234c061c7e1dbe39096e1eb5e7dd994a5409cf6ac3b463f83f553adc59e748c1558dbbdb426e0103a8f2cbabd83dafd738c445f89b1e7285
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
deleted file mode 100644
index bf3e51e5ae74..000000000000
--- a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils ltprune multilib-minimal
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="!<media-libs/quvi-0.4.0
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=media-libs/libquvi-scripts-0.9.20130903[${MULTILIB_USEDEP}]
-	>=net-libs/libproxy-0.4.11-r1[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.36.0[${MULTILIB_USEDEP}]
-	>=dev-lang/lua-5.1.5-r3:0=[deprecated,${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-
-	use examples && dodoc -r examples
-}
diff --git a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
index 1d357a005779..2a30743b87ff 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="examples nls static-libs"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
deleted file mode 100644
index 75d9b7ba8237..000000000000
--- a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="
-	>=dev-lang/lua-5.1.5-r3:0=[deprecated]
-	>=dev-libs/glib-2.34.3:2
-	>=dev-libs/libgcrypt-1.5.3:0=
-	>=media-libs/libquvi-scripts-0.9.20130903
-	!<media-libs/quvi-0.4.0
-	>=net-libs/libproxy-0.4.11-r1
-	>=net-misc/curl-7.36.0
-	nls? ( >=virtual/libintl-0-r1 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch
-	"${FILESDIR}"/${PN}-0.9.4-autoconf-2.70.patch #749816
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-	use examples && dodoc -r examples
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 7bec3bbc0dca..5c679c30d6f7 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -3,8 +3,8 @@ AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf84281
 AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
 AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-DIST libsamplerate-0.2.0.tar.bz2 3739932 BLAKE2B 45e7d1ceb4134bf41117ba09c3280e403d66b928bd0528cf2bae0c43064bc032de18d426f93802cd484080bc5b49b8df6378ea023c0ce76381d0a6d3972d8128 SHA512 40422f8a9a5eaf1d0cfa18a98ad561885c15556962db8892c412870745774f971087f5fc4775bc6e462857162ff7ba895d5b55e3cea9982aebdb915de391699d
+DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
 EBUILD libsamplerate-0.1.9-r1.ebuild 1003 BLAKE2B 51b1ef8835d7725369e8358e008d0e18e63bb6750b71362244c50fcf8a9d1351e276e9b06a4bfb4ce1f4fa7929ce003ce21b4cd2db99760e607040df9bf27c64 SHA512 ce35cf2cdf645f6dab7e1e8c1c7f3507fd7e79f8d10da27e678ed234dcdb5a9aeaecd705d497573c1ae7cbe4a5301dd2a8177d2e0e635b1b28ca0181b5067e9c
-EBUILD libsamplerate-0.2.0.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
+EBUILD libsamplerate-0.2.1.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
 EBUILD libsamplerate-9999.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.0.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
index c2eb013b6fe2..c2eb013b6fe2 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.0.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 885b73a355d4..7abe9eed9385 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,6 @@
 DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
+DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
 EBUILD libsndfile-1.0.30.ebuild 1806 BLAKE2B 6da01f634fe9fdbcd6909a5fb2b2fbc4db1d1d5e043bd9cbe49394cc0949b21fb180b276bc3487909c0f48e14d9364da946be1b0d2865fa93f9cee6a57343ebb SHA512 1dbf804a971370d8d4c160c5df5825587ad81053de5a01a1d5c86d74b5695952f06235c11dc8cd35df72ec5721db0c22800a4802f77029330e2fd07a75120062
-EBUILD libsndfile-9999.ebuild 1813 BLAKE2B 0c4729157478fe2d9a62a708bd35692ad3d74ea342a387fa4080d00b7f6cbbef81b037a01b1866830256ea56ba826cbf13e75d5583bb2ba9f8326cbb8a0f9ae6 SHA512 0a1b8d3c656277ab726c16e0b7b22501bec3896400fd5a7b8e842065019f1d71d8fa1d46a5d7a4beab413c9fc633b3fdf48003c08a40b3606115013c356b7e0b
+EBUILD libsndfile-1.0.31.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
+EBUILD libsndfile-9999.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
new file mode 100644
index 000000000000..541b8501fc49
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
+else
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://libsndfile.github.io/libsndfile/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		media-libs/flac:=[${MULTILIB_USEDEP}]
+		media-libs/libogg:=[${MULTILIB_USEDEP}]
+		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
+		media-libs/opus:=[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib:= )
+	sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+="
+		${PYTHON_DEPS}
+		sys-devel/autogen
+	"
+fi
+
+pkg_setup() {
+	if use test || [[ ${PV} == *9999 ]]; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--disable-static \
+		--disable-werror \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index fe3ad230a792..541b8501fc49 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,23 +3,23 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
-	SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
 DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+HOMEPAGE="http://libsndfile.github.io/libsndfile/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa minimal sqlite static-libs test"
+IUSE="alsa minimal sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -57,8 +57,8 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-octave \
+		--disable-static \
 		--disable-werror \
-		$(use_enable static-libs static) \
 		$(use_enable !minimal external-libs) \
 		$(multilib_native_enable full-suite) \
 		$(multilib_native_use_enable alsa) \
@@ -69,6 +69,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 067024cf9188..130c7e187faa 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -1,8 +1,9 @@
-AUX libvisual-0.4.0-better-altivec-detection.patch 1551 BLAKE2B a7c9c722ef508dc1895928ed1b62e392b31db0c860db7227cb30c2150027f502927d7011905881476456a3595f70484c6aab13d3d0a370d3a505d03341a7ceb9 SHA512 c78b136adf384d22ed6e918e30f6f42a97a087a4c1bb88799a9b299eb50c41ea7a98dd405ddb0360e9cf0ace83998744a9428a4e18954dade7ca75bbc54b4b16
+AUX libvisual-0.4.0-better-altivec-detection.patch 1555 BLAKE2B 8516652c13c365bab2e7027f64dc02e62e7ae499b077e6e6d65c2e9c4e84b2276c26ed07785d984696dfcbffc104f1f9d2c12a6a5d6cb0dd4b8eaf587f710e37 SHA512 ac7be2f83b1edef03ee82add11eb97e22dd7d90c53f858838e0616d5eda54505afa7cd86e35c30b5e44191ff31e754f65d2eb449e2e480cd5e2ee6ad5e34a833
 AUX libvisual-0.4.0-cond.patch 549 BLAKE2B 05526c32f22451d851d0dcef380257c31d459360771e75061ffe2fe1c7a87e84f87033ff2831d53e0bd0271f920b3ecb025ddf4ca94ebbb398b69962028f3c51 SHA512 57989250f0cfdd12ebcd0eb89cabca71091a0ad378369d654870a103c633a01bd1a1bbbb7d48d9995c2dfe80fe34b1c44a0a151be4a86c5e5455806a1b14ed94
 AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681d1bc99ef81d9556c1aa3f5cd0a0fd633f3468fb20691b1657ede58afe3313c01874f78f2e39bc52398b25b7318ceebac9 SHA512 e1cf6fb10a912e3117bf866a92d0b4c8de61fe1e35946a21f00f005efe2a48c3596ff087d9dc16807b9049a542410e24efadc9343208512b2e14974e0b01f018
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
-AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
+AUX libvisual-0.4.0-format-security.patch 542 BLAKE2B 12ebf90d87646e5a1bf2c6b9491c763c24aec6715b98a126302076a3b1fc23e281b77e66f2be3284e5be48885e8bd739ac4de4a20495dd0ffe97b1419859c123 SHA512 8102b36be4045496bee66d52d403ebcd916c88fd1743f946be0ca766d4feb533b2890076ebce1a19800d446bcb586fbadeeebf2d36b98da851342f1d46120d64
+AUX libvisual-0.4.0-inlinedefineconflict.patch 1882 BLAKE2B ad36c592e057f56e1a954caed674a7876eed43966d16769222ab0f3e7eed9e14ce7e43c60c03463519f658eccd3c0628c0a4ca04f413af05be81e01efbb3ed40 SHA512 eec5a6b5ec94c796dc89db891f7b2fcc3c6f8a8153192e270b14deaa8543c8e53e7f3c748803a5efc5e055475c673e3ed8a04327090f6b62a73f2c0c9bbf052f
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1243 BLAKE2B a051f52f5e024a969c9510681931b802c4da13e8863b8f015eebb0f0c5417468ea74dbf124223f8da68d93f797eadbd77cb8ed56de712a0dc084702ad07faca4 SHA512 73c142f1b1d60fb0c3af64f02885420b73ade90c71a62df4cc257246f8d507aa06cd2fc31fecb1b5948c6dfa174fae7fb3638679c75f75015666b0ede1731803
+EBUILD libvisual-0.4.0-r3.ebuild 1238 BLAKE2B 9f8b108e133cf8c12a23f973cb1541eda2225a38cbb5dc239c2260c73474f44394b1ce32fa53e3bf3cbf9e9b13b56cb301280b001530c71749e8007c5c01bea9 SHA512 ba537339663628060d9bf8fe0dbed4b8276429ce5f45a40a2884bddc8aa50b609cd248299c55d4e2bb8e8339c9dbbc6be87804235eed1ca0949c1941018497ee
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
index 19aa579aa110..ca34558549d4 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
 
---- libvisual/lv_cpu.c
-+++ libvisual/lv_cpu.c
+--- a/libvisual/lv_cpu.c
++++ b/libvisual/lv_cpu.c
 @@ -50,8 +50,19 @@
  #endif
  
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
new file mode 100644
index 000000000000..91ff1c727335
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
@@ -0,0 +1,16 @@
+--- a/libvisual/lv_plugin.c
++++ b/libvisual/lv_plugin.c
+@@ -442,11 +442,11 @@
+ 				
+ 				visual_list_add (list, ref);
+ 			} else if (ret != FALSE) {
+-				visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++				visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ 			}
+ 		}
+ 		else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */
+-			visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++			visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ 		}
+ 	}
+ 
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
index 5d04f30335a4..9267c5a954c5 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
 
---- libvisual/lv_cache.c
-+++ libvisual/lv_cache.c
+--- a/libvisual/lv_cache.c
++++ b/libvisual/lv_cache.c
 @@ -32,7 +32,7 @@
  static int cache_dtor (VisObject *object);
  static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
@@ -20,8 +20,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
  {
  	VisCacheEntry *centry;
  
---- libvisual/lv_defines.h
-+++ libvisual/lv_defines.h
+--- a/libvisual/lv_defines.h
++++ b/libvisual/lv_defines.h
 @@ -63,13 +63,13 @@
  
  /* Compiler specific optimalization macros */
@@ -38,8 +38,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
  # define __malloc		/* no malloc */
  # define __packed		/* no packed */
  # define VIS_LIKELY(x)		(x)
---- libvisual/lv_time.h
-+++ libvisual/lv_time.h
+--- a/libvisual/lv_time.h
++++ b/libvisual/lv_time.h
 @@ -101,7 +101,7 @@
   *
   * @return Nothing.
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index 50f3ac50b8e7..f6880e33b6ce 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,27 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-AUTOTOOLS_AUTORECONF=1
+inherit autotools multilib-minimal
 
-inherit autotools-multilib
-
-DESCRIPTION="Libvisual is an abstraction library that comes between applications and audio visualisation plugins"
+DESCRIPTION="Abstraction library between applications and audio visualisation plugins"
 HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug nls static-libs threads"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+IUSE="debug nls threads"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-better-altivec-detection.patch
@@ -29,24 +24,33 @@ PATCHES=(
 	"${FILESDIR}"/${P}-conditions.patch
 	"${FILESDIR}"/${P}-detect_amd64.patch
 	"${FILESDIR}"/${P}-cond.patch
-	)
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libvisual-0.4/libvisual/lvconfig.h
 )
 
 src_prepare() {
-	autotools-multilib_src_prepare
+	default
+
 	# autogenerated, causes problems for out of tree builds
-	rm -f libvisual/lvconfig.h || die
+	rm libvisual/lvconfig.h || die
+
+	eautoreconf
 }
 
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable nls)
-		$(use_enable threads)
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable nls) \
+		$(use_enable threads) \
 		$(use_enable debug)
-	)
-	autotools-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 4b872b903934..886ff1b66f06 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,12 +1,9 @@
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
 AUX libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch 8035 BLAKE2B 785a8769741e5af10ce0f18f6ef9f091d1335ca1c8515c9b653d3a177a620a8b3360b7df03f058b63e42259d6e4ccb6863e0ec9acd69886627a222ea3b8beb2d SHA512 b5af677b7f8fc6c61ea1c99c094103549cbe1a0163da70f51d4c34eec40b507a7bf8f84f97ee141a15c33bfaf2a6cb36c572a08465407fb17eb9b6a1364a3819
 DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
-DIST libvpx-1.8.2.tar.gz 5312988 BLAKE2B 4d27eb457c20e70f5b68b589962692d4938cf69e889009cd6aa74cbefb3afd53ba2733420e5a8feb1388558969d95d5a26e1fc60b9b8ef6a0be8dade7d54ee0b SHA512 da2ab0775a28ddd78654bbe46886e833d4ef7ba91867fc1427dceced735b6177eff06b24f204c075c50c3a5cadc5be6a1fb213c44df189218a543b52554f3a38
 DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91 SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
-DIST libvpx-testdata-1.8.2.tar.xz 422945340 BLAKE2B 117c26e77b9cda30ca083382981fd88139905fec756e362c6c8497adee26796cd9adab752b197b1eedb9f5e26970100c08fd0e3bd42184fd3e12afe927acad3e SHA512 a1616d1c199983d47157c2e99b409e781df86804048f9a7345f2e682ffc2c6d79ab95f5cf3ccb01c0db498e79686086d9c7aa2c2c07e53cb7f642afd1e38ea35
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
 EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440
-EBUILD libvpx-1.8.2.ebuild 3436 BLAKE2B 5c78fa513348cad6d6a1560a72fc4d0c15c746ea6f52843182f3b30d8d71e1f76ee245c95291ba9356a147de1f73f65f5a7a147aa1cd6d861fdaf5831ec7fe62 SHA512 2fc98db752426b5530a3c42b9a4a03a4e38e79d2746d42be3d5ffce155c9aa5e49f6d17a28c2535bb5fbdae8bea31fd90e0e15fa74ee51dface9b90a2357ae1a
 EBUILD libvpx-1.9.0.ebuild 3586 BLAKE2B b0a71cdc777a7b32dd39010d9c4319501b67ea289812ff8afc5e5f61aec9b4c14cb4c8fedacca57539f99f95d9dab24f7e8872c058feb44cfeac158f9e0b9b70 SHA512 61638b63c87ccbd7a8b14b89de3c327dfd8c17b064ab346ace2bf876ecdf40624bc519ece1923d3fa05285b307227eed7a1dd1b1c9e56a3afe79b754e3723fd4
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.8.2.ebuild b/media-libs/libvpx/libvpx-1.8.2.ebuild
deleted file mode 100644
index 31d177445f11..000000000000
--- a/media-libs/libvpx/libvpx-1.8.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.8.2
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://dev.gentoo.org/~whissi/dist/libvpx/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc +highbitdepth postproc static-libs svc test +threads"
-
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/ #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-	addpredict /session_mm_cli0.sem #nowarn
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--extra-cflags="${CFLAGS}"
-		$(use_enable postproc)
-		$(use_enable svc experimental)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	echo "${S}"/configure "${myconfargs[@]}" >&2
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index d3701544510d..b4e4bcae2fd1 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,7 +1,3 @@
-DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
-DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
-EBUILD libwebp-1.0.2.ebuild 1822 BLAKE2B ac80ecab45b8414ca3357b9282e96173cb8e690676cf5ed22ccdd95e6423c74bf0bb6fd733a21bc95f3c46c7427fe50c7b1c4e60b48c3c6797d3b015f2304f7e SHA512 4bf4df61a1b35e822e72dccc9dd94d7269fb30c1919389452561fc1c71ffd39968f9e1028910059c6a2c2342f4d79db7034006834680d7125b030cea50c07a4b
-EBUILD libwebp-1.0.3.ebuild 1839 BLAKE2B 1e189eade016fc3a9ec3c8a443bbbfb6b3d3720139d7a9c80d17f27b2f70c3992e1554085c1d624177cf5d062a60344265c91c052d06ef4e89db95aa48be5462 SHA512 b5d06ad1f77e7921bf3eece13085f40cda8bdfe5508c21dfd6cc2cb3f603b9f5de97e93da666f414996fcd902baa6248ed138731fa2b4401a4f06f8c86863280
 EBUILD libwebp-1.1.0.ebuild 1837 BLAKE2B a112fcc370eec9a5a69d75101b0c6e3b27f1553a0a9bf07297c2f840e8ba179a80a0cb4b8879ec89433a3fbf00b291c5aaf5ab43b26d285fcf60615c3c2451d4 SHA512 46c5b6ec590c13f48d9667fc89dea65ebe93fad63a80a4f807106b271dd0944a80d492d4d7d201972999dbef082e5dbe6b633b5b49ffb5cc2924414085091185
 MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
deleted file mode 100644
index 929b6b18c47e..000000000000
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool multilib-minimal
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/7" # subslot = libwebp soname version
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Fix libtool relinking, bug 499270.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable cpu_flags_arm_neon neon)
-
-		# Only used for gif2webp binary wrt #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	ECONF_SOURCE="${S}" econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
-}
diff --git a/media-libs/libwebp/libwebp-1.0.3.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
deleted file mode 100644
index 0d01423636ea..000000000000
--- a/media-libs/libwebp/libwebp-1.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool multilib-minimal
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/7" # subslot = libwebp soname version
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Fix libtool relinking, bug 499270.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable cpu_flags_arm_neon neon)
-
-		# Only used for gif2webp binary wrt #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	ECONF_SOURCE="${S}" econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
-}
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 635d2f3b8a4a..47f69a16238f 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r8.ebuild 2523 BLAKE2B 18186312150f3ac23a07019cb528838d6de6dad22269a8f5271b120dbb40fe4a4aeedd42b0cb5ab033ddfc647a7544fb84348d1c61acdfe5b59dfa686fdd1531 SHA512 651d96430285b8652c417aecdda8d7c90b04d814f946a65dd82b9fa8c58c4405ffc4d4ee4621ad22fead52a0ef3069b5e8e06a7cc2dbcbda4edbf6c2494d75e1
+EBUILD libwmf-0.2.8.4-r8.ebuild 2522 BLAKE2B 29538d7934a49b1dbdc277ec00a2a96c839fe66f2c258acc751a8480d952772907a77058f1b9ad4c9dbfb65ab998eae9d08b636c4f542c9cd641da0208c3cf00 SHA512 a03be6e5fbb8100c2fc1fe9668534d9c7a7d7d19aa6ec255e63add33c23cc11e17d9021bd83f4fbd4b9d1cbcb62751eef97d2e43beb1b6d9988950ad7ae60eb7
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index d281f1d619df..5015c38df7d8 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools gnome2-utils
 
 DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)"
-HOMEPAGE="https://wvware.sourceforge.net/"
+HOMEPAGE="http://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index 2391e83177a9..a81593948a98 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,3 +1,4 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
+EBUILD libxmi-1.3-r1.ebuild 704 BLAKE2B 86f014fdaf02b7d56e7a08b9ef52c61e548abf2866548df3f15c17fda3307d6b889c1918ebbe893ba78cd7cf3e804fad1e8bd30829899e690e950db74b1e379d SHA512 71695b9b679d686f46656b4fdc61088ae0d741c800b699fc0c4cb5d7b21a61a0c4476d72489438aba752861fe67d0d240b743c60b91bc7912d2f6aa5b1909902
 EBUILD libxmi-1.3.ebuild 614 BLAKE2B 14b43337437614721d4ce91bf120dce2df33efef6c1fe2330a627e3a09d0e4e530959f8bda76382a94f310f77fb661994c3e0ab26d87af5389288ed6858f1293 SHA512 d95bc3984fcccf56c3135381203084d80eceafc72104aee623371ac5a82589245bd96e1d04e07417f86f1d000c64c115d7630d9be981859fa3700d3609baf0bf
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
new file mode 100644
index 000000000000..0f495eb460e0
--- /dev/null
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C/C++ function library for rasterizing 2-D vector graphics"
+HOMEPAGE="https://www.gnu.org/software/libxmi/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+#mirror://gnu/${PN}/${P}.tar.gz"
+# Version unbundled from plotutils
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index dcc131ccbba6..b65a1befdf2e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,8 @@
-DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
-DIST mesa-20.3.2.tar.xz 14194120 BLAKE2B 545073b7f3f9dd54e087402b599ffa55e37a6a0b2422a52fc22cbe8de0b91a88603bd2241e2308f6891cdab731f0e01c9c9683028819aebcf3251ef3ae3db9bf SHA512 0cabf8ddfd20b56098c8f4c081a3c2d4741ef42f40c929645e74284db99cf2a81137d7d279b7b6a0c15dea83905119ddf612411b36344dc22a488de9f311f5ed
 DIST mesa-20.3.3.tar.xz 14222700 BLAKE2B 02996b9f784f4c4a4502f8d5a1ef9763799b36206cfbfb56aeeb84837a119457fcfdd2d2efc3bf87fe945bd4dd4747b77fe9af51b290311b86e850fa4d6ac8c6 SHA512 77735462f4ccbe865d0cf7e9db47c42f8bc2600b9a030dca11066d29e43f73c18ca0422e6356129fc14ac1b1018ed752ae4ee45bd31ae706fea58f573a14d346
-DIST mesa-21.0.0-rc1.tar.xz 14452448 BLAKE2B 1c5738a1ce16fa79931cb57cf2d1605970d95d1f7b635aa73f35ac78da27909c5d651491df64f90c4cd667df5b01550b0eba952d4f768cf862e8121cc75cfa4c SHA512 7157c5fbc9f545836e6b9d81805084450730aaab183466f1c19ef6b0d65ae1b4f04882a87f90982dbfec38da991732b9e0ddba9350be55d675dd409d7c142ed4
-EBUILD mesa-20.2.4.ebuild 14764 BLAKE2B 187917aac61caae964d85c3e08eb5debf34eedbf1c6e4e79861d74aa6f502ec2f8dde0da3e14e5c5dfded7932b233367a040871d3f3ecc1bb97b4da74cbf133c SHA512 14684402b21bddab714c36a42ffa031d4458bd7f5dc81d249bda462ce52164f24018983e08a782b0366b6539aae4522dc7e0fa6319318f6e2c41d0b941cd1568
-EBUILD mesa-20.2.6.ebuild 14771 BLAKE2B 452d6fc89964332cc6a40b3e7f59ee878a6d165765d550bfc253e20198dd3510d73bf763963cf6ae0c830cbbacc0cbddf18828909590caf48b2b73bd6ec136b9 SHA512 4fa2545d50e8c24c8faf0fa7b3a20a0309d376bf9479b854fb5cfc8d3c87ffdd37200c20ca83ec4766a9fb53bb8253613cf5b7c086055f73189d5ad12b440aee
-EBUILD mesa-20.3.2.ebuild 14854 BLAKE2B 4b713819cabfcd0330abe0fd764019b63f28bb7bfbb4ca39742a45ca1994a1a4b242308e5b647ecf2bca14e1de4d9ade3509c8360cc87a9a5279049b5dcd2be4 SHA512 f1f50fc292884e7f0ff4ddbc0cb6d40a1c16a931302860d907afb5401e9cbb666d246cf21a52ef37eb871bd29cf974481d55f7bc124a74fa5163809fc92a625f
+DIST mesa-21.0.0-rc3.tar.xz 14488732 BLAKE2B f459fde39b7a1a62166b1d58df309e6295c489eef1324649478a6e21139317068b7cc5fb9ab6d54a31bbfc8c696df81ebc9531e14c40020380f342dc5948036d SHA512 b51495e8ef3a4a2f1b98ad3c4f5037c21b4b7df375138bcc02b24cb4b7ffd7b807d76ac0853d0ecc81c09ceca2a97e5c402352700f297ed7f4369f98d03a0810
+EBUILD mesa-20.2.6.ebuild 14764 BLAKE2B 187917aac61caae964d85c3e08eb5debf34eedbf1c6e4e79861d74aa6f502ec2f8dde0da3e14e5c5dfded7932b233367a040871d3f3ecc1bb97b4da74cbf133c SHA512 14684402b21bddab714c36a42ffa031d4458bd7f5dc81d249bda462ce52164f24018983e08a782b0366b6539aae4522dc7e0fa6319318f6e2c41d0b941cd1568
 EBUILD mesa-20.3.3.ebuild 14854 BLAKE2B 4b713819cabfcd0330abe0fd764019b63f28bb7bfbb4ca39742a45ca1994a1a4b242308e5b647ecf2bca14e1de4d9ade3509c8360cc87a9a5279049b5dcd2be4 SHA512 f1f50fc292884e7f0ff4ddbc0cb6d40a1c16a931302860d907afb5401e9cbb666d246cf21a52ef37eb871bd29cf974481d55f7bc124a74fa5163809fc92a625f
-EBUILD mesa-21.0.0_rc1.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
+EBUILD mesa-21.0.0_rc3.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
 EBUILD mesa-9999.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
deleted file mode 100644
index a9abb722e3fc..000000000000
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ /dev/null
@@ -1,556 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="11"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.2.6.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild
index 3a059a995dd4..a9abb722e3fc 100644
--- a/media-libs/mesa/mesa-20.2.6.ebuild
+++ b/media-libs/mesa/mesa-20.2.6.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-20.3.2.ebuild b/media-libs/mesa/mesa-20.3.2.ebuild
deleted file mode 100644
index 3a23ce15ad2c..000000000000
--- a/media-libs/mesa/mesa-20.3.2.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="11"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.0.0_rc1.ebuild b/media-libs/mesa/mesa-21.0.0_rc3.ebuild
index 47d4972b3e94..47d4972b3e94 100644
--- a/media-libs/mesa/mesa-21.0.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-21.0.0_rc3.ebuild
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 1649570cebae..e618f1374cbe 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,8 +1,5 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
-AUX mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch 1093 BLAKE2B 12bf9abd2053868945df5e185a2a111118bfe886d3987070f75683be2f5c00bb5b6325119a99c2ed9f20e8f91b9dda8e90a712e05170c435bfc04cfa02d12306 SHA512 4869580800b3de0e68669d3ad6c4d7ae1c994d2cef7de444a130625c3ec806d9691973b0bc921a52c39361e35f11d319377a3330fbbecc7cf51afb62f1fcd99b
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
-DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
 DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
-EBUILD mlt-6.22.1-r1.ebuild 4814 BLAKE2B 7750e214aa0052178da1defe96742d7a67092c45d01a565ab0d049e625ca7d31fe9c8a5be7cc985d00565cd407937f6c8754380f618c1a14aba75a0b61cde912 SHA512 2d2a6e0d0e126a281b3ad07b9ae6df2feb8958e9e548bab4b83c5b8e5ddd477362369b61479381eae631432671f0513e145c0f42eb23fbd747c67d8a4ee27ab4
-EBUILD mlt-6.24.0-r1.ebuild 5323 BLAKE2B fe6e06c8b47aaea654668fc835b3bc95981ff948ccbeaf6569bf68f876db1f1e4b0bb91c1fe9e886fe2447a1800c001c340441a86cfe6e188f10340cc6727842 SHA512 9d4772005fb5a0e7bbd497243939a15d9d298ea4d2d9700564edacebd99ad614d9d34d128b7e3666ae1c606f7fb0d2099ea00e2f890c49c83e2f53e7ea305ecd
-MISC metadata.xml 1673 BLAKE2B ab376b18df6085a95490cfe541fd0cd0af07b0d221aa693132d8f5ae4ec67e468df2e823943edc871c97ad15848a43acaf92c9fb341f07c9fdfcf504896ac23d SHA512 ddfc34505aa0ed7b32b2e6af160929e45aa508b5aad3e42178976836b784f10d6de8c820bb40e0f1be3e62d5723fe93459fdd53579aa65dc996bca4a14dc6c7a
+EBUILD mlt-6.24.0-r1.ebuild 5347 BLAKE2B bda27b1eaa0ab139b06b029790b9528f3978b188eab9c75307c1128b60f0fa21ab34bae69e6f0efb0dec654f552fc8fc60fcf88d13a85ec85982465f907d8d3e SHA512 04e4f83c6efbb5a9d5fd7f307904f0473b82d385575332687b1c4ef87e69914605f75daa1ce116f913fdd6bf5ef7d8109c5bc469c39a566ec9cde110c7db8029
+MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch b/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch
deleted file mode 100644
index d60976c11855..000000000000
--- a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8b778aaee121c6b381bd570c2b6f526989866f8e Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 11 Sep 2020 21:24:24 -0700
-Subject: [PATCH] fix regression in 2c354d6e with multiple affine filters
-
-See #9 in https://forum.shotcut.org/t/v20-09-beta-is-now-available-to-
-test/20766/31
----
- src/modules/plus/transition_affine.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
-index 63bbaa1df..b1147c8c6 100644
---- a/src/modules/plus/transition_affine.c
-+++ b/src/modules/plus/transition_affine.c
-@@ -564,6 +564,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
- 		b_height = result.h;
- 		// Set the rescale interpolation to match the frame
- 		mlt_properties_set( b_props, "rescale.interp", mlt_properties_get( a_props, "rescale.interp" ) );
-+		mlt_properties_set_int( b_props, "distort", 1 );
- 	} else if (scale_width != 1.0 || scale_height != 1.0) {
- 		// Scale request of b frame image to consumer scale maintaining its aspect ratio.
- 		b_height = *height;
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 0a18c2e2c883..26411b90da30 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -12,9 +12,7 @@
 	<use>
 		<flag name="compressed-lumas">Compress the luma files in png.</flag>
 		<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
-		<flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag>
 		<flag name="lua">Build SWIG bindings for Lua</flag>
-		<flag name="melt">Build the melt commandline tool</flag>
 		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
 		<flag name="python">Build SWIG bindings for Python</flag>
 		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag>
diff --git a/media-libs/mlt/mlt-6.22.1-r1.ebuild b/media-libs/mlt/mlt-6.22.1-r1.ebuild
deleted file mode 100644
index b40bee09cb66..000000000000
--- a/media-libs/mlt/mlt-6.22.1-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-single-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
-qt5 rtaudio sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-#	ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:0= )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
-	done
-
-	use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-gtk2
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gdk)
-		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
-		$(use_enable libsamplerate resample)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab )
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt ; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang=()
-	# not done: java perl php ruby tcl
-	for i in lua python ; do
-		use $i && swig_lang+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	# not done: java perl php ruby tcl
-}
diff --git a/media-libs/mlt/mlt-6.24.0-r1.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild
index 1f6ac4939d80..ae45ba932470 100644
--- a/media-libs/mlt/mlt-6.24.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.24.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
 ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
 qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
@@ -51,7 +51,7 @@ DEPEND="
 	)
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
 	lua? ( ${LUA_DEPS} )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opencv? ( >=media-libs/opencv-3.2.0:= <media-libs/opencv-4.5.1:= )
 	opengl? ( media-video/movit )
 	python? ( ${PYTHON_DEPS} )
 	qt5? (
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index d5dc8145af8e..65933ae87bd2 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,7 +1,5 @@
-DIST openal-soft-1.20.0.tar.bz2 587550 BLAKE2B 4ce0b520db65e0298d334bae104dc0e38c2daf41680e40c259451741f7d4c8b06948f00b96efb31aec528e18b65e3f7099ea8b2fbc4cef963cf9a912f51c276a SHA512 7b103ffeeb8a6541d4bd31245ca5e34fec27d121fe04c21655480fb3907604f4171f912411f1e49622ec27db79d6cb85eb452ed78523abc906f18af57ffb755e
 DIST openal-soft-1.20.1.tar.bz2 512971 BLAKE2B be0abb32698d5ea77e8667e1b00fb123673325b0361c711d6c232d96d1add6d5c9a3e2ba7a3d04afcad27fe4f18ae803f690b14c98d198b77c75f1865679081f SHA512 a8a03a2162b5d35e66adc079e81d7fa075b83a3ee1cec3412cb40f7789263ed8bd005beefb7ef995f464dfa43aac22ea0f547b752dfc7533ed9120a95fb92513
 DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
-EBUILD openal-1.20.0.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
 EBUILD openal-1.20.1.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
 EBUILD openal-1.21.0.ebuild 2099 BLAKE2B d4886ca2095016d92081ceb4e65cdb0229775726960536e34235825a541eaf703be3f86922d0c46e982b14db925e5a5d889ff93b6e87942d8af68e5972f1309d SHA512 c284b17706eba849ce9827d5649e8f208994947913783d1f95cab2cc2f814f8cd8b4f7ad0cdee263e3ef1c35077714ac84fcfdd5e03323f04c389bdb0af98e7e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.20.0.ebuild b/media-libs/openal/openal-1.20.0.ebuild
deleted file mode 100644
index bd39df18ecf9..000000000000
--- a/media-libs/openal/openal-1.20.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 0b38e014360a..73f69e492cf5 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
-EBUILD opencore-amr-0.1.5.ebuild 531 BLAKE2B db1903c4469ca455eb7bdf16f657cb23753040d0f0f29c644142245c8a08331e5d4ab10664126501696b1f6a9b28d481ebec5def2e2e9409ad8aef0b2e195550 SHA512 b2a7962211823dee5bd458ac476f2296f79ff9315efa3bcf9c028784b6305e48411d287af039eccc9a38cf08591c6106eb2c8027e7b4e0ef70585574cf001463
+EBUILD opencore-amr-0.1.5-r1.ebuild 629 BLAKE2B cdf5fcf6ad8704a82a8836a4a850ab082897d7883b91634dcd8b307fbc6cf63bb3b0050140098483a51175acffdbbe9b68b2ee0e9bb472cb517ddac540342b43 SHA512 a1405cc9a180d457c1717689568e25a3f2774bb748b444c0e52c170523c6f59395ee5d1aef100faba9e9282187b9e5b38ca462ad8aa10a1905cc0f6b090a0c1a
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index f8b44aa51d41..425e4b64b2cf 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
@@ -1,16 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
+EAPI=7
+
+inherit multilib-minimal
 
 DESCRIPTION="Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec"
-HOMEPAGE="http://opencore-amr.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-DOCS=( ChangeLog README )
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c632b006640b..3b8492226e88 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -18,4 +18,4 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c
 EBUILD opencv-4.5.0.ebuild 20529 BLAKE2B 67363a3f10feeeacf0b24156257acb65004939c15b700381df5729f275450c3d440cda7779f9db1a5cab676308b2e26177391c08f74a71ef655fba5dbbf14cf0 SHA512 04cc308127b2c80996e651028ed8ddb015a44c3b05dfc3515b146292542e604e5267b2a6bb30e4a8f4d66ff59725baf80b9dde1142114d6a499a2937fea27c82
 EBUILD opencv-4.5.1.ebuild 20619 BLAKE2B 37816ee00830521386c22dde3976ae18b0a02f50e07173fe959930cccb8743532503eb05e76c2a059faa05380d1420465320b5fadc641bb7b3c94191352e7d04 SHA512 a7e85cc1d0720e893a16c477b82e8ef0856c7e07d1bf1c35d642e920c764a7bc4493e24e693c3ee195d5307a9b5208868116bbad0b9905c254b5a1dd0456af46
-MISC metadata.xml 3132 BLAKE2B 7a499ebf8678ccae68c4947075f925b439ecdcca8a56c77c8a57895d57ffda6ecaade65e1124d12a78bbdf15eef8f9c4524c921bc53009aeb7defd5c489396a6 SHA512 ff59cff9b8f41e69f421bee8d2680eb655c3336f2eafa8c3567ec0d0509707bf9cd0ba41190a8012564d43d87ac5b35e5dc2c827167ed6d315e422a53a13900a
+MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index ad1fde1b865e..7c92aae379f5 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -37,7 +37,8 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
-		<remote-id type="sourceforge">opencvlibrary</remote-id>
+		<remote-id type="github">opencv/opencv</remote-id>
 		<remote-id type="github">Itseez/opencv_contrib</remote-id>
+		<remote-id type="sourceforge">opencvlibrary</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 870076a61e0a..69eddae0a37d 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -11,8 +11,8 @@ AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f4
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST openexr-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
+DIST openexr-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
-EBUILD openexr-2.5.3.ebuild 1618 BLAKE2B 0d7f5d99b104274c4f68a96d20f99c2a155f19ad90ce584dbc2077ee889a07045f258661a103ba65e304015756ddc4098a1715bea381e7ef9faed2a97ffc64e2 SHA512 ed1b8f2d2e9834037cbd58ae16b4dad45c29bf5ef2c01fd7fd9c7f6e6d0b38a319d1ced1fca0ccde8ce0d722e2239478d7e6a12b776bb33676bc637807793b21
+EBUILD openexr-2.5.4.ebuild 1698 BLAKE2B a0e3e116800767c03b5eecb1afdd4bc543701edbd88d8a35a14c034fa0eb8bd9e3098d87e0674b2a9404553ebcb9a7fd3166600f88920fc91e0e895adcc0be19 SHA512 51bd2ed3daddc725f595209ff505421914a3bc312b727b6af19200f47fab209f03eda95269573e8a6d27bb29b657772ab920e4f819f88f0854c9c214459f575a
 MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
diff --git a/media-libs/openexr/openexr-2.5.3.ebuild b/media-libs/openexr/openexr-2.5.4.ebuild
index d1288a27aa58..888a4b92902a 100644
--- a/media-libs/openexr/openexr-2.5.3.ebuild
+++ b/media-libs/openexr/openexr-2.5.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
@@ -17,7 +17,7 @@ IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
@@ -28,14 +28,14 @@ S="${WORKDIR}/${P}/OpenEXR"
 DOCS=( PATENTS README.md )
 
 src_prepare() {
-	cmake_src_prepare
-
 	# Fix path for testsuite
 	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
 
 	if use abi_x86_32 && use test; then
 		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
 	fi
+
+	multilib_foreach_abi cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -45,7 +45,8 @@ multilib_src_configure() {
 		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
 		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
 		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON				# default
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
 	)
 
 	cmake_src_configure
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 2d57a65fd1ea..e343403e224d 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -5,5 +5,5 @@ DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5af
 EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
 EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
-EBUILD openimageio-2.2.9.0-r1.ebuild 3687 BLAKE2B 3f0380beec5dfd966da462aab996e0506c99c008566dc1505adee0b4db1d47b09b621a8793beadaad70528e331255fb5b9ffb04f66c3324450d1e700abcf58c7 SHA512 73cba82babf4d722c2e832aca2c2f26b02740d0fbbae77ef85bfbe866d368b04cdd5317925c6ad05d853ee44453d67879200e634ab7a56b3499b67545185239c
+EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 3c1186c26b4be04471860175f300491c06bccdec489ec41a2736b4808fecb1731c0ee4528498e412bebd503f8334ea4993ac50c824beb7bc6a243b14295292da SHA512 fb87b545fa4af284c30520a6abe95d44c956d968c4d636b0e7cfc7463cddc4f8a276cf008b2f887f83e2b0bbcf96fc159c7c6138e084ff50ff3c3756542427ad
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
index fefae14a27c9..6f81fbe44494 100644
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 6717a506e69c..28719311c7d1 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -3,12 +3,10 @@ AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd3
 AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B 263542dad18e40fca5e890da50c6ff756cbe1f5318fa142eda05af9ab7b65c7616c25505e0ef36047665f82b6498e5621cb6fe5dcbeaa0f7349fa641b50d6cac SHA512 5ef0dd098c00ab02284731999e5448997364e84e6b1a85028358b8a6cd8c8ba7cec08c9950d78e7cd7c4ac1ec6f0d09e178082a1c34de3bddfc9909c63f10a1f
 AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
-DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
-EBUILD openjpeg-1.5.2-r1.ebuild 1913 BLAKE2B f4c33d64895d505111a21aced86118570dae58387e042183be1117e95d39e32a34b57e78ea7f31ea1f09d6c2163842530a627a1e153a59a92a827db79693445e SHA512 5c36a1e56c4ddb66ec92c8e3044b23123fb3218d425af5143330d1684b8ac8c42fbf91891342e6f3c7efb785134d29409206789b53f85b0cfcb2e2d9f06c4b2d
 EBUILD openjpeg-2.3.1-r1.ebuild 4303 BLAKE2B 956343edd893fa16c00d6d4306f8a74453af590ce932c78f9f0e7b72a0b95ef184c897ce850840b03f9dabcc984321ac38f93ca9ca36b9a95e00fae0bb24dbed SHA512 6ae0ef7e1380aed0d218d933e8d4fa0e43208bdaf45da43198964f1cafa72f8a0eaf70f19ef7199ef4a2157a8f59684d8e4e6b1ed500e3f6eb150fc50ae7dc3c
 EBUILD openjpeg-2.4.0.ebuild 4461 BLAKE2B b79a28655f492c4e0762ad50a8c44e1ba96476d8d575df9f14ac1811cb5aeb142aeac4beb1d652a5772c2a15ed6ea58d5ecd80f827e63d578c763208c804d931 SHA512 a6b3397492243f211427ef62ebd01e1632e25a96dcbff9fc01f8dc8050b9e50450c3abd4b050aba8b76ab93b3b424a62c200c0e542716517239819fe35d3e15b
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
deleted file mode 100644
index 59ab4ced81a1..000000000000
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS CHANGES NEWS README THANKS )
-
-RESTRICT="test" # bug 409263
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/INSTALL.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-	)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING=$(usex test)
-			-DBUILD_SHARED_LIBS=OFF
-			-DBUILD_CODEC=OFF
-		)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-
-	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
-	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
-
-	if use doc && multilib_is_native_abi; then
-		dodoc -r doc/html
-	fi
-}
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 560cd26248bd..92ae5fcc121c 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -2,6 +2,8 @@ AUX plib-1.8.5-CVE-2011-4620.patch 415 BLAKE2B a6a059765551313653b0eb8d060d88cd9
 AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee373a4cf77278eecda1b26b6c02f8971d92f85b974e9fccbf7ff10af13ff4e54af6d7377140010f9a3113c86a6018bf0c SHA512 a09462ecb085703aae7cd3b77954cc800410aa37a9616255cca2f21456e6d5dcf8ead3f684c98236deb1455c6a034dc8ec874bafdbab003f7a63517ea1f8350d
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
+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
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/files/plib-1.8.5-shared-libs.patch b/media-libs/plib/files/plib-1.8.5-shared-libs.patch
new file mode 100644
index 000000000000..6ed51fd7dd75
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.5-shared-libs.patch
@@ -0,0 +1,256 @@
+diff -ru ../plib-1.8.5/configure.in ./configure.in
+--- ../plib-1.8.5/configure.in	2008-03-11 03:09:43.000000000 +0100
++++ ./configure.in	2010-07-02 05:27:45.478055160 +0200
+@@ -36,7 +36,7 @@
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ 
+ dnl Command line arguments
+ 
+diff -ru ../plib-1.8.5/src/fnt/Makefile.am ./src/fnt/Makefile.am
+--- ../plib-1.8.5/src/fnt/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/fnt/Makefile.am	2010-07-02 06:17:35.838107988 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_FNT
+ 
+-lib_LIBRARIES = libplibfnt.a
++lib_LTLIBRARIES = libplibfnt.la
+ 
+ include_HEADERS = fnt.h
+ 
+-libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
++libplibfnt_la_LDFLAGS = -version-info 9:5:8
++libplibfnt_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/js/Makefile.am ./src/js/Makefile.am
+--- ../plib-1.8.5/src/js/Makefile.am	2008-03-11 03:06:21.000000000 +0100
++++ ./src/js/Makefile.am	2010-07-02 06:12:40.559441988 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_JS
+ 
+-lib_LIBRARIES = libplibjs.a
++lib_LTLIBRARIES = libplibjs.la
+ 
+ include_HEADERS = js.h
+ 
+-libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
++libplibjs_la_LDFLAGS = -version-info 9:5:8
++libplibjs_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
+                              jsMacOSX.cxx jsWindows.cxx jsBSD.cxx   \
+                              jsNone.cxx
+ 
+diff -ru ../plib-1.8.5/src/Makefile.am ./src/Makefile.am
+--- ../plib-1.8.5/src/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/Makefile.am	2010-07-02 06:38:53.486390426 +0200
+@@ -1 +1 @@
+-SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
++SUBDIRS = util js sl fnt pui sg ssg puAux ssgAux net psl pw
+diff -ru ../plib-1.8.5/src/net/Makefile.am ./src/net/Makefile.am
+--- ../plib-1.8.5/src/net/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/net/Makefile.am	2010-07-02 06:14:40.710350074 +0200
+@@ -1,11 +1,14 @@
+ if BUILD_NET
+ 
+-lib_LIBRARIES = libplibnet.a
++lib_LTLIBRARIES = libplibnet.la
+ 
+ include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
+ 	netMonitor.h netSocket.h net.h
+ 
+-libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
++libplibnet_la_LDFLAGS = -version-info 9:5:8
++libplibnet_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
+ 	netMessage.cxx netMonitor.cxx netSocket.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+diff -ru ../plib-1.8.5/src/psl/Makefile.am ./src/psl/Makefile.am
+--- ../plib-1.8.5/src/psl/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/psl/Makefile.am	2010-07-02 06:13:48.314158343 +0200
+@@ -1,11 +1,14 @@
+ 
+ if BUILD_PSL
+ 
+-lib_LIBRARIES = libplibpsl.a
++lib_LTLIBRARIES = libplibpsl.la
+ 
+ include_HEADERS = psl.h
+ 
+-libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
++libplibpsl_la_LDFLAGS = -version-info 9:5:8
++libplibpsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
+                        pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
+                        pslExpression.cxx pslProgram.cxx pslDump.cxx \
+                        pslError.cxx pslFileIO.cxx pslCompiler.h \
+diff -ru ../plib-1.8.5/src/puAux/Makefile.am ./src/puAux/Makefile.am
+--- ../plib-1.8.5/src/puAux/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/puAux/Makefile.am	2010-07-02 06:16:04.001410273 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_PUAUX
+ 
+-lib_LIBRARIES = libplibpuaux.a
++lib_LTLIBRARIES = libplibpuaux.la
+ 
+ include_HEADERS = puAux.h puAuxLocal.h
+ 
+-libplibpuaux_a_SOURCES = puAux.cxx                  \
++libplibpuaux_la_LDFLAGS = -version-info 9:5:8
++libplibpuaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la $(top_builddir)/src/pui/libplibpu.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibpuaux_la_SOURCES = puAux.cxx                  \
+                          puAuxBiSlider.cxx          \
+                          puAuxBiSliderWithEnds.cxx  \
+                          puAuxComboBox.cxx          \
+diff -ru ../plib-1.8.5/src/pui/Makefile.am ./src/pui/Makefile.am
+--- ../plib-1.8.5/src/pui/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/pui/Makefile.am	2010-07-02 06:14:25.110128517 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_PUI
+ 
+-lib_LIBRARIES = libplibpu.a
++lib_LTLIBRARIES = libplibpu.la
+ 
+ include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
+ 
+-libplibpu_a_SOURCES = \
++libplibpu_la_LDFLAGS = -version-info 9:5:8
++libplibpu_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la
++
++libplibpu_la_SOURCES = \
+         pu.cxx            puBox.cxx       puButton.cxx puButtonBox.cxx    \
+         puArrowButton.cxx puDialogBox.cxx puFrame.cxx  puGroup.cxx        \
+         puInput.cxx       puInterface.cxx puLocal.h    puMenuBar.cxx      \
+diff -ru ../plib-1.8.5/src/pw/Makefile.am ./src/pw/Makefile.am
+--- ../plib-1.8.5/src/pw/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/pw/Makefile.am	2010-07-02 05:27:45.487123738 +0200
+@@ -1,10 +1,11 @@
+ if BUILD_PW
+ 
+-lib_LIBRARIES = libplibpw.a
++lib_LTLIBRARIES = libplibpw.la
+ 
+ include_HEADERS = pw.h
+ 
+-libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
++libplibpw_la_LDFLAGS = -version-info 9:5:8
++libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/sg/Makefile.am ./src/sg/Makefile.am
+--- ../plib-1.8.5/src/sg/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/sg/Makefile.am	2010-07-02 06:16:21.526342543 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_SG
+ 
+-lib_LIBRARIES = libplibsg.a
++lib_LTLIBRARIES = libplibsg.la
+ 
+ include_HEADERS = sg.h
+ 
+-libplibsg_a_SOURCES = sg.cxx sgd.cxx \
++libplibsg_la_LDFLAGS = -version-info 9:5:8
++libplibsg_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibsg_la_SOURCES = sg.cxx sgd.cxx \
+                       sgIsect.cxx sgdIsect.cxx \
+                       sgPerlinNoise.cxx
+ 
+diff -ru ../plib-1.8.5/src/sl/Makefile.am ./src/sl/Makefile.am
+--- ../plib-1.8.5/src/sl/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/sl/Makefile.am	2010-07-02 06:12:48.165324370 +0200
+@@ -1,16 +1,20 @@
+ if BUILD_SL
+ 
+-lib_LIBRARIES = libplibsl.a libplibsm.a
++lib_LTLIBRARIES = libplibsl.la libplibsm.la
+ 
+ include_HEADERS = sl.h slPortability.h sm.h
+ 
+-libplibsl_a_SOURCES = \
++libplibsl_la_LDFLAGS = -version-info 9:5:8
++libplibsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibsl_la_SOURCES = \
+ 	slDSP.cxx slSample.cxx slEnvelope.cxx \
+ 	slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
+         slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
+         slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
+ 
+-libplibsm_a_SOURCES = slPortability.h smMixer.cxx
++libplibsm_la_LDFLAGS = -version-info 9:5:8
++libplibsm_la_SOURCES = slPortability.h smMixer.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/ssg/Makefile.am ./src/ssg/Makefile.am
+--- ../plib-1.8.5/src/ssg/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/ssg/Makefile.am	2010-07-02 06:13:29.638301515 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_SSG
+ 
+-lib_LIBRARIES = libplibssg.a
++lib_LTLIBRARIES = libplibssg.la
+ 
+ include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
+ 
+-libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
++libplibssg_la_LDFLAGS = -version-info 9:5:8
++libplibssg_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
+ 	ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
+ 	ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
+ 	ssgLoadDOF.cxx ssgLoadAC.cxx \
+diff -ru ../plib-1.8.5/src/ssgAux/Makefile.am ./src/ssgAux/Makefile.am
+--- ../plib-1.8.5/src/ssgAux/Makefile.am	2008-03-11 03:06:21.000000000 +0100
++++ ./src/ssgAux/Makefile.am	2010-07-02 06:17:02.592635791 +0200
+@@ -1,6 +1,6 @@
+ if BUILD_SSGAUX
+ 
+-lib_LIBRARIES = libplibssgaux.a
++lib_LTLIBRARIES = libplibssgaux.la
+ 
+ include_HEADERS = ssgAux.h             \
+                   ssgaShapes.h         \
+@@ -13,7 +13,10 @@
+                   ssgaFire.h           \
+                   ssgaBillboards.h
+ 
+-libplibssgaux_a_SOURCES = ssgAux.cxx               \
++libplibssgaux_la_LDFLAGS = -version-info 9:5:8
++libplibssgaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/ssg/libplibssg.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibssgaux_la_SOURCES = ssgAux.cxx               \
+                           ssgaShapes.cxx           \
+                           ssgaPatch.cxx            \
+                           ssgaParticleSystem.cxx   \
+diff -ru ../plib-1.8.5/src/util/Makefile.am ./src/util/Makefile.am
+--- ../plib-1.8.5/src/util/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/util/Makefile.am	2010-07-02 05:34:06.711150524 +0200
+@@ -1,10 +1,11 @@
+ if BUILD_UL
+ 
+-lib_LIBRARIES = libplibul.a
++lib_LTLIBRARIES = libplibul.la
+ 
+ include_HEADERS = ul.h ulRTTI.h
+ 
+-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
++libplibul_la_LDFLAGS = -version-info 9:5:8
++libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
+         ulList.cxx ulLocal.h ulRTTI.cxx
+ 
+ endif
diff --git a/media-libs/plib/plib-1.8.5-r3.ebuild b/media-libs/plib/plib-1.8.5-r3.ebuild
new file mode 100644
index 000000000000..21af7bffc8de
--- /dev/null
+++ b/media-libs/plib/plib-1.8.5-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib-minimal
+
+DESCRIPTION="multimedia library used by many games"
+HOMEPAGE="http://plib.sourceforge.net/"
+SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="virtual/opengl"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared-libs.patch
+	"${FILESDIR}"/${P}-X11-r1.patch
+	"${FILESDIR}"/${P}-CVE-2011-4620.patch
+	"${FILESDIR}"/${P}-CVE-2012-4552.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-shared
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	DOCS=( AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO* )
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
deleted file mode 100644
index 3bdf9feb5224..000000000000
--- a/media-libs/qt-gstreamer/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28
-AUX qt-gstreamer-1.2.0-clang-38.patch 3455 BLAKE2B ff525007a8c04605cf21e0c14259367b53aa74af761183a22b0103f986b4721c91c2cd3b0570b3582395f3741d0cea44e95fef7a9790adac0f2b225d19be3ff0 SHA512 9678fb9e9502c055be9f0875d4d33bf7c8d852228009ad1ef5b85b41b009eb43fc3b946b3ffaaaf1b79a90e6e20c4940f46946655f07d533214ef76473cd7dc1
-AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
-AUX qt-gstreamer-1.2.0-gstreamer16.patch 853 BLAKE2B c25bd3018d1c20b601e9490a665014795114931158ef5cecb9ed3c27e9704483ab5a16fa89058d2cf87b7a63b0ec4644379861991bdb659b840494af1be7091d SHA512 118d8e3c4253f458206615b9b70dff839e492c4628275dfa2dd49705d1ca85dee16a2878d7af84ee8709c88b89d78b41afab65ea72786bce07d446142bbd4128
-AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
-DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1123 BLAKE2B 583ac048cb44e6b69fcbfe8d5f93e1473a4e168d6bbb9ef62bd9b4bb32ab50a0efbf08e7a7d2a9beb798ef2b2e8c81d53ad4477319520e66657f6658fdf431ec SHA512 f0353caf6f5e89ac278649391d1d28ff570c2dc751df0b6dafaa72197df3a0bf07cd284c3a130b096326053b51f6a83b383aa6041794fffb543f3c16b7c08e84
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
deleted file mode 100644
index e8227393c1a8..000000000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Add include guards to all boost includes, as qt's moc trips
-over nested BOOST_JOIN macros:
-* AUTOGEN: error: process for /var/tmp/portage/media-libs/qt-gstreamer-1.2.0-r1/work/qt-gstreamer-1.2.0-4/src/QGst/moc_graphicsvideowidget.cpp failed:
-* usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
-https://bugs.gentoo.org/show_bug.cgi?id=578906
-
---- qt-gstreamer-1.2.0/codegen/generator.cpp
-+++ qt-gstreamer-1.2.0/codegen/generator.cpp
-@@ -54,7 +54,9 @@
-         << "*/" << endl
-         << endl
-         << "#define INCLUDED_FROM_CODEGEN" << endl
-+        << "#ifndef Q_MOC_RUN" << endl
-         << "#include <boost/static_assert.hpp>" << endl
-+        << "#endif" << endl
-         << endl
-         << "#define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \\" << endl
-         << "    namespace QGlib { \\" << endl
---- qt-gstreamer-1.2.0/src/QGlib/connect.cpp
-+++ qt-gstreamer-1.2.0/src/QGlib/connect.cpp
-@@ -20,10 +20,12 @@
- #include <glib-object.h>
- #include <QtCore/QHash>
- #include <QtCore/QMutex>
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/sequenced_index.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/member.hpp>
-+#endif
- 
- namespace QGlib {
- namespace Private {
---- qt-gstreamer-1.2.0/src/QGlib/connect.h
-+++ qt-gstreamer-1.2.0/src/QGlib/connect.h
-@@ -25,8 +25,10 @@
- #include <QtCore/QSharedPointer>
- #include <QtCore/QFlags>
- #include <QtCore/QHash>
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- 
- namespace QGlib {
- 
---- qt-gstreamer-1.2.0/src/QGlib/connectimpl.h
-+++ qt-gstreamer-1.2.0/src/QGlib/connectimpl.h
-@@ -26,7 +26,9 @@
- # include "refpointer.h"
- # include <QtCore/QList>
- # include <stdexcept>
-+#ifndef Q_MOC_RUN
- # include <boost/type_traits.hpp>
-+#endif
- 
- 
- namespace QGlib {
-@@ -203,9 +205,11 @@
- 
- # else //QGLIB_HAVE_CXX0X
- 
-+#ifndef Q_MOC_RUN
- #  include <boost/function.hpp>
- #  include <boost/preprocessor.hpp>
- #  include <boost/bind.hpp>
-+#endif
- 
- // include the second part of this file as many times as QGLIB_CONNECT_MAX_ARGS specifies
- #  define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_CONNECT_MAX_ARGS, "QGlib/connectimpl.h"))
---- qt-gstreamer-1.2.0/src/QGlib/emitimpl.h
-+++ qt-gstreamer-1.2.0/src/QGlib/emitimpl.h
-@@ -125,7 +125,9 @@
- 
- # else //QGLIB_HAVE_CXX0X
- 
-+#ifndef Q_MOC_RUN
- #  include <boost/preprocessor.hpp>
-+#endif
- 
- // include the second part of this file as many times as QGLIB_SIGNAL_MAX_ARGS specifies
- #  define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_SIGNAL_MAX_ARGS, "QGlib/emitimpl.h"))
---- qt-gstreamer-1.2.0/src/QGlib/gen.cpp
-+++ qt-gstreamer-1.2.0/src/QGlib/gen.cpp
-@@ -19,7 +19,9 @@
- */
- 
- #define INCLUDED_FROM_CODEGEN
-+#ifndef Q_MOC_RUN
- #include <boost/static_assert.hpp>
-+#endif
- 
- #define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \
-     namespace QGlib { \
---- qt-gstreamer-1.2.0/src/QGlib/global.h
-+++ qt-gstreamer-1.2.0/src/QGlib/global.h
-@@ -23,7 +23,9 @@
- #endif
- 
- #include <QtCore/QtGlobal>
-+#ifndef Q_MOC_RUN
- #include <boost/config.hpp>
-+#endif
- 
- /* defined by cmake when building this library */
- #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS)
-@@ -84,7 +86,9 @@
- # define QGLIB_STATIC_ASSERT(expr, message) static_assert(expr, message)
- # define QGLIB_HAVE_CXX0X_STATIC_ASSERT 1
- #else
-+#ifndef Q_MOC_RUN
- # include <boost/static_assert.hpp>
-+#endif
- # define QGLIB_STATIC_ASSERT(expr, message) BOOST_STATIC_ASSERT(expr)
- #endif
- 
---- qt-gstreamer-1.2.0/src/QGlib/refpointer.h
-+++ qt-gstreamer-1.2.0/src/QGlib/refpointer.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "wrap.h"
- #include <cstddef>
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- #include <QtCore/QHash>
- 
- namespace QGlib {
---- qt-gstreamer-1.2.0/src/QGlib/type.h
-+++ qt-gstreamer-1.2.0/src/QGlib/type.h
-@@ -21,7 +21,9 @@
- 
- #include "global.h"
- #include <QtCore/QList>
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
-+#endif
- 
- /*
-  * This is a re-definition of GType inside the QGlib::Private namespace.
---- qt-gstreamer-1.2.0/src/QGlib/value.cpp
-+++ qt-gstreamer-1.2.0/src/QGlib/value.cpp
-@@ -19,7 +19,9 @@
- #include "value.h"
- #include "string.h"
- #include <cstring>
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
-+#endif
- #include <glib-object.h>
- #include <QtCore/QDebug>
- #include <QtCore/QReadWriteLock>
---- qt-gstreamer-1.2.0/src/QGlib/value.h
-+++ qt-gstreamer-1.2.0/src/QGlib/value.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "refpointer.h"
- #include "error.h"
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
- #include <boost/type_traits.hpp>
-+#endif
- #include <stdexcept>
- #include <QtCore/QString>
- #include <QtCore/QDebug>
---- qt-gstreamer-1.2.0/src/QGst/bin.h
-+++ qt-gstreamer-1.2.0/src/QGst/bin.h
-@@ -28,8 +28,10 @@
- #endif
- 
- #if !QGLIB_HAVE_CXX0X
-+#ifndef Q_MOC_RUN
- # include <boost/preprocessor.hpp>
- #endif
-+#endif
- 
- namespace QGst {
- 
---- qt-gstreamer-1.2.0/src/QGst/element.h
-+++ qt-gstreamer-1.2.0/src/QGst/element.h
-@@ -22,8 +22,10 @@
- #include "clocktime.h"
- 
- #if !QGLIB_HAVE_CXX0X
-+#ifndef Q_MOC_RUN
- # include <boost/preprocessor.hpp>
- #endif
-+#endif
- 
- namespace QGst {
- 
---- qt-gstreamer-1.2.0/src/QGst/gen.cpp
-+++ qt-gstreamer-1.2.0/src/QGst/gen.cpp
-@@ -19,7 +19,9 @@
- */
- 
- #define INCLUDED_FROM_CODEGEN
-+#ifndef Q_MOC_RUN
- #include <boost/static_assert.hpp>
-+#endif
- 
- #define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \
-     namespace QGlib { \
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch
deleted file mode 100644
index 977a09d7f6ce..000000000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From fc159e5c4c8ffeabdc7319514c6bb19c9c9e1d3b Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 13 Jun 2016 10:36:34 +0200
-Subject: [PATCH] Fix build with Clang 3.8
-
-error: invalid suffix on literal; C++11 requires a space between literal and identifier
-
-https://bugzilla.gnome.org/show_bug.cgi?id=767578
----
- elements/gstqtvideosink/delegates/basedelegate.cpp             | 2 +-
- elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp | 2 +-
- elements/gstqtvideosink/gstqtquick2videosink.cpp               | 2 +-
- elements/gstqtvideosink/gstqtvideosinkbase.cpp                 | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp
-index 7dde59c..65f364c 100644
---- a/elements/gstqtvideosink/delegates/basedelegate.cpp
-+++ b/elements/gstqtvideosink/delegates/basedelegate.cpp
-@@ -155,7 +155,7 @@ bool BaseDelegate::event(QEvent *event)
-         BufferEvent *bufEvent = dynamic_cast<BufferEvent*>(event);
-         Q_ASSERT(bufEvent);
- 
--        GST_TRACE_OBJECT(m_sink, "Received buffer %"GST_PTR_FORMAT, bufEvent->buffer);
-+        GST_TRACE_OBJECT(m_sink, "Received buffer %" GST_PTR_FORMAT, bufEvent->buffer);
- 
-         if (isActive()) {
-             gst_buffer_replace (&m_buffer, bufEvent->buffer);
-diff --git a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
-index 8f23dc2..c42513f 100644
---- a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
-+++ b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
-@@ -36,7 +36,7 @@ QWidget *QWidgetVideoSinkDelegate::widget() const
- 
- void QWidgetVideoSinkDelegate::setWidget(QWidget *widget)
- {
--    GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %"GST_PTR_FORMAT, widget);
-+    GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %" GST_PTR_FORMAT, widget);
- 
-     if (m_widget) {
-         m_widget.data()->removeEventFilter(this);
-diff --git a/elements/gstqtvideosink/gstqtquick2videosink.cpp b/elements/gstqtvideosink/gstqtquick2videosink.cpp
-index 7889fbf..bedc074 100644
---- a/elements/gstqtvideosink/gstqtquick2videosink.cpp
-+++ b/elements/gstqtvideosink/gstqtquick2videosink.cpp
-@@ -248,7 +248,7 @@ gst_qt_quick2_video_sink_show_frame(GstVideoSink *sink, GstBuffer *buffer)
- {
-     GstQtQuick2VideoSink *self = GST_QT_QUICK2_VIDEO_SINK (sink);
- 
--    GST_TRACE_OBJECT(self, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer);
-+    GST_TRACE_OBJECT(self, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer);
- 
-     QCoreApplication::postEvent(self->priv->delegate, new BaseDelegate::BufferEvent(buffer));
- 
-diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
-index 118d0a2..a707e02 100644
---- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp
-+++ b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
-@@ -207,7 +207,7 @@ GstFlowReturn GstQtVideoSinkBase::show_frame(GstVideoSink *video_sink, GstBuffer
- {
-     GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(video_sink);
- 
--    GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer);
-+    GST_TRACE_OBJECT(sink, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer);
- 
-     QCoreApplication::postEvent(sink->delegate, new BaseDelegate::BufferEvent(buffer));
- 
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch
deleted file mode 100644
index 6e875f678c2d..000000000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust@gmail.com>
-Date: Fri, 2 Oct 2015 15:00:29 +0300
-Subject: Fix compilation with GStreamer >= 1.5.1
-
-apply gstreamer pkg-config definitions To ensure gstreamer builds correctly,
-pick up its cflags in FindGstreamer and apply them to the build as definitions
-
-https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751382
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d3e7dd..5744015 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,7 @@ find_package(GObject)
- macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
- 
- set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
-+add_definitions(${GSTREAMER_DEFINITIONS})
- include(CheckCXXSourceCompiles)
- check_cxx_source_compiles("
- #include <QtCore/QtGlobal>
-diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
-index dab91ac..fe6cde1 100644
---- a/cmake/modules/FindGStreamer.cmake
-+++ b/cmake/modules/FindGStreamer.cmake
-@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
-     exec_program(${PKG_CONFIG_EXECUTABLE}
-                  ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
-                  OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
-+    set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
- endif()
- 
- find_library(GSTREAMER_LIBRARY
--- 
-cgit v0.10.2
-
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch
deleted file mode 100644
index 6bb24048f6c1..000000000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Sat, 7 Sep 2019 10:49:38 +0300
-Subject: [PATCH] QGst/caps: compilation fix from
- https://bugs.kde.org/show_bug.cgi?id=406676#c2
-
-Because the macro version of gst_caps_copy() confuses the C++ compiler
----
- src/QGst/caps.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp
-index 3824d82..a15b701 100644
---- a/src/QGst/caps.cpp
-+++ b/src/QGst/caps.cpp
-@@ -54,7 +54,8 @@ QString Caps::toString() const
- 
- void Caps::append(const CapsPtr & caps2)
- {
--    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2));
-+    const GstCaps * caps2ptr = caps2;
-+    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2ptr));
- }
- 
- CapsPtr Caps::merge(CapsPtr & caps2)
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch
deleted file mode 100644
index 537516db8ec1..000000000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8ed5453b1b5e6e8b3c202fb03c2084e04e5f6b44 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 15 Apr 2018 23:46:50 +0200
-Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- cmake/modules/FindQt4or5.cmake | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake
-index 855a48e..d73b3a2 100644
---- a/cmake/modules/FindQt4or5.cmake
-+++ b/cmake/modules/FindQt4or5.cmake
-@@ -49,6 +49,16 @@ macro(_qt4or5_component_names_to_qt_components output_list)
-   list(REMOVE_DUPLICATES ${output_list})
- endmacro()
- 
-+macro(_qt5_component_names_to_target_link_libaries output_list)
-+  foreach(module ${ARGN})
-+    _qt4or5_component_name_to_qt_component(qt_component ${module})
-+    list(APPEND ${output_list} Qt5::${qt_component})
-+    unset(qt_component)
-+  endforeach()
-+
-+  list(REMOVE_DUPLICATES ${output_list})
-+endmacro()
-+
- if (Qt4or5_FIND_QUIETLY)
-   set(_Qt4or5_FIND_PACKAGE_ARGS QUIET)
- endif()
-@@ -195,13 +205,13 @@ function(qt4or5_use_modules _target _link_type)
-     set(modules ${_link_type} ${ARGN})
-   endif()
- 
--  _qt4or5_component_names_to_qt_components(real_modules ${modules})
--
-   # Verify that Qt5 was found before using qt5_* macros,
-   # otherwise cmake will bail out if they are undefined.
-   if (${QT_VERSION} STREQUAL "5" AND Qt5Core_FOUND)
--    qt5_use_modules(${_target} ${link_type} ${real_modules})
-+    _qt5_component_names_to_target_link_libaries(real_modules ${modules})
-+    target_link_libraries(${_target} ${link_type} ${real_modules})
-   elseif (${QT_VERSION} STREQUAL "4")
-+    _qt4or5_component_names_to_qt_components(real_modules ${modules})
-     qt4_use_modules(${_target} ${link_type} ${real_modules})
-   endif()
- endfunction()
--- 
-2.17.0
-
diff --git a/media-libs/qt-gstreamer/metadata.xml b/media-libs/qt-gstreamer/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/media-libs/qt-gstreamer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
deleted file mode 100644
index 11c5d26ece1f..000000000000
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-util/glib-utils
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gstreamer15.patch"
-	"${FILESDIR}/${P}-gstreamer16.patch"
-	"${FILESDIR}/${P}-boost157.patch"
-	"${FILESDIR}/${P}-qt-5.11b3.patch"
-	"${FILESDIR}/${P}-clang-38.patch"
-)
-
-# bug 497880
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DQTGSTREAMER_EXAMPLES=OFF
-		-DQTGSTREAMER_TESTS=$(usex test)
-		-DQT_VERSION=5
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index be887c8fed0d..676f9c809077 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -2,5 +2,5 @@ AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
 EBUILD sbc-1.4.ebuild 875 BLAKE2B 42fddd2460c78eb9f19ad8d9f8bcbb8c85445aba1047f74e31280650058d30cc8446bcaecca6f2580c0d8645939bcdc858e59e9eefd15d093a0e864a1a633328 SHA512 f079230625d2221aa87ba9ab43ef564052916ed86ca9be200b71739c472818272e497129cc3bfbb351cc49f03731ddaf3baa7a4f0d57e596a6d240fb25e8d45d
-EBUILD sbc-1.5.ebuild 896 BLAKE2B 8a531b20a7aa493e4e49e77a81875a4ab0a3fb8bec78ce54055de9f506a3bd1200045fa7d86061a3568196cd502c5ca89d6bfe4a36dd7183d9db89967bb4981d SHA512 bd43e05c8cd616e8bff58a80b84192faa978e57fcfbf2d9ee07dde61bb5453e927ea08f0bb62aafcad4c03efe6a641a77f315c8a1d4cc11299c8d786cc1fbc50
+EBUILD sbc-1.5.ebuild 890 BLAKE2B 92b5e730e17a343fd6e8523ebed0a0c903ada5589bd14abb909ef6c583b1b35f40e550e47e92e002161f5c153ab4d5c44e75f5e573305e5c1c3d2a7dfd86d29d SHA512 51faa79e0060f4abbc2f1a33cbcfd00efa56c0c893df0614bee6c1b08d140ab599aaaa9b5f69db6dd88718f965aa8720ffe85619c9d12e99e3d5c8315da21784
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
index 91d43e28d957..f7a58b3af69c 100644
--- a/media-libs/sbc/sbc-1.5.ebuild
+++ b/media-libs/sbc/sbc-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest
index ac5543d69679..9e47deedb18a 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,4 +1,4 @@
-AUX sdl2-gfx-1.0.4-slibtool.patch 611 BLAKE2B 6cc3c43023133475bb71b51454430a41bad25dfb525d42cabdf4f42472e53d2ab6e7c70dcb58a364ddc7b755b5517ad03f4324a3bb7c1f61b9c5ad253ba78fc2 SHA512 932808bdf1a0d9c4a0a74c12ac32b365446122880fac0c23c12af342602121a9c93a5ebea6274e51b2d5b3ed73d6f876d68ec53c8280ec2ad31d53c6a9718bcb
+AUX sdl2-gfx-1.0.4-slibtool.patch 560 BLAKE2B 421170fe30fc7ba46867cfe111fd7366b68caa5a33e9e3ed27a47ef1350858a08a3c7f05aeb79219696d428b8409dabaec339a1f7169b7d3847ca037c05804f7 SHA512 f8266c0e43f77471c8ac28e6b3815c07a3dc36fe1a05a89fa578551f038ea48839dc9602294626f7b3030e9e8aeeaa6df98b28beee15baf5a81bcb3ebfc5fbc6
 DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
 EBUILD sdl2-gfx-1.0.4.ebuild 1125 BLAKE2B 66d7bfcd52ae2ad4175269d5425727f0b5c2f3636e4b5bcd9c64e3791dbc328c417dbbf1af63b6bcdd3834a89ce7bf748f29e732c59ae8d8018dc318863156f3 SHA512 ab6a0f04d27f929dc1d11e92a35303d801441d82a142cc42312d4bea43ad834fb12fe6311989a3f85b9ad86d730af462065a32aa6c3f2d1e2308769c29c95399
 MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4
diff --git a/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
index 3fd3b8767fe1..e4895c309512 100644
--- a/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
+++ b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
@@ -14,11 +14,8 @@ This fixes build with sys-devel/slibtool
          ac_default_prefix=/boot/develop/tools/gnupro
 --- SDL2_gfx-1.0.4/Makefile.am
 +++ SDL2_gfx-1.0.4/Makefile.am
-@@ -21,9 +21,11 @@
- 
- libSDL2_gfx_la_LDFLAGS = 	\
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
+@@ -24,6 +24,9 @@
+ 	-release $(LT_RELEASE)	\
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 +libSDL2_gfx_la_LIBADD =		\
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 25b17b9bd9f9..0bd88929e84f 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,3 @@
-DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
-EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5
 EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 24238b783885041ebb9de56ea9be3281dca5dbbae6f9b16bc38a9974f579ce782da76146cece2df7e75dc4f59eae131c303999b6983a432fc464e36ba37a6ac4 SHA512 c82415323ab8efa95a5b79c4ef2f89deb9577da201d88a6c946d0eb4d09381c1ee901fc404cf4839db7300529074e5e3d87fec356aee161bc65adfbef6130435
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
deleted file mode 100644
index 10dfe667c67c..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib multilib-minimal
-
-MY_P="SDL2_image-${PV}"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 097b2fc96a45..fa4dd90b46d7 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,3 @@
-AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
-DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.2-r1.ebuild 3249 BLAKE2B ff30f57b11499173c22b57a1b7319b17d9f64e7a3b282baed32ab9865fd5a078cea091fadfc21e56c4c9a70f30e85e6236f36aee4d27312dc434bc711a5a0b25 SHA512 6d99441d992531f4e75b11b9e3021a8991ced88809ac6181fd89eb2fbb61823ddffd1b95db41dfbb993b204d433620670abd3a73cc39a1b7509eb7cf2ef07630
 EBUILD sdl2-mixer-2.0.4.ebuild 3271 BLAKE2B 24d03746b5995df9a03daf1ffc137fea289775a849af5fe6209b309d6b72b8b46c1f21eb7a74a2d647ac0e61f086e99e705fef20a7e4b1ec87380d46dee54cc9 SHA512 ee857d55b233a8af78240c6a90da53b9e4a0dd7e005cadd4bbf886f4785aa7272f1977328e408fb7dc1e8cb5c3b3286f33cbf2f6984459e85757b602e15dd4c3
-MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
+MISC metadata.xml 672 BLAKE2B deb686ba387b3a1be2b2584f95c1058f5b94fc31f323b03c9e42868c4b06ebb13d40b94195e4791c7ca6ca5a36d757135cee3aeba422d24ed48d04269919010c SHA512 33a98a133bd53201fceba43b54dc44eb5ed83a3015f8d9729ffbd2a9fa400e75510a0e7b31ccd8bf21e430b7b843a6634637beba179ff724cd6b50536ecfe4ab
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
deleted file mode 100644
index 1377feddb39c..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 20:47:21.691153833 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 20:47:30.032153222 -0500
-@@ -138,7 +138,7 @@
-         SDL_free(music);
-         return NULL;
-     }
--    smpeg.SMPEG_actualSpec(mp3, &music_spec);
-+    smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
- 
-     music->freesrc = freesrc;
-     return music;
---- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 21:03:44.907081811 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 23:34:36.696418752 -0500
-@@ -174,6 +174,7 @@
-     int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
-     if (left > 0) {
-         stream += (len - left);
-+    }
-     return left;
- }
- 
diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 2049a3a33969..21a39d764434 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/metadata.xml
@@ -12,8 +12,6 @@
 		<flag name="mod">basic support for MOD files</flag>
 		<flag name="playtools">Install playwave and playmus tools (useful
 			for testing)</flag>
-		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support
-		</flag>
 		<flag name="tremor">enable OGG Vorbis music via libtremor</flag>
 		<flag name="wav">support WAVE files</flag>
 	</use>
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
deleted file mode 100644
index 9c910178b0a3..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="SDL2_mixer-${PV}"
-inherit multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-smpeg.patch )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-music-cmd
-		$(use_enable wav music-wave)
-		$(use_enable mod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		--disable-music-mod-modplug-shared
-		$(use_enable mikmod music-mod-mikmod)
-		--disable-music-mod-mikmod-shared
-		$(use_enable midi music-midi)
-		$(use_enable timidity music-midi-timidity)
-		$(use_enable fluidsynth music-midi-fluidsynth)
-		--disable-music-midi-fluidsynth-shared
-		$(use_enable vorbis music-ogg)
-		$(use_enable tremor music-ogg-tremor)
-		--disable-music-ogg-shared
-		$(use_enable flac music-flac)
-		--disable-music-flac-shared
-		$(use_enable mp3 music-mp3)
-		$(use_enable smpeg music-mp3-smpeg)
-		--disable-music-mp3-smpeg-shared
-		--disable-smpegtest
-		$(use_enable mad music-mp3-mad-gpl)
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools ; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi && use fluidsynth; then
-		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-		ewarn "environment variable to the location of a SoundFont file"
-		ewarn "unless the game or application happens to do this for you."
-		if use timidity; then
-			ewarn "Failing to do so will result in Timidity being used instead."
-		else
-			ewarn "Failing to do so will result in silence."
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index b51332612a2c..f77d9fcd064c 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,6 +1,3 @@
-AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
-DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
-EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
 EBUILD sdl2-ttf-2.0.15.ebuild 1006 BLAKE2B 094ee32c485d67fc19a98f1d9697d656e4b037ed0c9474fd56341d0641b7fd19a60eb22cd159b04009de559d49038e9777cc2730b1375325af23da72be76b43d SHA512 be39cfa034f6fcd1a052eb3db609b96900b986e6ccf52800fd1bd8d8c5c49b8140da395d353db6700bd20313dd2a7dcf4bdf0bc401f04fee849607b89c3d4a4c
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
deleted file mode 100644
index 02b06356190e..000000000000
--- a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/654758
-
---- SDL_ttf-2.0.11/configure.in
-+++ SDL_ttf-2.0.11/configure.in
-@@ -64,6 +64,7 @@
- 	;;
- esac
- 
-+PKG_PROG_PKG_CONFIG
- 
- dnl Check for iconv (character conversion library; see iconv.m4)
- dnl This isn't available on many systems
-@@ -94,6 +95,17 @@
- dnl
- dnl Get the cflags and libraries from the freetype-config script
- dnl
-+PKG_CHECK_MODULES(
-+	FREETYPE2,
-+	freetype2,
-+	[
-+		ft_found=yes
-+		CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+		LIBS="$LIBS $FREETYPE2_LIBS"
-+	],
-+	ft_found=no
-+)
-+
- AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is 
- installed (optional)],
-             freetype_prefix="$withval", freetype_prefix="")
-@@ -101,6 +113,7 @@
- where FREETYPE is installed (optional)],
-             freetype_exec_prefix="$withval", freetype_exec_prefix="")
- 
-+if test "x$ft_found" != "xyes" ; then
- if test x$freetype_exec_prefix != x ; then
-      freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
-      if test x${FREETYPE_CONFIG+set} != xset ; then
-@@ -123,6 +136,7 @@
-     CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
-     LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
- fi
-+fi
- 
- dnl Check for SDL
- SDL_VERSION=1.2.4
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
deleted file mode 100644
index 9bb754c90b17..000000000000
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-MY_P="SDL2_ttf-${PV}"
-DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
-SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs X"
-
-RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/sdl-ttf-2.0.11-freetype_pkgconfig.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index bf9a5e0d66a8..c637b553f779 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,5 +2,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
 EBUILD shaderc-2020.4_pre20201106.ebuild 2163 BLAKE2B 76a7b14c663846b0c2e0e297c44d65d800704b62b68df334a014c9c791610a044337d647af1a6f0037a096b7c4d340559d627c1d6873944954bd359fbf9c3eac SHA512 bfeaeaef179232e4eaa3810f3b30d3ca6cea1d8747cb862649476e5185eb8da72d95a9742354519b9caa78d8c0a3e6445173168a5c9a0dd42577e2cbd9301160
-EBUILD shaderc-2020.5_pre20201216.ebuild 2159 BLAKE2B 80d512fe0b48d5c21cef1db43da2c8ed8473f892547578756219358e9c7b0c950a1b70ea6da3bb74fb5d26d55add5c7afdd56ba918f585aa85083f07870bbd3a SHA512 090b1e5b5179e32d6b86d13ecbd6369404f7c91a7d85b85ecdb230e73befb60e6342e5a4f0f7bb4bc9236727578e0357117db65917e71f3d98445f484f386f11
+EBUILD shaderc-2020.5_pre20201216.ebuild 2157 BLAKE2B cc50f8666645cc5ed12b93c089f450870b290c77dbd52c83ccb95ba57d46688fb0514d8fa31dc2d0d028c07012567e4de209dc6c50259b76c7ffd93124c43b9f SHA512 40e75dcba1468f7e4bab30d22a746af68c42b7e77b7ea7fd8ea4306227a657f25da1d14ad502ac91a2631efe68c251d81aef2852884ac52b3d7647a23f450a99
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
index 63a26151653d..0fac5bb2b40c 100644
--- a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
+++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 7f7832908743..62c7e9b7810b 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -4,9 +4,10 @@ AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798
 AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e
 AUX simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch 790 BLAKE2B 117b907b783404e4e8d03d09ca66496e0fede9bac5ea056ca4489140e9b0532ba585ebb4e75aec47a85e16b88a027fc7ec95297df4fed44a880ad4f0855b17a8 SHA512 692d3741b059148ce1190425319862fdc4299d7efc3a392aee91b60b5575f4702c5f72a066a70984afb14d68fd561f03c76f3ff76894aae36036579272f0f9e8
 AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f
+AUX simage-1.8.1-fail-on-missing-quicktime.patch 453 BLAKE2B 23592fb30537aabd5c351e789d7c02acad784ab53fc0ce1f9f6ee4b3a020a95efff364717fe1bea0f843a88b9fe0577d7f9c46dbb4e64d3804a42adfcab19de8 SHA512 f4737b5cdf3ce136aa1a8539a2a6069dc8d7ff2f92278e220c096b8340cb70375331d919b46e1a477bc58ed5f9d2378a6f26ab0a8c38cb1a0092b6b2f4472c61
 DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f
 DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
 EBUILD simage-1.8.0-r1.ebuild 2239 BLAKE2B a9a205e8eab2e7593e81f5cea619764fa92e5ea6ee6003f39ec02bda59c84a9082c59ced21464d7a9484f11b3c522da4472f2fe275d18178d48af468d62d32da SHA512 5c890d96f4507fc924d0967b42327bcf099c75eafa8f748eae08e93836a6f88f87ced49f602371f447717f415e61ede23ef5ae78b63105ffba437bb9ad5dc885
-EBUILD simage-1.8.1.ebuild 2071 BLAKE2B 883d79364c540d18a3b4934c4ae7c658274c43342725cc726eeb57e8a72b6f2e7bd98151600545c723d54b1b7b84b24b241b350c4f240ae1b4859a1768771a4f SHA512 23f40cd0dc71d80973510dcc197d0949973938094b9f96ce29521b0ed881cdb4a3b530393ef2e9d26542171fa35a0ce4012542ad219674bef861d7e3ef4d6046
-EBUILD simage-9999.ebuild 2078 BLAKE2B 7c0186b12548ce1da4c960d1fdf0e7098f2bd624263b0f659acf8260107c33a6fd435199ac210618f6df7fa4fc6e05b6fb88753320eab7c22a9d276c7d6c1dea SHA512 373dcd2cb085ca0f7fa689eeadcf872416721ae21e0eda77de5ca8ababee10e701fc8eee361318f65da5afae76f48d3a725a540dd8f0bb6bfdf971ee4c90bce8
+EBUILD simage-1.8.1.ebuild 2213 BLAKE2B 6ca0cd18f87a6825bb7b8a854478b40d42af6dc45cdb07f7b3ed7c8be029df91edcd2ae8cbf7381b04deb94c9eab1359d9d35f1d6c784a64e99e2df71cfaefcd SHA512 8bd8da547da521c75e8f0dfc0fccd9373d319643cf638b88f8fc5a78eec1607f81e756672978a959a6c1ba52f880ea17d78563ec79105493f0b0ee96228e39aa
+EBUILD simage-9999.ebuild 2161 BLAKE2B 9550de5e7bfc93f6dc04ce7625c33fbbf6c9111ed2c75da0cc7c60a24e36a720fa13abff9f2ad5b7b651aebe9e7ba8fc04df25613968db812a9b9141fb55477c SHA512 d9e1f039e6315f48c6d69a1433f5c60617b31844aaee15342b146a4a8a6d4d664e0350d7baa3200bb3913358c7bef47226fdc860afde04876bdf2b5a5e9bd5f0
 MISC metadata.xml 297 BLAKE2B a6b86d0b1492873d329613ad09de390097f930f3b6782979bc15d2c20ec06f74b49e58db89ed76d955fc9c6ee7d5b854498e3d4b10763f6f6b2a17f4eee3f4e2 SHA512 8de4e504b13d7a98b5bb90a634c4dd5009688b6f9b78ed2504970b5bedcd4abfa4456db084803b63fd4ea4d88c4f9cdf4bac624a671663b079dad513b41328f3
diff --git a/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch b/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch
new file mode 100644
index 000000000000..c6fc96af05dc
--- /dev/null
+++ b/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch
@@ -0,0 +1,12 @@
+diff -ruN simage/CMakeLists.txt simage-my/CMakeLists.txt
+--- simage/CMakeLists.txt	2021-01-11 23:16:40.000000000 +0100
++++ simage-my/CMakeLists.txt	2021-01-24 04:12:55.309111983 +0100
+@@ -126,7 +126,7 @@
+ # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA.
+ # see https://en.wikipedia.org/wiki/QuickTime
+ if(SIMAGE_USE_QUICKTIME)
+-  find_package(QuickTime)
++  find_package(QuickTime REQUIRED)
+ endif()
+ 
+ if(SIMAGE_USE_CGIMAGE)
diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild
index abb7ac24fcbc..20e75177d9c1 100644
--- a/media-libs/simage/simage-1.8.1.ebuild
+++ b/media-libs/simage/simage-1.8.1.ebuild
@@ -51,36 +51,39 @@ BDEPEND="test? ( media-libs/libsndfile )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.8.1-fail-on-missing-quicktime.patch
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local mycmakeargs=(
-		-DSIMAGE_BUILD_DOCUMENTATION=OFF
-		-DSIMAGE_BUILD_EXAMPLES=OFF
 		-DSIMAGE_BUILD_SHARED_LIBS=ON
+		-DSIMAGE_BUILD_EXAMPLES=OFF
 		-DSIMAGE_BUILD_TESTS=$(usex test)
-		-DSIMAGE_EPS_SUPPORT=ON
-		-DSIMAGE_GIF_SUPPORT=$(usex gif)
-		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_BUILD_DOCUMENTATION=OFF
+		-DSIMAGE_USE_AVIENC=OFF # Windows only
+		-DSIMAGE_USE_GDIPLUS=OFF # Windows
+		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
+		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
+		-DSIMAGE_USE_QIMAGE=$(usex qt5)
+		-DSIMAGE_USE_QT5=$(usex qt5)
+		-DSIMAGE_USE_CPACK=OFF
+		-DSIMAGE_USE_STATIC_LIBS=OFF
+		-DSIMAGE_LIBJASPER_SUPPORT=OFF
 		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
-		-DSIMAGE_MPEG2ENC_SUPPORT=ON
 		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
 		-DSIMAGE_PIC_SUPPORT=ON
-		-DSIMAGE_PNG_SUPPORT=$(usex png)
 		-DSIMAGE_RGB_SUPPORT=ON
 		-DSIMAGE_TGA_SUPPORT=ON
-		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
-		-DSIMAGE_USE_AVIENC=OFF # Windows only
-		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
-		-DSIMAGE_USE_GDIPLUS=OFF # Windows only
-		-DSIMAGE_USE_QIMAGE=$(usex qt5)
-		-DSIMAGE_USE_QT5=$(usex qt5)
-		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
 		-DSIMAGE_XWD_SUPPORT=ON
 		-DSIMAGE_ZLIB_SUPPORT=$(usex zlib)
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_PNG_SUPPORT=$(usex png)
+		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
 	)
-
 	cmake_src_configure
 }
diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild
index 4dc309e659c7..f18a1bb093a3 100644
--- a/media-libs/simage/simage-9999.ebuild
+++ b/media-libs/simage/simage-9999.ebuild
@@ -57,30 +57,32 @@ DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local mycmakeargs=(
-		-DSIMAGE_BUILD_DOCUMENTATION=OFF
-		-DSIMAGE_BUILD_EXAMPLES=OFF
 		-DSIMAGE_BUILD_SHARED_LIBS=ON
+		-DSIMAGE_BUILD_EXAMPLES=OFF
 		-DSIMAGE_BUILD_TESTS=$(usex test)
-		-DSIMAGE_EPS_SUPPORT=ON
-		-DSIMAGE_GIF_SUPPORT=$(usex gif)
-		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_BUILD_DOCUMENTATION=OFF
+		-DSIMAGE_USE_AVIENC=OFF # Windows only
+		-DSIMAGE_USE_GDIPLUS=OFF # Windows
+		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
+		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
+		-DSIMAGE_USE_QIMAGE=$(usex qt5)
+		-DSIMAGE_USE_QT5=$(usex qt5)
+		-DSIMAGE_USE_CPACK=OFF
+		-DSIMAGE_USE_STATIC_LIBS=OFF
+		-DSIMAGE_LIBJASPER_SUPPORT=OFF
 		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
-		-DSIMAGE_MPEG2ENC_SUPPORT=ON
 		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
 		-DSIMAGE_PIC_SUPPORT=ON
-		-DSIMAGE_PNG_SUPPORT=$(usex png)
 		-DSIMAGE_RGB_SUPPORT=ON
 		-DSIMAGE_TGA_SUPPORT=ON
-		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
-		-DSIMAGE_USE_AVIENC=OFF # Windows only
-		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
-		-DSIMAGE_USE_GDIPLUS=OFF # Windows only
-		-DSIMAGE_USE_QIMAGE=$(usex qt5)
-		-DSIMAGE_USE_QT5=$(usex qt5)
-		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
 		-DSIMAGE_XWD_SUPPORT=ON
 		-DSIMAGE_ZLIB_SUPPORT=$(usex zlib)
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_PNG_SUPPORT=$(usex png)
+		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
 	)
-
 	cmake_src_configure
 }
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index ecb40218d52f..bc043080e2bc 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,5 +1,4 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
-EBUILD speex-1.2.0-r1.ebuild 1631 BLAKE2B 0da32c8e941b6ae2868d5fe3c631d0e2f58e342f01de15e8f448b606c671dde24b8d2351a249fc6c59869ac57c2a0f247d7235ff1560524790948436ced4ed8e SHA512 1fa0e55c24172852c15ffbf8934abd62a15bb27ac2e086e40ab3c90db8a5f1e64ebde5138f5bc241c0fde583806d00598ee5fb886fffb221bb84b6ed17c8f50c
 EBUILD speex-1.2.0-r2.ebuild 1643 BLAKE2B 52102721492f7a96d4c985f9555a9600d1b88a3cd3c07f12c21ade8b3beccd7f9cff511608cc4271fa579401965c6b56cc56aa015fb7f83e9b7c89050062959c SHA512 0b141213db7c624cf3b07613c9ad65de43e36337dd30747ee6d6bcf72fde430664cb71806258d8c9a7dc79740940999072b093b54e195df413ed766c5020f7e5
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
deleted file mode 100644
index 0500c2876781..000000000000
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech"
-HOMEPAGE="https://www.speex.org/"
-SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
-
-RDEPEND="
-	utils? (
-		media-libs/libogg:=
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-configure.patch" )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeex/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	local \
-		FIXED_ARG=--disable-fixed-point \
-		ARM4_ARG=--disable-arm4-asm \
-		ARM5_ARG=--disable-arm5e-asm
-
-	if use arm && ! use cpu_flags_arm_v6; then
-		FIXED_ARG=--enable-fixed-point
-
-		if use cpu_flags_arm_v5; then
-			ARM5_ARG=--enable-arm5e-asm
-		elif use cpu_flags_arm_v4; then
-			ARM4_ARG=--enable-arm4-asm
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vbr) \
-		$(use_with utils speexdsp) \
-		$(use_enable utils binaries) \
-		${FIXED_ARG} ${ARM4_ARG} ${ARM5_ARG}
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 067e5907fe23..4e38f1a3dfe1 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,6 +2,5 @@ AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1454 BLAKE2B ad3a0ef2f13c116583c0508a12cab79c0a4dd9a67589fa23389faba5e0be78e6e2518e795d5e984c3cbb7e2502b4e6caf55cabfaba2e6c431c5c3b54a66da0a1 SHA512 656122f0134ccc30e4d96fcd6da39f8f3544330d1b62935fe1688564edbac317a0e2e00701b1ec18ebaac1240f263d5c8b54ae415c9df96a49ec5457982cc015
 EBUILD speexdsp-1.2_rc3-r3.ebuild 1452 BLAKE2B fb1c74522d2ede3f6c2e85c31259beb4fa6f62173f57a2e457ba2b31a7602501094c15616d025d18262710cc9890d3190951e37dfd26d9f5f3ef6b2d3825abb5 SHA512 e830cc39bbacf1af828553f4beb987055975de1574bb0089662232d82a469046750977d271958b6119ade46528b3518892845dbfa23cc6e9f90b3904c0f75b6d
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
deleted file mode 100644
index d547a5fe0691..000000000000
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech -- DSP"
-HOMEPAGE="https://www.speex.org/"
-SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
-
-RDEPEND="!<media-libs/speex-1.2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-configure.patch"
-	"${FILESDIR}/${P}-config_types.h.patch"
-	"${FILESDIR}/${P}-overflow.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeexdsp/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	# Can also be configured with one of:
-	# --enable-fixed-point             (no floating point)
-	# --with-fft=proprietary-intel-mkl (mkl)
-	# --with-fft=gpl-fftw3             (fftw)
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_arm_neon neon)
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index b900d7f9e4c2..db99fdb7ce6c 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,5 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
 EBUILD tiff-4.1.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
-EBUILD tiff-4.2.0.ebuild 2065 BLAKE2B b3bcffdb906e86a1dca65698502e6ee2ab5648c8095a2575c25aceee267887627af8f7849de738b59c9692cf370993ce22b0fe61ff84b199c26067a9bbd0bf81 SHA512 767198b75bb5a11d10b6cb90605e0641a35ff9cf9cb3420613a46c9964aa688ad1aa55d07c40a3ffce2af3fbd4c8ae1294609bf0e53aeb2170cb0d725aa61a3b
-MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
+EBUILD tiff-4.2.0.ebuild 2058 BLAKE2B a9025eb795f2d699b7e8483f76ca1e767bb795350c139dea789f5cb2b3878a55f04a271c173a660acb95d1f229b67882dbd04bd08ff9fcae44d0603a5c83e2ce SHA512 d948a87d2e6c4f21139cefe099cbae1c19b4fb757c5e59a559edbf3c6b03c9ce71ec9195544b49630d6c63a2c74d3852a9ee49c16789107100aba0ee7871116c
+MISC metadata.xml 559 BLAKE2B c7f72104f0c49114e27a3db9548edfc112b6bb04881c980d5f4175835abd46a7be088cd9e8c2eae8311bd1656064d975d50579547a96e814b1affef54a17befe SHA512 95ca6b5655637f4cfacb224a77532ea958634e208b3f7d39cf2be778033b99f77af7947bce9db1e633dbcbc721ea2fba60e5a18a4c0e32a9019fcb95f568cce8
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 414505a38dd4..7cc4f8fccac4 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
 	<longdescription>
 		TIFF image library and tools, mostly for scanner and fax
 		support, but also used by GIS and other imaging tools.
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 60b651ee59a5..c93faafcf23f 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 629af90e92db..a5db46c85dbe 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
 EBUILD vulkan-layers-1.2.154.ebuild 1500 BLAKE2B efd2bf7ef134d238b3b2dd440c63861ca4e5d0d45e8b7184213c2319a3af8f81d6cc1354dadcf3617c9b280b13f5bc77a578defe2d58be5d295ee1b167652d8c SHA512 e1505189030e91984512769b2b5fd895508ee549395fdca1a3ae2891566e7bb5051d9eb37564483b4a1664f132a014031cf9aeaa177d5a895d23a24b82ec81fc
-EBUILD vulkan-layers-1.2.162.ebuild 1495 BLAKE2B 94401dbe0a64a4076e4cee582133fcdc821abd851ed9a3d834e9307b21b3cede4b21060008f73e8fbb1342a91c620d98b68ca15511fffffde4dbfe274a1ce352 SHA512 4e851997058bcb960fca27da4b608571c1e002c0df26f73e334bd34f3136aff03fde8e2662316b523a78375b5f13080c16a331134816d5c5c758cf2a5c95f8af
+EBUILD vulkan-layers-1.2.162.ebuild 1490 BLAKE2B 685b2b8b04cadd9ca4156de0777c283e0ea3a122473e502d1a65cc1d278ad2abb6c221b553a6a7ffdfb16064fcd1dd97a9bbce9b3ab0569923660d03c4d8c4df SHA512 77594334177fb4c33a364283e076aa3bc5f4725eef74bf88375694165139c03ebb14b43202da11837bf4a8413174d9f70165211ef4200273aa83d58ebccab209
 EBUILD vulkan-layers-9999.ebuild 1500 BLAKE2B e528f8534f6dca7e1215a68441f7f45669e11883ee89030e15f4cf9339ffa41bb845594e290c7b7dbdf1eb2394c0b1b75dbd6d4ac3f5187333699e5dc2684268 SHA512 16311564c45173b037ae66121b89933fbf3364cd3e527388c47e5234fc4fa7a2e1fc2736a68b23e7a248e190c6349a4037070bf687a324f17c21bf49a3882d81
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
index 9cb8d0ae93b7..9d84dce7be48 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 arm arm64 ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index cf9e6e606c50..eb3b20e50fb2 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,6 +2,6 @@ AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e
 DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
 EBUILD vulkan-loader-1.2.154.ebuild 1732 BLAKE2B 08279f7f9363058f4b4c7a7c9bf88b5d34b5be88490792df68fcb53699cbb6914b58300705704ebd711a87b955c2f1305c02a44641653b14d88067c17d5a6cab SHA512 bf7da02911bee62cf54d701c5f3785c40bbf0fe038721ae1d17a022fa3e74d71d0b8f6da16c1a48ed3a4f2c3fdab240d46925ce0f4b07b18d7ededc338f970f5
-EBUILD vulkan-loader-1.2.162-r1.ebuild 1796 BLAKE2B 254b07d98aa803d4b90b43c861637ca60af08f9e886c496fffedad99b8f4fb43754c11773f9b042548c26e8b584deb0daeff77d8302ce779130b95d36e3bd933 SHA512 f49fb9cb948ac1dd5172e1130f118ae3fb386cd0b6f2ed16ae8ed7914bba311d6a674cc19c0ae643c59ab4c5817f464a58ecc6c3b4d8e482fd40a2a742322c1b
+EBUILD vulkan-loader-1.2.162-r1.ebuild 1791 BLAKE2B b5121202259866dca31347915bd665a49d516bec03e81eeb32c6461b6bfb51d1d1f368ce3399256c9d1f34f1bbe37d89ec0e730953c955305f77a51109dfcaff SHA512 e52c8cf91fa119baa7efceb81f692f9d4b44840143bc47f5d1dad0fef66b4245a221c18ea06371521f4e7af6f71a691e81f0dc3498034a6bb0ecd700eb55a54d
 EBUILD vulkan-loader-9999.ebuild 1731 BLAKE2B adc4fccce6f98f7b17f29b9dcededd21fd5487ffe0f427a068173f92a61f918c24ec508c6f7e7ff2851f6bc9bd585207addfca3bf82d2ee35d81c18dcb4baaac SHA512 5acd4e2f9c5f3c4ffcd1f0219814810b9a3fa4387063606eeecd1e0d0b7e3454bb8a3b66a8bb7efab518dde966c8cc33e7477408871bc2d715d1327d93f63b49
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index 1fb27663e902..e12bf3b94aa4 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-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
@@ -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 arm arm64 ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi