gentoo resync : 04.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
commit: 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree: 44068672445b1418489aed82de58df3c470289e7 /media-libs
parent: 0f15659d48c193027158492acb726297501202c5 (diff)
71 files changed, 2042 insertions, 360 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1572322395d7..28554f3f3fce 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 693c1367baa5..9cba26b72a43 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -4,9 +4,7 @@ AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa7
 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.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
-DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
 EBUILD allegro-4.4.3.1.ebuild 2977 BLAKE2B cb8b478a8970c24c7fd7c2a6c8650d9263762d3e67971c94e33466ecf95a357a8e9df3de78a8618730c97d48cff6e638b242f55718a2ea66dc07911af966950b SHA512 e9fbde100e978f62058f446378b0514e62e315a8e2a869623168e3bbcd4f057d67a9b7524028d6d1fd8afbb423043486942701fb215d37d7dd35c50e5f2c56ef
-EBUILD allegro-5.2.6.0.ebuild 2969 BLAKE2B cbc457b3bc7486368625b4e68f0e2113bf2ec6d7c8c06ac2a04f2f52845c3d24bbb35ebb421d3a036daaec70d08384a803fd6b9c18af3d6407f05c1af55b8ef5 SHA512 ae3061752943fadcfd1500014476f164699233d54a4d1f853f852476fd0e65d04a6f4942283a9bbff37fc29020506f987a80b8e8d792f9978c084f633d7d43fa
 EBUILD allegro-5.2.7.0.ebuild 3244 BLAKE2B ae90976458b74539cdcb9260ebd7195a1912b41e0250abf0525b06d3bcfef02311e47ad65031672c9d777a86e5a287165b54a889e7ac0a668ba4412107304aea SHA512 35371b138febed8ee87b66fdda167bbd84f31b573382e6b648d16d77aa78cb20cf10f7acacff8059577068cc46172167e08d9b015b36848deddbd2f5c3d37a51
 MISC metadata.xml 1094 BLAKE2B 30dbd9ba5a9ac1adebf1eee05ced31ede45b3e3fdecd519a26c073f827af8188137592242c31c42c255d20dd8cc0ec541e8fe48c2748228934bfe98d44451012 SHA512 45d218016b3832602248801701c9c53ba79a82fdd35f776ca7bf845d9862ee62252d3899699b463bf81019823f91d025c9b539f984781e36e08cb4d9226ef0ce
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
deleted file mode 100644
index 32f11a6aac4c..000000000000
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="X? ( opengl )
-	xinerama? ( X )
-	|| ( alsa openal oss pulseaudio )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	)
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
-
-src_configure() {
-	# We forego freeimage for now because ebuild is not multilib
-	# No known consumers yet anyway
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_DEMO=OFF
-		-DWANT_EXAMPLES=OFF
-		-DWANT_FLAC=$(usex flac)
-		-DWANT_IMAGE_FREEIMAGE=OFF
-		-DWANT_IMAGE_JPG=$(usex jpeg)
-		-DWANT_IMAGE_PNG=$(usex png)
-		-DWANT_IMAGE_WEBP=$(usex webp)
-		-DWANT_MODAUDIO=$(usex dumb)
-		-DWANT_NATIVE_DIALOG=$(usex gtk)
-		-DWANT_OGG_VIDEO=$(usex vorbis)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OPENGL=$(usex opengl)
-		-DWANT_OPUS=$(usex opus)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PHYSFS=$(usex physfs)
-		-DWANT_PRIMITIVES=$(usex opengl)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TTF=$(usex truetype)
-		-DWANT_VORBIS=$(usex vorbis)
-		-DWANT_X11=$(usex X)
-		-DWANT_X11_XINERAMA=$(usex xinerama)
-	)
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	local HTML_DOCS=( docs/html/refman/. )
-	cmake-multilib_src_install
-
-	dodoc CHANGES-5.0.txt CHANGES-5.1.txt CHANGES-5.2.txt
-	doman docs/man/*.3
-}
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 451f8e68bc7f..9eefa5fa29a0 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,8 +4,8 @@ DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9f
 DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
 DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
 DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
-EBUILD alsa-lib-1.2.4.ebuild 2183 BLAKE2B 0ae13b0987dc0f55b08b2cc7e6bf565acc782469e7502512b4bafc6cd7ebf80ce54dbbd492cd3d11e8bac04f00d3df50777f92504bf482a8bd03086162d58459 SHA512 68e17a8e334f955cc403386f0e430d07ea9c116c21450fbdf4d071e68e260bfe6189ae612fa4b5efd88d4562885ab84824faa210d5736b7879e36e0dcb9de979
-EBUILD alsa-lib-1.2.5.1.ebuild 2511 BLAKE2B 431c692b5ae0ffca98f1100e34abfb64bc93a38a0faba2486c676a21482d156834d766252283f7f689ca8ceda3dc7294f7acc7ef52e4eafe983a7bdbc5cad5d6 SHA512 762f28d5fb7e082f0c3117532aa88f4da0f60a939514ca441cbcb6c48026572a7b85a934eccb27058dbd412356a5a66f615328c4b13fe759c3f9ac46107937d8
-EBUILD alsa-lib-1.2.6.1.ebuild 2511 BLAKE2B 2adb52258bd8023fb8f3e78f62b1882cfa3bff008a59c482091dea745bdaa33ad4e8494581dcc6fd2f6c5d1072eaab21f5dd36d1dae6d4c5ab66dc00c2a50fb8 SHA512 cd8f1dd437a86241142040b762c7871035725e7685fc076635a87d802507d86a27ce6a3f6fd52d969c550bd5c1418885ea2c44392b1d5cb1b1dd6926127c89b6
-EBUILD alsa-lib-1.2.6.ebuild 2511 BLAKE2B 2adb52258bd8023fb8f3e78f62b1882cfa3bff008a59c482091dea745bdaa33ad4e8494581dcc6fd2f6c5d1072eaab21f5dd36d1dae6d4c5ab66dc00c2a50fb8 SHA512 cd8f1dd437a86241142040b762c7871035725e7685fc076635a87d802507d86a27ce6a3f6fd52d969c550bd5c1418885ea2c44392b1d5cb1b1dd6926127c89b6
+EBUILD alsa-lib-1.2.4.ebuild 1986 BLAKE2B 75c4ca91c6f79e7a639341f8ea27f11ef704c42ba00eb9dc0f58884d257c505b069433559bbab92db87113bdf050e1c611131a02c989465957d17f3c92b6a3d0 SHA512 2bb97a7ae3fa3e7531957e42e8978fbd7b41408671db0f906c668687897180f168db6d0e67a354bc687f873cc95156921b6277f4c8bd335feadd0bbe5ebb528c
+EBUILD alsa-lib-1.2.5.1.ebuild 2314 BLAKE2B 00075780d4b4f7421556ff3ea10965e9f8a98433f786cc539fd72f3e039098f10a11cc7fa69f3d5a2b63f0f3297b40eec28afbed912e812452b8f2e3a3adbcef SHA512 159fb7ca0549fe84b86d9faf3e1f9b98d20b57be00b1d1055ba1d1926998c52e30838029907b74523b706d9fcc30fc2a3ac19568df3e083e00aed1da9fbd04d6
+EBUILD alsa-lib-1.2.6.1.ebuild 2314 BLAKE2B 884305ffaf821401f6b9f20726612d04ce65beb330c122c45a99540062fd96270c4872b02e1743a98cf7045b134d34121a4b7924568e24566f332e4b8cd562df SHA512 8acba14cf89e03f43e9b0caece170688b1139a49c65dd80ed62a044f20721787b8b341d2985e3e771cf523286d97059ffae2048696ff7cf2bbaf05a4be27e29e
+EBUILD alsa-lib-1.2.6.ebuild 2314 BLAKE2B 884305ffaf821401f6b9f20726612d04ce65beb330c122c45a99540062fd96270c4872b02e1743a98cf7045b134d34121a4b7924568e24566f332e4b8cd562df SHA512 8acba14cf89e03f43e9b0caece170688b1139a49c65dd80ed62a044f20721787b8b341d2985e3e771cf523286d97059ffae2048696ff7cf2bbaf05a4be27e29e
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index dcdaabb33203..a79d156fc211 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -35,10 +35,6 @@ pkg_setup() {
 
 src_prepare() {
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
 	# https://bugs.gentoo.org/545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
 	default
@@ -58,7 +54,6 @@ multilib_src_configure() {
 		$(use_enable alisp)
 		$(use_enable thread-safety)
 		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
index 78afa733c3c0..5bae5dbf8736 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -42,10 +42,6 @@ pkg_setup() {
 
 src_prepare() {
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
 	# https://bugs.gentoo.org/545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
 	default
@@ -65,7 +61,6 @@ multilib_src_configure() {
 		$(use_enable alisp)
 		$(use_enable thread-safety)
 		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
index 1b9c1819ad93..c9ea9965ca37 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -42,10 +42,6 @@ pkg_setup() {
 
 src_prepare() {
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
 	# https://bugs.gentoo.org/545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
 	default
@@ -65,7 +61,6 @@ multilib_src_configure() {
 		$(use_enable alisp)
 		$(use_enable thread-safety)
 		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
index 1b9c1819ad93..c9ea9965ca37 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -42,10 +42,6 @@ pkg_setup() {
 
 src_prepare() {
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
 	# https://bugs.gentoo.org/545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
 	default
@@ -65,7 +61,6 @@ multilib_src_configure() {
 		$(use_enable alisp)
 		$(use_enable thread-safety)
 		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index fc232c1090f6..216e5304643b 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -2,10 +2,12 @@ DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2
 DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
 DIST alsa-ucm-conf-1.2.6.1.tar.bz2 27682 BLAKE2B 12ff26daefa4ab0c66d1d0778dfd8a588a30b331dcaa783350510e439cefc83c15422b027ca2119d5a1ecd98257c3f2022219d4096f0d1d3c5122b69eb396e48 SHA512 2fca5f6dd87ff46865b57c6224aac9d0a8ca6f09f26c4116b0b0db6379236db7322b240186e3bef05e97c4ccbbd12a73299aca35d85aed0cb20b0019696d6a16
 DIST alsa-ucm-conf-1.2.6.2.tar.bz2 27720 BLAKE2B 98d0ad854b510f8ef41d014686e87776141cb8d3cc2989d5e91407bd2b412c0cb986d0ed726c9849bfc99472d6ca1f875e4c3ce16ac1b9181f031a210f13eb13 SHA512 d7122279bc36ab16dfe1a5f2e24b9dda57e1b59b7c7aeac3c8755af62b464053ed038aa56ebb52d7707ecae01674cac920ea784bb7493d978276a98cbf78d873
+DIST alsa-ucm-conf-1.2.6.3.tar.bz2 28153 BLAKE2B c14e50f2bcf95fbc038d3b2b5801850d4d22ab041fdb57dd9f4b161a748326671687585279801a9d3f803abd3d253d86b6b3e891e8c3024c5641f8a24ccccbb7 SHA512 14031173dd9b44c506f13172fcf89d1119e4b2d409a749ec8ef4948e75231a5e5091206e826dff9e70f1f803de8cfb9fd94886ef70764c705f65c1c7ebdf649f
 DIST alsa-ucm-conf-1.2.6.tar.bz2 27309 BLAKE2B 4f1f0ff361d11775799a215ffbd85acc229fb25e9e65321147e942ec5168997780003686a98f3d49dadd11cebc3156812d01ebcac385b0b7bbbbcbab78745951 SHA512 5fe85643b60c8defeafcdfcf97e61b5d05e6db28cef2466a70f63b8fffba22bdd50b83a5ca88806a6350de6e9d802dd3c2240b293190b9d05daea515c03d4397
 EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694508771bce1c9e75bafe50e437472f2f3bd33365286526b9f3dc2c4ae70fa199fb08f8d37ef0f9fb2bb9d031763fff3 SHA512 1a3f3b2189b0a198720b84fe730386f285abd8b628ff52dc682813d55f375ee4e37cde4e164bc82738c4b15585e113ffcff29307f0dd057fc6bef2d6c4e09d5b
 EBUILD alsa-ucm-conf-1.2.5.1.ebuild 518 BLAKE2B ec4d80331565113f921b711d4a1d501ff189b614d92989eaa120c480dbbf2e1ad181eeaea6fb696a4d184e20b2602fc7122b1e4e1d4a135f97b4b0b3abb93712 SHA512 76d07e86b7d9af05646ff92ceddce0e10c8cf3bf0c1a0cb6a3645db259c5c2c93c9fe330278a0b6d4dbf8faf40aea31abe7a8c2f50d8dc0723c4f52bc5651944
 EBUILD alsa-ucm-conf-1.2.6.1.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 EBUILD alsa-ucm-conf-1.2.6.2.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
+EBUILD alsa-ucm-conf-1.2.6.3.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 EBUILD alsa-ucm-conf-1.2.6.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
new file mode 100644
index 000000000000..fc541a8256d6
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index da73acaf3c19..09fd2b1526da 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,4 +1,4 @@
 DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
 DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc
-EBUILD bcg729-1.1.1.ebuild 1222 BLAKE2B 762ca156f6cb81568bc111cc1f63c564f7a83489401de8f5dd69d0bcdf4839d8e0c1e12f1285a2bdd4c7bc39c9935396a20b22238f82f0ecbadf8065a9facf68 SHA512 6e02f9d81e5497876c33b73906ad4171a80f3707c0e9ba93bbda243ec71257886a14f20c14862dc8d19ce75865614245c67fc413078896e837595ca9bcab73c4
+EBUILD bcg729-1.1.1.ebuild 1229 BLAKE2B d9aa9d4ae0f3a304a89f49d2217d39c2adc270c962282d5b59f683662319469154c9af59e2a0916f4bcb5bfe70f960778e35ce67a7966fe6fdb0bd17053d1ccb SHA512 f513f12e8ec1b405d61433dfc17410462e0dabe189793e44fc118319e126e28e410a0d8e715985f6b999ab8514a62c47c4400a494269ee597e8a3a1b7e298053
 MISC metadata.xml 319 BLAKE2B bad838641758fb0c37767cb4207f46af8aa011af0fc05039dd43b1d93e40f0052d00b0faede53a166b7e85289acbb98eaaa5bca7587197b85e2af215b1ba028e SHA512 98f57d45a63aab56597dfe7476054304b9b0629053599a5d54f2642616f0832eda39dbbce58f0792d3afa7075ddf9e86d8ea313c60ec69947d870f5ceaf4296e
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index b0918c6a824f..626a270c12b1 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="test"
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 99b4b2ba83ef..b77b1ed54c52 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
-EBUILD clutter-gst-3.0.27-r1.ebuild 1409 BLAKE2B 923ff394d4f3d6ddf1f344091a4c645d5a06cb64426707c3e9939f1182655d250e27d505c244d65c5c1df9b59608a3ddb4fa9c62d4069b3b881cbb0981657ac7 SHA512 5dadcada1be2e340c7c65f9e74bb5a4394dd6d36b0275826609aa49db1cbfcbea6ff0ac7cccb3b0bd33496a587a92d785d6f7aaab497048209aef6a6aaca3f81
+EBUILD clutter-gst-3.0.27-r1.ebuild 1416 BLAKE2B 8f0fed41f60021befde95b344167ae3504aca575e878c4e3738a45e53865bffe08662b5d5717d614bcdf9301612acec7d29ddfa8d2e4b9dfe7ff14587e30a8d8 SHA512 1cf5dff3cb3eac6f009b0be7dd4577b1c47b168cd355021293e70c439672737d63952b38e7d10b8d6bdf2a899ddbe90b088d6c5b2aadd05e967c6deb339ca794
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
index 0f04009f44e7..96cea1483431 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="X debug examples +introspection udev"
 
 # >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 768df491671e..5d41fc151f99 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -2,6 +2,8 @@ AUX codec2-1.0.1-fix-freedv-callback.patch 2395 BLAKE2B 1fc590ea00f7160b301abf80
 AUX codec2-1.0.1-static-rx_filter_coh.patch 688 BLAKE2B 9e80bfeacd28591128c863b81b41b447866b6f1c0c2c20905459c623e4dcf428efbf28fabf4a53470f74e739b55281761a0162112c076ee0c959d2e067b8c0c7 SHA512 abbd495022db2d695708f552a63274cab769f14d787092ca55f9f7f710d3d225e662d510d982553f77d14c59c35be1d82853e7b339bd55c8defb36abe3411e36
 DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
 DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
+DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
 EBUILD codec2-1.0.0.ebuild 713 BLAKE2B 2709cf1ee94f8f3341e054dfe6f0564a9223a64e9cc0896e3b4b32dcf7c86f7a2aac7c75669714da87db9e629ac23cb46b852296f7702911d470b8f7fa5141f4 SHA512 c4a8f31bc89f740d5d14e2fb63936b1a4c9bb15c9ef4aa56d36c9523ef4346ac0ef80848174600d9e7e6d5c745e6665f82ca4b9249f0b07f11d2929de0fe78a7
 EBUILD codec2-1.0.1-r1.ebuild 840 BLAKE2B ab3d64c7a78ce1d4066dcd8be945189cdde4a0cba11556e8b852257dcdc31544ad7a04934c8aa91cc7773802327fd83bfdede314de716dfd5c88678091bfee3d SHA512 562d7765935008a6ad17e5858c4d445b85c703e7a9ed136517016380d13e99888707a0271e9707a8cc82db69343c88b520ed800a8cde5f828e42998b6ef14789
+EBUILD codec2-1.0.3.ebuild 1025 BLAKE2B cbaaee831497ddfa53b7e3c0f95f301de31441805592f9fee71e628bc6369d8a2097a5c27cfbbac5099653d88043d6196e34ceb648dca82bf518f29852dc034e SHA512 a4b3e58d73fb4e0961987f2d79757864ea634d73ba0d2b32b8169ee9add653fae9b94f905abca121b8493529189005dd965108f1ac3ade5f8d554db14a5ad020
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.3.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
new file mode 100644
index 000000000000..4f5d051d8134
--- /dev/null
+++ b/media-libs/codec2/codec2-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_PV="${PV%.*}${PV##*.}"
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="LGPL-2.1"
+SLOT="0/1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples test"
+
+# Not yet passing, but infrastructure added to run
+# Needs Octave dependencies like "signal"?
+# https://github.com/drowe67/codec2/commit/9a129f1b3ad12ecbf3df7f4460f496ee11e49c08#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R155
+RESTRICT="test"
+
+#BDEPEND="test? ( sci-mathematics/octave )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=$(usex test)
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/cubeb/Manifest b/media-libs/cubeb/Manifest
new file mode 100644
index 000000000000..574c237ab7ba
--- /dev/null
+++ b/media-libs/cubeb/Manifest
@@ -0,0 +1,17 @@
+AUX cubeb-0.2_p20211213-automagic.patch 1378 BLAKE2B 4ecf503dce1cdfbfa44601dff21871755515452850ce720c83df5857b55ca8e6ee6b4e39ca204a7d411a6011ab272db50e4e407a59ae1c020609b8f59551fbb4 SHA512 ce7bf7954def11f95e8406bcb9e275680bcb9a072cd80ba49353322356142175317bb11482c912825c3c5e6e66c01b007d5adea8d6024ebb1d51b986d48f72d6
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cmake-0.1.46.crate 15119 BLAKE2B 0889436835c16bc47cdc671615f421a50acf6c34a3ba3b6b8b4289e11bf1b803abd15d88a65ae9c1588586151f467524517e9c60d5dcc820e41ff21711f3a536 SHA512 e2749309055c85baa242cef8d0f4a91eb7e694664c5e42339df8ccc6644d1563337b835d3d931f5a0a75351efd299a21fe6eea497941802ea041916d665c7311
+DIST cubeb-0.2_p20211213.tar.gz 220413 BLAKE2B 65cf123351f1d465e15c3822f4ae2890cb62e7b5cec22beffd444ac452650b71c1bbc71e50836da6d0474ae6847fdf57c4ee85975f26a35f6db4e1f7a21fef76 SHA512 33abe2bc426b06c3c6cb557fe1be62725f1dc56776d02ec6651ef8710d3a5d302b1f730ceaefe516ff1974775cdabd3753f24436c705af3c6e98fd5dabb6b015
+DIST cubeb-backend-0.9.0.crate 5871 BLAKE2B ac8cfd9a43eefa336fbad67c7183c3bd2375f7de36dfe17df55aef0003b950cd8eb45c823b51302f60773ebafbe6de8a80f276f5bc4c2fe250be6073fe95ae1c SHA512 e02c4703b630cbecfbe20bf3193fa88a130385885fecc18c2a8d6e464b13f0f395251afb35049cd1371532e372a6a5addc856e959fd2d6da63615f1cfdb20f14
+DIST cubeb-core-0.9.0.crate 10782 BLAKE2B 60feec670c0d0d74f45a2c8ef4d0d564aae3e79f28087b7392f61baf3a0f31822929cdbbf1dd2506ea5d4249765eead516e6adb8d1867fbc2e77eeec9b06eb4a SHA512 2a7b660f6a1c36e6cbdaef4e26589240675d1e553f75d2093b39e4dfc4c82327ce080f68143e7c8383cb198796d7ab764cd4038532010847d9829b98f07f530e
+DIST cubeb-pulse-rs-0.2_p20211213.tar.gz 37658 BLAKE2B 82b137df7072a048b6115a17a8f973f1464470094468f19c0e56835db6d8d7355115e712b02f29be3055868435c21915423cfc48c8b55f856e0b008f14802e3b SHA512 1bee7bbeacccf31e51a420cb28c37fb6747ff4b364cbf633e18e507959bbf46d4b706b35c7a200421b68295244289a56b4e8193c63f87c5996ddcdfd7c527054
+DIST cubeb-sys-0.9.1.crate 677935 BLAKE2B a6e10ee95e67ef03e2fa1915007a69227b28c0ade055cdff8e7941634690c6f34de8509e9b10b870097f3b17ca478794577a480232534aa1e593b6813eedbeee SHA512 594e7be07e2558ae81506ca52724bebaf51d2b99158af3808edee827f827dbfef24dc9f1a160bf23e3ac39043b17b920578164697f48a7e0fd544c0196b4f773
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
+DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
+DIST ringbuf-0.2.6.crate 18882 BLAKE2B 048402ee7e0fbe81597fa8450a50f89faaffac8dbe2cba1d1ddb870127e0a85f0e4f7553a806ea94530c00e113ee039a9c5df4d5e458bffdd3d483f09b39fc0a SHA512 e8a038342226f13c88137a91c27f14323b02dbafb8991c369c0332024a421edbb797db665e31ff9b35f40147fd1d71235a059930b574195add9a6613312472d6
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+EBUILD cubeb-0.2_p20211213.ebuild 2528 BLAKE2B e4d7e0d921c3b0084aa99b07d27a08f116bdb0ebf7f780333afb8614d7a36acdcd078e82e8ae621e42cca7beae7dd9db0bfdba086776bebebad4293fa7f2e708 SHA512 3015f64f2f8fd5cc6ccbae804a41042772f74a3e7746356fe6cd82f886bb4974a38db7949afaaa4d472ca39d7bcc9c1c07305565769b3fdcf5a98a9c102cc2b6
+MISC metadata.xml 569 BLAKE2B 811caf3735182ee5d94f88c8b4b725deb0a64dda04e211759b2fd3c280a5f87e9c2fdb53dc2ef1fcaa50a83f6feb8ea5b58274815f97c05502144c7d372f8002 SHA512 7a8cd8ed6464e4249aa9ed97bf9f4ec9995b710c39cca631b6e42edbcfd85839815fba00db3577c60f343cb7b805fa97fd186542cd03cae05d58684415cc82a2
diff --git a/media-libs/cubeb/cubeb-0.2_p20211213.ebuild b/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
new file mode 100644
index 000000000000..46cafe446b91
--- /dev/null
+++ b/media-libs/cubeb/cubeb-0.2_p20211213.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+CRATES="
+	bitflags-1.3.2
+	cache-padded-1.2.0
+	cc-1.0.72
+	cmake-0.1.46
+	cubeb-backend-0.9.0
+	cubeb-core-0.9.0
+	cubeb-sys-0.9.1
+	libc-0.2.112
+	pkg-config-0.3.24
+	ringbuf-0.2.6
+	semver-0.9.0
+	semver-parser-0.7.0"
+inherit cargo cmake
+
+CUBEB_COMMIT="773f16b7ea308392c05be3e290163d1f636e6024"
+PULSERS_COMMIT="f2456201dbfdc467b80f0ff6bbb1b8a6faf7df02"
+
+DESCRIPTION="Cross-platform audio library"
+HOMEPAGE="https://github.com/mozilla/cubeb/"
+SRC_URI="
+	https://github.com/mozilla/cubeb/archive/${CUBEB_COMMIT}.tar.gz -> ${P}.tar.gz
+	pulseaudio? ( rust? (
+		https://github.com/mozilla/cubeb-pulse-rs/archive/${PULSERS_COMMIT}.tar.gz -> ${PN}-pulse-rs-${PV}.tar.gz
+		$(cargo_crate_uris)
+	) )"
+S="${WORKDIR}/${PN}-${CUBEB_COMMIT}"
+
+LICENSE="ISC pulseaudio? ( rust? ( || ( Apache-2.0 MIT ) ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack pulseaudio +rust sndio test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/speexdsp
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndio? ( media-sound/sndio:= )"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	pulseaudio? ( rust? ( ${RUST_DEPEND} ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automagic.patch
+)
+
+src_unpack() {
+	use pulseaudio && use rust && cargo_src_unpack || default
+}
+
+src_prepare() {
+	if use pulseaudio && use rust; then
+		mv ../${PN}-pulse-rs-${PULSERS_COMMIT} src/${PN}-pulse-rs || die
+	fi
+
+	cmake_src_prepare
+
+	use !debug || sed -i 's|/release/|/debug/|' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUST_LIBS=$(usex rust)
+		-DBUILD_TESTS=$(usex test)
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+		-DUSE_SANITIZERS=no
+		$(cmake_use_find_package doc Doxygen)
+	)
+
+	use pulseaudio && use rust &&
+		cargo_src_configure --manifest-path src/${PN}-pulse-rs/Cargo.toml
+
+	cmake_src_configure
+}
+
+src_compile() {
+	use pulseaudio && use rust && cargo_src_compile
+
+	cmake_src_compile
+}
+
+src_test() {
+	use pulseaudio && use rust && cargo_src_test
+
+	# these tests need access to audio devices and no sandbox
+	cmake_src_test -E '(audio|callback_ret|device_changed_callback|devices|duplex|latency|record|sanity|tone)'
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/docs/html
+
+	use !test || rm "${ED}"/usr/bin/test_* || die
+}
diff --git a/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch b/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch
new file mode 100644
index 000000000000..5dd4a9553562
--- /dev/null
+++ b/media-libs/cubeb/files/cubeb-0.2_p20211213-automagic.patch
@@ -0,0 +1,51 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -175,38 +175,48 @@
+ 
+   find_package(PkgConfig REQUIRED)
+ 
++  if(CHECK_PULSE)
+   pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
+   if(libpulse_FOUND)
+     set(USE_PULSE ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
+   endif()
++  endif()
+ 
++  if(CHECK_ALSA)
+   pkg_check_modules(alsa IMPORTED_TARGET alsa)
+   if(alsa_FOUND)
+     set(USE_ALSA ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
+   endif()
++  endif()
+ 
++  if(CHECK_JACK)
+   pkg_check_modules(jack IMPORTED_TARGET jack)
+   if(jack_FOUND)
+     set(USE_JACK ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
+   endif()
++  endif()
+ 
++  if(CHECK_SNDIO)
+   check_include_files(sndio.h USE_SNDIO)
+   if(USE_SNDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE sndio)
+   endif()
++  endif()
+ 
++  if(CHECK_AAUDIO)
+   check_include_files(aaudio/AAudio.h USE_AAUDIO)
+   if(USE_AAUDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE aaudio)
+   endif()
++  endif()
+ endif()
+ 
+ if(USE_PULSE)
diff --git a/media-libs/cubeb/metadata.xml b/media-libs/cubeb/metadata.xml
new file mode 100644
index 000000000000..2d8dcbf48bf3
--- /dev/null
+++ b/media-libs/cubeb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="rust">Use the newer rust-based audio backends if available</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mozilla/cubeb</remote-id>
+		<remote-id type="github">mozilla/cubeb-pulse-rs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 58b3476b74c0..d73c6d344dd2 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,4 +1,4 @@
 AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.3-r1.ebuild 1656 BLAKE2B 3c59c876335ac9132ac8661abf01811bb3d4dba60ef890f72b9c2826a567e6d5573eab29204a47e00c56a5e926bf7a7e152a3cdc9defcda35d21022b684f0b24 SHA512 391ec014b35ac11b2f558b7536500a591eb7572d52c54771bcbfa052c18b8a7234bb4d17ba97fa80fca9a15817b097d1bf4556fc0dc1e10b464046c218f61b3b
+EBUILD flac-1.3.3-r1.ebuild 1636 BLAKE2B b589a9d43988a86bbf7432f3fd326e0068d95e56df80f217e67be518cb105f4dcd3a5e29471bb27c6cb5b6c4fdb07ebc5c198ad5c2cc51670467532ce0c1f86c SHA512 5e98b0c53c9c18584b5de9737d44626b5c6c01af99d43f5937a4195c7c11973578859ced3d56e914119b668ce5c3e763a95fb5ec43e110b1d4e2d88be7533848
 MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.3-r1.ebuild
index 5f99d9e11048..6dfe898f30c5 100644
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ b/media-libs/flac/flac-1.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,10 +18,9 @@ RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils
+	sys-devel/gettext
 	virtual/pkgconfig
-	abi_x86_32? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-"
+	abi_x86_32? ( dev-lang/nasm )"
 
 PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
 
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index 8b8284dde21e..a993ffb96da0 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 720 BLAKE2B 7901dd3fb8f1f2c03e69ec3c1d74546c9e46a416fa89ef7ba856d8fe759ba8177a6b9f376d4ed81856910e9e7345c2c5be9674bbc6d04bfc943aef355e8829fb SHA512 ec684a3fcdaf0e3270b06d21c86550b4262e10c67a9d4af98b6676760214e7da917b195132dbac4eb28374bf3bf62c44fa16c3b338fd0bffe1950545500eff9d
+EBUILD flickcurl-1.26.ebuild 727 BLAKE2B 957056f07e7a2e99451d56a1493f68ed3ef23dd8f435c07261d1476a9b20eda4cb2a8dc997bd30ffcf7fab0dd195ca96a82b8bce53c0d5a7703f663b07ace23d SHA512 eb94e0acfdaecb975ee508c76e61dc52b538d9dc313863e8b0ed0bd0d181b0297cedd37ea688c31ed62f47785d76873cd284618f013727d8908a3e8acf93cdfc
 MISC metadata.xml 353 BLAKE2B 9ca14bef082c611a8196f2dd2c4928f12a8a7c8bbd0690309a0fe3d11a04fb3fcb86d06580818c979a31c1213596f1e20b80da32792e8e4c3bba8d83c8dab454 SHA512 6f0ae948fc542b3d2a04b02eed1f4b30bb9ad5b359ec07f0aba4085e978184f8426b94c1f49a083214eeb21f018fee3696a63111ec53045f5c2b95c7e1b43c60
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index 96f1e11eec80..44be660a9458 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://download.dajobe.org/flickcurl/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="raptor"
 
 RDEPEND="
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 40cd120cf2f1..7465d5fdc0b7 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -8,6 +8,5 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 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-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
 EBUILD freeimage-3.18.0-r3.ebuild 3182 BLAKE2B e4279ecd9c3e8e00a998da85402efb3edd6845a20e1a2b25a61480d666d65a8702df19762615290e74fbdb8960d0d95f83e31a12865bb14c335fc7377139c7e4 SHA512 2113ca778f0116fc5ac12b74e9264e2fb04169af05d0b84e09ba3c3b42c9f51b30fab059fbc432d4c151a2761652cc0fd3296f661b9727f6a78d7a68b03923da
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
deleted file mode 100644
index 3240d3021ec0..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 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
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index f15202e6ef0b..43d779ab8770 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,7 +1,5 @@
-DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
 DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
 DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
-EBUILD glfw-3.3.4-r3.ebuild 1272 BLAKE2B 690a73e355b3e4926e54285a63f81a22a48055acc3577857e9fc42cc90b0a4fdf5e56d647d4636e6034790bdce60b840f758c08f58169bc6da62d2b86f8f29a5 SHA512 241f3431d4bc380c192811005ce67c53ef5120cd99aa07024238d4f2629f56084469f1b814302f72c19061585adac03801d1af30406471ad094b282d29038452
 EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c
 EBUILD glfw-3.3.6.ebuild 1132 BLAKE2B 444ec9d9260a341bb36f7bb42ce06f462f9ac51649ac9814282410ed9b0dd807e8a43a091791192b95f77f9b8a4e44f94bc4366ce4896f1e48ec08c6e0d874c1 SHA512 d4d39246710f94966c8c241adbe9de1b3ac47c572e8272d0f61db62b395990df295951312ffa6810ab13e9078ac948b9d7afb08572a7bece154ecc9d4e31e6be
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.4-r3.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild
deleted file mode 100644
index 73e3566ec70b..000000000000
--- a/media-libs/glfw/glfw-3.3.4-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland-only"
-
-# note: libglfw uses dlopen() for most of these at runtime
-RDEPEND="
-	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	wayland-only? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}]
-	)
-	!wayland-only? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${RDEPEND}
-	wayland-only? ( dev-libs/wayland-protocols )
-	!wayland-only? (
-		x11-base/xorg-proto
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)"
-BDEPEND="
-	wayland-only? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND=$(usex wayland-only)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a47f911fbb3e..91e99532ad1e 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,5 +2,5 @@ DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb
 DIST gst-plugins-bad-1.18.4-glib-volatile.patch.bz2 8492 BLAKE2B 7a6e4a3fc1d68c39ae08cb052eed1fcef9c5507c655525bcb48ab789f20027632136fb195643dc5d2e04728b4c3ac94b1dcbf9a14343333fb80d65c64244e1c8 SHA512 0d9e04b883a803cec518469f46dbcf47bfef614694cad6b2bb6e8cb31c3fcc80b0f3d81633b16cd05ca0516f49893aa67f4745dc22e80192ed385fb97ee8b97c
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
-EBUILD gst-plugins-bad-1.18.4-r2.ebuild 2520 BLAKE2B fc209b678a90d89cbc46d3a14af232cf73a77f4f44505b9edeafae78aed812defd6d3c5ebb487968365f6506fd44d8cfac1e6b622150662bbb0ffb7b1e49d00c SHA512 b7ccbb6eff44af1fb65535297b158f63ebf8729771debcdd27380ae4e5e0100256b56d4b85e4ae202855bf23e4ea30a200d5c7a23578985c468dc1ddf4a26343
+EBUILD gst-plugins-bad-1.18.4-r2.ebuild 2596 BLAKE2B 56a306ce7fdcdc1bf8c5f4fa770d954b39558c825f8884054302cddb2109e9281ea15abd0fd5416e6eaa401ba8bf84cbd982a85da8f2ada4ac5f7c924e75e13c SHA512 3e401390a1f43a65763222bc06fc0f5957e42ce3f528cef42d8ee074ac7d74a973d2b2d7c8a5d207ceff89196cf6f5a46d4aee26e6819fb2c3f408ecad46d129
 MISC metadata.xml 440 BLAKE2B 7effc0f6ca218dae5cae9375491cefd7304006ed2e0ffdb9afdedd8ea3098fd1fa4eb0c2cec9381a3bbbef1c4336094070484b11e447381a1465af66ccbcdb8f SHA512 443bc8793f8c94ea7005445fab8292a17ff2be19f82a769a303e5b84dcbb3282f61813995695bb935d16d2647aae2947acade8f456f14ff6df36fc45cd72f4fc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
index 93b00d92d833..6077b45e9ccd 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
 
 DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
@@ -37,7 +37,10 @@ RDEPEND="
 	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
 "
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 "
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index c1b1df46e6a1..af5b8ae2d92e 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
 DIST gst-plugins-ugly-1.18.4.tar.xz 509920 BLAKE2B a7aec6ac6e5739205c9567072596a8fb6dfcabc2f56ee0800c430c9bfc9549bf7ac75cb65719dadeb84036130d5b58f9be574f2a6531992ee7a8f23e9fb32d16 SHA512 eac02000ac3e0a54a953fe1531cb29bc6bc9913a707d1508905bf64fe0a4ef92f7d01b196259fc217fac8a344f0b2d683dd6d32210ce6b8c0acab08cb3b1322a
 EBUILD gst-plugins-ugly-1.16.3.ebuild 941 BLAKE2B 2a5e299284a15b210674a41aaa998b46bc607aafed4915fb29ae253ba92840977a74211ec80fc529dd706a6de03aedc9d4a81f8342df3cd5064120130a024bcd SHA512 11e3fc097a2fe4dbf114c5ab80678144b9d3f3b7e7b35ac688d30829a63e3057de7fe82a51f716f87023ac2ccae81b65c8920bb9a33e899371154498edd59cab
-EBUILD gst-plugins-ugly-1.18.4.ebuild 701 BLAKE2B 1d6f40ece8b0317805bc906a8be350f226af11f467527fd0dad889568b6bf46490e340605b0eec19963b81d5bb31e979e78589e48599701f778552c61729b7a7 SHA512 e2f9b40c65849f6bd0536ed49317df91ed19992aad5bdcddb1910980be9a769e54488f36b6aa96fe766944ed9c3f9b63a8e5239abd48cfd333d82c67b89c5e25
+EBUILD gst-plugins-ugly-1.18.4.ebuild 777 BLAKE2B ba68d1152cead7f1c2b373db2329426ad3e59ace5f7848f2371b97ad8ed49cf3d6ad43ac44b594c86ac581c6732e87070ab7e794e856cd188b933ead5f5c8f70 SHA512 80035915311971c204358b99090fcadd85b11b161ab76a49ac138623f2040c6723beba38f27110dc0e60a25ce651c5e43322b8eabf1e4021b66d5ad4c6857600
 MISC metadata.xml 346 BLAKE2B 940d96d0ed61860085f5f6ef81706c4bda670dd1b6bf4947e29e636d180a9bdf02c42e33fed50975f7da608f048dbe0d578f1b76c8e73b233bd7ac6d291dc653 SHA512 57dfe4552e5fa65043a0e5efba15df272f21d7c6838d705a83959991ff30a71ebf38526b5891cba93e4d1256f446258abd18cb368ec9782481f791e4815bd3b6
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
index afd4f5f7fafc..d05955f66871 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
@@ -12,12 +12,14 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="orc"
+IUSE="+orc"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/gtk-doc-am-1.12
 "
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 8ddd3bf59ca6..54f1e1368737 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -10,6 +10,6 @@ DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2e
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2313 BLAKE2B fcf505f08903965e6f8520854a36047c3acf1ccdb2ce0fa5fcc59141ff912f73861d112ec2fd4784a7f217439d3096c3e15ce7bfd78366a450a228d91c986e9b SHA512 c2924bc953a80d712bcaeae850fef3bff45862b23fbaa42679d0951a9c0742c47916a0350fee2c3e4f76f788b755245641838d12f70142375d0a34eac3205cba
 EBUILD libaom-3.1.2.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
-EBUILD libaom-3.2.0.ebuild 2488 BLAKE2B 5d00f0501961637e9a862647bce17e52080c0989ef555fd1478e86fd490168e3088453b3c39db3462ca03524dd7b721633e7ed86d90948b45a51548845802102 SHA512 5f6a4979ad9d25bfc661059153fe47e27a99a5017ead8c38051f4948065168af15326934f4b72cbaeddbfac7a382c34585c2dc55c8217bd3184fc88be309b4cb
+EBUILD libaom-3.2.0.ebuild 2482 BLAKE2B 15ed4e4cfe759cacc1d8f160c746af4ae88bb88753f927f7243ae484bc55871c5924e983950ca9110e795361c455cd92ae2683ba3d511ac981e922eea10309fc SHA512 eb9acba3c5c7840648d26f314c4db51db3cdbaf45820cee8cfbcd3fdde8b169b7133f8ae8d9a1e70686fc7d25f688abd0835079e2e0f01c8315820cbc59c27a5
 EBUILD libaom-9999.ebuild 2488 BLAKE2B 5d00f0501961637e9a862647bce17e52080c0989ef555fd1478e86fd490168e3088453b3c39db3462ca03524dd7b721633e7ed86d90948b45a51548845802102 SHA512 5f6a4979ad9d25bfc661059153fe47e27a99a5017ead8c38051f4948065168af15326934f4b72cbaeddbfac7a382c34585c2dc55c8217bd3184fc88be309b4cb
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.2.0.ebuild b/media-libs/libaom/libaom-3.2.0.ebuild
index d2f98922596a..7ea19c6c236d 100644
--- a/media-libs/libaom/libaom-3.2.0.ebuild
+++ b/media-libs/libaom/libaom-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 0f27e732f8d9..74f3f9b9c0f6 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -8,6 +8,6 @@ EBUILD libavif-0.8.4-r1.ebuild 1731 BLAKE2B c61c5147e258fdc537ce1ce0e0b2f4670511
 EBUILD libavif-0.9.0-r3.ebuild 2756 BLAKE2B dca93d690cda96a342621f9faff105ad2d99b38dd52563d562dcb13a37b04d75997e7fad672f5d57813dc1cb0cf8fb17e6efdc9bb3396150997925e1c8ac84a6 SHA512 0c406ce668c95b1ddbd84345d882aa08a7479d308eaac2993f986110f249c9ea36237c0936e1895bfcee446863a7cdcaa6ea1a86f98658e0ba685f145363043d
 EBUILD libavif-0.9.1-r1.ebuild 2711 BLAKE2B f7b13ab116fe7cd70c42a9bb5b1f48e162b663ec31e23caecbf4a39812ab3ea921b930b642e67a7cb381f6ac11dcb3c8c56c25d2b30dabf8bb32c8bd98b4f26b SHA512 b7676144986db06742b55ba99fd3440d7ac2c514302889a422fa4e718c5ea6564e2c3a52c7b43374d12a9f26e07a803e4beaadf2023af1bb7d4ec2373eec89f9
 EBUILD libavif-0.9.2-r1.ebuild 2720 BLAKE2B 7258ddf638cdd9311157c6ef9ef4d075315806382d121031f0212fa752606ec239b898f581df953f813c70f2e3112f84da365b49e5279eb97c503d246ac0cdb5 SHA512 a7cf8d7622390cfc4df2875b17e10f871f58163f6ae837d8a6f87093334b1a67fb84d4c218be77f70dce3aaadaa8c9bd0f481353b03ce65982c07a3e7037d751
-EBUILD libavif-0.9.3-r1.ebuild 2720 BLAKE2B 4f7580df6f9fa86213c30db157674e8bcdefd6d9d3a361c2250072b2a77714d60dca67aa6a02ac35f38c4f85ce3f085b4da3b939b134aedf761222ea71fa4b11 SHA512 a4b7e35510f79dd9b8c50878ab66936be76a4e280d0f63076b2761c9fdd3440bb658ca1a73c821c69e88933cb7d0760e1466c0cfa2e91c2bcce4df980ea0eab3
+EBUILD libavif-0.9.3-r1.ebuild 2716 BLAKE2B 81209715f03fb976dca97eb94e0cd57c077c84a97e4da038a9e46092cf1f3ba7abab92e00c9152d1a08b4f1fe58daaf50d7be34e4a59d7949cdf6776ba634045 SHA512 1e2ce152ba6c65d7c5506857bea42062066eff01534f049c36062410937d5b3eab51fec1bcbf957213caa36e7f8a5b1129399e28b444679de6098be1033f93a2
 EBUILD libavif-9999.ebuild 2663 BLAKE2B 1e85ce787146edafbaa33e9391a025e92761bdf86122438203479e72b2c90fae43e5d417981d7eb25c7212bea2035959cf293c81023617bf4319192f47e35710 SHA512 753acb2952f0f9e486d7776b058651c32242fc3045557fd207f1818dd1661546b5ec69c7275b5596acddb1e9625337a95bfb0664841cfe4b6799d52fe74ca54f
 MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f
diff --git a/media-libs/libavif/libavif-0.9.3-r1.ebuild b/media-libs/libavif/libavif-0.9.3-r1.ebuild
index ee304de7b302..bcf2e84bf548 100644
--- a/media-libs/libavif/libavif-0.9.3-r1.ebuild
+++ b/media-libs/libavif/libavif-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD-2"
 # See bug #822336 re subslot
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 REQUIRED_USE="|| ( aom dav1d )"
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 80e5d8b40ab9..65cb5c3e6769 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,4 +1,7 @@
 AUX libmediainfo-20.09-pkgconfig.patch 229 BLAKE2B 98a35093f464be14204ab1f722eb6a0a227cc8224f325227c05b19233723c03c1aae4b13c7f57293c7a75052c7e0f9110a01b5d144e2d1056c1c9f36f6533b96 SHA512 809af5bb16d558504b7abcbab7012101f5723fe08e0020fe4d91b558c04941a943384d5be8e076d672ba62e31aaeb0ae2fafd6fb2d31c7072939dd940feab12a
+AUX libmediainfo-21.09-link-fix.patch 1209 BLAKE2B d9e6662f594cca7166f01334e431bab0ceb51055d021ee918a3d63648fbd72fd01e9a2f192b77e57d99a36f16e60193d944d0d9e5c3f0f881441d6e774520ba4 SHA512 123362d1f8db82cb4954091c3929b488d808e150fc022ad05bb86517fa53ec1fd8e05d505d7376960f21f60c7aa1768c5eb690349cae391dd8a0a76cda041d5a
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
+DIST libmediainfo_21.09.tar.xz 1850688 BLAKE2B ac6b32a23a82f0c5f0901ef9b6a22b850a59efab80952fcc7cbcbd28951a43d0abb7065ca19adde4715e06f1798ac2992e3f3e82c16c9cf152ff95c42f15b27d SHA512 a0b5ea9c6fce3f5551176d411b8c227927f579c3f09442316f6c380926acc545ea346e044f808b66403b1f0aac6f88ed4413c8231e792256d3cd7676133ef3be
 EBUILD libmediainfo-20.09-r1.ebuild 1795 BLAKE2B ebc2af15dffb2639a0074e57e0f0c822e7931fa85170412b919dd5ba36924cb971a1c337e80402eb97766537a1d2c389c22ef0e9ec4c9be7693af377c65afe68 SHA512 2df425e3944cd74d61f4eaa0b0e189ff58b78595052472fdac0532c73b736563f96dd551cbfbea07b2b26376bcd104c6309dbef9427d3cd961665152cae9ac75
+EBUILD libmediainfo-21.09.ebuild 1834 BLAKE2B 5e05537b31d6a3b62c18096495c16daa94576e73b5eca52e9fd2086de5c97570e48c37c47f74d15cdd3778f0634b71d58d41f9a5b05dda35cc3836e6a87af1c0 SHA512 aeeb6b3bb76a069b8456c634fc67f298a36cc8e658291a6ac6c9cb2708e1c6bad8a0fd449f52a630db77b30784911fd668f1071172e75b64939d749e44bbf600
 MISC metadata.xml 347 BLAKE2B 66f84361f792efe1817c3427292038fd8dc244aea4263c2e2b571b7c5adfc9bd3fd4801cfc3154512a1892590f91c8248f603273d3e1c8d241285a7d863871fb SHA512 b33309009eb8ce3104f5995a4baf050ffe93d53e5a9e422e58abdfbc5c3c4c32406b126b9e1d0421656a73ed42ee662a1b5cec052f73e85ce16d4d278669b607
diff --git a/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch b/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch
new file mode 100644
index 000000000000..2b87839a762b
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch
@@ -0,0 +1,29 @@
+https://github.com/MediaArea/MediaInfoLib/pull/1434
+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1823029.html
+
+From: Jan Palus <jpalus@fastmail.com>
+Date: Wed, 22 Sep 2021 12:10:41 +0200
+Subject: [PATCH] ADM: compile-in tfsxml unconditionally (unrelated to
+ tinyxml2)
+
+Fixes unresolved symbols when compiling with system tinyxml2.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -230,7 +230,8 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
+                        ../../../Source/MediaInfo/Video/File_Vp8.cpp \
+                        ../../../Source/MediaInfo/Video/File_Y4m.cpp \
+                        ../../../Source/MediaInfo/XmlUtils.cpp \
+-                       ../../../Source/MediaInfo/OutputHelpers.cpp
++                       ../../../Source/MediaInfo/OutputHelpers.cpp \
++                       ../../../Source/ThirdParty/tfsxml/tfsxml.c
+ 
+ @MediaInfoLib_LibName@includedir = $(includedir)/MediaInfo
+ @MediaInfoLib_LibName@include_HEADERS = \
+@@ -280,7 +281,6 @@ endif
+ 
+ if COMPILE_TINYXML2
+ lib@MediaInfoLib_LibName@_la_SOURCES += \
+-                       ../../../Source/ThirdParty/tfsxml/tfsxml.c \
+                        ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp
+ endif
+ 
diff --git a/media-libs/libmediainfo/libmediainfo-21.09.ebuild b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
new file mode 100644
index 000000000000..d3f8394fc420
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-video/mediainfo!
+
+MY_PN="MediaInfo"
+inherit autotools edos2unix flag-o-matic
+
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms"
+
+# Tests try to fetch data from online sources
+RESTRICT="test"
+
+RDEPEND="dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-link-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i 's:-O2::' configure.ac || die
+
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		--disable-staticlibs \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index b8afe442e005..7e073ccb9460 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,5 @@
 DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
+DIST libopenmpt-0.6.0+release.autotools.tar.gz 1506911 BLAKE2B 44cf8c5f725d2b11409d23e293dca0c151cad17c029da7f70a22366e75baa1b49b763f67d617d84a142efd3933b90344ccca5d881e5c724e2cfe0210170593dc SHA512 8da6cf1f2dbf683c32f45cbf884784360cced5e21f9862c96a1a679bd90b36be9a7cc59accbf82271a804722986cb81e75915f6564aeaaa248ed3e967dfdfb1a
 EBUILD libopenmpt-0.5.14.ebuild 1544 BLAKE2B ce1beb9e386a70e598f295b4caedab63a9bfb273e4d31a7b78047d68b176dc6b46bf673ca97a395bb30067629785ef9f9117502c3bb0f6a50c25d7045203f51c SHA512 9b834a31821d7fae8e409241b4acf5c298a539c815191cef68219ed6ce6a4edb1cf85f50254c6ea61d17898fbbb0f58ed5c40f4ca35c7cc5965aadadcaa4a5d9
+EBUILD libopenmpt-0.6.0.ebuild 1546 BLAKE2B 681d53024b675898c28c08ffd1541380fbc375b09c70cbb41e724d27fa76608f496c2ffaf164663ff01ea9243b65616ab191d93328812b24b3c18121d165c082 SHA512 1e0eedabe9d82f5493c590d3262f2fc61ae0ed402d90743101e6a07674134f725223d5573f729e2a411c3aa7eebbf013c98442fe808af443e5c9d11f9ad63d86
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.0.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.0.ebuild
new file mode 100644
index 000000000000..ecc623d23085
--- /dev/null
+++ b/media-libs/libopenmpt/libopenmpt-0.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="Library to decode tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="examples mp3 ogg static-libs test vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )
+	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	# A lot of these optional dependencies relate to openmpt123, which
+	# we package separately, so we disable them here.
+	econf \
+		$(use_enable static-libs static) \
+		--disable-openmpt123 \
+		--disable-examples \
+		$(use_enable test tests) \
+		--disable-doxygen-doc \
+		$(use_with zlib) \
+		$(use_with mp3 mpg123) \
+		$(use_with ogg) \
+		$(use_with vorbis) \
+		$(use_with vorbis vorbisfile) \
+		--without-pulseaudio \
+		--without-portaudio \
+		--without-portaudiocpp \
+		--without-sdl2 \
+		--without-sndfile \
+		--without-flac
+}
+
+multilib_src_install_all() {
+	rm -f \
+		"${ED}"/usr/*/*.la \
+		"${ED}"/usr/share/doc/${P}/LICENSE || die
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${P}/examples || die
+	fi
+}
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index ebb6e1ad75b4..0a03d68b6336 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 970 BLAKE2B a9dd0653b50d8e4b59a67a50eb04731fb51aef207e3f1acf9cd01980c90fb87fb9b2bc5055f5b1f8a146a1f2168604376fe1bcd62e15e070e126756816cfddb2 SHA512 12707fcf13b77327211aa00400e488e6d10cd6464848deee0622901a87d88cf4fed3a6de71e52166392e1cbf8ecd4d1ba8c7f075a3c05c8997e2b57d0738eceb
+EBUILD libpagemaker-0.0.4.ebuild 969 BLAKE2B c44b9ce4e52016ef58aac57d24ac4e1053f8f50d977bfc15374e68a7f6c1351f3add4464d4253aba71ec5de978ee2ede151bed8c16293dfbab62d61fc1c1f51d SHA512 2c0b79407c76a9338cd7518b4977817a0ed1a72b1104f36dbf1e22ec8b1d1b5dfc4d2b1c6c028c908fd78260107932f86f196cb7db5597bee74b69cad2141c80
 EBUILD libpagemaker-9999.ebuild 1001 BLAKE2B 2c4e1f8276ad064fbd5bd0b770afdec36f35d6d7051bb8b6358bd2b1ab2af18f2c8c8e4140a063a84dc3d3bad35654921625ce5ca73aee348f3d75a9467e486b SHA512 9782f27c4d09ec8e5b52ba53ccfa87b338d6e506bc8c7b183ca80acfc824be49a7ec29a5e0eda4a3cf72a8efe938a715c9dcbafe192aed006284ceca71de8a09
 MISC metadata.xml 347 BLAKE2B 0ba06c106d1090491acd5f81427e86d8a010434ed1458ec439cbcf8981e18fdfababed76375e9abf718f7e2bb039608053f2241c0067fc3b3e0e35b3fb033ead SHA512 135293255acf6c39d9584ceea1761f85be3e9470761b538320f47243479766c690bb87a41ac1be7fd0a3bb69ebdd535236014447db0e087fed44529f575ef2e8
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 3a1c7b104373..5856ce390816 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.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
@@ -6,7 +6,7 @@ EAPI=6
 EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
-DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
+DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 [[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 8db2e073a6d2..050bfa064f30 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,6 +1,6 @@
 DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
-DIST libpano13-2.9.21_rc3.tar.gz 2801535 BLAKE2B e4b2ea3894b4b53e6bbaaea39370254ad3bd1a981a1857376ff96e801cf167115ceacbe3ef4c790c3dcd380e3b0ec4a6d2b3d116e212f22cc4a56eb373f3447f SHA512 d344b81b56ba6e7dd38c0826e7e085ad5e20f5d2b09b27369ffae1e30d8f5bc03ab00d656d472069429b843d2e1eeceb173eeac39ee31a3622ca851387daef04
+DIST libpano13-2.9.21.tar.gz 2801535 BLAKE2B e4b2ea3894b4b53e6bbaaea39370254ad3bd1a981a1857376ff96e801cf167115ceacbe3ef4c790c3dcd380e3b0ec4a6d2b3d116e212f22cc4a56eb373f3447f SHA512 d344b81b56ba6e7dd38c0826e7e085ad5e20f5d2b09b27369ffae1e30d8f5bc03ab00d656d472069429b843d2e1eeceb173eeac39ee31a3622ca851387daef04
 EBUILD libpano13-2.9.20-r1.ebuild 865 BLAKE2B 80da7ee945400ca2aec7bce606e64bb43628d38a921aa973a6049931f8f91b4920fe55fa41718f7ea790dfd05b5ac74263065b36dd5e12f2861eba98b1c9c5dd SHA512 d86662a87b63ef9c627cb7ac0134bf09c93fe4a726c59f0e7b6394c3611444b5e5d09b064b801442395d28d90f7a5b8f43051fc7e17e61e816efbda113425568
 EBUILD libpano13-2.9.20.ebuild 863 BLAKE2B bfedeb2bdacaaf0869fc81b94639696d8e3a55780ece792315d106bf4b273f24ef37e3616277d36d78397f19fdedb79ddc826cb7d0eb6454dd046ee7f82c5d29 SHA512 70a3d1b93416a41481a5de719aee25a322caaf5093eb781b257c5e23d115e642531297110d785d90e552d98d0ff435b6c457e650234e801b43a5392fefc706ee
-EBUILD libpano13-2.9.21_rc3.ebuild 755 BLAKE2B 9259283c6b91413e2b71bc6d41f121aa38f29f6ddc64cb4d1a2a0f8888ef68deebf51d93270f92a6ceb6a3d0c8629f322f55f641145695c06dd1f25edacf3d98 SHA512 ac4b9a817d5755d60f582b0966b534331175bc177909260f936739a3b51e955cbdece3a2315a540bfddf65f98ed930332bde555ef7bd2b4f9c64b52b276c4789
+EBUILD libpano13-2.9.21.ebuild 755 BLAKE2B 5c96d8d199de3c37cd9fb537816189684f3911e0a8d2cb1c78e1474a9a91e696dc826729c2ff288d64d52c851bfc3713e1c21e38d4d7b33d9cb95ff6ab90f12c SHA512 e70233e957a30643b40839c3a4f6411d5c26dc9468b1f02e954766027a51b5f7c4c80ab0e54ac193d9b3aba6e483afd858e1eb8bc471b122de042a1d49b386b6
 MISC metadata.xml 462 BLAKE2B 2043b0e6c260305e607a04d5d8e541c82408344a00e920c891eb1981aa05b75998f845800bb0a4fd16f3e1c83bcd2f4118e673845e47142a3ec58fa5df86ac3b SHA512 6f05c609c8a8f5a41b18009a1fa5258071328b99b33a670e0e2c56e1aaea398112759c42902b2e822684dc0f5b2979cda7efc59adf97dfe53c27d14707e1a6f0
diff --git a/media-libs/libpano13/libpano13-2.9.21_rc3.ebuild b/media-libs/libpano13/libpano13-2.9.21.ebuild
index 5d5496338675..ba54cae2b3a5 100644
--- a/media-libs/libpano13/libpano13-2.9.21_rc3.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 2f583295f423..ea7f3fbbae5e 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,5 +1,5 @@
 AUX 15.0-no-aec.patch 1709 BLAKE2B 0e31e8a4595525905163453b5f37751aecd63006c791005a74de259958b72be0b1e0e6a4597c839e84b7297c5122c0d0d3f4ccada143a28174a57797baa22a90 SHA512 5547d1d400967dffb868109ff6ebb51a723338d94f6da0b4ff18cb021b898469ef11f00fceddc1afe51643ad13443fc51ee26f3096f2dbd1626710c5895f8e58
 AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD libpulse-15.0.ebuild 5125 BLAKE2B e6d706d8bd455c9080fe8eb585e1701c9c27e199b17e35f3b7926749732ce9dc3e69551a7d497986120caf6e72aadb4ff8c029640ed565e4e221ca93cab770bc SHA512 71604e06517f74b82d93c4ce52eb137b5bc12419e0dc3be031e143cb8a59d38ee7fc67c8a822963efa2076561bc5f3d7f74a416e0e8754f66f4f936347ea4714
+EBUILD libpulse-15.0.ebuild 5133 BLAKE2B 7f783ab29826f04a04d1c286911debca9a8bd76934d862f97d8e7802f49cc79babb8f2917c1c7166806f48d555807a8d02e2cbaf4c08e1a9936dc9a4e5b2deb1 SHA512 eeca206d17f0c826c35d893d5cc85d74591cf83130da2ea5e0e53d91e5dca3aa0c389ef65c494339f1e1c42b5374c65895366e79594df03435659899e2106375
 MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f
diff --git a/media-libs/libpulse/libpulse-15.0.ebuild b/media-libs/libpulse/libpulse-15.0.ebuild
index 92f3abe61083..44b59893433b 100644
--- a/media-libs/libpulse/libpulse-15.0.ebuild
+++ b/media-libs/libpulse/libpulse-15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,10 +41,12 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-pulseaudio )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+	)
 	|| (
 		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
 		dev-libs/libpcre:3
 	)
 	!<media-sound/pulseaudio-15.0-r100
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 2d60b1deae1b..375eda91bab5 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,3 +1,3 @@
 DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a
