gentoo resync : 06.04.2022

101 files changed, 2895 insertions, 617 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ea83e446e261..78e25be4b621 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
index be73bf6d68a4..aa7f76ebdcd9 100644
--- a/media-libs/amdgpu-pro-vulkan/Manifest
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -4,6 +4,6 @@ DIST amdgpu-pro-vulkan-21.50.1.1376756-amd64.deb 8342920 BLAKE2B a99ba48ded384e3
 DIST amdgpu-pro-vulkan-21.50.1.1376756-i386.deb 8124604 BLAKE2B 5d325d2b6fe0b22c227df41049330f394315f17aa97203c7032131d5932e75d494539eac4d5e7ea89193a2736068e3a8e5f7a60de9a1a94b8af0b7fba757da21 SHA512 11480ebec72408a5727f99055c32d979912f838256d622c77c7efec37735d2805cf5c52e78d3c86dc0420d29ad52df2d65cd788b67cef1b2df1cfaa5a30c4bc2
 DIST amdgpu-pro-vulkan-21.50.2.1384496-amd64.deb 8320356 BLAKE2B 1a5997ee983bf4729c429dae7d333fd49f8bb24a5022238299fd87e4ad8a7579c0535a8198fc3869db3b8079634b1e06e9bb90ff761239486cb4ffb7ea6ead4a SHA512 16299cb567d9573080d6e3b83124e931692392c5282a3be5f39638682b2c8d4aa9395787382e0145d61dc5a5df3f3e143d9f01b1710ad11e940f3e8ea5137c7a
 DIST amdgpu-pro-vulkan-21.50.2.1384496-i386.deb 8124180 BLAKE2B 697899e40cedc584d8507c3c4c908c54db3676d47d720fb7b7fcab6e1f542e1d1e5efedb5b46231d4cd6974d3d03a19816d6ab4cc6d2f0279547058b5e4143e3 SHA512 8662efb65f14172f4261401115737f3c7eebbe071a9660f5146eaee9a1d4684c30174b18bea94d31686dbe679d66ab77f252192c1cda27ed57784cc9a57e5fdf
-EBUILD amdgpu-pro-vulkan-21.50.1.1376756.ebuild 2788 BLAKE2B 7137c459e6dacd9ac3b469fa4003c8b9ed833c94d00d384cf18ecb53906045e05911093a9665e5bbcad9b64ef9bf18cab358b9285cc2b73ec3bf0e78796d4af4 SHA512 a719c0e865209fa4017497655593b9286b4e241cdfbfe5b5966709ec1b91d2089b906c64116ee20bb5954b1adb3ac934bce5b300a8e41b7fa5227f453346270c
-EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2788 BLAKE2B 7137c459e6dacd9ac3b469fa4003c8b9ed833c94d00d384cf18ecb53906045e05911093a9665e5bbcad9b64ef9bf18cab358b9285cc2b73ec3bf0e78796d4af4 SHA512 a719c0e865209fa4017497655593b9286b4e241cdfbfe5b5966709ec1b91d2089b906c64116ee20bb5954b1adb3ac934bce5b300a8e41b7fa5227f453346270c
+EBUILD amdgpu-pro-vulkan-21.50.1.1376756.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
+EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
 MISC metadata.xml 401 BLAKE2B c46c3e3729fe8721b57a97a504997e1dd773fceb8ba0ff302f985eca3053abba5ac5f1103d6e4437074b854a3c4c55f7fc6991def0054fb768c8db9eec27ce16 SHA512 08ef778f6f5675ec9848b8f0a8e9296d41a4f21f18a344ba5a0f915a5933280dbd21e66692aaee5ca854785b3a639707d41c0912fdbe43373b51aa173c751383
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
index db6883188d30..b391b5756ff5 100644
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
@@ -30,7 +30,9 @@ RESTRICT="bindist mirror"
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
 
 BDEPEND="dev-util/patchelf"
 
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
index db6883188d30..b391b5756ff5 100644
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
@@ -30,7 +30,9 @@ RESTRICT="bindist mirror"
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
 
 BDEPEND="dev-util/patchelf"
 
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 5b49bc1a6e05..4568d0351dbc 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -10,7 +10,9 @@ AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493
 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
 DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
 DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
+DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
 DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
 EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b
 EBUILD assimp-5.2.2.ebuild 1170 BLAKE2B 0e87a8edaa8e4fe0b9a33d1dd5c95f63e041eafec91d40af902bc39f5be2aff4c998c4cc43b33b585f3b4a6a302a95f6f288599c29979e60a6aeb04c2c283e24 SHA512 dcc9ee9470c6b63f87c20e1ae2f3d75f8cc9e8b28ef25838b2558f932f0e775b3521380a903f3cffbfc1a9137403d2ffec2ff2386c2d74c227a8789ffcf8166d
+EBUILD assimp-5.2.3.ebuild 1225 BLAKE2B 0a59b57212b0324facedd18f2c71941567c6a5801906159e0c0d5810e730e720069422974d2f1c81a504e50cd430d169f6e3747454f1ee363fcbd2249790c170 SHA512 0cbd1b881aab6319321e8cfb73623e02bcda2b8dbe4806d8a967255cdbc9d4eadfca31516fd1349ef6dfb7fc1aeda932258dced0d8e21687961d120a9ed7e833
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
new file mode 100644
index 000000000000..ba654ddd393f
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="samples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib[minizip]
+	samples? (
+		media-libs/freeglut
+		virtual/opengl
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+	"${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
+)
+
+DOCS=( CodeConventions.md Readme.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DASSIMP_ASAN=OFF
+		-DASSIMP_BUILD_DOCS=OFF
+		-DASSIMP_BUILD_SAMPLES=$(usex samples)
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DASSIMP_ERROR_MAX=ON
+		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
+		-DASSIMP_IGNORE_GIT_HASH=ON
+		-DASSIMP_UBSAN=OFF
+	)
+
+	if use samples; then
+		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}/bin/unit" || die
+}
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 840c1a55eb74..da1b5b1e6053 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,5 +1,5 @@
 DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.1-r1.ebuild 1558 BLAKE2B 826eebb264c4644341ae201a5909667168b52a77116bd3fe6cfe713c147a5387f3520660be5065de1b44139eb262f8320614d4be39392c658e7a2419a0eacead SHA512 2e2028518fb66895f472e0b5241e7e7cf6e0508f68d6adb0e0fac826d35401bb8a2dd614d7727e996d7ef41fbd2045634f85285e1f3bd24e9ee4030e30cbfb80
+EBUILD chromaprint-1.5.1-r2.ebuild 1635 BLAKE2B 8687c05e31d18cd12285fe6b2befc8e30f3e29c769e5c91bf3206b1593a71bc6c3d744f437d53e515dfde9b8f324cfbf643ca749c8b5d758a84160bfb29de7c5 SHA512 c38844e269f1045c4b5d3e51e1f315a1fe6dc381f3c65fd2ec19960361e3b3f4782c4b54c6fc191a3772165554cadeedceeb6df1b39bf1c4f79dd9eadf05117c
 EBUILD chromaprint-1.5.1.ebuild 1300 BLAKE2B ac5a54d0965f922f3b29e65b42a02eb47ed2707ed7cf2b338e37a3791596f7b67bd78b913fbee3613c9bf20be1180bb28da0210ad1a019216b972077113351d6 SHA512 deb96d762d15d06c584839806b1487b9088236d41e7e284ab2de4837e247053a1e6ce271b2a9c89eb2988d2cc7229eedd9515e0d90eae9c0a5732e4119e9e906
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index 41f811d616ad..a3f156b7c867 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -34,14 +34,13 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 
+		-DBUILD_TOOLS=$(multilib_native_usex tools)
 		-DFFT_LIB=$(usex tools 'avfft' 'fftw3')
-
-		$(usev tools '-DAUDIO_PROCESSOR_LIB="swresample"')
-
+		$(multilib_native_usex tools '-DAUDIO_PROCESSOR_LIB=swresample' '')
 		# Automagicallyish looks for ffmpeg, but there's no point
 		# even doing the check unless we're building with tools
 		# (=> without fftw3, and with ffmpeg).
-		-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=$(usex !tools)
+		-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=$(multilib_native_usex !tools)
 	)
 
 	cmake_src_configure
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index d4cc57e9a45f..d75ad73a8948 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,11 +1,16 @@
-AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961
+AUX fontconfig-2.10.2-docbook.patch 519 BLAKE2B dc2d348b3365c32d4a57cacc8f2060b57289983643918efb5244af691f16ad2c23fcb1eadb803367ef6ef22689b50238b071ff804ecc6dfc4ff63a9b95464d55 SHA512 a73cfbbd76bd74d6e222104104ce8e04b8dadf77ca01f886f0bdaa42eae1a200e2cc0e1437e9d0bc7c4827c925b7556af6f8708a24c47f2a6b2f493f2157f507
 AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6
-AUX fontconfig-2.13.1-proper_homedir.patch 8048 BLAKE2B 8735be09139f13f41eeccd6ec9b34ad5086ec6716053570b1368a0c8068bff6431e15d5c3ca0a0341958aa8801ceba422ceec012adeca7f0fe71e4bd1f9a5970 SHA512 ecd77822f9ee6ff2529cb3401c5f4e8cf105583f51b040ab160b8ee99c62762a9eb04f836a15b1f6186423c8180238d0379d55442088d2bab03d8abe817e6e22
+AUX fontconfig-2.13.1-proper_homedir.patch 7787 BLAKE2B 02aa34bbc32c528826a83947e854cbac6ad4d9b9b0669a7b313367786d58c829dbf8a8ba9e2489e93b2f5770da4c8d968cbcf8055f6d2b8c285dc68a8e254408 SHA512 15fead3db21726dfa26e66b767724c3ebd8fc2a961e32a5a306287563f67bf9768144cdbc1915d667772724a764116031b5e4ffc5b38d314915242e154fd8d45
 AUX fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch 1005 BLAKE2B 48d1ad733b7543a17f4917c81a7ca2df402f6fbc851d97edbb0d6e58d28446b532a9804db0af45eaf3b294158ad5377ed2dee95b2f66fe63b44312c39def5262 SHA512 b583cd21d11add33bc94ff624ba96ab8fe585beac2fa285b7b207bfdf199debe2496d8cf12ec406d84fcb46eaba4c9c5afd768002e2b35e0d569fc82d894947b
-AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98fe4fed432afecfa2ee97c2a53f297cd7f674ca162aa01dcdadcc648c9cfb4cb8bd3f91714f1808322dd65c70308550c3a8e1b6c SHA512 c5a1a80cc99850d1ab197079ec629032310913d7756d86defcae5c721f3a50078c4059347b21cdc409b0de0d45c1466f038a9b5280bd7f772a966b43cbb3fe6e
+AUX fontconfig-2.13.1-static_build.patch 2009 BLAKE2B 1aca47b31dbc3b606210dc37fd4a0c9e2629e7647676e24ceffe3f5b6eb2dab6406445ab47589f8f921e6698b65080e5a2b7e2a6cd0034a3d92dcbb74aeeabbd SHA512 32bb7b93d05875a3b8cc74110fbcc2d43f78008fcaea0c50fbb89e5f78b13067a19dab4d251c03945be42f202c9a950d7c9160bb6537cff0a57f55a92e7ad54b
 AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
+AUX fontconfig-2.14.0-docbook.patch 991 BLAKE2B 1c4b3336e88c6beb33d456adcee1e97b8d542d8c5799cba6b9710a162a4fa342836a5acde62d7723a110f8777232a5f7aa1e4e1bd73bbb20bb5005b96ae1ec24 SHA512 c140c94b1c03dc091ed005928d2957239bb1738cf70b36b2401d3fcf94e7eab05cee686ad27a60b1299cccfbc11f463425fd97419fd01786e27cb7840e5620cc
+AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f052577bfd8f9becb4b3d0e22e28ee4ba9a03458dd54a4becf9e0e3c728f18db68f3a115be619469fee7dfb2a20e508ef320b14b SHA512 c96c6ba0b2ebf24d0669bb982672ac03b45e1413f68f50f2ad6556ef87014d3c42875d6094426e1b89e108b5f165a0040a3740fc37d94902224549e56bb3642a
+AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
+DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 EBUILD fontconfig-2.13.1-r2.ebuild 5608 BLAKE2B c2dae524023fc7ba003263ab64efce755ce51f58da635c395fe72cd688ae865a975bc6000ed179e95298696693015b24cd5cb4309d84606583aaad2aaeed5dbd SHA512 b3b447d031b424b4e8d94b12efae6248cb432727c7aee7bb6c0ed4ec692199c9b0df1cff102be37eedd20ea93c1dff99f1cf5acd1de260c96012d53de04c828d
-EBUILD fontconfig-2.13.93.ebuild 5890 BLAKE2B 122423d9ae3ad277cf9fefcc2269788b48dfe56c6ed6b8d9965a315063ab7d0b9a3398564e922bdf224277a53b79b822df70a2c134a871817fdd505c50ac3575 SHA512 484f8e8f3fbaae942b156ce89ed78e48cd52921de0f7f7c428b8d0022d46bd5f5a7a07260e036f90356caa27670f9a92804c3636e9672f7b740c9b9e11ebc7f2
+EBUILD fontconfig-2.13.93.ebuild 6052 BLAKE2B 8b8776533738da7a8b4c2a0d2e4364ff800f688c1dee7e12fc2d7f18c8a0ecb810435960148132a184ec88156433449e8655a5007afac77513d6dcdbff48e216 SHA512 5efb40c14064ee4ed26073b8e10e2ba3f0b2debd6d06b1c3c523897374ae3dfe23c94fab0fcf94dd028965cbee207856fb9c884eaafe1eb752c4831439a2de8f
+EBUILD fontconfig-2.14.0-r1.ebuild 6710 BLAKE2B 2cbb75c57a8b3fc840bddc2b80ff43d23c6b736bce548db98e5f0991c87eec3b5b65cc2d0076a9da47a22affb8239eb419307dbc048bc41421befe753ee77670 SHA512 42b6e28bb6cec9ff12472ee84282af4428176042ed68ce40b89d060e70bb7a7bb87ec840653e0e51afc3aea63a347bd27bcd33eedb12c5c940fca89a33b5b945
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
index 33d6549c8147..94bea6327148 100644
--- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -1,6 +1,6 @@
-diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac fontconfig-2.10.2/configure.ac
---- fontconfig-2.10.2-orig/configure.ac	2012-11-26 09:21:13.000000000 +0100
-+++ fontconfig-2.10.2/configure.ac	2013-01-05 15:40:54.541682239 +0100
+https://bugs.gentoo.org/310157
+--- fontconfig-2.10.2-orig/configure.ac
++++ fontconfig-2.10.2/configure.ac
 @@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
  # Let people not build/install docs if they don't have docbook
  #
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
index 19aee94ba988..71c27f56f644 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir
 this behavior was broken by d1f48f11. this change fixes it back to the correct behavior.
 
 https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
-diff --git a/src/fccfg.c b/src/fccfg.c
-index d7c48e8..4a53581 100644
 --- a/src/fccfg.c
 +++ b/src/fccfg.c
 @@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
@@ -40,8 +38,6 @@ index d7c48e8..4a53581 100644
      return file;
  }
  
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 79bcede..9f4d48a 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
 @@ -91,6 +91,22 @@ test_bz106632_CFLAGS =					\
@@ -67,9 +63,6 @@ index 79bcede..9f4d48a 100644
  EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
  
  CLEANFILES=out out1 out2 fonts.conf out.expected
-diff --git a/test/test-issue110.c b/test/test-issue110.c
-new file mode 100644
-index 0000000..28a3bd2
 --- /dev/null
 +++ b/test/test-issue110.c
 @@ -0,0 +1,245 @@
@@ -318,6 +311,3 @@ index 0000000..28a3bd2
 +    return retval;
 +}
 +
--- 
-2.18.0
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
index 7a0edfd849ab..d78317da0b3c 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
@@ -4,9 +4,6 @@ Date: Mon, 3 Sep 2018 04:56:16 +0000
 Subject: [PATCH] Fix the build issue with --enable-static
 
 Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
----
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index bac1dda..af870d0 100644
 --- a/fontconfig/fontconfig.h
 +++ b/fontconfig/fontconfig.h
 @@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8   *string,
@@ -20,8 +17,6 @@ index bac1dda..af870d0 100644
  FcPublic FcChar8 *
  FcStrDirname (const FcChar8 *file);
  
-diff --git a/src/fcint.h b/src/fcint.h
-index de78cd8..a9d075a 100644
 --- a/src/fcint.h
 +++ b/src/fcint.h
 @@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
@@ -35,8 +30,6 @@ index de78cd8..a9d075a 100644
  FcPrivate FcChar8 *
  FcStrLastSlash (const FcChar8  *path);
  
-diff --git a/test/test-bz106632.c b/test/test-bz106632.c
-index daa0c1e..2d67c2e 100644
 --- a/test/test-bz106632.c
 +++ b/test/test-bz106632.c
 @@ -25,25 +25,26 @@
