Updating liguros repov21.1.3

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-27 18:53:03 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-27 18:53:03 +0000
commit: 3482ddf943eff7b8848f1fb31350b99ce349e86a (patch)
tree: 9c9bb6ec6679e9dc44a84d87ba611989409b12ca /media-libs
parent: 8e8120eabdd28020aa69c7a60505cce2edd20adc (diff)
download: baldeagleos-repo-21.1.3.tar.gz
baldeagleos-repo-21.1.3.tar.xz
baldeagleos-repo-21.1.3.zip
154 files changed, 1715 insertions, 2915 deletions
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 4158f3aee8fc..0bebd4ad1f95 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,3 +1,2 @@
-DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
deleted file mode 100644
index 0387f700f4a8..000000000000
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop
-
-DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="Allegro MIT GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
-IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	svga? ( media-libs/svgalib )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-		opengl? (
-			virtual/glu
-			virtual/opengl
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shared.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-rpath.patch
-	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
-	"${FILESDIR}"/${P}-glibc228.patch               # bug 670781
-	"${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch     # bug 672858
-	"${FILESDIR}"/${P}-static-func.patch            # bug 696034
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
-		docs/CMakeLists.txt || die
-}
-
-src_configure() {
-	# WANT_LINUX_CONSOLE is by default OFF
-	# WANT_EXAMPLES doesn't install anything
-	local mycmakeargs=(
-		-DDOCDIR=share/doc
-		-DMANDIR=share/man
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_DOCS_INFO=OFF
-		-DWANT_EXAMPLES=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JPGALLEG=$(usex jpeg)
-		-DWANT_LINUX_CONSOLE=OFF
-		-DWANT_LINUX_FBCON=$(usex fbcon)
-		-DWANT_LINUX_SVGALIB=$(usex svga)
-		-DWANT_LINUX_VGA=$(usex vga)
-		-DWANT_LOADPNG=$(usex png)
-		-DWANT_LOGG=$(usex vorbis)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TOOLS=$(usex X)
-		-DWANT_X11=$(usex X)
-	)
-
-	if use X; then
-		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
-	else
-		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	rm -r docs/html/{build,tmpfile.txt} || die
-	local HTML_DOCS=( docs/html/. )
-
-	cmake-utils_src_install
-
-	#176020 (init_dialog.3), #409305 (key.3)
-	pushd docs/man >/dev/null
-	local manpage
-	for manpage in $(ls -d *.3); do
-		newman ${manpage} ${PN}-${manpage}
-	done
-	popd >/dev/null
-
-	if use X; then
-		newbin setup/setup ${PN}-setup
-		insinto /usr/share/${PN}
-		doins {keyboard,language,setup/setup}.dat
-		newicon misc/icon.png ${PN}.png
-		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
-	fi
-}
diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
deleted file mode 100644
index 54ff4f97fbb1..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/addons/allegrogl/src/x.c	2019-01-27 20:35:26.209055856 +0100
-+++ b/addons/allegrogl/src/x.c	2019-01-27 20:38:54.135570782 +0100
-@@ -650,7 +650,7 @@
- 		return -1;
- 	}
- 
--	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
-+	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
- 		TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
- 		return -1;
- 	}
-@@ -674,7 +674,7 @@
- 	/* Floating-point depth is not supported as glx extension (yet). */
- 	i->float_depth = 0;
- 
--	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
-+	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
- 
- 	v = glXGetVisualFromFBConfig(_xwin.display, fbc);
- 	if (!v) {
diff --git a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
deleted file mode 100644
index b3b0bc30b344..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c
---- allegro-4.4.2/src/unix/umodules.c~	2011-05-13 10:11:33.000000000 +0200
-+++ allegro-4.4.2/src/unix/umodules.c	2017-03-15 14:42:39.822612368 +0100
-@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive
- 	 continue;
- 
-       if (!fullpath_slash) {
--         snprintf(fullpath, sizeof fullpath, filename);
-+         snprintf(fullpath, sizeof fullpath, "%s", filename);
- 	 fullpath[(sizeof fullpath) - 1] = 0;
-       }
-       else {
--	 snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename);
-+	 snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename);
- 	 fullpath[(sizeof fullpath) - 1] = 0;
-       }
-       
-diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c
---- allegro-4.4.2/src/linux/ljoy.c~	2010-02-20 06:18:16.000000000 +0100
-+++ allegro-4.4.2/src/linux/ljoy.c	2017-03-15 14:52:28.474215615 +0100
-@@ -93,7 +93,7 @@ static int joy_init(void)
- 
-       if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) {
-          /* NOTE: IOCTL fails if the joystick API is version 0.x */
--         uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
-+         uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
-          return -1; 
-       }
-       
-diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c
---- allegro-4.4.2/examples/extrans2.c~	2008-01-30 11:56:50.000000000 +0100
-+++ allegro-4.4.2/examples/extrans2.c	2017-03-15 15:43:03.494831521 +0100
-@@ -211,7 +211,7 @@ int main(int argc, char **argv)
-       } else {
-          msg = "no flipping";
-       }
--      textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg);
-+      textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg);
- 
-       /* finally blit the back buffer on the screen */
-       blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h);
-diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c
---- allegro-4.4.2/setup/setup.c~	2010-05-23 18:05:33.000000000 +0200
-+++ allegro-4.4.2/setup/setup.c	2017-03-15 16:13:42.243136380 +0100
-@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP *
- 	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp),
-                     joystick_driver->name, i+1, num_joysticks);
-       else
--	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name);
-+	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name);
-       c++;
-    }
- 
-@@ -2879,7 +2879,7 @@ int main(void)
-       alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0);
-     #else
-       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
--      allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
-+      allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
-     #endif
-       return 1;
-    }
-diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c
---- allegro-4.4.2/examples/exkeys.c~	2008-01-10 20:46:00.000000000 +0100
-+++ allegro-4.4.2/examples/exkeys.c	2017-03-15 16:17:30.268545467 +0100
-@@ -193,7 +193,7 @@ int main(void)
-       if (key_shifts & KB_NUMLOCK_FLAG)  strcat(buf, " num");
-       if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl");
-       scroll();
--      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
-    } while (k != 27);
- 
-    /* various scan codes are defined in allegro.h as KEY_* constants */
-@@ -234,7 +234,7 @@ int main(void)
-       if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' ';
-       if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' ';
-       buf[10] = 0;
--      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
-       rest(1);
-    } while (!keypressed() || (readkey() >> 8) != KEY_ESC);
- 
-diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c
---- allegro-4.4.2/tests/play.c~	2005-03-19 12:15:07.000000000 +0100
-+++ allegro-4.4.2/tests/play.c	2017-03-15 16:35:18.628156496 +0100
-@@ -74,7 +74,7 @@ void usage(void)
- 
-    strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n");
- 
--   allegro_message(msg);
-+   allegro_message("%s", msg);
-    free(msg);
- }
-
-diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c
---- allegro-4.2.3/tools/pack.c~	2006-05-20 16:49:58.000000000 +0200
-+++ allegro-4.2.3/tools/pack.c	2010-12-30 11:20:42.425231307 +0100
-@@ -42,7 +42,7 @@ static void err(char *s1, char *s2)
-       printf(": %s", s1);
-
-    if (s2)
--      printf(s2);
-+      printf("%s", s2);
-
-    printf("\n");
-
diff --git a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
deleted file mode 100644
index afcdf5100c5e..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <andreas@ronnquist.net>
-Date: Wed, 12 Dec 2018 16:39:23 +0100
-Subject: [PATCH] Remove f* variants of fixed math functions
-
-Removing functions that conflicts with later glibc implementations,
-people should use fix* variants instead.
-(Simply use fixadd instead of fadd).
----
- include/allegro/alcompat.h | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
-index d31ab5b6d..c9536839d 100644
---- a/include/allegro/alcompat.h
-+++ b/include/allegro/alcompat.h
-@@ -40,24 +40,6 @@
-       #endif
-    #endif
- 
--   #ifndef ALLEGRO_NO_FIX_ALIASES
--      AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
--      AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
--      AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
--      AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
--      AL_ALIAS(int fceil(fixed x), fixceil(x))
--      AL_ALIAS(int ffloor(fixed x), fixfloor(x))
--      AL_ALIAS(fixed fcos(fixed x), fixcos(x))
--      AL_ALIAS(fixed fsin(fixed x), fixsin(x))
--      AL_ALIAS(fixed ftan(fixed x), fixtan(x))
--      AL_ALIAS(fixed facos(fixed x), fixacos(x))
--      AL_ALIAS(fixed fasin(fixed x), fixasin(x))
--      AL_ALIAS(fixed fatan(fixed x), fixatan(x))
--      AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
--      AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
--      AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
--   #endif
--
- #endif  /* !defined ALLEGRO_SRC */
- 
- 
diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
deleted file mode 100644
index ac107d387d56..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-static-func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/alleg/bugs/398/
-
---- a/addons/jpgalleg/src/decode.c	2008-02-13 14:04:57.000000000 +0100
-+++ b/addons/jpgalleg/src/decode.c	2015-09-03 14:57:57.888485546 +0200
-@@ -477,7 +477,7 @@
-  *  Reads a string of bits from the input stream and returns a properly signed
-  *  number given the category.
-  */
--INLINE int
-+static INLINE int
- get_value(int category)
- {
- 	int result = get_bits(category);
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index d696e01194e6..e185f4431713 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -20,6 +20,7 @@ and a GUI.
     <flag name="vga">Enables the VGA graphics driver</flag>
   </use>
   <upstream>
+    <remote-id type="github">liballeg/allegro5</remote-id>
     <remote-id type="sourceforge">alleg</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
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 fd07332a7b54..c167ec639d86 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,2 +1,2 @@
-DIST Image-ExifTool-12.05.tar.gz 4836500 BLAKE2B 92219a9d808bd075ae3bb9c98f519cc183cfb6513724a8a8c9d914822cfcc6d1aaf56ef06887c60f5153aee758bafadbaf5ccaead1d296f916cb2e34ce5e8c33 SHA512 0d36e3a9dd96378ac5951779a16b194cabf3cd52197ee916ff56c2a8f2a4c00392845d9675eaad1f3f08c2ba669d8802ad7bbbe754e649ac1bba315d8fbb04a4
 DIST Image-ExifTool-12.08.tar.gz 4842868 BLAKE2B 0ad8228f5b40bf51f1e29e4676ecd012de2dec6229452f7655adb543d44e59825a21311f2d09ece5190fdda06b21fbd8cc6a697b164cf6aae94c401d082459e1 SHA512 66e445fe1aca640d4b984cfacb4972f2bc64bcab61dbb014a0486a7d04612ecbd249a2691bcff704957c93467533b383c53883bb409a2064bb8c839ae7c2d4a5
+DIST Image-ExifTool-12.16.tar.gz 4888506 BLAKE2B d262f087b4334c01ed927945aa0b072c90eaf7322af017030ef193b8b20fc7ce7008b69c483bc83d1dbe0ceab5bcb7e894e5085cae853a1d9d74f72b9c8a360e SHA512 adfd21834ccf06277903712b3c5e328b29c56f3b30ee68f6802dca0820823b627622e55f53238690525d1d19df2a59cb57f9d80a1bb2e99da37fb7d963ee16ee
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/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/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..452c68e245c6
--- /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="https://sourceforge.net/projects/gmerlin/"
+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/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 8d122f0b1b50..2b2db7f9454f 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/metadata.xml b/media-libs/giflib/metadata.xml
index e2be81e1177c..859e803d72e8 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/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/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index bbb5fd9d2776..eff02a07beb6 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala
@@ -20,7 +20,8 @@ RDEPEND="
 	media-libs/libcanberra
 	introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 2418671100a6..2d3afb5db03e 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,3 +1,3 @@
 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
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 7ae82981a8cc..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="https://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/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 5234f54e4398..fa5c58143085 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="https://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/kcolorpicker-0.1.4.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
index 4867e8b9369d..5f6f7d835dde 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
index 417b4bc23c2d..c2ab3376cc97 100644
--- a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
index 9dca5f420467..200c46989da6 100644
--- a/media-libs/kquickimageeditor/Manifest
+++ b/media-libs/kquickimageeditor/Manifest
@@ -1 +1 @@
-DIST kquickimageeditor-0.1.2.tar.xz 3281984 BLAKE2B bf6467dd48c6f64a9b8b8752949af3776d766e8e7076d114c7a8522616f4e36ef47b470c382906764cf56b45f40163ee658f5ba295ae33ab1e379483d4181565 SHA512 b8ffbd2b1c331203bf5e81004b5da729658ea49e6d8c49a3d65b0f397a2b3095408479e9828bc15fbbf1ad69374a7c2cf8dc728c3fe44d28d30137657e3c759c
+DIST kquickimageeditor-0.1.3.tar.xz 3281972 BLAKE2B 314d492f841f1786d8e958f0b925a5485d8ee4644488e26fefaaf67bd9388403d5b88c7fc52826555ca91b762ec6caec79ae6a363a2c1d688d26076287a6e72a SHA512 ce04ca71aa6232cde2303a07dd800db9bc590a3fafda8c3843d46e994a37858934ee98914dde4c29e03cd01a247059b577375e57ac5d1449f9029d4865eae4ef
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/libaom/Manifest b/media-libs/libaom/Manifest
index 6a5f427431f3..74f6a2a6858b 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,2 +1,3 @@
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
+DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
diff --git a/media-libs/libaom/libaom-2.0.1.ebuild b/media-libs/libaom/libaom-2.0.1.ebuild
new file mode 100644
index 000000000000..8a9361596daa
--- /dev/null
+++ b/media-libs/libaom/libaom-2.0.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+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 )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
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/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 7f479ddcf3c5..f7af4a29b4df 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools-multilib eutils ltprune systemd
+EAPI=7
+inherit multilib-minimal systemd
 
 DESCRIPTION="Portable sound event library"
 HOMEPAGE="https://git.0pointer.net/libcanberra.git/"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	media-libs/libvorbis[${MULTILIB_USEDEP}]
 	alsa? (
@@ -31,22 +31,22 @@ COMMON_DEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.11[${MULTILIB_USEDEP}] )
 	tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome? (
 		gnome-base/dconf
 		gnome-base/gsettings-desktop-schemas )
 	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 "
 
 REQUIRED_USE="udev? ( alsa )"
 