-EBUILD libraw-0.20.2.ebuild 1389 BLAKE2B 87de555467fced89142b59ee0b2be5f59ac92f0b512c2764b71e9b28d2244c6b8af20a1ff2143268fae09acf4d1ae83551667465628307b47253ddcd1448c61e SHA512 cb98d1bd142f9e8a3904e0e447fb985284ae2b732ec408b79f19b980de9a121e305ad85ad4476cbfa7757cf24a45d70de094d67299530df210666408783cd971
+EBUILD libraw-0.20.2.ebuild 1395 BLAKE2B 7f06a15a10739b4d1631279b881db62b63238e39b278f5cf109965a82f83c6578c817036b4a815f238ea2886e8cbf959ce728d00b008a438b80eaa1894881e6e SHA512 1ec1ebde8c9c496674edbd2e86d94eb1880f465a9a54215b3dcea0d9917fa39f83535f42d2a50c3aa2beeeeeb24fc1c09f184ace0ef35338e47bb72c60343a29
 MISC metadata.xml 384 BLAKE2B d58c1c7f027fa62de0ba86f59f1c654bab4cba1d5f7c5d33f6584550c7b91396345c80d4821368878a63fc04e28a9795fa1e8f6a6510f450fded152c0dc23f66 SHA512 758f4ff9a0a4bc933797597c2c54f61e99041f347e8e94a8ffcaa886937029c88630fa8bb717942358e5b2587e53491f321d75551ae93d57af09e5e057399ec8
diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild
index 29cc29f4f705..427ddea9b696 100644
--- a/media-libs/libraw/libraw-0.20.2.ebuild
+++ b/media-libs/libraw/libraw-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index d343948458cf..cb6440d1f728 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,12 +1,15 @@
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
 AUX libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch 8035 BLAKE2B 785a8769741e5af10ce0f18f6ef9f091d1335ca1c8515c9b653d3a177a620a8b3360b7df03f058b63e42259d6e4ccb6863e0ec9acd69886627a222ea3b8beb2d SHA512 b5af677b7f8fc6c61ea1c99c094103549cbe1a0163da70f51d4c34eec40b507a7bf8f84f97ee141a15c33bfaf2a6cb36c572a08465407fb17eb9b6a1364a3819
 DIST libvpx-1.10.0.tar.gz 5340421 BLAKE2B 25ef346b9dce92d37cc4f4612ed351d0f93a60c9021ed5f9145a9128efa8b0af7cf30b6279c40481ab043b9922b93f6b502cdffc3feedaf4bca310fdaf8b1502 SHA512 f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d
+DIST libvpx-1.11.0.tar.gz 5347256 BLAKE2B 2c350e14fc3b8a3c10a71e230e893fbb9a68e6eeb6a413cc359bdbfddda21cc5c15d0de4b6110889845f88f8a946ef1266980c0a1b26aaf55b52330fe038e261 SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
 DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
 DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91 SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
 DIST libvpx-testdata-1.10.0.tar.xz 448090752 BLAKE2B 88391427d35c538d114df188a899f8de7247dcd861d8438a32530909430feceef48c2c35a53c5a57268dccd85bcd40ec92bb053cfc2b4588bde6447747e10803 SHA512 6d4f0d08f32b34e95c1a75a4340e0340c83b26008852fac4293f1f3c4b9e9ce0f8e2290de678e2f2c9e1309f6995857add4e98796e1a3f474ce1402c9cc862f4