@@ -96,6 +89,3 @@ index daa0c1e..2d67c2e 100644
  int
  main (void)
  {
--- 
-2.18.0
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
new file mode 100644
index 000000000000..b9d5e8e5b5e2
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/223
+
+From d4a8381169984246dbb14b7a810abd170d7d0afd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 2 Apr 2022 02:36:24 +0100
+Subject: [PATCH] configure.ac: allow disabling docbook
+
+Sometimes we might want to build docs (install man pages, etc)
+but allow disabling use of docbook.
+
+Bug: https://bugs.gentoo.org/310157
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -736,7 +736,13 @@ dnl ===========================================================================
+ # Let people not build/install docs if they don't have docbook
+ #
+ 
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook,
++	[AS_HELP_STRING([--disable-docbook],
++		[Disable building docs with docbook2html (default: no)])],,)
++
++if test x$enable_docbook != xno; then
++	AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+ 
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+ 
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch
new file mode 100644
index 000000000000..2ae36f4ae4d6
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/130466
+--- a/conf.d/60-latin.conf
++++ b/conf.d/60-latin.conf
+@@ -5,47 +5,50 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
++			<family>Liberation Serif</family>
+ 			<family>Noto Serif</family>
+ 			<family>DejaVu Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+ 			<family>Nimbus Roman No9 L</family>
+ 			<family>Nimbus Roman</family>
+ 			<family>Times</family>
++			<family>Thorndale AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
++			<family>Liberation Sans</family>
+ 			<family>Noto Sans</family>
+ 			<family>DejaVu Sans</family>
+-			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+ 			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Nimbus Sans</family>
+ 			<family>Helvetica</family>
+ 			<family>Lucida Sans Unicode</family>
+ 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
++			<family>Verdana</family>
+ 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
++			<family>Albany AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Liberation Mono</family>
+ 			<family>Noto Sans Mono</family>
+ 			<family>DejaVu Sans Mono</family>
+ 			<family>Inconsolata</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+-			<family>Cumberland AMT</family>
+ 			<family>Luxi Mono</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Nimbus Mono</family>
+ 			<family>Nimbus Mono PS</family>
+ 			<family>Courier</family>
++			<family>Cumberland AMT</family>
+ 		</prefer>
+ 	</alias>
+ <!--
+@@ -66,6 +69,7 @@
+ 	<alias>
+ 		<family>cursive</family>
+ 		<prefer>
++			<family>Comic Neue</family>
+ 			<family>ITC Zapf Chancery Std</family>
+ 			<family>Zapfino</family>
+ 			<family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch
new file mode 100644
index 000000000000..7d0041ad9765
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch
@@ -0,0 +1,14 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/320
+--- a/test/run-test.sh
++++ b/test/run-test.sh
+@@ -40,9 +40,7 @@ EXPECTED=${EXPECTED-"out.expected"}
+ FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT"
+ FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT"
+ 
+-if [ -x "$(command -v bwrap)" ]; then
+-    BWRAP="$(command -v bwrap)"
+-fi
++BWRAP=""
+ 
+ FONT1=$TESTDIR/4x6.pcf
+ FONT2=$TESTDIR/8x16.pcf
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index a88e04398db3..a47819b7d743 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -41,8 +41,11 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	elibc_SunOS? ( sys-libs/libuuid )
 	virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