-src_prepare() {
+PATCHES=(
 	# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
-	epatch "${FILESDIR}/${PN}-0.30-wayland.patch"
-}
+	"${FILESDIR}/${PN}-0.30-wayland.patch"
+)
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
@@ -59,9 +59,9 @@ multilib_src_configure() {
 		$(use_enable gtk3) \
 		$(use_enable tdb) \
 		$(use_enable udev) \
-		$(systemd_with_unitdir) \
 		--disable-lynx \
-		--disable-gtk-doc
+		--disable-gtk-doc \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 
 	if multilib_is_native_abi; then
 		ln -s "${S}"/gtkdoc/html gtkdoc/html || die
@@ -75,7 +75,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files --modules
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	# This is needed for desktops different than GNOME, bug #520550
 	exeinto /etc/X11/xinit/xinitrc.d
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index ac33de88c335..49953da61ae8 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/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index f8eb1255bace..7596822e1e86 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,2 +1,2 @@
-DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
+DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
index 116dfd530545..af4b712cddf0 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation"
+DESCRIPTION="Library for MPEG TS/DVB PSI tables decoding and generation"
 HOMEPAGE="https://www.videolan.org/libdvbpsi"
 SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
-RDEPEND=""
-DEPEND="
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		>=media-gfx/graphviz-2.26
@@ -41,5 +40,5 @@ src_compile() {
 src_install() {
 	use doc && local HTML_DOCS=( doc/doxygen/html/. )
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libdvbpsi/metadata.xml b/media-libs/libdvbpsi/metadata.xml
index f1eb1c62cdb0..d85b4252fc33 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>lordvan@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
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 97f8d76efd9a..44778789f9c2 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,3 +1 @@
-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
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 2814fee14c28..b99ecf2ef70b 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,4 +1 @@
-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
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/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 1e9c5d0db4e8..52582a06be4e 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -7,7 +7,7 @@ inherit autotools multilib-minimal
 
 COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
 DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif"
+HOMEPAGE="https://libexif.github.io/"
 SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 #SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index 745f16d3be25..2968f87bc9bf 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,9 +1,13 @@
 <?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>
 		<remote-id type="sourceforge">libexif</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
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..216bd6e37d0e
--- /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="https://sourceforge.net/projects/fame/"
+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 ccce62b45f72..d59bacb43776 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1 +1,2 @@
+DIST libheif-1.10.0.tar.gz 1681115 BLAKE2B d9dc8c630f76d0f8df33e644fbbd589a92aab62927b72f7cc49b0ac9b65141979250c7fecbc4f119d62e5cc4386803580bff10accb3a0a4a04aa9c74ada9a146 SHA512 85550afe4d2c4a0af16213f51b7c9e9478f87199941d125aa7622ee42e5473a2344f3460d9c684b1805d45f903a98b77b4081f539d5b8c445fbf9443c8341629
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
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 29715a5cdeda..6d9cf9c09cc1 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/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/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 8a9cc9385483..728f7667c6da 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/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>
   <slots>
     <subslots>Reflect ABI of libturbojpeg.so.</subslots>
   </slots>
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index 37f1203a6d80..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"
+DESCRIPTION="Easy to use C/C++ seam carving library"
 HOMEPAGE="https://liblqr.wikidot.com/"
-SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.tar.bz2"
+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 b6df221fe0b5..8bbe0fedcaf5 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,2 +1 @@
-DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
 DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
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 fc722694e74d..0e07fe11b3c0 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,3 +1 @@
-DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
-DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0e9e1d5393fc60bdb128045e11947873622f1d78f79eba7a4abd46e4537001b66e41f79008ff895680a016e22c5855fc SHA512 c68b7eb906eac2af7b6f588910824ea9a9bd32d4e7b4f8af3579b0e388f5c547583be0ebd1491cdef52dbdb0eca7e2b2731662e48fc66baaddc1e1ca76f385ff
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
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.08.ebuild b/media-libs/libmediainfo/libmediainfo-20.08.ebuild
deleted file mode 100644
index 5ec625856e57..000000000000
--- a/media-libs/libmediainfo/libmediainfo-20.08.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.03.ebuild b/media-libs/libmediainfo/libmediainfo-20.09-r1.ebuild
index 5ec625856e57..9da3548cd7e6 100644
--- a/media-libs/libmediainfo/libmediainfo-20.03.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/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/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..427f3dad4177
--- /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="https://sourceforge.net/projects/modplug-xmms/"
+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/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..8824f140a15e
--- /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="https://sourceforge.net/projects/mp3splt/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/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/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/libopenshot-audio/libopenshot-audio-0.2.0.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
index ed11d8638bf2..904c56d046d3 100644
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
index 72e2609eeb03..57f9514afb67 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/19"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples +imagemagick +python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index dab2f33cb6eb..f26c79c873ee 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,2 +1,3 @@
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
+DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
diff --git a/media-libs/libplacebo/libplacebo-2.43.1.ebuild b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
new file mode 100644
index 000000000000..ee21a12eceb4
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +opengl +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature opengl)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test -t 10
+}
+
+multilib_src_install() {
+	meson_src_install
+}
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 754a89a13737..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="https://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 366647ad08b2..cdd882828eb1 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/libquvi-scripts-0.9.20131130-r100.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
index 5810c11e593d..99b6e7e14c0e 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/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
index d28e2e715ebe..55ed8c1da944 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/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 26708363726e..b3383467bf63 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1 +1,2 @@
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
+DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
new file mode 100644
index 000000000000..2857de0cb9c4
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
+HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
+else
+	SRC_URI="https://github.com/libsndfile/libsamplerate/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"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Alsa/FFTW are only required for tests
+# libsndfile is only used by examples and tests
+DEPEND="
+	test? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		media-libs/libsndfile[${MULTILIB_USEDEP}]
+		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	)"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable test alsa) \
+		$(use_enable test fftw) \
+		$(use_enable test sndfile)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 04de4b3ca737..2857de0cb9c4 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -6,13 +6,13 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="https://www.mega-nerd.com/SRC/"
+HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
-	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
+	SRC_URI="https://github.com/libsndfile/libsamplerate/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"
 fi
 