+DIST libvpx-testdata-1.11.0.tar.xz 444614504 BLAKE2B ab6de4c46a771dc1c0dfb19326e580a492768c629eebbfb276db7da02e13256b2a66fdaadf76e5856879e871c7a17fcff657139582b1a3a84ad39c6018b912be SHA512 772e9d69dc9fc8e5a9411e1a532d908e86d90b03019e958349115a74697dcb35972ce71325312193d3a84030c3ff1d9bdbd09ed58918fffcba39c120ce4be868
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
 EBUILD libvpx-1.10.0.ebuild 3573 BLAKE2B 704b59a5698857715b586254fc355914d73c84dc1981d7c71a12afa693f550a73ef9c1449a4b020981bb591f6548266b7529c4d70355c2eb997070ae78d05a8f SHA512 3c22e2ed8284c62c01aafc213a676b38cbc2b33561e7ef4c4ee0bb893cc80348ee54e6477b9fb9a7a5bb0183fbfbc97343ad46eddb6c43694e83de81349fa1e7
+EBUILD libvpx-1.11.0.ebuild 4404 BLAKE2B 490f6594bc6012bcfa3d2e25460f892ba6414b4e9620241a4ed62d299228a9bbb35aea88a6e306c176c3a49fbbcde4235756eb33e79c347d04c87532bda2ec91 SHA512 e253cd9b2b4d8f2c300e1458d35964a672afaab731ae09c103de4252b9b0650e923cd23cc71390ef4716b682c0ef2f01fbf1b4061ab359af825de30d6d8b5530
 EBUILD libvpx-1.7.0-r1.ebuild 4068 BLAKE2B db66c287d712b2f45fea8b70a04c634835d53ee84ccaf4e92c0131303e709cda761f159d8af57a90f17c5630d3a4f56f6b43ad24f77c282beb8a8337817b4e6a SHA512 b72a28f0c6e1a4295b3c5e145dd9fb31668e0d7ea2c12f8a1ff47108bdf8043d4b775ce6d3847460d9470de510376ed6bb0f8ac6c43567940ee52d803c29b3eb
 EBUILD libvpx-1.9.0.ebuild 3564 BLAKE2B b0a98073f23279ae1ecfaf4dc84e774be84b38d4747a9e2647fdb73356f3ef598aef61dd030bf0ff41ab590ccea0e1e5ac8fe365950cd53af3e89ef8d8c9f441 SHA512 00d9206dcde228bd60a6986bb1bc0fc9fd58e5116c7e8cb1df621596b5862a8bfe638f3c1c85246a3c2e14224c379e04c0c150caa63fae5c3998ea265c611b7e
 MISC metadata.xml 665 BLAKE2B e30c009a656ccd33080da9a63ef68797a70881ff88a16d8913feaea04861736c6a4d0f49645f1217974bd0382f0d7de889e98282ef799e21517d52ede3b2bb68 SHA512 5210762c246e48c97437d77b071f72d9b859203ae21e2644e1e2cbbc09cc7c0b6a5055d3b074cb8bc7b6b786b926b6123d4851a85ea0cbcd968913ed72865bc8