+PDEPEND="virtual/ttf-fonts"
+# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
+# it is natively usable in BROOT to update ROOT when cross-compiling.
+BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
+RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
@@ -51,8 +54,6 @@ PATCHES=(
 	# Patches from upstream (can usually be removed with next version bump)
 )
 
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
 pkg_setup() {
 	DOC_CONTENTS="Please make fontconfig configuration changes using
 	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..569d95035ed8
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Cannot yet migrate to Meson as of 2.14.0:
+# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/244
+inherit autotools multilib-minimal readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+	virtual/libintl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/json-c )"
+BDEPEND="dev-util/gperf
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+	# bug #310157
+	"${FILESDIR}"/${PN}-2.14.0-docbook.patch
+	# bug #130466 + make liberation default
+	"${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+	# Avoid test failure (bubblewrap doesn't work within sandbox)
+	"${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+	# Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+	default
+
+	# Needed for docbook patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local addfonts=(
+		"${EPREFIX}"/usr/local/share/fonts
+	)
+
+	# Harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts+=(
+				/Library/Fonts
+				/System/Library/Fonts
+			)
+		;;
+
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts+=( /usr/X/lib/X11/fonts/TrueType )
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] &&
+				addfonts+=( /usr/X/lib/X11/fonts/Type1 )
+		;;
+
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts+=( /usr/share/fonts )
+		;;
+	esac
+
+	local myeconfargs=(
+		$(use_enable doc docbook)
+		$(use_enable static-libs static)
+
+		# man pages. We split out the docbook parts into its own flag.
+		--enable-docs
+		# We handle this ourselves.
+		--disable-cache-build
+		# See comment above *DEPEND. We use Expat instead.
+		--disable-libxml2
+
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts=$(IFS=, ; echo "${addfonts[*]}" )
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# Test needs network access
+	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+	# On bumps after 2.14.0, please check to see if this has been fixed
+	# to allow local access!
+	chmod -x test/test-crbug1004254 || die
+
+	default
+}
+
+multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+	default
+
+	# Avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		# Stuff installed from build-dir
+		emake -C doc DESTDIR="${D}" install-man
+
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+
+	# fc-lang directory contains language coverage datafiles
+	# which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
+		mv "${ED}"/usr/share/doc/fontconfig/* \
+			"${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"/usr/share/doc/fontconfig || die
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
+		> "${T}"/37fontconfig || die
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
+		> "${ED}"/etc/sandbox.d/37fontconfig || die
+
+	readme.gentoo_create_doc
+
+	# We allow the cache generation to make this later
+	# bug #587492
+	rm -r "${ED}"/var/cache/ || die
+}
+
+pkg_preinst() {
+	# bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+		local file f
+		for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" \
+						"${ED}"/etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ -z ${ROOT} ]] ; then
+		multilib_pkg_postinst() {
+			ebegin "Creating global font cache for ${ABI}"
+			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+			eend $?
+		}
+
+		multilib_parallel_foreach_abi multilib_pkg_postinst
+	fi
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8eb1282df89c..68068df9fba1 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -2,15 +2,20 @@ AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31
 AUX freetype-2.11.0-COLR_missing_blend_mode.patch 2304 BLAKE2B 002fa132591422fc4ef9180dd2ee667d42d57cc5be08e253dec182a345280e42ec15f2dd8d30891e13d168bf0da77279216b4fdc8e56c4e59a11f3f3438525b9 SHA512 4e55f43b86f2d54867dd62558b7a02312e82581a9469395ef24f8b6f0ec2e9ec14776a828c2520970758d8d67cec0c659087e48b8ed3ae30c77a725a92a9ffc1
 AUX freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch 681 BLAKE2B addd6b85be20b48b92af7f21dafab7014fae110163ed7d6a9341d958505d46a76dc131a54b1c954f3157737429b3b4a87ea0c7c621bfb3cb8f4f101ae2ce9398 SHA512 36060458da10c1afeaf3303010235e2b9adfd0273a7b8c0c0b5e4d4c30a3eac79485919613de892a1b0f2637d5f98fd5314477e833b78819421f134d6cdf40a3
 AUX freetype-2.11.0-quiet_noop.patch 1304 BLAKE2B 57276cf6480a4807e8e9704e5a9ea5d3a0d288e8af17f935e2911932fbe517d845b68abb503cfde697f6e6778a14c44334482d8917914817ec4c7f454dc005eb SHA512 f7261da6d457ce1c9ecd49d17a251f349f2786a3d12e42555a605a95b73573fdba90e70855b38e2c79ab6f4dabb8a8e6a3d1abc9fc8ca87d3ba29a04f9ee802f
+AUX freetype-2.12.0-librsvg_automagic.patch 2213 BLAKE2B b5e0b7e5c57650b7371fde47ab87be7e18385e7190a5c9e2d14a285a91e035427c44dde12a988fa993ca782e5f8396b9bbe0418078c9462b442852a911ec8f05 SHA512 cdce3b4b40f4ce1ef7ed3d58a0f1a916ba81f0788a4e6136fe53ba84ed53e48f91e5f670d3ef1dfbd367cd741dc366d88da6e1f34bdcf0b082324dd69d94f584
 DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
 DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
 DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
+DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
 DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
 DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36
+DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
 DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5
+DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
 EBUILD freetype-2.11.0-r1.ebuild 7398 BLAKE2B e4cdd82b1241ebce56f26477bf6557192fba0420da1b1b6adc6c268bd26cfbeab506f3c82df07d843e5ad8173d653f45a891485d7662bdfe9a344d2f9cf478c2 SHA512 ef9c9bb1e172c89c9f1db6e005e69fa0ef7031accf4a82be4b76d73968b92ded8cb80bd5075cb676c26b58c2db90f2e99162b13ebd15f9c1361f56373f40aced
 EBUILD freetype-2.11.0-r2.ebuild 7451 BLAKE2B e672e09cf5521eb9a7c345b38b3b28858d12629b2906811d1afd40cd882ce26414506c60a7d315692b524d1fb6d4471fb9c90dc136e942aeab3323188e3947f8 SHA512 a508bef0b6221eb6902cdb632af9a73953bf630923797d70a21287a93f8cd2afa1a08a75f5d48c31c4bfbcc3b368494c8969d2a84daf26f57255bd792a22e813
-EBUILD freetype-2.11.1.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
+EBUILD freetype-2.11.1.ebuild 7099 BLAKE2B 5ab262853bedba65e8ca456dda75263a7a2851d86d640cec35dcf650940d23729c49400c5f7e4af531aebfb6e2128e1e30abfe70d80c7949dbf35333ce252bec SHA512 599adba85e1a3526bc9135b1384db9898971fca4de7fbe8df2b47f52605955603bb4ec2a3a158505f449fe46a2af2ba98ed78c7f3197a035fe3ec876b6b14df7
+EBUILD freetype-2.12.0.ebuild 7492 BLAKE2B fcc365d9d8fe42e5b145ae577782f40d0a00a3592ec82b9f8fe1195a2290508651fab32f9c02cd62131a48195db727b62558b48b20599f08080238d38f648a9b SHA512 3dea41ca1c7bfd9d7f7b6fa190fc64bb120f9a6441b5deae1bbf4d365d282e623a7120230ee3ca8cd272332a4150be082df3f579296de709f1f15d45cc1150d0
 EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
 MISC metadata.xml 1361 BLAKE2B ec4f7fc1bd3a16f507b0ff18a637849744a5e470a26037a2ef7e0e9a6537408184ca722a003340128f962bcda1cedc044e411c58e5d315602095e1997dccc920 SHA512 16112a7dbc2231ebe0b9cecfd3b91bd966d49de1e04eb72694ef0a22c9495e6a91ac31da7bd027ce90fcda08ca10144d24c4e28b798a1074af147ab0f8b007c7
diff --git a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
new file mode 100644
index 000000000000..bb6854e9ecb5
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
@@ -0,0 +1,56 @@
+https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156
+
+--- freetype-2.12.0/builds/unix/configure.ac
++++ freetype-2.12.0/builds/unix/configure.ac
+@@ -530,13 +530,20 @@
+                [test "$ac_cv_search_clock_gettime" = "none required" \
+                 || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+ 
+-# 'librsvg' is needed to demonstrate SVG support.
+-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
+-                  [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
+-
+ FT_DEMO_CFLAGS=""
+ FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
+ 
++# 'librsvg' is needed to demonstrate SVG support.
++AC_ARG_WITH([librsvg],
++  [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
++                  [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
++  [], [with_librsvg=auto])
++
++have_librsvg=no
++AS_IF([test x"$with_librsvg" != xno], [
++	PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
++			  [have_librsvg="yes (pkg-config)"])
++])
+ if test "$have_librsvg" != no; then
+   FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
+   FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
+--- freetype-2.12.0/builds/unix/configure.raw
++++ freetype-2.12.0/builds/unix/configure.raw
+@@ -530,13 +530,20 @@
+                [test "$ac_cv_search_clock_gettime" = "none required" \
+                 || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+ 
+-# 'librsvg' is needed to demonstrate SVG support.
+-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
+-                  [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
+-
+ FT_DEMO_CFLAGS=""
+ FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
+ 
++# 'librsvg' is needed to demonstrate SVG support.
++AC_ARG_WITH([librsvg],
++  [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
++                  [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
++  [], [with_librsvg=auto])
++
++have_librsvg=no
++AS_IF([test x"$with_librsvg" != xno], [
++	PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
++			  [have_librsvg="yes (pkg-config)"])
++])
+ if test "$have_librsvg" != no; then
+   FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
+   FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
index 7e8918903023..e2ef9bdbfa37 100644
--- a/media-libs/freetype/freetype-2.11.1.ebuild
+++ b/media-libs/freetype/freetype-2.11.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
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.12.0.ebuild b/media-libs/freetype/freetype-2.12.0.ebuild
new file mode 100644
index 000000000000..6dddbb78b16f
--- /dev/null
+++ b/media-libs/freetype/freetype-2.12.0.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="High-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
+		local dlg_dest_dir="${S}/include"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
+		# inspired by shipped autogen.sh script
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;${FREETYPE};" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+	if ! use adobe-cff ; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug ; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils ; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X ; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-shared
+		--with-zlib
+		$(use_with brotli)
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	export CC_BUILD="$(tc-getBUILD_CC)"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Installing utils"
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge ; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header ; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 5dbf4ec27cd0..efbb2ed3d2f7 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,5 +1,6 @@
+AUX 0.14.0-clean-up-python-support.patch 7005 BLAKE2B 623b003ab5c03ed86585ac662c5ddae0857bc09ddf28f5a42ea40f60601758111bcb408f38bfaa1aa081d882750d343eef355977da2ee84b3a9675d560243e11 SHA512 3de9ec1e11e859b393e16ae9d6a15e98157869b8b9cb2e939e8642eb4f38e9aaca05c969094dae001425475113ce4dc0224d3bcffd72a581b310174d039d1fd8
 DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
-DIST gexiv2-0.13.0.tar.xz 387188 BLAKE2B 25550fd0b711e1363da1f6144af482709b52b0334e326a211919fcc97ccaef1832978a31d8d7ec111caf3f3b9b4db3537d818d35199da2e0b6250098c6d99d01 SHA512 dcd94a8e8ab7e3764bf652514222c3cce4537bf2658905405a25d1dd18878e67343060f5b1cf9fd8b11acf4dd2b727a9d49a0d8f379838c60c92de69f0bed2c5
-EBUILD gexiv2-0.12.2.ebuild 1792 BLAKE2B d340d1c9249a8d40f1033354fc784f2257076ab156c92da315ee42ba5e1288b7386d53720e3c9a41f8c15ef8919f7207ebab6c69700e87fa2e929a87cb48b7a8 SHA512 06cf3a12ce5f33132433134da2fde272c0151e76189e51b058fcb94942de869ecacbc11571387f5d90c6fdb0c960de8c075f93c88f97b014024104d0d04fd784
-EBUILD gexiv2-0.13.0.ebuild 1812 BLAKE2B 4da38dce9112359317b4f5f732847991a03c51833cac03c7fdf30565bc495fd0285f1cd1134a3aad68967c457c7a97a228e637d3d42f4bf16a8bfd141814d320 SHA512 78a839a2294d065fbb93fd6bec8edf0bab434e1ad20b0cb3919344a5dcd9ed62945b3295db3082a8d2d92092dbeec1f784713f9f21492386d1461bf78bacea9f
+DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
+EBUILD gexiv2-0.12.2.ebuild 1793 BLAKE2B 8251109fe8ea27a5fe4023479b1dfd0e0db1bf34635e2d79b6ec6bfe8830aca3faa5d6de1caa2b597de1f2fa3fc1b29903955fe4c72d2d06f2b8837664faec28 SHA512 7491b8132f9673955e896bf81d444a944dcaf306d253fb367966f142ab084f1b8dbd17f6dab7472ca920f51a481ac211b30eea07f3fd80c5b71028c72c273afc
+EBUILD gexiv2-0.14.0.ebuild 1876 BLAKE2B 9040e4426967ca972118ebd0dd32af8f8989af05c9f00d12c8065121e745acbe153f5cd677a749f500190151f5f9f0cffb5495e8b3f0c7dd0a57b55d5834a704 SHA512 6e8a1883f4a7b29e45815d6a8c0da4f35a2c619d4adaee915c65b20763226765090ea4bcf7ad3c29999b5cb3db39a38ca8b69b50c0da4f67c0500dde424e6803
 MISC metadata.xml 514 BLAKE2B 55bceb7ce8a3c1298a712d2340a166baeabac51ac09a248561c8f8c41b1696380f5d1307437dfab1b677e3e92950a028c20e115008cb359f31b354d01e0b13ee SHA512 63267566c28b52bcf4fe5359df76363767ae590f933e4936770ab0aa5fb43304c1d21c9e37acb81a4fcd0522135a364328379c6a27d3dead37a5f0d858e0672b
diff --git a/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
new file mode 100644
index 000000000000..0e2fbaa33fe8
--- /dev/null
+++ b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
@@ -0,0 +1,175 @@
+https://gitlab.gnome.org/GNOME/gexiv2/-/merge_requests/64
+
+From 7e36a7dfeadfff134beabf502ca4d551f505fd8e Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Fri, 24 Sep 2021 11:48:34 -0400
+Subject: [PATCH] clean up python support
+
+- fix always failing gexiv2 test due to missing import gi
+- actually use override during testing
+- fix totally ignoring gexiv2 test status
+- fix broken build with -Dpython3=false
+- remove unnecessary configure_file
+- remove misleading explanation of -Dpython3=false (it also disables
+  installing GExiv2.py)
+- remove unnecessary python3_girdir
+---
+ meson.build                                   | 21 +++++--------------
+ meson_options.txt                             |  1 -
+ test/meson.build                              | 13 +++---------
+ test/python/{gexiv2.py.in => gexiv2.py}       |  3 ++-
+ test/python/meson.build                       | 10 ---------
+ .../{test_metadata.py.in => test_metadata.py} |  4 ++--
+ test/python3-test.in                          |  4 ----
+ 7 files changed, 12 insertions(+), 44 deletions(-)
+ rename test/python/{gexiv2.py.in => gexiv2.py} (94%)
+ rename test/python/{test_metadata.py.in => test_metadata.py} (99%)
+ delete mode 100755 test/python3-test.in
+
+diff --git a/meson.build b/meson.build
+index 42f70cb..3f9426f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,6 @@ gio = dependency('gio-2.0', version : '>= 2.46.0')
+ cc = meson.get_compiler('c')
+ cpp = meson.get_compiler('cpp')
+ math = cc.find_library('m', required : false)
+-python3 = import('python').find_installation('python3', modules: 'gi', required: get_option('python3'))
+ 
+ bmff_test = '''#include <exiv2/exiv2.hpp>
+ #ifndef EXV_ENABLE_BMFF
+@@ -48,24 +47,14 @@ if get_option('gtk_doc')
+   subdir('docs')
+ endif
+ 
+-if get_option('python3') == false
+-    warning('\'python3\' is disabled, any Python tests will not be run.')
+-else
++if get_option('python3')
+   if get_option('introspection') == false
+     error('Build option \'python3\' requires \'introspection\' to be enabled.')
+   endif
+-
+-  girdir = get_option('python3_girdir')
+-  if girdir == 'auto'
+-    python3_output = run_command(python3, ['-c', 'import gi; print(gi._overridesdir)'])
+-    if python3_output.returncode() != 0
+-      error('Finding the Python 3 gi/override path: ' + python3_output.stderr())
+-    endif
+-    girdir = python3_output.stdout().strip()
+-  endif
+-  
+-  message('Installing \'GExiv2.py\' into \'' + girdir + '\'')
+-  python3.install_sources('GExiv2.py', subdir : girdir)
++  python3 = import('python').find_installation('python3', modules: 'gi')
++  python3.install_sources('GExiv2.py', subdir: 'gi/overrides')
++else
++  python3 = disabler()
+ endif
+ 
+ subdir('test')
+diff --git a/meson_options.txt b/meson_options.txt
+index 5e76789..edb3cfd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,5 +2,4 @@ option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable
+ option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
+ option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('tools', type: 'boolean', value: true, description: 'Enable or disable building the commandline tools')
+-option('python3_girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto)')
+ option('python3', type: 'boolean', value : true, description : 'Enable or disable using Python 3 (and PyGObject module)')
+diff --git a/test/meson.build b/test/meson.build
+index c4f287d..0ae50ed 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -1,12 +1,11 @@
+ test_sample_path = join_paths(meson.current_source_dir(), 'data')
+-python_module_path = join_paths(meson.current_build_dir(), 'python')
+ 
+ test_env = environment()
+ test_env.set('G_SLICE', 'always-malloc')
+ test_env.set('TEST_DATA_DIR', test_sample_path)
+ test_env.prepend('GI_TYPELIB_PATH', typelib_path)
+ test_env.prepend('LD_LIBRARY_PATH', typelib_path)
+-test_env.prepend('PYTHONPATH', python_module_path)
++test_env.prepend('PYTHONPATH', join_paths(meson.current_source_dir(), 'python'))
+ 
+ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+                              dependencies : [gobject, gio, math],
+@@ -19,11 +18,5 @@ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+ 
+ test('regression', regression_test, env : test_env)
+ 
+-subdir('python')
+-
+-python3_test_conf = configuration_data()
+-python3_test_conf.set('PYTHON3_PATH', python3.path())
+-python3_test = configure_file(input: 'python3-test.in',
+-                              output : 'python3-test',
+-                              configuration: python3_test_conf)
+-test('python3', find_program(python3_test), env : test_env)
++test('python3-gexiv2', python3, args: ['-m', 'unittest', 'gexiv2'], env: test_env)
++test('python3-metadata', python3, args: ['-m', 'unittest', 'test_metadata'], env: test_env)
+diff --git a/test/python/gexiv2.py.in b/test/python/gexiv2.py
+similarity index 94%
+rename from test/python/gexiv2.py.in
+rename to test/python/gexiv2.py
+index 4e01ff5..503815c 100644
+--- a/test/python/gexiv2.py.in
++++ b/test/python/gexiv2.py
+@@ -22,7 +22,8 @@
+ import unittest
+ import os
+ 
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2
+ 
+ 
+diff --git a/test/python/meson.build b/test/python/meson.build
+index 783ba0b..e69de29 100644
+--- a/test/python/meson.build
++++ b/test/python/meson.build
+@@ -1,10 +0,0 @@
+-python_conf = configuration_data()

+-python_conf.set('PROJECT_API_VERSION', project_api_version)

+-

+-gexiv2_py_file = configure_file(input: 'gexiv2.py.in',

+-                                output : 'gexiv2.py',

+-                                configuration: python_conf)

+-

+-test_metadata_py_file = configure_file(input: 'test_metadata.py.in',

+-                                       output : 'test_metadata.py',

+-                                       configuration: python_conf)

+diff --git a/test/python/test_metadata.py.in b/test/python/test_metadata.py
+similarity index 99%
+rename from test/python/test_metadata.py.in
+rename to test/python/test_metadata.py
+index 45d9d45..8d4296c 100644
+--- a/test/python/test_metadata.py.in
++++ b/test/python/test_metadata.py
+@@ -30,8 +30,8 @@ import tempfile
+ 
+ PY3K = sys.version_info[0] == 3
+ 
+-import gi
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2, GLib
+ from fractions import Fraction
+ 
+diff --git a/test/python3-test.in b/test/python3-test.in
+deleted file mode 100755
+index 6fb3bf8..0000000
+--- a/test/python3-test.in
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#!/bin/sh
+-
+-'@PYTHON3_PATH@' -m unittest gexiv2
+-'@PYTHON3_PATH@' -m unittest test_metadata
+-- 
+2.34.1
+
diff --git a/media-libs/gexiv2/gexiv2-0.12.2.ebuild b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
index 391e3904bcea..5fc59d4f31ce 100644
--- a/media-libs/gexiv2/gexiv2-0.12.2.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/gexiv2/gexiv2-0.13.0.ebuild b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
index 00f117fc268d..2de5eadc27cc 100644
--- a/media-libs/gexiv2/gexiv2-0.13.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-r1 vala
 
@@ -32,22 +32,30 @@ RDEPEND="
 	>=media-gfx/exiv2-0.26:=
 	>=dev-libs/glib-2.46.0:2
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
 	test? ( media-gfx/exiv2[xmp] )
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-clean-up-python-support.patch
+)
+
 src_prepare() {
 	default
-	use vala && vala_src_prepare
+	use vala && vala_setup
 }
 
 src_configure() {
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 153658c7f43a..174cd9237c0b 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,7 @@
 DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
 DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
+DIST glfw-3.3.7.tar.gz 779531 BLAKE2B f8ea04a6556ca35631d354f92f298c8942a0491e4a96ebcf56a5a88ce5ae68931f7c9cd638ce1951407ed8cb09e9e86272a944d85e1e8010dd6e68135c38de37 SHA512 7b71a5a564633c3617bb0e765566069de9d54e0381fb828959a77a42ca94546623fda514292adee72ddacacc305b219a2e6c4bb799bfab8186010642bc2dffe8
 EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c
 EBUILD glfw-3.3.6.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
+EBUILD glfw-3.3.7.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.7.ebuild b/media-libs/glfw/glfw-3.3.7.ebuild
new file mode 100644
index 000000000000..32cac19f8453
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv ~x86"
+IUSE="wayland-only"
+
+RDEPEND="
+	media-libs/libglvnd[${MULTILIB_USEDEP}]
+	wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	!wayland-only? (
+		media-libs/libglvnd[X]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${RDEPEND}
+	wayland-only? (
+		dev-libs/wayland-protocols
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+	!wayland-only? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXinerama[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${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/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 881d1ec007a3..1b219c783ac1 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -5,8 +5,10 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a
 DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
 DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
 DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e
+DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53
 EBUILD gmmlib-22.0.2.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
 EBUILD gmmlib-22.0.3-r1.ebuild 962 BLAKE2B b985222af586f9481786480fa90fcb9d53ca94526ee12a52050a557d04d92d7dccbf12738c857ea121e918f53a07b7cd438d26aa4bf83e03fa247b1d7c5c8d7f SHA512 dfbad61d40e0d7ef12b1802e360ea884cd0c6721873cc56f2ea4a201ccdcbcfaf9e3103472966ab04b0361ca8fff81b17c12fc455d63837afc9143e079028048
 EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
+EBUILD gmmlib-22.1.2.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
 EBUILD gmmlib-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-22.1.2.ebuild b/media-libs/gmmlib/gmmlib-22.1.2.ebuild
new file mode 100644
index 000000000000..f0fd281de976
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.1"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 3f1f1f8421e6..ba8a21a810aa 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -5,6 +5,6 @@ DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc94
 DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
 EBUILD gst-plugins-bad-1.18.4-r2.ebuild 2596 BLAKE2B 56a306ce7fdcdc1bf8c5f4fa770d954b39558c825f8884054302cddb2109e9281ea15abd0fd5416e6eaa401ba8bf84cbd982a85da8f2ada4ac5f7c924e75e13c SHA512 3e401390a1f43a65763222bc06fc0f5957e42ce3f528cef42d8ee074ac7d74a973d2b2d7c8a5d207ceff89196cf6f5a46d4aee26e6819fb2c3f408ecad46d129
-EBUILD gst-plugins-bad-1.18.6.ebuild 2464 BLAKE2B 2c44d5ff135821aff68aab2f3b371f1d3024472de2f62a2a72844b38c0e881be8e683575ed7abbf8381c673c58220dd1c95a8a35b9437c2f333b64f81d014116 SHA512 63af316478d00cd2c8e89ef9ffcaffbd851f17b54e0bca96234a223a58ab87d57fe674e027341912c86b0f4bc38fc030933bd50e404f9dea9e918ede853a21a6
+EBUILD gst-plugins-bad-1.18.6.ebuild 2458 BLAKE2B 396a174625dc67984afa3e95a3093cc055ffbaa835feb4aef8f40cd3052db506b7344a0602c3f0dc48698e023810ca30c58dc69bb6110f2dbef1eb4802404481 SHA512 e83ab13f31b602cf03f2dd2253702b263367a5af3c5a24a78fe1bb5fb0a64a62a2703155029970934ebb87615ecd2f307f9fb2779371acb485d05bafaead4fc6
 EBUILD gst-plugins-bad-1.20.1.ebuild 2444 BLAKE2B e24fb43caefb1f306df280aa5b883abf40e1ff76069f83c8b5febc3e46c8a06886f347f6b0cb777de39d541e5b46a5b69e33d9d653b32b3fb32207fc62ca949a SHA512 08545855e75450d86a97dd58c05d2555c1c5181e85e1610bb9d67fff5ac80f794358c4339a3445c355d93d103ebd12b338cfa5364838b0f14e6a3f2991454bb8
 MISC metadata.xml 440 BLAKE2B 7effc0f6ca218dae5cae9375491cefd7304006ed2e0ffdb9afdedd8ea3098fd1fa4eb0c2cec9381a3bbbef1c4336094070484b11e447381a1465af66ccbcdb8f SHA512 443bc8793f8c94ea7005445fab8292a17ff2be19f82a769a303e5b84dcbb3282f61813995695bb935d16d2647aae2947acade8f456f14ff6df36fc45cd72f4fc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
index ce64efe50571..86ca99f9cc84 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index aae64e068d64..a9190d51930a 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -6,6 +6,6 @@ DIST gst-plugins-base-1.18.6.tar.xz 3180564 BLAKE2B ad68cd65cff362ea990b26b9669e
 DIST gst-plugins-base-1.20.1.tar.xz 3290068 BLAKE2B 56619a3c267d38daedc1d05b6ab95e8b66dba7bd9e30b019801146688b706f84551290de607d5d2e6f31f2a87302ab75db5cb9704623b4cc11e4aa5c327922c5 SHA512 679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541
 EBUILD gst-plugins-base-1.16.3-r1.ebuild 5996 BLAKE2B 7dd358811a9dd7611fdaa894d98f29cc8bd5220870f4c4f6b150b5c02560b659913932ffe86bf8da8a79be492a08fbc658285e4e6c8ae868e45e521198ea112d SHA512 7e808520e0961f9df523c3b9bab2c66f63c95ab27fff7207514247b93a39cfd5feb5a7544eede97f973df2fbf6123eb971a963ed7db11f811f79575b161eb3f4
 EBUILD gst-plugins-base-1.18.4-r1.ebuild 5761 BLAKE2B 2b93d59d47e5e3ea484be1950a44be3eb03871dcbf67bf027a4dc98a44360431480eb877766cba61512a4b67c82ed777b331a8d52d257b4dc09174fd09bb0b38 SHA512 078ea3980db730d127a86a92b19d7eb80e811034ab55b1a715b135f7abd7b3ecea398d93821c9a21a4ad92431113f6355a0163f38cd2c7252ac0c5f487225d26
-EBUILD gst-plugins-base-1.18.6.ebuild 5640 BLAKE2B 5a676e9b475e47e6e0dbf922c1b4c4569a988018716adc82963f7d8f677ee46b1b888bd93d14cd405f02c019f2e1dc495f51c9d648dcfc1ddd80aec69722aca9 SHA512 bda40b35ec3d41ca7fcdcb1cc7e6c9ba6665d4e42ff84150dabcb82f9d74ac1b9b40ab7ffff6a43e07861651c97fe35084c16ea628bba8d542a6e1f21fd5c4ee
+EBUILD gst-plugins-base-1.18.6.ebuild 5634 BLAKE2B 63fc6ff951af5e2e4c3c094b203eccf15e6383faf833b7059282b340b8472accd436df11df55a35de69b4f107a0063b764eaf55bda9dc8ebb5f413ff48d362cc SHA512 ba4daa5a9a3fb7adea6b2a90882d4113cdc47d0da9ba0b884027962c8af68a5c264df516e7b8daedf3b41841142f0e12eac7a6088e67d79a8670d60317d031f4
 EBUILD gst-plugins-base-1.20.1.ebuild 5573 BLAKE2B db0104803ec4c96c76a7ecf067dce56dbd106ca418930bb83bd7256631cb219c8e30628195c2c473d6ec4a00895ca66f5b10fd100ad8e08f7c868350ff65d820 SHA512 4ca6a7fca9113889e811f269ddb46ea153b578eb25f9c468a6518c8b98024fb83425b1a462d4e0a596c2e1303c111f413c5833c1ac8cbea5121ac2580254a5f2
 MISC metadata.xml 1066 BLAKE2B 1d67f7f75e3f44459adfce03a6ab85a8c7d6a0b24ae83ef48d6b80c1d64845edb1ec5e7cbbb002585eb91663210025707887f5eff66eee41b14e0afcbdc0b4fd SHA512 227960f7c740d5131c1006854273d4b1047a3ceba07d5eda3d60c0f5baba4e8ed9926fab1737e1f97c5745f87f80fcddbdc7e239f5f2942902c92f8053074931
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
index 58eb741e1987..2936e0a396f9 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index babfd332e2ef..053573ac80fd 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,11 +1,9 @@
-AUX gst-plugins-good-1.20.0-lame-feature-option.patch 721 BLAKE2B 857188fd4e6392fc87b75174123636b6d9178742b0f3d90cf17a3b756f3fdc5e19e16d7c22b74d58704caca914f393f75d73762672e2a14481404c030dba29b8 SHA512 e2860cd84627fef0b285e2910a9efc208bbe520b341894fd8e2216193d8610c1e3c4b3c6c5bbcb545bc0c6ad8eff71864fc35f4bb1f2507e131d02a4e39f9a2b
-AUX gst-plugins-good-1.20.0-ldac-rtp-header.patch 5748 BLAKE2B 00b9fdf873751d8566cc4951a9a0d887a61d3e7f433d6a72ccdc384c6267c0d076bbe8e12e80b8eeeb60d23ca0321353c3c300f22e99e3621cafe43a17639fbd SHA512 320c478ea792f9944ce3d80e7661014a23427bb74aefd6ac4f1fb80437868728d27ddfb5ee2b24ef6ff78aead2e71947bb367b50440e477f294b304b0d6e1bc0
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895 SHA512 e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
 DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4 SHA512 6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e
 EBUILD gst-plugins-good-1.16.3.ebuild 1407 BLAKE2B 7709616de2741cecd718c6dd6ac66e7f427b4f8ed80b5a07085a3cb5a3e2cfcc0ac36f28adbbb5c6f6f91f0e31768483462c5f390c672311d4f1c7d308dfac86 SHA512 e31d9ff7c2a665942970da87adedcb90ce31c9c8cecba2816af2d5a15edf7b07f0fdbba7b5bd1a0fb0973f2f8f685b64c54981f601927ca8b6b68b672303b8ad
 EBUILD gst-plugins-good-1.18.4.ebuild 1107 BLAKE2B 7a482bd520673f9f380be8ef253e56bd9fcafea31f408e2932cc2b05976b5757c46bb047c101ade5d35569413c16753e763f34477d7322c9a9d10055401fedf9 SHA512 929a9e4832409b481744d4048b99dda4a3fd1578d78cd306a7f8e94fa6614955145d801ecf6f9f994942f8b6588d3e57955b398ef956651699d4f8168bd5d047
-EBUILD gst-plugins-good-1.18.6.ebuild 1113 BLAKE2B ed67c675ebaf80530bf9779f44e8934aa1c430b8b9b754edc6a3351395ea704eecacfbb4826759e167cf072e43819d7961f56a1e330dd63be13cd9041035a126 SHA512 dbe363637519cda3fe604d0ba5ceabefe4cf70f643b61e7a61758288c617dcfb782a42526e984f05ab1ee2e25d6bcde1fe59bd5fa278d4b71a7d0549e698aa8a
+EBUILD gst-plugins-good-1.18.6.ebuild 1107 BLAKE2B e27c6fd7ebf7f2a96948fb945b2100e03a72117b7720c347f4346f6f71ba2e6946f095539894ace1018d576a1a8a70262a4c35c29d5a154301c0e175dc7a85af SHA512 5e46c46df637bb21b99ffd6c3a5d14e2295d95dc8f9ed9cf39871ea75ef9c9d220e4789a1fbac7052b9038bf53669a3a608808a8e1ddaff63de182c9106e2b88
 EBUILD gst-plugins-good-1.20.1.ebuild 1169 BLAKE2B 4708d87bbecb2d6bcf45e5db89c0f9ca36ee255a286fc79ba3ad5895e1d2c0a687ccb8689716d0dea3de70cac98621fc864fff5931ad31da2a0268dccb274df0 SHA512 62404ae8a5d86d442bf18afb8e457d888430bf6ff35eb116e0ed48b8737e702f1a7e882afa7582c81783c7249c8e5e1ac117265111bf39f5ba23f007d26ccb64
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
deleted file mode 100644
index c431b1fb6bd7..000000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d03971dac7b32a6ffcbf161853e017f65ae7c22f
-Author: Heiko Becker <heirecka@exherbo.org>
-Date:   Fri Feb 11 21:35:54 2022 +0100
-
-    meson: Don't build lame plugin with -Dlame=disabled
-    
-    Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1686>
-
-diff --git a/ext/lame/meson.build b/ext/lame/meson.build
-index 2169fde6f4..3290f17e1e 100644
---- a/ext/lame/meson.build
-+++ b/ext/lame/meson.build
-@@ -1,5 +1,10 @@
-+lame_dep = dependency('', required: false)
- lame_option = get_option('lame')
- 
-+if lame_option.disabled()
-+  subdir_done()
-+endif
-+
- lame_extra_c_args = []
- lame_dep = cc.find_library('mp3lame', required: false)
- have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init')
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
deleted file mode 100644
index f1fc4601a23a..000000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From cc3419daf60159394cd310c2405a78775b3f84db Mon Sep 17 00:00:00 2001
-From: Sanchayan Maity <sanchayan@asymptotic.io>
-Date: Thu, 24 Feb 2022 20:28:23 +0530
-Subject: [PATCH] rtp: ldac: Set frame count information in payload
-
-The RTP payload seems to be required as it carries the frame count
-information. Also, gst_rtp_base_payload_allocate_output_buffer had
-the second argument incorrect.
-
-Strangely some devices like Shanling MP4 and Sony XM3 would still
-work without this while some like the Sony XM4 do not.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1797>
----
- .../docs/gst_plugins_cache.json               |  2 +-
- .../gst-plugins-good/gst/rtp/gstrtpldacpay.c  | 63 ++++++++++++++++++-
- .../gst-plugins-good/gst/rtp/gstrtpldacpay.h  |  1 +
- 3 files changed, 62 insertions(+), 4 deletions(-)
-
-diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
-index 88bff47243..003546d59d 100644
---- a/docs/gst_plugins_cache.json
-+++ b/docs/gst_plugins_cache.json
-@@ -14678,7 +14678,7 @@
-                 "long-name": "RTP packet payloader",
-                 "pad-templates": {
-                     "sink": {
--                        "caps": "audio/x-ldac:\n       channels: [ 1, 2 ]\n           rate: { (int)44100, (int)48000, (int)88200, (int)96000 }\n",
-+                        "caps": "audio/x-ldac:\n       channels: [ 1, 2 ]\n          eqmid: { (int)0, (int)1, (int)2 }\n           rate: { (int)44100, (int)48000, (int)88200, (int)96000 }\n",
-                         "direction": "sink",
-                         "presence": "always"
-                     },
-diff --git a/gst/rtp/gstrtpldacpay.c b/gst/rtp/gstrtpldacpay.c
-index 2b14b746fe..aa30673e7e 100644
---- a/gst/rtp/gstrtpldacpay.c
-+++ b/gst/rtp/gstrtpldacpay.c
-@@ -48,7 +48,7 @@
- #include "gstrtpldacpay.h"
- #include "gstrtputils.h"
- 
--#define GST_RTP_HEADER_LENGTH    12
-+#define GST_RTP_LDAC_PAYLOAD_HEADER_SIZE 1
- /* MTU size required for LDAC A2DP streaming */
- #define GST_LDAC_MTU_REQUIRED    679
- 
-@@ -64,6 +64,7 @@ static GstStaticPadTemplate gst_rtp_ldac_pay_sink_factory =
- GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-     GST_STATIC_CAPS ("audio/x-ldac, "
-         "channels = (int) [ 1, 2 ], "
-+        "eqmid = (int) { 0, 1, 2 }, "
-         "rate = (int) { 44100, 48000, 88200, 96000 }")
-     );
- 
-@@ -81,6 +82,38 @@ static gboolean gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload,
- static GstFlowReturn gst_rtp_ldac_pay_handle_buffer (GstRTPBasePayload *
-     payload, GstBuffer * buffer);
- 
-+/**
-+ * gst_rtp_ldac_pay_get_num_frames
-+ * @eqmid: Encode Quality Mode Index
-+ * @channels: Number of channels
-+ *
-+ * Returns: Number of LDAC frames per packet.
-+ */
-+static guint8
-+gst_rtp_ldac_pay_get_num_frames (gint eqmid, gint channels)
-+{
-+  g_assert (channels == 1 || channels == 2);
-+
-+  switch (eqmid) {
-+      /* Encode setting for High Quality */
-+    case 0:
-+      return 4 / channels;
-+      /* Encode setting for Standard Quality */
-+    case 1:
-+      return 6 / channels;
-+      /* Encode setting for Mobile use Quality */
-+    case 2:
-+      return 12 / channels;
-+    default:
-+      break;
-+  }
-+
-+  g_assert_not_reached ();
-+
-+  /* If assertion gets compiled out */
-+  return 6 / channels;
-+}
-+
- static void
- gst_rtp_ldac_pay_class_init (GstRtpLdacPayClass * klass)
- {
-@@ -115,7 +148,7 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
- {
-   GstRtpLdacPay *ldacpay = GST_RTP_LDAC_PAY (payload);
-   GstStructure *structure;
--  gint rate;
-+  gint channels, eqmid, rate;
- 
-   if (GST_RTP_BASE_PAYLOAD_MTU (ldacpay) < GST_LDAC_MTU_REQUIRED) {
-     GST_ERROR_OBJECT (ldacpay, "Invalid MTU %d, should be >= %d",
-@@ -129,6 +162,18 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
-     return FALSE;
-   }
- 
-+  if (!gst_structure_get_int (structure, "channels", &channels)) {
-+    GST_ERROR_OBJECT (ldacpay, "Failed to get audio rate from caps");
-+    return FALSE;
-+  }
-+
-+  if (!gst_structure_get_int (structure, "eqmid", &eqmid)) {
-+    GST_ERROR_OBJECT (ldacpay, "Failed to get eqmid from caps");
-+    return FALSE;
-+  }
-+
-+  ldacpay->frame_count = gst_rtp_ldac_pay_get_num_frames (eqmid, channels);
-+
-   gst_rtp_base_payload_set_options (payload, "audio", TRUE, "X-GST-LDAC", rate);
- 
-   return gst_rtp_base_payload_set_outcaps (payload, NULL);
-@@ -145,14 +190,26 @@ gst_rtp_ldac_pay_set_caps (GstRTPBasePayload * payload, GstCaps * caps)
- static GstFlowReturn
- gst_rtp_ldac_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer)
- {
-+  GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
-   GstRtpLdacPay *ldacpay = GST_RTP_LDAC_PAY (payload);
-   GstBuffer *outbuf;
-   GstClockTime outbuf_frame_duration, outbuf_pts;
-+  guint8 *payload_data;
-   gsize buf_sz;
- 
-   outbuf =
-       gst_rtp_base_payload_allocate_output_buffer (GST_RTP_BASE_PAYLOAD
--      (ldacpay), GST_RTP_HEADER_LENGTH, 0, 0);
-+      (ldacpay), GST_RTP_LDAC_PAYLOAD_HEADER_SIZE, 0, 0);
-+
-+  /* Get payload */
-+  gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
-+
-+  /* Write header and copy data into payload */
-+  payload_data = gst_rtp_buffer_get_payload (&rtp);
-+  /* Upper 3 fragment bits not used, ref A2DP v13, 4.3.4 */
-+  payload_data[0] = ldacpay->frame_count & 0x0f;
-+
-+  gst_rtp_buffer_unmap (&rtp);
- 
-   outbuf_pts = GST_BUFFER_PTS (buffer);
-   outbuf_frame_duration = GST_BUFFER_DURATION (buffer);
-diff --git a/gst/rtp/gstrtpldacpay.h b/gst/rtp/gstrtpldacpay.h
-index 0865ce7ade..0134491752 100644
---- a/gst/rtp/gstrtpldacpay.h
-+++ b/gst/rtp/gstrtpldacpay.h
-@@ -42,6 +42,7 @@ typedef struct _GstRtpLdacPayClass GstRtpLdacPayClass;
- 
- struct _GstRtpLdacPay {
-   GstRTPBasePayload base;
-+  guint8 frame_count;
- };
- 
- struct _GstRtpLdacPayClass {
--- 
-GitLab
-
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
index e1f8658bcad6..afd8caebeb9c 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index a90dc16202d8..8201caa7e465 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -4,6 +4,6 @@ DIST gst-plugins-ugly-1.18.6.tar.xz 515236 BLAKE2B 9f68321e5b58e49989630838fb8fa
 DIST gst-plugins-ugly-1.20.1.tar.xz 504136 BLAKE2B a3e0e7934feab2efb38dcfa8a034eca9bd3010051b0a6b6c09f100f4a356dc9e8654c45b7e124e4a0e3ac5174f2be6b4362df26bb94df61d899453e10dfbb2ff SHA512 cf4db5da474cba86e19ed399014dff8d0ed3a51feaaaf3a25779af23f5996b6d28c8c9237ad7b4d47051e4336c3b2b467094aed39bf15c8c25b7a6fe9508e6d5
 EBUILD gst-plugins-ugly-1.16.3.ebuild 941 BLAKE2B 2a5e299284a15b210674a41aaa998b46bc607aafed4915fb29ae253ba92840977a74211ec80fc529dd706a6de03aedc9d4a81f8342df3cd5064120130a024bcd SHA512 11e3fc097a2fe4dbf114c5ab80678144b9d3f3b7e7b35ac688d30829a63e3057de7fe82a51f716f87023ac2ccae81b65c8920bb9a33e899371154498edd59cab
 EBUILD gst-plugins-ugly-1.18.4.ebuild 777 BLAKE2B ba68d1152cead7f1c2b373db2329426ad3e59ace5f7848f2371b97ad8ed49cf3d6ad43ac44b594c86ac581c6732e87070ab7e794e856cd188b933ead5f5c8f70 SHA512 80035915311971c204358b99090fcadd85b11b161ab76a49ac138623f2040c6723beba38f27110dc0e60a25ce651c5e43322b8eabf1e4021b66d5ad4c6857600
-EBUILD gst-plugins-ugly-1.18.6.ebuild 783 BLAKE2B 0f62e2296b8955388760e35fe77a80cd058793a885c3c55c27e221892f144c9281f47ea26143268d357ac4b4e49a13f14b297f05e7c8c39c5e06337db8475e30 SHA512 f635cea66276c25c80387a3353051a4001fbebfba24cf1d851b4ca04f78f7687eb20e55904f01948988791514e4f1de23a5a9a9a0f2e6e820aac7336afd24ffc
+EBUILD gst-plugins-ugly-1.18.6.ebuild 777 BLAKE2B 7e9d0f763b0d4db51857583ed6b9f7cd1cf8d3be410fe6a842a54cf2b8e414f98c5f3d6ddb925105fd7cdbf0360b22640292e10eb910257e3785ac6e7d133009 SHA512 0cd107c5dc7554447a9d0e2a7efab1d61e8cd25327206c94ec4917267603815d2dafc2a76fa8072a0516df319439cd95a279ffd8ee7d4bf92af967e5890e17c8
 EBUILD gst-plugins-ugly-1.20.1.ebuild 757 BLAKE2B 6b0aefde7c540fa4ce733fc7a998ffd814ba43ca4c08e058b3135a570fd43589dc5456cf4d01631c0e1299d5087421473843ab10d31fafeb3730a75e7e5afa68 SHA512 baa9b0afe57099445156440d5c386019f8eb4f6cb001be14e5f5a6c74f539ef3f72db0397c314f4e20e2203c50513d9123e11efd15a7851cc8ecbf3b37a3ed12
 MISC metadata.xml 346 BLAKE2B 940d96d0ed61860085f5f6ef81706c4bda670dd1b6bf4947e29e636d180a9bdf02c42e33fed50975f7da608f048dbe0d578f1b76c8e73b233bd7ac6d291dc653 SHA512 57dfe4552e5fa65043a0e5efba15df272f21d7c6838d705a83959991ff30a71ebf38526b5891cba93e4d1256f446258abd18cb368ec9782481f791e4815bd3b6
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
index 08de114b8516..8f20334eb44f 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="+orc"
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 852781541976..de0bf7af78b3 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -4,6 +4,6 @@ DIST gstreamer-1.18.6.tar.xz 2713892 BLAKE2B 93642e33f0812cae60318ac821fcda450b1
 DIST gstreamer-1.20.1.tar.xz 2674128 BLAKE2B c05c29ac53df2ed5d60c3f2e9dcbc130e4733bc19fbb23b31285190cd68e5abd2a9209e87b4cd481719944b4fcdf6b0e1dbc1a7ba93cfa96fd305e698f971b3a SHA512 d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a
 EBUILD gstreamer-1.16.3.ebuild 2854 BLAKE2B a573111c26ab04f84025d4a83e7c8f4827fec79d0e8e21b92f1fe6851c97f11b1267b0ed7baff1a910ca644fde428bc1cf3f3396aca689f0e74c721b47ac4843 SHA512 a2d2b8a8ffd4d1772c54bf1571748d0cf2150fab5442081f39de141ceaf7d5c0c17db70a2e889ba51d33586716c7ed9d0e66d0d217807ebf42ae9c39ae16a05b
 EBUILD gstreamer-1.18.4.ebuild 1923 BLAKE2B 2665125b17e94481935f8a511929975a78f24f1e8300f2e544b742ef3076f7ceab1f985c34f85facc893671299635ea8303d5835992165eca5db4f62201a6924 SHA512 2f241f2e6713f9c68ddd1d116ac7ece29289dad2c288fb01829c6912108e09769ada4b3479e18531c11b061768c758e16647c0af96bedb0253561d88ac1b27f1
-EBUILD gstreamer-1.18.6.ebuild 1929 BLAKE2B 24551a9755056c267664d9835bff9ec853d68e221eb9670d8299e200ffd978d660a3075b55d3bd0a59042dac0146c6eecc3aaf9516fdcc6dae9e4eeb4ea09edd SHA512 f32c1d60ccfe80b6b5bebb61529bb8ebb9d533bec9636ce5c93cc56d740a1b7c8e3432328fc3737db04325f1adfb34a057a36abf31531ac9f937ee3b60e8eec4
+EBUILD gstreamer-1.18.6.ebuild 1923 BLAKE2B 4091bd4ae149c4c155b93214183ba4b360d3ffca60fbeb79ac5d810e5b8461ccb62b8361db028db1a78b52f050eecc124168285ec125989ba2627dd2c58c4e0a SHA512 6eacae95697c7c8f0fafb633ee98f3cca63d0d0d98b3bc7ddbcc31761eb2193c3c6912d1ce9c601db5a509450c3ddaa7f2eecd2b984d8e4bcbfcda0e68c8b9b7
 EBUILD gstreamer-1.20.1.ebuild 1963 BLAKE2B 86fb850491c039def9a8aed674f09613f7e732b87f7236b0fde8b349b36475f7c8b8e0dc0ef5cb1acad2f28f4c179d82c000db392ccf96c8bb01c7778fe57816 SHA512 4a5148e0d60f34a01915b5925bc5d39c60b7560826fd87d71b841acd70df90f2e39e4972cf0bcdaa339b25c96ba9069126f3e8b268d2cff36ca99b1b00b155e6
 MISC metadata.xml 587 BLAKE2B 6fbb8876aa30451f9ed4851b8da1698371f1d546fa13674ef87acae0a73f85770e17a5cec2232fabae28fc7cd28e76fdc177b9d016ea35f20094b40aef6a25c2 SHA512 d28f3793ddc86087854b04a2330e158f521761a45192ee32ac947f9affb400443205a3c0911864474738e2494626ba4fea66dac6549934fd5cdb32af6fe2ad4c
diff --git a/media-libs/gstreamer/gstreamer-1.18.6.ebuild b/media-libs/gstreamer/gstreamer-1.18.6.ebuild
index 865d7a4a1928..9570ec8cef92 100644
--- a/media-libs/gstreamer/gstreamer-1.18.6.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.18.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection +orc unwind"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7e50c6a4ab83..e031321d3447 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,9 +3,11 @@ DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd1031253
 DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
 DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
 DIST harfbuzz-4.1.0.tar.gz 29069953 BLAKE2B 6f8fd1889e36b20309609cc0e0d75c06167345273c78998a481c00e14fb219c3f61538c85e1956d14141b475bbe7cbffed5dfe26313e30ac970231c4e1eb50fb SHA512 e558b58233a13570693cc35764ce2824dea8b6388f47ced228f1317a9f08b6f482c1bc8d5c46352b74e84e709f569b164bea81647212c7e82467e19dfcb703a6
-EBUILD harfbuzz-3.2.0.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
-EBUILD harfbuzz-3.4.0-r1.ebuild 2635 BLAKE2B dbf9df9b91f507cdc1d04e672780691bf514eb3f6c7e257025c0b017a7d3d68e6bec0ef0f8bf4fdf3cabb18935ec1b2d762bc4dd34a68eb1f2184bbb0db4e7ac SHA512 f5eb7784845dd4f4f6982966fb7fad0ec27465261aec72f6f79eacc73e7a17fd6f45272db2749d89047eea89ce742eb183b63c8039f422443b249fd7b846fd5e
-EBUILD harfbuzz-4.0.1.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
-EBUILD harfbuzz-4.1.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
-EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+DIST harfbuzz-4.2.0.tar.gz 29092181 BLAKE2B 75e2461932a17b2da50331b5bbdddd4c68ddafeea59088e2ad34e2de6b9f679154fddaf6579de1ef244f5f55baf61fa0b7f66459d9e16b365e152f973471f649 SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38
+EBUILD harfbuzz-3.2.0.ebuild 2561 BLAKE2B e495672f81b0d3cc4c3dea9c811b9c305415b7a49345baeef24ea4d13f2460402c059c7e2733750865b47de4be03ec7270980797e8ef601ba3d89abed90c7442 SHA512 59cbf266b6046116e503a783345fc53e517b012b0fb2ade0409a99d2470d330d8411fd6cc9b850dbf114f7c157241ac0b16aa28973344a537960dd26c322aae8
+EBUILD harfbuzz-3.4.0-r1.ebuild 2634 BLAKE2B 11d283633a330394fed087949f23577949d8cf2f4cd62f1412bd2dd4446eeed93d4dceab953a4a8478d63f73f55db09ba3ad1413134bc2187434ae59b6bf86c7 SHA512 8156848580a041b5f4fd2e53758caec3c1490fa4d48806646d5b7437862c56c1b61a9cd434ab9047e4cc9f33c4b8cc439780a833c84653fa9af15f24089d9230
+EBUILD harfbuzz-4.0.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
index a40771678b2b..04e6837e2000 100644
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
index 8a1d1b1f669e..fc9f7e995db4 100644
--- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild
new file mode 100644
index 000000000000..899f139ec716
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 13a302b8f1b1..15b23b9624b9 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -2,6 +2,5 @@ AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a
 AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33
 AUX libcdaudio-0.99.12-libdir-fix.patch 343 BLAKE2B d53a60c2bfb6308fc9f54e61846b7867f9a28f6a9b37dbf313fd581f68c4d188a35c87a9b2c573d114ca5334fba131ac43e4338e8bc9565a0224a15d7b17aebb SHA512 76d7ac645607b6ee0105fcef8d68462a23ce6e7c7fec96e3142c3fb54771d726983c4bc3eecb0caf729e8198089aff706c4122d81f28d1c13b602a2688c06307
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
-EBUILD libcdaudio-0.99.12-r2.ebuild 591 BLAKE2B 0094a01615a1dea1a743b6f04e4627c76329e3276e59d3aa88e8e9576f76d99f851b6d8f01777448c648b3f742eb8a025744f6ee0241054be9ad008d29ec5f0d SHA512 b37623127810c9998f5f0aaf59ee5847ddac519012d29f825f88f63d3f0bbf6955313d92d00979edebca06a948e0fbc5533e0cee1cec686bc965b075a9b22650
-EBUILD libcdaudio-0.99.12-r3.ebuild 634 BLAKE2B 1c9b81e42c61fa27b9fc462cfe7c706af5d3527e566b16cfdbfb7a553165107cfe6168ab5c9bf5e8a4ecfdb55da7cfac0371e96266a63fb4804e0ae009c1b6a5 SHA512 f2bf557124e6d990144824acbd84bdd0bb163fb53f8fdc48bf25d027cf3e39eb9ce8d32e4a7cfc3c4eef3ef0884410b0e6292a7c629fb8ee85e7fe8e626ea6d8
+EBUILD libcdaudio-0.99.12-r3.ebuild 628 BLAKE2B f2ea99e1543e443c0d841e942643886a244bb9dffa19c9f4aa1ae98b12f5a4fbb2800939d7c0ba2fc9098320ebf867fc086e2b3ca698e8752bc031e745873494 SHA512 8714d0e1007f1303cbfeced2f1b8e792d2f77bc8fcd4e7bc5fb89fb5486e8a9c58227ba9724cf5663c7956479b9eaf4dd02301d9706316ced431f09f9c235a11
 MISC metadata.xml 334 BLAKE2B d9be9083a98a2b39213e4be83809d0fc452d0ce36ac1d9f90a62ce46a921842daead9da5efc3fa677df8e8e6578f15d298f669a7a7c309d137716859e1420747 SHA512 5ed9828508c9cc4e02f337bb7acb844d418ff555372bc5bdb1650b3e8a366bb1ab2a2bac88a6e5b08b6b74e8f3dce119971b126cccfd329fb206b9358eb934a3
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
deleted file mode 100644
index 9c81c3f40ba8..000000000000
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library of cd audio related routines"
-HOMEPAGE="http://libcdaudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.99-CAN-2005-0706.patch
-	"${FILESDIR}"/${P}-bug245649.patch
-)
-
-src_configure() {
-	econf --enable-threads --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
index 041695340a12..0ee870260770 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-libs/libeot/Manifest b/media-libs/libeot/Manifest
index ff5da3743b93..268f38a23c42 100644
--- a/media-libs/libeot/Manifest
+++ b/media-libs/libeot/Manifest
@@ -1,4 +1,4 @@
 DIST libeot-0.01.tgz 38651 BLAKE2B ba8362035dca9db2adef636ce153f4fd1d75c20cf0f9671d6f1aa64e055dfbe7644811f44751e11eb4660f0902c14b66be8cdbb45c85325bfd5dd5b37e388b15 SHA512 ff8c3d92b948159171c76306d4a74758974c7ee26c801c5de48805f182b542015286b1e53cfc6dc4524494becb74fb55185701e06fc9be7c16f2d89ac0275941
-EBUILD libeot-0.01.ebuild 699 BLAKE2B 7907d0bfe3412b8f906f98f743fe4fa66f6ec432dc8e33516c377c194b0de2afa7f5b4348f1c9e21e915e4820b9dc4815bc6c1037b86db2bd11a81f77c1d783e SHA512 b14fa7f2a737ba48439e6de7a45973b7801bad28ed195d2ccfdfe3db735347de27910fd47369691524c3084c9b3c4d87dd34c48e720ebfd5280efeb9b958d72d
+EBUILD libeot-0.01.ebuild 706 BLAKE2B f4bf94c02c3d5211367050d5f122f55ee6f76dabd689e77dde3469a1c20ebb45c7bb6d257392a450d0e8f4a76632fd2c8151d5507998a169ecdf485f64a11ed0 SHA512 f3627131555a8bf5dd1a217e9cb368f86cf4c461515eddaaa8119a60334524bc07e24359a2a44b0a21a200eadd20e143661ab084e77f46aa8b1833763d6e0f9d
 EBUILD libeot-9999.ebuild 701 BLAKE2B f7b7bdbc3c61e3c6812fba7f02c080f8521acbfe01445eec5c6a533f537a3279aa03ca06a229167c3fb3c635d16edd89dace472973e148b89f6a1c55076ba227 SHA512 cc19cea0eb60270a72720ac199533e40a07dfdb793130c7171894c0779c6a76f085ff18fc035956f79f7a9f98beda87b030b609ccfd2685e76669cf9a728ade2
 MISC metadata.xml 338 BLAKE2B c6c1ff67c503267257fab7101393f177a21a5a138d3cfb16c3fa4b08f091d176dcf1eeb1bd877d57925fec692bebaeb4c5ea6888022c02bb4f45c22ba3ac76a7 SHA512 a2156072b19db8ea245cf965854e79dde90ed7fac4ce4dba641ef081a0fef6d5dfe3e01c764ed83317d843f152976b31ab2bc9ff2a8a6a4357fa48701f4af927
diff --git a/media-libs/libeot/libeot-0.01.ebuild b/media-libs/libeot/libeot-0.01.ebuild
index 26beb1dbfabb..838ce3e108f8 100644
--- a/media-libs/libeot/libeot-0.01.ebuild
+++ b/media-libs/libeot/libeot-0.01.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/umanwizard/libeot"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 16af3bb54ff0..27d95b42f1b7 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,6 @@
+DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
 DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
+EBUILD libepoxy-1.5.10.ebuild 1064 BLAKE2B c701d43e518995aa880d1ea01d6a9d2a2f7523d89ed3b2a8c30337e34313acc3dbc534e39abd2cd41635e8d53a3a70a1345bbd02190e59a54985d84165a3ed27 SHA512 64a984a035a3798da1af0d055d131286e6d93be12048d3ea3aa0ee9cb649e49015a9c6ec88781022f65e2db0020ced2bc74e8956255fa895169277912cb0f697
 EBUILD libepoxy-1.5.9-r1.ebuild 1056 BLAKE2B 30d5433e96f453c74dcd1d12da3047c9194eea9658b6914a64f1fee52a73aba5fce5fd2ef67fca87a692849b4122ac2fd83966e578c38951a48a7c4a054a3bd2 SHA512 3b8052007d1670460d3b0abb5f4b9b6ca4bd7aa3440f3a667a33af076213a80a50af2c4573a35acda842fdaf6784a5f72e3f36a162c18b6c865a8012c46d1230
-EBUILD libepoxy-9999.ebuild 1064 BLAKE2B 7dd53d9dcab52dc889fa6d60207bcf4f144fbe2c430a43a14641b69bb4e50436bd7ae87fba382c65f0d61047d89011ae92812eb05548bf996bc230887d52757e SHA512 cb89bd72d25043ab72078c4927b9f64f4e79c6bacd62dd16fca2118286eaac3ad9790e7f062d38ac40e000c4a590a5da1698f7d895bdbe6dcc22f57c6511e2fd
+EBUILD libepoxy-9999.ebuild 1064 BLAKE2B c701d43e518995aa880d1ea01d6a9d2a2f7523d89ed3b2a8c30337e34313acc3dbc534e39abd2cd41635e8d53a3a70a1345bbd02190e59a54985d84165a3ed27 SHA512 64a984a035a3798da1af0d055d131286e6d93be12048d3ea3aa0ee9cb649e49015a9c6ec88781022f65e2db0020ced2bc74e8956255fa895169277912cb0f697
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
new file mode 100644
index 000000000000..e6be2aed6eca
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+)'
+inherit meson-multilib python-any-r1 virtualx
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library for handling OpenGL function pointer management"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+egl test +X"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=$(usex egl)
+		-Dglx=$(usex X)
+		$(meson_use X x11)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx meson_src_test
+}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 8a0359a68ecb..e6be2aed6eca 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson-multilib python-any-r1 virtualx
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index da5c43e2d176..a0494fed9dce 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,5 +1,3 @@
-DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
 DIST libffado-2.4.5.tgz 1229890 BLAKE2B 18c260b782c9a97e3f2c8689a218f7a4925158c3e3cb14987182bf04043438d1325a9ababfe29860f6769a5eeabb49a843a8d15072b24b914334c447b5c7238d SHA512 a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f
-EBUILD libffado-2.4.4-r1.ebuild 2749 BLAKE2B 95fdbd0c43c4c9d396d3be9c9b00036b249ec3d1d78d89844203721f00a027416e5d72454c41d6d78a671f7afc84ee3b57eec6609bc00182051c6e6562d8ee08 SHA512 04a62a67a23f1b6b58c9af9a212f705b62a61bbc6ee829d06f562bf852a1b078310b1741698a46b3b2b0df839da74206d8e3554b5d6ce43a42cb08ab34ea88a7
-EBUILD libffado-2.4.5.ebuild 2752 BLAKE2B 05d33916b54e2121789b48d1367b30b9981a2448c56a6c5fe023b1cbe77f602ed2aaa4459b8cfa8131e0855c4e527df7658ff3a047a417adb8d448320ef00dc7 SHA512 12a618e97cef2217fdcb8a396f08e46264c88642f2d96057d5fc404cd5c3425bb9f4d278d9063a7f9606ce3164869ad1b29ec20961443fa63ec0cf639dd6db59
+EBUILD libffado-2.4.5.ebuild 2750 BLAKE2B 11c5d5b664631d266ea57c838012edbcee209fd77457c8230ac01370a3affb94d326c9b1482c720234e4d6cf59108eae85c3c52fa1460784dcd04ef8455192d0 SHA512 3539b52c64ca920567d5db02799ea2476bd9de393e8929e9dabbdbbd617f1e75823acc2182637c60bad43a673fd479078fd0bb59d016f02ab3352c0d5f1ef386
 MISC metadata.xml 597 BLAKE2B 4fc750b04079094c4251e60cc4067847ba015a9bef54c83ac9ecc2b53a24048279df06711b5fa1482e379e25a7cce7aed491a67129469bca46ee747a30f7427d SHA512 9f0823e3554c7602b27d39d565af89079e6a5260f19f6850bf3f2f228a4cd6e40a27f94c1a85e6aed0226918beb6dcefdd85b830fbbe438bdcb899dccd51e4f8
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
deleted file mode 100644
index b9daf2d2a40b..000000000000
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
-		')
-		x11-misc/xdg-utils
-	)"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Bug #808853
-	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libffado/libffado-2.4.5.ebuild b/media-libs/libffado/libffado-2.4.5.ebuild
index 8383212fe83e..3e212bb12d21 100644
--- a/media-libs/libffado/libffado-2.4.5.ebuild
+++ b/media-libs/libffado/libffado-2.4.5.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 13224669dd65..7e35a4f03c09 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,5 +1,5 @@
 AUX libfreehand-0.1.2-icu-65.patch 993 BLAKE2B 80699fd1393f3234b2041eb0c15fe53cbb3fec9c0911b21fc4a4b9834be5dba781b68ea506c18ed34982f588b243c6df0757bdd720f71bb9927b2fda8a6211fa SHA512 ff271f6132417940c1269a4df76c956960014e44b15284f5b03e90ed2668517fdd864cd281ceda1d7cc02df46c194c9cefcfd52e71fd7ae6398a81684b976d71
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1260 BLAKE2B 1525bee01d4398b95785a6ab933a660ad8a2ff843f72aa7bf5293b194942ed2331de75c27a3bb4566b7f2e2ff1fa9f021fabfda18dfe2c9d90df3f6aaab0cfbd SHA512 8d3d9882a6af58f20c0da16d963586f3f918b0d240e228030d4e8e4ce412431e2ab97cb567d34909274124e7be6989ff127d0ac6011ad67f4cc9e3d8b06a39be
+EBUILD libfreehand-0.1.2.ebuild 1267 BLAKE2B 54255b1f6113d69fce5682e010a1f8f3beb0f5d423436877e75dd51e14c9d0df22be2d402b4b73f6f91fa3c3ef54f33afd77fc060419a8683eaff9130e63be2c SHA512 b76e4f4f29a2e377a31676eeb24066efb35a2dba32e57ce5f6e898d05b85bb01168f80ef723339bc4edfc13f004fae61f81bdb2b2c5829ea58bb02d661e8af89
 EBUILD libfreehand-9999.ebuild 1246 BLAKE2B 767d2896865fd15b611bc8fdeb7d18992ca93d357cee5c2d326819349e450edfda10e48f863a69a62e15debbf45e1b4806a51e5b85e38273b24d34e806c19046 SHA512 1a37677a4de0caa0d04876d8a46bed67a9a62318526bde2eb2623664583a27816d069a16e1ab2eeab5ccb27265020c91d53028392254283a4735e734030c6314
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index 0caf03f8f057..582c605fe52b 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 11db8a9376a7..73942bfa3965 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,4 +1,7 @@
+AUX libjxl-0.7.0-atomic.patch 4461 BLAKE2B e2c1edf952ba13d2ffb55c1e1122a4ed8ae692155e770e3a64b9ccfe7100395f44f2d0a84bac99a73c99630a8f9891906bdff54514f386f92b6ab2bf6cdb367a SHA512 68d70ed26eec2038c287fc1e0124f7e3ef62277aa7621706aab390616f4a1f5fe23a2675ed996c6c73d117e41e81c4c556efd30887ecbfeada7fd1e4ed7914b6
 DIST libjxl-0.7.0_pre20220311.tar.gz 17322724 BLAKE2B a3cf970ea3db67e0890e94a5c74ea66610d4fed608fa3d079e6934a1d5f2bdc3ef4264c1df85e4b4efcd22c060087c712009f6c4a6b69a41f6e96ff3674c6de5 SHA512 f3e46ddea462b31de6df3c615c3cd628adc58c7ff41588e2ec4cc8929590c9272603a66ed4620b9ba550d85b3d1a6da3f51b1c4f8650ef8901347fea8af5d474
