gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /media-libs
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
129 files changed, 2848 insertions, 1062 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e9888c17b229..7679719b1d66 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index a970b54601e3..2ffad0ac7870 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,16 +1,10 @@
-AUX allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch 701 BLAKE2B 76b9a2aaca022bbdc143b25adf4d5ad5bc62a52d72222bff3b9fd7b115f62482e98d69919a73324265b3f4a4aa548eb39fe613576166d51ba676d47ed9bdd948 SHA512 d3cbf252917a3dea316475fb8add5f966d6317a8563ac4e15324bcc34585c71c0dd71287507d8ee1f62b223054f009d28eece16656954597a9d35a1406f68dfd
-AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
-AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49bd650fe065b2ccc4f9ee70a191b8fc22f3fe2501b54ac8fb2dbdb4630958f68585895c4f813a67495690a8d830d4879 SHA512 8783c04c765c3f28afd0b94603056e4a28a968f329f8814f60b074327dbd0f22e0e124df17223f04f840fdbdb5db7c9b868ccb90062902699df44b59c3b91060
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
-AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
 AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
-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
-EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
 EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
 EBUILD allegro-5.2.6.0.ebuild 2948 BLAKE2B 6a09a2460d6d002dc2760e1d9651ec610eb0b1cd3ff8de0dc4c0713fe86824f28ac1798e4b814352425468f9627a60292ff1cb76f8a3fa4ae835be7678910cf8 SHA512 1b17d768dc4797f36ff940d6e9f9f22b2a0ff5c716700fc903b2779f7e779a82cd13ae3e4ff4a1f46b5f55bb6cd88271f0d69a7fbf521c67cae7217bfc21281d
-MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
+MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae
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 1a6f9338ec6e..8c4daf206b01 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>
 </pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index f92549bab1ef..35d21eb0e10a 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,5 @@
+AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
+EBUILD flac-1.3.3-r1.ebuild 1644 BLAKE2B 511e2666915aba97d5cf0d23729bb4cd081325f2b5939fa8428e633d4aaef60d736968c0600749428c0cb41948f0866b0fb1779c39dce188d38d438aaf159785 SHA512 9621ba9081de2673dcafb26d6d84aa38e36cce5c3aee314ad658e8cab87851b2a05d57494d8dfe2ea70b706a11b4295dd9b7c1bd861da55a69b2eaf9a0c54a31
 EBUILD flac-1.3.3.ebuild 1573 BLAKE2B f7be916b09a5c039a7476293f6249e5001a88f7ec28a20eb0924bb84f879dbe77ba30435709a4e5b9933a2e0c6ce0bff6f02d9bf406c9d9473957f2afcbdcc46 SHA512 cac94617c638560ff703dde9f1998de293df1d3ed3d81d46ab9f1929f3330f9dfc2bfea36eb7b78df58cbe753358b9ad9d91d9daf1a325497f48d398a0cd37c7
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
new file mode 100644
index 000000000000..bcad809374e3
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
@@ -0,0 +1,13 @@
+diff --git a/src/flac/decode.c b/src/flac/decode.c
+index c26d3f60..bd3f6524 100644
+--- a/src/flac/decode.c
++++ b/src/flac/decode.c
+@@ -1307,7 +1307,7 @@ void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMet
+ 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ 		FLAC__uint64 skip, until;
+ 		decoder_session->got_stream_info = true;
+-		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
++		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) != 0;
+ 		decoder_session->bps = metadata->data.stream_info.bits_per_sample;
+ 		decoder_session->channels = metadata->data.stream_info.channels;
+ 		decoder_session->sample_rate = metadata->data.stream_info.sample_rate;
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..fc6ee1ef776f
--- /dev/null
+++ b/media-libs/flac/flac-1.3.3-r1.ebuild
@@ -0,0 +1,61 @@
+# 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 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
+
+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/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index db2b9352651a..c5af9f57d07f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,15 +1,11 @@
 AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961
 AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6
-AUX fontconfig-2.13.0-add-missing-lintl.patch 1119 BLAKE2B 7b6b8deeb5b06ed3016add4e9e04c65ec7d8ef43223783950ea911c3544ec084c8ae78739be5eb79f4bcd91b91bdc943726d2d3d6dab46cabec69e2ce2b8338f SHA512 439470687be12c6cf3f9da21a5b0d1fac6c685296f740247aaf6cf1c1e22bf567ab2348408ed9fabe0c6f7b738e54b9813e562e9d762c861b61f70ee569ad754
-AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d530b874051c7cfe8abde7f504c643a8b52bdaf265d39205d9c9fd5375f464ddaed858c9b599e633d04b92f94873bf65f SHA512 845b2db1783840070a27de2f28ce8f9cc6968b5e07c89c91110248261e9977bf15edc886b5ed9badb2fa14efc1868c82c4ab0ee45aec8a0cfbc74b5ae459c939
-AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
 AUX fontconfig-2.13.1-proper_homedir.patch 8048 BLAKE2B 8735be09139f13f41eeccd6ec9b34ad5086ec6716053570b1368a0c8068bff6431e15d5c3ca0a0341958aa8801ceba422ceec012adeca7f0fe71e4bd1f9a5970 SHA512 ecd77822f9ee6ff2529cb3401c5f4e8cf105583f51b040ab160b8ee99c62762a9eb04f836a15b1f6186423c8180238d0379d55442088d2bab03d8abe817e6e22
 AUX fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch 1005 BLAKE2B 48d1ad733b7543a17f4917c81a7ca2df402f6fbc851d97edbb0d6e58d28446b532a9804db0af45eaf3b294158ad5377ed2dee95b2f66fe63b44312c39def5262 SHA512 b583cd21d11add33bc94ff624ba96ab8fe585beac2fa285b7b207bfdf199debe2496d8cf12ec406d84fcb46eaba4c9c5afd768002e2b35e0d569fc82d894947b
 AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98fe4fed432afecfa2ee97c2a53f297cd7f674ca162aa01dcdadcc648c9cfb4cb8bd3f91714f1808322dd65c70308550c3a8e1b6c SHA512 c5a1a80cc99850d1ab197079ec629032310913d7756d86defcae5c721f3a50078c4059347b21cdc409b0de0d45c1466f038a9b5280bd7f772a966b43cbb3fe6e
-DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
+AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-EBUILD fontconfig-2.12.6.ebuild 4856 BLAKE2B 89422216e7ea3511433a9b804179139c1b32231ed78b73defb97e8d1a572a5076e78a8f59ceedd4698240172b4e95843d4a936a3ee52eb7b3a9c66b57a9f4dff SHA512 f743068c2b7d6e8582dc3f8005cf5dc7020e5e5da4e931ea6104f5bd3eec9f0adb99e802c95f390e40ea59adfa122aada183ae609d24d86ad5c121b8db5898a9
-EBUILD fontconfig-2.13.0-r4.ebuild 5155 BLAKE2B de35bc5b131b063d983eee820a87abcdc6d91b97e9ff09cd04aab5d856093df2a3bdd7f5f695eb1fa1368c1a1850539a1679ac3dad5ad1c76de5131273c465a4 SHA512 4757d8979ee3f2fb71510ec1168a1c31e11aa5bb8c2d70847e5e6190bcebcafde484e2d7dc0f3eb4621e25d042e83fa5a80a03aadd9a34b7b42a35102b9360e7
+DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 EBUILD fontconfig-2.13.1-r2.ebuild 5606 BLAKE2B e56b1cff96e38c2495bbc041ba7f4a5debff6476ff2df3460ab19353876df21fa0be1af2b0dc4258e5b0c796c002ebb7b5be3dbee7b4047a062695872a39f5f3 SHA512 f45676cbe2ffb35839513cf85a76c5d9c7ead789fe4fa0be07ad1c1dc701f79caded154ce128a7da0a0a04e73e0ce8bd5665f305e935a6121d69bee1cff2247e
+EBUILD fontconfig-2.13.93.ebuild 5832 BLAKE2B 277d6ebe2e2481cacf7e3b4a513899b4bdd65aec0f2db1353c169eb3e46060fc4d6f3493ca36c642b68693ade6aac0d107e15b4f044e72941ae957a78e00bc51 SHA512 4d09dc19f73128bfdd66bf14ff643f78c4c2d777cc526c2817dbc1905cea66194ad5465603794061e1a0c11f98933b14da0274b1c78d0c12523753f096280344
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
deleted file mode 100644
index 6bea02b1fca8..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Fri, 9 Mar 2018 11:55:43 +0900
-Subject: Fix the build issue again on MinGW with enabling nls
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1ff065b..2111ce0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -82,7 +82,7 @@ AM_CPPFLAGS = 						\
- 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
- 	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
- 	-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
--LDADD  = $(INTLLIBS)
-+LDADD  = $(LIBINTL)
- 
- EXTRA_DIST += makealias
- 
-@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
- libfontconfig_la_LDFLAGS =			\
- 	-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
- 
--libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
-+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
- 
- libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
- 
--- 
-cgit v1.1
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
deleted file mode 100644
index 002e493a409e..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://bugs.gentoo.org/650332
-Do not set locale in the library.
-Patch from upstream.
-
---- a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -41,6 +41,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <string.h>
-+#include <locale.h>
- 
- #if defined (_WIN32)
- #define STRICT
-@@ -302,6 +303,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
- #else
---- a/fc-cat/fc-cat.c
-+++ b/fc-cat/fc-cat.c
-@@ -40,6 +40,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -271,6 +272,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
- #else
---- a/fc-conflist/fc-conflist.c
-+++ b/fc-conflist/fc-conflist.c
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -102,6 +103,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1)
- #else
---- a/fc-list/fc-list.c
-+++ b/fc-list/fc-list.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #else
-@@ -117,6 +118,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int			c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1)
- #else
---- a/fc-match/fc-match.c
-+++ b/fc-match/fc-match.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -121,6 +122,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int			c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-pattern/fc-pattern.c
-+++ b/fc-pattern/fc-pattern.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -111,6 +112,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-query/fc-query.c
-+++ b/fc-query/fc-query.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -115,6 +116,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-scan/fc-scan.c
-+++ b/fc-scan/fc-scan.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -110,6 +111,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1)
- #else
---- a/src/fccfg.c
-+++ b/src/fccfg.c
-@@ -26,7 +26,6 @@
- 
- #include "fcint.h"
- #include <dirent.h>
--#include <locale.h>
- #include <sys/types.h>
- 
- #if defined (_WIN32) && !defined (R_OK)
-@@ -39,18 +38,6 @@
- FcConfigEnsure (void)
- {
-     FcConfig	*config;
--    FcBool	is_locale_initialized;
--    static void *static_is_locale_initialized;
--retry_locale:
--    is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized);
--    if (!is_locale_initialized)
--    {
--	is_locale_initialized = FcTrue;
--	if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
--				    (void *)(intptr_t) is_locale_initialized))
--	    goto retry_locale;
--	setlocale (LC_ALL, "");
--    }
- retry_config:
-     config = fc_atomic_ptr_get (&_fcConfig);
-     if (!config)
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
deleted file mode 100644
index dddc8bb95726..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/650370
-
-From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 12 Mar 2018 11:49:58 +0900
-Subject: [PATCH 1/2] Allow the constant names in the range
-
-https://bugs.freedesktop.org/show_bug.cgi?id=105415
----
- src/fcname.c | 34 +++++++++++++++++++++++++++++-----
- 1 file changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/src/fcname.c b/src/fcname.c
-index 79e413e..15fb659 100644
---- a/src/fcname.c
-+++ b/src/fcname.c
-@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string)
-     case FcTypeRange:
- 	if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2)
- 	{
--	    v.u.d = strtod ((char *) string, &p);
--	    if (p != NULL && p[0] != 0)
-+	    char *sc, *ec;
-+	    size_t len = strlen ((const char *) string);
-+	    int si, ei;
-+
-+	    sc = malloc (len);
-+	    ec = malloc (len);
-+	    if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
- 	    {
--		v.type = FcTypeVoid;
--		break;
-+		if (FcNameConstant ((const FcChar8 *) sc, &si) &&
-+		    FcNameConstant ((const FcChar8 *) ec, &ei))
-+		    v.u.r =  FcRangeCreateDouble (si, ei);
-+		else
-+		    goto bail1;
-+	    }
-+	    else
-+	    {
-+	    bail1:
-+		v.type = FcTypeDouble;
-+		if (FcNameConstant (string, &si))
-+		{
-+		    v.u.d = (double) si;
-+		} else {
-+		    v.u.d = strtod ((char *) string, &p);
-+		    if (p != NULL && p[0] != 0)
-+			v.type = FcTypeVoid;
-+		}
- 	    }
--	    v.type = FcTypeDouble;
-+	    if (sc)
-+		free (sc);
-+	    if (ec)
-+		free (ec);
- 	}
- 	else
- 	    v.u.r = FcRangeCreateDouble (b, e);
--- 
-2.16.2
-
-From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Wed, 14 Mar 2018 18:31:30 +0900
-Subject: [PATCH 2/2] Add the value of the constant name to the implicit object
- in the pattern
-
-For objects which has been changed the object type to FcTypeRange.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=105415
----
- src/fcname.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/fcname.c b/src/fcname.c
-index 15fb659..c9320ae 100644
---- a/src/fcname.c
-+++ b/src/fcname.c
-@@ -490,6 +490,10 @@ FcNameParse (const FcChar8 *name)
- 			if (!FcPatternAddBool (pat, c->object, c->value))
- 			    goto bail2;
- 			break;
-+		    case FcTypeRange:
-+			if (!FcPatternAddInteger (pat, c->object, c->value))
-+			    goto bail2;
-+			break;
- 		    default:
- 			break;
- 		    }
--- 
-2.16.2
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
new file mode 100644
index 000000000000..910f0c7ef565
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
@@ -0,0 +1,62 @@
+--- fontconfig-2.13.93/conf.d/60-latin.conf
++++ fontconfig-2.13.93/conf.d/60-latin.conf
+@@ -5,44 +5,47 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
++			<family>Liberation Serif</family>
+ 			<family>DejaVu Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+ 			<family>Nimbus Roman No9 L</family>
+ 			<family>Nimbus Roman</family>
+ 			<family>Times</family>
++			<family>Thorndale AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
++			<family>Liberation Sans</family>
+ 			<family>DejaVu Sans</family>
+-			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+ 			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Nimbus Sans</family>
+ 			<family>Helvetica</family>
+ 			<family>Lucida Sans Unicode</family>
+ 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
++			<family>Verdana</family>
+ 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
++			<family>Albany AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Liberation Mono</family>
+ 			<family>DejaVu Sans Mono</family>
+ 			<family>Inconsolata</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+-			<family>Cumberland AMT</family>
+ 			<family>Luxi Mono</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Nimbus Mono</family>
+ 			<family>Nimbus Mono PS</family>
+ 			<family>Courier</family>
++			<family>Cumberland AMT</family>
+ 		</prefer>
+ 	</alias>
+ <!--
+@@ -63,6 +66,7 @@
+ 	<alias>
+ 		<family>cursive</family>
+ 		<prefer>
++			<family>Comic Neue</family>
+ 			<family>ITC Zapf Chancery Std</family>
+ 			<family>Zapfino</family>
+ 			<family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
deleted file mode 100644
index afb9dc10bb9a..000000000000
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ ${ROOT} = / ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 338f391d2aed..329ec7d1678e 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -1,41 +1,54 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
+inherit autotools multilib-minimal readme.gentoo-r1
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="https://fontconfig.org/"
-SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
+# Test test-bz106632 is known to be broken, see bug #751232
+# and would require several backports. It will be fixed in
+# next version.
+# check-missing-doc is known to be broken, see bug #733608
+# because fontconfig-2.13.1-static_build.patch introduces a
+# function FcStrBuildFilename which is lacking documentation.
+# However, backporting isn't worth it. Will be fixed in
+# next version.
+RESTRICT="test"
+
+BDEPEND="dev-util/gperf
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
 	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
 	virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