diff --git a/media-libs/libvpx/libvpx-1.11.0.ebuild b/media-libs/libvpx/libvpx-1.11.0.ebuild
new file mode 100644
index 000000000000..89eaadcc978d
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.11.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarball or checkout git tag
+# 2. mkdir libvpx-testdata
+# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 4. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 5. make testdata
+# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.11.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
+
+REQUIRED_USE="test? ( threads )"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=384585
+	# https://bugs.gentoo.org/show_bug.cgi?id=465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/ #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+	addpredict /session_mm_cli0.sem #nowarn
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	unset CODECS #357487
+
+	# #498364: sse doesn't work without sse2 enabled,
+	local myconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-pic
+		--enable-vp8
+		--enable-vp9
+		--enable-shared
+		--disable-optimizations
+		$(use_enable postproc)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		$(use_enable threads multithread)
+		$(use_enable highbitdepth vp9-highbitdepth)
+	)
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...) #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# libvpx is fragile: both for tests at runtime.
+	# We force using the generic target unless we know things work to
+	# avoid runtime breakage on exotic arches.
+	if [[ ${ABI} == amd64 ]] ; then
+		myconfargs+=( --force-target=x86_64-linux-gcc )
+	elif [[ ${ABI} == x86 ]] ; then
+		myconfargs+=( --force-target=x86-linux-gcc )
+	elif [[ ${ABI} == arm64 ]] ; then
+		myconfargs+=( --force-target=arm64-linux-gcc )
+	elif [[ ${ABI} == arm ]] && [[ ${CHOST} == *armv7* ]] ; then
+		myconfargs+=( --force-target=armv7-linux-gcc )
+	elif [[ ${ABI} == ppc64 ]] && [[ $(tc-endian) != big ]] && use cpu_flags_ppc_vsx3; then
+		# only enable this target for at least power9 CPU running little-endian
+		myconfargs+=( --force-target=ppc64le-linux-gcc )
+	else
+		myconfargs+=( --force-target=generic-gnu )
+	fi
+
+	# powerpc toolchain is not recognized anymore, #694368
+	#[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	if multilib_is_native_abi; then
+		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+	fi
+
+	echo "${S}"/configure "${myconfargs[@]}" >&2
+	"${S}"/configure "${myconfargs[@]}" || die
+}
+
+multilib_src_compile() {
+	# build verbose by default and do not build examples that will not be installed
+	# disable stripping of debug info, bug #752057
+	# (only works as long as upstream does not use non-gnu strip)
+	emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no
+}
+
+multilib_src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+	emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 0baf36a25012..24b72cbb3326 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r8.ebuild 2558 BLAKE2B d0d3d0a0053dd4bb6a48ea239a59ea87de839a9ef8b6d7094f669c9a1381d7ab35391b2fa98d0632b563fe4ba427496b8d4e096495f795bcc25a33aa7baed4c4 SHA512 ab0f5be34e6f66d0eac8c35598160d9c367c7b3bab62cef79685d102dbc5dd3e64cd457a774e2fd7e2bcb3afe8f3a3b05a5720386705686dbe76afbe88251ffb
+EBUILD libwmf-0.2.8.4-r8.ebuild 2564 BLAKE2B b4149974b77a473beb9a5c4c129810c646bab3c44129c421324ac0f6b0228996229e86e7854857cabc73ecda90c26be9673581a82fe105fa265cb140e5f4a635 SHA512 3082806b551e31cf0cb0588f8c94ec59d7e4eefa7a16106cae1e995aa36dab9b8e1831bf6603585df57999cf8f74d5158a6153610d8cfd771fa5a18289bbcc91
 MISC metadata.xml 304 BLAKE2B 309f7a8ad3556a6f229c6f3568319de9f62387c6dc32e385dbb8524f519c9144b8b4f9e651214f2c74ac3d510686af8b6c786453620b249a399ce1e984523cd1 SHA512 529f336dde78c9d1fe518f1bfd2a34f28887f6070be82373ad051458550d31f5f73a9240bdff2f47a43ddca49f5c5bc88d3df826f8fea52bfd8354c841e1ee8f
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index 53c0743ac37c..55b213bf3b8a 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="http://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/wvware/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c308c7677d63..425850278dc8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,8 @@
 DIST mesa-21.2.6.tar.xz 15868208 BLAKE2B aaa6447a2f5a472c2ee2b7d6b12effb79d02804684358fd233aa00bda945c66efa3850931cd9114c51ddd492033b9f66372380395540a11fe40229edfe7ee125 SHA512 e65d77e2609cba85bd2cdbd4ba2072729c1556a43defdd24a91e708e3223f84b23657e63a91b16c5729684ea12fe31f45bae88294c572e057f2981a5d6c0f5a0
 DIST mesa-21.3.2.tar.xz 16466760 BLAKE2B 549d37d365b477b3f991ef0602c94b6df826e32dfac8bf76c19157e01ffca84ce1f0fd8311a04bbdc1a6804f562a075945e2662083a3a663ba78fae0d4853ef6 SHA512 35c510cbab70be43bc207720a12fe85b0c010fafa147238f2c22dd873967278f187ee7675a662882ead3598305f1f37804567deb93022a692ca259f563abfdac
+DIST mesa-21.3.3.tar.xz 16476044 BLAKE2B 04ae7983c82fbd6dafb405ee717df2406607e4fb1f95996abe5390cb1cbdb6385fb8b00ac9982d1bc7dd10fc18eeb1bc08d7147dc00969bd3bcb347a53ca77ec SHA512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673
 EBUILD mesa-21.2.6.ebuild 15212 BLAKE2B b4153c461e270495b87b56ccd708522216cafcf18635a5d488b011b85db0cd5ead8c908f3e7bc33a5ca21177b634c8adc0bd9da84ae3bee5c76a78b85188c481 SHA512 ae7ff35b6dd713950464d2d501b0ca136be7e3e0900dd3136c3181cf733523543edf87642ddba2e1175c5c6cc2906970f5da82c125b029a22c754031e85fa63f
 EBUILD mesa-21.3.2.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
+EBUILD mesa-21.3.3.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
 EBUILD mesa-9999.ebuild 12066 BLAKE2B 9aca896f15ef00fecd3e6ac8ec844e4ab1f5fa831872effd07909f8d8729273a51a91d1156683fc83ccc0efc574435ec07b8f85db8a6a162a66e89a2a6c0e176 SHA512 e9f217a1481790be4e81c741965c502e430d4a8acdf5f479a7a2f819a4b7e936281e0401dd33e4d9632ff3b03a011e830877bb431d6ed98e50c84fdd60307ba6
 MISC metadata.xml 1848 BLAKE2B d08b83f9a7b14353998d07602583ed2f8c4208b03562a0b1c45fc0d4e1ef40787ed2b37b512557af48f00b08e7ea8db65091cd6c01bdfc6c3e1f497e44268cdb SHA512 2076fd824999959ec819bf7aad9a33fe00419e8ae9f91b9ea70440538f8f2c30d9e934973c80883515479dddd038443257dcf960c566d66421f86898c79fbe94