-EBUILD libjxl-0.7.0_pre20220311.ebuild 2041 BLAKE2B df2cf000bbea7746788b04b88c2826dd10d1be2998f856746a15dc0af44e7436f506be0fc8f5254e52df79e3e5e578cefc1c6837bbc59f5f7f7847c4b36607a2 SHA512 7f65d81181a3c4472c8f9686ba504ffa524f1ee331b6999e5ac2c1f3ed9be33a9e70b9e295bf4496cfff9f8557991cf962829aae25b20e3d479019f7fc314bfc
-EBUILD libjxl-9999.ebuild 2007 BLAKE2B 48c2a0965cc8db89d318f616fc93128e9e998f5535a74dcf3235a423adc04408972edee79a046b868958d39e83a2c2508e345d5af544cd709994058810546496 SHA512 5ab1f5b1dd76cef89ba945e5c3ed6b8837c87f137fedb60be68591dfe904b1cadeae27806dfd409151d698146ae52a0014b676ccc9489c8e281fa18de308025c
+DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
+EBUILD libjxl-0.7.0_pre20220311.ebuild 2131 BLAKE2B 9292dbc20406ba9544c66d5658b1d782d7b601b29f87b585426adc400fd1dad883003ce730f7db96b75fe8715c48ca7160492155e7088929b050c58367c97b63 SHA512 c625e4a3151f68986c3632b27f2c730084756b293e6a4d50c17d192c445ce925a37ad88da18dbcca4c684f53e504880768ee3def4cceca14dbf870f0aa1f9e7c
+EBUILD libjxl-0.7.0_pre20220329.ebuild 1973 BLAKE2B 0bd9bdf88b23e9e511f1e9cfb1608b160e1c441806cbdedcf2809eb65aa7e3578172986b6bffa5397d32baa8a53f57e22677beacc3f64f097a8ec68606d63a15 SHA512 581844e5aeee26cdd1a670c45a1f3fcc4416428382577458f7f72afae24149184fa51ac3369c83e33933d4c9c7887bedb58f2f1b05d13822b5b04167ed07eacb
+EBUILD libjxl-9999.ebuild 2024 BLAKE2B 73aabbd86aa96d03d516a3699f069d9d3a625d84aae2e76683230b6a4dce99f3e68ec4661e3ed74c9b466001289a0ba789527c926c08feb8a1704412b73ed761 SHA512 7fa2de19a8876d6f567f8e1c12411a7b9349cd7938fe200f9eeb966bd3f8f76c7fddc70dde65d2279e72306a584f12f12eede1a45cfa3e92fbfb84978b1dde7b
 MISC metadata.xml 736 BLAKE2B b4c49d06f4888fe4714add21be0d8c8b0e5961a03307165384692a07dda463cc0438dfe5a99a878555e5d15f0ad56fe4c66c4dd39c90603147150b4d9d3e088b SHA512 feb1910542331c2c3e8769e172081d59c20bfa082cb353787cb718dbd562114210e5da38c5dd87bba9f11ee5756f426c71b835cd178c5d2bd7bfd661cbeb10ce