@@ -28,8 +28,7 @@ DEPEND="
 		media-libs/alsa-lib[${MULTILIB_USEDEP}]
 		media-libs/libsndfile[${MULTILIB_USEDEP}]
 		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	)
-"
+	)"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
@@ -38,16 +37,14 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable test alsa)
-		$(use_enable test fftw)
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable test alsa) \
+		$(use_enable test fftw) \
 		$(use_enable test sndfile)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index b17ea6636334..bc6548cf102c 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1 +1,2 @@
 DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
+DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
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..90b6bd098c55
--- /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_{6,7,8,9,10} 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="https://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 24aa4ffa35b8..90b6bd098c55 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -7,19 +7,19 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} 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="https://www.mega-nerd.com/libsndfile"
+HOMEPAGE="https://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/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 0db329254f79..0be432dd7ccb 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="https://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 a35301ab6ad4..8db4a44656b4 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,6 +1,4 @@
 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
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/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild
index 7fdb393a5c9b..1326c2ab6ceb 100644
--- a/media-libs/libvpx/libvpx-1.9.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.9.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc +highbitdepth postproc static-libs svc test +threads"
 
 REQUIRED_USE="test? ( threads )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 619de6de1d03..2b15e5445645 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,3 +1 @@
-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
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/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index d281f1d619df..1f0b17411613 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="https://sourceforge.net/projects/wvware/"
 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/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/mesa-21.0.0_rc1.ebuild b/media-libs/mesa/mesa-21.0.0_rc1.ebuild