diff --git a/media-libs/mesa/mesa-21.3.3.ebuild b/media-libs/mesa/mesa-21.3.3.ebuild
new file mode 100644
index 000000000000..4fb71e92fcad
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.3.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+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} crocus 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 cpu_flags_x86_sse2 d3d9 debug +gallium 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?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	osmesa? ( gallium )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_crocus? ( gallium )
+	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 )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+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="13"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:13[${MULTILIB_USEDEP}]
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${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}]")
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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_freedreno &&
+		   ! 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 freedreno, 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
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		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 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_crocus crocus
+		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_freedreno freedreno
+		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'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		$(meson_use video_cards_crocus prefer-crocus)
+		$(meson_use video_cards_iris prefer-iris)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+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/oidn/Manifest b/media-libs/oidn/Manifest
index 5475a8c52f06..94ca5aca7fe4 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1,6 +1,8 @@
 DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 743cd87f92bc89182de716254f89136e6907bd18ec0d589b3338e7e89a364797cecd8d398c90acca0df74a1390d06ece7c44864710c9819c370b3922843a6300 SHA512 b1f132fbdadef9b5efa3769dcceba34b7c2619030a79314146861b58e81e5757f3beed247670ccea8886f3a32819eba4433481d3bac27cd29031546093ec58d8
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c SHA512 6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
+DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7 SHA512 8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
 EBUILD oidn-1.3.0-r1.ebuild 925 BLAKE2B f38e5ba0887cdb823e36b7cff5a092a93c12c38bcb8aa5acd44686a7c6b102115f0c4794b4826ceff06fbf05bf3ce4d9ae58273b9cd4e896f380a63b33af93d4 SHA512 8eefc86b47ea486447cbcdb7012b51966594e59a0c00690610d3a9c21263f3b41275c0137877b840dac4187b8fe2ccef0c343bef1b9a1559865e78fc1f6d0df7
 EBUILD oidn-1.4.1-r1.ebuild 804 BLAKE2B 74e3f828c6d08b74b584cf54bddf1687b271d852ab64e746841eb83cd38c20fff165e2c977d024f4a453061c3b3bb8994b86fd1101cbca1faa1b6b2c85000ad1 SHA512 3845870de35356b4b0e6210ed0f114b483f8cf64300927399ab9516f4a636d2513fe8a5f3e9b0040df0a3342e8887733cf554f008dc6ab352b5aa1dfb68e855a
+EBUILD oidn-1.4.2.ebuild 710 BLAKE2B 16f3da55a7b88a3ee3577a8ce6f4f05631a7ac494028e47f269473f24db836a4882593d05f80d2b40bb236aac47abafd7176fd3f40b5e017f06e0c8c914984a5 SHA512 48458b346063c4a8cc52b90cc3119d2913b88190bde3128442fe055ad31eb44a9c79157dcf3e215a700223fc75cf13a760b1eefe41360ce2d0893d5ae6d29e88
 MISC metadata.xml 754 BLAKE2B b1be901e2f498cb917222e495a89f5515c2837a83e086e5a7c8db5f571ce50401d3ca82546e61ab3507de3d3068eee4ee8c85b3430565eb3db7c3cfc3194f827 SHA512 1806e677d62ae2b3cc2857eb05d106abf840a1e1fc21d1a875716441ffe3db1a13c5d96ca9316b2285c43fda4e2d62829ceb4b32ad13ecea2a521a1b1ed84096
diff --git a/media-libs/oidn/oidn-1.4.2.ebuild b/media-libs/oidn/oidn-1.4.2.ebuild
new file mode 100644
index 000000000000..7768a0e3ea4b
--- /dev/null
+++ b/media-libs/oidn/oidn-1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="http://www.openimagedenoise.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-cpp/tbb:=
+	dev-lang/ispc"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 26170656f166..7d9561b46e3b 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -19,5 +19,5 @@ EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe99
 EBUILD opencolorio-2.0.2-r2.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
 EBUILD opencolorio-2.0.3.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
 EBUILD opencolorio-2.1.0-r1.ebuild 3030 BLAKE2B 1d406a80b0ba910dc73381bb20d41fbf5fa01ab3e8a4342a02f3460e842980a4f09b6f0fde17da9aa30135dfca742b37ff5076ac24d65745d3633fecc6f63010 SHA512 3d2aa32bdf71b9ba2f3f0ecad17e430d7c8e81794168455dbbbb0176dcffb064a384771c5ad738d7b6c4aa209cc9a922325dea0ebf3d37c0bdf85abbb9c8dfbe
-EBUILD opencolorio-2.1.1.ebuild 3030 BLAKE2B 1d406a80b0ba910dc73381bb20d41fbf5fa01ab3e8a4342a02f3460e842980a4f09b6f0fde17da9aa30135dfca742b37ff5076ac24d65745d3633fecc6f63010 SHA512 3d2aa32bdf71b9ba2f3f0ecad17e430d7c8e81794168455dbbbb0176dcffb064a384771c5ad738d7b6c4aa209cc9a922325dea0ebf3d37c0bdf85abbb9c8dfbe
+EBUILD opencolorio-2.1.1-r2.ebuild 2987 BLAKE2B 84232f4da90329934d2dd430a058ee25cc9b9229f7cb583cd5a2ff103c71eab9a48013612410395c083f7d3cda02fc027f72c29f53753cf142e16736799e48c9 SHA512 59448793311c5833b07f5f7d5894178f92a787d208a08e13c93f3225884f0902e222e6066ae7f7090498a16b6da8a30561f916a4016257c767f4a12e06f0ce42
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-2.1.1.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
index 9a4f6d7d90ed..579e0b7623fa 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,17 +25,15 @@ REQUIRED_USE="
 # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
 # bug #821073
 # 2.1.1 should be?
-#
-# See bug #802363 for yaml-cpp < dep
 RDEPEND="
 	dev-cpp/pystring
 	dev-python/pybind11