diff --git a/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch b/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch
new file mode 100644
index 000000000000..44d76fcfb10f
--- /dev/null
+++ b/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch
@@ -0,0 +1,136 @@
+include following patches :
+
+fde214c5f4dc5ffd0360401a68df33182edf9226 Refactor c11/atomic patch for riscv64
+326711f86719e6ce7b0422a7970ce8f8b1598f25 Make sure to list Threads::Threads in JPEGXL_DEC_INTERNAL_LIBS
+b12bb7a5f37d6bcaf134cfab7828ae08c4a0e60d Remove duplicate reference to hwy library
+87fe7c16e1fb2e21b6a1dca26782950ae1559d99 libjxl implementation rely on c11 atomics
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc1bbac..cce9748 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,6 +191,15 @@ endif()  # JPEGXL_STATIC
+ set(THREADS_PREFER_PTHREAD_FLAG YES)
+ find_package(Threads REQUIRED)
+ 
++# These settings are important to drive check_cxx_source_compiles
++# See CMP0067 (min cmake version is 3.10 anyway)
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_EXTENSIONS OFF)
++set(CMAKE_CXX_STANDARD_REQUIRED YES)
++
++# Atomics
++find_package(Atomics REQUIRED)
++
+ if(JPEGXL_STATIC)
+   if (MINGW)
+     # In MINGW libstdc++ uses pthreads directly. When building statically a
+@@ -298,10 +307,6 @@ endif ()  # !MSVC
+ 
+ include(GNUInstallDirs)
+ 
+-set(CMAKE_CXX_STANDARD 11)
+-set(CMAKE_CXX_EXTENSIONS OFF)
+-set(CMAKE_CXX_STANDARD_REQUIRED YES)
+-
+ add_subdirectory(third_party)
+ 
+ # Copy the JXL license file to the output build directory.
+diff --git a/cmake/FindAtomics.cmake b/cmake/FindAtomics.cmake
+new file mode 100644
+index 0000000..9a6cdc3
+--- /dev/null
++++ b/cmake/FindAtomics.cmake
+@@ -0,0 +1,53 @@
++# Original issue:
++# * https://gitlab.kitware.com/cmake/cmake/-/issues/23021#note_1098733
++#
++# For reference:
++# * https://gcc.gnu.org/wiki/Atomic/GCCMM
++#
++# riscv64 specific:
++# * https://lists.debian.org/debian-riscv/2022/01/msg00009.html
++#
++# ATOMICS_FOUND        - system has c++ atomics
++# ATOMICS_LIBRARIES    - libraries needed to use c++ atomics
++
++include(CheckCXXSourceCompiles)
++
++# RISC-V only has 32-bit and 64-bit atomic instructions. GCC is supposed
++# to convert smaller atomics to those larger ones via masking and
++# shifting like LLVM, but it’s a known bug that it does not. This means
++# anything that wants to use atomics on 1-byte or 2-byte types needs
++# -latomic, but not 4-byte or 8-byte (though it does no harm).
++set(atomic_code
++    "
++     #include <atomic>
++     #include <cstdint>
++     std::atomic<uint8_t> n8 (0); // riscv64
++     std::atomic<uint64_t> n64 (0); // armel, mipsel, powerpc
++     int main() {
++       ++n8;
++       ++n64;
++       return 0;
++     }")
++
++check_cxx_source_compiles("${atomic_code}" ATOMICS_LOCK_FREE_INSTRUCTIONS)
++
++if(ATOMICS_LOCK_FREE_INSTRUCTIONS)
++  set(ATOMICS_FOUND TRUE)
++  set(ATOMICS_LIBRARIES)
++else()
++  set(CMAKE_REQUIRED_LIBRARIES "-latomic")
++  check_cxx_source_compiles("${atomic_code}" ATOMICS_IN_LIBRARY)
++  set(CMAKE_REQUIRED_LIBRARIES)
++  if(ATOMICS_IN_LIBRARY)
++    set(ATOMICS_LIBRARY atomic)
++    include(FindPackageHandleStandardArgs)
++    find_package_handle_standard_args(Atomics DEFAULT_MSG ATOMICS_LIBRARY)
++    set(ATOMICS_LIBRARIES ${ATOMICS_LIBRARY})
++    unset(ATOMICS_LIBRARY)
++  else()
++    if(Atomics_FIND_REQUIRED)
++      message(FATAL_ERROR "Neither lock free instructions nor -latomic found.")
++    endif()
++  endif()
++endif()
++unset(atomic_code)
+diff --git a/lib/jxl.cmake b/lib/jxl.cmake
+index 97dfd73..8f69894 100644
+--- a/lib/jxl.cmake
++++ b/lib/jxl.cmake
+@@ -346,6 +346,8 @@ set(JPEGXL_DEC_INTERNAL_LIBS
+   brotlidec-static
+   brotlicommon-static
+   hwy
++  Threads::Threads
++  ${ATOMICS_LIBRARIES}
+ )
+ 
+ if(JPEGXL_ENABLE_PROFILER)
+@@ -355,7 +357,6 @@ endif()
+ set(JPEGXL_INTERNAL_LIBS
+   ${JPEGXL_DEC_INTERNAL_LIBS}
+   brotlienc-static
+-  Threads::Threads
+ )
+ 
+ # strips the -static suffix from all the elements in LIST
+@@ -467,7 +468,7 @@ add_library(jxl_dec-static STATIC
+   $<TARGET_OBJECTS:jxl_dec-obj>
+ )
+ target_link_libraries(jxl_dec-static
+-  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS} hwy)
++  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS})
+ target_include_directories(jxl_dec-static PUBLIC
+   "${PROJECT_SOURCE_DIR}"
+   "${CMAKE_CURRENT_SOURCE_DIR}/include"
+@@ -488,7 +489,7 @@ endif()
+ # to do, remove $<TARGET_OBJECTS:jxl_dec-obj> here and depend on jxl_dec-static
+ add_library(jxl-static STATIC ${JPEGXL_INTERNAL_OBJECTS})
+ target_link_libraries(jxl-static
+-  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS} hwy)
++  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS})
+ target_include_directories(jxl-static PUBLIC
+   "${PROJECT_SOURCE_DIR}"
+   "${CMAKE_CURRENT_SOURCE_DIR}/include"
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
index 1afe0678670a..9c909deddbe6 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
 
 SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/3f8e77fcfabe8ca8ddee6be4e662de525667c570 -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 LICENSE="BSD"
 SLOT="0"
@@ -30,6 +30,8 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-atomic.patch" )
+
 S="${WORKDIR}/libjxl-libjxl-3f8e77f"
 
 multilib_src_configure() {
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
new file mode 100644
index 000000000000..5407dd894d8b
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+
+SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples openexr"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	>=x11-misc/shared-mime-info-2.2
+	openexr? ( media-libs/openexr:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/libjxl-libjxl-fde214c"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTING=OFF
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_EXAMPLES=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if use examples && multilib_is_native_abi; then
+		dobin "${BUILD_DIR}/jxlinfo"
+	fi
+
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 1a2abbce5e64..0dcf64fe11d8 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
-inherit cmake-multilib git-r3 xdg
+inherit cmake-multilib git-r3
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
@@ -23,7 +22,7 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/jpeg[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
+	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
@@ -31,7 +30,6 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
 	openexr? ( media-libs/openexr:= )
 "
-
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
@@ -62,6 +60,7 @@ multilib_src_configure() {
 			-DJPEGXL_ENABLE_PLUGINS=ON
 			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
 			-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
+			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
 		)
 	else
 		mycmakeargs+=(
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 0f7713a39e1d..5d3e4ea1fc5d 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,4 +1,8 @@
+AUX 1.9.5-meson-add-introspection-option.patch 2825 BLAKE2B 4592c45d3fcbd94a79923a79655eb76ac5bff48efba0c75157ef94d6820bc1e79351e2bf493b73933ee22d937d5a2a770c4379673e9b59f48a7c4030d857d618 SHA512 45dd0a9dcfc88a50f1c9f7be25e149fff3e8610a2ae466842e5c7ee219e2feb0c08400f9546d30567a5c4fc19095dcd29666efb4080e49d37142a6bfa0f4a158
+AUX 1.9.5-meson-add-vapi-option.patch 1600 BLAKE2B 1d6cdfb25740c310c6bd4c1ce7be98464e2e9286619fdb58c4fc518ba2b6a60414091ac7580384e9921b1744f949545a8c09c7240f95cb11c257878f751f76fd SHA512 9397d758f850bf24793f95baff2f0ebc2f5b2375ccc4bf13c7d336d14e88cd172dc85e281ab52ccf11ad475309ebd88d9663ba1b6c3ba45321a0eab390431e86
 AUX libmediaart-1.9.4-drop-bashisms-configure.patch 1524 BLAKE2B 6ae4ba196772750f9a09ad90d6c3e66965ee3c2a828211531aa3321f582da5b3c8e3304687fb077ff67fd1c0a5fe4ef39d9421382073452abf0e94de50eeb769 SHA512 ed049f69e5899e4fc8a897c245845a2b80e4aead9d7a28b9e20ce4b73de3c495f35afb0b8d44481ced868c537ecd0236dd5cbcc674e7483d75ac329c4ca9c0db
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
+DIST libmediaart-1.9.5.tar.xz 5549620 BLAKE2B 6656baeb52aa0f4c355354dab3eb5499af957a2d9c5530e46874127a71a55b744b0370ec25b5e187ea9b615acb195f5b817196d59e668c34f2e3c8c4f8060598 SHA512 b1d54f4b480cb5cf63a2231b082635268ac1ab708ba829a3e5ccfdfb530e9d463c5ac505cd1dc44643f23f787c4df2ef287a7e68d56e93a05b97be450c7799b6
 EBUILD libmediaart-1.9.4.ebuild 1800 BLAKE2B 0b6aff357fd291cc560b8195d0d7eaa141d70671d8216e0f477ee4c1a120c5b2294b7f391ad702a130152e38ced7c7cf7de2547d58f2c5b58121693239770f56 SHA512 667c3ff283ff2de3c97fa9496146c1930a752bf1748a4128638030336a91533ba71830b5f7f9946126580bb9845a2ea879dd4323a2d415aef899b554fc2844ba
+EBUILD libmediaart-1.9.5.ebuild 1194 BLAKE2B 88b32ddfca1334e88e482dc71f6f97a6c888ca1b478fccb2ad7f22d63b9ec9d4a81c1531ee3e5d1210c9f3822caca143d8ad3a3a04c60f42fb15cc9439e465de SHA512 eeea122d0f1ff4c0f6daf7ddbe862e313ebd21878eb23a06ed87a4a31464aef296ff4c38e4c4d058c00c882b8fa5c5c5a3d787425c807a8aebbbed3c170367a8
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch b/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch
new file mode 100644
index 000000000000..b61f2ed9bf81
--- /dev/null
+++ b/media-libs/libmediaart/files/1.9.5-meson-add-introspection-option.patch
@@ -0,0 +1,87 @@
+https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/14
+
+From 0de77d9eccb6ed78416339a47113f3dc4fe4c453 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 5 Oct 2021 23:35:26 +0200
+Subject: [PATCH] meson: add introspection option
+
+Add introspection option
+
+Fix #3
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ libmediaart/meson.build | 42 +++++++++++++++++++++--------------------
+ meson_options.txt       |  2 ++
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+diff --git a/libmediaart/meson.build b/libmediaart/meson.build
+index 56e00ab..2f44e63 100644
+--- a/libmediaart/meson.build
++++ b/libmediaart/meson.build
+@@ -41,28 +41,30 @@ libmediaart = shared_library(
+   install: true,
+ )
+ 
+-gir_args = [
+-  '--quiet',
+-  '-DLIBMEDIAART_COMPILATION',
+-]
++if get_option('introspection')
++  gir_args = [
++    '--quiet',
++    '-DLIBMEDIAART_COMPILATION',
++  ]
+ 
+-libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
+-  sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
+-  nsversion: libmediaart_api_version,
+-  namespace: 'MediaArt',
+-  identifier_prefix: 'MediaArt',
+-  symbol_prefix: 'media_art',
+-  includes: ['Gio-2.0', 'GObject-2.0'],
+-  header: 'libmediaart/mediaart.h',
+-  export_packages: 'libmediaart-' + libmediaart_api_version,
+-  extra_args: gir_args,
+-  install: true
+-)
++  libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart,
++    sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers,
++    nsversion: libmediaart_api_version,
++    namespace: 'MediaArt',
++    identifier_prefix: 'MediaArt',
++    symbol_prefix: 'media_art',
++    includes: ['Gio-2.0', 'GObject-2.0'],
++    header: 'libmediaart/mediaart.h',
++    export_packages: 'libmediaart-' + libmediaart_api_version,
++    extra_args: gir_args,
++    install: true
++  )
+ 
+-libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
+-  sources: libmediaart_gir_and_typelib[0],
+-  packages: 'gio-2.0',
+-  install: true)
++  libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
++    sources: libmediaart_gir_and_typelib[0],
++    packages: 'gio-2.0',
++    install: true)
++endif
+ 
+ libmediaart_dep = declare_dependency(
+   link_with: libmediaart,
+diff --git a/meson_options.txt b/meson_options.txt
+index 3ef49ba..b8c51b1 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,7 @@
+ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
+        description: 'Which image processing backend to use')
++option('introspection', type : 'boolean', value : 'true',
++       description : 'Enable / disable the GObject-Introspection integration')
+ option('gtk_doc',
+   type: 'boolean',
+   value: 'false',
+-- 
+2.34.1
+
diff --git a/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch b/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch
new file mode 100644
index 000000000000..54536c3124af
--- /dev/null
+++ b/media-libs/libmediaart/files/1.9.5-meson-add-vapi-option.patch
@@ -0,0 +1,48 @@
+https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/15
+
+From 8cfc2a3fd5144ad116285f637506b1d39c469212 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 26 Mar 2022 10:25:56 -0700
+Subject: [PATCH] meson: add vapi option
+
+---
+ libmediaart/meson.build | 10 ++++++----
+ meson_options.txt       |  1 +
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/libmediaart/meson.build b/libmediaart/meson.build
+index 2f44e63..74aa4df 100644
+--- a/libmediaart/meson.build
++++ b/libmediaart/meson.build
+@@ -60,10 +60,12 @@ if get_option('introspection')
+     install: true
+   )
+ 
+-  libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
+-    sources: libmediaart_gir_and_typelib[0],
+-    packages: 'gio-2.0',
+-    install: true)
++  if get_option('vapi')
++    libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version,
++      sources: libmediaart_gir_and_typelib[0],
++      packages: 'gio-2.0',
++      install: true)
++  endif
+ endif
+ 
+ libmediaart_dep = declare_dependency(
+diff --git a/meson_options.txt b/meson_options.txt
+index b8c51b1..c97c054 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,6 +2,7 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q
+        description: 'Which image processing backend to use')
+ option('introspection', type : 'boolean', value : 'true',
+        description : 'Enable / disable the GObject-Introspection integration')
++option('vapi', type : 'boolean', value : 'true')
+ option('gtk_doc',
+   type: 'boolean',
+   value: 'false',
+-- 
+2.34.1
+
diff --git a/media-libs/libmediaart/libmediaart-1.9.5.ebuild b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
new file mode 100644
index 000000000000..426d14572a81
--- /dev/null
+++ b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson vala
+
+DESCRIPTION="Manages, extracts and handles media art caches"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk gtk-doc +introspection qt5 vala"
+REQUIRED_USE="
+	^^ ( gtk qt5 )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2
+	gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	qt5? ( dev-qt/qtgui:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-util/gtk-doc
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-add-introspection-option.patch
+	"${FILESDIR}"/${PV}-meson-add-vapi-option.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local image_library
+	use gtk && image_library=gdk-pixbuf
+	use qt5 && image_library=qt5
+
+	local emesonargs=(
+		-Dimage_library=${image_library}
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 0a03d68b6336..179ded3bf314 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 969 BLAKE2B c44b9ce4e52016ef58aac57d24ac4e1053f8f50d977bfc15374e68a7f6c1351f3add4464d4253aba71ec5de978ee2ede151bed8c16293dfbab62d61fc1c1f51d SHA512 2c0b79407c76a9338cd7518b4977817a0ed1a72b1104f36dbf1e22ec8b1d1b5dfc4d2b1c6c028c908fd78260107932f86f196cb7db5597bee74b69cad2141c80
+EBUILD libpagemaker-0.0.4.ebuild 976 BLAKE2B dc9d68285c38b74e18660d13c15d1b21fbe2ad589da7e922989fad55efbbd9d8881893bf1eb4a5b681ceb34b6fbd293f4275ca0328a214c337cde47cdb0e2484 SHA512 8934f5d7108ae62aa5d3b4731e56fc4e1c145c8d21b2646343d4d2fc2708b255cde745ea3a3d542fb4f1e83152da3b402d289d2836d4867b1b6aba30d7ba809b
 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 5856ce390816..cd985418d5e9 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index fab5bfe7d7fc..c4e85a746bd8 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,5 +2,5 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839c
 DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f
 DIST SDL2-2.0.20.tar.gz 7207221 BLAKE2B 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623 SHA512 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de
 EBUILD libsdl2-2.0.16-r1.ebuild 6465 BLAKE2B b1abfb4334df0bb3857d23c4b92f2ca158c75d70bea5aef5dd7643b7f4c5c9b6ba5f280d8a130b6a63fe5331d88012d7924bb5fd9525ad69c07b521b82eaacf4 SHA512 71a675c646db408f01da627c40651bdcbdcc59aff11a8d22ea8bdc13c13de42337082e4b2ee4157aa5081071609c2479be0334f4a119721ebe79bf0d336361c7
-EBUILD libsdl2-2.0.20-r1.ebuild 6517 BLAKE2B da8cf99ba06841efe11c3f88c74a935a462644d2b4aec44656468ed0dfe3989652f25a3367e0d74bd14b1424bdee7dc74dd298aeb27143abb56830ba13dab08f SHA512 dc8b9d90ff79c3c2ba9338560c1a5d9d59111f6418cdd4e2069817b5fcd6f2be016b15f1cdcba9bec3aa40c46f8e4c0c2cee5c7c13901bd81481aba1ab32baf1
+EBUILD libsdl2-2.0.20-r1.ebuild 6512 BLAKE2B 1c03fae7d5066a6e0c9baadea85ea570d158352963fa386a87a462908cac498106710bee7a2efab6699d59bbfe361a29a281968dec7f72d55021a5b47011d3ad SHA512 5fe836e28e584854225b7183c00a53ae64fc991e35faf71eb9f587395a626511b8e9e1f212d286bd4846d4a882bc3e5cf7b40c007d1b1d827eeaaddbd43bfdff
 MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7
diff --git a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
index ac70239d8ce4..673d3087e19e 100644
--- a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/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="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 089f4d58b503..f3f1fb9af6bf 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,6 @@
 DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
+DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c3e10674a44216ed83e657e603ddfbc33afe0827676fc4f5dc7745a9fb6aa866023fe589d0c00714477e3a246e5f2 SHA512 d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006
 EBUILD libsndfile-1.0.31.ebuild 1796 BLAKE2B bcc411b71c822a9d427e71c682bf3613f5f79958bd76f7664c2d0fbf7e20ff44ee2496defd1fbdc9484c9c96c083515341f0ed30051af471060d6e1270a2e8ab SHA512 787cb47d84d230460a735fa73fe137f4a8d0d1319e47fc034decb3275ace8b4843807787dc5c837251e54deb4cb8a2c20625c3545b49972c43e6d7016e70157c
-EBUILD libsndfile-9999.ebuild 1797 BLAKE2B 8f3d3750ea5b81f17bf56c8582b8bd4b5db9e3805cd13da1baa3b898c624a1fe2dd41e003d6ad55673bc6ed5150de969b49cf6e39d4b55324f875568f8d78bd4 SHA512 551f120d839465e02f66b81b70dd700c7b6607fe719cfb603e9da2fe4ad56f863df2c3bf8d7fb773b7a5514148721c4faa1a15a04ab1125a2754886e9cf0f41d
+EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B 99412566285e27002762c9a46a849a7e61a880c168746dfbe25d0a1b9430d597fc719d3b35332993ccf566e5d29fff1f25499b3874f774ce764d6cb33af77ade SHA512 5149a95f5398c3cd19e12e2a07dfd7a4124d1f82f585997f8ef26eedc144969a56c4e0b44a37cd929dc4664aa37804bb35fad9c91fbf9eb4d5cceceaedaf8f56
+EBUILD libsndfile-9999.ebuild 1918 BLAKE2B b89768d09324e9276f402ede221311bfd8dc2e9acbcf83bc8d38d31503bce38f01896d0f1c0fa08af0491f9ad8647ef83c0d9366e2630d9365df3f26f44e5c10 SHA512 5fa0004d35d6e6132bcd9ce5e289e8edbdcaa8eff8aadb5f393f0a277793a708b35c9d0b28af2c6d39ac86defaebda87fb192d2f9c55ac552f4aea2fc7e212b2
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..16d64ad88d7a
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
+else
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="https://libsndfile.github.io/libsndfile/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		media-libs/flac:=[${MULTILIB_USEDEP}]
+		media-libs/libogg:=[${MULTILIB_USEDEP}]
+		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
+		media-libs/opus:=[${MULTILIB_USEDEP}]
+		media-sound/lame:=[${MULTILIB_USEDEP}]
+		media-sound/mpg123:=[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib:= )
+	sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+="
+		${PYTHON_DEPS}
+		sys-devel/autogen
+	"
+fi
+
+pkg_setup() {
+	if use test || [[ ${PV} == *9999 ]]; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--disable-static \
+		--disable-werror \
+		$(use_enable !minimal external-libs) \
+		$(use_enable !minimal mpeg) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 9a3d895a3dd9..7518292d8465 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
@@ -9,8 +9,8 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
-	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
@@ -28,6 +28,8 @@ RDEPEND="
 		media-libs/libogg:=[${MULTILIB_USEDEP}]
 		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
 		media-libs/opus:=[${MULTILIB_USEDEP}]
+		media-sound/lame:=[${MULTILIB_USEDEP}]
+		media-sound/mpg123:=[${MULTILIB_USEDEP}]
 	)
 	alsa? ( media-libs/alsa-lib:= )
 	sqlite? ( dev-db/sqlite )"
@@ -60,6 +62,7 @@ multilib_src_configure() {
 		--disable-static \
 		--disable-werror \
 		$(use_enable !minimal external-libs) \
+		$(use_enable !minimal mpeg) \
 		$(multilib_native_enable full-suite) \
 		$(multilib_native_use_enable alsa) \
 		$(multilib_native_use_enable sqlite) \
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index b1d62c798d8f..12908735a27b 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,6 +1,3 @@
-AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
-DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 9c9efeeb9d02ea98df998efc4a0996fb64a60837941cc4095a1bd3ff7c03d57cc21c68796fef729281d782095c14ce4bfaa429c59aa99dd647062da31291700c SHA512 d857040a48458d67154d08ef5d70b55a25a192b41278a1f098f215f025a098b35d8d69391b14b855dd6b989a2afec56c0437056843082318c8bdcc8d73213147
-EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 51965a0c6c96baae98b62827facfb9b93c019d1cbfdea78145eb28d4a03c611e01caae7e8be798a42310041221129f2ed28bfb3ee6378ee8aea72241d20b28b1 SHA512 5b4d029d0e745e7f42d792c8216298a7f1b0098f0c2034f1ff1da3adf43ce884eb254172bb66be9ae73c0551e9f08006471c3f8067bf7f90bb3935ce9f02d6b1
+EBUILD libv4l-1.22.1.ebuild 1467 BLAKE2B aaf5b0160710a087ce3c8bed30c89b2a0622a375f9ab7854f8786be9f5a7d114538cc0ec18e05aac54c6ec76d40981aa156547494cce1c435ca07bf320234c7f SHA512 da296cf7abcd04f6d35e6a99455ff52ee65a85246ebc7a37b4da09275acd2e88bd450fac0e833c7c73923332e0208f916eda5afae1d20b4bbb2534b964c6eaaf
 MISC metadata.xml 1117 BLAKE2B 1d9a1bb6f3e6f2fdeb8c892b8714f8e36ccee4e95defb2ddd9e2fe43e4e9901636e7fa717475b13efe111a2b4be89d78b1b610c153de778ab625b9bee566b783 SHA512 63617e7fccd7394ba402cde356011429b60d7781197fcbfaf473ff88a788fd0a7b631ab10e6cc198bd5a5985cef7ccf026359d4c4ff7a28616661cd8cef1b07d
diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
deleted file mode 100644
index 017513bcb907..000000000000
--- a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 23 Aug 2020 16:33:21 +0100
-Subject: [PATCH] configure.ac: Add --without-libudev option to avoid automagic
- dep
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9f43ab5..e6134d08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,16 +291,23 @@ else
-    AC_MSG_WARN(ALSA library not available)
- fi
- 
--PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
--if test "x$have_libudev" = "xyes"; then
--	AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
--	LIBUDEV_CFLAGS="$libudev_CFLAGS"
--	LIBUDEV_LIBS="$libudev_LIBS"
--	AC_SUBST(LIBUDEV_CFLAGS)
--	AC_SUBST(LIBUDEV_LIBS)
--else
--   AC_MSG_WARN(udev library not available)
--fi
-+AC_ARG_WITH([libudev],
-+            AS_HELP_STRING([--without-libudev], [Do not use udev library]),
-+            [],
-+            [with_libudev=yes])
-+
-+have_libudev=no
-+
-+AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno],
-+      [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, [])
-+       AS_IF([test "x$have_libudev" = xyes],
-+             [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
-+              LIBUDEV_CFLAGS="$libudev_CFLAGS"
-+              LIBUDEV_LIBS="$libudev_LIBS"
-+              AC_SUBST(LIBUDEV_CFLAGS)
-+              AC_SUBST(LIBUDEV_LIBS)],
-+             AC_MSG_WARN(udev library not available)
-+            )])
- 
- AC_SUBST([JPEG_LIBS])
- 
--- 
-2.26.2
-
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
deleted file mode 100644
index 653db36f66ce..000000000000
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dvb jpeg"
-
-RDEPEND="
-	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automagic.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		$(use_enable dvb libdvbv5) \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg) \
-		$(use_with dvb libudev)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
index af9048e8367b..2223dab92514 100644
--- a/media-libs/libv4l/libv4l-1.22.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.22.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
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 73bdf7c5dce0..9568742137bd 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -9,7 +9,7 @@ DIST libvpx-testdata-1.11.0.tar.xz 444614504 BLAKE2B ab6de4c46a771dc1c0dfb19326e
 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 3513 BLAKE2B b0c213f4895736a46bfd766c46d325dc9b38f24df3c5a8fb89785ce2ea3907043b09aab0a18e61ec42d0a1c1765e698b9c377ab2bf4444d7c2160efbf2df3982 SHA512 63b2f6b8a4341c2d77826be4f7e261dff02c56324dcbd1c4665a290ad8824dbb3a7f2fce17fdbc014034e425e24240bc176f12769c19ef8040514c236687b8ef