+DEPEND="${RDEPEND}"
 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
 	virtual/ttf-fonts"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-	"${FILESDIR}"/${P}-locale.patch #650332
-	"${FILESDIR}"/${P}-names.patch #650370
-	"${FILESDIR}"/${P}-add-missing-lintl.patch #652674
+	"${FILESDIR}"/${PN}-2.13.93-latin-update.patch # 130466 + make liberation default
+
+	# Patches from upstream (can usually be removed with next version bump)
 )
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
@@ -44,16 +57,23 @@ pkg_setup() {
 	DOC_CONTENTS="Please make fontconfig configuration changes using
 	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
 	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge fontconfig."
+	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
 }
 
 src_prepare() {
 	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
 	eautoreconf
-	rm test/out.expected || die #662048
+
+	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272
+	# Please remove on next version bump!
+	if [[ "${PV}" == 2.13.93 ]] ; then
+		local sgmlfile
+		for sgmlfile in doc/*.fncs ; do
+			touch -r ${sgmlfile} ${sgmlfile//.fncs/.sgml} || die
+		done
+	else
+		die "Forgot to clean up src_prepare()"
+	fi
 }
 
 multilib_src_configure() {
@@ -86,8 +106,7 @@ multilib_src_configure() {
 		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
 	)
 
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
@@ -114,21 +133,26 @@ multilib_src_install_all() {
 
 	dodoc doc/fontconfig-user.{txt,pdf}
 
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
+	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
+		mv "${ED}"/usr/share/doc/fontconfig/* \
+			"${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"/usr/share/doc/fontconfig || die
 	fi
 
 	# Changes should be made to /etc/fonts/local.conf, and as we had
 	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
+		> "${T}"/37fontconfig || die
 	doenvd "${T}"/37fontconfig
 
 	# As of fontconfig 2.7, everything sticks their noses in here.
 	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
+		> "${ED}"/etc/sandbox.d/37fontconfig || die
 
 	readme.gentoo_create_doc
+
+	keepdir /var/cache/${PN}
 }
 
 pkg_preinst() {
@@ -136,15 +160,17 @@ pkg_preinst() {
 	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
 	# config files.  If we install as-is, we'll blow away user settings.
 	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+		local file f
+		for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
 			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" \
+						"${ED}"/etc/fonts/conf.d/ &>/dev/null
 			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
 			fi
 		done
 	fi
@@ -152,12 +178,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
 
 	readme.gentoo_print_elog
 
-	if [[ ${ROOT} = / ]]; then
+	if [[ ${ROOT} == "" ]] ; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
 			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 22b754f90376..be631a4be50d 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -9,5 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r1.ebuild 3052 BLAKE2B a013e1053090f810136410e9bcadbe09d5610cf6896160fc4cbe00223adf0e386c8f294c70848f4c7da4194e8ffa5c766393bd8bb76a956cfe9aa3f5997ad96a SHA512 3b587b0c14a81c752f7c5f669aaf2f32ac077a72e98a957b3bce7458ddb6ad5d4fc3ae189224bddae1739e9cd103b0c1bbeafd01d6ec2b22564fdc77509e747e
-EBUILD freeimage-3.18.0-r2.ebuild 3166 BLAKE2B a2a37f66d3e57fcf0c62bfff9a8f35ba3f98140a0f59faf00a951608921a5cd49ec4056f154ee0a4c8d009c328eff43557b38499b3987dd79abefecc33f44491 SHA512 40bfdcd3257cab417ab798664e4048051fca196ce99dd2b858bca82b5a48b4436cdd3ae43db8f446b5cdd8dfdc7df5d90e1f8fbc1a1e22519f1c745ba9304650
+EBUILD freeimage-3.18.0-r2.ebuild 3165 BLAKE2B f8e4ee3616194ae6b71e2b3fe86bc62997b739256b2ecccd391b05310fbb74cb1b1d1235965e755bc5e35a3e6179d3b597484a526db588aafa99d715ea39ebaf SHA512 ca3f049f9a2341187f6cff0fbd9c556aa2cc6db54e4ce9055aca744df0fd63c7bc6abe9bc0dc3559bb804387c1284a174bd94ef7dcdf19270c84758f9fb3f2bd
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index e833f947fde1..d15d09ce9bc8 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index a14af47ee68d..e42eba91a2b0 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -2,6 +2,6 @@ AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6753 BLAKE2B 7685748055452421efb82759b4f1649a3f9fdecbc113f930394f03479014b0ed25a1ad8410384aa0181bf2992005aac8fa2122e1cf7d34f42419eddc6d19c0b4 SHA512 192bfc5f7b42cf248a61caec949d862f4f8fde1192e246d9157cb2e76208e2b7a046ca4d8d42890454c54c779dd4e3cec45e2b33a06076656fcc2d0962817ae7
-EBUILD freetype-9999.ebuild 7147 BLAKE2B aacccaff4a628fbf5dd4fcd0c8b3946ffdc02a8e63c8363ae47add5301e0bf9b388d8a6218b071493fc36c4e12ff42b31a01ef488481c6d7b208b73ba71296c9 SHA512 2865efcb32a9b5671f4d3381900a1a385f60b209c53f6ffb2f0a11c197cc3d5c5360f935a5fe5e0f70734145c1be387d4d96d905f4f8646251007f16578b167d
+EBUILD freetype-2.10.4.ebuild 6745 BLAKE2B 6fdfc887e407dd5848a8d7989808862cdb8723354d3716761ce1b106606d125cc7320f613f8cab38d408a32eac30af923638b922ecf8cda8beda307422773048 SHA512 29c8171c1729f59064c61eeeda66d0413b46e9d225a657ab038c2344ae49892bd742d6576bb27b9d4107ba50c058bd9c8a9d2aa66923ed3f32f50d9f8f8e5135
+EBUILD freetype-9999.ebuild 7139 BLAKE2B c765a0fac9000c3ce9d90ee41c825c494b065055cba425580cbdfcb7804383a905215eebd113b09bdf4bef91dc6b90b2c83cdd62c78907bab1a97c256d268dfc SHA512 79c30e21004e1f0cc0ec079eea6c98467c5e0726f629659c1fd81cb75c05d32f1f94ea9016f084c8c64e4920a03ee7477270b87d7a5360bed6c27d3fc5d3336a
 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 9f1e9603ff4a..6ede5206ae84 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -90,8 +90,7 @@ src_prepare() {
 		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
 			< configure.raw > configure.ac || die
 		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
 		unset freetype_major freetype_minor freetype_patch
 		popd &>/dev/null || die
 	fi
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index a124165276f5..10ef7635e9df 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -85,7 +85,7 @@ src_unpack() {
 		# Need to copy stuff from dlg submodule (#758902)
 		local dlg_inc_dir="${S}/submodules/dlg/include/dlg"
 		local dlg_src_dir="${S}/submodules/dlg/src/dlg"
-		local dlg_dest_dir="${S}/src/dlg"
+		local dlg_dest_dir="${S}/include"
 		mkdir -p "${dlg_dest_dir}/dlg" || die
 		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
 		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
@@ -100,8 +100,7 @@ src_prepare() {
 		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
 			< configure.raw > configure.ac || die
 		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
 		unset freetype_major freetype_minor freetype_patch
 		popd &>/dev/null || die
 	fi
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index 2777cfb6955b..5dab1606df4e 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,3 +1,5 @@
 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
+DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
 EBUILD ganv-1.6.0-r1.ebuild 989 BLAKE2B 220776bd6eb12032155ce483ede6fa5c9c781a01d72bce681af492683a7e8b0065dc76a9f889dd78f5219cd93b35f2dc22cdeec316b086a6860c959d5b0fef1f SHA512 2e32a7f133e96a0e6f6ab28db8fef64505a2bdac81f31d68d62c11b4cfc46608256db7c84e1de1aaa027f024e86a0b7b7499072855b9ead722b35fe042ef199d
+EBUILD ganv-1.8.0.ebuild 991 BLAKE2B 7816da3720c870a86fdeedf59df26218c97af5666cd5242a8743b5ebfe3e4bd158dbbd119f791e27d2b2773d23d8cf52278fb7a03e0b8f6cd542d196f932d808 SHA512 57d98f6bd91228968628562352066324309cc6210c980967b22e29f4b42320da3c866805e744f91099131199a81d2003126d57d2911a1f5d7ca9c7af366089a8
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
new file mode 100644
index 000000000000..eaeb8d96462a
--- /dev/null
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils flag-o-matic waf-utils python-any-r1
+
+DESCRIPTION="A GTK+ widget for interactive graph-like environments"
+HOMEPAGE="http://drobilla.net/software/ganv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fdgl +graphviz introspection nls"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	x11-libs/gtk+:2
+	graphviz? ( media-gfx/graphviz[gtk] )
+	introspection? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection:=[doctool] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	nls? ( virtual/libintl )
+"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	waf-utils_src_configure \
+		$(use graphviz || echo "--no-graphviz") \
+		$(use fdgl || echo "--no-fdgl") \
+		$(use nls || echo "--no-nls") \
+		$(use introspection && echo "--gir")
+}
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index ebf46f3ff750..3b62ebe78cef 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,5 @@
 AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-5.2.1-r1.ebuild 1899 BLAKE2B 67a8f88148435a590512a9a9b02cb8111b32e9a537ef868f2d67fe28fc027b13449655b931a7ede2d814f42e947a992ffeafdd403692a228948ac4bc81ad18ae SHA512 df9c49dc327f09bbe5f0d15fb19ce3e19ee566cc0b2dbd23d2e0fd4dbd9162bc82d298f5982ec0aa9046d1aec0214e3ab40bb39ab9e72c82c25f66312d4f9cfc
+EBUILD giflib-5.2.1-r1.ebuild 1877 BLAKE2B 474ceab5ed2fb23b04eee2cd993a6cb7db178426e89740362bbf418479c155a0bcdf2c712a226f9e5cbe4dd7acc653d97ea609ca552fa2b4574340cc8d4087b9 SHA512 4cbfdf5f939135c77c22fec1ea42bb3b8ad8b2d1c83e366f99e6b065d2df508e0bf672816432924e45ec72e857f45536b92f25eb38291e25ec6ac0a8d7914b84
 MISC metadata.xml 248 BLAKE2B 46adedd4004568ddad75971a42a14a53916a118e2df96eec2eb420a1c55009c152f5d41510e7b3030825d81d476c3db981847f12aedafa2c0b556b549666c389 SHA512 3e9d14a9f2c2e9bf88543fb580abb09dfc35c8065b8f77579bbbae2330fa105ca808f35c8542f4db4b0dc0ac4026bc26adb9f2f45ac52755b822e0b98c751532
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index 31a7c84cf5ff..a64dbd61c8f1 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 4c32882ecf05..2c35e6e00035 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,12 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
+AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
 DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73a97c7bc3b5730b6c270daa3eac753287cd83334085c90ce081ff4a8a4d1f79b46e832059b08c36602c5c39f3b3a1af5 SHA512 ebd23658aec78ebdf7cd13577f5ca408e2995c4df6135c951d3bea4a59a84461690d71f6e7ebc2014daa5508e07d32ff20c25019d90255150e7c93e241d403fc
 DIST intel-gmmlib-20.2.5.tar.gz 728792 BLAKE2B c78cebcfad9f314e3ee298deaa78586cb5c1c8e2e5bba9051a8b17c26001b72aaa675443fcdc9757031977c548a0360e2511bd29873fc7302922b33a2c1a0324 SHA512 354363b0944e4f0e08065fa7a0cb85d477f522858a55f4998a2374ef8e115e331961cc269db886dac3b1e5825d11e036ebc0b4ab65b1618653810e4bfc4751ec
 DIST intel-gmmlib-20.3.2.tar.gz 729059 BLAKE2B 3cc07d9dc07fecd483c35bde41802c8a433a751310fe4d0273625f3a6e245a2dd6e5546b4e5bed40b04b22c4e00a648cce66b221c25da8c6f3f3637a890508bd SHA512 1d8ea369b5b22ca747f8bdaee0be24584b79ccdecaad6c85e5f0a41ac171459261c8c5b220797ffc525e7e29cfa1664f9eaca07f5e72d4a260f327d8980fb2dd
+DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068d6217e025b33e719c6fdc24aa4e5f97fe64b290f2d4461bb701eb8c14e747c8eac0b62f226f044f9a7c71de0455dfbd SHA512 a4f6fb8cd3ae2dc837586d6b51495bcceda5d4a9ecaa59fa730d3240a0da359b4449cd9aec96905f7c572f6425cdc19bb419681d99269ca8541542d7abf03c96
 EBUILD gmmlib-20.2.2.ebuild 888 BLAKE2B bb3f30b545eabfe214fa659f887c082f1fa45fd1bbbd823ad7a98ee9a24ff78d121a0dcc59ea0ce18e343c2a666fa5a1b6d948dd41b118c2f5bb6711b9c65828 SHA512 04b82961035d0297f4f2323f63e48c09d03b1d354f452cc1c626b5f91e6d81300af3109fe2bef55168a440d98ab29bc544591d22a1b1149fa470f27db54122da
 EBUILD gmmlib-20.2.5.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
 EBUILD gmmlib-20.3.2.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
-EBUILD gmmlib-9999.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
-MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
+EBUILD gmmlib-20.4.1.ebuild 1021 BLAKE2B 94334db99ac85f71ffe275c078d859c01ec57976e1f9beeaec20f729800502dff88dbb36595358134e3fe0dd47d36ec05ede742bcb8cf96486a26ac8b511d40e SHA512 52721f3e6bf12c6c7cb5ba62ac689cddaf942ac90ecddb2d991ef0957cf491ec90ca55cdae61b4928dfa6a3c584c377a09e8fadb9fa59d0ba2ba487e3cfc81d0
+EBUILD gmmlib-9999.ebuild 1021 BLAKE2B 94334db99ac85f71ffe275c078d859c01ec57976e1f9beeaec20f729800502dff88dbb36595358134e3fe0dd47d36ec05ede742bcb8cf96486a26ac8b511d40e SHA512 52721f3e6bf12c6c7cb5ba62ac689cddaf942ac90ecddb2d991ef0957cf491ec90ca55cdae61b4928dfa6a3c584c377a09e8fadb9fa59d0ba2ba487e3cfc81d0
+MISC metadata.xml 490 BLAKE2B 306c3fddcc4a5569f5bd040f7cfb545b78a052d6786b54fa0751cf980b753d9097b09b2a03c0c9d11be40c0dab7dde2a92d1c1bbeb3775e1e77dec847230a93d SHA512 30cbe0310e14e2ebd354ece2d7b710db50ee9cbb7d697370f5bda57b2b823f9d93a6e3c07844c3f8d90b91fabf9236ac450c9fbaa5aca5438ef0d4d5feaaac0b
diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
new file mode 100644
index 000000000000..befd33f83bb6
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
@@ -0,0 +1,98 @@
+Prevent overriding of user-define CFLAGS, including -march flag.
+The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code.
+Note: code should detect CPU features at runtime and use sse4.1 paths only if supported by CPU.
+
+--- a/Source/GmmLib/CMakeLists.txt
++++ b/Source/GmmLib/CMakeLists.txt
+@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM)
+     endif()
+ endif()
+ 
++if(NOT DEFINED OVERRIDE_COMPILER_FLAGS)
++    option(OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
++endif()
++
+ # begin -- label bldsys file prologue
+ # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE
+ #   and so must precede the inclusion below of bs_init.cmake .
+--- a/Source/GmmLib/Linux.cmake
++++ b/Source/GmmLib/Linux.cmake
+@@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+     -Werror=format-security
+     -Werror=non-virtual-dtor
+     -Werror=return-type
++    )
+ 
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # General optimization options
+     -march=${GMMLIB_MARCH}
+     -mpopcnt
+@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+     -msse3
+     -mssse3
+     -msse4
+-    -msse4.1
+     -msse4.2
++    )
++endif()
++
++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
++    -msse4.1 # SSE4.1 compiler support is required to build
+     -mfpmath=sse
+     -finline-functions
+     -fno-short-enums
+     -Wa,--noexecstack
+     -fno-strict-aliasing
++    )
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # Common defines
+     -DUSE_MMX
+     -DUSE_SSE
+     -DUSE_SSE2
+     -DUSE_SSE3
+     -DUSE_SSSE3
++    )
++endif()
++
++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # Other common flags
+     -fstack-protector
+     -fdata-sections
+@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+     -fmessage-length=0
+     -fvisibility=hidden
+     -fPIC
++    )
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     -g
+     # -m32 or -m64
+     -m${GMMLIB_ARCH}
+     )
++endif()
+ 
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ #Gcc only flags
+@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL  ${GMMLIB_COMPILER_FLAGS_RELEASE})
+ 
+ #set predefined compiler flags set
+ add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+ add_compile_options("$<$<CONFIG:Debug>:${GMMLIB_COMPILER_FLAGS_DEBUG}>")
+ add_compile_options("$<$<CONFIG:Release>:${GMMLIB_COMPILER_FLAGS_RELEASE}>")
+ add_compile_options("$<$<CONFIG:ReleaseInternal>:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>")
+ #cmake 3.3+, add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>")
++endif()
+ foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON})
+     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ endforeach()
+ 
++if (OVERRIDE_COMPILER_FLAGS)
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}")
++endif()
+
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
new file mode 100644
index 000000000000..09b5bcec53f0
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -0,0 +1,49 @@
+# 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
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +custom-cflags"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TYPE=Release
+		-DBUILD_TESTING=$(usex test)
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 814f7e0d4a70..09b5bcec53f0 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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
@@ -27,16 +28,22 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
+IUSE="test +custom-cflags"
+
+RESTRICT="!test? ( test )"
 
-DEPEND=""
 RDEPEND="${DEPEND}"
 
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+)
 
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TYPE=Release
+		-DBUILD_TESTING=$(usex test)
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
 	cmake_src_configure
 }
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index 80088c21d0ab..61c45b70c770 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>k2k@narod.ru</email>
+    <name>Evgeny Grin</name>
+  </maintainer>
+  <use>
+    <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index 228252384772..f845b6602fc2 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 847 BLAKE2B b42bd8e7bc1b249ab0c8258ad58eadaf33c682712185dc8d86ea1952185992359e17d7ad404ee6b7cb794dabf37ca5d54b7cfb4623c42838ff192a86a3d46bae SHA512 c99775df1319f0b8851150f6243fa0d8dfa65de27ca352d301be70892adb4d938b4742c80c5330862a4f5c12684d39dda1161a2ee72181b6ddd130e633c22a41
+EBUILD gsound-1.0.2-r1.ebuild 858 BLAKE2B 6de21d34dd116ee34db8855f34fa21f3429a5e21dc0fc5a79f05e9cb8887d9d91e2e9e6b50ba8c0977a05f05870b0fd58390f72cd19562c7bf9b9630c25b4a13 SHA512 c92d35a6a48b94ef22c9f63cb354628d957ad59b47f3f3ba9ebddb265d8a4ec21e8200ed9ac6b9ecadc979fd29ea7e56a43548228c94c2d50ae7a53c4d316ab6
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index 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/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index d4c3da6f006b..f3f2361d20cf 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,6 +2,6 @@ AUX gst-plugins-bad-1.14.5-make43.patch 7736 BLAKE2B b0b1b85e7bce7b267c382bd853b
 AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
-EBUILD gst-plugins-bad-1.14.5.ebuild 2705 BLAKE2B 7f6071a63b6b0d33e255f2982731f3693fba2a663bd19079e40c1a913a1fc2aefe0a476fe7b9603c85d64c6edf13fdd1952bfd188acb045b3dbbf12b4a1e724e SHA512 801628a4d531b1495e7c8b595c4e053fec91d31a56417cd6e37612bd28de07bdabecae53e9a54f5232b6f401a7608d64762b472640ff120fa3d9e5808bacd51d
-EBUILD gst-plugins-bad-1.16.2.ebuild 2327 BLAKE2B 96d7a53e10665c7ba40c9611acff659959c1b13408a2618a66ded9fb93b7c8c0fa8e6e4fe88c43613557260bb8a6532d00a68397ba3139ef5df7606382e2154d SHA512 59e95dda7ad39e3e60fa2c2dbeb560d0df34b47f81dc3119cf817bc8224672d6742334e7b0af3a8c4e80753c36ba853a108aa19a10be7d9335f5f2a76209dc6f
+EBUILD gst-plugins-bad-1.14.5.ebuild 2681 BLAKE2B bc85aecf70149241ab47bf8fe6dc2f4a172feac1a445d713f7dd8a948efd0e2ab1c216c972e744c16f058aaa70b5c6641b49ccc8a2e598462dfeec57a31be9b5 SHA512 b4cbdeea64bbb9f86eace388008b5102a32e1101629a5dac7cd049dbb2c6adf021b91becc4ae6abed9ca6e58b7d66e3f11c94ff4780cc8e836034da552f3b9c0
+EBUILD gst-plugins-bad-1.16.2.ebuild 2303 BLAKE2B d2a38f50c1ee5806ffb1be74b1ce92e532521624457b69284b334ba728cb3b4c97180e07bb69620f413a635cd52c78d8ae7fd9a3fa028eb7b68a25396e032b67 SHA512 c5e7d28c33f5b146aaa979999c4c2b2e4b827977d0f342f7bc5b4a7350c459020efdbbcdaf2791aa4303b1ed67a500db639f1c08a4eb423615639a3c6633293c
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
index d6954c204325..ceb2433d5d84 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
index 20b5fa1083a3..4e59e10b3ade 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index bd6c36aedefb..fda50141f78e 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,6 +3,6 @@ AUX gst-plugins-base-1.16.2-make43.patch 12403 BLAKE2B e99167bbb792c5815e8bb7265
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
-EBUILD gst-plugins-base-1.14.5.ebuild 6026 BLAKE2B 40d91d7859c85891d37a2a660c0c25a4ebe0e47ca4bf5953e4129275aac6c16afdc1f5038a4732698e44b689b1c163383d448e3e3b23d30f332c62a020971412 SHA512 bd8267b42bbbff6a3600ca0698b9c207c705213cec81d92363b3dbb02c09bac78bbde2fa91bee5a34866f302afbfc5f00594d6315d7a8f8e6bd3867b189dcb86
+EBUILD gst-plugins-base-1.14.5.ebuild 5939 BLAKE2B ee15054730e0119af1d6b0203f5b6e0f479bfa5f01be60f2956c0431ba26692a4814c723b33b049e6d692ddeb29505889f52d5eb1003739fa1a0e907d8a1c1bf SHA512 b7c4d12d8c029a184711e54d7eeee23e6427d79d36f18dbf5f15a8b26dbe078a057a312930b708684808f31b1a519d57a94939f602754ffe012c2730fb4fd95a
 EBUILD gst-plugins-base-1.16.2.ebuild 6046 BLAKE2B 1925848df988f12d58b5da0963744b5304654fa88acd78c84fd2d7a5da6c4300e368e91753e095cba4acfca0bad97a7355af87a22a148c6a4f081d55cc06d9c2 SHA512 7cf8736921c8ea16058fa84c796ab8182ddb60e90c01851cea41cc5d33de0bdd31d142192536a0925287a33a625cff7e856aeb835d391e798e5cf78646c0c6bb
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index 94fe04ade07a..8b1ba0f14416 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 6a9c0a359acc..c662e3797259 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,6 @@ AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5c
 AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
-EBUILD gstreamer-1.14.5.ebuild 3508 BLAKE2B f8171e213b89db5be1edad768f29fbb263e7166e639865255a4aff3300d2bb051a43b532e4431e2065d6d33ff73e5aa0c540addce0dedc4b7aead4761a825c01 SHA512 8dd402d61b9a8fc9408d8186050502c2722cd7e401e25e438021fb67b2d877f341c1a01d763833d9616d4280a8e6d71af444fff63676f17a84485291b32edb6f
-EBUILD gstreamer-1.16.2.ebuild 3426 BLAKE2B 3bfd1d6109151dbbc46bcead5d8f49230f65ead9ab227d9c16dd332abbd7afc741e904579ba5f0724e0d99135e4212d5a4e3de6e65e7e602f38e474e89b5255a SHA512 08ce0b0c6e74099c924a472eae173ce7bcdec10de34aabde9fa20fa0f21e1d3678890dd2ec2250a9ac745f30db7382665a36560999f81e21f304a3a2e97cced6
+EBUILD gstreamer-1.14.5.ebuild 3028 BLAKE2B ef82e9743fd2fc3e3a58e440898923cd95a25b522834d16f8f8c7aa54e94b482453e4eee356f38b84f8485cc7dff771909305dd304da18e45fe288d38ba9792b SHA512 a8fc136c373baa98d9ff27ce5edc1bb95fbd5f43de35468d13cd4b071cb1696523737ed5926dc00c5930ae3836ff4323eb43a508c40a4976f9899867c8a297c6
+EBUILD gstreamer-1.16.2.ebuild 2946 BLAKE2B 00ac2a8067a0847131146f7c74ebdfc9a4ace5091eb8a27c31913d08cbc08685602ad6c2dc1836a5566b7aa8d40b126962b019021c3f32d35b632b6716468441 SHA512 25b99b349aec91c480fbb18425904463d034936d22747d9e5f7ef96937791ad46b76ab4b308f6db46a408f4f4e74935d1609b260f9fb3404ad033b291dd4eeb4
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index ec77d2d0c15f..0610aeed9ce8 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
@@ -41,17 +41,6 @@ PATCHES=(
 )
 
 src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
 	multilib-minimal_src_configure
 }
 
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index 5eab87d12d69..d2ffca1d69d6 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
@@ -39,17 +39,6 @@ PATCHES=(
 )
 
 src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
 	multilib-minimal_src_configure
 }
 
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 5e44b1205219..40c0db8450ba 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,5 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
+DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
 EBUILD imlib2-1.6.1.ebuild 2265 BLAKE2B c17d5006217501fb09a9a830dfa28701619acedbdcffde6554234ad0bf330cc7975f7866f3cb651cf82c736d0aca4c5b167cf39381d952028903861160fb9788 SHA512 63499f3825fbc49a74f0218d306e1691e0a9ca5fa908369ce250852dcd0a5d98d760cf2d9f1d07b33fb5e87205010412bb08919cb48a9c28e3d759c772e2a754
-MISC metadata.xml 2922 BLAKE2B b79d10aeace227cd55be0bfa26085fcb96fbc3272d4a529ce787bfceb9c88284b5e4a39744576b801d818c8b0247acf67cc94f2a07eee3f917552645e7504594 SHA512 e3eb78a927ec99b3dca515c66f927813082158b9269ecf18577cae1ae390eaf45adc41d655934f332410933e7287ca7173f951a245de5f3e2138fddef7596dd7
+EBUILD imlib2-1.7.1.ebuild 2274 BLAKE2B 1ed206c08e47ee8221f809afdcbdf3771536f732436968f7084c15f97f10bc0858e08aa2a38084e2d33f34747e9bb0e44a2c5321ecd3139c5683c77d6222890d SHA512 7568e4b5ed75184c64da376377a736420f311ffbec252081f14be3bdeee62f64314a7a9932ecf4741ae014eeac313b4f73c8c792fbfac39c25d871939d10350a
+MISC metadata.xml 3007 BLAKE2B df2f5a1a31aaf3f2a9535869ce159ba896d0a2f6c4b079815e08cb61444889627463663eb0226929c7f9cbc081b44aed251de5feefa2e33306ea3daf6aff987b SHA512 773c6756e2fd5bfd63a47bfa702f306e20d12f368fd6f675cd0df835783db934608052426ab2cfd11f3cafc52c2e5be911b37367283f686a85c2edae49ca0274
diff --git a/media-libs/imlib2/imlib2-1.7.1.ebuild b/media-libs/imlib2/imlib2-1.7.1.ebuild
new file mode 100644
index 000000000000..4817a18e5c5a
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.7.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
+	static-libs +tiff +webp zlib"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!<media-plugins/imlib2_loaders-1.7.0
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_with bzip2)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_with shm x-shm-fd)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with zlib)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doc/. )
+		rm "${S}"/doc/Makefile.{am,in} || die
+	fi
+	einstalldocs
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 51aeb95e5cab..51478a0dd180 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/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="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
 	<use>
 		<flag name="X">Use the X window system</flag>
 		<flag name="bzip2">Bzip2 loader support</flag>
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index bf22ea47c958..698ed04b5505 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,3 +1,3 @@
 DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673
-EBUILD kcolorpicker-0.1.4.ebuild 724 BLAKE2B 5541e6a84569d0b80a8306a84e3e73f24b0a780534e052f9f64c0df40188adf784f7ccad41d180e0532f4c962d61cd2ed2b88407efd1b37a9bbcab908d8a532b SHA512 24a88a49805019249934d7c1ba874072d782ce7b604cba693d5ab4318de66ccc62d3b73ec8cbf305a5cf9f86f7923495d4dcc676169bb6cf66775c54c189d47a
+EBUILD kcolorpicker-0.1.4.ebuild 736 BLAKE2B cd45dd2b5d00729be89d8de3d89eb01452675961b1a472bebd5b0a0f5b2c09a713c2cfc09195955fdc5103005873665c50f1537f3ac65408d687678463f6974e SHA512 574126d929e6bbb8774a1d1e4b9dae5a88ff3e5c14ba8ea04dff08a745cada0e45fc8d4ee8530bbeff838ee4197fef33889c158f7e1867ef12c34f1ad751ebf4
 MISC metadata.xml 582 BLAKE2B 5cabe4fbc89f6b33dd2193707ce455544c8e61139ea78d03220a4acb6833d7d085c8d3470ab0031ead6072d766987b93b4e1f15694898f25b8358bf550868598 SHA512 1b722a703324f146d71a8cbcf807b1e8be67708bbb3af541dbbe1e42958c9f47d5eca36e93f967521f37a2b674068265e7d2c2c7853aaeddfb93748b83794c8b
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
index 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/Manifest b/media-libs/kimageannotator/Manifest
index 6241f8fa8f97..68746e3acfd1 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,4 +1,4 @@
 AUX kimageannotator-0.4.0-fix-static-test-library-PR195.patch 1010 BLAKE2B c296f280c851b54d3a6d7fe088ce429b9840144214617346c5e6849784eaa4e3f5b1469cbbf05407aaef812c10f61f0e693bcf3be1d5b852802280e15b2f8c74 SHA512 6baa5fc3fe31e1f9cd6422a667a4cd295783cf8c92aec5c4ff22918edafa461a90008ff4d99f8ded9f3718dbf9c667c59a6dfb280c62292a5b0915bd3b1081a8
 DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
-EBUILD kimageannotator-0.4.0.ebuild 943 BLAKE2B 3137d18a8b5fb287af5c8fbaa870e911deff13d149116fe1d11aba6fdf486c2c97b51d947ed921a8ec50592db33bc93afb749a335efb1992b981621245ba7194 SHA512 be3ac5c3f577f93e0a7091672c131af5d9cb49af90b26080635e00ba46cb74f0ebc7b327db4b2511e0f1815cc6bde07468052051a69b58305bf6bc345e7b9a17
+EBUILD kimageannotator-0.4.0.ebuild 955 BLAKE2B e38e7482bdfdd5dc7aecfd60ed4fbb1276efe78a8a1cf908ca267ef8343297bf7c7ecd4b0623dc56859ecb33b49ceed9b5c31f4e7b91435ef5fe43b076720ccd SHA512 5d9a8196fee811344e3986b6a98ea5a9426c6d57c75bd734769b468889d13dd2f4ed9f50148e677e23a246d6ca13f1ffb90e1261f5c47e46a7edbb609313fce8
 MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
index 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/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index 9847f276116d..9572f0a75837 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -1,5 +1,5 @@
 AUX lastfmlib-0.4.0-string-conv.patch 510 BLAKE2B 088c8deb83ad96450b21e1d7a8e99d34a5421ccaa72ad75e102f89f011d494ee4e54c9799a1a6296543f7d230dcb41dec48a083d4c0a09a8a52f87744c7256ab SHA512 cd212e173559822586c97fe175791b7ca2ca7239cc511d5b4d07ff7dfc9ec87b5f3a126acf58c4bd95a7cb19cfc04b067ecb99fab6cb1815e59f56fe9c70ee4f
 DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748
-EBUILD lastfmlib-0.4.0-r1.ebuild 714 BLAKE2B 345ecabe9615c4587e878086f07795032406a2f93bb83be60bfe26bd4c30585751c66e6d0cc58fed544c569614438a5da85a9564bd30a72ce4c56dbe37e0381c SHA512 b981d9273d217d4e59aeb9035c8f692d5fb9b009e9e3106321b7c43403dba84aa7413cf42f6d2b140a8d8d2ceac3cc25dd6d79e4d667734968b4e4f163ec0fcf
-EBUILD lastfmlib-0.4.0.ebuild 664 BLAKE2B 3a0cf60999baa26e7d202fc3ef50bbe6e49d02c5ed328523abd05b78442ee8d7fbfb79376fe7504eac58a7a91fea97a1677c76e4dfa2d63511e5c328ad2e556c SHA512 2b263e34261d74d174fec0270d2b7510484514c497089a23d5a504d85a500052065030d5dcf5420f80ff4d5097b43092f3b71c11325f40c45de9a6f749c4f17d
+EBUILD lastfmlib-0.4.0-r1.ebuild 712 BLAKE2B fecfceee16dde08655022b339759fb2f3eafaa6aed378338a908eafe1390c18335d7fbb930bd617ad048d4637e63b161a06b97ed4de13b4bc5de1932dabec3f0 SHA512 1c4bc366ced22aee90212b7e7ea79bfa69dd761b450fa2ab77d235400e6424710acd6045c9025947e2fa4cdc7c8a46fb8db36164c02ba529860530825562c103
+EBUILD lastfmlib-0.4.0.ebuild 659 BLAKE2B 66b6202bd89d9e8053e998080c978ec5f7ac2406964e19817051c06f17670a8a60d9166d4a108292ef9902d9b9b6fe26687f4cd1b5f2888b7413b029224bed34 SHA512 a46ef097334b5520a3dc5cd76857af5fa6560de31cdac835a215d96aca920f59bf95f1c9c64cd0aa55bc44b1a4f8f1e61c936f6d8101995a304ec91772deef21
 MISC metadata.xml 335 BLAKE2B dabbb4b4997e73611fb77582fbb5b2f07bb0f41106dd68de366039342d2d1de1021e5d2133dc606baa6cc7f0510f7e532a955740c1735377d122f2387883fb9d SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
index f10290636479..877bb72bb059 100644
--- a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="C++ library to scrobble tracks on Last.fm"
 HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases"
-SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/lastfmlib-0.4.0.tar.gz"
+SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug syslog"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-string-conv.patch"
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
index 3b55a002f90e..36000699d5c8 100644
--- a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="C++ library to scrobble tracks on Last.fm"
 HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases"
-SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/lastfmlib-0.4.0.tar.gz"
+SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug syslog"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf \
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index f44e7230a703..28ab03c8cb19 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -5,7 +5,9 @@ AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 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
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
+EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
 EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
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/libavif/Manifest b/media-libs/libavif/Manifest
index 1591199153f8..a5f39e1eb75f 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -4,5 +4,5 @@ DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d
 EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc49c0570e69aa54cedf31ae5dc2a499dd1e8f944fa44b606fb6302b49231ed8337d81f6e4fa6fde503794d80844 SHA512 32cb7970ba5fc28330c6b9575e693417c36116b7a57ff5aa1c4f88d6db039b3d14ec36b325d8df0f09bc56581b928725ed33f9093a46c39151409b103ffac9f6
 EBUILD libavif-0.8.3.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
 EBUILD libavif-0.8.4.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
-EBUILD libavif-9999.ebuild 1616 BLAKE2B 6fd97427b007b3ef0e892505eafd538cfd7eb13879fa6d5817608e4dfb027983b283b830b8a5a6fdaad10e764a3281f41a5a382286e27ffaa8db530d5f776749 SHA512 80003f7397e70ce3a50281c508fe43c96745a0c24b316a6f2f9b4abbfd6ff4312c2c3edf506d9325c5732c8ed379b050b503a9124ed62a4f3dcd6cf1c0d3bfc8
-MISC metadata.xml 772 BLAKE2B ef2759de03290413ee0922ceaa954c162589f2506d898c1da168ed4825967e06afe568e648d988a9b5ca36e31baf55476e8c63e0340e122084b3cd8a014bf6af SHA512 8b7ddd778f700afebbb2f5174af9139175e5048430e6bdf63bbbd75556c8b1f87626bc134b3a246f05cc33d8f9957e9670cd86e65ced919ec562f8af3e76f783
+EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d
+MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index ffaba14b1959..f4756e028039 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.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
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 DEPEND="media-libs/libpng
 	sys-libs/zlib
@@ -20,7 +20,8 @@ DEPEND="media-libs/libpng
 	aom? ( >=media-libs/libaom-2.0.0 )
 	dav1d? ( media-libs/dav1d )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	rav1e? ( media-video/rav1e[capi] )"
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -33,6 +34,7 @@ src_configure() {
 		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
 		-DAVIF_CODEC_LIBGAV1=OFF
 		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+		-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
 
 		# Use system libraries.
 		-DAVIF_LOCAL_ZLIBPNG=OFF
@@ -55,10 +57,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if ! use aom && ! use rav1e ; then
-		ewarn "aom and rav1e flags are not set,"
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
 		ewarn "libavif will work in read-only mode."
-		ewarn "Enable aom or rav1e flag if you want to save .AVIF files."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
 	fi
 
 	if use gdk-pixbuf ; then
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
index 2df8acaf8694..a1119e8ee76a 100644
--- a/media-libs/libavif/metadata.xml
+++ b/media-libs/libavif/metadata.xml
@@ -15,5 +15,6 @@
     <flag name="extras">Build extra apps (avifenc, avifdec) and test files</flag>
     <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
     <flag name="rav1e">Enable support for the rav1e codec encoding</flag>
+    <flag name="svt-av1">Enable support for the SVT-AV1 encoder</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index dc0b56f08469..98b5feb8c9be 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2466 BLAKE2B 043cbfe9b05aeb14966b9f5cd9e21f97de2826e5cb22ac9fd3b6282aba31153ffcbe247d903de91302aeca8646a32521909a601449fe6ef964f44d4ff3303f20 SHA512 a18c327f0ab13328f3ada80f27cb67a80225e49da4fd9c6dded7e92a93d579358620844999b7fcb6ea3020d93b2a7af727c578a8da1f3610d91897a5ece48c66
+EBUILD libcanberra-0.30-r5.ebuild 2459 BLAKE2B ee479bd5c14d066928d8c82d54ce09ef8fc02807112ce8022ec5f1d9255af4f7ee22c2db97159f473e303e6d2c540de696c2e17813c25617dae9a61f4d74729a SHA512 65714b83fff4e88e20a41441168870d0fe9d42bb5f5636d884f5a9f797aa7eac7a5491b4be35b692d71301e29b34b665c8dcf29ad539f055868ec0681c109d80
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index dd0bace15bfc..344dbc295877 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="http://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/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 5d366626e003..c30021bffc5c 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
-DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
-EBUILD libdvbpsi-1.3.1.ebuild 937 BLAKE2B 5cb98da1eff0ad0c9d4fc05b7bd72dc80814609709c1da24ecd8c15433ca4862995272ccef5420060b2ba119f7d18327ed695a8a8c2b87eda22e0773c23ca15a SHA512 4d05e1bc6cdf6edde684100f4f51d5d56842b5672f44041f23e7a2245ee252e33b382ddda7f727def89fc00cddf8e80d1bf7d737c217a28793ad7c3f8d1dcc7f
+DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
 EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
-MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
+EBUILD libdvbpsi-1.3.3.ebuild 934 BLAKE2B eb05d01e96faecaf3d97d2c557ed683d5f3dee5a54956871640ef0ad766d0ce8199211d8a80e6f5a8178120387c2b3866dfee4b9eac2e5f6ddf6847cc8a34214 SHA512 abcf8d3a951bbaeb48c7eea62c25d300b0998ca68e47e73ee3dba2ba08426ae844d5a69d99adee70973e976ef96accb78d4a02349bf43b92c3bad187faa4983e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 d76dee6b725e..6f49eba8f496 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,5 +1,5 @@
 <?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 -->
 </pkgmetadata>
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index ba6d90dbc1b5..3e847fce5d83 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,4 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
-EBUILD libexif-0.6.22_p20201105.ebuild 1472 BLAKE2B 200f622089f3d8cac1bf75e9e1963091611694ad689bdd2ced7f818e494f0dd55c6f8a85b608c95c969f48a8b8f054e88fd7b698a5e556ab7563e9b4e9f1c120 SHA512 c43b9826f17119db34e0233233e9bb7f1c42073052d23273f228607a9359e9ac42c8c5004abdf31a6a81750eeb36fd18ea51d95fd46d5bb23cd0dc7e7e738309
-MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
+EBUILD libexif-0.6.22_p20201105.ebuild 1437 BLAKE2B f1821fe0e0394b776515360f3c69f0feb4bf772d267108d655d688cb991bced0996043085be37306ceb732d34d6a6da2183aa8035ced3ac5834dcdf6686f82bb SHA512 949d70abe76e25d9615355e4ab70cef9ee4ba04f892a17908d4682b7b630e3f8574f0e7d8a8dc6e888c157cfa8cf83a5c7fafc7a6b5352f98c6b007d005ea7be
+MISC metadata.xml 366 BLAKE2B c9412873f5846ca7f8b8465063dcacc021e8e181f2c2f8382e68fd3fbf492b1b6ec361adb19e8c8e565497df7e564670f1ced283bbf70009fd70a465f34f2065 SHA512 7d174956f37394f2687f811a17815e3167cbf82e513ce6e146b77ce62f8aeff4d97413fc6e0d3cc96570f8b256450861ab92769c64cdf085805536beb6116c02
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 f8874c54adaa..dd7cee55e09a 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -4,6 +4,7 @@
 	<!-- maintainer-needed -->
 	<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>
 </pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index e828e93efae6..294cca031128 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -6,5 +6,5 @@ DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a5
 DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2986 BLAKE2B ac2af06f2cf40f1f8ada21d841a46d8ba6fe8908ad19e9ab9e7c1f1eb607446f466e1c7aa79aedf856e08241ad6b61c7fbc5b5768b5a7ebf6d0fb481bc77332a SHA512 a6cbfbfbc7ccf0fd7f5e96935a378677f3435de7c3fd260c5912cabcb68a6820b18ade6347f8bfd9495ed4df5d7d5e4c944a0cf1f0021bcd71073925b3151cac
-EBUILD libjpeg-turbo-2.0.6.ebuild 3048 BLAKE2B 29f41776836e7ce5d7f1f88adcae28433166e5846154341e6c9237dd70b4ba0665b0c312c1027614a9906ee0995256edae47daebe189fc91d2e0891d34995ddf SHA512 ea4539ef8db05f4cf1c1b31a4bab3ebfeceb16ec8b270d1bb03b866c402815fd10dee1a22869546f90cca3f555a5ac75298270ba01d818372462f71e1be920d7
-MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
+EBUILD libjpeg-turbo-2.0.6.ebuild 3074 BLAKE2B 28d83accdf1be5beb235cc6ada2b57eb4a3dca1fbdf20acedfaa979e46a90aca50d5db2577a4127710835db7f957e4c36c35859cee0dd98198109f4c692da447 SHA512 188498e6272f6755d00ed8b17dd214b821111b5624e56d48669052650377671111674f74fe393e79e66da6384364eb4baa90a9f7fa678b7eea9ec78d17e493f5
+MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 7516ff286242..333b911bb9fe 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index fa375260076d..617cdf8ffdd9 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/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 15f67fa5ee37..30b64ad8e4c6 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,5 +1,5 @@
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
 EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
-EBUILD libopenshot-audio-0.2.0.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
+EBUILD libopenshot-audio-0.2.0.ebuild 555 BLAKE2B 5b01f9cde9ff2cb95334ec8840a4a80d6ee5f5f95de7ca5c138d9e42121c1c450b0594a8d22662467e8502795ff24bbfa7d679c706195c9991947bd890b1bb56 SHA512 ab8ab99d4f330c5f0888afa1a07ac5a9895f5ab141f2a2627fa3512027627153026a744b01129fe3f6d43cb959ff639af4ddc78c682ad80d311b1ec240fda213
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
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/Manifest b/media-libs/libopenshot/Manifest
index f13ba25da2d6..88457a6bcb20 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -4,5 +4,5 @@ AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
-EBUILD libopenshot-0.2.5.ebuild 2355 BLAKE2B 2b7225b9b3bad2843595c4c6657392ef4f77722929c2de868222cb619354d05ad4f4e1886fb63b4208835b27396a6db57b24d337f77a7e89043c17589f1bced4 SHA512 5b0c6e16eb01ad7b5858397b6e803b83d32d7c03e5bdb7b66c1d733f37136da930976b8f17e8bd540f4c9078f1b365e4d01d8ab7b00423420fc4eac45b5c3c0a
+EBUILD libopenshot-0.2.5-r1.ebuild 2361 BLAKE2B 480a89ff5f2b2190d4596e5ba5f1505ad9fe16c1febfe4a1f2f6b7a37291b2b3bff8a3223fe531735a3e8098431d7a2184a6763f07c72ba4bab06aaf6e737f4e SHA512 99ab2e14e80b9bd7a4ef4b939b4f2f9f326add36c4e915223a0572e4175219f92dcbf07fe949524456970d2f6439e05770b7503f51969702b867e0f0e9f48b48
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
index 37973900308f..1c5d1a9b83e7 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ 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"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/jsoncpp:0=
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
 	>=media-libs/libopenshot-audio-0.2.0:0=
-	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis]
 	net-libs/cppzmq
 	net-libs/zeromq
 	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index d50a6ce1724e..03a88f53c7f3 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,7 +1,9 @@
 AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
 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
 EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee
+EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
 EBUILD libplacebo-2.72.2.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
 EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
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/libquvi/Manifest b/media-libs/libquvi/Manifest
index 371ff9964e0a..d752d5cb0704 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,6 +1,7 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
+AUX libquvi-0.9.4-autoconf-2.70.patch 359 BLAKE2B de87ca7222d1073da64337eed378a8d231da4ccd99cffa48dac377fac040b93df752977c7cbf9fc872c5547a599cdeeedb25832c9102c0df39b991f5b0669e58 SHA512 a6c1a853013ff7cc128d8ec1599e9847c4f5ec94bd9eab389c589696d0af8ab5704a9c2861186fa51d84a18dac67000af9c20c0fcedb1af1f0ba6fd64cbd1d00
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
 EBUILD libquvi-0.9.4-r1.ebuild 1272 BLAKE2B f3d2d6088b4da79b5cd4a8957b0ea260368ade1f8984ffadbf6228c551c6021b661099dafc04e782abbae49df416293cc048dbca9eeb0dac28c78764dc789579 SHA512 3e2388d3a61e5f1fdeb83616e100acefdc89da45ba975b63d8818c3eec9c4c011440a61b97033f9819b334da7763a8bbd2cda90516d1f4404b4082a4a080890d
-EBUILD libquvi-0.9.4-r100.ebuild 1231 BLAKE2B 010b179f6ac462f3fd0e935313418f2a7398fc1968f6e7c58e926b67dd596f0df183166a7160ffcc9fae1863e771deda8710d7214526eef148da72a27ce1f268 SHA512 f731ab1f56c2c4c921713566dc5a0f80cefc174e6f5a7393739cd7548ee92713f3eae5d709a664186660894b1b456c974fcd6482b64b0a4583310b35c17a3df7
-EBUILD libquvi-0.9.4-r2.ebuild 1140 BLAKE2B b04ee1c72dfd7d839b2c2b3bd7ac8ba8a211b52642de8cf2f51e9fe5bde924df1d5b6097cfaffe826005142404df06dc606cdd693f33a7b09feefb7a4d675895 SHA512 39c33b798178220753872a8ad263c825be6191c13ea9955871141f03be9f4e3bba487a92d7c768916e8c02354495321a31963dd7506fd0b4aa12bd2a63e18b61
+EBUILD libquvi-0.9.4-r100.ebuild 1287 BLAKE2B 661e1cb938df16ecc9ede714b7b6c0f80040b7fdac6a1cd04834b5b40d397b23bab7fe2daceffcb774a72e35ca2737ff7941dbe773b23da76fa6c43b99f4dc2a SHA512 3d025522b33548ee63d647d3cfd48964c0ff734dac0ef1bf23b91493b16440536a855d13866bfce8e4c81a2d843f5c49f054a5fc9f3a12776b8974215026f925
+EBUILD libquvi-0.9.4-r2.ebuild 1196 BLAKE2B 2f85382337e83f5b47b9b346db7110b5bae74b37caf94a5a5ff8d9d5d442e7b586571f6ab421d0383b6daf41b725d62fce513ca2961ef3a6035a43050285051d SHA512 001db44e174c076311a08adce359eacfd50850712b1d5fbd19555f3658b72b9ae0330d039800e1ac02f8ab27679a516bbfbf9a512754b917e27693fe3d69c33e
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/files/libquvi-0.9.4-autoconf-2.70.patch b/media-libs/libquvi/files/libquvi-0.9.4-autoconf-2.70.patch
new file mode 100644
index 000000000000..4fe7757e813d
--- /dev/null
+++ b/media-libs/libquvi/files/libquvi-0.9.4-autoconf-2.70.patch
@@ -0,0 +1,11 @@
+--- libquvi-0.9.4/configure.ac
++++ libquvi-0.9.4/configure.ac
+@@ -8,7 +8,7 @@
+ AC_INIT([libquvi], m4_esyscmd([./gen-ver.sh -c | tr -d '\n']),
+         [http://quvi.sf.net/bugs/],[],[http://quvi.sf.net/])
+ 
+-AC_DEFINE_UNQUOTED([BUILD_OPTS], "$@",
++AC_DEFINE_UNQUOTED([BUILD_OPTS], "$*",
+   [Define to configure invocation command line options])
+ 
+ # Interface
diff --git a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
index 6ef8499f4dca..1d357a005779 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-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
@@ -38,7 +38,10 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch
+	"${FILESDIR}"/${PN}-0.9.4-autoconf-2.70.patch #749816
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
index d25e8694a5e0..75d9b7ba8237 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,10 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch
+	"${FILESDIR}"/${PN}-0.9.4-autoconf-2.70.patch #749816
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 51b9bafd0ed7..7bec3bbc0dca 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -3,6 +3,8 @@ AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf84281
 AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
 AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
+DIST libsamplerate-0.2.0.tar.bz2 3739932 BLAKE2B 45e7d1ceb4134bf41117ba09c3280e403d66b928bd0528cf2bae0c43064bc032de18d426f93802cd484080bc5b49b8df6378ea023c0ce76381d0a6d3972d8128 SHA512 40422f8a9a5eaf1d0cfa18a98ad561885c15556962db8892c412870745774f971087f5fc4775bc6e462857162ff7ba895d5b55e3cea9982aebdb915de391699d
 EBUILD libsamplerate-0.1.9-r1.ebuild 1003 BLAKE2B 51b1ef8835d7725369e8358e008d0e18e63bb6750b71362244c50fcf8a9d1351e276e9b06a4bfb4ce1f4fa7929ce003ce21b4cd2db99760e607040df9bf27c64 SHA512 ce35cf2cdf645f6dab7e1e8c1c7f3507fd7e79f8d10da27e678ed234dcdb5a9aeaecd705d497573c1ae7cbe4a5301dd2a8177d2e0e635b1b28ca0181b5067e9c
-EBUILD libsamplerate-9999.ebuild 1260 BLAKE2B 93bfb41c34f1f3cdfed84a21669df2c3438a328addb0f6ff82ee3f5e34f7cf73693fc9088b1b9c81902f578921bef63e1bc1cef9b8f48c7c4ca4184a6c357f48 SHA512 80f76da5d804f8797ea6eff974fd04d12f2e419e90e5a6b39cd69ddfab07b289e2b857c3ebd6b856dada110837253b794371dd171b70014bba5cc7eb98515586
+EBUILD libsamplerate-0.2.0.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
+EBUILD libsamplerate-9999.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.0.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.0.ebuild
new file mode 100644
index 000000000000..c2eb013b6fe2
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-0.2.0.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="http://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 96d8198f8acd..c2eb013b6fe2 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="http://www.mega-nerd.com/SRC/"
+HOMEPAGE="http://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/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 07a9edc0838b..da1e65a7b269 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -7,5 +7,5 @@ DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce8801
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
 EBUILD libsdl2-2.0.12-r2.ebuild 5896 BLAKE2B 233c8d1ee14e2c95d6bb09eef0c62644c9688c7d51baff25db7bf94148f1465591e32873516fd74ad7a1af552054f7161d5d132656ee3560d4ec69ec3bb8353a SHA512 777603ad7137c73b7fdccbf56c4a27766c8394f43a1df52751766d2f445a1e51b03dfbb83b32274cd982f5ebaeaa0cd80e9caca215e352996dc802c98a05d0dc
-EBUILD libsdl2-2.0.14.ebuild 5934 BLAKE2B b7fcd558236452186bad549772be1b46e9291637024bcfb484fb0d3e16abacabae634e7713db2d149fdc236cb3922739b4ad27a236366b08422fd59de2da1ba6 SHA512 1d376fa674a998be10673400d0ffe65c8a0cc9387f3c412c5f57129285b7f737cd189403b05fc245050fe1abeaec5184a7aeec90bcaff1dbb2fb83c3ffdc3928
+EBUILD libsdl2-2.0.14-r1.ebuild 6155 BLAKE2B c38ffed9cd5160241f44268b9b34d267b82b9315cea18f9b0fcc3cf562018d3256c5266d5fec5c841df532133b3f184c7230ff4dae9828ed2d626c640a732bd5 SHA512 c3d07224b7be960c8e6201b659e5ee7923d2f2a3cb6aaadfe3118cbd7b27ec88dc9a3f2f4199f43d82bbb67eda21852a424d1c5e6d04b8aa6a98d1f69474b37e
 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/libsdl2-2.0.14.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
index 4002370c79ee..4d1a2b292c97 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
@@ -1,7 +1,8 @@
-# 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 flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
@@ -97,7 +98,12 @@ src_prepare() {
 	rm -r src/video/khronos || die
 	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
 
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+	# SDL seems to customize SDL_config.h.in to remove macros like
+	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
+	# being reintroduced.
+	# https://bugs.gentoo.org/764959
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \
+		eautoreconf
 
 	# libsdl2-2.0.14 build regression. Please check if still needed
 	multilib_copy_sources
@@ -187,7 +193,7 @@ multilib_src_configure() {
 		$(use_with X x)
 	)
 
-	#ECONF_SOURCE="${S}" 
+	#ECONF_SOURCE="${S}"
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 23156d3ab496..4b872b903934 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -8,5 +8,5 @@ DIST libvpx-testdata-1.8.2.tar.xz 422945340 BLAKE2B 117c26e77b9cda30ca083382981f
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
 EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440
 EBUILD libvpx-1.8.2.ebuild 3436 BLAKE2B 5c78fa513348cad6d6a1560a72fc4d0c15c746ea6f52843182f3b30d8d71e1f76ee245c95291ba9356a147de1f73f65f5a7a147aa1cd6d861fdaf5831ec7fe62 SHA512 2fc98db752426b5530a3c42b9a4a03a4e38e79d2746d42be3d5ffce155c9aa5e49f6d17a28c2535bb5fbdae8bea31fd90e0e15fa74ee51dface9b90a2357ae1a
-EBUILD libvpx-1.9.0.ebuild 3587 BLAKE2B 496795027a8ac8f291940f036720bcc88f6c2260e81b110256245235367fecef8640121734c78ba6eb915e934794a9c05e340381e0175e9b30498274accaefcc SHA512 9f6a96cba0f09bd1571eb1730fe90aaa48b973b165f083250b325a768465a8835ea26410574a05b102e4783278f8786c06f9c0e6a6d54ec46b1815a39484bd4c
+EBUILD libvpx-1.9.0.ebuild 3586 BLAKE2B b0a71cdc777a7b32dd39010d9c4319501b67ea289812ff8afc5e5f61aec9b4c14cb4c8fedacca57539f99f95d9dab24f7e8872c058feb44cfeac158f9e0b9b70 SHA512 61638b63c87ccbd7a8b14b89de3c327dfd8c17b064ab346ace2bf876ecdf40624bc519ece1923d3fa05285b307227eed7a1dd1b1c9e56a3afe79b754e3723fd4
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.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/libxspf/Manifest b/media-libs/libxspf/Manifest
index 9eeed641ee33..4438e48c5e13 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -2,6 +2,5 @@ AUX libxspf-1.2.0-autotools.patch 5008 BLAKE2B 2e0547bb6f7885304e3e4fb03e8562d8d
 AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
 AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
 DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
-EBUILD libxspf-1.2.0-r1.ebuild 871 BLAKE2B ec941c6aafef183a890fb57ab0c9b11f7d5fd4fcf5d099c5c59b4280d851132ae34bff70fa7c9fb4ce22ab1bbdede6505c2b063f041d7bfe480a412289043f85 SHA512 ae2fcb25dd95dfed477917e6a68c30e73d936e5e0477b02a8db1f741dad1e1b66e35f847789f1ae6a2012a71524bf8f010122ec5a4ae83cc8a32fd0c2666ae3e
-EBUILD libxspf-1.2.0.ebuild 1030 BLAKE2B b7ca86066c1ab47e11e1dac05b0c6dca79188cfebf8f7e70d8cc5b4acaf55793f5b455c63bf207238bd52777ba806578be86170fe3d5d0cabf3b04f806182655 SHA512 097e928c7595464e5fb578aed75d9f8b05928e894644000ab57f6deff0f6e5db2bc3051bd724bdeb90947b6e98a20160cce5f97b4068b625038ce8ad1d1235da
+EBUILD libxspf-1.2.0-r1.ebuild 870 BLAKE2B 67db633d9b407008a2d7208c435e759a6242613e5aa33e88bbc357bdc74780ce42c6c58175f35ec8e82f10fcb2bbb21364c828a84002a2136f1bafdb9a631295 SHA512 de6f8d1d844c824f161c0ed3c8496b8855a632973f20f04c15078e4ede3fe6a30104a71248d3136b25db09b5f9e63dcf624382790ea5a76f7d2ea2d9f61d5390
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
index d551573562ed..2d587d5b770f 100644
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
deleted file mode 100644
index 088fadf47a2c..000000000000
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="Playlist handling library"
-HOMEPAGE="http://libspiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/uriparser-0.7.5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cpptest-1.1 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# do not install missing files
-	sed -e 's/gif,//' -i doc/Makefile* \
-		-i bindings/c/doc/Makefile* || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		--disable-doc \
-		$(use_enable static-libs static) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 0f9e726fe871..8430bcf173b6 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,5 @@
 DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
+DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
 EBUILD lilv-0.24.10-r1.ebuild 1794 BLAKE2B bedb0bd319674b705999cb548ffd1a17135b5fe85a40e4c953ada86466aef9a959e0bfd409fa5e05f387ae40ea1794973f20f78a6d39fccf5890f36456e546c2 SHA512 380cca73ca22954f3ed8f84d7c0e1ce35abaa063b6e463fdab792aaa90bccdb6b9862725303684cf3b425df83e143b11986efe140c158be628d42cad865f1983
-EBUILD lilv-0.24.10.ebuild 1667 BLAKE2B 9c6ebef150f1927f98b95a0976dfdf8a14cb1ecb00e8f5c3b310ae80d896a3803a69535eb9ea1be0d148f68eadc5ed689cc01b870b0ac5c7ef8be463c5b988cc SHA512 f152ae9d5acd264b9c0dbd8be22429e13e42a5ca7149004d7d62561eb760ee3bb29e0f73f5308cb01142a568fe20cecb933c9a05f88aea882b5845ba64ca13b4
+EBUILD lilv-0.24.12.ebuild 1809 BLAKE2B 8ec9d60fd8aa53bf92a1d5b85d7ef20f428f34d5da26153cc27a193e4e4bd806b9b712885d19371a3090f644a400e84ce22be8f31b4dd47aba5a91f13936b89c SHA512 405d1c211f28e2668486529ab5b85926b9ad142cb75e718fa1676341a0d5277ddb6a1bfa2e0fe0b47346b3601e222f27f7f7a343b9a47e096675b38f2edd269f
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index 24f31b85a9ec..5ff162080706 100644
--- a/media-libs/lilv/lilv-0.24.10.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -1,12 +1,12 @@
-# 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
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
 
 DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
 HOMEPAGE="http://drobilla.net/software/lilv/"
@@ -14,24 +14,33 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +dyn-manifest static-libs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/unittest2[${PYTHON_USEDEP}]
+		')
+	)
+"
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/serd[${MULTILIB_USEDEP}]
 	dev-libs/sord[${MULTILIB_USEDEP}]
 	media-libs/libsndfile
 	media-libs/lv2[${MULTILIB_USEDEP}]
 	media-libs/sratom[${MULTILIB_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-python/unittest2 )
-"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_setup
+}
 
 src_prepare() {
 	default
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 6b3fe3af015c..aa9ae04b01a1 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,5 @@
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
+DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
 EBUILD lv2-1.18.0.ebuild 1366 BLAKE2B 2913c6e04ab202c62205851d54436b6f1f9394430749d98435333a9bc778e196b03aee4b337736b6cd4858dd07855d8de7367ad5db0fadff51b395c6817dfa25 SHA512 466a8b7937b4e43533784f03b4f919813d953f84be15b52783e3aeedd4d4d74247c7d5b190b055a50ea899a4be31ba93e0ea41c8201a3d10e1249ed65123c1a5
+EBUILD lv2-1.18.2.ebuild 1372 BLAKE2B bc66c5a7fb9bdef84cdc7c87a48f68835cf1f6d151f9ea034d93a962e0de1b65aea72ad47b37b5f5398d54773b67c46ac7e40faf1d1d1450f491a8169bb1cbb5 SHA512 6eba725e4f93ab395c44edf0e9f6e47c37405bf05524a8df9b2dad9053370ee4466bb561945ff4f429ee949e2bca6cf366222d82120b78aa90b061e301680563
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
new file mode 100644
index 000000000000..27b679b1caf8
--- /dev/null
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )
+"
+CDEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/markdown )
+"
+RDEPEND="
+	${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e9d219d150ec..dcc131ccbba6 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,12 @@
 DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
 DIST mesa-20.3.2.tar.xz 14194120 BLAKE2B 545073b7f3f9dd54e087402b599ffa55e37a6a0b2422a52fc22cbe8de0b91a88603bd2241e2308f6891cdab731f0e01c9c9683028819aebcf3251ef3ae3db9bf SHA512 0cabf8ddfd20b56098c8f4c081a3c2d4741ef42f40c929645e74284db99cf2a81137d7d279b7b6a0c15dea83905119ddf612411b36344dc22a488de9f311f5ed
-EBUILD mesa-20.2.4.ebuild 14787 BLAKE2B 3fcf8c3aaf4a1604f5f9740e86209bd39afb5ac75d3a235e158f69018992d1a5d9615cbfa7dc60c3ec2ed8056d8fb6a233137f827c034d706979960f339091e0 SHA512 b538f732c70f7ba100b3b2938e7071b34d98ad5c2db4b46395005daae744165602d6cf4cc2a1778b8adeb236c3f86b285c2927677304b55ca9458874ea6177be
-EBUILD mesa-20.2.6.ebuild 14794 BLAKE2B ab5f4a04e055c761db7bd0757b62d5e75d87288972780d5d24fed1d6da6cd17ae79f1427c2190a629b8c6b78471991f5d43dfe88a159416a6788b97ea33db11e SHA512 02e10dbb2a6e0e4542771ef543fd04cbca5d0bb6394382db6aced502e34955556ae00df2b62a8a0bc437f64668ab1f099fd71243c26f965a7e734d5b49ad1b95
-EBUILD mesa-20.3.2.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
-EBUILD mesa-9999.ebuild 14788 BLAKE2B 3dc2eada6db840d106b3fb21bff2d842338189e9c49da9424673f95061dd5ff1de22bde773114bf6c8d4b33cff43e5774e77ea218eefb88f36e9e283071873d4 SHA512 2a06fe70afeeb6cb060a59ed936c44618fb6d85b19ddbd84529f4cf6e5347a5603eb65b8993a693d99b367a78aba5682adf9d860575a967041b56874121e87a0
+DIST mesa-20.3.3.tar.xz 14222700 BLAKE2B 02996b9f784f4c4a4502f8d5a1ef9763799b36206cfbfb56aeeb84837a119457fcfdd2d2efc3bf87fe945bd4dd4747b77fe9af51b290311b86e850fa4d6ac8c6 SHA512 77735462f4ccbe865d0cf7e9db47c42f8bc2600b9a030dca11066d29e43f73c18ca0422e6356129fc14ac1b1018ed752ae4ee45bd31ae706fea58f573a14d346
+DIST mesa-21.0.0-rc1.tar.xz 14452448 BLAKE2B 1c5738a1ce16fa79931cb57cf2d1605970d95d1f7b635aa73f35ac78da27909c5d651491df64f90c4cd667df5b01550b0eba952d4f768cf862e8121cc75cfa4c SHA512 7157c5fbc9f545836e6b9d81805084450730aaab183466f1c19ef6b0d65ae1b4f04882a87f90982dbfec38da991732b9e0ddba9350be55d675dd409d7c142ed4
+EBUILD mesa-20.2.4.ebuild 14764 BLAKE2B 187917aac61caae964d85c3e08eb5debf34eedbf1c6e4e79861d74aa6f502ec2f8dde0da3e14e5c5dfded7932b233367a040871d3f3ecc1bb97b4da74cbf133c SHA512 14684402b21bddab714c36a42ffa031d4458bd7f5dc81d249bda462ce52164f24018983e08a782b0366b6539aae4522dc7e0fa6319318f6e2c41d0b941cd1568
+EBUILD mesa-20.2.6.ebuild 14771 BLAKE2B 452d6fc89964332cc6a40b3e7f59ee878a6d165765d550bfc253e20198dd3510d73bf763963cf6ae0c830cbbacc0cbddf18828909590caf48b2b73bd6ec136b9 SHA512 4fa2545d50e8c24c8faf0fa7b3a20a0309d376bf9479b854fb5cfc8d3c87ffdd37200c20ca83ec4766a9fb53bb8253613cf5b7c086055f73189d5ad12b440aee
+EBUILD mesa-20.3.2.ebuild 14854 BLAKE2B 4b713819cabfcd0330abe0fd764019b63f28bb7bfbb4ca39742a45ca1994a1a4b242308e5b647ecf2bca14e1de4d9ade3509c8360cc87a9a5279049b5dcd2be4 SHA512 f1f50fc292884e7f0ff4ddbc0cb6d40a1c16a931302860d907afb5401e9cbb666d246cf21a52ef37eb871bd29cf974481d55f7bc124a74fa5163809fc92a625f
+EBUILD mesa-20.3.3.ebuild 14854 BLAKE2B 4b713819cabfcd0330abe0fd764019b63f28bb7bfbb4ca39742a45ca1994a1a4b242308e5b647ecf2bca14e1de4d9ade3509c8360cc87a9a5279049b5dcd2be4 SHA512 f1f50fc292884e7f0ff4ddbc0cb6d40a1c16a931302860d907afb5401e9cbb666d246cf21a52ef37eb871bd29cf974481d55f7bc124a74fa5163809fc92a625f
+EBUILD mesa-21.0.0_rc1.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
+EBUILD mesa-9999.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
index ca0dfceda9d0..a9abb722e3fc 100644
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+	emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use X || use egl; then
 		emesonargs+=(-Dglvnd=true)
diff --git a/media-libs/mesa/mesa-20.2.6.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild
index 87cd61434798..3a059a995dd4 100644
--- a/media-libs/mesa/mesa-20.2.6.ebuild
+++ b/media-libs/mesa/mesa-20.2.6.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+	emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use X || use egl; then
 		emesonargs+=(-Dglvnd=true)
diff --git a/media-libs/mesa/mesa-20.3.2.ebuild b/media-libs/mesa/mesa-20.3.2.ebuild
index 4a9d566b07cd..3a23ce15ad2c 100644
--- a/media-libs/mesa/mesa-20.3.2.ebuild
+++ b/media-libs/mesa/mesa-20.3.2.ebuild
@@ -370,7 +370,7 @@ multilib_src_configure() {
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+	emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use X || use egl; then
 		emesonargs+=(-Dglvnd=true)
diff --git a/media-libs/mesa/mesa-20.3.3.ebuild b/media-libs/mesa/mesa-20.3.3.ebuild
new file mode 100644
index 000000000000..3a23ce15ad2c
--- /dev/null
+++ b/media-libs/mesa/mesa-20.3.3.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="11"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-21.0.0_rc1.ebuild b/media-libs/mesa/mesa-21.0.0_rc1.ebuild
new file mode 100644
index 000000000000..47d4972b3e94
--- /dev/null
+++ b/media-libs/mesa/mesa-21.0.0_rc1.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="11"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 152e9ea51a87..47d4972b3e94 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -105,7 +105,7 @@ RDEPEND="
 	)
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.8
 	)
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -374,7 +374,7 @@ multilib_src_configure() {
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+	emesonargs+=(-Dplatforms=${platforms#,})
 
 	if use X || use egl; then
 		emesonargs+=(-Dglvnd=true)
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 3ce828d71d5e..5491f9d41206 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -12,6 +12,6 @@ AUX openctm-fix-makefiles.patch 6672 BLAKE2B 5cc7ad6b882bd4bb3cb05d112dd953807c0
 AUX openctm-no-strip.patch 1654 BLAKE2B e284556eb0d7866e527002bdbf291701654dd99a8353592c1dd5f93f6f74bbe4797da4bbc7960d4d7b875734fa4edbff68032c6835cbb26c0bb6f9cf0a471df3 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
 DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6
-EBUILD openctm-1.0.3-r1.ebuild 1415 BLAKE2B bf2c58839ee94c3e2a7f9265a2f9031bc27a494f4bb9977e317fc99fd98b1712bbab90372dcda5a77483cc6dac67a60725a885896b7b67f8c5185fcea6ebada8 SHA512 9e25921489dd8476d8418dc8c62684de641d7c21fde7aa3a7d89103d1e62c680d9919c7fe81524f305a6b0ae763cbd127ba08a9063d6e5287580ba509a8b22d8
+EBUILD openctm-1.0.3-r1.ebuild 1408 BLAKE2B 58ceaaf66b0e27e567ea1fa03e2733df059fe3c2460c270315aff4d78d4e5431c84bdccf87f97770c32f3ed9eccd9185309a72c5b4c8ecb2ad2ac4a4cdd0f7d0 SHA512 383cad1ffdbdbd7238d5be19299a82dcca03a52764e7cd452dddf86579234106fadcddd298483058291695558f6e630c79a3c734ae0dd05aaaf3745200b846b7
 EBUILD openctm-1.0.3.ebuild 924 BLAKE2B 1cb9e32be2a294baa203a10675fa9b33321625a7c5129af388f906a96e3de4762d83146197b835032f9d78a511cd42f0920d27e5b7ecb4f035a934863d8cf6c5 SHA512 a75a3bb34941102b35be2c17023c5af6dba7851b322969bfa3fdf698fd20c6b4b632cd1c7e4c761046f4744616163ffbea45be80f71eee9bbe3c988d3ee92f0a
 MISC metadata.xml 665 BLAKE2B 04fec51f9d81997088613e4ca3b4d1d12643e597bbd91896d78a06c90886abaa857785895e8b29b8284afb975594a68c0a046b050360ad971bf964e596398bbe SHA512 79591a66512551c42e4d28d9abaccd3a564b0fb89fb12b52bba9b130704bc6f04d13565f7b0ec41f7b7b79454d49c2002e0aebf48e7e71665c78f8de2f9cb201
diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
index 60585930f8ea..e4014df8c998 100644
--- a/media-libs/openctm/openctm-1.0.3-r1.ebuild
+++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit edos2unix flag-o-matic toolchain-funcs
 
 MY_P=OpenCTM-${PV}
 
 DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
 HOMEPAGE="http://openctm.sourceforge.net"
 SRC_URI="https://downloads.sourceforge.net/project/openctm/${MY_P}/${MY_P}-src.tar.bz2 -> ${P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/1"
@@ -18,17 +19,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="
 	dev-libs/tinyxml
+	media-libs/freeglut
 	media-libs/glew:0=
 	media-libs/pnglite
 	sys-libs/zlib
 	virtual/jpeg:0
-	media-libs/freeglut
 	virtual/opengl
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/${P}-escape-hyphens-in-ctmconv-man-page.patch"
 	"${FILESDIR}/${P}-link-ctmviewer-with-libGLU.patch"
@@ -53,5 +53,5 @@ src_compile() {
 }
 
 src_install() {
-  emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" -f Makefile.linux install
+	emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" -f Makefile.linux install
 }
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index d9e48e93f3f1..2d57a65fd1ea 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
+EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
-EBUILD openimageio-2.2.9.0-r1.ebuild 3688 BLAKE2B 649081db83330abd7e0b3cdcc8832f5d505d1d472c5cc6c597d96ad5093c9d8a52ec6006121cfa7dee593bd486a1dd3c466426d07ff4fbe75364831c3c8e6376 SHA512 6ff1a5b43cdfba2b3278ff973389005161048c77398bf435e12f8f798a5a1822eb076f65ea8c3a4263a498c432503e334d01f40a5771bcaa8e675f0a7c70dd31
+EBUILD openimageio-2.2.9.0-r1.ebuild 3687 BLAKE2B 3f0380beec5dfd966da462aab996e0506c99c008566dc1505adee0b4db1d47b09b621a8793beadaad70528e331255fb5b9ffb04f66c3324450d1e700abcf58c7 SHA512 73cba82babf4d722c2e832aca2c2f26b02740d0fbbae77ef85bfbe866d368b04cdd5317925c6ad05d853ee44453d67879200e634ab7a56b3499b67545185239c
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.10.1.ebuild b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
new file mode 100644
index 000000000000..8eb2ae36862a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
index 3e0eafee8bf5..fefae14a27c9 100644
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 244690f60adb..6717a506e69c 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,6 @@
 AUX openjpeg-2.3.1-CVE-2020-6851.patch 1240 BLAKE2B 440efbd4960def0c98cc5d1874c2261ae263d3a398bf1ed14cb1bdc151ba2351c8d9899d498ea4c103acbbfb85924f6e1ba1690c7d6be46b444946f18710b82b SHA512 c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297
 AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd372b625bcddb01e532cbe418b718560729a09e332eefc066da05b1169feda056d9a518858cce4b252b28a2005ca6763d5b3d7 SHA512 9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc
-AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
+AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B 263542dad18e40fca5e890da50c6ff756cbe1f5318fa142eda05af9ab7b65c7616c25505e0ef36047665f82b6498e5621cb6fe5dcbeaa0f7349fa641b50d6cac SHA512 5ef0dd098c00ab02284731999e5448997364e84e6b1a85028358b8a6cd8c8ba7cec08c9950d78e7cd7c4ac1ec6f0d09e178082a1c34de3bddfc9909c63f10a1f
 AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
@@ -10,5 +10,5 @@ DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
 EBUILD openjpeg-1.5.2-r1.ebuild 1913 BLAKE2B f4c33d64895d505111a21aced86118570dae58387e042183be1117e95d39e32a34b57e78ea7f31ea1f09d6c2163842530a627a1e153a59a92a827db79693445e SHA512 5c36a1e56c4ddb66ec92c8e3044b23123fb3218d425af5143330d1684b8ac8c42fbf91891342e6f3c7efb785134d29409206789b53f85b0cfcb2e2d9f06c4b2d
 EBUILD openjpeg-2.3.1-r1.ebuild 4303 BLAKE2B 956343edd893fa16c00d6d4306f8a74453af590ce932c78f9f0e7b72a0b95ef184c897ce850840b03f9dabcc984321ac38f93ca9ca36b9a95e00fae0bb24dbed SHA512 6ae0ef7e1380aed0d218d933e8d4fa0e43208bdaf45da43198964f1cafa72f8a0eaf70f19ef7199ef4a2157a8f59684d8e4e6b1ed500e3f6eb150fc50ae7dc3c
-EBUILD openjpeg-2.4.0.ebuild 4463 BLAKE2B 3c047be61cf552fdc8729c9c1c56fa6be8f25caa16473d3b3d883ff639367fe1e47f2adfc72cdd355179169d3540635cc26b27e1d7d02589bbe15d5984a0ae60 SHA512 8b8950746c87fb0734b6d1c307cd4c9d3a2b3c0bf4cbae47d46c65d56df3f32163baa3cffce2b8f7eb2d60e497cde5bf91399268e102ee01751bb48eddfb6621
+EBUILD openjpeg-2.4.0.ebuild 4461 BLAKE2B b79a28655f492c4e0762ad50a8c44e1ba96476d8d575df9f14ac1811cb5aeb142aeac4beb1d652a5772c2a15ed6ea58d5ecd80f827e63d578c763208c804d931 SHA512 a6b3397492243f211427ef62ebd01e1632e25a96dcbff9fc01f8dc8050b9e50450c3abd4b050aba8b76ab93b3b424a62c200c0e542716517239819fe35d3e15b
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/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-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 5aaab89871bb..58bad868b8f3 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index a0469caaafa3..be887c8fed0d 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,5 +1,6 @@
+AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16091b8eaf9c426cc24444a041949a6747fe134020261131f0681448111d2558b85391308157c828a96ea1b046c7d1 SHA512 bc1116ff941c88418e79bb35e1f08828d637e4d2d3192c1e808b1d5adc02e1942f968f49805365cb7a34817f119e24d8d9c3baf2133c77b91ba79a3e4446d249
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
 EBUILD sbc-1.4.ebuild 875 BLAKE2B 42fddd2460c78eb9f19ad8d9f8bcbb8c85445aba1047f74e31280650058d30cc8446bcaecca6f2580c0d8645939bcdc858e59e9eefd15d093a0e864a1a633328 SHA512 f079230625d2221aa87ba9ab43ef564052916ed86ca9be200b71739c472818272e497129cc3bfbb351cc49f03731ddaf3baa7a4f0d57e596a6d240fb25e8d45d
-EBUILD sbc-1.5.ebuild 844 BLAKE2B 973696eaeecb53c6c062dbf5c5bde603ea16902d0b7c086fd23cfcb4cd41c0df1587b1fe09e022da75db46b1d180ff60dfe30f0cd0a420357591730c76839a7f SHA512 148764f8f823517a6014520b43a9d2732c67d1f9d939a0f873d457bc91b3c466e82985dfa2914ca6bf267fbc9f95a819e19afd5e563859c0c4d7d73cb9db475c
+EBUILD sbc-1.5.ebuild 896 BLAKE2B 8a531b20a7aa493e4e49e77a81875a4ab0a3fb8bec78ce54055de9f506a3bd1200045fa7d86061a3568196cd502c5ca89d6bfe4a36dd7183d9db89967bb4981d SHA512 bd43e05c8cd616e8bff58a80b84192faa978e57fcfbf2d9ee07dde61bb5453e927ea08f0bb62aafcad4c03efe6a641a77f315c8a1d4cc11299c8d786cc1fbc50
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
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..91d43e28d957 100644
--- a/media-libs/sbc/sbc-1.5.ebuild
+++ b/media-libs/sbc/sbc-1.5.ebuild
@@ -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/Manifest b/media-libs/sdl2-gfx/Manifest
index 1092e4e6126f..ac5543d69679 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,3 +1,4 @@
+AUX sdl2-gfx-1.0.4-slibtool.patch 611 BLAKE2B 6cc3c43023133475bb71b51454430a41bad25dfb525d42cabdf4f42472e53d2ab6e7c70dcb58a364ddc7b755b5517ad03f4324a3bb7c1f61b9c5ad253ba78fc2 SHA512 932808bdf1a0d9c4a0a74c12ac32b365446122880fac0c23c12af342602121a9c93a5ebea6274e51b2d5b3ed73d6f876d68ec53c8280ec2ad31d53c6a9718bcb
 DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
-EBUILD sdl2-gfx-1.0.4.ebuild 1070 BLAKE2B 6eab3d78de54c079d17f8f6db470886b715e7c651134e7d6c6d223d60cfc5a80df9e9461caf598f1684b7f9faf6bff4103e6aaa9bcf4646b103785eb28b72ccc SHA512 2c4fec1bf3034b956892ed4cbfd4b7bdbced7b060e485733f492a747217ae94028f7ee01582f3de5b4e0b67ef62cecda1bfea50a9b3034fbb489d14178b38dbc
+EBUILD sdl2-gfx-1.0.4.ebuild 1125 BLAKE2B 66d7bfcd52ae2ad4175269d5425727f0b5c2f3636e4b5bcd9c64e3791dbc328c417dbbf1af63b6bcdd3834a89ce7bf748f29e732c59ae8d8018dc318863156f3 SHA512 ab6a0f04d27f929dc1d11e92a35303d801441d82a142cc42312d4bea43ad834fb12fe6311989a3f85b9ad86d730af462065a32aa6c3f2d1e2308769c29c95399
 MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4
diff --git a/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
new file mode 100644
index 000000000000..3fd3b8767fe1
--- /dev/null
+++ b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
@@ -0,0 +1,29 @@
+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
+@@ -21,9 +21,11 @@
+ 
+ libSDL2_gfx_la_LDFLAGS = 	\
+ 	-no-undefined		\
+-	-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 860562eafdb9..494a39f77f5a 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/simage/Manifest b/media-libs/simage/Manifest
index f9dcabe965aa..7f7832908743 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -3,6 +3,10 @@ AUX simage-1.7.1-disable-examples.patch 1803 BLAKE2B 93c4ef68fa3e2e1db406c7fd3fe
 AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798e3c93034e7e4d17e1bf5ba5f9921f307e52b87f9d3e02babfac83e40eed401f98db8a225f404fa248957f41b03e360541e46bc62c893d099 SHA512 4a25f0f54a609c613e4f7baaf87a694e246b0c283cf85195e6d272826deb95dda9106125925188e785a2c64c2ed9633465ceb76b2b816e463cfa063ec16dffdc
 AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e
 AUX simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch 790 BLAKE2B 117b907b783404e4e8d03d09ca66496e0fede9bac5ea056ca4489140e9b0532ba585ebb4e75aec47a85e16b88a027fc7ec95297df4fed44a880ad4f0855b17a8 SHA512 692d3741b059148ce1190425319862fdc4299d7efc3a392aee91b60b5575f4702c5f72a066a70984afb14d68fd561f03c76f3ff76894aae36036579272f0f9e8
+AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f
 DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f
+DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
 EBUILD simage-1.8.0-r1.ebuild 2239 BLAKE2B a9a205e8eab2e7593e81f5cea619764fa92e5ea6ee6003f39ec02bda59c84a9082c59ced21464d7a9484f11b3c522da4472f2fe275d18178d48af468d62d32da SHA512 5c890d96f4507fc924d0967b42327bcf099c75eafa8f748eae08e93836a6f88f87ced49f602371f447717f415e61ede23ef5ae78b63105ffba437bb9ad5dc885
-MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
+EBUILD simage-1.8.1.ebuild 2071 BLAKE2B 883d79364c540d18a3b4934c4ae7c658274c43342725cc726eeb57e8a72b6f2e7bd98151600545c723d54b1b7b84b24b241b350c4f240ae1b4859a1768771a4f SHA512 23f40cd0dc71d80973510dcc197d0949973938094b9f96ce29521b0ed881cdb4a3b530393ef2e9d26542171fa35a0ce4012542ad219674bef861d7e3ef4d6046
+EBUILD simage-9999.ebuild 2078 BLAKE2B 7c0186b12548ce1da4c960d1fdf0e7098f2bd624263b0f659acf8260107c33a6fd435199ac210618f6df7fa4fc6e05b6fb88753320eab7c22a9d276c7d6c1dea SHA512 373dcd2cb085ca0f7fa689eeadcf872416721ae21e0eda77de5ca8ababee10e701fc8eee361318f65da5afae76f48d3a725a540dd8f0bb6bfdf971ee4c90bce8
+MISC metadata.xml 297 BLAKE2B a6b86d0b1492873d329613ad09de390097f930f3b6782979bc15d2c20ec06f74b49e58db89ed76d955fc9c6ee7d5b854498e3d4b10763f6f6b2a17f4eee3f4e2 SHA512 8de4e504b13d7a98b5bb90a634c4dd5009688b6f9b78ed2504970b5bedcd4abfa4456db084803b63fd4ea4d88c4f9cdf4bac624a671663b079dad513b41328f3
diff --git a/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch b/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
new file mode 100644
index 000000000000..341cee6db318
--- /dev/null
+++ b/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
@@ -0,0 +1,28 @@
+From 8c4fda363a940a365571ae0985e742f7df1f9620 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 13 Jan 2021 22:03:46 +0100
+Subject: [PATCH] [Gentoo-specific] remove RELEASE flag from pkg-config
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d869715..a980571 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -794,8 +794,8 @@ if(UNIX OR MINGW)
+   set(PKG_CONFIG_REQUIRES "$<$<BOOL:${PKG_CONFIG_REQUIRES}>:$<JOIN:${PKG_CONFIG_REQUIRES}, >>")
+   set(PKG_CONFIG_REQUIRES_PRIVATE "$<$<BOOL:${PKG_CONFIG_REQUIRES_PRIVATE}>:$<JOIN:${PKG_CONFIG_REQUIRES_PRIVATE}, >>")
+ 
+-  set(PKG_CONFIG_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE} ${PKG_CONFIG_CFLAGS}")
+-  set(PKG_CONFIG_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} ${PKG_CONFIG_CXXFLAGS}")
++  set(PKG_CONFIG_CFLAGS "${CMAKE_C_FLAGS} ${PKG_CONFIG_CFLAGS}")
++  set(PKG_CONFIG_CXXFLAGS "${CMAKE_CXX_FLAGS} ${PKG_CONFIG_CXXFLAGS}")
+ 
+   # PKG-CONFIG settings
+   # according to https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+-- 
+2.30.0
+
diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml
index 5d644615b938..3a028eb34dfe 100644
--- a/media-libs/simage/metadata.xml
+++ b/media-libs/simage/metadata.xml
@@ -5,6 +5,6 @@
 		<email>reavertm@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">Coin3D/coin</remote-id>
+		<remote-id type="github">coin3d/simage</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild
new file mode 100644
index 000000000000..abb7ac24fcbc
--- /dev/null
+++ b/media-libs/simage/simage-1.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://github.com/coin3d/simage/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
+else
+	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	sndfile? (
+		media-libs/libsndfile
+		media-libs/flac
+	)
+	tiff? (
+		media-libs/tiff[lzma,zstd]
+		app-arch/xz-utils
+		app-arch/zstd:=
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/opus
+	)
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( media-libs/libsndfile )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.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_TESTS=$(usex test)
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
+		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-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)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild
new file mode 100644
index 000000000000..4dc309e659c7
--- /dev/null
+++ b/media-libs/simage/simage-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://github.com/coin3d/simage/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
+else
+	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	sndfile? (
+		media-libs/libsndfile
+		media-libs/flac
+	)
+	tiff? (
+		media-libs/tiff[lzma,zstd]
+		app-arch/xz-utils
+		app-arch/zstd:=
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/opus
+	)
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( media-libs/libsndfile )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.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_TESTS=$(usex test)
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
+		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-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)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 5cbbe05f2f8b..3dae2e3f6103 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,5 @@
 DIST sratom-0.6.6.tar.bz2 347297 BLAKE2B 0cb1949486deb5e8f823b17c98fb415dc44b0cefece647b6c5b3646438736ee9c7afa617bb00a68d61a31c80f6e643758f48602f647655aa4b185b2cc5fff893 SHA512 ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55
+DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
 EBUILD sratom-0.6.6.ebuild 1209 BLAKE2B be014a842a28db8afd3ac90a90ce18da79a6a6cd04a7b775a59977f63c4ccb72ab25ea084357ec90ec1f2928dc61a3c01694155f564f5c3bbfd50e15b98f47db SHA512 c5dce50fa212e1a3563d6de8939ab46e81cb3394e386578d70e1c15f6147e5ebc7b2e2c288040f8d7531d6dd169dded9242b050670dc7297252af7b6771f329b
+EBUILD sratom-0.6.8.ebuild 1227 BLAKE2B e5e0782b5fdd40b3ebed3b9063a1bfd2f6d87dcddc162e2620f28cc4caac11f516619e883dd93bfa6245b5f1dbee9e4652e1a399376b46bef19f891055d3d418 SHA512 8450e09b501a9c10d11ec02efc7687eadffff25e9b5bbceca8c7fd52591a50329adc4f05be551aae15904ca37a905566731b2d16e85fba4caecd1f7a25b57045
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
new file mode 100644
index 000000000000..b3294902ca69
--- /dev/null
+++ b/media-libs/sratom/sratom-0.6.8.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
+HOMEPAGE="http://drobilla.net/software/sratom/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/serd
+	dev-libs/sord
+	media-libs/lv2
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 66bb7056f605..89f52afb84a8 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,5 @@
+DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
 DIST suil-0.10.8.tar.bz2 357003 BLAKE2B d5445a8a539d3aaca94141fe0a7bfce976db9602fcaa563d0e5661ce7d281ac48679110e5545d3a3aa4d3c488c5ce7a00f2f06bd67e56da26943885a71480648 SHA512 1d68996756ac593b2b2da6d9554e3257944cacbc8d70d90ded0f6ad5b5877778a08c779a12c7b4527d492f9c480613e030ab6933532f758e16221daa9d5c2dd4
+EBUILD suil-0.10.10.ebuild 1039 BLAKE2B 6b3daca525992b06a1aadc08d11d69af004c2fc6f558d67d156780afd60ca294421d4502e074b2daa59852b73f37bfa284c9ffacf752091495109bdca19459d0 SHA512 83e33aa22d5805fa6c51ed625cae1db27c304afae053cc42d7a49ee7e129cef1fca5128a2d182092eab145c9ef16a64ecbc919620521946eda7bfc5e5e72a981
 EBUILD suil-0.10.8.ebuild 1035 BLAKE2B 18df0a00bab2c43851ebb6459b109778360d69bda164a340f6a5c19193ac90ace15421ce680a0dc99d9b9c20070f6c28cae6d92fbec515b85917796e5e84413d SHA512 e6751b93b4b06c3fde428c53538460f2571218e588992b781117c83b1791bde6e79931be2ea3d7ad6ffa5afbe65e2ead6fb616c07fa96c61989ff02a875e01b9
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
new file mode 100644
index 000000000000..4dd9b8aea8ea
--- /dev/null
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
+HOMEPAGE="http://drobilla.net/software/suil/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc gtk qt5"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	media-libs/lv2
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(usex gtk '' --no-gtk) \
+		$(usex qt5 '' --no-qt5) \
+		$(usex doc --docs '')
+}
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
new file mode 100644
index 000000000000..71545a1de1ba
--- /dev/null
+++ b/media-libs/svt-av1/Manifest
@@ -0,0 +1,5 @@
+AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
+DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
+EBUILD svt-av1-0.8.6.ebuild 1122 BLAKE2B f0f3d148a69c3a95d622d165a6091f77b6c3ce5c67ff42d1ed7875bb71192541c35c8c96476171dbbe572eee1ba3c651509cf52dab98399626bd5788b0eb962f SHA512 2ba17f2c63f9f9c746e32e93de6e692fcb12c86fbf5d684804258ca20c76159e6324e30e8cbc8a9f374acc3953627caca730a4e2278e1e22fe03e80dfa8ac46d
+EBUILD svt-av1-9999.ebuild 1055 BLAKE2B af96eb94a47185ddf01ef21ccb5044ecdaa5ea3eee428a05de6bad22022d8777d4dfa31a6de1290200504d01b27a5129fa92b02832eaeadc653b8043b98be589 SHA512 45326879f4d0069b712a1ab85a5fa4b1ab4324f7eeb21c7735821dced5e638bf7430e4f2357511cbc2f596d7364316268194a406981e6c7fa617cfa8d077535d
+MISC metadata.xml 531 BLAKE2B b276b87582bf66d16429b34b3c55c522b459700dd11010c85210ba8377538bd91b74fe65f6464dddef9f3aca809b9d2e836ce67875574960a6dbdfea34fb9172 SHA512 99100bbfcbe32caa3d5a80121a512802cf01da9b439b5baae5ca88a694658a50783d42bd047e349367a42dca2c724684bbe216fdc8e433d8aa4a58ac9cfae2c6
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/metadata.xml b/media-libs/svt-av1/metadata.xml
new file mode 100644
index 000000000000..ba30acda57ab
--- /dev/null
+++ b/media-libs/svt-av1/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>Theo Anderson</name>
+	</maintainer>
+	<maintainer type="project">
+		<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AOMediaCodec/SVT-AV1</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
new file mode 100644
index 000000000000..d7d8df53a362
--- /dev/null
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
+HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	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 ~arm ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	S="${WORKDIR}/SVT-AV1-${PV}"
+fi
+
+# Also see "Alliance for Open Media Patent License 1.0"
+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=(
+		# Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
+		# undefined reference to `ifd_inspect'
+		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
new file mode 100644
index 000000000000..9bd9658e06a6
--- /dev/null
+++ b/media-libs/svt-av1/svt-av1-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
+HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	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 -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	S="${WORKDIR}/SVT-AV1-${PV}"
+fi
+
+# Also see "Alliance for Open Media Patent License 1.0"
+LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
+SLOT="0"
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	local mycmakeargs=(
+		# Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
+		# undefined reference to `ifd_inspect'
+		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 0044b9f8d126..b5d39263e389 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -6,6 +6,6 @@ AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca7
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r3.ebuild 3556 BLAKE2B 223936590be67ab4e1f65849b32ae8088f96a826545e1e6335cf8ee32f8151bea532aa7c4bc04e3f4c1ba0158ad146fea881a1054e899bcec9c5cd27ed3f3091 SHA512 534f2bf41aa9882d03382bbfd4d41d821dc194d218f20872cace7fecc3a47fb412743fbf04617f3633006855eb41331fd2fc4206d0620b38a4508e85ce5fea82
+EBUILD vigra-1.11.1-r3.ebuild 3537 BLAKE2B e7ada91c5f71a9585e7735478c691817f34096ae835d888020a4820e20fa3908d117e0639e93d2ba186aa0f636fb07a7ae4dd53e4cb86170458b6bbca7b068ce SHA512 2e69ca19f10526acb187da1524d12cdd498dcd30fda90955add22276d7d9fa2ec91dae57cdd6876b9bd95fcbc8d6caa420ceed27b181ce49a870f0eadae52dd4
 EBUILD vigra-9999.ebuild 3907 BLAKE2B a428dac82f37a2d526cbe757da1363dd9a968c2e970bf91fecd3f8d3ed1204f5344df2f3b29ce7a370e8801f9d5fa6480b75adb113bc0dd41c65f7fc49869ac4 SHA512 f539813b694eda28dd26b4fca29e6f1b0c3daf3b04eac13ac1c71406632ee0b9f1f066ce26f7a067b74cbb624a9396ba3c71196f6802c422dabe45dee25ca0c2
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index c9dfc49eed8e..f3b56a52e27c 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 inherit cmake python-r1
 
@@ -97,7 +97,7 @@ src_prepare() {
 
 	if ! use test; then
 		cmake_comment_add_subdirectory test
-		sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
 	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /media-libs
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)