-	<dev-cpp/yaml-cpp-0.7.0:=
+	>=dev-cpp/yaml-cpp-0.7.0:=
 	dev-libs/tinyxml
 	media-libs/ilmbase:=
 	opengl? (
 		media-libs/lcms:2
-		<media-libs/openimageio-2.3:=
+		media-libs/openimageio:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 7891383bd529..80e783914042 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -15,10 +15,13 @@ DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f
 DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
 DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
 DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
+DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
+DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.5.0-r3.ebuild 20527 BLAKE2B c268b0a0e8c7e47a5b14af5dad3757c9df07096e285d23feb6c6b3af15138037c45f4bd7da104fa4a643b6329faa13e733bf76098b45a2db2efb60f96016746b SHA512 322e98d5a2ad73397880f27b03b9f3717d8387be382973d6ec4059ce7b87b7740e4c91f3180038651517800ad2d6868b90ab7df085d450d43f253aef9b4aadfb
 EBUILD opencv-4.5.1-r3.ebuild 20614 BLAKE2B 5377f4c1af0957ec9bc6f5d0ca83fa14977c4bbf5d0e2e2982c32bd9d3ea1f42ce5c9faec398010858109eaa3a04303141207573c5672ac749467e3f5b0c3fea SHA512 33a3028a698ddbeebd91afc006949cb4f1837df8fec4b20c6f5570dc3f65fac05bfa8109325bba8d26fa7faeece0b79974b7b9c6fd111a5e5a4189dfc0c58ba1
 EBUILD opencv-4.5.2-r3.ebuild 20667 BLAKE2B 1482e70d2c5dcaa6d568f6c4326eac12a5380433fb40267cd1961a83f4ea3a2ca2b2d2c4351b0304d9882a84b144d81a52a9da6ccc34fb05987356a8d21f6e86 SHA512 121fa6c8b4297290808ea1fd67d56dec075c96d90c7b60484294cc939fb5bd9595d6aa9cf833eefcd93f36ea31e1c3c032791a21074ebe6da460bc01fd2d0945
 EBUILD opencv-4.5.2-r5.ebuild 20722 BLAKE2B 1eff4e40444049fa054ebe99b6675b9ae780310aaa85a678ac1216936773afffab32d372f181bbfc72bdd3ee86732639ae02383a16344a6fdb1a3bad55bec159 SHA512 c28a914751319a8fa7140838debba1d745fe09e4f2f6d5564549246c916f91b69446e823aa6262a7d94176d60404f37b271bf79299100f47d14a22a045ddc12b
 EBUILD opencv-4.5.4.ebuild 21206 BLAKE2B 4de0279868389f82d0ca24dc95fc597fc5ec20c8e8cb112164ff78e942f01b9119163e41b162ac409912f5b8a6d601ec065f3b51755114a4642cefc379a03ca2 SHA512 611816ed458371f63f870d1b1df2f73839a8005d23aaf14b72893d47a63f07807fbc7b7053afac620833e8f8fbe664f75ec851b0d5e73c9b9cdb4d79e4f55ef1
+EBUILD opencv-4.5.5.ebuild 21194 BLAKE2B b7251fe4655f7800ed2183b36b6c7c6bee778e08de1c75ac723e240daea951c8bf27a5bb4dcfbc9900bf0ad6cdd7c81d26c343a51bfab923669274348d050c28 SHA512 c11df51fa83b6477e0bd4e49b18e20936fbbfa153912d81712bb05fc764045558d18dc8ff0bec41bce51b9fbb407333e6122a2c6bd3369b23d11c7b626d3b2c5
 MISC metadata.xml 3186 BLAKE2B 0293399368d675e350992184bcaad2de17e68aae0ea3fa15bb885ac975f14f0350efc5a00a17737be22cf8b5c0808b3853c77b66ff43294f443305ee188aaa06 SHA512 6d3ee73a3b78581b3e4f12287578cae84afa8747d2432fa436860c265ae92f1072cb83a1b41a2f80ed9141f4c097224df6280c78970d7d68e1c9baa92d383395
diff --git a/media-libs/opencv/opencv-4.5.5.ebuild b/media-libs/opencv/opencv-4.5.5.ebuild
new file mode 100644
index 000000000000..cc9da840a605
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.5.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( contrib
+		tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.8:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		>=virtual/lapack-3.10
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? (
+		<media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}]
+		media-libs/ilmbase:=[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+	eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [contrib_sfm]
+	/usr/include/opencv4/opencv2/sfm.hpp
+	/usr/include/opencv4/opencv2/sfm/conditioning.hpp
+	/usr/include/opencv4/opencv2/sfm/fundamental.hpp
+	/usr/include/opencv4/opencv2/sfm/io.hpp
+	/usr/include/opencv4/opencv2/sfm/numeric.hpp
+	/usr/include/opencv4/opencv2/sfm/projection.hpp
+	/usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+	/usr/include/opencv4/opencv2/sfm/robust.hpp
+	/usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+	/usr/include/opencv4/opencv2/sfm/triangulation.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		# Try to force OpenEXR 2 for now. bug #830124
+		-DOPENEXR_ROOT="${ESYSROOT}"/usr
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index cc28c03d8542..6302dcd217ac 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,11 +1,13 @@
 DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
 DIST openimageio-2.3.10.0.tar.gz 32443970 BLAKE2B 90b4f39ed654cafe24905c3d9e32a04057d80d3fc1cb7a1b2ad5e1d3c239b112e9af8d28ee49d54721aa78778118562106c4bcfe2509a1337e15bd13993f144b SHA512 9e8768d743056a7d115b47611d4e6dfc43f3b8b155224e3746075b407a265fcd509d406e78f1b6a5aa0b55270729cbb2049cfeb9d5c1af9a9a8f05a7333292b1
 DIST openimageio-2.3.10.1.tar.gz 32443281 BLAKE2B 10308f87b390747a4e0af4bce2c7636e8cca61fe695dc4a43a1021a411c3887fedee6c88ffa89c439bf00f23c4b862036149244eda5887812943845f446ce361 SHA512 9e911f5c4b0df02502ed0195b8acd3eff2b3d9398b33f956544306eda57f972fda0a69bd1d1448a385c92753e3a9127209c5937559df6ad594c5a6125c5870c7
+DIST openimageio-2.3.11.0.tar.gz 32439595 BLAKE2B 6e64284c36de87fc077e839db808d4fab0cb6ea4951639cfed21e68900782c03ef6c2e64dcae5c1bf9360ad0a838ee36396d31634ad0ddd20f8fc9f683fc9dc8 SHA512 7e973f4f1b00dfc2486d074f5fdd03aa612a650411c7440868a4846ecfda8b172be33110fce35801dfed92d80f338b989f3ee001191938c48edef5ca760eff3c
 DIST openimageio-2.3.9.1.tar.gz 29248072 BLAKE2B 22cd31dc51670a388f232874d2f3831fb87df09de3fe8d2492a34f2c9d96f2e3ae13426e30c1b9627926a3ec3150ca9b37377642ea6621a184e14d7358e9d0e5 SHA512 0522d22eca5c9858ef2b6407053f8a74872b9b05214efe01d88f0abee6b21c48cf23444987a21364261e4addcc5cddef38d7f87deda8bc5167a1cd40770327bb
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
 EBUILD openimageio-2.3.10.0.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
 EBUILD openimageio-2.3.10.1.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
+EBUILD openimageio-2.3.11.0.ebuild 4994 BLAKE2B bc098946528cdfc437abdcfdb18cc8c61910f7d9c32733c4d3052c6ae1d8e38eb0f59b7aebe751294980d54ac8bb70bab369ceb51a53e1c3fb40c3d50de030da SHA512 192508d42a4510817d7a2771a4391ef1c1f45e1f469e21b01a82ed2ac752a6edc978ce8e749f5a94d20eb18d935351001aa49378e7c161d3546c6f647d56eebe
 EBUILD openimageio-2.3.9.1.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
 MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/openimageio-2.3.11.0.ebuild b/media-libs/openimageio/openimageio-2.3.11.0.ebuild
new file mode 100644
index 000000000000..9de77bbf5c52
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.11.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+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/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.3"
+KEYWORDS="~amd64 ~arm ~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 gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) 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
+	)
+"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/ilmbase:=
+	media-libs/opencolorio:=
+	media-libs/openexr:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	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() {
+	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+	# (because it mix and matches which version it uses; sed this to
+	# make sure it'll use OpenEXR 3 if it can, but it won't.)
+	# bug #821193
+	sed -i \
+		-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+		src/cmake/modules/FindOpenEXR.cmake || die
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+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
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-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[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	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/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 2ab401509511..21b62b323f5e 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,6 @@
 AUX sdl2-mixer-2.0.4-fluidsynth.patch 1457 BLAKE2B 9b8914065ade05bcf70c3783ae22f732e5a401f74cdc39272865d5c6f0fa31c0ee89b16f642a5b5f69b77ecd9dc96cb7313d4dd6c55303efd5d128679f1cb6f3 SHA512 e268a5bf327f2203a7f48ed0cdc05f89fea778eac706555f21ee2b3cab761600988f385195c3078917c422bc70c7b96fff650a1a213370469fe07340dc7d7852
 AUX sdl2-mixer-2.0.4-slibtool.patch 3794 BLAKE2B 5e6f316a32a7c58abdbf764ada81c85e9db6509f99b3a7054de08ea90f1bf54d12bad6f177e7d76181d76f6b0d218acd1f44e8d50e91f7b3ef74056ddf3acd0b SHA512 da520853a59036ea413cc24964798fe40414c072612e2fa0bf79373be669b76d6b07a3853123317f25eb82db1a4dbd105b23469e6da14bb0596242fc1a9060d7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.4-r1.ebuild 3545 BLAKE2B 5e61def0ea221c091e5b7425ad6f39fc26cfe988fa7835d8f36c5a203185221c2c9681e85cd4af81a35153766240a232a3099e18cbb6deaec1ac79f628802f15 SHA512 2480687ee0143beb10760b8ca30c2a4e2b20cd03e55fd46a0838bed5ce2fee94bce3d48ceb73396af6637a5e98f16876d2e73eb28b4c326a2a819082938f7f0c
+EBUILD sdl2-mixer-2.0.4-r1.ebuild 3543 BLAKE2B f45a8c0ee76cb93a9601b99b26b9d3301d46178b3a1caea4a07d11f09b293a3c5ea3f98aaf42151296f8adcc77e2aac2df7a5fa4a200773a10a68b367f64708d SHA512 5ff2c44501cc98f75b80991b4398718c61957d667c0f58b56fb1a2998235ed35750bfd2b5ac0ddae2763675c7456ee5226433e06325a2ad8029b97a399052188
 EBUILD sdl2-mixer-2.0.4.ebuild 3491 BLAKE2B 2f4d9ae4b9a0911f7721e355c48d8a60d4477f3f320b32fdeb9e7eb5e6ac147b5c57dcc03d115c20fe5df21f5812d3ff6b09acb9e4293edb199be5eff2f3419d SHA512 1b076b2813c946e514f13a950809ca5e3fedd67899c0110a99d88a6d7f6594be73a6d44f2bf41650bd7275123fff82f5dd5d6772e04f1717009a552a3a25ac55
 MISC metadata.xml 673 BLAKE2B 8cc1ebfc30f840ffb98cc60659f5d30f8cafc6e7c3e3ef156e6637ec8bab0ed203679e055917cb406debadbc45f44a3171337d5e13bbf91ca46f91420ba8df02 SHA512 560232a2d580ecb87832520448481c5cc4c07958c929f30bc9f5e5d0b17e957cf36ab70c13059b2bb28b609f3e89f3d02731bb8ad8a74404726147cd4f98be85
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
index 4648beb4226c..65363e58cfec 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index 15729f2cc0f7..dfbdcd8bc072 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,4 +1,4 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6-r1.ebuild 1828 BLAKE2B 6448de7450b4927de3363b03a1282c285249bae2bd41932306d0bdf626a0071f47d6aa8a8de4e9be7b1fbe9e0a7cba5342039a27ca13a376e95ab6e7848ef239 SHA512 e0c9113f4b68d9990cef75a1413efb139422231b61cfdf93bf72a688e5c02ad2d570507ba9527fb98eceb9bb18717788ac2450cc913fb87679be61dfbc33363c
+EBUILD spandsp-0.0.6-r1.ebuild 1835 BLAKE2B 679bda38200fc9e1360fef7b7b9cf3347bb58a365c05c9a3c66062e36d0864f9d6f02f24d3ce9156a5582a3511616bde1486bb57889068cbf92b631a4cad8768 SHA512 0dfe3554992ffd2e6d304c1a1e1318ee122cb33254c0db2a904514f18155930f1a1c33074bd31d594d3ad79e3af5eb314292b0839ec42d83fc58ca9f9cb0aca9
 EBUILD spandsp-0.0.6.ebuild 1990 BLAKE2B 7665e0a1e4003e7f6c70331fdee881615df879f1f32272dbc8ff81ec53a4931a65cd458febf6e03ca700c4392f820858a7ca0b8f73f9f059e620266e3417a93e SHA512 9502da0b5fd038cdb6ed8e4f368ae1e6fc45d78ebe106f324653ed70b3be613da6f86a7b003050fcf920dcb52be4b6f63cf7a37662f12071fb0cdcf574a9af61
 MISC metadata.xml 244 BLAKE2B 55f7bb21fa829b545045078abd465615b8e8d3ba8ce19e1acf7466d14d45d695d771d9d78983749f8e0290166f3eab703ea332169a4fda45427ad4baa6ff8512 SHA512 2dde78e90a526f069d855081163e58cbcd9cd9e0429eb1615c9ef8bc5af93bcea4d145333feedd8adcf8421e3417c7ebf0b03b98227cad03431f20cb014f080a
diff --git a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
index bbbf322e189f..84eb7d57d4a6 100644
--- a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3"
 
 RDEPEND="media-libs/tiff
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index f992246cd3fd..35f049ed8f45 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,3 +1,3 @@
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
-EBUILD xvid-1.3.7.ebuild 1715 BLAKE2B 9441a2a5524fe7ea264a9208723e33dbe7317210c3088458b2531c524bf6e690f9dd4e95303ea15d9073ee4f2cda408a5ff5819dfbab185f42945860eca14ed5 SHA512 6efe5deae196d287b0c3f2217b084e29e5c8d63d135ab297c74c67380235d8e243747bb049f70c0fa19a7078586a385f6be7748b97ebe6cf2514e5bd9f3c075e
+EBUILD xvid-1.3.7.ebuild 1642 BLAKE2B 097970f3a38ab0a72b8e840c16d67180dd73e703910c51d96546507c80744a6cc9a25fbfdfa68823cf0c705be2993c2dd41b08008bb2d8d12330bf4a036e089b SHA512 50dd399c3c851abc650c7f05af7b36cbd13a8173aa5c736aa356d4b9390d278023da5031a9a02a0d58775a6ba5039acc6e14685f279c9d74287f74b79a436f2b
 MISC metadata.xml 322 BLAKE2B 841709000ce38ec97e44a9223e6458abf57618d1f858f31d2a31ac190495fa558f4b7d9220b11566dfd927643480001bd14dda9497fe3fc1f8aeba38ce4f3822 SHA512 a9ce57b28bae87e53a402ac2ff8ac3dc6c8011fd72d528c371b4b9107613a81829986646940140862e0ff7ce475773b35da771a5fa043e0ced9a34111204891e
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
index 9ac9a9213f3b..d1c7b23c02e1 100644
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ b/media-libs/xvid/xvid-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="elibc_FreeBSD examples pic +threads"
+IUSE="examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
 YASM=">=dev-lang/yasm-1"
@@ -47,7 +47,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	use sparc && append-cflags -mno-vis #357149
-	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
 
 	local myconf=( $(use_enable threads pthread) )
 	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index aa2914ca0aff..93a4ccd43673 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,4 +1,6 @@
 AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d4963885d34b3d52e4ec0bbf397d85d03c67ea22f82f6c2f8ef0c2e1e7f5e1f19b2adb5372f9c56cb60597dfe94623414ff9edf9a7 SHA512 aa9cae5d9d8fb7567b1723ce8334880bbdef1bf0f361ff5cdb8b1932316ed531e410b32e20d919cd1c7b0c24647e810f4cec754360d72c99c18dee9bb9894483
 DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
+DIST zita-alsa-pcmi-0.4.0.tar.bz2 21673 BLAKE2B 16e4adb9e531e70528b6128997a2b899036e21bd00aed24ad257c1247c08b59f6a33c30b1d3ae22c29893fadb31af84fc3b336b405dc50c39b9ef6c9b2a90beb SHA512 e06ae18e657d75b354c7269fcf1a4ae56241e3efbb182c7a64611855a49e086028d4f9bd91a6bbe8da2a64357ab7190d6e0dc5ae38dc9c3457fc8ce256930a50
 EBUILD zita-alsa-pcmi-0.3.2.ebuild 909 BLAKE2B a1c3c8876270c146a9b09e53d57c2656b295bb1f8123acd84568b0f3e0922c921944bfc17c90f2971b7a0cd28c9ee7d92ee146897f37ebc76dbac13323e29580 SHA512 cc4d32ab5e75f1d51b1d157623e2da1cf89c33039fa381f4872cf1bd15370782d62380662961ce832d46ba41a603a0e9fb2294693d5430ddd201d8e191cd1de1
+EBUILD zita-alsa-pcmi-0.4.0.ebuild 914 BLAKE2B fcd134b596c77a706ba200d6e73cfae7d6067e47cbbd1aa90d19a1bd685cbfc7bf147bda0144771226aef254020eb832ee5bffba9054fa3b0ae5d019f2f3fb76 SHA512 5942268405258c344c76e5f845f4b0c28518c1e7d7b8d3fdcf20b36e1b95f97ce99e4ef2457c3f0a3b2dcf82e3806189575a0f0e057f705fe0ae0d2b48791b66
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
new file mode 100644
index 000000000000..16433bb0bc29
--- /dev/null
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides easy access to ALSA PCM devices"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+CDEPEND="media-libs/alsa-lib"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS COPYING README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-Makefile.patch"
+)
+
+src_compile() {
+	tc-export CXX
+	cd "${S}"/source || "Failed to cd to sources dir"
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	cd "${S}"/source || "Failed to cd to sources dir"
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
commit	3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree	44068672445b1418489aed82de58df3c470289e7 /media-libs
parent	0f15659d48c193027158492acb726297501202c5 (diff)