-EBUILD libvpx-1.11.0.ebuild 4340 BLAKE2B 7320e9a8da514c48054249a42e22ede7570b176902e86964e94de598e7165fd173f0a85d5ee325eaef11ca6f5cb204b617a62c703d4b5f1b10c8d04d47cc91a3 SHA512 59af95a5197a5090f3ec21d97917e8e8562a034d25757f95583680f71596cb2a099801a0a10f9d21953af7d8f379e2d76d5880e4805b2cc74b1cb7836e21f752
+EBUILD libvpx-1.11.0.ebuild 4338 BLAKE2B a83124c9a4f0d72185eb9d8e474c19c2ba1ff0673f25df0220bcca8acc07c23b518390a73a6a533f22417b5cfa24558c72b3779f06597447c14d4543b7d2c596 SHA512 4bc994c6127712d2374bd01a6499b4bedf5204126555ab18044ee9ea8f91b336fcfae8dbeb001fe7ff7144a5158352bf7e1a81b3d7d3f003159f00d7fbd80708
 EBUILD libvpx-1.7.0-r1.ebuild 4008 BLAKE2B d97bc37287825a027d6732955e0563ec899d434401c648894a203208576c9de7e2142d9922a70d8d99a65086f55ade1003d413202c1c91e60321903addc99693 SHA512 3369709c5882d692fac2d225639c82927ce8a69b85517673a0b5a85b891fdcac022ed5d78a5ab22715b9d1d4b1843c8c433dfb3642bcb45bdada596247814ff4
 EBUILD libvpx-1.9.0.ebuild 3504 BLAKE2B 65b08b6e66e759de5a2ab1df71dcadabeb62b0f2eae7c77f7816b43a9d5427b1c103b1b6113f76a5d40a7495d28377c496afc8ad64a2a1bc1d068b32dff2cda6 SHA512 25e856ba85868de2ed61e4b3b704118e2ab9771c9272670626ac0bb2e876793a0e80ebe3b49d5eebe78c57cd68879c55b537c4689dd866b5ae2349f4e94db0d1
 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