index e2999d3b129f..9d4f576e09ad 100644
--- a/media-libs/mesa/mesa-21.0.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-21.0.0_rc1.ebuild
@@ -107,6 +107,7 @@ RDEPEND="
 	wayland? (
 		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.8
+		dev-util/wayland-scanner
 	)
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
 	video_cards_intel? (
diff --git a/media-libs/mlt/mlt-6.24.0-r1.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild
index a40d57ba9d94..5ed47f65bbdd 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 d966abffd371..585460905abe 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,2 @@
-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
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/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index 8e41f2ef32ed..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,9 +1,9 @@
 # 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="https://sourceforge.net/projects/opencore-amr/"
@@ -12,5 +12,12 @@ 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/metadata.xml b/media-libs/opencv/metadata.xml
index 42c3073d4cea..9addf4638729 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -37,8 +37,9 @@ 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>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index bad6b43ab082..fa82ca253d39 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1,3 @@
 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
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 c5e5a078bb21..5531d4744ac1 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1 @@
-DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c2878c58ca005eef5fdc4a0c60825ba5c29dd37a543551e9427fda99d859d3cf3cab9cb8c459b47e2b8935e8b7730a09e19de1 SHA512 79f412bd3f7ad4cf6cb57d99293c02fa71478ece102478a6b93a8c5b8c4c56d1313595d24753f9ae1714039ac6aa1be4ae37461233203bac217fe6c0667fbf3b
-DIST openimageio-2.2.10.1.tar.gz 29215445 BLAKE2B ac45bcbd89f023aac7ae063ebbcf9d26375af2d370d18569cd0b4571640d446ceb639b871c107c6727aa92ad05ebea662bc8c34231bfd99a1c18215920ad3089 SHA512 6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a
-DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
diff --git a/media-libs/openimageio/files/openimageio-openjpeg24.patch b/media-libs/openimageio/files/openimageio-openjpeg24.patch
new file mode 100644
index 000000000000..2e3d8cafb328
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-openjpeg24.patch
@@ -0,0 +1,40 @@
+commit 100f9fc3ecfc12b427b344313f2b5bea54e04480
+Author: Chris Whalen <chris@chriswhalen.ca>
+Date:   Sat Jan 16 07:08:35 2021 -0400
+
+    added openjpeg-2.4 to OpenJpeg_include_paths (#2829)
+
+diff --git a/src/cmake/modules/FindOpenJpeg.cmake b/src/cmake/modules/FindOpenJpeg.cmake
+index 3b0750e8..96229b19 100644
+--- a/src/cmake/modules/FindOpenJpeg.cmake
++++ b/src/cmake/modules/FindOpenJpeg.cmake
+@@ -56,18 +56,21 @@ endmacro ()
+ 
+ # Generic search paths
+ set (OpenJpeg_include_paths
++     /usr/local/include/openjpeg-2.4
+      /usr/local/include/openjpeg-2.3
+      /usr/local/include/openjpeg-2.2
+      /usr/local/include/openjpeg-2.1
+      /usr/local/include/openjpeg-2.0
+      /usr/local/include/openjpeg
+      /usr/local/include
++     /usr/include/openjpeg-2.4
+      /usr/include/openjpeg-2.3
+      /usr/include/openjpeg-2.2
+      /usr/include/openjpeg-2.1
+      /usr/include/openjpeg
+      /usr/include
+      /opt/local/include
++     /opt/local/include/openjpeg-2.4
+      /opt/local/include/openjpeg-2.3
+      /opt/local/include/openjpeg-2.2
+      /opt/local/include/openjpeg-2.1
+@@ -88,6 +91,7 @@ if (OpenJpeg_ROOT)
+        ${OpenJpeg_library_paths}
+       )
+   set (OpenJpeg_include_paths
++       ${OpenJpeg_ROOT}/include/openjpeg-2.4
+        ${OpenJpeg_ROOT}/include/openjpeg-2.3
+        ${OpenJpeg_ROOT}/include/openjpeg-2.2
+        ${OpenJpeg_ROOT}/include/openjpeg-2.1
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index b5656ce9665d..3d67f2af29d5 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -19,5 +19,5 @@
 	<upstream>
 		<remote-id type="github">OpenImageIO/oiio</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/media-libs/openimageio/openimageio-2.2.10.0.ebuild b/media-libs/openimageio/openimageio-2.2.10.0.ebuild
deleted file mode 100644
index 91a713999b9f..000000000000
--- a/media-libs/openimageio/openimageio-2.2.10.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
deleted file mode 100644
index 29cd71588e59..000000000000
--- a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
deleted file mode 100644
index 75d14100f1b4..000000000000
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.10.1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r2.ebuild
index 91a713999b9f..513e6d659e84 100644
--- a/media-libs/openimageio/openimageio-2.2.10.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r2.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
@@ -88,6 +88,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-openjpeg24.patch"
+)
+
 DOCS=( CHANGES.md CREDITS.md README.md )
 
 pkg_setup() {
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 0179013e339c..4421745b1143 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,4 +1,3 @@
-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
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
index b0b2666c7220..7eb393b8922f 100644
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -1,5 +1,5 @@
 From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.com>
+From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Thu, 11 Apr 2019 13:10:57 +0200
 Subject: [PATCH] Use GNUInstallDirs for standard installation directories
 
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/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..0874eb232ad2
--- /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="https://sourceforge.net/projects/plib/"
+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 4018bfeff4e0..000000000000
--- a/media-libs/qt-gstreamer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
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 9c604ba4a6dc..000000000000
--- a/media-libs/qt-gstreamer/metadata.xml
+++ /dev/null
@@ -1,9 +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>
-	<origin>gentoo-staging</origin>
-</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/files/sbc-1.5-ifdef-builtin.patch b/media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch
new file mode 100644
index 000000000000..cfa89958db10
--- /dev/null
+++ b/media-libs/sbc/files/sbc-1.5-ifdef-builtin.patch
@@ -0,0 +1,30 @@
+diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
+index 97a75be..ac79ca5 100644
+--- a/sbc/sbc_primitives.c
++++ b/sbc/sbc_primitives.c
+@@ -591,6 +591,7 @@ static int sbc_calc_scalefactors_j(
+ 	return joint;
+ }
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
+ {
+ 	__builtin_cpu_init();
+@@ -605,6 +606,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
+ 		sbc_init_primitives_sse(state);
+ #endif
+ }
++#endif
+ 
+ /*
+  * Detect CPU features and setup function pointers
+@@ -630,7 +632,9 @@ void sbc_init_primitives(struct sbc_encoder_state *state)
+ 	state->implementation_info = "Generic C";
+ 
+ 	/* X86/AMD64 optimizations */
++#if defined(__i386__) || defined(__x86_64__)
+ 	sbc_init_primitives_x86(state);
++#endif
+ 
+ 	/* ARM optimizations */
+ #ifdef SBC_BUILD_WITH_ARMV6_SUPPORT
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
index 65d68e49819c..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
@@ -20,6 +20,8 @@ RESTRICT="test"
 RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-ifdef-builtin.patch" )
+
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
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
new file mode 100644
index 000000000000..e4895c309512
--- /dev/null
+++ b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
@@ -0,0 +1,26 @@
+This fixes build with sys-devel/slibtool
+
+--- SDL2_gfx-1.0.4/configure.in
++++ SDL2_gfx-1.0.4/configure.in
+@@ -58,6 +58,9 @@
+ fi
+ AC_CHECK_PROGS(WINDRES, [windres $hostaliaswindres $host_os-windres])
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ case "$host" in
+     *-*-beos*)
+         ac_default_prefix=/boot/develop/tools/gnupro
+--- SDL2_gfx-1.0.4/Makefile.am
++++ SDL2_gfx-1.0.4/Makefile.am
+@@ -24,6 +24,9 @@
+ 	-release $(LT_RELEASE)	\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
++libSDL2_gfx_la_LIBADD =		\
++	$(LIBM)
++
+ %.o : %.rc
+ 	$(WINDRES) $< $@
+ 
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index a9c7fc0a7fa1..a14378bad41f 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.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=6
@@ -21,6 +21,10 @@ DOCS=( AUTHORS ChangeLog README )
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.4-slibtool.patch"
+)
+
 src_prepare() {
 	default
 	mv configure.in configure.ac || die
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 0f4de5bea6a9..558bff0ce036 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,2 +1 @@
-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
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 91d1c5d090f3..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="https://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 e6990108ce5e..8fc00617b6a4 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-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
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 e4c56ad76b14..2ae7e99d9830 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 ac1ee4929cd5..83c93cbf0b34 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,2 +1 @@
-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
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 c63f37673e4e..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="https://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/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
index 4f11caa75cce..d3e05884e991 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/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/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/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/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch
new file mode 100644
index 000000000000..81c82bb1358f
--- /dev/null
+++ b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch
@@ -0,0 +1,123 @@
+https://bugs.gentoo.org/766156
+https://github.com/AOMediaCodec/SVT-AV1/commit/09c90e4cfb602b9a247a8a256923bdbddaf2ed9b
+
+From 09c90e4cfb602b9a247a8a256923bdbddaf2ed9b Mon Sep 17 00:00:00 2001
+From: Slawomir Pawlowski <slawomir.pawlowski@intel.com>
+Date: Fri, 18 Dec 2020 16:47:20 +0100
+Subject: [PATCH] Fix C only build
+
+---
+ CMakeLists.txt                            | 5 ++++-
+ Source/Lib/Common/Codec/common_dsp_rtcd.c | 5 ++++-
+ Source/Lib/Common/Codec/common_dsp_rtcd.h | 2 ++
+ Source/Lib/Decoder/CMakeLists.txt         | 5 ++++-
+ Source/Lib/Encoder/CMakeLists.txt         | 5 ++++-
+ Source/Lib/Encoder/Codec/firstpass.c      | 2 +-
+ 6 files changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8baff740b1..efdd7385fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -302,6 +302,9 @@ if(BUILD_TESTING)
+ endif()
+ 
+ add_subdirectory(third_party/fastfeat)
+-add_subdirectory(third_party/cpuinfo)
++
++if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
++    add_subdirectory(third_party/cpuinfo)
++endif()
+ 
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/Source/API/ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/svt-av1" FILES_MATCHING PATTERN "*.h")
+diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.c b/Source/Lib/Common/Codec/common_dsp_rtcd.c
+index e24f99f66b..c09f088b88 100644
+--- a/Source/Lib/Common/Codec/common_dsp_rtcd.c
++++ b/Source/Lib/Common/Codec/common_dsp_rtcd.c
+@@ -17,8 +17,10 @@
+ #include "EbPackUnPack_C.h"
+ #include "EbAvcStyleMcp.h"
+ 
++#ifdef ARCH_X86_64
+ // for get_cpu_flags
+ #include "cpuinfo.h"
++#endif
+ 
+ /*
+  * DSP deprecated flags
+@@ -69,7 +71,7 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, const TranLow *dqcoeff,
+ /**************************************
+  * Instruction Set Support
+  **************************************/
+-
++#ifdef ARCH_X86_64
+ CPU_FLAGS get_cpu_flags() {
+     CPU_FLAGS flags = 0;
+ 
+@@ -105,6 +107,7 @@ CPU_FLAGS get_cpu_flags_to_use() {
+ #endif
+     return flags;
+ }
++#endif /*ARCH_X86_64*/
+ 
+ #ifdef ARCH_X86_64
+ #ifndef NON_AVX512_SUPPORT
+diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.h b/Source/Lib/Common/Codec/common_dsp_rtcd.h
+index b76882b003..f67243f3d4 100644
+--- a/Source/Lib/Common/Codec/common_dsp_rtcd.h
++++ b/Source/Lib/Common/Codec/common_dsp_rtcd.h
+@@ -67,8 +67,10 @@ extern "C" {
+ #endif
+ 
+     // Helper Functions
++#ifdef ARCH_X86_64
+     CPU_FLAGS get_cpu_flags();
+     CPU_FLAGS get_cpu_flags_to_use();
++#endif
+     void setup_common_rtcd_internal(CPU_FLAGS flags);
+     void svt_aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h);
+     RTCD_EXTERN void(*svt_aom_blend_a64_vmask)(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h);
+diff --git a/Source/Lib/Decoder/CMakeLists.txt b/Source/Lib/Decoder/CMakeLists.txt
+index c8ffc57657..c71c4da0b8 100644
+--- a/Source/Lib/Decoder/CMakeLists.txt
++++ b/Source/Lib/Decoder/CMakeLists.txt
+@@ -99,7 +99,9 @@ set_target_properties(SvtAv1Dec PROPERTI
+ set_target_properties(SvtAv1Dec PROPERTIES SOVERSION ${DEC_VERSION_MAJOR})
+ add_dependencies(SvtAv1Dec EbVersionHeaderGen)
+ target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS})
+-target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public)
++if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
++    target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public)
++endif()
+ install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+ configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY)
+diff --git a/Source/Lib/Encoder/CMakeLists.txt b/Source/Lib/Encoder/CMakeLists.txt
+index 936592e1ce..ab310dcef1 100644
+--- a/Source/Lib/Encoder/CMakeLists.txt
++++ b/Source/Lib/Encoder/CMakeLists.txt
+@@ -130,7 +130,9 @@ endif()
+ set_target_properties(SvtAv1Enc PROPERTIES VERSION ${ENC_VERSION})
+ set_target_properties(SvtAv1Enc PROPERTIES SOVERSION ${ENC_VERSION_MAJOR})
+ target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS})
+-target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public)
++if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
++    target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public)
++endif()
+ install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+ configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY)
+diff --git a/Source/Lib/Encoder/Codec/firstpass.c b/Source/Lib/Encoder/Codec/firstpass.c
+index feb7a1fae7..80b7dd05d8 100644
+--- a/Source/Lib/Encoder/Codec/firstpass.c
++++ b/Source/Lib/Encoder/Codec/firstpass.c
+@@ -1189,8 +1189,8 @@ static void first_pass_setup_me_context(MotionEstimationContext_t *context_ptr,
+     // set search method
+     context_ptr->me_context_ptr->hme_search_method = SUB_SAD_SEARCH;
+ 
+-    uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]);
+ #ifdef ARCH_X86_64
++    uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]);
+     //_MM_HINT_T0     //_MM_HINT_T1    //_MM_HINT_T2    //_MM_HINT_NTA
+     uint32_t i;
+     for (i = 0; i < sb_height; i++) {
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index 340c2c175bce..d7d8df53a362 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="~amd64 ~arm ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
@@ -21,6 +21,8 @@ fi
 LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch )
+
 src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 	local mycmakeargs=(
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index c2d6639bcec2..1bd665ae1fb2 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 cc094cd736e6..5f738e5f8bbc 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/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
index 1d4633ac6531..545133b801ed 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/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index c58681869a18..edb3cb74cf64 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
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-27 18:53:03 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-27 18:53:03 +0000
commit	3482ddf943eff7b8848f1fb31350b99ce349e86a (patch)
tree	9c9bb6ec6679e9dc44a84d87ba611989409b12ca /media-libs
parent	8e8120eabdd28020aa69c7a60505cce2edd20adc (diff)
download	baldeagleos-repo-21.1.3.tar.gz baldeagleos-repo-21.1.3.tar.xz baldeagleos-repo-21.1.3.zip