index b157a4048fdd..00b9211d078f 100644
--- a/media-libs/libvpx/libvpx-1.11.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.11.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/7"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index c830a8e1bb18..457a40a909c1 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
-EBUILD libzmf-0.0.2.ebuild 1045 BLAKE2B 5007b0ccc92ce90a80477557c2bf4ff0b3a74fb3ec006be97d63db78af7aa67887387fd4bbffa0942c3ae75e8d53b635beea19150f2b163672fec31fdc23d476 SHA512 3eef2082d76da8f828e88e15b1f011773d65cbff393fc9b4b3e66b592fc462bd4ab6cb49e35e8b29158cfb91e79b2cd9476dcf4bf001689185f359e44de4e837
+EBUILD libzmf-0.0.2.ebuild 1052 BLAKE2B d1087b08a96fe57a0c160d7b908c4adc46af342ebcaee29d1c8fb39e5a69af22d88943ab64249f9d56723199a2224078865c89818b915236bb56e04c55bb9b3e SHA512 45373d76969b5acc9a589d09d17dcd1695c596c1d07ae8e32f9d93ae07374b6257c94c3644b6bae36f1d04a91f76c6e917cf9448592c6d09e85a4d5f5c6c63c0
 EBUILD libzmf-9999.ebuild 1067 BLAKE2B ab5d5058ac4d0621fb946575660abebbb7b38b6a40e81ccc47eaffb24a91669a0d4317f36fc86a86ad222aac96097a2fecd5317c4ef272624a3249d2703a084d SHA512 1feffc1087522b915ae254e4a80f257adc0bdfbfd77ad66d85124914b036a723babeaf9e7fdd58fa28dd258cccb2ae544882e9bf2b3b11abf29cb6b331b55798
 MISC metadata.xml 322 BLAKE2B 0f262709cb2e7bae511e2293ce646d183680f79a62bbe2f13faf443108720231b11435e337dfad4612171c53c90cb3667c7f074eac2e86ce2e62344488c7d8d5 SHA512 df2c04a9977852a49b1023627ee5a28eca154d6b276bc72f8b47957d73b1f745fad4dc0208aa0a1c7e7b76aad74cba0aa7360434711ec19f33b0976748b53ecf
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index a2d9bddf410b..4d3dc28e21a3 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 
 IUSE="debug doc test tools"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b15a9bae0e48..442582a73330 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,10 @@
 DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6 SHA512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88
+DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9
 DIST mesa-22.0.0.tar.xz 15565680 BLAKE2B 65dd09e1864f353f07ab01cb21cb89f858a071d74043b1913b0abe3ee3b3a992ca3878d40ffe52cc45546770d5ad9e198c93a24a8564ffeb9c8a05da38af300c SHA512 9faef66adbacba24d11dfe8e2d1a753295798883a10a7cc91e6df9d678c64a8286a12e60c0d8576d944a8cc76f00c30d27c3a71d3458bbe3dbcd66c88a454c3b
+DIST mesa-22.0.1.tar.xz 15634448 BLAKE2B c102643a81f47b36da24148564968dd5578b01970d14769eeb501d00ba43f49052893625ac7a8d67638f3d9bfe610440f300eb5657322387d8e5dc15b62f13b2 SHA512 cc8012b8f3fcbecfbb153d0e009e6522c3776023501da8499c06f1eaa9ab0a555ca597e16e4d7a2b954b05c8c0737ae6567e0d8549fb63aa86ae587eb31cd01e
 EBUILD mesa-21.3.7.ebuild 15192 BLAKE2B 647d7b0865d39dd575ae9264cbcdbc07c6f92cda7d8dacbb5ce6bb5c92f0c0b38f322536e486802c8911415ed0e40ad14467bc900d9983e22b917ef1a3c4e75a SHA512 59ed639bd6904ee343f5297bc755ab9bc0dec759459f5b20c7a36c3abc7a3dbb349caca46b7c81909d8d9f0b317525973a24a0486291feeb47356d0d0718606d
+EBUILD mesa-21.3.8.ebuild 15216 BLAKE2B cdbff5f19caf5e784e950f306374d10f2ed61a2ba0b13c7970be201b4c84701bc42a66ec6c45c4701a54e23e1c44072a2c285b33d2d34f6c0e858894cc13eb5b SHA512 4c2eb36699727015f9f1251cf66e0c350f2659c8f91aa0ac3485e1c1c2d2f6d6cfac5a23bdacc1d6acbfc18d74a58b24b417eaa6570dda8df0381043d453217a
 EBUILD mesa-22.0.0.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
+EBUILD mesa-22.0.1.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
 EBUILD mesa-9999.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
 MISC metadata.xml 1848 BLAKE2B d08b83f9a7b14353998d07602583ed2f8c4208b03562a0b1c45fc0d4e1ef40787ed2b37b512557af48f00b08e7ea8db65091cd6c01bdfc6c3e1f497e44268cdb SHA512 2076fd824999959ec819bf7aad9a33fe00419e8ae9f91b9ea70440538f8f2c30d9e934973c80883515479dddd038443257dcf960c566d66421f86898c79fbe94
diff --git a/media-libs/mesa/mesa-21.3.8.ebuild b/media-libs/mesa/mesa-21.3.8.ebuild
new file mode 100644
index 000000000000..082bfd9f9739
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.8.ebuild
@@ -0,0 +1,561 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..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 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	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 gbm )
+	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 X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_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+=(
+		-Damber=false
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(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/mesa/mesa-22.0.1.ebuild b/media-libs/mesa/mesa-22.0.1.ebuild
new file mode 100644
index 000000000000..15b5138f55fb
--- /dev/null
+++ b/media-libs/mesa/mesa-22.0.1.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..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="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno intel 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}
+	cpu_flags_x86_sse2 d3d9 debug 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_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
+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}]
+	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}]
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	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}
+	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 )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	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_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, 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 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_intel ||
+	   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 llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   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_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	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
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel 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=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-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
+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/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 1709cea2e654..01114fe9fa20 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,5 +1,5 @@
 DIST nv-codec-headers-11.1.5.0.tar.gz 67850 BLAKE2B 27c1ae4a8710bbb1ca72d5009ec4b62c71f1899c128009bf7017603429dc9c47df9894bb0e1eb2fd21986ee713aa24a82e0753a4b196347ad51371d67b2f3dbf SHA512 b973ba763476b083870d7701b63cb98cc5e22d3698e431316c82b8ffd887d430df296938af52ed54478440105ac34f4282b0a8471eb541c1ff77cac9ad33ec3d
 DIST nv-codec-headers-11.1.5.1.tar.gz 68516 BLAKE2B 0c47b885f1dc14aa6a6118ee66ffc2846626986eee0a3c5fc6159f16aa72e5d12e6ccc44bb68b095cb36f68d8b437bde98c870e23b2794048de96b40fc85acae SHA512 b0738e51e3d542483a15bdbf615b1233a2ef110f1a12853b1af45c650fbd144f4aa94dd68289c66582eedb2309bf266c7e1c0ef48b9e2ee1789fd009ed45bd88
 EBUILD nv-codec-headers-11.1.5.0.ebuild 738 BLAKE2B 3d290c7431842d4f46036befbf3fee0bbce911f90f17760a127c009d4c65049504e4e42d5005623f18d4df22f1599cc3f0834d9dc9b5548eb5dc481124918304 SHA512 6607e5b46adafcda81eedf56b4e66094b51f915a70490e2a65249ded6e177cf551eade71af9761b46591bd12e88c388ea07e8ecf3bfdc428ebb57074766aa901
-EBUILD nv-codec-headers-11.1.5.1.ebuild 739 BLAKE2B 367c020dba563c9c52e8e166bbe8a3356b8032d85793622ae598ec2747d9815d71eea8a802bea5c274e14ff5381df1f9ef29c8adf33ab5b862cfba2ac730b2c4 SHA512 18cbad472cc973ecf74097ca3053d786fe4e997c39e1ed17adb892143eb09f2913536582d690f7529ec3fdc3bd75d7024492dcbb68e2ddac2be611178af810c6
+EBUILD nv-codec-headers-11.1.5.1-r1.ebuild 677 BLAKE2B 96888014f8aba19dacad0e23017a2f490c5805e3473c1aaa5cd1410d8ff2ee3cfbcadc97a5d30ef6f6657c1f2614f8e366dcbf7710b9836da1afc631723d9657 SHA512 1b0359c7016606ce01d20b3ec2608c0040c16504d2dca896fd5bdce2c63818d76ffb91f85e35fa77b4810703943870d37e255a7a583e95590c1f0a3553c33164
 MISC metadata.xml 320 BLAKE2B 87b2f0f66194013fc14f77ab1d3cb940fba6d2194f8b17411cccd0fc3c5c86b850ceef3b05160d81929228392a4ceaaf8e7862ed0ed801f6f6af7dafb7624111 SHA512 589c3adde9ae93f2db628fe91710bc19e2d007ce0ab4810d17ab7dad6eede2a1e4e332e485c89fa542552f726a27a591a9894e0518663b9dd82063381b9126e5
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
index a6586dda664b..bf44773fcf29 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit multilib-minimal
-
 DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
 HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
@@ -13,17 +11,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
-RDEPEND=">=x11-drivers/nvidia-drivers-470.57.02[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
+src_compile() {
 	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
 }
 
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+src_install() {
+	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
+
+	mkdir -p "${ED}"/usr/share || die
+	mv "${ED}/usr/$(get_libdir)/pkgconfig" "${ED}"/usr/share/ || die
 }
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index c12e27571f76..408c151859e6 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -12,5 +12,5 @@ EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866f
 EBUILD openexr-3.1.2.ebuild 2163 BLAKE2B 70e443af57f3f044be3e47030919b273b673a0c22f2d871ec9cfbb602dc0aa725f37704cc3d0a35c3a781c12c0dd6a780b386ed844094b0a6a3179c3962f9f41 SHA512 8c7e0d1ad8c15b11c5f6d8126dfcf648bf8f2b6a8b810a01856f26a8f65e49605b3941bd48e14539800114a49164c12fec71ae5f857bdf6f4496fa67139c16de
 EBUILD openexr-3.1.3.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
-EBUILD openexr-3.1.4.ebuild 2171 BLAKE2B 97a8f93dd83d637ceb65e9afa306efc80e4f1455b5f2920fd688767cd4460b498edccf7fd582bef570ea1c145c831ac2af8ed6ae48cd8e1f0a0bf76fcfb39c89 SHA512 ac2d49668c14d987ec0be17262cbee7a07a28585add7667e95aefe2f93ea593361345b48cddd77c60825fffd8b18ec303797f6f043a677962bfc038bb29ca6af
+EBUILD openexr-3.1.4.ebuild 2170 BLAKE2B 1765dcd4eb7c504912301f59403d45195ac3a93cb72d1178e4f26f0f4bdfb6f68c9efdce16bef3f3a30ba60dd1de74977f3d9704f4bd92fe3d26d91fac57d473 SHA512 ded503632f4a0b75d3a15267c52d1ed37e652b4664d81260f071cadab4dd8a70d3c8ce6a3c5c289765afa11c805f1c9a44789ac9d9b305a9c891c2e6b0a7e7f0
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild
index ffe4572facba..de5d41a68c51 100644
--- a/media-libs/openexr/openexr-3.1.4.ebuild
+++ b/media-libs/openexr/openexr-3.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index bba3d36866a7..34a355535585 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,4 +1,6 @@
 AUX quarter-1.1.0-cmake.patch 535 BLAKE2B b800b87ff88a824170700f37599bd425c08d2defdd515f98314de531710ff56f916a7619cd9eac35c74664bc7dd55f4320234ac96b0e1c6b08ff64b04c312918 SHA512 fbd981e1af9003ee6f92a6218a2d150b110f3e86c580b2a57a7d5e496f3e7a36e0ee8b5e664ef38b7d5db7294b2500c64e1c8c4adf9a8ee3b877173f409bb411
+AUX quarter-1.1.0-find-qhelpgenerator-binary.patch 864 BLAKE2B dbffc6c53bb6834b8825b4c515c749a1fbaf378a7b03b9f9d2509ba72ca9ba363b800f26eed68421e4bca0a68f721e0ef360cd29ca95f465f4fca7ee3054b99d SHA512 23e9a0bb5a3cabe7f2c4e1b977d5a01973331416633fa3f44c1869d22d420a5e60c1d3d61853f422b6ce4340a8b3352031e4a6841fcb4be5c3b0cdf416087ae3
 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0 SHA512 2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c
+EBUILD quarter-1.1.0-r1.ebuild 1548 BLAKE2B d5f36f88da213b610d6582c102d489ffe73d9ebeb12abe79b0b51d186072d6b3181d2ee8578d70f59d7f5656e60e4ad2bfaaff7521dcf1f1d12a2e50e2d87114 SHA512 8add446876bc3daae6cb9d45345e0255f4fce5f49b94b19a3c68b449e81cb9e7e81af98fa7eb90fd3bc060acac9d5ae2fdaf261b214552fbd16b3c846ce4a675
 EBUILD quarter-1.1.0.ebuild 1363 BLAKE2B dd6327391b0a12c2987f83b71a66d0e90484d89b5083eab58f79921e2e2a6332613fabdd139062d8bf675e3685c96ff20231a0bc535c386073b907ac2db3c11d SHA512 ea0579d3912689f1a36aca4bf832a2bd69c7446d4271d54e6e59a0acc75bcb0bca7aa4a28c68d3dea8016211ac54e3844cda0e19742da1e46c2571414367ff5f
-MISC metadata.xml 850 BLAKE2B 88b9deaea963a026b2a89f7fbbf1661f5f5894e67ead85804920abd9c0a014b2d51c284a0e7c14054c617b2f6a2c97ecb3d3e8ca037cb14306b4e1f1ce506b70 SHA512 e295d24e8bb5aac5c04f0a2b944d7fb612b98f75b3f4db5cc003fffc66bf152dd0c19c444400ad03d1c69a241f5349dfefe19e603b36d69e58fa4eb27b07aa89
+MISC metadata.xml 1095 BLAKE2B d49405831d4200b0294c6bdedee25ce91e91f8a74f69d279fa557ab85df3f4a84b4f65d8824375ef943bbdf135ec0affbbdd74459b7dc3d16c813816c6405ff0 SHA512 c6ddcec450816262a64df90e9f081c0a6eb7572d8d3d2ff0dcf5980263d84ac2425a1d49997072dd9d7baf8e27007944a46a96cfcdde12282e8fcbe84c47fd0a
diff --git a/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
new file mode 100644
index 000000000000..6fe804551e72
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
@@ -0,0 +1,22 @@
+From 04994984239e18ea68af04734c4c8a1324bc0ac6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 2 Apr 2022 15:00:42 +0200
+Subject: [PATCH] find qhelpgenerator binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,7 +204,9 @@ if(QUARTER_BUILD_DOCUMENTATION)
+     endif()
+   endif()
+   if(QUARTER_BUILD_DOC_QTHELP)
+-    find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
++    get_target_property(qt_qmake_location Qt5::qmake LOCATION)
++    get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
++    find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator" HINTS "${qt_bin_dir}")
+     if(NOT QHG_LOCATION)
+       message(FATAL_ERROR "Missing program Qt qhelpgenerator")
+     else()
+-- 
+2.35.1
+
diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
index 9ef4a04c87ad..356911f89686 100644
--- a/media-libs/quarter/metadata.xml
+++ b/media-libs/quarter/metadata.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>reavertm@gentoo.org</email>
-    <description>Feel free to maintain/fix</description>
-  </maintainer>
-  <longdescription lang="en">
-  Quarter is a light-weight glue library that provides seamless
-  integration between Systems in Motions's Coin high-level 3D
-  visualization library and Trolltech's Qt 2D user interface library.
-  It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
-  </longdescription>
-  <use>
-    <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-    <flag name="qthelp">Build API documentation in QtHelp format</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">coin3d/quarter</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<description>Feel free to maintain/fix</description>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>waebbl-gentoo@posteo.net</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Quarter is a light-weight glue library that provides seamless
+	integration between Systems in Motions's Coin high-level 3D
+	visualization library and Trolltech's Qt 2D user interface library.
+	It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
+	</longdescription>
+	<use>
+		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="qthelp">Build API documentation in QtHelp format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">coin3d/quarter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/quarter/quarter-1.1.0-r1.ebuild b/media-libs/quarter/quarter-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..9ccb1a4a1aac
--- /dev/null
+++ b/media-libs/quarter/quarter-1.1.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_P=${P/quarter/Quarter}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz"
+S="${WORKDIR}/quarter"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug designer doc man qthelp"
+
+REQUIRED_USE="
+	man? ( doc )
+	qthelp? ( doc )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-libs/coin
+	virtual/opengl
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		qthelp? ( dev-qt/qthelp:5 )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-cmake.patch
+	"${FILESDIR}"/${PN}-1.1.0-find-qhelpgenerator-binary.patch
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
+		-i Quarter.pc.cmake.in || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DQUARTER_DEBUG=1
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DQUARTER_BUILD_SHARED_LIBS=ON
+		-DQUARTER_BUILD_PLUGIN=$(usex designer)
+		-DQUARTER_BUILD_EXAMPLES=OFF
+		-DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
+		-DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DQUARTER_BUILD_DOC_MAN=$(usex man)
+		-DQUARTER_BUILD_DOC_QTHELP=$(usex qthelp)
+		-DQUARTER_BUILD_DOC_CHM=OFF
+		-DQUARTER_USE_QT5=ON
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index d8996b56110c..062f6de3a0b2 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,6 +3,6 @@ AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd
 DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
 DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
 EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
-EBUILD vulkan-layers-1.3.204.ebuild 1673 BLAKE2B 67a14dc9785acd9c61319e8772f6dc55f635a3b8c20d6f1bcef027472278b1ca5f327d25cb66b2223615352c1de44eef05aa85620a3ca801c8d64e30579d976d SHA512 3b3012e79208a4fc778c49c4344f7696fa48f30396df4c23c0a99a638a1760b570794f9fb6e70493bd972afd3b353b0c5d3a5a1e8ee26acf7d200896b7e92827
-EBUILD vulkan-layers-9999.ebuild 1620 BLAKE2B 9eed71962ec4bb21c802b5a8d511f853dc7d2fc2cb10a26956c3ca2fb7fa391ea0e9e870be32f9001e107c28e6b0c15ad8a998b0a52e7b0bc4d11be25a9afc43 SHA512 d34fec44047ff30b6681efc9fb0da9ed22a48e746d3edc570f949f0a889c97832826735030adbc431bddcf4ca16f21cdb4af88ff053739b567c2d30d4c124175
+EBUILD vulkan-layers-1.3.204.ebuild 1631 BLAKE2B 3a33173fec35bf49cda2777aa38d6b6be02c8d26ec253dbbd1b0218dbc8c436ddc513584eba2ae1d7db8d539b58f861b855755e0f9adff7bccd2cb1c68cbc8d9 SHA512 33e854009921cfc83287241143db5e50f88f31fb3060d2a15967f0134aca747c8778ea80b971307c3b175eeb4e423a8857923f3d1489083b763ee037ac78eb51
+EBUILD vulkan-layers-9999.ebuild 1578 BLAKE2B 9de9bc4610ddd8be733ff703e6b181e693d31c6ac3819c21e2c62b644b213ef561b4515c4c60c8aa318550038182e0e1807af210029bdba55b146d06dbee2aa5 SHA512 87d4953f698930b71808e4df361294bed60c7deb92e09fe1a03ee1e8b4da00f6187c0b3b4a436e8fe41a8d25dfc748133b347957f585a50bd373fd967e365bb8
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
index 2288a824c1fd..3b60f6688ddf 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
@@ -54,7 +54,6 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
 	)
 	cmake_src_configure
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b4edb5a84d37..d907a6f8f9b1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -49,7 +49,6 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
 		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index 05ef2ba6ed97..ffdac656414f 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,4 +1,4 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
 EBUILD woff2-1.0.2-r4.ebuild 875 BLAKE2B a476d41e48546fda707c634bc66921ddb0ce26cb70634017c8ea1ec686f7c2ee575a4fdde64e19c53c5224d2b78bf91a1c96daf21d84b636307155363a5bd5b8 SHA512 c9c5d23377043fa0b99dcbdcd74a2a31491aba7f8088276ac4ee15529eb0131980d66dc97692bb71365fc2dfad0aa1e98f06ede88d3eabaacb010e52e42b8595
-EBUILD woff2-1.0.2-r5.ebuild 865 BLAKE2B bd372a9e6862ec417353d9a492999ccc742de15a6ffc5014cebfd2e6cc7cdfc75c056a226be63f8aee0f16493cdb52f481cf99b06923ca498a6256dab6478784 SHA512 d6cc4989f8e37b4c6266469e25724bfde30f9a2f8b1dda5f916f399f7ca591dede90863324cd15fb9ab91ec3fb8ccf94815e7831b1f02c1b777bc186155a3287
+EBUILD woff2-1.0.2-r5.ebuild 858 BLAKE2B 183d7cd6bc4f92f2d67ef75f027b5301646b755ec202ad1d13fb8619686c2bf337e4283759c7ca7f0433d89a26f3076462bf9a2878597f4857427a347ba5a310 SHA512 37d6dbd4c787f6c8d1f3e88d659e3b3bcaca8654be18b16ea4d3f4867817cbf43db44c4224e08440b87b435e776c4196c80a9b22c2685abd29cf9ced47f1e07b
 MISC metadata.xml 354 BLAKE2B ad57a794365a6750452e942c5570e3357d829c917f09f7d79d7cd14612d0adfe6d0dc4f0e6697a3d0ab91dbc8b4927270b7ecff99c1ca0b5f95c88d07b78d23a SHA512 c42129cdbfc646eb68afe8f1cabaefa9aacd6444a99dd469b686bea805ffe3929382ebbab79c1936d5c1b3c4709647aba751e7a73baba367687ba63f1e605afe
diff --git a/media-libs/woff2/woff2-1.0.2-r5.ebuild b/media-libs/woff2/woff2-1.0.2-r5.ebuild
index 21a221e8d610..0f7be738f97b 100644
--- a/media-libs/woff2/woff2-1.0.2-r5.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli:="