gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
362 files changed, 8230 insertions, 5162 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2-r3.ebuild b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild
new file mode 100644
index 000000000000..834067f5713b
--- /dev/null
+++ b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A library for storing voxel data"
+HOMEPAGE="http://opensource.imageworks.com/?p=field3d"
+SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="mpi"
+
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	>=dev-libs/imath-3.1.4-r2:=
+	>=media-libs/openexr-3:0=
+	sci-libs/hdf5:=
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2-openexr-3-imath.patch
+)
+
+src_configure() {
+	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+	# bug #808731
+	append-cppflags -DH5_USE_110_API
+
+	local mycmakeargs=(
+		-DINSTALL_DOCS=OFF # Docs are not finished yet.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+		$(cmake_use_find_package mpi MPI)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index fc61bb7c43f0..b11606a6493f 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,6 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
+AUX Field3D-1.7.2-openexr-3-imath.patch 7968 BLAKE2B 8700dca8ee30b09b4e0d5e247377da9ec2032e91ef45af0c0f2a46a85ce1f00e402dce5317b7a371cbd56b0228183521ec27223b6a86ccabcd6b770b351d2439 SHA512 edbd7d0af80f74e5d9ac9e516cc1c2ed7c7f96a46eb4c390d2f2cdfbacb0eac0e5030f936012ba5fc50555f415599e4fefc359c4b16b5dff0d6bfb4384dc723e
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
+EBUILD Field3D-1.7.2-r3.ebuild 922 BLAKE2B f078ed2b059987b4bf0867c3d50acc83795aba8f34aa341f96d02986291d59bdf4aad3eddbebd89e83c4f86affa96d000662f5b3d0708db884da4a4e97f3780b SHA512 94c5752415aa41a83464a2ad38391ca2db3a813dfaf16f79b97cc735173f30e8b274136fed5b82f395ff93c1526b537e8f684271d83faa1b46be3e3bf9cdc019
 EBUILD Field3D-1.7.2.ebuild 925 BLAKE2B e1b07186c1718294d5c0a35c93e81dae7ff2e9f210feeb51213b70a3bb500d04f6668709444d67f9b098867e847cbdfb91512b3d3f74c21cf3c8530874fa77a8 SHA512 5b31697dc8fba020e4e5346181c037f37efdedec85fc4ad24c809f32700e947702330bd87178296dff296495c1e86db62b214597fb8b845c9939e39b961cab1a
 MISC metadata.xml 739 BLAKE2B 7fe96438b4f2f78238a6cfb1818391840039d002daa574edaec6a0976141222647da4e8c5e91a5a15acc582dbaef7005e356925443f09f0046fc5ec5283518db SHA512 04fca4a4ac5c768c389455c3d2ce382f68d1905506058879ccb5cdb333627f26fdfbf2e6d977c381d9d4f025a7481f484c94f5a48fa06ac91a7927d93abd467f
diff --git a/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch b/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch
new file mode 100644
index 000000000000..a4155403d46c
--- /dev/null
+++ b/media-libs/Field3D/files/Field3D-1.7.2-openexr-3-imath.patch
@@ -0,0 +1,233 @@
+https://src.fedoraproject.org/rpms/Field3D/raw/rawhide/f/Field3D-openexr.patch
+https://github.com/imageworks/Field3D/issues/101
+
+--- a/export/StdMathLib.h
++++ b/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+--- a/export/Curve.h
++++ b/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+--- a/include/OgUtil.h
++++ b/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+--- a/include/UtilFoundation.h
++++ b/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+--- a/include/OgIAttribute.h
++++ b/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+--- a/test/unit_tests/UnitTest.cpp
++++ b/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d7a4a41f79ac..35c99fc82639 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
new file mode 100644
index 000000000000..be73bf6d68a4
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -0,0 +1,9 @@
+AUX icd_amd64.patch 330 BLAKE2B 6911c451ee96d68e91f5ca8a8536b758f8ecf81bcc1b19681a3eb960c1c0e06808560bd339b9d44395b58eb0794355670dddaa55eaddcc55b301f2c0c3090ea5 SHA512 3d1e4401be88302d4d5058082eada58f5ac8bbd9fc875c494d30407d1e2ab28319968f7fca96b7afb6d82ecf19c9a6a408bd06f9fa1d755d1e1fe7b906a76257
+AUX icd_x86.patch 322 BLAKE2B 823d90dadb6f4791937ebcd28cc2ce5045a1a713cc4b5b58201e9ee6b57be8568a1ff63724e1fc16c29446e85e8dd1d533248ccf41acbd1355fccbff62239285 SHA512 c39fa60fa116ee92bf613dd8cab08b464cd35b9e63cb0ccc568cc0024b93652ce556b8823edf987498d72309ba841085434481fffa4cabd5de1494851cbcd4d3
+DIST amdgpu-pro-vulkan-21.50.1.1376756-amd64.deb 8342920 BLAKE2B a99ba48ded384e39beca0f7321ee6cc77f751843c7ee5d9b45e284740ac1a0932497e3029e95e6f7f6bc1a0d3772619be01a0bc22b4b3857bf24a47f1cfa7b2d SHA512 ff9479652c6b7d359e3b1b1c8f5038f4e447fe2f5f5f186414ecae30ed99be75373bacb599045b23d530c93a78d8049d2bedf129e655c198c9e9e9f8b528d951
+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
+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
new file mode 100644
index 000000000000..db6883188d30
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
+	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+	usr/lib64/amdvlkpro64.so*
+	usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+	if use abi_x86_64 ; then
+		mkdir "${S}/${PN}-amd64" || die
+		cd "${S}/${PN}-amd64" || die
+		unpack_deb "${DISTDIR}/${P}-amd64.deb"
+	fi
+
+	if use abi_x86_32 ; then
+		mkdir "${S}/${PN}-i386" || die
+		cd "${S}/${PN}-i386" || die
+		unpack_deb "${DISTDIR}/${P}-i386.deb"
+	fi
+}
+
+src_prepare() {
+	if use abi_x86_64 ; then
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+		mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
+		patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || die
+
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_amd64.patch
+		mv amd_icd64.json amd_pro_icd64.json || die
+	fi
+
+	if use abi_x86_32 ; then
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+		mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
+		patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || die
+
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_x86.patch
+		mv amd_icd32.json amd_pro_icd32.json || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use abi_x86_64 ; then
+		insinto /usr/lib64
+
+		# Vulkan
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+	fi
+
+	if use abi_x86_32 ; then
+		insinto /usr/lib
+
+		# Vulkan
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+	fi
+}
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
new file mode 100644
index 000000000000..db6883188d30
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
+	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+	usr/lib64/amdvlkpro64.so*
+	usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+	if use abi_x86_64 ; then
+		mkdir "${S}/${PN}-amd64" || die
+		cd "${S}/${PN}-amd64" || die
+		unpack_deb "${DISTDIR}/${P}-amd64.deb"
+	fi
+
+	if use abi_x86_32 ; then
+		mkdir "${S}/${PN}-i386" || die
+		cd "${S}/${PN}-i386" || die
+		unpack_deb "${DISTDIR}/${P}-i386.deb"
+	fi
+}
+
+src_prepare() {
+	if use abi_x86_64 ; then
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+		mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
+		patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || die
+
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_amd64.patch
+		mv amd_icd64.json amd_pro_icd64.json || die
+	fi
+
+	if use abi_x86_32 ; then
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+		mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
+		patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || die
+
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_x86.patch
+		mv amd_icd32.json amd_pro_icd32.json || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use abi_x86_64 ; then
+		insinto /usr/lib64
+
+		# Vulkan
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+	fi
+
+	if use abi_x86_32 ; then
+		insinto /usr/lib
+
+		# Vulkan
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+	fi
+}
diff --git a/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch b/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch
new file mode 100644
index 000000000000..ac55e40a0f2b
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/icd_amd64.patch
@@ -0,0 +1,8 @@
+--- a/amd_icd64.json
++++ b/amd_icd64.json
+@@ -4 +4 @@
+-        "library_path": "/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlk64.so",
++        "library_path": "/usr/lib64/amdvlkpro64.so",
+@@ -10 +10 @@
+-        "library_path": "/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlk64.so",
++        "library_path": "/usr/lib64/amdvlkpro64.so",
diff --git a/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch b/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch
new file mode 100644
index 000000000000..5d70ac2af943
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/icd_x86.patch
@@ -0,0 +1,8 @@
+--- a/amd_icd32.json
++++ b/amd_icd32.json
+@@ -4 +4 @@
+-        "library_path": "/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlk32.so",
++        "library_path": "/usr/lib/amdvlkpro32.so",
+@@ -10 +10 @@
+-        "library_path": "/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlk32.so",
++        "library_path": "/usr/lib/amdvlkpro32.so",
diff --git a/media-libs/amdgpu-pro-vulkan/metadata.xml b/media-libs/amdgpu-pro-vulkan/metadata.xml
new file mode 100644
index 000000000000..03e31d9fc34c
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<name>Adel Kara Slimane</name>
+		<email>adel.ks@zegrapher.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest
new file mode 100644
index 000000000000..ea05b289cabe
--- /dev/null
+++ b/media-libs/amf-headers/Manifest
@@ -0,0 +1,3 @@
+DIST amf-headers-1.4.23.tar.gz 14971091 BLAKE2B d569851ccb5b3cd57bfff3e6475207e9f01681c2215add160a83165653efce2f0c8acc41a49c227952a649f0cfe92e7e713fbee8bd45b0489844c19e83fa5c74 SHA512 98b2b7d634ac24be5c5234fad99d58c9668b2dab83e89162a0508f9b06efec5de29b307534dc1dd677f9586be2c4fa58c8f04a535d5e66fa0be3b233a117a5d7
+EBUILD amf-headers-1.4.23.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
+MISC metadata.xml 570 BLAKE2B efe03e3d179662de4a0a63ad87d6ed0650a06931c9ba6aadba4fd8a35266012f224105ca3b1d87e4e7622cc355b8c3391db90d48e2c96540341a50c0cff7d454 SHA512 b43fde2f2714f5aac813edf978029347cbac784dd9f388bd0f5a8f0ea800ddeff396095cb40e0ffc4e068895a72db66101a70dab2d70f7f9a28bf29bafe6c382
diff --git a/media-libs/amf-headers/amf-headers-1.4.23.ebuild b/media-libs/amf-headers/amf-headers-1.4.23.ebuild
new file mode 100644
index 000000000000..f96ac72bc0e6
--- /dev/null
+++ b/media-libs/amf-headers/amf-headers-1.4.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
+else
+	SRC_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="The Advanced Media Framework (AMF) SDK"
+HOMEPAGE="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/AMF-${PV}"
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_install() {
+	insinto "/usr/include/AMF"
+	doins -r "${S}/amf/public/include/"*
+}
diff --git a/media-libs/amf-headers/metadata.xml b/media-libs/amf-headers/metadata.xml
new file mode 100644
index 000000000000..2e81ecdb16ab
--- /dev/null
+++ b/media-libs/amf-headers/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<name>Adel Kara Slimane</name>
+		<email>adel.ks@zegrapher.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">GPUOpen-LibrariesAndSDKs/AMF</remote-id>
+		<bugs-to>https://github.com/GPUOpen-LibrariesAndSDKs/AMF/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 326f3554fc8a..001c58e87528 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -6,7 +6,11 @@ AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c1
 AUX assimp-5.0.1-fix-unittests.patch 1062 BLAKE2B 3e1e2a236f5f4fc9aa901001a526261569513b221082480bcb366e208489b00df33f7da38245293a17e8aac846ca715a86d10c1a7362137c4afd30f63782fdb0 SHA512 66f52cc5f809eb6987e1c6298730ae6bf89e1d0fb1c7665834448494121f79c1602277ac6eabb69a302171cf1048b54560ade3bc00a8e1adb4fe464bdb71d9de
 AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a918831e7fbbd3c9e46cb654c94c370d95ac5622f3c95ab161debeee92234548778de494640f88e4d8131f0bf91b76b07c9 SHA512 981d62f20448cc47c732dd4c0bd24ad43c2bb02a9a765ea1da12e834cd50a1675bdbed94d37d1f60c011ba237327be953db89ec1d509dcfeaf30ed480eb9217f
 AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3
+AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2
+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-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
 EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b
-MISC metadata.xml 363 BLAKE2B 3d1b813f2b4c63179eaa6519fabd01f7ed2f2155fcf23286188199edde3f11804be4925334924ef53e2187ced0b76fa930145fa64f6c9eb256e6f5af19b7c881 SHA512 6e1c56b215a9f8df4f1c49ce754ce113f242d5ef7f933b4995002b4b63ca9441c0649e91b299c6e0a007e54acc6653a8b609681a6e3347747171d91cea3416c2
+EBUILD assimp-5.2.2.ebuild 1172 BLAKE2B 598eb79aa6d39bbd8f55904949da69cb662811ac4f8012e57c3218c5f870bd671298b747241458484d7a30abb5491c55072e111b65d2b07140655a1290062170 SHA512 c684e1b2de17bd8769e01afae68a20bbd360e166ec58206783077229a3a8f9e57ba9c0d94cc010168a4452b6a1c19a07d40a15d5ad1cd0ea8df7443bae62357c
+MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
new file mode 100644
index 000000000000..d2628095f7fb
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -0,0 +1,59 @@
+# 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}"/${P}-fix-usage-of-incompatible-minizip-data-structure.patch
+	"${FILESDIR}"/${P}-disable-failing-tests.patch
+)
+
+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/assimp/files/assimp-5.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
new file mode 100644
index 000000000000..3c423ac5107a
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
@@ -0,0 +1,52 @@
+From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 11 Mar 2022 11:24:13 +0100
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
+     aiMatrix4Scaling(&result_c, &scaling);
+     EXPECT_EQ(result_cpp, result_c);
+ }
+-
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
+-    // Use predetermined vectors to prevent running into division by zero.
+-    const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
+-    aiMatrix4x4::FromToMatrix(from, to, result_cpp);
+-    aiMatrix4FromTo(&result_c, &from, &to);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
+@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
+     EXPECT_EQ(result_cpp, result_c);
+ }
+ 
+-TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
+-    const auto qvec3 = random_unit_vec3();
+-    result_cpp = aiQuaternion(qvec3);
+-    aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
+     result_c = result_cpp = random_quat();
+     EXPECT_EQ(result_cpp == result_c,
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
+     EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+ 
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+-    EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+     EXPECT_NE( nullptr, aiGetBranchName() );
+ }
+-- 
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
new file mode 100644
index 000000000000..6d48161646ef
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
@@ -0,0 +1,24 @@
+From https://github.com/assimp/assimp/issues/4334#issue-1097591121
+From: Brecht Sanders (@brechtsanders)
+Date: Fri, 11 Mar 2022 10:01:15 +0100
+Subject: [PATCH] fix usage of incompatible minizip data structure
+
+Suggested-by: Brecht Sanders (@brechtsanders)
+Bug: https://github.com/assimp/assimp/issues/4334
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/code/Common/ZipArchiveIOSystem.cpp
++++ b/code/Common/ZipArchiveIOSystem.cpp
+@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
+     zlib_filefunc_def mapping;
+ 
+     mapping.zopen_file = (open_file_func)open;
++#ifdef ZOPENDISK64
+     mapping.zopendisk_file = (opendisk_file_func)opendisk;
++#endif
+     mapping.zread_file = (read_file_func)read;
+     mapping.zwrite_file = (write_file_func)write;
+     mapping.ztell_file = (tell_file_func)tell;
+-- 
+2.35.1
+
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 31a4d44a05c1..5525e184d20e 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<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>
 	<use>
 		<flag name="samples">Build viewer library</flag>
 	</use>
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index f85e3826aa17..4262da591c4e 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1,5 @@
 AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
+AUX ffmpeg5.patch 745 BLAKE2B f353faf80b4fdfb26b2d8a135ab0415ac3f6780a2b5894e18b12e137fb109b1b89b4c8500f8dc1e809d763f851ce186f199f32c680a80c816f40ece997639d0f SHA512 8eeeac40bbf4e1faf7a99d2cbfe4a7b3bc85b5b5927c7bf69ef774ad06fcedcb0a84296dce7300f4907b2ca16525e6db854acad371d788c7f5fb7bd4a94efc86
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.9-r1.ebuild 2861 BLAKE2B 2371dd722efc7383dc40556a4ce329dd356aef10abcc5324f0a4a76e1cddebaeb986910e827a3e9d53453415d5cca497f38724fcfa3d80196578d8eb383af1b7 SHA512 514544fd7835413ebcda7b08ca1c6b3757042878810e96899b622c28d95dbb3122ce4a7fb78b34d5159315ab0984630849f9c99053d3218406ebbfcde48c782b
+EBUILD aubio-0.4.9-r1.ebuild 2890 BLAKE2B 8092db7b899d9e2a58a17369c76d4e7549d1bf6fd0ad28ab26489c100750f6aff24a4656ae6f1c7d55a2f5f63f74b3d705d30eac5fe18c9628f7b9c3549c05ca SHA512 c71ed6f34b4df6aa3da741bf12791a39a8b48649bf138d7fed98f428e7c3f0cea177f5c86767e128851b1743b7e3aee81a1faf9a3601043e3871ebb9ab4b6c85
 MISC metadata.xml 347 BLAKE2B f7d98421cac20a208edfa27aa0f7cf90749ae2ccf6db3b2504b7fef79f305e5b3d42adf63848ead968a47491f394ddd20c7c9eba78134e72f849d83636cf4fe6 SHA512 f4ca8b9029523bbcb1e4541033555eadf40fb61024f224545d41ce33b5647a213ffe6f15f7d1a088d192a9d240dd621fda3eb78a8b4c2a53d0f2b925673acd23
diff --git a/media-libs/aubio/aubio-0.4.9-r1.ebuild b/media-libs/aubio/aubio-0.4.9-r1.ebuild
index 579361fe63c9..48d70ea69fd3 100644
--- a/media-libs/aubio/aubio-0.4.9-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r1.ebuild
@@ -51,6 +51,7 @@ PYTHON_SRC_DIR="${S}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.9-docdir.patch
+	"${FILESDIR}"/ffmpeg5.patch
 )
 
 src_prepare() {
diff --git a/media-libs/aubio/files/ffmpeg5.patch b/media-libs/aubio/files/ffmpeg5.patch
new file mode 100644
index 000000000000..e4901ad69c01
--- /dev/null
+++ b/media-libs/aubio/files/ffmpeg5.patch
@@ -0,0 +1,28 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+Date: Tue, 25 Jan 2022 18:30:27 +0100
+Subject: [PATCH 1/1] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec
+ > 59, thx @berolinux (closes gh-353)
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index e0ae93b5..1421bd9a 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -68,6 +68,10 @@
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ #endif
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#define FF_API_LAVF_AVCTX 1
++#endif
++
+ struct _aubio_source_avcodec_t {
+   uint_t hop_size;
+   uint_t samplerate;
+-- 
+2.11.0
+
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 5e1cb6bad44c..08e79d162b1c 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,4 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
 DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-EBUILD avidemux-core-2.7.6.ebuild 2625 BLAKE2B 034507126a57480094c4031333cfe896ab1379a22ad8504c1286b34d2249d16201901bbb399b91822bbc7a0a71ffaefa168ff35b835a4eecc15a763770cd1f8f SHA512 04f4c055ccaae76f817cd70fb3e960d65c8dcf133b63588b420e08c9b656601589932a409aa85cf2c7bc8e5705bcd329a03fd71e8830141320aa65b15daaba6f
 EBUILD avidemux-core-2.7.8.ebuild 2601 BLAKE2B fed7b31522c8ea68290615575351294e2b9fe624234012ef06da86d9cf2e9344bdd10d787b2090b45bacbae30f25651e868491063bc8ad749faa12a8a6b0a232 SHA512 9d128c8a2f3f5523ac6030dbb50899d9db92cde004246bc6df0b063851a879c09cff1c2e5f21234758bd6233c9b28c6a9ea3ef52d0e2e08761c88ab27c492284
-MISC metadata.xml 570 BLAKE2B a945ea7c008345a89000528bc0a1281976d069305607807025ea743463253684e6780c6a5afedda35509c53ad6d534161c7182fea6dbec96afdd94601bf69352 SHA512 84039ce63eb4e0aaee2f7df2200c0f72b3fcad7024d901369ca1eec132f2ada3dcffff3e5b2d200fddbb2fcac285ca6d5f142b74209d17144f17fa24de2bd011
+MISC metadata.xml 445 BLAKE2B e50f517d52c143a715503c3f235371a7e03de54e6eba1da6eac8101cdf28392247ed4fd80c2abc51639394c5883b9c123810597ac9499bba0760ed34ebb0013a SHA512 414df3edeaa635e37cbab1a7de5edb214f258e16f89bb32f5d820474017e54f2f3eab48929e505ea9fa8b6aca1f7e608cc558ca6147e605272c2fe644798597b
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
deleted file mode 100644
index 6f2b5d5eb4bf..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
-	nvenc? ( media-video/nvidia_video_sdk )
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0= )
-	vdpau? ( x11-libs/libvdpau:0 )
-	xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
-	!<media-libs/avidemux-core-${PV}
-	!<media-video/avidemux-${PV}
-	nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because
-		# it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove bundled ffmpeg."
-
-		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
-			buildCore/ffmpeg || die "${error}"
-		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
-			-i avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -e 's/include(admFFmpegBuild)//g' \
-			-i avidemux_core/CMakeLists.txt || die "${error}"
-	else
-		local ffmpeg_args=(
-			--cc=$(tc-getCC)
-			--cxx=$(tc-getCXX)
-			--ar=$(tc-getAR)
-			--nm=$(tc-getNM)
-			--ranlib=$(tc-getRANLIB)
-			"--optflags='${CFLAGS}'"
-		)
-
-		sed -i \
-			-e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
-			cmake/ffmpeg_configure.sh.cmake \
-			|| die
-	fi
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-	# Bug 768210
-	append-cxxflags -std=gnu++14
-
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DGETTEXT="$(usex nls)"
-		-DNVENC="$(usex nvenc)"
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 3e232c066cc7..b1eda22c6936 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Video project</name>
   </maintainer>
   <use>
-    <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
     <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
   </use>
   <upstream>
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 409ef74e4de3..e2299007fa41 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
 DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-EBUILD avidemux-plugins-2.7.6.ebuild 4219 BLAKE2B 3c898da7cfd15fc2aba0794656c88dce1bea1c785848100ca2ee4f9f59eb4a62d30793be332c8bb5aa7f696bb684f24e62529869996ef46998f1fa6c396f6884 SHA512 d3abc534168f7a84917e6c52cbef6dba3be04aaa949ba40895241b3671a2944bf623835a928559bcd96a0960f8ae131066e7e033674a04552c6e5719b089404c
 EBUILD avidemux-plugins-2.7.8.ebuild 4351 BLAKE2B 4d02669d0adc0a4889299ca0d49707bd155ed9505a45837184c9b9e5611f53cccc1d2dc4c170aba69f559bb34c29efa0b45b187830685ec25db1a513d2a0f06b SHA512 3a13e5986634be9cf3c9dca653d916f7184b99eef4144461e328ad86359607a6954db3d94bcfc316d921333e5df9e6edcd88b80c4aefd4d971fc8e787e7e6750
-MISC metadata.xml 1314 BLAKE2B 4e36f213edce809de307062cb13962b3ecd7ff2ba50a58519a31101ba3e782812f5801f1b8904a1d39c808ba19daf1229d39c91509f32968e3b406627d636b62 SHA512 0b5ff6a059fa1b37f989c50917f417bfabaf9fcc84a42e97c21db98ef583bec48e7bec9222a0985eb4a606328a3f67462e5f43b053affd8d76e23ff97edc31c7
+MISC metadata.xml 1189 BLAKE2B d60e5066b0c0febfd49970bcbaca17eb02c270c3b2c3d7a49a7f5c4993860c782f71f772c3dd13e955c69aaf16a69d8c2f8b03be29577e9e0378f278a566c8ff SHA512 5b2d3008aed214d6379876c7332fcf553282df62a1494d9d839c4737a221dd37f202f260f893dd5a2f955024f298657f7ba91827a348239b6b3fb7697c8fd41c
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
deleted file mode 100644
index 05c23cdcca6a..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	dev-lang/spidermonkey:0=
-	dev-libs/libxml2:2
-	media-libs/a52dec
-	media-libs/libass:0=
-	media-libs/libmad
-	media-libs/libmp4v2
-	media-libs/libpng:0=
-	virtual/libiconv
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dcaenc? ( media-sound/dcaenc )
-	dts? ( media-libs/libdca )
-	fdk? ( media-libs/fdk-aac:0= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi )
-	jack? (
-		virtual/jack
-		libsamplerate? ( media-libs/libsamplerate )
-	)
-	lame? ( media-sound/lame )
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:0= )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)
-	xvid? ( media-libs/xvid )
-"
-DEPEND="${COMMON_DEPEND}
-	oss? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
-
-src_prepare() {
-	default
-
-	# Don't reapply PATCHES during cmake_src_prepare
-	unset PATCHES
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
-	done
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-
-		local mycmakeargs=(
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			-DFAAC="$(usex aac)"
-			-DFAAD="$(usex aac)"
-			-DALSA="$(usex alsa)"
-			-DAFTEN="$(usex aften)"
-			-DDCAENC="$(usex dcaenc)"
-			-DFDK_AAC="$(usex fdk)"
-			-DOPENCORE_AMRWB="$(usex amr)"
-			-DOPENCORE_AMRNB="$(usex amr)"
-			-DLIBDCA="$(usex dts)"
-			-DFONTCONFIG="$(usex fontconfig)"
-			-DJACK="$(usex jack)"
-			-DLAME="$(usex lame)"
-			-DNVENC="$(usex nvenc)"
-			-DOPENGL="$(usex opengl)"
-			-DOPUS="$(usex opus)"
-			-DOSS="$(usex oss)"
-			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-			-DQT4=OFF
-			-DFREETYPE2="$(usex truetype)"
-			-DTWOLAME="$(usex twolame)"
-			-DX264="$(usex x264)"
-			-DX265="$(usex x265)"
-			-DXVIDEO="$(usex xv)"
-			-DXVID="$(usex xvid)"
-			-DVDPAU="$(usex vdpau)"
-			-DVORBIS="$(usex vorbis)"
-			-DLIBVORBIS="$(usex vorbis)"
-			-DVPXDEC="$(usex vpx)"
-			-DUSE_EXTERNAL_LIBA52=yes
-			-DUSE_EXTERNAL_LIBASS=yes
-			-DUSE_EXTERNAL_LIBMAD=yes
-			-DUSE_EXTERNAL_LIBMP4V2=yes
-		)
-
-		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
-		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_install
-	done
-}
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 8d0f32d4e20b..bfc77676349a 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support via <pkg>media-sound/dcaenc</pkg>.</flag>
     <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
-    <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
     <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 81f90a86b7d7..93a4340e5211 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,8 +1,6 @@
-DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
-DIST babl-0.1.86.tar.xz 299868 BLAKE2B 2189659ef5b3890bc78329808dcff5e7577a85c9728d54f848fa2f6ed085cea53deeaa734c600b1d73dcb5a8acd2f680800459c0a4c5b7dce61bc69a54ab9d3c SHA512 aff3b0069f7cdb515e6ace880500f4b89521062f9030ef452f0555b3cd993fffdd5f700c403a7be8e6758957073e7623360fc6ac41d86d5d31551c0fd0ff6048
 DIST babl-0.1.88.tar.xz 299972 BLAKE2B a22811196e306e3b846da63f361ecf792715d461cd8af85017af8dd353a406a38130f3e675214edc261557b6a0f6d3ed5586bfe7ecdf9b08ed5b8e7bc4aeb7f7 SHA512 1260133e44aa1878e13e2c64387e8540ca93edd7a905e2f8eebc58679444ba8815b9b6801b538a759c9b7b60294d7d7c33418bb1feee1879dcb8381450fe1742
-EBUILD babl-0.1.84.ebuild 1754 BLAKE2B df007b372ddcf5183259fb0cd84733dd6e199c876517a20c6befd0b771e04a4950a929282cb9e0d67246cdb7a521046ee22a9b7ac286ed73d50b5d23cb0e566f SHA512 874afe0607634738fd4ffef5a25df48c118d7a10f1e47919e085a3a2e34e38c9aeb21bac3af17c2b32e41cece3b9c4520395629d516574374319a7010a5a74a9
-EBUILD babl-0.1.86.ebuild 1765 BLAKE2B a3f06cca7426f8e7e2c434160d22add6d368d068191df0597c051f5c956d96ddec4bf1a86e1c75b77a2c2c23b4ba3ea043c64ee4ae4de01249265ad2c11d191c SHA512 241f433d0b28f96fa2daba465bd861e10d4e013e5e1f127a2507e6179e28e8b66a4cfc2282a2929234ee232a1a4b4ffbde34efbbfd7813f2a893d7f67e75d494
+DIST babl-0.1.90.tar.xz 309324 BLAKE2B 9fbbbe06539fd85007875e697529aa071d32a2d9e65f9750ceeb4a1f1ec1a3ac4a74dc40f932f7ff669bafdb1e9506df05414c7765f57b7d818901bffc55ccc2 SHA512 c0eac3c7d5eb328de2f97ccc9743bc2f78d79c23dc4d3465e979d98827b1643a0f2a257f0445e4acd09f15a9f95c79f67d09cb18c2c94b4f3d290944a0341e3c
 EBUILD babl-0.1.88.ebuild 1761 BLAKE2B 5a2bdf88fb83178a3e64ac744d2c8c87d2ef1d7496c7cb35fab80de297be56b60445e282f0cce2188000517f1f63b6b118c8d9ea7f1cf4fa7e32a50c5118cb22 SHA512 96aac9e6aef6489543f7cc1d287efd7e2e98f8ee3139cc96c354c13f976693ae8e53db1716f4cc13db6e183f257c53e57c097293b93d0ddcb5074650bf9d0360
-EBUILD babl-9999.ebuild 1765 BLAKE2B a3f06cca7426f8e7e2c434160d22add6d368d068191df0597c051f5c956d96ddec4bf1a86e1c75b77a2c2c23b4ba3ea043c64ee4ae4de01249265ad2c11d191c SHA512 241f433d0b28f96fa2daba465bd861e10d4e013e5e1f127a2507e6179e28e8b66a4cfc2282a2929234ee232a1a4b4ffbde34efbbfd7813f2a893d7f67e75d494
+EBUILD babl-0.1.90-r1.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
+EBUILD babl-9999.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.84.ebuild b/media-libs/babl/babl-0.1.84.ebuild
deleted file mode 100644
index 721b1da802da..000000000000
--- a/media-libs/babl/babl-0.1.84.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="https://gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-REQUIRED_USE="vala? ( introspection )"
-
-BDEPEND="
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-RDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	local emesonargs=(
-		-Dwith-docs=false
-		$(meson_use introspection enable-gir)
-		$(meson_use lcms with-lcms)
-		$(meson_use vala enable-vapi)
-		$(meson_use cpu_flags_x86_avx2 enable-avx2)
-		$(meson_use cpu_flags_x86_f16c enable-f16c)
-		$(meson_use cpu_flags_x86_mmx enable-mmx)
-		$(meson_use cpu_flags_x86_sse enable-sse)
-		$(meson_use cpu_flags_x86_sse2 enable-sse2)
-		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/babl/babl-0.1.86.ebuild b/media-libs/babl/babl-0.1.90-r1.ebuild
index 4efedaf83c70..9c019093af42 100644
--- a/media-libs/babl/babl-0.1.86.ebuild
+++ b/media-libs/babl/babl-0.1.90-r1.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
 
 VALA_USE_DEPEND=vapigen
 
@@ -37,10 +37,11 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	gnome2_environment_reset
-	use vala && vala_src_prepare
 }
 
 src_configure() {
+	use vala && vala_setup
+
 	# Automagic rsvg support is just for website generation we do not call,
 	#     so we don't need to fix it
 	# w3m is used for dist target thus no issue for us that it is automagically
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 4efedaf83c70..9c019093af42 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-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
 
 VALA_USE_DEPEND=vapigen
 
@@ -37,10 +37,11 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	gnome2_environment_reset
-	use vala && vala_src_prepare
 }
 
 src_configure() {
+	use vala && vala_setup
+
 	# Automagic rsvg support is just for website generation we do not call,
 	#     so we don't need to fix it
 	# w3m is used for dist target thus no issue for us that it is automagically
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index ecf85b0710b7..840c1a55eb74 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,4 +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.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-r1.ebuild
new file mode 100644
index 000000000000..41f811d616ad
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GTEST_VERSION="1.10.0"
+GTEST_DIR_VERSION="1.10.x"
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
+HOMEPAGE="https://acoustid.org/chromaprint"
+SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test tools"
+RESTRICT="!test? ( test )"
+
+# Default to fftw to avoid awkward circular dependency w/ ffmpeg
+# See bug #833821 for an example
+RDEPEND="tools? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+	!tools? ( sci-libs/fftw:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+DOCS=( NEWS.txt README.md )
+
+multilib_src_configure() {
+	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+
+		-DFFT_LIB=$(usex tools 'avfft' 'fftw3')
+
+		$(usev 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)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cd tests && (./all_tests || die "Tests failed")
+}
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index b77b1ed54c52..7529b84150bf 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
-EBUILD clutter-gst-3.0.27-r1.ebuild 1416 BLAKE2B 8f0fed41f60021befde95b344167ae3504aca575e878c4e3738a45e53865bffe08662b5d5717d614bcdf9301612acec7d29ddfa8d2e4b9dfe7ff14587e30a8d8 SHA512 1cf5dff3cb3eac6f009b0be7dd4577b1c47b168cd355021293e70c439672737d63952b38e7d10b8d6bdf2a899ddbe90b088d6c5b2aadd05e967c6deb339ca794
+EBUILD clutter-gst-3.0.27-r1.ebuild 1439 BLAKE2B 5d32b0b52a270b73a7070bdadb84711ca75ffb78b802cac23f012645fb394c6ee44df804f0391c34e585fb4186856a6b82e6095e47577b6fe6f4344f2150424a SHA512 0d66197c99965ff613531baac0c551093ea5e4f448d226bf890689ce60c873d840d260e15fc5603e1fb0197dd49fb764a763e453a551df029c23a3e2d49cd2f4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
index 96cea1483431..6ee1ebd7c805 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
@@ -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
@@ -49,7 +49,8 @@ src_install() {
 	gnome2_src_install
 
 	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins examples/{*.c,*.png,README}
+		docinto examples
+		dodoc examples/{*.c,*.png,README}
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest
index 25fa3aec1f2e..344208760ed9 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gtk-1.8.4.tar.xz 331508 BLAKE2B 4e21b361fb0ebf8e322601e3a9f148125cb489cb6e14a963ee6e7fbf845556dd37fc1fedc89e8288d24bca559afe079cb7efe65c7be5c59c59b21461cf38834a SHA512 810f879a56cd71f1e9c4678ef704a997ee652d052cfea56b3ed9478f7a813a35dd2fdcded028ce17411ae02da52fa31e0fb8d1f4130c7b9f6d25eeb774b51ada
-EBUILD clutter-gtk-1.8.4.ebuild 1068 BLAKE2B 99187fca8bb829a666d57020ebe78c87808b2e4f5010318b66dc0465b970f3dc3bac1a83b71f2e37ecdd107e6006d7e09478d9910e949753478c6bf5bce9bdf5 SHA512 9242243d3e168bc93e6666e350a9bb84f5546f69b0ed2bd929ee6996bf2c2b437de5ea002dd42ac297e2ded49a1039f6e8abb7d651138a132d21ba923a97a875
+EBUILD clutter-gtk-1.8.4.ebuild 1093 BLAKE2B 7326b3913adf4d96770ba21390220e4f9c6ca550c2c444b578ffe89640fabcba196f1d16035b1df596352ecd0785505dcc56ac86cbb400023d4b69477cf6fca5 SHA512 726106636ab98ba63960c8c4e88c4b651a567f2869d33ba0e78b91f8183debdacc68b9cf1c4ec95ecfb71aff65f05973b99352b3d60ca374c227ccbcd7258433
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
index 315031d22747..7d499e79ff98 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.8.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
@@ -38,7 +38,8 @@ src_install() {
 	gnome2_src_install
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,redhand.png}
+		docinto examples
+		dodoc examples/{*.c,redhand.png}
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index f669bbcb2824..d33dc1029300 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,3 +1,4 @@
+AUX codec2-1.0.3-fix-build-with-Os.patch 937 BLAKE2B c0f0ca07e4dffdf6adf93507c296a729c5fad2572e7672c080e51944dd0faa48701486b741f8be760ee35aa6a5beb5f83bb98b598cfa1e895cb01d1320eea92f SHA512 dbb5ceb346a4ef5f9d7eedab6d5c58f4f83124c194cbca9413dde202eeda41d68cf583efa8229538c548f9a6a966fe03798dc6dac4ef8d23a1aeb58c49554471
 DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
-EBUILD codec2-1.0.3.ebuild 1071 BLAKE2B 5915392ef5bcdc4c6f2b6f531ba7c5de5aa3a81c688a74fabafca43a3bdb0162f39130b59bc364ab3b15f0f22f6b8f40008da5ab25824f462db3b74471b0c852 SHA512 9838e593c31a283a23fdd3ebb82e8dcb0dc21cf5c689974a0fb6b2a7b02ff528d98c6cbf277eb604dc474d96ec2cb3af30b1286be2227e037e0130598a2f778f
+EBUILD codec2-1.0.3.ebuild 1076 BLAKE2B fe3df169eb9d6ed3810294d98ac94a453f66cb7357d731d3ed7af8d2f5bfe3210f5c06199abba2e369c35c34c9985232de05cc6fb504ed54bc912bda187b420d SHA512 7a42bc69ce7f708e8112031895f6d541dadd68a8bddd33ebdfe996e26d9b2a3b9f4cc1756223dd5777e97e87d01f014519fda335e33aee3d3e85d56480034725
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.3.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
index 3f50389d58e9..e9d3f48e1237 100644
--- a/media-libs/codec2/codec2-1.0.3.ebuild
+++ b/media-libs/codec2/codec2-1.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
+inherit cmake-multilib
 
 MY_PV="${PV%.*}${PV##*.}"
 DESCRIPTION="Low bit rate speech codec"
@@ -24,10 +24,11 @@ RESTRICT="test"
 
 #BDEPEND="test? ( sci-mathematics/octave )"
 
-multilib_src_configure() {
-	# bug #817437
-	replace-flags -Os -O2
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-with-Os.patch
+)
 
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DUNITTEST=$(usex test)
 		-DINSTALL_EXAMPLES=$(usex examples)
diff --git a/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
new file mode 100644
index 000000000000..4f3f30661421
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
@@ -0,0 +1,19 @@
+https://github.com/drowe67/codec2/commit/a8d4226859548ceb050619160af562e0b43bb05c
+https://github.com/drowe67/codec2/issues/293#issuecomment-1025665342
+
+From: drowe67 <david@rowetel.com>
+Date: Tue, 1 Feb 2022 07:20:50 +1030
+Subject: [PATCH] change required to build with -Os
+
+--- a/src/cohpsk.c
++++ b/src/cohpsk.c
+@@ -816,7 +816,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
+ 
+ \*---------------------------------------------------------------------------*/
+ 
+-inline void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
++inline extern void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
+ {
+     int c,i,j,k,l;
+     int n=COHPSK_M/P;
+
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 2a6d88bbc794..ff32de099a97 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,4 +1,4 @@
 AUX cogl-1.22.8-slibtool.patch 835 BLAKE2B d0bc0215d785be2b8fbae5afc23b50dc79adc77bb4a1c8e8dcef0104febfad397ddab94f9afe811b9765cd9c829bab4d5282ae95e5f32aaea3ec4e6c2649a651 SHA512 a0478481712f2481f08bcdd2c0feb87c2c1a45fe0e0e37aa00bdeed54ca5376d0dbeafe8b21d9ea28bb326025ccfaefa956683b779cf19f2bfc8524f7b962c97
 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
-EBUILD cogl-1.22.8-r1.ebuild 3468 BLAKE2B 5aeca1d5c5d773f434de3c7d68414c7eaf3299ee68471bbeae75e15f6ee70ef8b4c7269ca66b5ad997f539329758a11bc60ecd4bfa62e6b8904fe33fe28766b2 SHA512 494874708f053e831e3543c6b121a4792845bb0319a4cb3f9d4d2f74991add7aa4bdd2e2250c9020ae0a467fbcac8657712d0af9a10d553d5f6393ad5c25dc2b
+EBUILD cogl-1.22.8-r1.ebuild 3493 BLAKE2B a1749b36dd318e5bad5044328589112e9e2cd2d5d11c8347bdbd3b22c5f778a2482a811a8114ef4585eff87085969e78f807a504165567824c92d96133fe83ff SHA512 c144d309da57c14c47ea8c15ec8eb9cb531bba95a72043cd36d17769905bc31e60196d5b3b9c1b99c85eb75f1dfa0d5b2f0b7d6237f9c25c3a784f5d9d672a40
 MISC metadata.xml 458 BLAKE2B f10413fbb937bfca31271bfb5e1077125fcab9dc3887224f40d65099c715a5d5a5f40d733749cc096df530c431655c4ecaf94584e0529f9379d7e44482876b9a SHA512 8b332175235249193619499150eb4c714e7ebdb9de9685ca60d8dfdcf73940f36067e5864d0cc328b89abf9a138cd52ac0a77d21d9f9d06a524267199669e32e
diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r1.ebuild
index 037d055dd7dd..a5e772c9b85e 100644
--- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -114,8 +114,9 @@ src_configure() {
 
 src_install() {
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,*.jpg}
+		docinto examples
+		dodoc examples/{*.c,*.jpg}
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	gnome2_src_install
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index fb58b780fd5b..d2794cd30eda 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -8,6 +8,6 @@ EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f60
 EBUILD dav1d-0.8.2.ebuild 1385 BLAKE2B 07afc7effebb6a91327be86b1373ef96a7128c085b60d50a31872b9562393b907a462e4ca224a5bda8a321797f01d6e591aac1b1a441dbf74ad67d3fcc8c1f2e SHA512 fdb3117cdc548992547914ce24fb357eb114f5e4df3615ce481426fc88cfb833426da4308e9b00c83d1272aed071b13e6ccfc698d9325c2eb6e3bc45e98e8b17
 EBUILD dav1d-0.9.0.ebuild 1398 BLAKE2B ba98a74ef08264dd06f10530c26abd743520b80de2249227314b5353afdc2faf67844c4aa8ab4f8e8380f6e2f4a23b5f20f318c1e98bb14d54f91d5d9e38bfa1 SHA512 275f5ab2201789b78c7660779f45e302812fcc65dabd3066aced0dd7aad5aaafc4f95d995674991fbe03f1699f4946498c1460bc218938b81b9de5c7f3a435b7
 EBUILD dav1d-0.9.1.ebuild 1392 BLAKE2B 7b4b06cc144b9854810e59cab5960f21073447ff8ccdc27cd41ea30d59dce505e69639fc5064875352bd2830482a6383758c1ebdedd6cf81cd15691f4ed4690d SHA512 ed2af7eaec02836bc2f63e5ab919162b04b909293e3a335e6f4f084f9fb8a8c657a48e623d127d99874f99615f0e24cbf67723df96a73a591f16f8beef5c683f
-EBUILD dav1d-0.9.2.ebuild 1398 BLAKE2B d54719b00936810c0560ef963804520768a59fad9f3d672bf3956a29f8cad5ffafa7dd632b15c8667717948df0fcad74b81c5563361309e8c13d80520ad117a8 SHA512 3ad58f695222cb49d4787b9b25345bb677a15b431f622fce6264ac9a529cca756b4d837c6a9c8f29946d807f68865790dfc9e569e25133ff33208777f4bb8750
+EBUILD dav1d-0.9.2.ebuild 1392 BLAKE2B bfc3a4e00ab29a8492a714e27ae9577ef5fa0963dbf041eea653a007d4fee4121cfa9c74279084ec1e83292d25ca3ade0cb4bf17ae1bbf49aee781a2af1dd26e SHA512 50521384c4d9d2a54f011e64a0ec9605bcbae244da3408c71c77cfc21633816e1573f4035e8d38565ef624fd136519475ef95c69e7abc7fd6ea1e377e921173d
 EBUILD dav1d-9999.ebuild 1315 BLAKE2B d0b8b18c1305696de2db882c054ff3913f4d5733d8d267ce8eb25be5cfd2c2cc5d79c2ceafb5c2209203a72705dbc65488fcf34641f5cc961c8ffe3e25228794 SHA512 9bd5fd0589832f0738c76a55a1815bde76a99b30489d0c4598bf3b7c0f5557d7a05bf1d4596fa976729bd22e7fdef3f9d4012240a94d8178f282884162a89dd5
 MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-0.9.2.ebuild b/media-libs/dav1d/dav1d-0.9.2.ebuild
index fb91a0e8cc7d..7328056c980b 100644
--- a/media-libs/dav1d/dav1d-0.9.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit ${SCM} meson-multilib
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 6bbe0969dd14..219c859f696e 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -7,4 +7,5 @@ AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4a
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
 EBUILD devil-1.7.8-r2.ebuild 2142 BLAKE2B d9ef2e6223ea2de918726a6f73f6cb342aea5a092be8a2e0ead630bcf0ef31af3f6ef79ef043c0e9eca2b8701d9ce2462b801bb8405acc92f0c6aacfc1dab14a SHA512 0539a865a64ffc14e0afec959e28277c81bd83f1c4e31155bd43b24429000e983e839e71c8b8639b2145ee374d94ec2c0501b9752b9bb01483c87d5f910331e4
+EBUILD devil-1.7.8-r3.ebuild 2160 BLAKE2B 570703c1faf8fb03c0b112e36b7246cdbdfd3e7bdb6257c5e7470bfbb855b8871687e35455c0305127fe52a9c02ed4429eb2aab7cb65d3591d80935afe8f462d SHA512 91b32333c10c9dc2e35018660d1165b88e2a3d236806d8ccc4bc9cbfaf04295147aa993db6675fbf632123be4dac4d76005deb9a4d8267cb2a92b1b50c716b83
 MISC metadata.xml 500 BLAKE2B ea23c56af001f0fc76e8f5a1e718a7fe7f011139bed10081f9a1b220b82f43da353722fe3e6a80fa8de7162d7c55da109617df50f428a0b973ddf1bfe27158d5 SHA512 7902a135b51029e4cf8fe5f9baf5e38250d5e471d820b98b9440a0be72c90902694b89e8d32de1d8e595384642ade6a7435aeba85c928e6d3f4cacde72925dc6
diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r3.ebuild
new file mode 100644
index 000000000000..113a199ada8a
--- /dev/null
+++ b/media-libs/devil/devil-1.7.8-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P=DevIL-${PV}
+
+DESCRIPTION="DevIL image library"
+HOMEPAGE="http://openil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt opengl png sdl static-libs tiff X xpm"
+
+# OpenEXR support dropped b/c no support for OpenEXR 3
+# See bug #833833
+RDEPEND="
+	allegro? ( media-libs/allegro:0 )
+	gif? ( media-libs/giflib:= )
+	glut? ( media-libs/freeglut )
+	jpeg? ( virtual/jpeg:0 )
+	mng? ( media-libs/libmng:= )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	opengl? ( virtual/opengl
+		virtual/glu )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	tiff? ( media-libs/tiff:0 )
+	X? ( x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrender )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-CVE-2009-3994.patch
+	"${FILESDIR}/${P}"-libpng14.patch
+	"${FILESDIR}/${P}"-nvtt-glut.patch
+	"${FILESDIR}/${P}"-ILUT.patch
+	"${FILESDIR}/${P}"-restrict.patch
+	"${FILESDIR}/${P}"-fix-test.patch
+	"${FILESDIR}/${P}"-jasper-remove-uchar.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-lcms \
+		--enable-ILU \
+		--enable-ILUT \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		--disable-exr \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		--enable-jp2 \
+		$(use_enable mng) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable xpm) \
+		$(use_enable allegro) \
+		--disable-directx8 \
+		--disable-directx9 \
+		$(use_enable opengl) \
+		$(use_enable sdl) \
+		$(use_enable X x11) \
+		$(use_enable X shm) \
+		$(use_enable X render) \
+		$(use_enable glut) \
+		$(use_with X x) \
+		$(use_with nvtt)
+}
+
+src_install() {
+	default
+
+	# Package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index b8d7ef08927e..19dedc764bdd 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,5 +1,7 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
 DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
-EBUILD embree-3.13.0-r2.ebuild 3671 BLAKE2B f9833656184addff84fcd49024e8ad82bbb871de8ae5b82a19bf1baf9b2cdbb871b13f8919e6046f3aaaa043aabe8867b8ba17ab121c4b3cf1fc9aafe1b28428 SHA512 a5e7a50b44142baafadfd5157fb6af32a6e702688efa9ea72aa1c8c36fdbc8bf752cb9105d9e2e9f696ae6e8aa833f2a78c47e663d60821dd34e2c05acdb6c8a
-EBUILD embree-3.13.2.ebuild 3775 BLAKE2B ecfd7e1629e2250ac08d4e597e75c2edf9ff32f27180d9108907a31e4915a784b3d5a37f7818304ad205ca1aede6a73792c84ac1391b31a2735c4e13c752efe8 SHA512 edbefc1ee4277f3cf8f2dbb26f5740ae634cfe01b84bc65073b62bbd74df49789e134dd8d76c2e2ee85f7256bb935bce8168840c42b5019b25eaacdecadfdf9c
+DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd
+EBUILD embree-3.13.0-r2.ebuild 3632 BLAKE2B f444cb044ee4ccf93e943c7407d3c03c792ab45dbe7b29c985438de9686ee56d9885541b97eeab9fa1e8bda3c1966a7a8aa0b7f9149ed85963cfb227396920e8 SHA512 72ee5506cc0e7e4b834bc5952cce2627d07c545d380f94e41084db1646191b6ce10821c136f6d3efdd5bc0bfca9fe08831b0716b5b077bd0b5a826f33a7e76d7
+EBUILD embree-3.13.2.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
+EBUILD embree-3.13.3.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild
index 136ad000762f..f72392a0812c 100644
--- a/media-libs/embree/embree-3.13.0-r2.ebuild
+++ b/media-libs/embree/embree-3.13.0-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
 CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
 RESTRICT="mirror"
 
 BDEPEND="
@@ -56,13 +56,13 @@ src_prepare() {
 src_configure() {
 	# NOTE: You can make embree accept custom CXXFLAGS by turning off
 	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
-	# any "march" compile flags. This is because embree builds modules for the
+	# any "m*" compile flags. This is because embree builds modules for the
 	# different supported ISAs and picks the correct one at runtime.
-	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
 	# and it fails to link properly.
 	# https://github.com/embree/embree/issues/115
 
-	filter-flags -march=*
+	filter-flags -m*
 
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
@@ -93,7 +93,7 @@ src_configure() {
 		-DEMBREE_RAY_MASK=$(usex raymask)
 		-DEMBREE_RAY_PACKETS=ON				# default
 		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STATIC_LIB=OFF
 		-DEMBREE_STAT_COUNTERS=OFF
 		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
 		-DEMBREE_TUTORIALS=$(usex tutorial) )
diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild
index 94efef93e9b9..40002cff3ac1 100644
--- a/media-libs/embree/embree-3.13.2.ebuild
+++ b/media-libs/embree/embree-3.13.2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
 CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
 # Let's be explicit here even though we could simplify it.
 REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
 
@@ -56,13 +56,13 @@ src_prepare() {
 src_configure() {
 	# NOTE: You can make embree accept custom CXXFLAGS by turning off
 	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
-	# any "march" compile flags. This is because embree builds modules for the
+	# any "m*" compile flags. This is because embree builds modules for the
 	# different supported ISAs and picks the correct one at runtime.
-	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
 	# and it fails to link properly.
 	# https://github.com/embree/embree/issues/115
 
-	filter-flags -march=*
+	filter-flags -m*
 
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
@@ -111,7 +111,7 @@ src_configure() {
 		# default
 		-DEMBREE_RAY_PACKETS=ON
 		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STATIC_LIB=OFF
 		-DEMBREE_STAT_COUNTERS=OFF
 		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
 		-DEMBREE_TUTORIALS=$(usex tutorial))
diff --git a/media-libs/embree/embree-3.13.3.ebuild b/media-libs/embree/embree-3.13.3.ebuild
new file mode 100644
index 000000000000..40002cff3ac1
--- /dev/null
+++ b/media-libs/embree/embree-3.13.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="mirror"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+	tutorial? (
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+		virtual/jpeg:0
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# default
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# default
+		-DEMBREE_FILTER_FUNCTION=ON
+		# default
+		-DEMBREE_GEOMETRY_CURVE=ON
+		# default
+		-DEMBREE_GEOMETRY_GRID=ON
+		# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON
+		# default
+		-DEMBREE_GEOMETRY_POINT=ON
+		# default
+		-DEMBREE_GEOMETRY_QUAD=ON
+		# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON
+		# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON
+		# default
+		-DEMBREE_GEOMETRY_USER=ON
+		# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		# default
+		-DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+		# default
+		-DEMBREE_RAY_PACKETS=ON
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial))
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_ISPC_ADDRESSING:STRING="64"
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/esdl/Manifest b/media-libs/esdl/Manifest
index 9fc2fce0496d..20fde4b04cc1 100644
--- a/media-libs/esdl/Manifest
+++ b/media-libs/esdl/Manifest
@@ -1,3 +1,3 @@
 DIST esdl-1.3.1.src.tgz 308475 BLAKE2B 258d4c774ee56cf1c4afbb1f0a712cd42a1ca5742c7dde6c03b3f297351d3c3cda918491ad58338551450fb68ea29da04477c4057cebb7ffa81b9bba25a918b7 SHA512 66e8f69fa29fc0400f58dfa892656e00536a481a3dc364b9b295aee98818ff325f6475a009287352520ef428941e866b46e6f0267a7df184831c87b9304d385d
-EBUILD esdl-1.3.1.ebuild 794 BLAKE2B 9d962e2cf6c3999bc2a68dd925a06cccc4837d88a09aa23c202c8362f3047a8889d8df4d65903a15ab72b34e149f96c5ac9a60684244a720197c2e5dd5991825 SHA512 a0b0202281d4297d15f33543de35db11a460956e33cecfe7bce75bd30043aad3e4c5c67f3b83278b7a43225f3c7d97203a30f8e4e53f3ebc038d80389f0c3063
+EBUILD esdl-1.3.1.ebuild 786 BLAKE2B 26d87f93e0eac4edf4be6177656aa9dcdba75c4b5ac936c8e7cedc244c1ddcf907bb3d7c79000d9330c8bf83c0572b61dbc15cb415d24fbf71a2df3421d8ffd2 SHA512 8f1c420ca6f69935f68b3a8cd34fa6bda586025c42955e26f4807fc5aeaae93cb21ad3d6a3fea8c4023fb2ecd3e591c4e933464009ff17848c86726dbbccf9af
 MISC metadata.xml 570 BLAKE2B 514b7669ab11a0bf7cbb1793992d8f463e1cb112f4ec2f152eb4bb1bf0c306213bf0b0b417bbb9ec30b38451440bda9816433adadaaeca25892a36309a9cac0b SHA512 a1ef49f9869e3fedaf81feb8f4d13c7238205d829a6c31ce8d0d1c9f3d051d4c3a1c9a9f230302e05294331ec2cbf148bf56a4d56a710e4d942879bdd428a06c
diff --git a/media-libs/esdl/esdl-1.3.1.ebuild b/media-libs/esdl/esdl-1.3.1.ebuild
index 39c668074613..9f7a826ca320 100644
--- a/media-libs/esdl/esdl-1.3.1.ebuild
+++ b/media-libs/esdl/esdl-1.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fixheadtails multilib
+
+inherit fixheadtails
 
 DESCRIPTION="Erlang bindings for the SDL library"
 HOMEPAGE="http://esdl.sourceforge.net/"
diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
new file mode 100644
index 000000000000..1eff52b17475
--- /dev/null
+++ b/media-libs/fcft/Manifest
@@ -0,0 +1,5 @@
+DIST fcft-3.0.0.tar.gz 441458 BLAKE2B 9ff83691435953285f1b3f8b51dac7b17453a457eeb910f035e39c6fa3bb39098d3adbb7179f734261a4034e9ea8b034dd03a20ba0c364b7de2efe9b781dfdaa SHA512 fbf7ac7d777bdb530b90b79a0bd8b90d3f7ae8b099c2733304dbe89fbcc1a1a3493d1eac0478bcdee291d8c804da21461737fc3e34164637e86ff737023622b1
+DIST fcft-3.0.1.tar.gz 441493 BLAKE2B 79fe864edf04b21fe88fa167e3390836e5c7254710082312068ff4c39624508e086f4eed2ea5706b52421b2276a6f2d1f2211ff0b256112d989764e667c44fe2 SHA512 856bec504a253678a2962c0a7c5029e5fd3d26e305ca3fcae8d9df398bcc84a03e9d67522673d1f1bb0ec91606c0627d6ab4bf2780cbb5965a01c91e6f0aac89
+EBUILD fcft-3.0.0.ebuild 1923 BLAKE2B fd4c2103f14439e1f6efa03950724995e1a3b15847e42bea11e067d02ed98234f122071ca101c96fe5fcc3aeb41e851244355f847b7f61a450bf403033daead7 SHA512 35a61954dcb546d9cf90277e1e835133a72680d6cbcf2e6601b70eb4510943d6946c744e4bade1bb2e1fd20c0f09dca6fa01369771214c8ae44c968c040a932f
+EBUILD fcft-3.0.1.ebuild 1930 BLAKE2B 13d1c5b14964a7abb19d9951511753ebf61fe6dc868189e2a9a1fb9c690674d1b2664748e7b572de5d6230eca06eb66b57bf0f725a73a91705f8f3d71b0f9d0b SHA512 0a9b5eb6c76a1571a94ff256a58644b1595f7b00b87df6969681c5d6ccaf7cb64bf76a8a9446ff9223c973b8947e92a79c13ae134a882eac951bca0c882dc6b2
+MISC metadata.xml 631 BLAKE2B 464952a9c2b5959cbcb732323c54d57c4e67cb65efe87b4fe63b8369568531b0c6a0988990ea1756ee6012f81e6226600d638f2008fcdf452da36adeb5e204c0 SHA512 c2d704df7eeb25403bdbb7bd39c58c20d3c95dcf1c00051b8b558389344f9176fd4027349337ac7bb29249feefc997d0ef38e4ddc611d13a0c04a7880c048164
diff --git a/media-libs/fcft/fcft-3.0.0.ebuild b/media-libs/fcft/fcft-3.0.0.ebuild
new file mode 100644
index 000000000000..27380210cb01
--- /dev/null
+++ b/media-libs/fcft/fcft-3.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+	libutf8proc? ( harfbuzz )
+	examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/pixman
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+	harfbuzz? (
+		media-libs/harfbuzz:=
+	)
+	libutf8proc? (
+		dev-libs/libutf8proc:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-i18n/unicode-data
+	dev-libs/tllist
+	examples? (
+		dev-libs/wayland-protocols
+	)
+	test? (
+		dev-libs/check
+		harfbuzz? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/scdoc
+	examples? (
+		dev-util/wayland-scanner
+	)
+"
+
+src_prepare() {
+	default
+
+	rm -r unicode || die "Failed removing vendored unicode-data"
+
+	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+		meson.build || die "Failed changing UnicodeData.txt to system's copy"
+	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+		meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature harfbuzz grapheme-shaping)
+		$(meson_feature libutf8proc run-shaping)
+		$(meson_use examples)
+		$(use test && meson_use harfbuzz test-text-shaping)
+		-Ddocs=enabled
+		-Dwerror=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md )
+	meson_src_install
+
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/fcft-3.0.1.ebuild b/media-libs/fcft/fcft-3.0.1.ebuild
new file mode 100644
index 000000000000..f09d1c8f6801
--- /dev/null
+++ b/media-libs/fcft/fcft-3.0.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+	libutf8proc? ( harfbuzz )
+	examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/pixman
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+	harfbuzz? (
+		media-libs/harfbuzz:=
+	)
+	libutf8proc? (
+		dev-libs/libutf8proc:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-i18n/unicode-data
+	dev-libs/tllist
+	examples? (
+		dev-libs/wayland-protocols
+	)
+	test? (
+		dev-libs/check
+		harfbuzz? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/scdoc
+	examples? (
+		dev-util/wayland-scanner
+	)
+"
+
+src_prepare() {
+	default
+
+	rm -r unicode || die "Failed removing vendored unicode-data"
+
+	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+		meson.build || die "Failed changing UnicodeData.txt to system's copy"
+	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+		meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature harfbuzz grapheme-shaping)
+		$(meson_feature libutf8proc run-shaping)
+		$(meson_use examples)
+		$(use test && meson_use harfbuzz test-text-shaping)
+		-Ddocs=enabled
+		-Dwerror=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md )
+	meson_src_install
+
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/metadata.xml b/media-libs/fcft/metadata.xml
new file mode 100644
index 000000000000..f209916337f0
--- /dev/null
+++ b/media-libs/fcft/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for grapheme
+			and run shaping</flag>
+		<flag name="libutf8proc">Use <pkg>media-libs/harfbuzz</pkg> and
+		<pkg>dev-libs/libutf8proc</pkg> for run shaping</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index d73c6d344dd2..4459cb79a40d 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,4 +1,3 @@
-AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
-DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.3-r1.ebuild 1636 BLAKE2B b589a9d43988a86bbf7432f3fd326e0068d95e56df80f217e67be518cb105f4dcd3a5e29471bb27c6cb5b6c4fdb07ebc5c198ad5c2cc51670467532ce0c1f86c SHA512 5e98b0c53c9c18584b5de9737d44626b5c6c01af99d43f5937a4195c7c11973578859ced3d56e914119b668ce5c3e763a95fb5ec43e110b1d4e2d88be7533848
+DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
+EBUILD flac-1.3.4.ebuild 1557 BLAKE2B 4faef3d38c8d122351f2226045f1791e5b7313a40b20e4d0c3d56770a7042630ca861a90ff8eab3e4026f32fe1522f87df714481ba97871d06eb870b86332d96 SHA512 c7c81964103b03aebaf3de424e4772af2c02ac65b38f2011b319baec9380a699491dfe5806070f14bfa199710f9d4ad4f373e1542ec85fda45183abb04f3f146
 MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
diff --git a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
deleted file mode 100644
index bcad809374e3..000000000000
--- a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/flac/decode.c b/src/flac/decode.c
-index c26d3f60..bd3f6524 100644
---- a/src/flac/decode.c
-+++ b/src/flac/decode.c
-@@ -1307,7 +1307,7 @@ void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMet
- 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
- 		FLAC__uint64 skip, until;
- 		decoder_session->got_stream_info = true;
--		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
-+		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) != 0;
- 		decoder_session->bps = metadata->data.stream_info.bits_per_sample;
- 		decoder_session->channels = metadata->data.stream_info.channels;
- 		decoder_session->sample_rate = metadata->data.stream_info.sample_rate;
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.4.ebuild
index 6dfe898f30c5..14e1d3cdc10a 100644
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ b/media-libs/flac/flac-1.3.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
 
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
+RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils
@@ -22,8 +22,6 @@ BDEPEND="
 	virtual/pkgconfig
 	abi_x86_32? ( dev-lang/nasm )"
 
-PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
-
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-doxygen-docs
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 66b72ef3d5b8..d4cc57e9a45f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,6 +6,6 @@ AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98f
 AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
-EBUILD fontconfig-2.13.1-r2.ebuild 5607 BLAKE2B 4722f100c1c0f4d1c476bf434695ada405ce4d31b3936a5f8bc3d3db61896b413bdf1d8c9eef15a3753f3d396abc5fcf94af0bd723cc4820cfeefef0a8ac8d07 SHA512 77cd364bbc0b8c1ef7fe6d792d2c089350b0b46470f2342fac36a2009d3c22f891385ac15a0d7fc274c03afe3be1437146751ec68f3979db75cc7ba351ed3f7d
-EBUILD fontconfig-2.13.93.ebuild 5832 BLAKE2B 277d6ebe2e2481cacf7e3b4a513899b4bdd65aec0f2db1353c169eb3e46060fc4d6f3493ca36c642b68693ade6aac0d107e15b4f044e72941ae957a78e00bc51 SHA512 4d09dc19f73128bfdd66bf14ff643f78c4c2d777cc526c2817dbc1905cea66194ad5465603794061e1a0c11f98933b14da0274b1c78d0c12523753f096280344
+EBUILD fontconfig-2.13.1-r2.ebuild 5608 BLAKE2B c2dae524023fc7ba003263ab64efce755ce51f58da635c395fe72cd688ae865a975bc6000ed179e95298696693015b24cd5cb4309d84606583aaad2aaeed5dbd SHA512 b3b447d031b424b4e8d94b12efae6248cb432727c7aee7bb6c0ed4ec692199c9b0df1cff102be37eedd20ea93c1dff99f1cf5acd1de260c96012d53de04c828d
+EBUILD fontconfig-2.13.93.ebuild 5890 BLAKE2B 122423d9ae3ad277cf9fefcc2269788b48dfe56c6ed6b8d9965a315063ab7d0b9a3398564e922bdf224277a53b79b822df70a2c134a871817fdd505c50ac3575 SHA512 484f8e8f3fbaae942b156ce89ed78e48cd52921de0f7f7c428b8d0022d46bd5f5a7a07260e036f90356caa27670f9a92804c3636e9672f7b740c9b9e11ebc7f2
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 6b51d5adc5b4..ddf062068696 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,8 +54,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-proper_homedir.patch
 )
 
-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
@@ -102,6 +100,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
 	default
 
 	# avoid calling this multiple times, bug #459210
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 329ec7d1678e..a88e04398db3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -110,6 +110,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
 	default
 
 	# avoid calling this multiple times, bug #459210
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index fadba67090b6..be11953664d5 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +1,6 @@
 AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
+DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
 EBUILD freeglut-3.2.1-r2.ebuild 1499 BLAKE2B 5fe6ab2def7d44b129fe22ed721303324e5deda66a0d572e990760371cf6c661cd0804a2db8b3c7e876b2834d027bb0bd01727655f86d468f7a638a8ed097bdb SHA512 321c424e287b5e4b0a1e1f7c02f34639b952a85ca4ca81f8f8479b732bd47ad93d8d141dd00ba61cfbed4bdadfeabf70e2608e02acdd6a5195b15d84da088957
+EBUILD freeglut-3.2.2.ebuild 1418 BLAKE2B 904326a455872b0255c4f55a1590a085361903a03b8a66262afba6d1e8cdbe335df3dde6337a0e068e980033a5930e80d8b91c7108c7f04d64043c9b494ca48a SHA512 177a9073edea80520aaff5da7771f0d8995d6371519e883ce8872c86382fb3c76cf63264bbdc32a8b336d28d89c98dcbd76595e82bd4022c831c0cb76fb44854
 MISC metadata.xml 529 BLAKE2B ef8eb49e76fa342486804eb88393b0b80710761c9255e8971f99cd40a41cdfa7ac4734d66a2d2b285d9493ae9b6c56706235749f4958985e15bb22796a81908b SHA512 fe290b4e32aaecbc3f604adf0ef295d8fb1e9a2dee4fd4c3b61a56a82e4d6c4395cb6b6e4e91a6c196d632cf65102539d8f91dd7556ab7d63e539866d83dc8e5
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
new file mode 100644
index 000000000000..e874bf8c151d
--- /dev/null
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+# enabling GLES support seems to cause build failures
+RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
+# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
+		"-DFREEGLUT_GLES=OFF"
+		"-DFREEGLUT_BUILD_DEMOS=OFF"
+		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
+	)
+#	$(cmake-utils_use gles FREEGLUT_GLES)
+	cmake-multilib_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
+}
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 7465d5fdc0b7..1262ae333363 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -2,6 +2,7 @@ AUX freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch 6242 BLAKE2B 3deb724b2c
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
 AUX freeimage-3.18.0-libraw-0.20.0.patch 1912 BLAKE2B 56892466e8c8c4a1178c66ba24fa0da0b4218ac883a21eee47ac87044a5cb300182d33c04e91e9ed30a0e3b03c34cd447c0400bb2b6045f96866bb583aeaee06 SHA512 6fde3ee5e0219bdb6cf897e1898dfd0e06dbfceb67f06a935776b96c4688b27e11075958c339c417c3d3490d5778e802b1eafb4c92360c342acf0a2b7ff6345e
+AUX freeimage-3.18.0-openexr-3-imath.patch 5333 BLAKE2B 9465fb9c9f50f5bfe08d1d337acff27441d2054dbcada9df173f5bbaae5b25dd2d155de141c464e3188cc871a2dc2e25fb8b992151ae1cd9e6134a889e3ab705 SHA512 88ebb72e6b531e4444904789025962d1e4b2b7947c1b353b46db138c55c5f486ed7ee81ee455f084ed4780b6aef0a0afe2f0a8518b5b723c51bfc6dad4ca9fe1
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
 AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e
 AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4
@@ -9,4 +10,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r3.ebuild 3182 BLAKE2B e4279ecd9c3e8e00a998da85402efb3edd6845a20e1a2b25a61480d666d65a8702df19762615290e74fbdb8960d0d95f83e31a12865bb14c335fc7377139c7e4 SHA512 2113ca778f0116fc5ac12b74e9264e2fb04169af05d0b84e09ba3c3b42c9f51b30fab059fbc432d4c151a2761652cc0fd3296f661b9727f6a78d7a68b03923da
+EBUILD freeimage-3.18.0-r6.ebuild 3272 BLAKE2B e838e809310f2485f47524126769c3225ba34ab4a65d287cc03a2fa8e75789771715f5536a9db2436d94f00ae41821d8fbed3cc3d6fafbfbe3a3228fa7d484d5 SHA512 f50a10ac25c41c43bfb61e1a1f09279d8e57439c028aff83a0446101acb520fa7efef4657b4c39361ef752cd619909f114490fbf0895fca3aa994fd8172c2197
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch b/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch
new file mode 100644
index 000000000000..693c71fef321
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-openexr-3-imath.patch
@@ -0,0 +1,144 @@
+diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
+index faa8037..e88bd2d 100644
+--- a/Source/FreeImage/PluginEXR.cpp
++++ b/Source/FreeImage/PluginEXR.cpp
+@@ -28,16 +28,32 @@
+ #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
+ #endif 
+ 
+-#include <ImfIO.h>
+-#include <Iex.h>
+-#include <ImfOutputFile.h>
+-#include <ImfInputFile.h>
+-#include <ImfRgbaFile.h>
+-#include <ImfChannelList.h>
+-#include <ImfRgba.h>
+-#include <ImfArray.h>
+-#include <ImfPreviewImage.h>
+-#include <half.h>
++#include <OpenEXR/ImfIO.h>
++#include <OpenEXR/Iex.h>
++#include <OpenEXR/ImfOutputFile.h>
++#include <OpenEXR/ImfInputFile.h>
++#include <OpenEXR/ImfRgbaFile.h>
++#include <OpenEXR/ImfChannelList.h>
++#include <OpenEXR/ImfRgba.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfPreviewImage.h>
++
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ 
+ // ==========================================================
+@@ -66,11 +82,11 @@ public:
+ 		return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
+ 	}
+ 
+-	virtual Imath::Int64 tellg() {
++	virtual uint64_t tellg() {
+ 		return _io->tell_proc(_handle);
+ 	}
+ 
+-	virtual void seekg(Imath::Int64 pos) {
++	virtual void seekg(uint64_t pos) {
+ 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ 	}
+ 
+@@ -100,11 +116,11 @@ public:
+ 		}
+ 	}
+ 
+-	virtual Imath::Int64 tellp() {
++	virtual uint64_t tellp() {
+ 		return _io->tell_proc(_handle);
+ 	}
+ 
+-	virtual void seekp(Imath::Int64 pos) {
++	virtual void seekp(uint64_t pos) {
+ 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ 	}
+ };
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index b9da767..96da4d7 100644
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -39,7 +39,24 @@
+ #include "Utilities.h"
+ #include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+diff --git a/Makefile.fip b/Makefile.fip
+index 60bedbc..193126d 100644
+--- a/Makefile.fip
++++ b/Makefile.fip
+@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG)   += -ljpeg
+ LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
+ LIBRARIES-$(USE_MNG)    += -lmng
+ LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
+-LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
+ LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
+ LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
+ 
+diff --git a/Makefile.gnu b/Makefile.gnu
+index b11c554..3de5a1b 100644
+--- a/Makefile.gnu
++++ b/Makefile.gnu
+@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG)   += -ljpeg
+ LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
+ LIBRARIES-$(USE_MNG)    += -lmng
+ LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
+-LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
+ LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
+ LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
+ 
+diff --git a/Makefile.srcs b/Makefile.srcs
+index 26e1a6d..d97eacf 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -180,7 +180,7 @@ INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
+ INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
+ INCLUDE-$(USE_MNG)    += -DUSE_MNG
+ INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
+-INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
++INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 Imath)
+ INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
+ INCLUDE-$(USE_WEBP)   += -DUSE_WEBP   $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux)
+ INCLUDE = $(INCLUDE-yes)
diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
new file mode 100644
index 000000000000..fc7744569906
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+		media-libs/tiff:0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index e70369a41997..a1de4750d09b 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -1,6 +1,7 @@
+AUX ftgl-2.1.3_rc5-clang.patch 900 BLAKE2B b6d3e112c35d57a6659478980ea2c258937d51775e8bc7ca2522dd8e4f0530c4bf6eac15ec9b01c2736a4ba0e2a566aa72f2f1d55e39cdd17e538e50494191c3 SHA512 984ce9dc8dcb76297516101ea12c60a71679afface99b826a7e415a899c21ee5df4c8e7cfbf0d072e8127a4bc0dde2b938be7b3859f8ed2555090c24b4c9f9bf
 AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af130a6263312f5c48deb24f08db723422cb148b0d0d4a250b461604a7cc5e32270e3dc2050a2230487d2a92674386c8f636d7c0e1f SHA512 81d7ce2043e86bd451d07f97e8686fd90527994154410eb9519d18c77b97b9311c062332fe4f6e1acbb566810d961f87626f5a56ab7843ff4e2eb3d66f3be7d4
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1247 BLAKE2B 4a6145a0445a4c1c24c90306b03c1ef3e566c0ad0062918a9c5f0b5d000707e0a45c38e74baf4afeee124d80c8d36e2c9ba72c7d62a8eec02760d451a56eb931 SHA512 ca734a3990c294824434fd834bfeb2419390829db9bd580d212ecbb331378f533f13250f07bcee19b066bc92aca28e0ba9c1eed9e902283c04f31a5e28bfaf8b
+EBUILD ftgl-2.1.3_rc5.ebuild 1279 BLAKE2B 9480976285750fbacb08221a7a0794bfad41c0a9cc6555083bb84628933ed421f2ebd8c81bed363cd397468622e06abc15b3659025760d05d7d389450d579fff SHA512 4e46c9828be246dca22e1b93dd112aedda43b41e4f85d35d831715831e45813c5a4e2fc48dfffdbbfdf0937bebc89f6fd949c79a04b58755a6994c565bf22447
 MISC metadata.xml 328 BLAKE2B 176e85d39009b168447e2bb51661a59f9e121fd965fd668c40b32a39126679b94b942a53307cbeb5d7c68eb1acaa433a65e9080e56d50d59b7fec01c7bfbbd44 SHA512 043d076e9f5bce255c55625561cdbbc59720208d9a3b0786ce67e31940905e0b2cdc4f29695bc297667faf13b4d6d5ee350fa80a687406214435f9efeb808ca1
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch
new file mode 100644
index 000000000000..d9866a591733
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch
@@ -0,0 +1,24 @@
+--- a/demo/simple.cpp
++++ b/demo/simple.cpp
+@@ -105,14 +105,14 @@
+     float t2 = sin(n / 50 + 1);
+     float t3 = sin(n / 30 + 2);
+ 
+-    float ambient[4]  = { (t1 + 2.0) / 3,
+-                          (t2 + 2.0) / 3,
+-                          (t3 + 2.0) / 3, 0.3 };
+-    float diffuse[4]  = { 1.0, 0.9, 0.9, 1.0 };
+-    float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
+-    float position[4] = { 100.0, 100.0, 0.0, 1.0 };
++    float ambient[4]  = { (t1 + 2.0f) / 3,
++                          (t2 + 2.0f) / 3,
++                          (t3 + 2.0f) / 3, 0.3 };
++    float diffuse[4]  = { 1.0f, 0.9f, 0.9f, 1.0f };
++    float specular[4] = { 1.0f, 0.7f, 0.7f, 1.0f };
++    float position[4] = { 100.0f, 100.0f, 0.0f, 1.0f };
+ 
+-    float front_ambient[4]  = { 0.7, 0.7, 0.7, 0.0 };
++    float front_ambient[4]  = { 0.7f, 0.7f, 0.7f, 0.0f };
+ 
+     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ 
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 8d9baca0cd07..22107b5dd36a 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-underlink.patch
 	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 24caa1500637..2bc9c29fa239 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,16 +1,6 @@
-AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5
-AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
-AUX gegl-0.4.26-fix-build-glib-2.67.3.patch 765 BLAKE2B cd9a629e1dc6aa8751b06c950ee0340464e8110c042663c3f94ae6ba347047bd5bef3d39db590d3c3d0e8d0388b7e86e2e4478226c4e85e01faa91e7eec9fcb9 SHA512 9b7bccc4f7b555e95c8e2858879c5056278b439c79b586aadf0ad343f3fc210afcfee766b9902c8f6868bf9e246cb61ee66e828e50ed44d64a1c51cbf61e28f5
-AUX gegl-0.4.30-fix-build-openexr-3.patch 694 BLAKE2B 45bfdc9ebb8bb651e84a5e7038e878fbd022083de1a92adc020212e6903faced42a12c68ba0643e2699795a71fa9a703871af4d1a280e612dfda74b50c216179 SHA512 4ccad50d0789a95f599b62b4e8801e417214615775cd44f201bd101635316ed7d763f8a84365dc09d62503859558791d0c0d4871866fde84ed42ecdb091d013e
-DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
-DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
-DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
-DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef SHA512 68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
 DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
-EBUILD gegl-0.4.26-r1.ebuild 5022 BLAKE2B d76955b962ac995d1648152318607f4ebc4f74680e95e357eaf2ff0391800212c9cf0ba2bb7445ce89031ff0d0fc1c5c14046903de32bb4e49a6adc3267fb49e SHA512 14bf294c9c1b073d7c3dce07b61b0b02d298ed3fe9d53825c91c4ed6b10d28fdfebc73dcb63fff9dbd272d0278b688a64236ca0ddce5ca15722af2b17d009912
-EBUILD gegl-0.4.28.ebuild 5034 BLAKE2B aa7b52183ed7cf1047dc19be3343fd06efda464eb03aecd93959bbecde260a4d7aaf172bb91194d672fa8ae2512ef698e0b77492a8bc6307eda9c4f093271f73 SHA512 bb2ab17cfbab58b420bad3b957a2b84563d7294631a7b188fef6a5dc530b742da96b6dee5d0fc8103ee419e9ef2b587ee1011e02cb96bac372df7f68404fab8d
-EBUILD gegl-0.4.30.ebuild 4830 BLAKE2B fa94364b30d66a79315ea3590fadf06467c8b24ae4ed83b7d4e27435b4e0b54f48a7252e009165d1aacbd0db72673c9ed3d32cd593c0ab652e74aec635f2aeae SHA512 65935c4762ab9e6aae27e23fc0ea4498db7d4ce7cc3479c694b9fd665a1dbe90aed34c467fa7dfc72955ee522a955dbfa9944f8d665e4e06bd7c9039a6d9de69
-EBUILD gegl-0.4.32.ebuild 4768 BLAKE2B 28e5d8e1a0f489a75a4189f9aba3a3ddf2c0b64969d3e82b0a73bc8a0e5291bf8a8101d80782b8d12b9786df3857e98dfdd05b0d3555b9e0e7792dc71e847413 SHA512 378d9dd8e728a4b9abf1c86beb2576d938ea8a28beb718c96580bcb7d6cb08d73a11b5a946610de8219b41f0218e7fb2d738a5f34d0c5b4325e05a12f67ee256
-EBUILD gegl-0.4.34.ebuild 4773 BLAKE2B 4fe2ea80db7178069c0ef6203956b32a5eae7ff43b617140defa2ffbd52792bfb27816e4eb72a48d3b906874f49638e24c789a66fae6b00cfaefb4bd65b7030e SHA512 58022c7ac32788806ed85ed75c221490eecb2e7fe7692a180f0074091762eeace4a5415f03bbcf22c94688e7f04d3bc5c4d81063d6158981211f60d723f8ad19
-EBUILD gegl-9999.ebuild 4503 BLAKE2B 929b36e0e05ab11cc0d542141a0b756a00f27fd2c36e63e1a17896d9e2f85e6bdadb5e85c9e14f3bd71d902e89501daa44ab7f8e22e9b498e00bf0d133639862 SHA512 8153e84bead2d81cd63c3ba1376bc03c0a6afc271b52dc5496053a6061cfdb470fc6f39793b19c392bbe156a368d5830a648fa41629564fa432f6e089a454d40
+DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
+EBUILD gegl-0.4.34.ebuild 4769 BLAKE2B b604793b8f69d8a4633f74364d8ebd841ea604ceca71abdf74f13ec7290662bb4e8486f2b1d729b0afbe6ee8d8d35fdf083069f5add4e0521f063fb1e6f51b3d SHA512 27fe527925ceb33137244ad4bdcc7ce62e46b72abb022706876bd45ab6ebe3b9b29283e27a84e076758539e5937be3430a25fe7dc86b89f014ce013a3e2a60d4
+EBUILD gegl-0.4.36-r1.ebuild 4592 BLAKE2B 0ed8be4945cae0fddb346428a2a40fc919161399cf2afd04fc15cf7119f657ee03dc0effea6b0403b99de754216260c842a657a6c38f8f4e3e84bc8091331f5f SHA512 39196850da1fe93f7404cb645ac186bed91ea99e25bf33e11c5b819f4bf0d1aa6c92c645b199332371a6f168ee95f06047e2795a364e7c3573968564f34f46b3
+EBUILD gegl-9999.ebuild 4378 BLAKE2B 84ff73cd6821e16038c52a87daaa404d7b4c09b701c0251bd2744bdd57a546f90f636efce4e6dd838c99131e251bd6c710fbb0190449bb51e412c3a357df7416 SHA512 5aa398283404313498eb5638f0a0c9c31b0f8db59acde5d5fb244558cb8148510463217c850196d972e9eb8a5148401ed03604580dbaf3e0248ccaeb743921dd
 MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
deleted file mode 100644
index 4be09057d896..000000000000
--- a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Oct 2019 21:55:03 +0100
-Subject: [PATCH] Drop failing tests
-
----
- tests/compositions/meson.build | 2 ++
- tests/python/meson.build       | 2 --
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
-index 8699e7c..5e76e8c 100644
---- a/tests/compositions/meson.build
-+++ b/tests/compositions/meson.build
-@@ -87,6 +87,7 @@ test('compositions_with_opencl',
- )
- endif
- 
-+if false
- test('compositions_without_opencl',
-   python,
-   args: [
-@@ -100,3 +101,4 @@ test('compositions_without_opencl',
-   suite: 'compositions',
-   is_parallel: false,
- )
-+endif
-diff --git a/tests/python/meson.build b/tests/python/meson.build
-index c6782e6..47a160b 100644
---- a/tests/python/meson.build
-+++ b/tests/python/meson.build
-@@ -2,8 +2,6 @@
- testnames = [
-   'gegl-buffer',
-   'gegl-color',
--  'gegl-format',
--  'gegl-node',
-   'gegl',
- ]
- 
--- 
-2.23.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
deleted file mode 100644
index be4498ccee4a..000000000000
--- a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Oct 2019 22:05:58 +0100
-Subject: [PATCH] Add suffix "-0.4" to installed programs
-
----
- bin/meson.build   | 2 +-
- tools/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/meson.build b/bin/meson.build
-index 4daf6cb..b77b692 100644
---- a/bin/meson.build
-+++ b/bin/meson.build
-@@ -42,7 +42,7 @@ if libspiro.found()
-   gegl_deps += [ libspiro, ]
- endif
- 
--gegl_bin = executable('gegl',
-+gegl_bin = executable('gegl-0.4',
-   gegl_sources,
-   include_directories: [ rootInclude, geglInclude, ],
-   dependencies: gegl_deps,
-diff --git a/tools/meson.build b/tools/meson.build
-index 43c5495..c1b0d63 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -19,7 +19,7 @@ detect_opencl = executable(
-   install: false,
- )
- gegl_imgcmp = executable(
--  'gegl-imgcmp',
-+  'gegl-imgcmp-0.4',
-   'gegl-imgcmp.c',
-   include_directories: [ rootInclude, geglInclude, ],
-   dependencies: [ tools_deps, ],
--- 
-2.23.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
deleted file mode 100644
index 00e1b8ab4845..000000000000
--- a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
-From: Olivier Tilloy <olivier.tilloy@canonical.com>
-Date: Fri, 5 Mar 2021 12:58:18 +0100
-Subject: [PATCH] Fix build with glib 2.67.3 (see
- https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
-
----
- operations/external/exr-load.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
-index e864f7e3e..28403639c 100644
---- a/operations/external/exr-load.cpp
-+++ b/operations/external/exr-load.cpp
-@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
- #define GEGL_OP_NAME exr_load
- #define GEGL_OP_C_FILE       "exr-load.cpp"
- 
--extern "C" {
- #include "gegl-op.h"
--}
- 
- #include <ImfInputFile.h>
- #include <ImfChannelList.h>
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
deleted file mode 100644
index e0e938acc22e..000000000000
--- a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 24 Apr 2021 10:51:09 +0000
-Subject: [PATCH] Fix build with OpenEXR 3
-
-Add a header that is no longer transitively included
----
- operations/external/exr-save.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
-index 1e8c09d96..87abed511 100644
---- a/operations/external/exr-save.cc
-+++ b/operations/external/exr-save.cc
-@@ -45,6 +45,7 @@ extern "C" {
- #include <ImfChromaticities.h>
- #include <ImfStandardAttributes.h>
- #include <ImfArray.h>
-+#include <ImfFrameBuffer.h>
- #include "ImathRandom.h"
- 
- 
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
deleted file mode 100644
index 71107e34e87e..000000000000
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.68.2:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-	"${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
-	"${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix skipping mipmap tests due to executable not found
-	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
-		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
-		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
-	done
-
-	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
-	pushd "${S}/opencl/" || die
-	for file in *.cl; do
-		if [ -f "$file" ]; then
-			"${EPYTHON}" cltostring.py "${file}" || die
-		fi
-	done
-	popd || die
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		-Dgraphviz=disabled
-		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
deleted file mode 100644
index 6952d3f4fa8c..000000000000
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.68.2:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-	"${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
-	"${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix skipping mipmap tests due to executable not found
-	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
-		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
-		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
-	done
-
-	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
-	pushd "${S}/opencl/" || die
-	for file in *.cl; do
-		if [ -f "$file" ]; then
-			"${EPYTHON}" cltostring.py "${file}" || die
-		fi
-	done
-	popd || die
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		-Dgraphviz=disabled
-		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.32.ebuild b/media-libs/gegl/gegl-0.4.32.ebuild
deleted file mode 100644
index dab149b166ad..000000000000
--- a/media-libs/gegl/gegl-0.4.32.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson optfeature python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.68.2:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-python_check_deps() {
-	use test || return 0
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	# patch executables suffix
-	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
-	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
-	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
-	# skip UNEXPECTED PASSED 'matting-levin' test
-	sed -i -e "s/composition_tests += 'matting-levin'//" \
-		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
-	pushd "${S}/opencl/" || die
-	for file in *.cl; do
-		if [[ -f ${file} ]]; then
-			"${EPYTHON}" cltostring.py "${file}" || die
-		fi
-	done
-	popd || die
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Djasper=disabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
diff --git a/media-libs/gegl/gegl-0.4.34.ebuild b/media-libs/gegl/gegl-0.4.34.ebuild
index 2f812f3aec2c..a95469a52e93 100644
--- a/media-libs/gegl/gegl-0.4.34.ebuild
+++ b/media-libs/gegl/gegl-0.4.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.36-r1.ebuild
index 6aacb2afe2a3..6a4a84a8223b 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.36-r1.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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
@@ -39,7 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.68.2:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
+	>=media-libs/babl-0.1.90[introspection?,lcms?,vala?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	>=sys-libs/zlib-1.2.0
@@ -73,11 +73,7 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-openexr-3.patch
-)
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
 
 python_check_deps() {
 	use test || return 0
@@ -99,11 +95,6 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
 	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
 	pushd "${S}/opencl/" || die
 	for file in *.cl; do
@@ -112,11 +103,11 @@ src_prepare() {
 		fi
 	done
 	popd || die
-
-	use vala && vala_src_prepare
 }
 
 src_configure() {
+	use vala && vala_setup
+
 	local emesonargs=(
 		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 074d6327b123..bd02e5d34adf 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,9 +1,10 @@
-# 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} )
+# vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
 inherit meson optfeature python-any-r1 vala
@@ -38,7 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.68.2:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
+	>=media-libs/babl-0.1.90[introspection?,lcms?,vala?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	>=sys-libs/zlib-1.2.0
@@ -93,16 +94,11 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	use vala && vala_src_prepare
 }
 
 src_configure() {
+	use vala && vala_setup
+
 	local emesonargs=(
 		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 43d779ab8770..153658c7f43a 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,5 @@
 DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
 DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
 EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c
-EBUILD glfw-3.3.6.ebuild 1132 BLAKE2B 444ec9d9260a341bb36f7bb42ce06f462f9ac51649ac9814282410ed9b0dd807e8a43a091791192b95f77f9b8a4e44f94bc4366ce4896f1e48ec08c6e0d874c1 SHA512 d4d39246710f94966c8c241adbe9de1b3ac47c572e8272d0f61db62b395990df295951312ffa6810ab13e9078ac948b9d7afb08572a7bece154ecc9d4e31e6be
+EBUILD glfw-3.3.6.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.6.ebuild b/media-libs/glfw/glfw-3.3.6.ebuild
index c82e318544e2..32cac19f8453 100644
--- a/media-libs/glfw/glfw-3.3.6.ebuild
+++ b/media-libs/glfw/glfw-3.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
 IUSE="wayland-only"
 
 RDEPEND="
diff --git a/media-libs/glyr/Manifest b/media-libs/glyr/Manifest
index cb1ea84959fb..16cc62fd5503 100644
--- a/media-libs/glyr/Manifest
+++ b/media-libs/glyr/Manifest
@@ -1,3 +1,4 @@
+AUX glyr-1.0.10-fix-version.patch 739 BLAKE2B a39fb9efa6d5f94c7de099036267f059f6b5ae1b4272c40af0c270e58b81d3331821739b8cdb370fa1d94577c47ecf5684c43900f809a3c7fa830352a9ba2b4e SHA512 84512d32476724e19effef9c01306cf77b62a3044c00213a7ee5d34710f20eda88f65ace38592e0391a5f1c15c2d5e2cbae8b28ac660ded6abead2a5508bc76d
 DIST glyr-1.0.10.tar.gz 416414 BLAKE2B 6cc4dbe7f95bb86635c131f37e4a0d0c95cf2027e8d84629e5d2760d9d8baa5194976b119f2759922ad6a3a2986cc22c630260bb85108caf04674d12a43b1406 SHA512 dc5a579c84c321de7c28861e42196d42ef73bbdbe86b5d662d7ace1d79efe8d6d8d0a8086092ed9c32af9651db8cb11bf1678c5582b17192b23e20a66812bb21
-EBUILD glyr-1.0.10.ebuild 748 BLAKE2B 41feff88821280b8c2564c42646cd80e1a7791db1107d00d0dd8bf504ae1de1409042de109f94d84997e630f32979e1875c10a9f1c823b53804e888a19cadb0a SHA512 bf35304a65a57739aa46af25d5042cddc75790d18b34569c5e86d1007b692191983aa9a46e927b3630c05e220d9a0fe9b79c0ae8cbe1586970c059033c5b7efb
+EBUILD glyr-1.0.10-r1.ebuild 784 BLAKE2B 357e6e6b8ee6ee834ac5c758815e3529e4e387297dbfed6b02a56b9f0df4aa0d5041c33187e8f0b1f3b8c258fa2104ce0bfa9616bcee22b5a30112a8ee3af04d SHA512 3aa6af29794ee0c569a21a2a7b9647896a92ab434b03892a45cdbd6204322d59bafab0969f2737694a72f71e9ec03da34e0ffe54831fd72e55d1a10ed4dec99d
 MISC metadata.xml 329 BLAKE2B 8f3f81df3e002776e233ae65958ca1efc0ab83663f440030b957e14bb932b42d63f2f2fc90c0c2bebc463bb36fd469e1271c2eebd3074d21d3e852666a8a272f SHA512 3cb53de8df8679ce2cd675c4308b70f5b0f359a267284c225126c909d38a127d1dbe5fdc3f2450ce98054cd63c150afefce6e94adb174500a158e8a0d38cf5e4
diff --git a/media-libs/glyr/files/glyr-1.0.10-fix-version.patch b/media-libs/glyr/files/glyr-1.0.10-fix-version.patch
new file mode 100644
index 000000000000..0d0c126faa7f
--- /dev/null
+++ b/media-libs/glyr/files/glyr-1.0.10-fix-version.patch
@@ -0,0 +1,23 @@
+https://github.com/sahib/glyr/pull/104
+
+From bf0a0f0a040aed89f7fef3dadf52754b73efc597 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 27 Feb 2022 00:48:25 +0000
+Subject: [PATCH] CMakeLists.txt: fix version
+
+This avoids e.g. the pkg-config file installed having the wrong version.
+
+It must be updated on new tags/releases (just before tagging).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,7 @@ ENDIF()
+ # ------------------------------------------------
+ SET(GLYR_VERSION_MAJOR "1")
+ SET(GLYR_VERSION_MINOR "0")
+-SET(GLYR_VERSION_MICRO "9")
++SET(GLYR_VERSION_MICRO "10")
+ SET(GLYR_VERSION_NAME  "Raving Raven")
+ # ------------------------------------------------
+ 
diff --git a/media-libs/glyr/glyr-1.0.10.ebuild b/media-libs/glyr/glyr-1.0.10-r1.ebuild
index 65ac5aac4cf9..b4710e885734 100644
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ b/media-libs/glyr/glyr-1.0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Music related metadata searchengine, both with commandline interface and C API"
 HOMEPAGE="https://github.com/sahib/glyr"
@@ -12,21 +12,21 @@ SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.10:2
-	net-misc/curl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS README.textile ) # CHANGELOG is obsolete in favour of git history
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-version.patch
+)
+
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i \
 		-e '/GCC_ONLY_OPT.*-s/d' \
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index ce77b9586cd3..6962cb3eeb81 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,15 +1,9 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
-DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
-DIST intel-gmmlib-21.3.5.tar.gz 747289 BLAKE2B 288cc0e051389818fcd1025e5f9e650dea6e52df08020aec1c1127afa5e422410c825a45eb78fa8343b583c246501371143a1c8176232b81acf314af3b2513af SHA512 59922ced38983333a29c075cef5d28f02331c0e5a28ac556229e474e9a904a19d952d40daedfcca2365ab35212e0c14bf6db0087283ec5d0b932651c450178c4
-DIST intel-gmmlib-22.0.0.tar.gz 755785 BLAKE2B 30d0e5fa87bbec35532b1934741bdbc1616e1af654d8e90f77b176c757207acf806e9f366d0bcd27b752df19373e0513eca462b39fd1eb6b434c4549b243963e SHA512 7d9a1c216ca5e3d15f53e780698303bb0ab580043a37d83b7b014cc4645e371ec66f49fb0c404fe1856350cc33fb9bf5e7006cb7fd065236086496d7270874aa
-DIST intel-gmmlib-22.0.1.tar.gz 756727 BLAKE2B 767802e5d25b79647af84c10cf2377e07530b61682e564f5d317e308e31090a9427322c4faba78eb072b4c3933968cb575dc24029c174388c6b9a04b3fdc8325 SHA512 a9ad41611ba8fb6b0bf1ab8769ba9d12dd4450728d268d2c099e959c5638593c1cea1eea5fc00a8d9f311881b267e6059b422045deaabf42b35bcd98e1dfc12e
 DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
-EBUILD gmmlib-21.3.3.ebuild 762 BLAKE2B 502ca6165fd0f155c30a0bab51e802ea8f748382694644d738b257d5ad8b77aaea101d805e9098cac6b5deba03c92f5cf03f7dcdb0ecc4c51f9803a2ba5a9e12 SHA512 5d2b77fb6f87f72805495665fe4b8c802429d4890c2d857a0d9e7f6b3676a8ba230f1c4a15ca44645ba5d0e6f92eb17e2e33457ac3dfa6492f7df4134ab6df9c
-EBUILD gmmlib-21.3.5.ebuild 764 BLAKE2B 024e984f0b1e86b4663e763004c5489033f098b21c3cc283b6aef0cec6e0b7bc21d5c419fc9505b0cd4350b36062b6a777c59c77b9dcb52e1e344963466edaa2 SHA512 fceeaf8ab5e739d484e6ce625ec3dd438fb31f6b9727b1b563de4128034bab1cf996e859410a054c1ca3f5201dca0bfd82a76c21534551e891cfd95b9ab36992
-EBUILD gmmlib-22.0.0.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
-EBUILD gmmlib-22.0.1.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
-EBUILD gmmlib-22.0.2.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
-EBUILD gmmlib-9999.ebuild 845 BLAKE2B ffc7d65df6b699426cf51813f7dc425c4ac94ab09fc43974a811047820e7b228d5ca59653db89483b153d03fe2409853a4b4e2a7cc23f61ef2cb66736a745b03 SHA512 7353902c4f3b38c7305452077284a888e48bb1e7974be92b622c4000ae310bcd7509a2a70c122a729c2675b95a17aabc9befc557cdbf6e205fee61704229c828
+DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
+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-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
deleted file mode 100644
index 66e98449ad8a..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 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"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.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/gmmlib/gmmlib-21.3.5.ebuild b/media-libs/gmmlib/gmmlib-21.3.5.ebuild
deleted file mode 100644
index c6bc8d5f5c6a..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/0"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.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/gmmlib/gmmlib-22.0.0.ebuild b/media-libs/gmmlib/gmmlib-22.0.0.ebuild
deleted file mode 100644
index 2e977a3d2a9e..000000000000
--- a/media-libs/gmmlib/gmmlib-22.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.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/gmmlib/gmmlib-22.0.2.ebuild b/media-libs/gmmlib/gmmlib-22.0.2.ebuild
index 1e2a71912bdd..2e977a3d2a9e 100644
--- a/media-libs/gmmlib/gmmlib-22.0.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.0.2.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.0.1.ebuild b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
index 1e2a71912bdd..c99bb7dfa852 100644
--- a/media-libs/gmmlib/gmmlib-22.0.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
@@ -12,7 +12,10 @@ S="${WORKDIR}/${PN}-intel-${P}"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
-SLOT="0/12"
+# gmmlib version 22.0.3 made breaking ABI changes without changing the
+# soname, so the "_1" subslot suffix was added. There is no need to keep
+# this suffix after the next soname version bump.
+SLOT="0/12_1"
 IUSE="+custom-cflags test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index ff83cbf204ae..813c2d6ebd0e 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -18,7 +18,10 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI=""
 
 LICENSE="MIT"
-SLOT="0/12"
+# gmmlib version 22.0.3 made breaking ABI changes without changing the
+# soname, so the "_1" subslot suffix was added. There is no need to keep
+# this suffix after the next soname version bump.
+SLOT="0/12_1"
 IUSE="test +custom-cflags"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index ef93496507a4..757b09d46b0e 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,4 @@
 AUX 1.10.6-fix-vector-check.patch 822 BLAKE2B 2a364853cd085fdfc1be38caf792667cc97b0834337abf441bd3fe3dc5e4ffb47496226c8bd93d9935b3725bc3a118b037404317c3d7b70566727e7f48283bd8 SHA512 e4e2d318369b9cc58ac39ece05dbfa919ea614a7d1984ab0ba5128400751843b290dbe921297f86dc54977244378acf76977351e831500d217acf67f1191a825
 DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
-EBUILD graphene-1.10.6-r1.ebuild 1594 BLAKE2B e9258e19662562b5ce19411aaaaf0fc960851cc30adb48c0f7f945cbea8fbf1b53fa280282685220c28c81e14d736e4b7981386651b196c00d440bd9f0553cc2 SHA512 9a69ee04f4a17db082bc798dd4d77fe325109ccfb7eed214240d26b09041c5dbcd025cd4b7abe9e997987682c7f8036aa8461c227b7147fbd7a478b02c5ee271
-EBUILD graphene-1.10.6.ebuild 1532 BLAKE2B bc1d794250843f3ac67302da2917f55504535cd17b68009a4d51490aee949b2bddfd031be478877b06509f078e28a89c3ce65b11979979f2b34990ba403715da SHA512 a7bad13274a2301cfed78892acaa7771ff8ec40b6fe0d61db0fba755175317137739f13da240f79bd9368b3b651eca8b4d4973da093c531908126749e94bf9fd
+EBUILD graphene-1.10.6-r1.ebuild 1588 BLAKE2B 32190e6be87361dc968579eb5c6ff548595b90dd4e8e93eba90ac5319062c629073435c7259cde7563ffb773a8714670217cbb61a6ab149a86d9cd5095fb9030 SHA512 1de7fdfc0af41108271e1aefa8407f7da31e064b10fc64563f560506ce2b8aef66dabaa99210044405c8d2a97827da532915bf30c8a61385437539c35bb9a27d
 MISC metadata.xml 334 BLAKE2B 72027568b7436430c57d6ca3e522368786b9219c7b139eeb3c1e04f398539c2f1e78d63c741546813e4118904777c202dc56be114cd27b7056ef289e14cfd074 SHA512 8300692156435706d82417194a9d8fcc6865560b67d723ea38d0a985f7b910f4f9c65cea31049e30fdf854ab2d4d4983197a006803b2b6fb6d28cc7e40746959
diff --git a/media-libs/graphene/graphene-1.10.6-r1.ebuild b/media-libs/graphene/graphene-1.10.6-r1.ebuild
index 29dbe5384376..b632a2b91b30 100644
--- a/media-libs/graphene/graphene-1.10.6-r1.ebuild
+++ b/media-libs/graphene/graphene-1.10.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 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="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/graphene/graphene-1.10.6.ebuild b/media-libs/graphene/graphene-1.10.6.ebuild
deleted file mode 100644
index ab7fb554651e..000000000000
--- a/media-libs/graphene/graphene-1.10.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit xdg-utils meson-multilib python-any-r1
-
-DESCRIPTION="A thin layer of types for graphic libraries"
-HOMEPAGE="https://ebassi.github.io/graphene/"
-SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
-	local emesonargs=(
-		$(meson_native_use_bool doc gtk_doc)
-		-Dgobject_types=true
-		$(meson_native_use_feature introspection)
-		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		$(meson_use cpu_flags_arm_neon arm_neon)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 91e99532ad1e..3f1f1f8421e6 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,6 +1,10 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4-glib-volatile.patch.bz2 8492 BLAKE2B 7a6e4a3fc1d68c39ae08cb052eed1fcef9c5507c655525bcb48ab789f20027632136fb195643dc5d2e04728b4c3ac94b1dcbf9a14343333fb80d65c64244e1c8 SHA512 0d9e04b883a803cec518469f46dbcf47bfef614694cad6b2bb6e8cb31c3fcc80b0f3d81633b16cd05ca0516f49893aa67f4745dc22e80192ed385fb97ee8b97c
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
+DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc942fc658631dfc75b90f342f088e58c4655b1591651fbcd2a98259c95f0a7e830bb0ec67f65eb87d4b13c9f2adc733da7f12f SHA512 78731e0db04afd3dcdd5c5ea84df4e096a5db121fd9cb6eb79197844482a3b36b2764a664f171f80c809e6182ceae2350113d47f3f7c684d2d88f752bc092baf
+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.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
new file mode 100644
index 000000000000..ce64efe50571
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+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
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+	!media-plugins/gst-transcoder
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+# Fixes backported to 1.18.x, to be removed in 1.18.7
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature vnc librfb)
+
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		myconf+=( -Dgl=enabled )
+	else
+		myconf+=( -Dgl=disabled )
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild
new file mode 100644
index 000000000000..ffccda97c31c
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+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
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+	!media-plugins/gst-transcoder
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature vnc librfb)
+
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		myconf+=( -Dgl=enabled )
+	else
+		myconf+=( -Dgl=disabled )
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index c95a64df2d55..aae64e068d64 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,6 +2,10 @@ AUX gst-plugins-base-1.18.4_meson-0.58.0.patch 2198 BLAKE2B 3a6e661f37c94c6c2e01
 AUX gst-plugins-base-1.18.4_wayland_registry_remove.patch 2041 BLAKE2B 88830f067aee3ef0bbe89cce2c88c32a12626ef9c84d64b53fd6a119709aa22f827a3ff30a7ae5064e8e2e2c0f9c3999c740c7712ddc53d058b4a2baec286097 SHA512 0cf14673d77a4071dac220c620db21fd1a82e8d2445ac554ae2d27c9e429729af11eded8b5dacdaac444566676dae68f4bfd2bedd3c186b5eb1e39fc5c694de0
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
+DIST gst-plugins-base-1.18.6.tar.xz 3180564 BLAKE2B ad68cd65cff362ea990b26b9669edc6fe9be21e178e84d7db9d5d4fb13e31326ad7d40cc6228ed5bd54b74aad8a085332d6ce005519208ce6c3d397c29ca0a94 SHA512 b63c80354f1e7363e776726246328781a598a9739ab51b91db552935e5e4e96145ceb7b5b16bff6d054497ed37189bf742ae66774c23b1921b8b19bd9ab93945
+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.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
new file mode 100644
index 000000000000..58eb741e1987
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+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"
+
+# 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
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS="AUTHORS NEWS README RELEASE"
+
+# Fixes backported to 1.18.x, to be removed in 1.18.7
+PATCHES=(
+)
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	# opus: split to media-plugins/gst-plugins-opus
+	GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+	local emesonargs=(
+		-Dtools=enabled
+
+		$(meson_feature alsa)
+		$(meson_feature ogg)
+		$(meson_feature orc)
+		$(meson_feature pango)
+		$(meson_feature theora)
+		$(meson_feature vorbis)
+		$(meson_feature X x11)
+		$(meson_feature X xshm)
+		$(meson_feature X xvideo)
+	)
+
+	if use opengl || use gles2; then
+		# because meson doesn't likes extraneous commas
+		local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+		local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+		local gl_winsys=(
+			$(use X && echo x11)
+			$(use wayland && echo wayland)
+			$(use egl && echo egl)
+			$(use gbm && echo gbm)
+		)
+
+		emesonargs+=(
+			-Dgl=enabled
+			-Dgl-graphene=enabled
+			-Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+			-Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+			-Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+		)
+	else
+		emesonargs+=(
+			-Dgl=disabled
+			-Dgl_api=
+			-Dgl_platform=
+			-Dgl_winsys=
+		)
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild
new file mode 100644
index 000000000000..11cce3fa5f2d
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+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"
+
+# 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
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS=( AUTHORS NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	# opus: split to media-plugins/gst-plugins-opus
+	GST_PLUGINS_NOAUTO="alsa ogg pango theora vorbis x11 xshm xvideo"
+
+	local emesonargs=(
+		-Dtools=enabled
+
+		$(meson_feature alsa)
+		$(meson_feature ogg)
+		$(meson_feature orc)
+		$(meson_feature pango)
+		$(meson_feature theora)
+		$(meson_feature vorbis)
+		$(meson_feature X x11)
+		$(meson_feature X xshm)
+		$(meson_feature X xvideo)
+	)
+
+	if use opengl || use gles2; then
+		# because meson doesn't likes extraneous commas
+		local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+		local gl_platform=( $(use X && echo glx) $(use egl && echo egl) )
+		local gl_winsys=(
+			$(use X && echo x11)
+			$(use wayland && echo wayland)
+			$(use egl && echo egl)
+			$(use gbm && echo gbm)
+		)
+
+		emesonargs+=(
+			-Dgl=enabled
+			-Dgl-graphene=enabled
+			-Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+			-Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+			-Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+		)
+	else
+		emesonargs+=(
+			-Dgl=disabled
+			-Dgl_api=
+			-Dgl_platform=
+			-Dgl_winsys=
+		)
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index d526dcd48f9d..babfd332e2ef 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,5 +1,11 @@
+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.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
new file mode 100644
index 000000000000..c431b1fb6bd7
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..f1fc4601a23a
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
@@ -0,0 +1,163 @@
+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
new file mode 100644
index 000000000000..e1f8658bcad6
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+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"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="bz2"
+	local emesonargs=(
+		-Dbz2=enabled
+
+		# gst-plugins-ximagesrc
+		-Dximagesrc=disabled
+		-Dximagesrc-xshm=disabled
+		-Dximagesrc-xfixes=disabled
+		-Dximagesrc-xdamage=disabled
+
+		# gst-plugins-v4l2
+		-Dv4l2=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild
new file mode 100644
index 000000000000..de6939296c03
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer-meson
+
+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"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# Fixes backported to 1.20.1, to be removed in 1.20.2+
+PATCHES=(
+)
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="bz2"
+
+	local emesonargs=(
+		-Dbz2=enabled
+
+		# gst-plugins-ximagesrc
+		-Dximagesrc=disabled
+		-Dximagesrc-xshm=disabled
+		-Dximagesrc-xfixes=disabled
+		-Dximagesrc-xdamage=disabled
+
+		# gst-plugins-v4l2
+		-Dv4l2=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index af5b8ae2d92e..a90dc16202d8 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,9 @@
 DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
 DIST gst-plugins-ugly-1.18.4.tar.xz 509920 BLAKE2B a7aec6ac6e5739205c9567072596a8fb6dfcabc2f56ee0800c430c9bfc9549bf7ac75cb65719dadeb84036130d5b58f9be574f2a6531992ee7a8f23e9fb32d16 SHA512 eac02000ac3e0a54a953fe1531cb29bc6bc9913a707d1508905bf64fe0a4ef92f7d01b196259fc217fac8a344f0b2d683dd6d32210ce6b8c0acab08cb3b1322a
+DIST gst-plugins-ugly-1.18.6.tar.xz 515236 BLAKE2B 9f68321e5b58e49989630838fb8fa33da22b887c11735efde1460e0d857644c14a856f7dbd5337e0f2a4791f6934ddeb4defb22e7be70aa8c246b0439fdd9136 SHA512 86c8c536644885d4e1c6691d390ff13faa401f62baa964453c61909f1a1d13a7c43f0cfa5f7a05cc7a34cc90227b1b77244e84024c4c776797f1501c8defe10f
+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.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
new file mode 100644
index 000000000000..08de114b8516
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
+
+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"
+
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild
new file mode 100644
index 000000000000..4c3c48b389b5
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-ugly"
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
+
+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"
+
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 738e1efa36c3..1ad6d90e2bf5 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,5 +1,9 @@
 DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701
 DIST gst-rtsp-server-1.18.4.tar.xz 358140 BLAKE2B 3c8dae60742cc35580d5dbb4bbc5175ee93de2d2bb64c0de0dd09df5137b2b1518f6a39a2538d1eca86e8bd756299cada6f26ae23f33e1af1d6317e1e30d9d63 SHA512 1cda671f43e608d89aa024a8b4a39cbe1b83e1cd822b1190c777dd18c2000b5c8370e50598821b9c3f348776a418286a26993acf4255c6ff488682e0addeefab
+DIST gst-rtsp-server-1.18.6.tar.xz 364472 BLAKE2B 7fe0f70130f2e8022cc9308e8bde1c889c918e34edcfb633c0edf4e674f1b88610ec975cf67aca123193a22025512afbd3d5ab71df6b3d69eea44e56fab30602 SHA512 11c637fe263a9a55820be51fc3cef0aef06af5dc06ab20786b804412ee16ca7abdf20261b10e7483accde390ba75a921b050ab7a2f737145780815cd47f8f5f8
+DIST gst-rtsp-server-1.20.1.tar.xz 358032 BLAKE2B 53dc0936a6a67b75c636d5170549b10456a68679e7fb5cfc6ad5a9d3e56044ddd93bbe25353fdd9f102155d831de48e8dbecc0697b767f9c2e03e4c1d1460a4e SHA512 8f1cf76602e55fbeaa77cd757c2a1380a792909a53e00cb29a4978789f37ee56493ce3fcb652769cdd47ccb935bba0291908d16fa506b58bcc65f34d303ac963
 EBUILD gst-rtsp-server-1.16.3.ebuild 1948 BLAKE2B 930640db6ad1288e443cc65333f9c84b175bc8bec63afd89fc947fc58737377db32c904fa427fce3b876b207ef33db73ad00d7b49726eb78b6ccedda0ae96485 SHA512 5850334f33b39fe3bbed46f48beecbecb604873d7751aaf570b0faf286b81e80027a2afa1ef1c76bac8851c6eac58b62be932d283a3145a1cb3e210c329b4a12
 EBUILD gst-rtsp-server-1.18.4.ebuild 1248 BLAKE2B 568b8a4d85963148b1621daab81984f7e5bceeebf36e2f3eacaa052427ea957535a81f9fc8a75a89bd177b97bcc6ffd685897a82fccd47d4844c461544752563 SHA512 7d0bf501f0200c23b6cef25f17ba6b79deeef089bb2093c8df94e6affe025abe44d52339115f02f55ee975677de8086150475496686c2320ec18d09dc7fc911c
+EBUILD gst-rtsp-server-1.18.6.ebuild 1248 BLAKE2B e8ec2d0cd4da462a93debb826600a33acf689023f0846b3124463430a7118cfcd66e571d28f147b939c2234e33ab507b49da8a12577d1a4a5a6cbcc5deac264c SHA512 ad8dbe53ef0ad4a3a1454911b647f316a4a85534867b031692b1b2d12a86d1c651c17f57c877326079acdea72721c8b6e85263b684942c1bf337688d48d5b147
+EBUILD gst-rtsp-server-1.20.1.ebuild 1184 BLAKE2B a199b9d3f7ea74c18c6591d9bd515fc62ab701dc32e6a1e3c08b54ad32b642df19357a2975a019389ab1509596ad699960fd42ba3164118442950de1580d5566 SHA512 6eb59c2ca5095ab1010fd49a70833bdfcb68121ee83ebd74b8ff2cc8e4326f2ca2f6b02695e0e10adcd70cc0ff8dd92465fdc5217e2eab1bacbf2e64b5f044e4
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild
new file mode 100644
index 000000000000..470918b177f6
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild
new file mode 100644
index 000000000000..b48154a12921
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 4c0d7b6f5014..4e6e842d7e39 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamer-editing-services-1.16.3.tar.xz 1091208 BLAKE2B d88bed4e8958a6bad05aab8d6c19cd737c6812e0780c420fd144d58fe416cd5dbd01e019c3fc53417d65cb2d6e100de123dc8183c8c3dab329fd677ba55644c5 SHA512 c84cc2dab2b1644ab118794b7aeb98748f893a26070359850f48e87cf362fd53b54baf8754a07e1d412cacb85cf9cfcafb3cf10d79c67bbe077e4d763f9703ef
-EBUILD gstreamer-editing-services-1.16.3.ebuild 1854 BLAKE2B ca2103e20fe4db1494a3bfd0292cd14a8c6984bb6eb176cb1b8832e996fd246002077fc053c65d93c1dce510138d8fb1d004bc1261b4c23470512e3c5fbf4d9a SHA512 80b202bc6983adf3b29015bcdba91a60c0bc6d36021f741169648af133e96cf87c214b2063ee61901b8ec0b6e99381902546696080912f8e470cc9c40ed21c27
+EBUILD gstreamer-editing-services-1.16.3.ebuild 1857 BLAKE2B 9161678fd102cc9f249a289f7c6cccc97e9a3e4f4f4591cd598fbaaa736cf73a1b27c86cd1eaa2dfcbf5f0cad4c016796b533fd9567f1aa80c9deaa8d0be2105 SHA512 d5219ab71d71e520bfdf83c0ac58c5b442adc984893026675aeb2b5304c35c029b5debdbd1baf53655a1a097f1271f74e81701fcda3a6a2a02690ed8be2cc2c9
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
index 8b428d9256fb..ea68e1b65af1 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
@@ -1,8 +1,8 @@
-# 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,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 GNOME2_LA_PUNT="yes"
 
 inherit bash-completion-r1 gnome2 python-r1
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 03e1064d3b13..852781541976 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,5 +1,9 @@
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
 DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
+DIST gstreamer-1.18.6.tar.xz 2713892 BLAKE2B 93642e33f0812cae60318ac821fcda450b15894e44d17e1e4dae3a9d84f20e86bbb418bf924fdf2cc52e4bcbbea8cf8fac530157bc48e43fb86819c587ad1aab SHA512 9598da87a6e87ddd134542dd72e110ce53bb673a8f29484d85ce4daff2a19e1fb5c392ddad460d0bb9138a51ae65f06ba2e7251636bbee272070feea428facac
+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.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
new file mode 100644
index 000000000000..865d7a4a1928
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.18.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+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"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		-Dcheck=enabled
+		$(meson_feature unwind libunwind)
+		$(meson_feature unwind libdw)
+	)
+
+	if use caps ; then
+		emesonargs+=( -Dptp-helper-permissions=capabilities )
+	else
+		emesonargs+=(
+			-Dptp-helper-permissions=setuid-root
+			-Dptp-helper-setuid-user=nobody
+			-Dptp-helper-setuid-group=nobody
+		)
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	DESTDIR="${D}" eninja install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/gstreamer/gstreamer-1.20.1.ebuild b/media-libs/gstreamer/gstreamer-1.20.1.ebuild
new file mode 100644
index 000000000000..ffbe7db340d4
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.20.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gstreamer-meson pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+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"
+IUSE="+caps +introspection +orc unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/bison
+	sys-devel/flex
+"
+
+DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE )
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		-Dcheck=enabled
+		$(meson_feature unwind libunwind)
+		$(meson_feature unwind libdw)
+	)
+
+	if use caps ; then
+		emesonargs+=( -Dptp-helper-permissions=capabilities )
+	else
+		emesonargs+=(
+			-Dptp-helper-permissions=setuid-root
+			-Dptp-helper-setuid-user=nobody
+			-Dptp-helper-setuid-group=nobody
+		)
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	DESTDIR="${D}" eninja install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}/usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 67bfe5405cab..174a89f2293a 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,11 @@
-DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
+AUX harfbuzz-3.4.0-multiple_icu_defs.patch 777 BLAKE2B 78eabdcdfc8dc54c53113157b9a05d44f90fb75bea1c4333837519b3782a7cd8107919a98c19a19bd792be1192f02dee441a8ca1932ca2309248a278ec0f589e SHA512 0d993fa05fc2b783c50edfb6309448c12d45ed7a434a9b2a6a9930e87bca08bb380a2329b7807ce2b3519512f24e445cf55ac483b38cd00f50a523b21483ec31
 DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd10312533addc975a8871e549ad33f27f4a6da33cc190e3de17bd12c9716258bd0cb165c4c04da5057f92cc53e8673d4c10a SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
-DIST harfbuzz-3.3.1.tar.gz 29039964 BLAKE2B 55034a83d63369fe6b8a010cbab35615c60d03e052f2f49a6ed176222f2623beaa11e32a3872a0f2128d10b4e7240fcf198d8445b8b80ae0134ff2bf9a51ece4 SHA512 05a5fd52e0eac9eb1288c4d5e49154a29c1dd98032b5afd49cbb563520865ead0fd756651e46374b016fac0d1a584fb89aef5835758b5970266a3c926676da95
-EBUILD harfbuzz-3.1.2.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
-EBUILD harfbuzz-3.2.0.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
-EBUILD harfbuzz-3.3.1.ebuild 2570 BLAKE2B 942e4d6d00de538db5253cb2fac48ddc6d0b2c52475067451d6b130ea71429ffb99b2172a724183786ebd69ae2953629175e651e6354ef70f984d015c2ab3fcb SHA512 8f3c1001af7b91538d38969686d168b4246e1dbc058de9450eba764b15bdba6fb145b11f2c21fea13e88547f1225d420f37acbf5b91541b55f474a1e52d6b8ec
-EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
+DIST harfbuzz-4.0.0.tar.gz 29060304 BLAKE2B f49693d3329a44c7e614d27a491076dd00e725ac85f64bdaacc128a9573e459b84c247c1585adb2e3ce194bd7b3d01ce7c517ff2e27f04d23985b8655188a239 SHA512 d2b740f3392cd2763f467298dcd384e74fdbf592ebc066125451f886163c24bfe7993eb43f34d0ea3933ad16eee1c6f6ebe4e95f48cc13ac6650c64dd0b4ba8c
+DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
+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.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+EBUILD harfbuzz-4.0.1.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
new file mode 100644
index 000000000000..64aebcfc03f1
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
@@ -0,0 +1,24 @@
+From 256dcde149737246a04cfc0fe388cb91acb65522 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Mon, 21 Feb 2022 00:07:03 -0700
+Subject: [PATCH] [meson] handle multiple element ICU DEFS
+
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e22859a265..27cd3daa97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -105,8 +105,8 @@ else
+ endif
+ 
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+-  icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '')
+-  if icu_defs != ''
++  icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split()
++  if icu_defs.length() > 0
+     add_project_arguments(icu_defs, language: ['c', 'cpp'])
+   endif
+ endif
diff --git a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
index f6617befe9b3..a40771678b2b 100644
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	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"
diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8a1d1b1f669e
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
@@ -0,0 +1,102 @@
+# 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/3.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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-multiple_icu_defs.patch" #833891
+)
+
+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 instrospection, 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-3.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild
index 9322b2928b1c..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-3.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild
@@ -21,7 +21,7 @@ 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/3.0.0"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
index a40771678b2b..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
@@ -15,13 +15,13 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	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/3.0.0"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f6617befe9b3..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ fi
 LICENSE="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/3.0.0"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 4968f6b55231..2e2f4df7f5b1 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,5 @@
 AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD ilmbase-2.5.7.ebuild 1089 BLAKE2B 3be2d25a4f410fa55508396bb8aeee554f6747f61b9edb130d99ba2576fe533cef6b5f41e1af58efdecb8d0c7da8e06972257877b111041855d201163ac5e415 SHA512 fead430fb6a6ea5e906ed37a391ae5aaadff56f065aa494f7d3aefdd2f9dcd72635817de87df4247977af2e3ae3d059af9c53d772ec05ed7fec77fb7ee4ff2f0
+EBUILD ilmbase-2.5.7-r2.ebuild 1089 BLAKE2B a23dfaf5e1af5e869882ff36a3f3c594d92243fc4cc3d029a9e3b666814d2464237cb5708647d9702880695249d5879687d4cb22987ed40a65517f0072a0ac39 SHA512 34b375053d274b9c8cbb994471c9b1393ed7f00be8ff60e2cc76ef9cff338f71d549d768223d25b16424614af46cf406c0372a338c508225350ccc2d1ba5e8a7
+EBUILD ilmbase-2.5.7-r3.ebuild 1142 BLAKE2B cffd679f9c0b88a7173445bdcf0242b2e7f694162b74faf5c335b18832a32178a5fa9419ccb58bd38d889229181283e0fbcf5a49ff5e2b0d111d68a2ed655cd5 SHA512 69cd3492ac065772db9829027afa1c6d559d534bf7b7859532367e14a776f6cbc0c3308f0a73d90a4abd0a804ab22cebd4005e16bbc9c044dd633cf580efcd3f
 MISC metadata.xml 692 BLAKE2B 7127a8f7a09d330611b53333d304a65edc9e97ed0d64ee8c0be87ce14c072f2f58507a84800f0ad1191ff2307b97401611aae00f3406bb197ef08294e2cd4639 SHA512 ab1157b16c56c47ae496b12da23f08670bfcae120a00b6c37f5d93cf82fc6981c7f054dd945a67cff17c8c282a4a3e45dc8924cd2ccce78ba6e232f24fa16c99
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild
index 9b78d8f34758..f059ec0f2bc5 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild
new file mode 100644
index 000000000000..4e17a1bf8dab
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!media-libs/openexr:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md )
+
+src_prepare() {
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DILMBASE_INSTALL_PKG_CONFIG=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index b62541ff4ca3..98d8ccd4e9a9 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,7 +1,9 @@
 DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
+DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
 EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B a4c3319f5e05a32bf1e50530b5402812f81984cfcfdff5093be402d3795cdd3d989d014876f9f431eff7ae3c45497a2dd5197c52feecc0609216b0dfcdcdbe79 SHA512 ab82cb5d378bcc45f1ccdf1429a3bf121a3050b9cdd36794440fc292f4ff7e573d8d58951743e5c886b1d3441ebe98411707f490fcc800aeb1ca67255c050d6e
-EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
+EBUILD kvazaar-2.1.0.ebuild 1848 BLAKE2B 9ea0e877e0df6e622a45a5521e6d485318fcc9f0ae7290fea05503352b04b7eb14bd796ee8a21cfc8464ea58453328829803addd713684a7159624b30128c2ba SHA512 91f6f2306cf5704e2012c001591f06cb0bacca453d44f0595f75e87936429d39a24e6d24dd1d69ad60b696c341267464f95908d57578ec2898eaf162c5526c9b
+EBUILD kvazaar-9999.ebuild 1848 BLAKE2B 9ea0e877e0df6e622a45a5521e6d485318fcc9f0ae7290fea05503352b04b7eb14bd796ee8a21cfc8464ea58453328829803addd713684a7159624b30128c2ba SHA512 91f6f2306cf5704e2012c001591f06cb0bacca453d44f0595f75e87936429d39a24e6d24dd1d69ad60b696c341267464f95908d57578ec2898eaf162c5526c9b
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.1.0.ebuild b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
new file mode 100644
index 000000000000..5e1ab5d32af7
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GREATEST_PV="1.2.1"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+else
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+LICENSE="LGPL-2.1"
+# subslot = libkvazaar major
+SLOT="0/6"
+IUSE="static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RESTRICT="!test? ( test )"
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		media-video/ffmpeg
+	)
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+"
+
+src_prepare() {
+	default
+	sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
+	eautoreconf
+	if use test && [[ ${PV} != *9999 ]]; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=595932
+		rmdir "${S}/greatest" || die
+		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+	fi
+	# Some m4 macros append Werror, we do not want that.
+	append-flags "-Wno-error"
+
+	# valgrind isn't available on all archs
+	# also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3)
+	# see https://github.com/ultravideo/kvazaar/issues/216
+	find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index f0ff4dca3520..5e1ab5d32af7 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index f831e319f6f2..00c1bf227809 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,7 +1,11 @@
+AUX lcms-2.13-grayscale-regression.patch 1292 BLAKE2B 09dbb8d22bebbef348aa4f86fd6d32e3398c0577b70321ef7813185fda17475b489a06b315700747442464a03d2644d48d5ade549d0372ff3ba9023fffa6f051 SHA512 b173f31f2428bd9f8590d0b7bdbced17c9e07e9a871b05fed3a2eb73261e4ee52b751cd0fd1a50ad6bc2478b30079df4fba139b233297216910f53b8840c2227
+AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c07d7102c7d2f6c5c442d570fd27998d6e9fcc32224822fbc6dac66a8ad07597d9dd02a4622643421459d2d62fc15710fb5887f03e SHA512 1df85b4372a1df8cebe49415c187d19a830eaaac5b1bc1946246bc1baf60bedf11fe2d4761c929fe58c61206420be96b5ab1fd0088cf4da8007de41d079262e1
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
+DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
 DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824cfa4ca0d6260064945faf0ededfa3b69fa8b041cbad49be1ddb7c6099d3b25873ec0d6e31beecea014808c8f SHA512 28cc5310b54b6254447c04ec8072878eb59e539095c400c05a15975b636f2f49daa2e5fa9021a3f9886a1b50e6c85bd950cefa8f171e3f4ee3be269a8dadc4d2
 EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178
 EBUILD lcms-2.12.ebuild 1283 BLAKE2B 4491db59f78ff4242cb145e0013a08d004cdacfeb16d382869f26696649adca511cd6979914b6e56948352dca7811983161136c1bfad99ae6e592f7c9713a003 SHA512 93052efb79a9102e2558a83c289aecf88c519a233cf6c7cc436aed8e2055b5e8fd858403244691293e778f892458e9e475ca5bcabc8531856c56edad391b96f3
-EBUILD lcms-2.13.ebuild 1291 BLAKE2B 38a2bbe39eab23763a8bf27ece4eb90d30b5e033921c8a13cd28517b94b29638621aa9879358e0607eee29361716224760e0e224303614d118c1dc21d0aaaf2b SHA512 41d18dcd572448d8651c4d845f88d754dcf6e308a029bab2ba3a7b99a11f96d3678b2f84bf38a724bb5f6c339fbcba5fd40e2bc50682fc92c9dad147fa74cb83
+EBUILD lcms-2.13-r1.ebuild 1351 BLAKE2B 59c944d988c637f0522a7d4ac5796834a2ae10aaf0b56ed8d8cffab406b0166d3d85fc7d763a8af5958c72ee6f5045af428f9ad434a59f6ae2267bc798dd3585 SHA512 a5c1a3ebfeba65ca1d7d02d6ccdbdddb9aea6fde725b6ea4b04a68b1c02e37cd48ccfc74004bdf47a487e16b75db41d32b5a8bdaa5d9875261d78585cca0e8ad
+EBUILD lcms-2.13.1.ebuild 1456 BLAKE2B 3b18cf1b4696e6d4c4618b7cc65c363fdfe9a2eaeb8c6b82589b10dd967b75b18c4780091efee1d8e43b5933c8ba682e67ebbf0a4835c8918fba8132417fb855 SHA512 696c7a1edf1fd2150319bbfd59c224f3ef585a81ac0b16abca4deebca14073e08585c12fa87c62acb9dc9bce42b62589660fb22156331eae05daf397908bb261
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
new file mode 100644
index 000000000000..d1ce0483ee6f
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
@@ -0,0 +1,38 @@
+https://github.com/mm2/Little-CMS/commit/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7
+https://bugs.gentoo.org/832520
+
+From: Marti Maria <marti.maria@littlecms.com>
+Date: Sun, 30 Jan 2022 16:56:48 +0100
+Subject: [PATCH] Fix for optimisation error on grayscale
+
+Thanks to Aaron Boxer for reporting this issue
+--- a/src/cmsintrp.c
++++ b/src/cmsintrp.c
+@@ -278,10 +278,10 @@ void Eval1Input(CMSREGISTER const cmsUInt16Number Input[],
+        // if last value...
+        if (Input[0] == 0xffff || p16->Domain[0] == 0) {
+ 
+-           cmsUInt16Number y0 = LutTable[p16->Domain[0]];
+-
++           cmsUInt32Number y0 = p16->Domain[0] * p16->opta[0];
++           
+            for (OutChan = 0; OutChan < p16->nOutputs; OutChan++) {
+-               Output[OutChan] = y0;
++               Output[OutChan] = LutTable[y0 + OutChan];
+            }
+        }
+        else
+@@ -324,10 +324,10 @@ void Eval1InputFloat(const cmsFloat32Number Value[],
+     // if last value...
+     if (val2 == 1.0 || p->Domain[0] == 0) {
+ 
+-        y0 = LutTable[p->Domain[0]];
++        cmsUInt32Number start = p->Domain[0] * p->opta[0];
+ 
+         for (OutChan = 0; OutChan < p->nOutputs; OutChan++) {
+-            Output[OutChan] = y0;
++            Output[OutChan] = LutTable[start + OutChan];
+         }        
+     }
+     else
+
diff --git a/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch
new file mode 100644
index 000000000000..41e12fdf1f4e
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/832733
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+-LIB_PLUGINS = ''
++LIB_PLUGINS=''
+ 
+ # Add configure option --enable-maintainer-mode which enables dependency
+ # checking and generation useful to package maintainers.  This is made an
+@@ -149,7 +149,7 @@
+             [
+                 with_fastfloat='no'
+             ])
+-if test "$with_fastfloat" == "yes"
++if test "$with_fastfloat" = "yes"
+ then
+             LIB_PLUGINS="$LIB_PLUGINS -llcms2_fast_float"
+ fi
+
diff --git a/media-libs/lcms/lcms-2.13.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild
index 592a2703d159..5ffc35b8645b 100644
--- a/media-libs/lcms/lcms-2.13.ebuild
+++ b/media-libs/lcms/lcms-2.13-r1.ebuild
@@ -25,6 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-grayscale-regression.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/media-libs/lcms/lcms-2.13.1.ebuild b/media-libs/lcms/lcms-2.13.1.ebuild
new file mode 100644
index 000000000000..d1f7d6df39a5
--- /dev/null
+++ b/media-libs/lcms/lcms-2.13.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.13.1-fix-configure-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	# TODO: Swap back to elibtoolize once dropped eautoreconf (for bashism patch)
+	# for Prefix/Solaris
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		$(use_with zlib)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 329894ce1f62..8fc45fc92227 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +1,6 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1480 BLAKE2B abf532f63f5ce083a4c6245dbd8b48f39c31b432522648694c191d1b52c932ae383ae51bf44346518be061035147c3c20025cc8b730fae2946166326ac202cfb SHA512 1b49eb61435f067007e0bf8ed62de963a8ef9b14937c8bb91021815012a754de8fea122f1bb1d8aba18ec0ac0a67f19f70d3b8da5e5fdd3d089df302abccd489
+DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
+EBUILD lensfun-0.3.2-r1.ebuild 1480 BLAKE2B efb609dca27ad95b193f5b4e2d1e5bd8dde7740be3878d9fb48dae651bde567881cfe5747cf0f2664db4d0999b022d5b8fd23ff5d5c81e0a85b26f84c92d349a SHA512 87f7f9732e2befc6c53e15664125345c88fc24710d31c311cad49754b8f5ea99613432d791737c51906177202078be7a5d9fdfc4e98b73637565cf53d0135bb9
+EBUILD lensfun-0.3.3.ebuild 1487 BLAKE2B ded57460e00e2c0d2bfc281dc21c970dca4a4be7c3719ece82d10be40f3e562aff5bccbc1a981a4fb1d8af12e4e2369189576e4acd822ebce31b8482053e5d66 SHA512 e88a7ab4a23f2ac80700e114180213b010ad277091461ccd2b06a2923c4b643570ea784d65e38f05e15d9eca681eb31c674827c8a6ec4f5eaeb94381130dcb9f
 MISC metadata.xml 714 BLAKE2B 68947d3724407e09902ca87a7d7857ef43007fc04fbf428ae23ca065564755836c9939c29b745d4477d1e75da71a436dc9308b99a98219aa86c059bfb50f8b38 SHA512 a62f71b0b4deba655826f8f78e95a3585d5e012ed3ab9c8576cba1f6535ef3d4626dfe821ec62e60bd00d00dffd00c1da5ca7a5ae5dba1b7587dc3fc57550078
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 1853d83462d2..0cf6eb2b6e13 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
diff --git a/media-libs/lensfun/lensfun-0.3.3.ebuild b/media-libs/lensfun/lensfun-0.3.3.ebuild
new file mode 100644
index 000000000000..8911ea725f13
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.3.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 cmake
+
+DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.40
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md docs/mounts.txt ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-warnings.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DSETUP_PY_INSTALL_PREFIX=/usr
+		-DBUILD_LENSTOOL=ON
+		-DBUILD_STATIC=OFF
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
+		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	mkdir -p "${T}/db/lensfun" || die
+	cp data/db/* "${T}/db/lensfun/" || die
+
+	XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 7497539ba641..71bf4264e5bc 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,3 +1,6 @@
 DIST libaacs-0.11.0.tar.bz2 324061 BLAKE2B 8faffa270580f82b7fc6ae53922a9ec15087b754adebc84f1fd216c748dbcbe6723c14908efc9ef77b891bda149d10bf5020321906a36a3654dddbf6bdc00936 SHA512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388
+DIST libaacs-0.11.1.tar.bz2 325669 BLAKE2B be8553ef8d312d3c62005b12d0473f9f3a8e1d0fbe86b0c0e69ffe213b26658489a1d0b0414222d2a5088d157832e5b27b989945d4a25b1a16e858e43e67629d SHA512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42
 EBUILD libaacs-0.11.0.ebuild 995 BLAKE2B 6e8356455234f41ed2de48888365e747878e272ad7d020540709b678c87a885bb66b2e8881842ad4a71f75a10f3cd400cb03ec2eab70c9a6b20d6464a2df5aa8 SHA512 1b33bfca2086f60b46edc39cf351f1d2ec166cf54dd07a6a778775916e60cb1ca9f500794678cb9adfafc0e67d01b1dd677ce072d4c6e74d1eaba351a63af248
+EBUILD libaacs-0.11.1-r1.ebuild 1038 BLAKE2B 5448e6bd32dfca1feff18db5106e2207a5dcb97ee042168c2dd80aeb9691bb9ea80e2ac581eaf45a18e71d3237758e55eee3fb403200683544e60609c04221fc SHA512 999d74bcce19be181db4ee6f93a9db1d666c439f5bd1cb49b8873d5a293e9ae39cd76a54e25bf61160c5c524deda0b679e9582a5224387dda34deadeed926d03
+EBUILD libaacs-0.11.1.ebuild 948 BLAKE2B d64e141c12b57cd873171139c5559988cd872f452b0336f93ad4b1f232f405de7617a707d5a99f3d97fd2ec9584a1a9d368a6dce32fb01246d4a32bd8df2de4c SHA512 f0764473c03e0498b9c4bd4d3855c287b7765987ae4e78e61ace287627999e54e94bea3bc99367b37c538114806c1cb626f575a70df2a65bc7de4e5a99cf1669
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-libs/libaacs/libaacs-0.11.1-r1.ebuild b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..3e7993af6438
--- /dev/null
+++ b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
+HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
+SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+	virtual/yacc"
+
+DOCS=( ChangeLog KEYDB.cfg README.md )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-optimizations
+		--enable-shared
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# Workaround automake bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54390
+	mkdir -p "${BUILD_DIR}"/src/file || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libaacs/libaacs-0.11.1.ebuild b/media-libs/libaacs/libaacs-0.11.1.ebuild
new file mode 100644
index 000000000000..0a75f45c2dbd
--- /dev/null
+++ b/media-libs/libaacs/libaacs-0.11.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
+HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
+SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+	virtual/yacc"
+
+DOCS=( ChangeLog KEYDB.cfg README.md )
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-optimizations
+		--enable-shared
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 815849f288ca..2556c45c19fb 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,4 +1,6 @@
 DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2eafd94eeb1b92177d2c7b5c32de2342f9cf1c7e500b28fdac2b00ea8d43b1e56c9d1c8c0efe1bbc4e40285a52a SHA512 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
+DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 EBUILD libaom-3.2.0.ebuild 2422 BLAKE2B 3bc74e6923f44c3daefdbed351e6fabb3ace367981499af4051205d3e8d5e0200a072ba8f9d91302d7a32be751c64f1f89a4d7fe095f8354c56d147a04ec55e6 SHA512 34767df5f510f6ba88eef3475d4e52765ba8967150854635c363cca2c7e42fc3646205d6aea64b9f6e1397dc87a582bfbf3e42f472355e5527cb294bd473742a
-EBUILD libaom-9999.ebuild 2428 BLAKE2B 274b92868f8986aecf1cddd8d47e4c70d1070eb262b772ff440d3e1ff05bfe5ab2ea12f411582bd776a6e87fa8933653b79604ccd070deeb6163af4a828a9b6c SHA512 415e58b83def4ad6b9b5b60ac98e5edd3929d4ba042d05b02949f8b958dd728d725c05a92aea6f51cc72b69c8d52d9acfde0605365ae7ab5efc910b09d8cae07
+EBUILD libaom-3.3.0.ebuild 3090 BLAKE2B 5174985df97a5ce713c16230bb2744a71e3cd5203d5e1301c58cf90353df3af9c7790a2ea817b2fa78064ae8b2a30223d29258f1df8027b91fc22be44969decc SHA512 1ddd6c41017f2236c03c0a3d0f4c14cbc8a926f6eae2a92f52547a02b450964c3b5b284c3d8367ad6a799dcebec9ae828bda8e922cbc5960f8da5d6972622205
+EBUILD libaom-9999.ebuild 2432 BLAKE2B e5dea7087d3d0dc2a5ed9e671c0a3e044c0cd079299f851b63d10c4e5d446002b47f0707a8e31d0427355df0b77cfd71bbdc41bdbdba6cdb36bd23707a8451d4 SHA512 316469183bc7b44a60db5ab0ffd59ebc634426901bf56cde8658e28cfd95815af9d31f4e9215e09c7e2ed1f335eef407da74096e82060cd413356841cf7fe371
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.3.0.ebuild b/media-libs/libaom/libaom-3.3.0.ebuild
new file mode 100644
index 000000000000..e23ac9e6a952
--- /dev/null
+++ b/media-libs/libaom/libaom-3.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc +examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 1c7cfa25f6f8..711be136d0c9 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
@@ -12,12 +11,11 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	S="${WORKDIR}"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
 
 LICENSE="BSD-2"
 SLOT="0/3"
@@ -38,7 +36,7 @@ BDEPEND="${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
 "
 
-# the PATENTS file is required to be distributed with this package bug #682214
+# the PATENTS file is required to be distributed with this package, bug #682214
 DOCS=( PATENTS )
 
 multilib_src_configure() {
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index a68fabd2685c..cf2a543eee30 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,5 @@
 DIST libass-0.15.1.tar.xz 369884 BLAKE2B d5b7a4e474aa847ace6ba36085b7c2ef6de3e70fe00e3ea99be0f6c54d807969d90bb08d651357445e2158b01058f4c2995e1bb1d5f895479cdc0fb67fa3495e SHA512 e5a1cca7a72b21de7da2f83fc46db6b35e822593b67fa16563451f4121965e16e825a1665996a0e6022992e6b0365fc2b9b898932dd8086d2ee87b48851ef307
 DIST libass-0.15.2.tar.xz 382036 BLAKE2B 6448bbb152787e813c2f32544694b4854723d97fcac281355f61b3efd3499c65a0a27f7405060c0a4aa200795b564a1907d3db04dda6ecaa892ad3fc78e9cb77 SHA512 4a352d2d21d8a7f25d593f0456cd057912589e55c0709dbf33150d23253fa7859da41584238f03c51782e066a0f92c6849c36b6210324cdb57ed01539921a39b
 EBUILD libass-0.15.1-r2.ebuild 1195 BLAKE2B eddb9a6b968ac94ce771b139e6e5961c5ef94a7863370feebbccb88c438eb020d10b134889966118a50e345ac10abec813e860c3b9aec042a018ad80e66b22ed SHA512 f4cc0d36a9d8119b14cfe433f70ea35b2220a190e1dc4d1345b2f324be819368247afe037a44655e35bcec4afb9607389ab87622e4679a7d6bbac574056f8810
-EBUILD libass-0.15.2.ebuild 1202 BLAKE2B fb79eeae9318f9331a79790ab545b7ef5bf04f57f6955fe593dea1e2261129708abf1489d81dbe86b9f46302ea3bcaaafa2ab20b6c2f8c024b0c4d31a4e8b4d5 SHA512 8b7ebb02e7ec0c2ced75ef4f4951d61bd5b1f088b68c1102a66d4d6ed80baf0a4914790aad5efda8335c8ef38ccd987279dc0f0c6396d1d264c1c1c2d8e5263b
+EBUILD libass-0.15.2.ebuild 1195 BLAKE2B 32c63c8e9c0d12e742f1e43571f715c804082dfec08eabadd4bee2b1f80db62eb28f59878249c689bc7718f997892bd43f2bc10d2f8195fe3fd3d456d0a61c05 SHA512 0491131050348caeacd6633d754fb234ef29c8d35e634109df068cb9f2f8fe9212885622afc3c1ea1291fd832bfa437bbec0f197f3e2cd63ca38af83d1e78504
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.15.2.ebuild b/media-libs/libass/libass-0.15.2.ebuild
index c7b276399d86..473e2635aabf 100644
--- a/media-libs/libass/libass-0.15.2.ebuild
+++ b/media-libs/libass/libass-0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index 3e826b81b29d..3e9211a482e8 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,4 +1,6 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
+DIST libbdplus-0.2.0.tar.bz2 321743 BLAKE2B 2ef8da1741829aef1e0e52fda3ef4d41d05fc7141d1e38c0e8bbdf116fe7afa65024c9d97f61e5ec9ccdf5d2d6063a4d1aff2a0731e7f19b280e31f1b637a9c2 SHA512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6
 EBUILD libbdplus-0.1.2-r1.ebuild 1050 BLAKE2B 10a40ea3e988f632026a315dbde1d4527578fe6ce681b3b12af65aa90473bec0a6829150a9f736721f261c0c73e890b654dce2cb496982261ac770e85952fb33 SHA512 b9066a5d1a0d9833e8b466375906e0f23b685ad91493f5c5e6b8a26bf03241e26f3864512591915990a34f2960eccb345c6fdea08ca6cfa101a5dff6f911bdfd
-EBUILD libbdplus-9999.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
+EBUILD libbdplus-0.2.0.ebuild 1040 BLAKE2B af69923a82128d5ac6c8028107995921bd80d44c2f2cb0d5ddc4afdc58122bc0a2499ca563f4d93845f6a6be274357b01e285d6e8500a8e9123ffe343230db2d SHA512 41f82471a7b3b1a85a0dff09712c2928f4a5a4734f4496d913b7bf3657c0ddcafa585d9f3a5cde82d09426318b9bad285c3a80dc1705ebbb1d01fe09eb72686c
+EBUILD libbdplus-9999.ebuild 1040 BLAKE2B af69923a82128d5ac6c8028107995921bd80d44c2f2cb0d5ddc4afdc58122bc0a2499ca563f4d93845f6a6be274357b01e285d6e8500a8e9123ffe343230db2d SHA512 41f82471a7b3b1a85a0dff09712c2928f4a5a4734f4496d913b7bf3657c0ddcafa585d9f3a5cde82d09426318b9bad285c3a80dc1705ebbb1d01fe09eb72686c
 MISC metadata.xml 347 BLAKE2B 8db9fe97341f2b23aea662c6a416c7fa0c4a6c593afb3ed4c55f20326b07a03d909b0d23055c37eccbf44f53098542d273198d97e95ceb425172c050e0dc03c5 SHA512 96b0fba6ce8a9fe073ce96f18fcca7961b682c6f5c2839992bb323fbfd3984bdcb234ae475914055b4336002825e7c9e4ba6ab673e9c2dfeebbd6dce8880e499
diff --git a/media-libs/libbdplus/libbdplus-0.2.0.ebuild b/media-libs/libbdplus/libbdplus-0.2.0.ebuild
new file mode 100644
index 000000000000..42d90708b4cc
--- /dev/null
+++ b/media-libs/libbdplus/libbdplus-0.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Blu-ray library for BD+ decryption"
+HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aacs"
+
+RDEPEND="
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-optimizations
+		$(use_with aacs libaacs)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libbdplus/libbdplus-9999.ebuild b/media-libs/libbdplus/libbdplus-9999.ebuild
index 8bffc8107314..42d90708b4cc 100644
--- a/media-libs/libbdplus/libbdplus-9999.ebuild
+++ b/media-libs/libbdplus/libbdplus-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
 
 inherit multilib-minimal
 
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="aacs"
 
 RDEPEND="
-	dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
 	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )
 "
@@ -29,19 +29,21 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
+
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-optimizations
-		--disable-static
 		$(use_with aacs libaacs)
 	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 9592f7801e2e..3a99ef269691 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -2,8 +2,10 @@ AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b27
 DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54 SHA512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
 DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a SHA512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
+DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8 SHA512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
 EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
 EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
-EBUILD libbluray-9999.ebuild 2007 BLAKE2B 478fd75959be666b511ca485c1bceea124b70282273dcdb687c9ae1e6b98d0bc6c7e92fa0ccbb020a29370202c248dc7ec1a0b2b5eaf4269714db18cae12344f SHA512 5a168560da9a4db8f929596176889e3ac7d6ea34c9c9ca2f39f37550909e45502976933d08456dcfe67c815a41564105321aa5f3bfde5e4f52680814b45590f6
+EBUILD libbluray-1.3.1.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
+EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/libbluray-1.3.1.ebuild b/media-libs/libbluray/libbluray-1.3.1.ebuild
new file mode 100644
index 000000000000..9d617a0039d2
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.3.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV#9999} != ${PV} ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit autotools java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
+
+RDEPEND="
+	dev-libs/libudfread[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.8:* )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8:*
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #621992
+	use java || unset JDK_HOME
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 6781e565d5d8..9d617a0039d2 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,24 +1,24 @@
-# 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
 
-if [[ "${PV#9999}" != "${PV}" ]] ; then
+if [[ ${PV#9999} != ${PV} ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+inherit autotools java-pkg-opt-2 multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
 RDEPEND="
 	dev-libs/libudfread[${MULTILIB_USEDEP}]
@@ -45,15 +45,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch
 )
 
-DOCS=( ChangeLog README.txt )
+DOCS=( ChangeLog README.md )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
-	use java || unset JDK_HOME # Bug #621992.
+	# bug #621992
+	use java || unset JDK_HOME
 
 	ECONF_SOURCE="${S}" econf \
 		--disable-optimizations \
@@ -61,23 +63,23 @@ multilib_src_configure() {
 		$(multilib_native_use_enable java bdjava-jar) \
 		$(use_with fontconfig) \
 		$(use_with truetype freetype) \
-		$(use_enable static-libs static) \
 		$(use_with xml libxml2)
 }
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
+
 	multilib_is_native_abi || return
 
 	use utils &&
 		find .libs/ -type f -executable ! -name "${PN}.*" \
 			 $(use java || echo '! -name bdj_test') -exec dobin {} +
 
-	use java &&
-		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
 }
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 6bf6c1537913..13a302b8f1b1 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,5 +1,7 @@
 AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a251a71d134f36365125879384bc638a4f7ae19308041658f98e27570b7e5255f945a504f520401fed44ceceb581f31abd335 SHA512 75c95893f64bb599e00ef96c303b8daad1e8d02f017deb428eb934fa1716f6736a3388e11ff5474103b1b5afafb89aff5e0ed038c8c93e90f5be0f97585c3ebb
 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
 MISC metadata.xml 334 BLAKE2B d9be9083a98a2b39213e4be83809d0fc452d0ce36ac1d9f90a62ce46a921842daead9da5efc3fa677df8e8e6578f15d298f669a7a7c309d137716859e1420747 SHA512 5ed9828508c9cc4e02f337bb7acb844d418ff555372bc5bdb1650b3e8a366bb1ab2a2bac88a6e5b08b6b74e8f3dce119971b126cccfd329fb206b9358eb934a3
diff --git a/media-libs/libcdaudio/files/libcdaudio-0.99.12-libdir-fix.patch b/media-libs/libcdaudio/files/libcdaudio-0.99.12-libdir-fix.patch
new file mode 100644
index 000000000000..96ee6fabf69d
--- /dev/null
+++ b/media-libs/libcdaudio/files/libcdaudio-0.99.12-libdir-fix.patch
@@ -0,0 +1,12 @@
+diff -ur a/libcdaudio-config.in b/libcdaudio-config.in
+--- a/libcdaudio-config.in	2022-02-23 09:34:38.948920631 -0600
++++ b/libcdaudio-config.in	2022-02-23 09:34:56.239410252 -0600
+@@ -49,7 +49,7 @@
+ 		echo @LIB_LDADD@
+ 	;;
+ 	--libs)
+-		libdir=-L${exec_prefix}/lib
++		libdir=-L${exec_prefix}@libdir@
+ 		echo $libdir -lcdaudio @LIBS@
+ 	;;
+ 	*)
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
new file mode 100644
index 000000000000..041695340a12
--- /dev/null
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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
+	"${FILESDIR}"/${P}-libdir-fix.patch
+)
+
+src_configure() {
+	econf --enable-threads --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index e8a2b526d872..13346da21b1b 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,3 +1,3 @@
 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
-EBUILD libchamplain-0.12.20.ebuild 1441 BLAKE2B fe9fea138c567b7086047e346a0b42a783ea444af3294ad5684e3efbd9685895ddc02cc991f8d361af867a46684a43d56ab4368be9e9758bf6488f77ccf0830b SHA512 eaf4de6212da83a8a748649a88fac965f6b52a119a564b99e03e99eae3e67cb1f38b3af64f03a35dc5438bd8d8055fbd10bb816180325685205d15e33969e052
+EBUILD libchamplain-0.12.20.ebuild 1440 BLAKE2B 3e82e12557656dfaa095c46ddc455c1ef3d31a057cd5aa5c0e646c7dedd9659d10d3e36f567ed2b720485667ada09dd4a15a478643706d3567e49f63aeeb8c1c SHA512 826a2d6e09f1d6a4c5a609251a9e99acec27d8bfa1ae8326114b79c7670a594ac0d5fe11cc81aca775495605d631575960a4e1884af54450ad8d4ba908b0bf4e
 MISC metadata.xml 622 BLAKE2B 6b7b529567c7ee1612bebeb0bcd219a821daed7cc9ed124d8c9e071e023138b98bf14c93c95f4701127cfbaaf77ac913378a7673ce1db79de999b82ee4b5a209 SHA512 936a8c3b394c0d7d37e97dd19dd4112333021218a3c723c740f29f584f8319d58dcba261f59188c4d53cac2ca847c2e9a601177a8bca7309248c53cda82a9f4d
diff --git a/media-libs/libchamplain/libchamplain-0.12.20.ebuild b/media-libs/libchamplain/libchamplain-0.12.20.ebuild
index 343c72ebe4ee..9b39ee57b76c 100644
--- a/media-libs/libchamplain/libchamplain-0.12.20.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+gtk gtk-doc +introspection vala"
 REQUIRED_USE="
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index 713cc2a1b275..9697e0b982b5 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,3 +1,3 @@
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
-EBUILD libdiscid-0.6.2.ebuild 601 BLAKE2B 1e0f7e7aa7f1ea53c8e5d09cb69194356b6b627c29b04627f6cbb568517b180497b35fec579451252ae4defda76d2d9c4382f5a8db07cec4e1354ab3145888d9 SHA512 c897bfb4bc60e8790efc871ac3242aeaa30d604eeed643d7112b9214460f3b30cc3631e8c388b6102daf4210b3a34e4b048b25a890c59709fb54b28a20ab3bf6
+EBUILD libdiscid-0.6.2.ebuild 600 BLAKE2B a57e6445a0d7fb98246a0c66fc3336d81ff9816480199ab358e3bc3e05c27f5af7564fc9d45d97bfb8261abc0933966aeb26ed174d9f0c71237292ba53629a6f SHA512 608d3555f95b058dc4346346b82a5a0937d38e2e9ab854439d922aac0e61bd0b80f3b086684a3e3d5096e928c36057d8403e06f5db58ef841287d87d461fe71a
 MISC metadata.xml 588 BLAKE2B fd4496362fde7a6f1a7c7ae74ddae9e52d1037d01d35660edb695f863491fa34ac001c32114525115730451a83fdd81d46a70c369df112ecfe0fc2f58cf5fc42 SHA512 adc9c5d0d91f0902df19f9dd3360ad6588dcc7aee37beee25e10c2cc50e27f7a500034c47e932621c7ff1c1f3741bc8633fa9d29598d6f39e309ffcbb9040f2c
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index cc66774eef9b..7648758331d9 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index b2e7f3e51be4..b4b34698e089 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -2,5 +2,5 @@ AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e
 DIST libexif-0.6.23.tar.gz 2764684 BLAKE2B 517eaadc71b6ccaa7899b89b770a14fc051f365c728d5518fe6f0c05aa14690eaa6a33323c9305d02398df6ba2fceb806537202224a3c00018f7bcf835a3ff84 SHA512 c382b5f36e4fc1501664e3bad18553abb1b18f752f93111af5081e996bcc37b425ac9f0b0e1ffd7145270254ac44a4adb7875d5b0d8379113da6162b17442e23
 DIST libexif-0.6.24.tar.bz2 1992163 BLAKE2B 75d3a2b4fefd7b7706226e70d31250ef7e99eeb81a4839ddc36cc9e3180534542d8a02851f8e6fd5034bbc925a616ead8c4bfb0cce8bc5886c3ec54811914a6b SHA512 35c9e7af2c3d44a638dc6bbe8f96962d41c0f3fe4a257494f7a73baefab9aba507477175289ccf9002a66cc16ca53d5d1f44d6fef9e014b27f687ecdc58f5111
 EBUILD libexif-0.6.23.ebuild 1259 BLAKE2B 37fbb51a58132fd41e93dd1bb739027b333c685fbf359936d706a4835a682f289238905fda934e3d92ac966ae4e997c7a5e179fc8e3fde1fd03163824e309d4e SHA512 06aba07cca26cbe47f175ca566004972cb6de84b4396bd74c37858351057d8bb4421f094e9d664981740873234d4a7d3bfd97bcbd6201bb166b14ff12ee53c40
-EBUILD libexif-0.6.24.ebuild 1228 BLAKE2B 56bc7cac5dcee342b1c9b108459769f4caac856d8a7059106c8b19c8cb7b2eb7e250aac653a349a38c1449f6b709d475e78791d38c25d3362ec6d8707290ab18 SHA512 bc03f8fae43f1d8c7729a1c85f993e419be15b44ce353093349393935f44183af318ee3956def8a8acb718f1c945714279e38faea3646417f630e726818fa9dd
+EBUILD libexif-0.6.24.ebuild 1221 BLAKE2B 401acaf75dcadb4d84fcb67d3f93594ce1f4319c659ccbe2336fb801795acfb694035a39dd59c3e89a690f6d77cf4a33c1a8304868a5d8dd6c3c0ec78e647468 SHA512 1c8b91de1488327b2146e7b977d3c56655aa348bf8ce0ee2cf95fe2a16f92903f7052de1bbf1108f1925b1802134be92dcebfdde1253cb772848460c59d330c2
 MISC metadata.xml 453 BLAKE2B a6539b21b1ea55bbd09ab7385ae771673a802a3dcc41d637fae7ad50f2f67aecc2c253cc77c86d80df83649972d8619f9e18e8b9d7c6259ecc1326617be8ffff SHA512 44b76d19654a28cfaedbd9627d9556554846ce48f142cdfd67753f395547cb3717772cdef6935a641354a5621c560a0b7d276dac4ab62d467d42946a8327e0cc
diff --git a/media-libs/libexif/libexif-0.6.24.ebuild b/media-libs/libexif/libexif-0.6.24.ebuild
index 8d78a770bc8a..6ebe41757a0c 100644
--- a/media-libs/libexif/libexif-0.6.24.ebuild
+++ b/media-libs/libexif/libexif-0.6.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 921b5f1ab189..da5c43e2d176 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 597 BLAKE2B 4fc750b04079094c4251e60cc4067847ba015a9bef54c83ac9ecc2b53a24048279df06711b5fa1482e379e25a7cce7aed491a67129469bca46ee747a30f7427d SHA512 9f0823e3554c7602b27d39d565af89079e6a5260f19f6850bf3f2f228a4cd6e40a27f94c1a85e6aed0226918beb6dcefdd85b830fbbe438bdcb899dccd51e4f8
diff --git a/media-libs/libffado/libffado-2.4.5.ebuild b/media-libs/libffado/libffado-2.4.5.ebuild
new file mode 100644
index 000000000000..8383212fe83e
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/libfpx/Manifest b/media-libs/libfpx/Manifest
index 14add44120d1..0bb724cd9522 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,4 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10.ebuild 988 BLAKE2B 05e951ed01112ced23099a464bcca11be6f9d2cf768b8a4273de1402c0b1f3510c7acdb9bbb24eeab6e363dd6bfcd900528bf2ea5e6888e9e0c38e5e556774be SHA512 6c83f36c8fc4176ea738523940e0c71fb77bc1fb51d02243c40b9b8144d31bc757551feb747e0bc480584068c00a0bbefd9a1dcbddc227bf4a290d20b733a4cb
+EBUILD libfpx-1.3.1_p10.ebuild 1007 BLAKE2B d9add94c9bcaddd83ce4ffd2a4515ada117d08c82d1145686d161b102e516d46db061b9da15e9b7bbff3a3b6d93e03e6409b07f736d33e799b204b7045a8719b SHA512 e520fd9a0b7bd2df7b6c61223c1519262e0b593a0f57718fa521e9aecda6769a3b554495848d2246f2cea867a5f0b2efb1d7f451f1115dc05828980d8db0227c
 MISC metadata.xml 334 BLAKE2B 5f2c903be8e07657f0b5ea2f60d1d51cd22c18582227ca2f3d7e86b1911b790e442aed299bd894217c99e106fbcb4a31c3c240eba69338f9de14cfb8ede765da SHA512 b4d167b6a8f3dadcde95c86990d0855862b84e465bf4538c7991d0d581cc0c91d42923435e66d381c91f657b150ac322f25fd7bc1bdb4870cf489534279f5859
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 74cc58c20d49..2215b9f1cefa 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.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
@@ -40,6 +40,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog doc/*.txt
 
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/*.pdf
+	docinto pdf
+	dodoc doc/*.pdf
+	docompress -x /usr/share/doc/${PF}/pdf
 }
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
index dfefcd76f839..628481c0faca 100644
--- a/media-libs/libfreeaptx/Manifest
+++ b/media-libs/libfreeaptx/Manifest
@@ -1,5 +1,5 @@
 AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
 DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
-EBUILD libfreeaptx-0.1.1.ebuild 1064 BLAKE2B e01207c4e23f52f93415e0773893052fe1a3c6d0e34c8a68b621613627d4d9f492df644ffd1ead185aa71d0d3e00c510b670950bacb5b811a33e83492d1fa537 SHA512 2604e506a76c7ee29dab662fcc94403be5d6fc23239cf951e2d26c380c85a45adde54d7cf3da59397dbe3054e8ba2ca11b209bd4214ba403b07bc09ea2a7ed9b
+EBUILD libfreeaptx-0.1.1-r1.ebuild 1171 BLAKE2B 22e52588a9cd332920862f5195f66b5787439e5b044d056505607d98d11146b41a7d559082f0cd8e763d3f695a7f5517d7b81eaac2065808da7fae92a951be78 SHA512 2c8a6a215dcc2fb60b38541201e8b5ad8e1494d45858e9afe8de43678abe561ab43fa305c35586ac555c0866f1ee5ed5b1897b8ac4afa7c31381433ee834cf9a
 EBUILD libfreeaptx-9999.ebuild 1104 BLAKE2B 9ab4ea981ac6243332276f0f17b3b941b4a49b658cabf5e6658efb7664cd71ae522683383f023788cc8dafb233d0ff94d4f21e16ed47a36f8d7273638d963706 SHA512 99f6b1912b7c00e7c2e0f55ee7c9210697b2b0d705a85920a02a58c9aaa443fa29e85128a699b76280a994b27b1a954e0c9e900c74ad41133a2484d2b671eae5
 MISC metadata.xml 443 BLAKE2B c6bc37f198358a17bb8c099093ed64f9318966930771426243e401e35d8c4c0b4d764532ded69a71ec6e5ed463d582106d8574d661bd9d9a144b71528b0d02ae SHA512 ab15fe16e8ab3e5cfc792dbbb65437e17ee76f4b9b94a08fa90f553f1d15a1c179e6cd791962ac9ddc764b50ac5410ddf0dd7c3618b2c274f6fcb5ef7c5982ea
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.ebuild
index d27cd8ed1912..349cf9fa588b 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.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
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Reverse-engineered aptX and aptX HD library (fork of libopenaptx)"
 HOMEPAGE="https://github.com/iamthehorker/libfreeaptx"
@@ -24,7 +24,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-version.patch
 )
 
-src_compile() {
+src_prepare() {
+	default
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
 	tc-export CC AR
 
 	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
@@ -38,7 +45,7 @@ src_compile() {
 		all
 }
 
-src_install() {
+multilib_src_install() {
 	emake \
 		PREFIX="${EPREFIX}"/usr \
 		DESTDIR="${D}" \
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 653d7130802a..c7809ff4bae0 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,3 +1,3 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2-r1.ebuild 751 BLAKE2B d2bd984fed1a075ae0b0497ed16c4f90130c31ca1b44ce529b81dfe218b875002cf6bfdcf469c476178afad8dfe005cde03c271e93d85d3e8b7e458bef7cdaf1 SHA512 8f28a5479e7aa60d875f1f22b34ced3168ea0ad1cb01cfea71d742c11b8e2054a78fb7bce8af6cf85e6f83a382f919f4a867e3da435d2814ca6552cdd77cf314
+EBUILD libggiwmh-0.3.2-r1.ebuild 758 BLAKE2B debf90f6aabb4f100bf2bcd5614316490c67927c3055447e77a9acb3a3468b04a1de8924cb0ea38e00e4b6ed9bd255c02219f7bbb23f7ac40c2cd06857e5aa70 SHA512 41d1f1228164480a6aedfff4a0c48c3f5242a7d70d4252b59ff674d5bd7da69351d5d5e3492781c81aee83246b59a810cbcd6f684d504c6da849ad6a4bd2b932
 MISC metadata.xml 297 BLAKE2B 5224c162fdbab9d408c0b908e21f3b910c078888b850127f6c0ac140f1db19de89677b89465d56efe0d336e9f3bba8ffb0167d228c2daaba8c05c819e8788c35 SHA512 1d1d5cf70a0dddfb1f131cb9253cb13dbed3995a801485ca0a4e7194ef128e50cd70e42113d4d2c0d3b73b09d520ef5e3fd2b41fd2dd078a42c6c17f1f6976f8
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index 699e643a96bd..3d92579a0e83 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 6381190172dd..53d96e671121 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,4 @@
-DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
 DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
-EBUILD libglvnd-1.3.4.ebuild 1421 BLAKE2B b22257530cbf32ff9e61f9abeb5990a376e839caf28491d6ab5b99c149ce51a812cb9b6a7d8e43cf5f56bbf6dc21a969635270843556e407aa85b18a0977feca SHA512 35aec220b9ce9596cc668cefc40d6977282396f3c381bf6a633278186782cb336a9bccd4a335e4898c27b8c05bc5c175d033f1374259431fd900185e442ec321
-EBUILD libglvnd-1.4.0.ebuild 1425 BLAKE2B 1e37e15d239526714907d332bf5bc7bfb8e4ea04fd6692a55b0eba9626e2f99f0113e510da9fe1bef39d9a7a4d9233bec91194853786b731798bd67737721b7b SHA512 b00f4798b362ba466ea35444739fb1c28aaaf6b0cb87f56c387ee99c34e712ca5d7fb47b1384c82ba5f71b0a3c3b014be26031415d135e872c2d9f60bf428484
+EBUILD libglvnd-1.4.0.ebuild 1424 BLAKE2B 50a8c3a6a5541a1794a783c81ce0c446dd50e0c7927bc40498199c29fc931adf36e39d895cc81e5d0c0a195f11c380484655a014fe2ed5653e1ee411b2ae7100 SHA512 6116bd1538f71ff9a6ddaf500b668508129a5cbd679da2110dfd37568f5404ffa37fcb9c7a1207ff20c5364427dcaaf5e7dab7ec4d1bf1473073301d2da7d129
 EBUILD libglvnd-9999.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.3.4.ebuild b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
deleted file mode 100644
index 4e4423833af2..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
-	!media-libs/mesa[-libglvnd(+)]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-		$(meson_feature X glx)
-	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use X; then
-		virtx meson_src_test
-	else
-		meson_src_test
-	fi
-}
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
index bf7eccde03d4..e423bc734b47 100644
--- a/media-libs/libglvnd/libglvnd-1.4.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index e048bd41bebc..8142d16696cc 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,6 +1,6 @@
 AUX 2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch 6423 BLAKE2B ef91e230e39cb4a57db00b858f7375c1e2d62dd390373b2d70ba9ec4f2950c7a2ccc753ce467de9569c2888f2cd2c4d8f9333edd90a905a98b76b091f1184e82 SHA512 4bfe532bf3148627146310b4ab21814042402a7f0c78411ca5af2d992102d6be82b9675ba90df4c427843faede90bcdbe6e78b700cb4c83e7a2ef3e0b9371465
-DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
 DIST libgphoto2-2.5.28.tar.bz2 7399434 BLAKE2B 3feed613fd84cbea6109afa2ce643ad8be9b3df14cf332cbd93a8260d7082756f5278578b4052a289b954751a82a2f62583ea327ce96255bd653912130319bfc SHA512 5898d35a991361a6cc6824cb88aab79326b59e4080b5e885e1619667d11c4a92d24a1d3fbdbd6af49696508ace1eba1b17bf2f406c72dc9ad69bcf019bc86eec
-EBUILD libgphoto2-2.5.27-r1.ebuild 6138 BLAKE2B 83d032cea7648fd9abab34677882082dc9589fa568e6d3451e48c63a8e35b774a41071ccd0c6249b7c3efb2d28cc4fc411827a8bd7b5a5aeeeab5f6730fdf336 SHA512 7f313d046bc0a3ae0cddb1b09b6b5ea472d14a741305bfdc9427872e8b1bcf221793ee20d0e4c86fc1bc83d61e614298efe96cf20da6e032d9d1c73e923e3256
-EBUILD libgphoto2-2.5.28.ebuild 6270 BLAKE2B 0bc7d864dc6e6942e52ca5ee014938688b5a2d47092d3367bc69fb2db842726604497ec6acbc8227a846239ce4c620c86806d76881b90e9a82d7ffcae1a36b15 SHA512 9228db88081ea83e025bbb5b800e6a2e2a36824a629a8263c5dd0dc0687bf92a547b457f820047c65abec6cfedb21f5fca97be06afd5340975e6e5aed278acac
+DIST libgphoto2-2.5.29.tar.xz 5875684 BLAKE2B a0bc48b95ecff3c7f157b7baee18bc3ad86d376c9adc6f7eedd2f8cea40434cc97598cad49ebc1e4683492f9eb3e5b3494de3112bb740d2ccd8e2c55cf4ff1ed SHA512 f8e3dbea58fa6f19a100ee319d5561387a54e8701a19d034bc7d6fe474dc6e4f21fccc4b6c11346df4fdc811666d49ea0b9a2b5b67aab00acd5a1e94d9259c94
+EBUILD libgphoto2-2.5.28.ebuild 6263 BLAKE2B 90b8acfb93c0237076ad1bd5a03ef12a472b1598f9dc4db35472209fb6186c7c7f786531063c6a250de68d8a2e3aae7b797b1d19e5303a2ad972a7d0186f7813 SHA512 99b679a74ff8883a17619b327332c5db56ffa23532d1e4807a2c39f5514059ce513eef299458fabd8eade9bd9903fe3bbda1046bf1cb00f0212c759ed5651f79
+EBUILD libgphoto2-2.5.29.ebuild 6184 BLAKE2B fc31faae2c9b70eff9069f5c86dabd7439a414936179dbcb8e39071c267d3dabcd2e1091320751f9579266fb74eb8a1bac7615af33743dc8851a5f904e69bd61 SHA512 b46e1f8c793545c824e6fbb7c8e12f67fe1bd57b67eac969830c1766504b67c1c876ea1d960a7b0cb9272b1ed8302a2372a9ac96cf8ee24aa3382df34f3b8bf8
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
index 21661ad1025e..cac1cf938107 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
index 5ef1555d66f1..6e421c8a0712 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.29.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
 
 # TODO
@@ -6,18 +6,18 @@
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=7
-inherit multilib multilib-minimal udev
+inherit autotools multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz"
 
 LICENSE="GPL-2"
 
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -89,11 +89,13 @@ src_prepare() {
 		|| die "examples sed failed"
 
 	sed -e 's/sleep 2//' -i configure || die
+
+	eautoreconf # For configure.ac patching
 }
 
 multilib_src_configure() {
 	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
+	use doc || myconf=( ac_cv_path_DOXYGEN=no )
 
 	# Upstream doesn't default to --enable-option-checking due having another
 	# configure in libgphoto2_port/ that also needs to be checked on every bump
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index c7ea8eb7ddd3..06713388e857 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -4,4 +4,4 @@ AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
 EBUILD libgroove-4.3.0-r1.ebuild 1034 BLAKE2B 51ff73ff9ca7beb103c59ec0fa2ec93d3f5ebfcfabe90856635fc4646b1872a498d236b7d816e03037a6512eababa1ca30d2ff4afbd1c1462d27d0607cf51966 SHA512 b3bdb7c215e049b88341244b7b2458869ef949fa9e039008fa561696b2057c38686954852a217674279e5ffc2626181cf9b4fefafe12cd2078727d028906a8df
-MISC metadata.xml 1233 BLAKE2B fb00dd0aa47f3f0c1d2cc9bd420a3189cf45e262a45e5d06bd04c99b2e12be23304af70bc11bc89eaf46c5e8488412fc95bd854de20ad6f6422b2893debc7010 SHA512 36e54f83059c47d175cde2c68dda4cd305514ef03a3999a26695f8706f45110a050be309973a4a379d0dc58e4febe34cdf86d5230f6578995293ddf6f0c4d83a
+MISC metadata.xml 1012 BLAKE2B 6484365a3e695db09f305f8a4a8f04ee08947c17fb397a2657e4c839afd30ce01424a35c0716228fc3b836cdb68b57227ec93c135f2f168068c068d08e3ccc5c SHA512 ea0dc25acb9d66d9b22bd684216c20eb22892fa6caf63dcba6179687bcde45b4289de544509ee014f2c52ab8bc94bd8299a93bb5bd2f2393527b799fe359a1fb
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index 6c3c5dad1c05..59a78738e302 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>sir.suriv@gmail.com</email>
-	<name>Diogo Pereira</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 	This library provides decoding and encoding of audio on a playlist. It is intended to be used as a backend for music player applications. That said, it is also generic enough to be used as a backend for any streaming audio processing utility.
 </longdescription>
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
index 9fb962c03863..2964faefe12a 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,8 +1,4 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
-DIST libinsane-1.0.7.tar.gz 964471 BLAKE2B 8c91f9799fe0f4bd3181e62a31396f2eb0670b41bc6c231da8714d87dcf854299fd6777481fc0cfb70700d1f34dbb453695451ea2e09ab180a14d601cd678197 SHA512 9c9f884fa3f99a7b04882a4cf866ab5c0b7abb1f60ac75ba921856184ad1471de41dc5a0c312eba93eb82c75d54bea9e30c76f2ee8b647904da700e013fe3ba9
-DIST libinsane-1.0.8.tar.gz 965255 BLAKE2B f87281f599b097a077b3d09457585c31d6def2b42fcf66bb4207998cdd3e609b2ae4034f6867c49869668ff411effdd150d23b1ea0e92cce45adf43e23203c80 SHA512 810a7e7005b93a4da53aefa6b3c63824800eba5fee9b945d45f64372a98e04e6fd5fd554db817f2b41c481ec78b3723b151337de6cb5784d423868e19bd36aa3
 DIST libinsane-1.0.9.tar.gz 965461 BLAKE2B ee464d8b3328e8205dbc04d779c8c55133c3bab8b5483ab151870c22311f5d5c000a535baba95ea6362d130f57b6f185e9391017f808dec4bf23a93109546337 SHA512 a3d5ef16363454956c39767968515db76d1c279035e3a4c6a7db77a3e99e409b77cdacd27ccfba0fe80f5bf36d8c37d700aed551645b6038f3b770b2eaec10e2
-EBUILD libinsane-1.0.7.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
-EBUILD libinsane-1.0.8.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
 EBUILD libinsane-1.0.9.ebuild 960 BLAKE2B 2a1a06eb5298f55876733c54b44429ae5b725fde3d58107be717d6b66f6b7b536eb3dc7f3bbbeb9605e1143075dd5d3f787c698254298df1a2a98a9085e4af0a SHA512 a5b1eb340dbeaadd6874e3dd4feef06c115bd6c0bae62fa95dd0288ffd85b45c2745a8095283f150b32bf5f8bded24755075937ebcc1d6caf3dae0bf3219144c
 MISC metadata.xml 1016 BLAKE2B a332e663ae5b286f57990c4e48d0c3767a54b6e5f6059986367783b75618dabbd13c2118de34e8c750765f3bed207cc40a8eaeca02e2fb8b5d2557799457d5b5 SHA512 b8870c17184ef366edf70710deb5f40e16819301870478c8902471bf09820fb08c9cfd85ae14d844c2a0b8ad3ba1f99cf6c84a7d47c5029a40de5584ab73efa7
diff --git a/media-libs/libinsane/libinsane-1.0.7.ebuild b/media-libs/libinsane/libinsane-1.0.7.ebuild
deleted file mode 100644
index bf213a427962..000000000000
--- a/media-libs/libinsane/libinsane-1.0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="dev-libs/gobject-introspection
-	media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="dev-util/glib-utils
-	virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.8.ebuild b/media-libs/libinsane/libinsane-1.0.8.ebuild
deleted file mode 100644
index bf213a427962..000000000000
--- a/media-libs/libinsane/libinsane-1.0.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="dev-libs/gobject-introspection
-	media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="dev-util/glib-utils
-	virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 37b4b8df94bd..cabbb42c8453 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,7 +1,9 @@
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
 DIST libjpeg-turbo-2.1.2.tar.gz 2257645 BLAKE2B ae8b7db9fd634b3b29a916098e2b54a8e045cb7a9d883de1f2e8a34542154a724e5d7788fb4b4d816c36d6503fc2a7427165dc3af9d47c77bfb7c51a42bc1d51 SHA512 f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5
+DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3248 BLAKE2B a2b9fcc4939e064ebb0f73875ce3a4cfa5e3233c0c8125905f66f8f76320fda29cd4ad4c0c08b66844dc7f36e9bce696ece323798c897c7e03243a8982e9117e SHA512 aa15cb2b8f08cd54d590a8ac76d3eb8b512ad8c62235a239cf36fda55f818a71462834b7e3579f4becc8269e2b3bccdbd6f6f809305fb2f6578587e03338a416
 EBUILD libjpeg-turbo-2.1.2-r1.ebuild 2898 BLAKE2B 0dfb36277ffab99dd91be4b5861ee7f2f09ebfbfdf0e296ed55d6b45d65a05a43bc521a335dafbaeb851c945745974dd5c158fd7731453714658d943353f9f93 SHA512 f70c4d19f544e834369c2087d178b40acef209455ee025f41e78bf47feedd0c99e7f88c4b4689ba70fbefbcc2c083547db151b002e8f71e8474abbba6528ff51
+EBUILD libjpeg-turbo-2.1.3.ebuild 2928 BLAKE2B 37dad1918b06c2953612b3a81a569c9df80728b4c1ecb56cfdd7316ea5e01695ec6e7ad1b9f5b2fcd2dc511313b2a4945f3ba33f3073eb048bcb3b10d913e43a SHA512 34a80fd44958235f3ffc2c919479a3fc24c075c47e5a09c1d895c632b3341f07a81cc6eb34c18b7709662cb1db4066932454b5cedef3171ccc18a1c2fbad5fc8
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
new file mode 100644
index 000000000000..19d0c5004701
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib java-pkg-opt-2
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+if [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="cpu_flags_arm_neon java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+
+BDEPEND=">=dev-util/cmake-3.16.5
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	local FILE
+	ln -snf ../debian/extra/*.c . || die
+
+	for FILE in ../debian/extra/*.c; do
+		FILE=${FILE##*/}
+		cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+	done
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+
+	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
+	if use arm || use arm64; then
+		mycmakeargs+=(
+			-DWITH_SIMD=$(usex cpu_flags_arm_neon)
+			-DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
+		)
+	fi
+
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
+		mycmakeargs+=(
+			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use java ; then
+		rm -rf "${ED}"/usr/classes || die
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local -a DOCS=( README.md ChangeLog.md )
+	einstalldocs
+
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	dobin "${WORKDIR}"/debian/extra/exifautotran
+	doman "${WORKDIR}"/debian/extra/*.[0-9]*
+
+	docinto html
+	dodoc -r "${S}"/doc/html/.
+
+	if use java; then
+		docinto html/java
+		dodoc -r "${S}"/java/doc/.
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index 433e1d4d193b..e996d4819869 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,5 +1,3 @@
-DIST libkeyfinder-2.2.5.tar.gz 79220 BLAKE2B a0a9b6b0d392d8da7be479e30a733f64f0c0723a1890a969ff1cc0ffc56599778148f7fe081724e83f1b3cc2217bb52f46418ed328da7d34d9229aabf24cbaef SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb
 DIST libkeyfinder-2.2.6.tar.gz 79371 BLAKE2B dbc1b531098686169cf358a631ce2dfd8d053df93cbcc31b4fd1320ee01f84e60f0b4e290d57b31f0ba09b7d81430574b98dbc4a181953119a732f019c437f48 SHA512 c1b771cebfb925db521a344e28fd1d3bc6e6e921e45dcc81f90926e5b2020fea201a4bc05a65177d3559208a45746fd7784eb6f37352bb10ab7d7b820b40c0b6
-EBUILD libkeyfinder-2.2.5.ebuild 633 BLAKE2B 0498b9032218a6e8912666f125cf12601870b018f0babe3f2bafcf907f1d95e140845840938d18821dd1de6de43d393aa1ea80732711a921295ed4349ca6a084 SHA512 20071b62303ef5f15c32aeb001dba8f0dfd4c8a10ed04b220a5a15a367acb57bf7652d557ebde32b9744944c4270870fbb0c0e40f2064260779bb26ef6cf2935
-EBUILD libkeyfinder-2.2.6.ebuild 633 BLAKE2B 2682a8a8a2ed7755cabbfbf61af10c7cec8273d4a1c06fb261f1f3e95eda618b4fd137a2a6da108ee04ffa00433bd830928b787962ee45f3dc6db978d27472bb SHA512 5430c319e2208547ff35462d45325cde341e088c76b17fb99945fe3407f5a3ca18265361faee82b355cf1c333873d4c91e3d3441211af0734b3f6d05a826bbf8
+EBUILD libkeyfinder-2.2.6.ebuild 632 BLAKE2B 47da5f4d0e30c7079f2a272069b34f09b257be64601e95d73d2d5d3dab3b509e43b592198d7173b7ac1f4c2eb329945274f397e7b7a40922e2209e5617e0d99c SHA512 0ac33a037a00e4834bd0d828b095a47d3df68c18225651e2862a3e0fbe705f0842afe4c6cedd22f0ffd735a39a49dc0ea6570f775c20efa9276445f060a6e94b
 MISC metadata.xml 260 BLAKE2B 67e6833093739454709d11437f08f56992d87b35e1f70405c5667ce6f35164e50891bd5a590f67a234c7a6bcfaa53bbd3b0034324a70aaabf1dfbdac16c20681 SHA512 ec587e23153929573978a938c94e2e87519f5e08fba1e07d0aedfa782f6ce09480299149ad874c04f7f5acf21c1ca8275efcb2a3589d16842041ce1c11cb63ab
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
deleted file mode 100644
index 43183be273ec..000000000000
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Musical key detection library for digital audio"
-HOMEPAGE="https://github.com/mixxxdj/libkeyfinder"
-SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sci-libs/fftw:3.0
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/NAMES fftw /NAMES /" \
-		cmake/FindFFTW3.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
index 4b58f20bc804..453059773918 100644
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index ca260cbeea8f..07618597260a 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
-EBUILD libldac-2.0.2.3.ebuild 611 BLAKE2B 1f843fc9b9156edf8839d84a7842156936999593bb0061764bdb2a4e3f2bd1a3180e243ff2c651b8d2decbfa9e20ea2e1cf35b0539869194d5ba7e4e54d166a8 SHA512 453fc5044c33de0eedc92e483bd2cf965ac31226dbd011788dbcde2858e08fb728de2273087afb87386d4f23f3658c552079e20a531f7966cc0dd3ab8a239c38
+EBUILD libldac-2.0.2.3-r1.ebuild 695 BLAKE2B bd3fe04a8bc31af08607cc42dcc485867297a17f4c16732505e9740e3a4f8a72f73b4230ffe3d216953d9007b1d58164dffc273008116c4ec02fe395776955fa SHA512 951ed4eab2b886af2ca93d944bbe8e226165845b899a5b3c34b8c413e76294ac4924c6cc477c41339e46c09fcfac330e7461caf75fc77525956c8eafa3376879
 MISC metadata.xml 295 BLAKE2B 23ffbd8cccd6184716f9d45199f0aeefb4c8629b2b75b0205ee7b76ef4851eabccd9e912f5612a58cd5cc9cc7582d3154efa19a6c3391fbde03b335f81e098a8 SHA512 dff2d678a578497377ce964d374e5690721cf1cf9aa8955ecdfd5acde1a00b987b67b22b78b782b3d9350f01611b81d816f88d00ecd3d00375afe586858c570d
diff --git a/media-libs/libldac/libldac-2.0.2.3.ebuild b/media-libs/libldac/libldac-2.0.2.3-r1.ebuild
index 611a50404c67..17ec26c64b25 100644
--- a/media-libs/libldac/libldac-2.0.2.3.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 DESCRIPTION="LDAC codec library from AOSP"
 HOMEPAGE="https://android.googlesource.com/platform/external/libldac/"
@@ -15,7 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-
 
 S="${WORKDIR}/ldacBT"
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DLDAC_SOFT_FLOAT=OFF
 		-DINSTALL_LIBDIR=/usr/$(get_libdir)
@@ -23,3 +24,7 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake-multilib_src_install
+}
diff --git a/media-libs/libltc/Manifest b/media-libs/libltc/Manifest
index d8b612cc6df0..0dd6c01a84c0 100644
--- a/media-libs/libltc/Manifest
+++ b/media-libs/libltc/Manifest
@@ -1,4 +1,4 @@
 DIST libltc-1.3.1.tar.gz 440790 BLAKE2B 881a237a23e6f4a9d058d69b26cad78c96a9dc0f90bb5b5ffc2d08f4b894d039b57e53cb70844d89b0defa5795d252e3afef07d43bfd4dc8b10a34066b6c1efe SHA512 e4ba96560f04155d022d2c975fa36d4bb77efb9a877344041e1bd12bd5e7d04dccb452f3a4e061aba961bd0c3c0d1d53dc98ac469e04e61a934feeedc20e09b3
-EBUILD libltc-1.3.1-r1.ebuild 636 BLAKE2B 39bce99c13b892d3ee8c0f51889d995e0c632dfec5f3998341893de7799fb917737d55cd73551ee82fa8daac9cad771f5cff35ccd6ae4df242baf8fdb9b0d107 SHA512 20a2d328bc8d105e7c3b32103d887610e4eed7d8e05049c89d94afcf186684cd9dafee782f9f773b5b4134e063bffff12de3bebcc58ff6579f4255babefd86bd
-EBUILD libltc-9999.ebuild 637 BLAKE2B 4be99e4b5703025bfc195c3888939494026b269e9a71941d7398155b9ef1b15cf803e98e36f839e669e0bb73ef2c50c6f58df4d3cee06e01eb81cce3b6bc64d5 SHA512 f20bd2865c70ac0cb31077cb520c5481f49aa023d3c588ec001a6ac0d58040bc89f44eee7cd10ebac9daa92d2c7f97175305952b0c47d6aaabc1d81fbe94ba4a
+EBUILD libltc-1.3.1-r1.ebuild 627 BLAKE2B 785e8d0e3ef817cfb1d7d426518842d09d3ddc30d2fedae658e4600d727a0fb2b4fe25eb7b2c594eac017c329ce0f56d8889c5f4f473bdf5a5ecae195682afc4 SHA512 a2ac7e63ef75cae901936462733cfb4d56ccbaff8130f8bdb5f20a44acea6281b9e41f0645a46801cf3a159d3ffbda62449cdae6bec5060afc91e954bc2823bc
+EBUILD libltc-9999.ebuild 628 BLAKE2B 407f8e4e3a512ffd1074fe83a07dacb79777adec1de7ebc759734dcf2284e85c70330a1a3ef79fd4aea432851efd88d844aefe17095b2b68bb89dccf1d90ffe1 SHA512 192b57e9e2b1ad8eeeb9147c335dede561948a8141a6b174f5e4e4ebcdb0965945b4c7edea755f50b903973ae32411f926a2f1f0095287adb6739ac3e5e1b4b3
 MISC metadata.xml 393 BLAKE2B 8767a82f0fafc648e7c900f16a10b1100666f648e356d012c1ad3e47a098f4b79c35b4f70cc8fccf008d97d2fd4e2bf936482dcadacbfbbb8ae748f9ecd423a7 SHA512 cacb1b95b2a7216ea8d92dc105093000b1693e94dc26914305ceb4767ee0c23a82bf29d3343dd879ffa5b1018ead25148024482f3e7d3c5f414a251236add29a
diff --git a/media-libs/libltc/libltc-1.3.1-r1.ebuild b/media-libs/libltc/libltc-1.3.1-r1.ebuild
index 7ec6c8eaf9eb..5a4b897e7335 100644
--- a/media-libs/libltc/libltc-1.3.1-r1.ebuild
+++ b/media-libs/libltc/libltc-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RESTRICT="mirror"
 src_prepare() {
 	default
 
-	[[ ${PV} == *9999 ]] && (eautoreconf || die)
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_install() {
diff --git a/media-libs/libltc/libltc-9999.ebuild b/media-libs/libltc/libltc-9999.ebuild
index 37f4e75a206e..3f002a9de5ae 100644
--- a/media-libs/libltc/libltc-9999.ebuild
+++ b/media-libs/libltc/libltc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RESTRICT="mirror"
 src_prepare() {
 	default
 
-	[[ ${PV} == *9999 ]] && (eautoreconf || die)
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_install() {
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index f0841ee2b9a5..b898922077ee 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,3 @@
 DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
-EBUILD libmatemixer-1.24.1.ebuild 774 BLAKE2B 5befe6b705c85f3a3718736beb28db3838e33a28faf1d987e0b81fc784a101d71d4e179b10348dd66634fb95350a4690b01e0690966d957bc642e45277e50366 SHA512 912e899e61151ea4bbd7f857c274216ef229b7ca4f3bcbd326c2991b276c9a2572ce2671088814933af243e7eb77f394654e8b2e254ebe35340b3fc5c7531175
+EBUILD libmatemixer-1.24.1-r1.ebuild 768 BLAKE2B d9f01b771f0bf2298c2101adcfdc0f130235712bab44cd78f413667d1549d4676625dd3512242a359522635db718bb6d454b57b0b050bcd4be4bbd031906cb4c SHA512 a732593f69b3a85fc5409b5701f87477f8120daccf872fe8f2dfd8fa161a57c9afa5b1e1696e2914cf356b4881296f0351e742636caf9a5b334f18ba6e9a756b
 MISC metadata.xml 342 BLAKE2B 7003d4ae792752fb338346cf2dc5c76e54ea8bf8f3eb4b130bf55e65b7a3faaa64e311737920dacebd6a787d25b96ed71a476faa852d8a37df6397d3bada34f9 SHA512 04787f69a60ae67bdf2db0204bb4f01d968b4ce2cfad97e7ef50e16c9674b6d3016587aee3c08e9c2d35385dfb65c612568a1ffe79b52a858c4849155a25bbae
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
index f74391f426f8..5bb125a158b0 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.50:2
 	>=sys-devel/gettext-0.19.8:*
 	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[glib] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 4dfef2d3a480..08e567f6e338 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,3 @@
 DIST libmpdclient-2.20.tar.xz 71552 BLAKE2B d80c343d7655ccddb253275694d40665d286bf9c59729d0c836c927ab479b1ab4819f36a69c62a29c3ad220fcbfa712da5418cf8c3cc9f9e24af4e3c39ce1e11 SHA512 3271c8eae017402976dbfabc51c7cb8d39912c8a3fd6cd075adc978d490f2eb850d86ccec9f7bccbda48c9d6ca1cda89918ac7c76b21f7f63ca1a276b67e94b6
-EBUILD libmpdclient-2.20.ebuild 1023 BLAKE2B 885902239be571d2193c3635cee0fcc930bca9813513a07633d74fca28a5ecc23507689326be50ebd988c2789d3c54af221399a8dd3b4b11c0f91613cfeae112 SHA512 ad9421de6f5269aa4440e69b889bafdb91d1b6bf2f4e7bde661a62473393c21a4431824f29d151dcdfb9998ec4e066de56f099bda7bbd805b3719632b8c65ba6
+EBUILD libmpdclient-2.20.ebuild 1016 BLAKE2B 45420c8d3180c843137508493aa75e247c518904b6af6ec3ef7d6d496e59771bb94e923768456ab8a6e2d0ac3ba8c90c9087243a2a7d29cf641277e252d8b23a SHA512 d5b2c51f5c7a0b8e5c50ee414991d81d8066d49c10796d5bbdf4b9772db08a901712c252c7368f2f89c86a7d9b2000ef8fdae9cdd7f6c17efd33195eee8bbd26
 MISC metadata.xml 349 BLAKE2B d4d0ea2f19d76de587387907f676073a9c162d1bfb19543a3b5ab9f8beebc68c790cd64027a897da33d1a73925c11b5ed63f9d8f1ae53394a61922311aba7e79 SHA512 7e1aace7ae0668b1855ec46371320e98fce2a7f4719847e7fb1675ae9ecb54bd6006d699f3fd6bbccd4e2789512493fac310e104b84f77efcbb080cdf9de7129
diff --git a/media-libs/libmpdclient/libmpdclient-2.20.ebuild b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
index f76f8a091c05..223b5fe1687f 100644
--- a/media-libs/libmpdclient/libmpdclient-2.20.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
index dd6ff9e6592a..fd3f2168c1b1 100644
--- a/media-libs/libopenaptx/Manifest
+++ b/media-libs/libopenaptx/Manifest
@@ -1,6 +1,6 @@
 DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
 DIST libopenaptx-0.2.1.tar.gz 31575 BLAKE2B 531a1b4e8f4a711bf1b36dfea2424b23821dd4f0b50cc367e1298fc7a41f32ec494fdb25907173d1e2685bd0af74d3ebe5a7a3f221f2e57e92bd6d6e2b8b80c8 SHA512 7c7f515585ed41cd276cd3141037ce21e3ebdb713dc932bcdb33320d9910c734bc81e581e2c09b3399b3516c789e5da7128fdab5ab6b5e4f42a86b6ac6d3f28c
-EBUILD libopenaptx-0.2.0.ebuild 1052 BLAKE2B 0bd31710677fd210a422d93af0f3ebac5a5670764c488e8e4be5f9b93c8e17c2d011df8fc229bab4b3ca3c4f9cd68d2906de85086dc4d3a4bfbf047886e71f73 SHA512 01b8bbddfe2d9fb4227bbade0960334e007af4337266735fa2f959cbfd000fa49f79a09c2c9c4e348b373201eca3d9988a8c8add1af43a068f716a7e4e8379df
-EBUILD libopenaptx-0.2.1.ebuild 1012 BLAKE2B 8b4ab8722197e813535dfa19cd15884f72101e4ce7861c18c551834b3303f81242a91a71e931d1d88fe4eb0d58cbb85212f9412262c867b38646b8451f0d41a1 SHA512 9a9e7fbc7eb610b1ef5d0da3a56d968352a68252c26a204cdbee35a9a15d6b1b860eae3349c2cc76cb00be44038885422bddf79015abba4f20e1bf14374b4f85
+EBUILD libopenaptx-0.2.0-r1.ebuild 1159 BLAKE2B cd309bf7fda782ca98b9f268296e0eecc304859bb8c1bf0e18199c075672205fb39dfa5cad5dd4eda6639e77de6dd33e309700d21629e4fe1af524482f70a2a8 SHA512 c8120815ad0ccc6813eff9a553c648e7450f2a9bf9362a2d669fa3244543038337f978bd1d77b539baab33bf890184761f6b5c185edc37e56197053788086e8a
+EBUILD libopenaptx-0.2.1-r1.ebuild 1119 BLAKE2B f94f8b0d418f0712e5162d9362da0d6fc1aa40946c239e2b11438a8bd7838d02fb8467836f0cdd57cd409de98dfedb613ad7f87f425bbc91cecc9a1a4fef6d15 SHA512 933a57560a202c1f9015db4302daddf22f07873977c05d8f32dc8756fef68e5daa9b5b5f9d9246d007b767495570909f1c51246df5d1f1c0161a721164c698f8
 EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
 MISC metadata.xml 476 BLAKE2B be4271abb0887a42331d01cf6a071b7fcf6b6c9260a6aa0032cb2219fd97a809fccbbc391d5be002b8839d6d1fb78b5c58350053d7198524281dc6520174c0d3 SHA512 7fd6ade1cde67518d8957de391520995cbb0f00559031f7acec69010da500569103f87842dc9ca29921a2c9482354d7ed11c402cb080a79b9d88d3458cf1a78c
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0-r1.ebuild
index 4a08c59202ca..84aea87a2a3f 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0-r1.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
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Reverse-engineered aptX and aptX HD library"
 HOMEPAGE="https://github.com/pali/libopenaptx"
@@ -21,7 +21,14 @@ SLOT="0"
 
 IUSE="cpu_flags_x86_avx2"
 
-src_compile() {
+src_prepare() {
+	default
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
 	tc-export CC AR
 
 	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
@@ -35,7 +42,7 @@ src_compile() {
 		all
 }
 
-src_install() {
+multilib_src_install() {
 	emake \
 		PREFIX="${EPREFIX}"/usr \
 		DESTDIR="${D}" \
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.1.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.1-r1.ebuild
index 41f077aff4f5..e33fdfe55cac 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.1.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.1-r1.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
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Reverse-engineered aptX and aptX HD library"
 HOMEPAGE="https://github.com/pali/libopenaptx"
@@ -21,7 +21,14 @@ SLOT="0"
 
 IUSE="cpu_flags_x86_avx2"
 
-src_compile() {
+src_prepare() {
+	default
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
 	tc-export CC AR
 
 	use cpu_flags_x86_avx2 && append-cflags "-mavx2"
@@ -35,7 +42,7 @@ src_compile() {
 		all
 }
 
-src_install() {
+multilib_src_install() {
 	emake \
 		PREFIX="${EPREFIX}"/usr \
 		DESTDIR="${D}" \
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 7e073ccb9460..577583738b71 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,5 +1,7 @@
 DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
-DIST libopenmpt-0.6.0+release.autotools.tar.gz 1506911 BLAKE2B 44cf8c5f725d2b11409d23e293dca0c151cad17c029da7f70a22366e75baa1b49b763f67d617d84a142efd3933b90344ccca5d881e5c724e2cfe0210170593dc SHA512 8da6cf1f2dbf683c32f45cbf884784360cced5e21f9862c96a1a679bd90b36be9a7cc59accbf82271a804722986cb81e75915f6564aeaaa248ed3e967dfdfb1a
+DIST libopenmpt-0.6.1+release.autotools.tar.gz 1511280 BLAKE2B 222e71f0cc1343ff76c9ffc295664c52db74906b20a9c7cdd7d7e7d05a4795a2cda1d0de265f0e1b2dabc1bfb6757342046117222b5d035f633ae9da7e7d2301 SHA512 b43124746fc7c8bdbcfcf24c5cff1cd8330cab664fd1641ac7a35416ed25bb80c74f31db74085c13f4beb9774c17c12a4486c8c5e976f3fbb70a27c236c0f4fb
+DIST libopenmpt-0.6.2+release.autotools.tar.gz 1514140 BLAKE2B 38e8d24352cce92b38ddf8e1f33af7fb72571b88b8f4cbddff626affe2f00bdb73635872d502417e37c68aa0f2254338088bb493b47c688a22d342b3ba54f725 SHA512 a4bbf804d4be72d11216173371ab81703877071cf15e2daaaf59b0eb892d5948072af00bd1ec8c097c23bb3f77bc2c0be6cf853dcf3c7c24aa6109a9f74d0948
 EBUILD libopenmpt-0.5.14.ebuild 1544 BLAKE2B ce1beb9e386a70e598f295b4caedab63a9bfb273e4d31a7b78047d68b176dc6b46bf673ca97a395bb30067629785ef9f9117502c3bb0f6a50c25d7045203f51c SHA512 9b834a31821d7fae8e409241b4acf5c298a539c815191cef68219ed6ce6a4edb1cf85f50254c6ea61d17898fbbb0f58ed5c40f4ca35c7cc5965aadadcaa4a5d9
-EBUILD libopenmpt-0.6.0.ebuild 1546 BLAKE2B 681d53024b675898c28c08ffd1541380fbc375b09c70cbb41e724d27fa76608f496c2ffaf164663ff01ea9243b65616ab191d93328812b24b3c18121d165c082 SHA512 1e0eedabe9d82f5493c590d3262f2fc61ae0ed402d90743101e6a07674134f725223d5573f729e2a411c3aa7eebbf013c98442fe808af443e5c9d11f9ad63d86
+EBUILD libopenmpt-0.6.1.ebuild 1546 BLAKE2B d286b4a71a7b0717b004a3cd48756cffee5a0d628da54ff12f06a3876562bd5ba4ff8a4986c0f38ab62e242f36f543977860d4d41a55ef8baf149088e05ea2cd SHA512 2039890692c50e32ddc36a5e48be90c125076e9000bce1b16efca2ce83c0531d912c09fd4b9f1bbab99aebf6d42b799b59f055051017c46c8b1274800ac9e512
+EBUILD libopenmpt-0.6.2.ebuild 1546 BLAKE2B d286b4a71a7b0717b004a3cd48756cffee5a0d628da54ff12f06a3876562bd5ba4ff8a4986c0f38ab62e242f36f543977860d4d41a55ef8baf149088e05ea2cd SHA512 2039890692c50e32ddc36a5e48be90c125076e9000bce1b16efca2ce83c0531d912c09fd4b9f1bbab99aebf6d42b799b59f055051017c46c8b1274800ac9e512
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.0.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.1.ebuild
index ecc623d23085..80d66a784a6e 100644
--- a/media-libs/libopenmpt/libopenmpt-0.6.0.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild
new file mode 100644
index 000000000000..80d66a784a6e
--- /dev/null
+++ b/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="Library to decode tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="examples mp3 ogg static-libs test vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )
+	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	# A lot of these optional dependencies relate to openmpt123, which
+	# we package separately, so we disable them here.
+	econf \
+		$(use_enable static-libs static) \
+		--disable-openmpt123 \
+		--disable-examples \
+		$(use_enable test tests) \
+		--disable-doxygen-doc \
+		$(use_with zlib) \
+		$(use_with mp3 mpg123) \
+		$(use_with ogg) \
+		$(use_with vorbis) \
+		$(use_with vorbis vorbisfile) \
+		--without-pulseaudio \
+		--without-portaudio \
+		--without-portaudiocpp \
+		--without-sdl2 \
+		--without-sndfile \
+		--without-flac
+}
+
+multilib_src_install_all() {
+	rm -f \
+		"${ED}"/usr/*/*.la \
+		"${ED}"/usr/share/doc/${P}/LICENSE || die
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${P}/examples || die
+	fi
+}
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 15e36a7cd8c5..d46e3658510b 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -4,9 +4,11 @@ DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf
 DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
 DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c01a27c5f97873ff0e5e3212d9b7cdebd98cce3d5ee5364ca8a585ec2a16d0bafc5a863ed35f6f225d86a4410b92edfd3 SHA512 6a2d3c6c053edc3a912a46f9c16d226d83c6f8880714f0b20a8b9417889616e4c1d4d41b8935b898cc580dc3b480ce974bb3921162165f0774ea91be1dfff520
+DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
 EBUILD libplacebo-2.43.0.ebuild 1462 BLAKE2B f040787c2e5848e5be23c77af1af76e68e2ac0e85bd178e00621e6c9fde8a69b01ba681e350d3d783a5812188ede1ea58e209be899b7a6b19c876fc7f5822118 SHA512 990a0551961a89f335e437ce984ffc0047816d655a7ba6be8202c6d791b840840aba63352ff6fd2af5d4cc41a36eb7ace63e51bb03019621768602154c5486b8
 EBUILD libplacebo-2.43.1.ebuild 1478 BLAKE2B 5184f42cdda1740d9b2fb33e05406517d076ad7d557da6c74b580200863fdc340cf208f716da38b172a4f06f9fb74fcc461afcd25ac886a10b398816f96f0689 SHA512 bddeac21c3635c87c7079477c02df39586e6a9604ac65a69b12714bbcf72373b1a9999a3b8bd1cdccff4f42a2c1c62757714162a97cc381419a481626834114d
 EBUILD libplacebo-2.72.2.ebuild 1854 BLAKE2B 707afa5008705ac6e26a4773b8af28e774ce1d43c3d5c6490d51ca01cec05b034dc0429dbb82a5bd14c7fad05e6633031bac645464afa29edf093d444368448f SHA512 3e2c29c2a24db7cdfa43c38c71e399774886359adfaa52ac8988334a3844c6ee519248a945ba9ebd39a93c045d4e3e8cd9e139b37fc299ca93ed3828587ad842
 EBUILD libplacebo-3.120.3.ebuild 2031 BLAKE2B 997411cc63ea1bf8b4b4b3885528f9c0a5ed8051bb544c2994d81c003c3bd75396d1232feebd7931e9fb46539f0fffcd6d00c8a7116f344ae2204eb816ae201e SHA512 dc07f76ded931f7c1052a0e334b0165d378af3d9355d325e37049ba2e5962ae1ae8874555fd3e5d15a3bbc8c1e272c81b45803a5ba870692506a62d014c39fbe
-EBUILD libplacebo-9999.ebuild 1820 BLAKE2B 2400b3afe34f17b9a15e2fbe38dd628fa9abdca33c76b2e48a45a1372b6ccd62064aabb3b0d4b222bbeb1f99f8a4e5a4d55f75b7ae046845caf417213c33b970 SHA512 7d6b0ace53931b8e731d19fc801fb1eaaafa74fef5cf8df8fbac03943036760d82d4702d7da4b4aa5eb37d3e2c62450a297bd03ed6ed53a82069b36ca6492104
+EBUILD libplacebo-4.192.1.ebuild 1785 BLAKE2B 8dd1ebc305e6a0183a60209f94cb131bb93c07936767a41fde0ebecd6903e44b8ae436bc02278ba4a6c6ddf655118562848062e817784e1af5148562c0921665 SHA512 060352d8be3cff8cd58908d064e17e465d0bf0bb336f5436bfca5d72d21636c43c6a1e7a7b7f3fe43434fb17b4c0a04ccc1d9663f76544eb278131e3d191ec0b
+EBUILD libplacebo-9999.ebuild 1825 BLAKE2B 5d9b974d7f2832a2572cf52e425c11965db0d921fb8d72549bd98fcbfcbbb69d8b52e2062961c736b4579eac4090d7c703b7bf45dcc70857bf79278cf85a814e SHA512 32d303d3505e725288afa53b814deb30bbc1a2a09270c7e07cb7201aa1b54304c4b381f1f0f5a249adf6a4c8fa736aa9653102061424a11c0e6bb1fe48a39024
 MISC metadata.xml 600 BLAKE2B 64be4c9fc7d6f967c7439d374ab5a8cb499066d9a6216ee14161db98359e69d6cfe4a57eafc18ac3f7e414234d4987ef0cb812e01552810ea4c6f29e06e42498 SHA512 2b62cdec3e8ca9ddc669cd0dad10888ec394dba889f4547b81e8a48603ae3657828f4d62a6aa45d3f8bf53c360b0870c76b259e93f0242c0d332e978091bd5b4
diff --git a/media-libs/libplacebo/libplacebo-4.192.1.ebuild b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
new file mode 100644
index 000000000000..9a280729ff19
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..10} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +opengl +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig
+	vulkan? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vulkan && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature opengl)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+		# hard-code path from dev-util/vulkan-headers
+		-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 10
+}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 2d4a284c5fa1..59e93dcd9835 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 # Please add a sub-slot for releases depending on libplacebo.so version
-SLOT="0"
+SLOT="0/9999"
 IUSE="glslang lcms +opengl +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index ea7f3fbbae5e..590d76b6f770 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,5 +1,3 @@
-AUX 15.0-no-aec.patch 1709 BLAKE2B 0e31e8a4595525905163453b5f37751aecd63006c791005a74de259958b72be0b1e0e6a4597c839e84b7297c5122c0d0d3f4ccada143a28174a57797baa22a90 SHA512 5547d1d400967dffb868109ff6ebb51a723338d94f6da0b4ff18cb021b898469ef11f00fceddc1afe51643ad13443fc51ee26f3096f2dbd1626710c5895f8e58
-AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
-DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD libpulse-15.0.ebuild 5133 BLAKE2B 7f783ab29826f04a04d1c286911debca9a8bd76934d862f97d8e7802f49cc79babb8f2917c1c7166806f48d555807a8d02e2cbaf4c08e1a9936dc9a4e5b2deb1 SHA512 eeca206d17f0c826c35d893d5cc85d74591cf83130da2ea5e0e53d91e5dca3aa0c389ef65c494339f1e1c42b5374c65895366e79594df03435659899e2106375
+DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
+EBUILD libpulse-15.99.1.ebuild 5549 BLAKE2B 65717b18f084134215884dd2f1580bb5fb242c757a1ad30e75724d517a585600168bf5023e8701a9c0e423b22ecb651e442398d972e25f6849d5e37ccc77adc7 SHA512 300f4e11a6e521ccb9fcad128e0aa17d189aba1367ce48f63c7d805723426ef1ac9aef38e15eeed647133d7df6743c06eb2073fd905209ac43ee9d7611f85272
 MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f
diff --git a/media-libs/libpulse/files/15.0-no-aec.patch b/media-libs/libpulse/files/15.0-no-aec.patch
deleted file mode 100644
index bd0b4d58b789..000000000000
--- a/media-libs/libpulse/files/15.0-no-aec.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4ea50aa41ff0131b380aef97623be578b702cac7 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <mart@leio.tech>
-Date: Fri, 24 Sep 2021 00:02:40 +0300
-Subject: [PATCH] build-sys: meson: Relax sanity checks for daemonless builds
-
-Echo canceller, udev and speex resampling is only used by the daemon, so
-don't error or warn about those in -Ddaemon=false builds.
----
- meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d7e468cab..63ed62342 100644
---- a/meson.build
-+++ b/meson.build
-@@ -961,7 +961,7 @@ message('\n    '.join(summary))
- 
- # Sanity checks
- 
--if not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
-+if get_option('daemon') and not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
-   error('At least one echo canceller implementation must be available!')
- endif
- 
-@@ -981,7 +981,7 @@ if host_machine.system() != 'windows'
-     ]
-     warning('\n' + '\n'.join(message))
-   endif
--  if host_machine.system() == 'linux' and not udev_dep.found()
-+  if host_machine.system() == 'linux' and not udev_dep.found() and get_option('daemon')
-     message = [
-       'You do not have udev support enabled. It is strongly recommended',
-       'that you enable udev support if your platform supports it as it is',
-@@ -990,7 +990,7 @@ if host_machine.system() != 'windows'
-     ]
-     warning('\n' + '\n'.join(message))
-   endif
--  if not speex_dep.found()
-+  if not speex_dep.found() and get_option('daemon')
-     message = [
-       'You do not have speex support enabled. It is strongly recommended',
-       'that you enable speex support if your platform supports it as it is',
--- 
-2.32.0
-
diff --git a/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
deleted file mode 100644
index f3df62031d34..000000000000
--- a/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/806052
-
-commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Tue Aug 3 09:43:32 2021 +0300
-
-    build-sys: meson: Require xice, xsm and xtst for daemon only
-    
-    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
-
---- a/meson.build
-+++ b/meson.build
-@@ -681,9 +681,9 @@ endif
- x11_dep = dependency('x11-xcb', required : get_option('x11'))
- if x11_dep.found()
-   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
--  ice_dep  = dependency('ice',  required : true)
--  sm_dep   = dependency('sm',   required : true)
--  xtst_dep = dependency('xtst', required : true)
-+  ice_dep  = dependency('ice',  required : get_option('daemon'))
-+  sm_dep   = dependency('sm',   required : get_option('daemon'))
-+  xtst_dep = dependency('xtst', required : get_option('daemon'))
-   cdata.set('HAVE_X11', 1)
-   if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
-     cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-libs/libpulse/libpulse-15.0.ebuild b/media-libs/libpulse/libpulse-15.99.1.ebuild
index 44b59893433b..357eea6b8537 100644
--- a/media-libs/libpulse/libpulse-15.0.ebuild
+++ b/media-libs/libpulse/libpulse-15.99.1.ebuild
@@ -5,8 +5,7 @@ EAPI="7"
 
 MY_PV="${PV/_pre*}"
 MY_P="pulseaudio-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
+inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
 
 DESCRIPTION="Libraries for PulseAudio clients"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -71,9 +70,8 @@ BDEPEND="
 
 DOCS=( NEWS README )
 
+# patches merged upstream, to be removed with 16.0 bump
 PATCHES=(
-	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-	"${FILESDIR}"/${PV}-no-aec.patch
 )
 
 src_prepare() {
@@ -87,6 +85,7 @@ multilib_src_configure() {
 		--localstatedir="${EPREFIX}"/var
 
 		-Ddaemon=false
+		-Dclient=true
 		$(meson_native_use_bool doc doxygen)
 		-Dgcov=false
 		# tests involve random modules, so just do them for the native # TODO: tests should run always
@@ -171,6 +170,15 @@ multilib_src_install() {
 	# therefore clear the variable when calling the function that will access it.
 	DOCS= meson_src_install
 
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	bashcomp_alias pactl pulseaudio
+	bashcomp_alias pactl pacmd
+	bashcomp_alias pactl pasuspender
+
 	if multilib_is_native_abi; then
 		if use doc; then
 			einfo "Installing documentation ..."
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 6d0c66dcc3fc..4aee1f266a8a 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,4 +1,4 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.3.0.tar.gz 450111 BLAKE2B 3707b573ffef414e5373526704d4e54bf0f53b6bc5d9ce6e69bf22e11e5380eccb65a6c26e3598ee4bf43f341a7dcc6e1a7d7f5113bb649ef9e94b01ba36cc0f SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627
-EBUILD libsbsms-2.3.0.ebuild 875 BLAKE2B 2c0fa9149e46023e980cbb1f1ff5b2afebacf9d194068947180f7ed9a889520595c99fe8854b97f2ab66919022e78de27d8616ad1bcf3b8a7f9a9c9ebfec056f SHA512 7906a3c7887a014d43b198d009ac3590b0e25f5d512efb5897529251e237ee8dcb616cfcd6389b0ec4d81b60981ca66d40360a81205e32c58ef19bcb6fc260e8
+EBUILD libsbsms-2.3.0.ebuild 849 BLAKE2B fa40f3f99528384622a4ab081f6b5c632253c84a09c9855e12c30579ec42c42f995abfae2a053795af801f589341e80443a7a046a35e34635ff5ab234ed2c9e2 SHA512 5ed1ed6754abc1347f57b043914874494a8afb51402bee1412cc89e36453a8a25d9edd46d0bc90d57a4c97ec769b10ea93fc98c45ef5597e7a396ace7f4cb948
 MISC metadata.xml 345 BLAKE2B 6c5e16098765be40aa9fbdcc21c4d9bc154f481481a6968dc186d209e598fc52e4429db625e637d22a52faa482a2fa6a2782ec93f9f2e22e63596fc68a0a297a SHA512 3c20434b2fbcf7e55b76f8fd5df7637b5e9ffef12db88948530036f9474f6960cdc1277378b3dcee3c81d9de75e60bc1363b43c55a5a03062118d6372b6b9a29
diff --git a/media-libs/libsbsms/libsbsms-2.3.0.ebuild b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
index a3e87db0a454..eba1a0570529 100644
--- a/media-libs/libsbsms/libsbsms-2.3.0.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
 inherit autotools
 
 DESCRIPTION="A library for high quality time and pitch scale modification"
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index aee0a8ed5be0..4326685cb2a2 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,7 +1,8 @@
 AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4fdbf7ecf8a7eae05efd4e74d5e84d6f3eb8a63eeb0abd998404819bed8d084cf98bbb79faab3877512cb713 SHA512 3c853f577c569f2228d63ed9b63ca8cdc23313b5d76b890186ae7d0741e18f1707f5470cad88daf849f8972d42a9100480e354bbfc80e8be030467cac364a58a
+AUX libsixel-musl.patch 1304 BLAKE2B 09e7a75a94edd944cca9997c74b235f9f27aeff550b2a9a02225c93d60f1faf598b9c5c304c9e8f1f207da37d7712d40115410f65cae17995c3bdaed6cfc99d7 SHA512 39b7227040e523881a9405e7f6b98362a0c4fb7f717bf50a724eabfd5cfe9779f820243f7ae0a83b61b4dd124ec4ff0070d391ea43476388095e1d4160f13cbd
 AUX libsixel-static-libs.patch 240 BLAKE2B ba9091c4991c6e69f83ca7eaa35aa7ceaf81e8542b1edffd1ce64ba1bedf518ad82603cdc610f256b1a0dc4954151b7407202a27c101ef6de59ff0724021faa3 SHA512 d3c6c060e8eba47c98180e5e4e127dfcb6f77f89b11dbaa8595cfd9786eee94a884476d210deb9ca6eaa2f548c6407a9bff714cfc3f18d4fa36b60d2c1fc165e
 DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
 DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
-EBUILD libsixel-1.10.3.ebuild 1904 BLAKE2B 8ff2651e85dd33befb7c9c27c6f83ca121a164e206011c07932f92f4be8c8ef7ae17aa0edaba77829f5d430a1f2216906f7c3a12ea61fa038e7c3ba95c1944a9 SHA512 d70d0c4e051e4e51e5b51e34668a286c2a16155f9de6b822f78bb5ba22327241ca31cde612de8a9e9a8b10dec7b0b234a81e7dbe120ce020aa8acf9e446e7f06
+EBUILD libsixel-1.10.3.ebuild 1936 BLAKE2B fa889fe7e38b2bb8611a96e8899beee9774c1b47bb6a66cb51a3ff49ae92b8bf70148a7b6e399a0c5401ae083047b3c7a5dd63f43936bd1f95de0904f85ab02e SHA512 6dcab43217f9a710b43a18b21ca952b72e07498c52aa7e59556f03535f4059e9c7045482fa0d5a7226c8679ad2babdbb4213264aa807dc86bfe185b9770fd22d
 EBUILD libsixel-1.8.6.ebuild 1848 BLAKE2B 65ebce0c43773581673555da29d7ada4e2bcafb8b2d98dd6e311b1cd9ead95d1a8d52bcc2739b5c1410c2ab776403909bcea1a7198e664d9739db6cabf920f73 SHA512 4a006fd05ba3b344d387dea8c59e6895c28f515094c84bee22fc4479c320964faf768a926bbaee008103fb74fe4b5285e97b31ff61e1e2b12db045508ab548e9
 MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/files/libsixel-musl.patch b/media-libs/libsixel/files/libsixel-musl.patch
new file mode 100644
index 000000000000..f353a2f7c8d6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-musl.patch
@@ -0,0 +1,57 @@
+https://github.com/libsixel/libsixel/commit/a8d60939d00af520e7139741b58928a9cc2c5f04.patch
+https://bugs.gentoo.org/830074
+
+From: nick black <dankamongmen@gmail.com>
+Date: Wed, 29 Sep 2021 22:31:58 -0400
+Subject: [PATCH] no need for sys/unistd.h
+
+--- a/converters/img2sixel.c
++++ b/converters/img2sixel.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+ 
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ # include <getopt.h>
+ # include <inttypes.h>
+--- a/meson.build
++++ b/meson.build
+@@ -66,7 +66,6 @@ needed_headers = [
+   'string.h',
+   'unistd.h',
+   'stdint.h',
+-  'sys/unistd.h',
+   'getopt.h',
+   'sys/types.h',
+   'sys/stat.h',
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -26,7 +26,6 @@
+ # include <stdarg.h>
+ # include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ #include <sys/select.h>
+ # include <time.h>
+--- a/src/encoder.c
++++ b/src/encoder.c
+@@ -27,7 +27,6 @@
+ # include <stdarg.h>
+ #include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/types.h>
+ # include <time.h>
+ # include <sys/time.h>
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -28,7 +28,6 @@
+ # include <sys/time.h>
+ # include <sys/types.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/select.h>
+ # include <errno.h>
+ # include <termios.h>
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 4e9128a773dd..636229521e33 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.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"
@@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig
 PATCHES=(
 	"${FILESDIR}"/${PN}-meson.patch
 	"${FILESDIR}"/${PN}-static-libs.patch
+	"${FILESDIR}"/${PN}-musl.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libsmf/Manifest b/media-libs/libsmf/Manifest
index 04aba00cec3b..a7496c981fc9 100644
--- a/media-libs/libsmf/Manifest
+++ b/media-libs/libsmf/Manifest
@@ -1,3 +1,3 @@
 DIST libsmf-1.3.tar.gz 545850 BLAKE2B 32e1497825d16a1ecdb869dc8168a66c6ee2fbdea3bf03da3284aaf72453c2a4d8db38676cbc23f39e73f28c8517d3afd088d627402389865bb9c8a9e2d0b2aa SHA512 3c383ec8f2fbe48ddab1008b3ecfe6941c38e33cfd963eabdf07f09c8c04c1b8758c8774b25672f70c29b570f2c250c795979d19b39c5027810b54b07035497d
-EBUILD libsmf-1.3.ebuild 777 BLAKE2B 6d6afa2045ca151a9b2941b85e3a6fb06b766840c1ba9b2e60b708eece62b53a3c229defa8bb2c43095eb5c4e9377b43361645d37c844a342915dbdf162ccc38 SHA512 f9568fb42ee8d88eb69e5759b78ea201fc8a3a75a5760336c88054ec9fb06b422ffc907d73a5eb8653a70e7ae6b79adc6a16e501f6fa06cfc9fec3fbb1b3c0bf
+EBUILD libsmf-1.3.ebuild 758 BLAKE2B 08836955468bdd189152b6d80fff5c4e2afbf201bc129e706baabe74ee4b55348f2918d7e998b25feb61fb3752af93d3fdfb117fae92f6cc174575c45089c3ca SHA512 c014329eda16bca9614f00d8ac5ed02f5fe0289a27b5f7a096dbf1ad9aa6e443cd5b9a7d4698769cb25a201287da2f944bed59307c9975095832e86e96fe7809
 MISC metadata.xml 330 BLAKE2B e624d7f1c6023cb92c726ed2d1f772d9d2cda38187b6f0605a02e53bd4249363933f41ea5bdef92cc32dee5fe9b33d9a94de6425f0bc2282f64a03449308343b SHA512 b5dc1bf49ccf8473d2cb623151053ef5b4cdcf80ee179bef3331244397f3e006ffd2336273068cb6322ff783a3c2c494b63b05a1875be76cdce2b9c00a24daf2
diff --git a/media-libs/libsmf/libsmf-1.3.ebuild b/media-libs/libsmf/libsmf-1.3.ebuild
index 374d68ee1085..858716580daa 100644
--- a/media-libs/libsmf/libsmf-1.3.ebuild
+++ b/media-libs/libsmf/libsmf-1.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="Standard MIDI File format library"
 HOMEPAGE="http://libsmf.sourceforge.net/api/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index adf42f2b563a..5e1af4b640f4 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,3 +1,3 @@
 DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
 EBUILD libsoundio-2.0.0.ebuild 988 BLAKE2B 7551d26be84375a57b51888b8fc72f575f5d04b44abd9e8d3280446ee1f1e9c1fd363a3ab8a7d304d096ff8a05525e61376785614559e202e5a4acccc2a20efa SHA512 619a8078913d0b4af32f9381e54aaadf5f35d74ef478f04e970763b503d9b932be9557a73b86a20ab4a943ce6a013e0be930657d99faadf6b159b86877c1e1bd
-MISC metadata.xml 932 BLAKE2B a3388f32479992418c7a0c4a070a49ea66b4f929685a4701f391f65989f0f36048e133e69627f2438340621d9a7f9a0236194456784166ed851b78ae1354557f SHA512 ff3d7892693e288c26bf86926e2e04a3ddc88715b24bc5c5c3f539b75c714f8e2d8101a67711f56afcdcfb7741967379f5a8458d08dad2520cbd29ad67dad056
+MISC metadata.xml 711 BLAKE2B b52734db8cd5c5a7b93653a086aba4da08bab41fb0aa6feeb84ed905814214a4bb6d5af4c37967319d3a1cad7208607b93544f312b698bbaea21714182b835e6 SHA512 04e8a088a732a324014bfa99d48b6a54ac12f16ed71843cef86f79a73a7af1cde945b9e3c445305d69396d8272f8159e0af5682230b23ccb544675166cc4bf5b
diff --git a/media-libs/libsoundio/metadata.xml b/media-libs/libsoundio/metadata.xml
index 2728c3f489c6..a33f8748d8d7 100644
--- a/media-libs/libsoundio/metadata.xml
+++ b/media-libs/libsoundio/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>sir.suriv@gmail.com</email>
-	<name>Diogo Pereira</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 	C library providing cross-platform audio input and output. The API is
 	suitable for real-time software such as digital audio workstations as
diff --git a/media-libs/libtaginfo/Manifest b/media-libs/libtaginfo/Manifest
index faa40da1e13e..61dc0a9f0311 100644
--- a/media-libs/libtaginfo/Manifest
+++ b/media-libs/libtaginfo/Manifest
@@ -1,3 +1,3 @@
 DIST libtaginfo-0.2.1.tar.gz 2093070 BLAKE2B 0b0c83c1cfe15cbc2fd19936bcba4377cfeea13a95d085dff95b42c9b547b8bf8c21a2187ebb7d0d8510644be8db38a98a6beefe22ea83be7303762fa590214a SHA512 f1a79b1f7ea12bce10c82c0a4106f855c95b6efeef25e7548fc629d4f8977f50fe62637426a53ec0333902d5e2a81980c189719d030d7f85897ecfa8cbb1ba41
-EBUILD libtaginfo-0.2.1.ebuild 497 BLAKE2B 3e478ea3d0691e1344a06c123812055bcf36fe612c7fc280476fc194fa994ee380b1d8ab2e75823423e3e6357f269d6e7866cf907ed55df390ca071ae2d6bfa3 SHA512 52328aeeec648108209281fe8b069c5aeab4e2ab27b76b9bf6cb082d5d939e0defac23901090ac84c3081903a31b7bf19ae2a885ded82b4a23dbf39fda9d760b
+EBUILD libtaginfo-0.2.1.ebuild 478 BLAKE2B e6c3ab51bc7326aa4923078b12b145984fe2334f4eba9362c3104ffa002796bfcd03388ca0919e9031b6a779c0a7b3910d29b3e51890a80c72b2095de2c07388 SHA512 51a669680e99a4afe2a89f4038b3211df3b251ba5dcf37bf711ca2d62f2738cf4901cfa9af1b1e949a9b2b107294fee11636b78a3cdb68982ef9c61882e38b57
 MISC metadata.xml 344 BLAKE2B 0d5aa10cfb0397f3b39d460d14943bbf80b69672a971374881d50ea173fd9dd2ff68b41e6f95f50b160d0409d5bc7b7c3c0c6b79e8b2c8cd973f3d89d7b6b5cc SHA512 2271041773ddfbf52cad97d9565b4af561453c3c0c65d8414d16763df228faee48f30dfa5186a1dd8e4283babf4612ed7d765e2986d39ec0151c003f126fcedf
diff --git a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
index 922bec301628..6f7a3f5ee7c4 100644
--- a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
+++ b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="A library for reading media metadata"
 HOMEPAGE="https://bitbucket.org/shuerhaaken/libtaginfo"
 SRC_URI="https://bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 74be58482ad1..401ad410d58e 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,5 @@
-DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
 DIST libtgvoip-2.4.4_p20211129.tar.gz 1098091 BLAKE2B 20d90b10a2f87d05fdb5bf723e87045262cfa06a33a0543a9a73e946f44d7017e04faeba19a13d20ab531c4c335d234c172d0cc93819b35477a990cfcb87dab3 SHA512 e55f05e5459e453d33ff717b928324c39adcb0ab2e6aaefa0f2deb35ca76c956ffc723d7138964a3bc10a7bc1e3bc66360ff8c55a080eb3210f5728542ec7d96
-EBUILD libtgvoip-2.4.4_p20210302-r3.ebuild 1512 BLAKE2B 8f24ed4b309e81ab91508ab07c981a189aa9c641cfce8e9ac324c32dd9773bc3d551ee3944827c67e57bfdd6c5877765e0fdeec982a9a3ce6262cab4054fde65 SHA512 656380dd0edbbef3a7a9dc9e37292bd23e18d9bc69f8da7ef3fd1250729bfadb072265949bf60cd1beb9c3062bc2a1036f2c2507278a3d26a0291fafe69740e4
-EBUILD libtgvoip-2.4.4_p20211129.ebuild 1465 BLAKE2B 9886e71edbdac03dadfc7c90bd85b78f0ddfb50f67811efefab88d9350baa7ce653f31548054cded3f0d9205ac917df9cb6bee8d3eba253fd89b52c00fd08c6c SHA512 0f5279280cbbb3ed6d91148e0e16212440c6b48242a24e1f0cee0d96232446a09c04558f06cf67c6daa32cec53c1fd5d3707de01af1838810e03f4af6b2c6c0b
+DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77
+EBUILD libtgvoip-2.4.4_p20211129.ebuild 1472 BLAKE2B 80eb1ec657b03564c40074717ddcfffadaeeef7764a97ee9f2720b50d0d787eda07e028256d6e762ac0343825d178a256f2fcb3adcf8c53cd3f7f83a9e577462 SHA512 562654cb431b6fbc2baa7d152acdd6fb0c9767117ecfada99c9b860544cf40444729365ffa4d268596ab63365af0d778dd8a9a1a11ed97892451bfa33cccba78
+EBUILD libtgvoip-2.4.4_p20220117.ebuild 1587 BLAKE2B 220ab20273a76fab9c3ec704491303318382d20684a115edbc53e2fc2d621b9fa744397f3efe37acc72af667ed859e20dc8401a0383544d5a779818357de370b SHA512 3ac4c177d968b192a4a3a33edf5a034eef0fba3b8a21d8d9e165872367eb4bcc2c4ce497c0e92d6b9e61bb852008076b733d989c0f9f6674e88a36a0d972168c
 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
index fdee80617c06..8c2c2aee32a2 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild
index 808da0bb4e92..d07f0de37ad7 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild
@@ -1,20 +1,20 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic autotools
 
 DESCRIPTION="VoIP library for Telegram clients"
 HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
 
-LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
+LIBTGVOIP_COMMIT="a090c6a8f7bfb365b301d85bb8c9664d71321c5c"
 SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
@@ -40,9 +40,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Not using the CMake build despite being the preferred one, because
+	# it's lacking relevant configure options.
 	local myconf=(
-		# EAPI8: Remove --disable-static
-		--disable-static
 		--disable-dsp  # WebRTC is linked from tg_owt
 		$(use_with alsa)
 		$(use_with pulseaudio pulse)
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 7df9d39c6040..20e2dc8aef9c 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,4 @@
+AUX libuvc-0.0.6-GNUInstallDirs.patch 1584 BLAKE2B cf4b7c747b1e4d2fb4ed54d7273aca710d9486c9f9348f104ca5ea6c4f2c4ecc7552fa4de2cbda7f64dd41f5d6526d83206f3cc45552c72a2b15be965f19cb3d SHA512 5f7dac19c337708385836a881837832cc1896aec424ef6ee9db1ef5c0f38815bbb75ea07bb29b24d8992686a4000e642cbc55aa72c7e38e48c2e92ac4fc64b14
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
-EBUILD libuvc-0.0.6-r1.ebuild 789 BLAKE2B 7b54213b0e68a9c660ee0159c012ad7f24eb0025ae91770bd5c8395c842c1dccddf825b47fc35366631cf269b0575f79e9fa1aec46906d472af638314f37b2ee SHA512 476cce36b9c961e877329baec2b56750d631e4d5836cbd8e4d16fbdcc5de57e88a7909aea5a51520a8d0e4e1986c2b029b0b6ccc3093493517118a18d3d3a6d4
+EBUILD libuvc-0.0.6-r2.ebuild 679 BLAKE2B f0022d44d61476528673970b2fc1bd85a8f9683f6351f71099efc26c7c2c453922a072a094a033e3886e2f03b4d2f524f53b0d488bab69a445266972bee85281 SHA512 27404bc76d36de06f3b54e94f0ab9cee421af5404515376a40d1f086146dd69751651d061f1450da249fb68ba4189d134e97340a20f3193473360858ae3c333c
 MISC metadata.xml 477 BLAKE2B cf7d3f2daa125b52a3399b1a922168ae0ae6a40866ebf77a429082a91d1f339269db810e586e15d7230eb851007759720a7f0787f6d53cd3cff690238e5323b9 SHA512 f24d7b6383a232e336ea32762d425767e96068dfb565a5df4d520da195d94ed0e6dd774323a01b307593229d19bd2af3ea9d7006dae81e1ce9353a542deed6bf
diff --git a/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch
new file mode 100644
index 000000000000..e7ac5d7268fc
--- /dev/null
+++ b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch
@@ -0,0 +1,36 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@
+ 
+ SET(CMAKE_C_FLAGS_DEBUG "-g -DUVC_DEBUGGING")
+ 
+-SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libuvc" CACHE PATH
++SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libuvc" CACHE PATH
+ 	"Installation directory for CMake files")
+ 
+ SET(SOURCES src/ctrl.c src/ctrl-gen.c src/device.c src/diag.c
+@@ -110,18 +110,18 @@
+ 
+ install(TARGETS ${UVC_TARGETS}
+     EXPORT libuvcTargets
+-  LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
+-  ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
+-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libuvc"
++  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libuvc"
+ )
+ 
+ export(TARGETS ${UVC_TARGETS}
+   FILE "${PROJECT_BINARY_DIR}/libuvcTargets.cmake")
+ export(PACKAGE libuvc)
+ 
+-set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+-set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-set(CONF_LIBRARY "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++set(CONF_LIBRARY "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ 
+ configure_file(libuvcConfig.cmake.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libuvcConfig.cmake)
+ 
diff --git a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild b/media-libs/libuvc/libuvc-0.0.6-r2.ebuild
index 881b8fc7a2fa..f8266936fe40 100644
--- a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
+++ b/media-libs/libuvc/libuvc-0.0.6-r2.ebuild
@@ -1,42 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
 HOMEPAGE="https://int80k.com/libuvc/"
 SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	virtual/jpeg:0
 	virtual/libusb:1
-	virtual/udev
-"
+	virtual/udev"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-CMAKE_MIN_VERSION="2.8.0"
-
+PATCHES=( "${FILESDIR}"/${PN}-0.0.6-GNUInstallDirs.patch )
 DOCS=( changelog.txt README.md )
 
-src_prepare() {
-	sed -r -i \
-		-e 's/(\$\{CMAKE_INSTALL_PREFIX\}\/)lib/\1'"$(get_libdir)"'/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TARGET=Shared
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest
new file mode 100644
index 000000000000..9e51fb46f5b4
--- /dev/null
+++ b/media-libs/libvmaf/Manifest
@@ -0,0 +1,3 @@
+DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b
+EBUILD libvmaf-2.3.0.ebuild 794 BLAKE2B db1e216260c6df43833d887d50916be281da55b2d8c7a4db95383814554dd72d50e34fec9bc047db8674f26b8ef69da2f1d5d483942476ccf55185ed113c5b18 SHA512 2af72ad89522043161115ad9d1090ea5b940f4b6594ae37fddcca58afcc961ff74d05e652e5b68009ea2439854e46aa30e20ff8c83b9ed87ccaf146f85c422ed
+MISC metadata.xml 721 BLAKE2B f0e82d2d6d28429c7d0a91b111b82d3a5df006f27142f063d527b73ee37ed82892c4d85db473098ca32ce09d3a1eca926666830e2d1ea3256f0598b413861c7d SHA512 741de386e11eeb0cde13121604fa60d1c22012f9e4c351ec423ce3d7cbc164006441e37d49682c0f1ab64dffc6b949a39ed971755b2f026bb6964e53acc6ff95
diff --git a/media-libs/libvmaf/libvmaf-2.3.0.ebuild b/media-libs/libvmaf/libvmaf-2.3.0.ebuild
new file mode 100644
index 000000000000..33cbad2ec7f4
--- /dev/null
+++ b/media-libs/libvmaf/libvmaf-2.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="C libary for Netflix's Perceptual video quality assessment based on multi-method fusion."
+HOMEPAGE="https://github.com/Netflix/vmaf"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Netflix/vmaf.git"
+else
+	SRC_URI="
+		https://github.com/Netflix/vmaf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2-with-patent"
+SLOT="0"
+
+BDEPEND="
+	dev-lang/nasm
+"
+
+RDEPEND="${BDEPEND}"
+
+S="${WORKDIR}/vmaf-${PV}"
+
+multilib_src_configure() {
+	EMESON_SOURCE="${S}/libvmaf"
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto "/usr/share/vmaf"
+	doins -r "${S}/model"
+}
diff --git a/media-libs/libvmaf/metadata.xml b/media-libs/libvmaf/metadata.xml
new file mode 100644
index 000000000000..fe7546eb5ac1
--- /dev/null
+++ b/media-libs/libvmaf/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>adel.ks@zegrapher.com</email>
+		<name>Adel KARA SLIMANE</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		VMAF is a perceptual video quality assessment algorithm developed by Netflix. This software package includes a stand-alone C library libvmaf.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Netflix/vmaf</remote-id>
+		<bugs-to>https://github.com/Netflix/vmaf/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 12b532e05e85..73bdf7c5dce0 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 4344 BLAKE2B 12f3c70baa2f1af74826397ea9dace4e3ceb422aa1130d361628254529649783e03032376f1b5a59995e99af24acd51b640fea470a5bd2d073c7a7247ca8bca0 SHA512 1f3b657de349ff61f2b686f1d428645c970a6f67b771a59cfb70cec04474d9bd575e1766dc0cdd058492cda74575835f5ab7690c9529a01bc4dc2ad3fe37b32f
+EBUILD libvpx-1.11.0.ebuild 4340 BLAKE2B 7320e9a8da514c48054249a42e22ede7570b176902e86964e94de598e7165fd173f0a85d5ee325eaef11ca6f5cb204b617a62c703d4b5f1b10c8d04d47cc91a3 SHA512 59af95a5197a5090f3ec21d97917e8e8562a034d25757f95583680f71596cb2a099801a0a10f9d21953af7d8f379e2d76d5880e4805b2cc74b1cb7836e21f752
 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 cf3374f9e957..b157a4048fdd 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/libwebp/Manifest b/media-libs/libwebp/Manifest
index 2a6a6cf1be67..2e6d27cc55a6 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -5,5 +5,5 @@ DIST libwebp-1.2.2.tar.gz 4117468 BLAKE2B 8bdb5a82317f06c39458b04580fa674399bc02
 EBUILD libwebp-1.1.0.ebuild 1854 BLAKE2B 8b7c661b253198816a6987d2e0d5b42572211f0bd7ab9317501871e73faf3c74d4e29c61a4b1ecf1182de1ce37e67d2d51a6b87ee98c098d665863d8797a2578 SHA512 630a2f2af3d7572a8c7b526521dc444ee90efdc65f12152606fffd7446d6d8b0ea244d5be57c5f990cf82087a684d485c2d336f28a74505e9be944277e4b9dfe
 EBUILD libwebp-1.2.0.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
 EBUILD libwebp-1.2.1.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
-EBUILD libwebp-1.2.2.ebuild 1868 BLAKE2B 0a09ef0dc5fda022bc07e6718f92e51870b552205ba0981b0950076895d84165cc093061636d218fa3fa99ac67671d5d8d744f68f094f5bf5f18a807a071e3b4 SHA512 f99da617d3fd2e378962cd6ceeb95b6d2864e78726a17a6a5932c264fa9013161660c1443c16d85a1e1326930cf6871f6151adb5db5da892042b162ad90f9be7
+EBUILD libwebp-1.2.2.ebuild 1860 BLAKE2B 8fdf615ef885195236f910ced4910e963d48a056278934d1adfed81cce4befc746b1e452118c9fd478faa78df1281f846c008f6e4a94596e470ac1065d9f8c41 SHA512 4ab1ba694c891c096ad69069b9cbfc1ca2571e208ab98c64e34d91b44135488aabb17ac463fd616a266591a0d77a16d41b694920d28d7384162a78ac2d96677f
 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.2.2.ebuild b/media-libs/libwebp/libwebp-1.2.2.ebuild
index 2ca960e6475f..74df9177ed62 100644
--- a/media-libs/libwebp/libwebp-1.2.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index d850f0fe4844..0a20f1c40aa0 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,3 +1,3 @@
 DIST libzen_0.4.38.tar.bz2 129706 BLAKE2B 3e40e31663f655885f47b7674936a765cce032da25fcc3f57604b116414bf4348db363a4745bf98126879de9d2de5d4443af1fe3a1f64a7bafd3525eb1ca38da SHA512 d946cd2349848925e13a3fb6aab5ad4f5aca28bc89b3263faca3096d7bbcae3a4ff9ed2552bf005b4ca1f4c8c8f59856f4c4aafa7c734ecebd078e6fc40a9a0b
-EBUILD libzen-0.4.38.ebuild 1294 BLAKE2B f186937dd8c346d7b039cd0fe2280f3ca3bb68ece9dafabcca17c4545f9b78c23b95b95c735878a3f1524af4ad8e37b5b44ea589357c6f58b4217a9a6f59aead SHA512 5af4b5142f22553706efc7a716d27b00fcd9f479b77e553f60c76249d71966fc72dc4431a3d9b7f8a85c2f24d8fd999e145d5db9fdb39611b7bf1a701ebc89fd
+EBUILD libzen-0.4.38.ebuild 1286 BLAKE2B 7f666b78875bc270bfa1d6dae4863e4975a373ad817fd5ca6fa7c2a3acf340759360a0a8ee4a3f3921c71a19f6da10f0a1ce24e1c74e16deef8c5226e40afcbd SHA512 5f7e0a4cb84edbf021e06e6b0fad7ba3f9c23940b0fa4fb8d7f1abf1d10121fba40b9a1f732f662bc3b74ed810cf41939d3bdb19e24f2c5026d82524f29873c2
 MISC metadata.xml 392 BLAKE2B a57d4f857e1716b904183c862184654212a31e3d3ce089891f85c88b627b9a4b956d542c434e9565843b582e9f35c9e5fc8d4c14b647131c9bf239c383df9bba SHA512 77eff51f73560975ee03ea94a3d0880ad8adb4c6a2ae4930d986436562fcafa09677d18843c2dac366b74e8233f7a900f8ae74b7b82335c8b4067a703f6b3d6b
diff --git a/media-libs/libzen/libzen-0.4.38.ebuild b/media-libs/libzen/libzen-0.4.38.ebuild
index 44bed1b7bf2f..70592c35a964 100644
--- a/media-libs/libzen/libzen-0.4.38.ebuild
+++ b/media-libs/libzen/libzen-0.4.38.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib
+inherit autotools
 
 MY_PN="ZenLib"
 DESCRIPTION="Shared library for libmediainfo and mediainfo"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc static-libs"
 
-DEPEND="virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${MY_PN}/Project/GNU/Library
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6ad92e7fcaec..b15a9bae0e48 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,6 @@
-DIST mesa-21.2.6.tar.xz 15868208 BLAKE2B aaa6447a2f5a472c2ee2b7d6b12effb79d02804684358fd233aa00bda945c66efa3850931cd9114c51ddd492033b9f66372380395540a11fe40229edfe7ee125 SHA512 e65d77e2609cba85bd2cdbd4ba2072729c1556a43defdd24a91e708e3223f84b23657e63a91b16c5729684ea12fe31f45bae88294c572e057f2981a5d6c0f5a0
-DIST mesa-21.3.2.tar.xz 16466760 BLAKE2B 549d37d365b477b3f991ef0602c94b6df826e32dfac8bf76c19157e01ffca84ce1f0fd8311a04bbdc1a6804f562a075945e2662083a3a663ba78fae0d4853ef6 SHA512 35c510cbab70be43bc207720a12fe85b0c010fafa147238f2c22dd873967278f187ee7675a662882ead3598305f1f37804567deb93022a692ca259f563abfdac
-DIST mesa-21.3.3.tar.xz 16476044 BLAKE2B 04ae7983c82fbd6dafb405ee717df2406607e4fb1f95996abe5390cb1cbdb6385fb8b00ac9982d1bc7dd10fc18eeb1bc08d7147dc00969bd3bcb347a53ca77ec SHA512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673
-DIST mesa-21.3.4.tar.xz 16497248 BLAKE2B 3fe2543bb6286a0d84a247785dbb4b5dd6df905eab748a89854589008d9db5aae6c52e473c58cff8d03694d46d3ce2a2680fddc8c978f898dc9bcdec02ca9b6b SHA512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9
-DIST mesa-21.3.5.tar.xz 16521664 BLAKE2B 4dcf2e40103233332724289434998149c41a86fdaef622c2fc92065d1708a0635ed5a179e5fc8e51d82efe794f4f99c7de734ed61a8804b5e94aecb071656795 SHA512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933
-EBUILD mesa-21.2.6.ebuild 15212 BLAKE2B b4153c461e270495b87b56ccd708522216cafcf18635a5d488b011b85db0cd5ead8c908f3e7bc33a5ca21177b634c8adc0bd9da84ae3bee5c76a78b85188c481 SHA512 ae7ff35b6dd713950464d2d501b0ca136be7e3e0900dd3136c3181cf733523543edf87642ddba2e1175c5c6cc2906970f5da82c125b029a22c754031e85fa63f
-EBUILD mesa-21.3.2.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
-EBUILD mesa-21.3.3.ebuild 15028 BLAKE2B dd3fbfebece8087f7ef76c0009c17df6742c2b2c22cf121425379ce04bbd2bb9737cad8d2bb3fca9835fd23f20649090d3eabb84bd131b6f66683048fe2c8dc8 SHA512 ac865266d0d8cb0e89a3d8c108cc3b6ec9a24846bb138f61e80117f87264da3b1309b582cd1d754ce296aab8cf6b20cbc25ab94caef2865d468b0211174e0723
-EBUILD mesa-21.3.4.ebuild 15021 BLAKE2B 743e616fa4a41dffde7c2bbcbb482c211a02b67e6c802eda52bef3f83c1ee42f3e71b4d28d34279adeb946ed1ac61c3a19be729fdda9b5bdc90ab99eef3aebc7 SHA512 36b6e3a749a9e1aae1f5029be3dee3340064b7555b8df8b25d1316ebe2eea7f2ef39fa7c7a79ef371bab3285c3000e422ad42d20c08adc8a217d24cea2452316
-EBUILD mesa-21.3.5.ebuild 15028 BLAKE2B 277b5a33cde6adead9e304d995f608ed05cfa58148687bc653c9d651996ccc860511b45ff70b2d490e3f903334dacb7ca93af492628e9ea0c7a6e783f08d1acf SHA512 e9d51672757062b6e4a6ce6674711bd6efee004b95a43123a663d276a5e61d540cfedee6074455e7ed94451b8fe046c26a7fe116262e287b60c850d4566778dd
-EBUILD mesa-9999.ebuild 12066 BLAKE2B 9aca896f15ef00fecd3e6ac8ec844e4ab1f5fa831872effd07909f8d8729273a51a91d1156683fc83ccc0efc574435ec07b8f85db8a6a162a66e89a2a6c0e176 SHA512 e9f217a1481790be4e81c741965c502e430d4a8acdf5f479a7a2f819a4b7e936281e0401dd33e4d9632ff3b03a011e830877bb431d6ed98e50c84fdd60307ba6
+DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6 SHA512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88
+DIST mesa-22.0.0.tar.xz 15565680 BLAKE2B 65dd09e1864f353f07ab01cb21cb89f858a071d74043b1913b0abe3ee3b3a992ca3878d40ffe52cc45546770d5ad9e198c93a24a8564ffeb9c8a05da38af300c SHA512 9faef66adbacba24d11dfe8e2d1a753295798883a10a7cc91e6df9d678c64a8286a12e60c0d8576d944a8cc76f00c30d27c3a71d3458bbe3dbcd66c88a454c3b
+EBUILD mesa-21.3.7.ebuild 15192 BLAKE2B 647d7b0865d39dd575ae9264cbcdbc07c6f92cda7d8dacbb5ce6bb5c92f0c0b38f322536e486802c8911415ed0e40ad14467bc900d9983e22b917ef1a3c4e75a SHA512 59ed639bd6904ee343f5297bc755ab9bc0dec759459f5b20c7a36c3abc7a3dbb349caca46b7c81909d8d9f0b317525973a24a0486291feeb47356d0d0718606d
+EBUILD mesa-22.0.0.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.2.ebuild b/media-libs/mesa/mesa-21.3.2.ebuild
deleted file mode 100644
index 4fb71e92fcad..000000000000
--- a/media-libs/mesa/mesa-21.3.2.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=true
-		-Dgbm=true
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.3.3.ebuild b/media-libs/mesa/mesa-21.3.3.ebuild
deleted file mode 100644
index 4fb71e92fcad..000000000000
--- a/media-libs/mesa/mesa-21.3.3.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=true
-		-Dgbm=true
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.3.4.ebuild b/media-libs/mesa/mesa-21.3.4.ebuild
deleted file mode 100644
index a5334667f07e..000000000000
--- a/media-libs/mesa/mesa-21.3.4.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=true
-		-Dgbm=true
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.2.6.ebuild b/media-libs/mesa/mesa-21.3.7.ebuild
index 922ef8bc5f58..f94b6c9c9f55 100644
--- a/media-libs/mesa/mesa-21.2.6.ebuild
+++ b/media-libs/mesa/mesa-21.3.7.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} )
 
 inherit llvm meson-multilib python-any-r1 linux-info
 
@@ -224,7 +224,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+	wayland? ( dev-util/wayland-scanner )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa/mesa-21.3.5.ebuild b/media-libs/mesa/mesa-22.0.0.ebuild
index 7b064418bfbd..15b5138f55fb 100644
--- a/media-libs/mesa/mesa-21.3.5.ebuild
+++ b/media-libs/mesa/mesa-22.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit llvm meson-multilib python-any-r1 linux-info
 
@@ -26,88 +26,62 @@ 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"
+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}
-	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
+	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_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	osmesa? ( gallium )
+	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_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium )
-	video_cards_vmware? ( gallium )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
 	xa? ( X )
 	xvmc? ( X )
-	zink? ( gallium vulkan )
+	zink? ( vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+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}]
-	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}]
-			)
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			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}]
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
 		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${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] )
+	${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}]
@@ -150,53 +124,51 @@ 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? (
+	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_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
 						${CLANG_DEPSTR_AMDGPU}
 					)
 				)
-				!video_cards_r600? (
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
 					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
+						${CLANG_DEPSTR}
 					)
 				)
 			)
-			!opencl? (
-				video_cards_r600? (
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
 					${LLVM_DEPSTR_AMDGPU}
 				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
 						${LLVM_DEPSTR_AMDGPU}
 					)
 				)
-				!video_cards_r600? (
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
 					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
+						${LLVM_DEPSTR}
 					)
 				)
 			)
@@ -207,6 +179,7 @@ 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
@@ -253,11 +226,10 @@ llvm_check_deps() {
 pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
+		   ! use video_cards_intel &&
 		   ! 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"
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
 		fi
 	fi
 
@@ -300,17 +272,6 @@ pkg_pretend() {
 		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
@@ -331,8 +292,7 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
+	if use video_cards_intel ||
 	   use video_cards_radeonsi; then
 		if kernel_is -ge 5 11 3; then
 			CONFIG_CHECK="~KCMP"
@@ -346,7 +306,7 @@ pkg_setup() {
 		linux-info_pkg_setup
 	fi
 
-	if use gallium && use llvm; then
+	if use llvm; then
 		llvm_pkg_setup
 	fi
 	python-any-r1_pkg_setup
@@ -355,135 +315,93 @@ pkg_setup() {
 multilib_src_configure() {
 	local emesonargs=()
 
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"
 	emesonargs+=(-Dplatforms=${platforms#,})
 
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
+	if use video_cards_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_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
+	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
 
-		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
+	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
 
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
+	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
 
-		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
+	if use video_cards_r600 ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature xvmc gallium-xvmc))
+	else
+		emesonargs+=(-Dgallium-xvmc=disabled)
+	fi
 
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
+	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
 
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
+	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_i965 intel
-		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_intel intel
 		vulkan_enable video_cards_radeonsi amd
 		vulkan_enable video_cards_v3d broadcom
 	fi
@@ -503,19 +421,19 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		-Degl=true
-		-Dgbm=true
+		-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 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)
@@ -530,13 +448,6 @@ multilib_src_test() {
 
 # $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
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 35aa38434e1b..15b5138f55fb 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-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} )
 
 inherit llvm meson-multilib python-any-r1 linux-info
 
@@ -421,8 +421,8 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		-Degl=true
-		-Dgbm=true
+		-Degl=enabled
+		-Dgbm=enabled
 		-Dglvnd=true
 		$(meson_feature gles1)
 		$(meson_feature gles2)
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 1cf3896de1a5..4231dddbf11e 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,4 +1,7 @@
 AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
+AUX munt-mt32emu-2.6.1-docs.patch 527 BLAKE2B dd86c30bddab89a25eecb158cebc7370d0df1bdea2cf5fcf3a8dcb4d39573bd3f3c22c8877461dd793dab75fd47d87ab1cff3ab1b7025f3adbfa0e7905acb959 SHA512 23696b724b8fc11a6b392653382e31237593428ec661bff77c85135f8f9dc44d2e7e8fb62a32c1ac558978d6b1264990bff28dc64fba51a5f44522bd8ed9a8c5
 DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
+DIST libmt32emu_2_6_1.tar.gz 572860 BLAKE2B 3ba8ec7d9b73a83341eafc990e2c5a2c5c439564ad43ac3d6f9ab3325225c863418fd901e5424e57343b40cb8cc873345003fd299d6a22d02ff3872681ff164e SHA512 888c417cce04b31b45858220a6615105611471567be8cce91c2053885c4b677a09667310bfab702bbf62f4b7230bb7c2357cb480087f6e4daecbd58e464e4212
 EBUILD munt-mt32emu-2.5.3-r1.ebuild 684 BLAKE2B 8ecf48e04870afd899d5ec983188095e240a031d2dca08df1e9c175d4d4cc59e9978a3f8d2cfeceeadf2e0dd6fda17a6d792adacb5c8272af982e544353ef3f4 SHA512 ba6776449ec18ecca8c6d8f9ee48449dcc0055784f6a79277f62f3a2ac69b6b1bf5fd65db40154f65ae910b19ae9144b6fdb5b0ea6a5830101f3622a5f43b83b
+EBUILD munt-mt32emu-2.6.1.ebuild 684 BLAKE2B d7f4d5cbc4246c1c3bce9595222cc4fde6c7bd506877d9fcab6f4d0291a094b68a371ece3c8bfdd79fb15c05c4347da583fc05858c25590fe5bbb81af5145d05 SHA512 0a509e89a6b852c9bbf45375cbbe596e7f6e3dbf3e1616968d60c94a0f1eff075068c5c24e1a13496e666d96b5b7c5da48649ae4707abce668523a6bf0936696
 MISC metadata.xml 621 BLAKE2B 52ec37202ec80fc7b37c23087264133c670058b8ae6428377abbccd7b7728314463b13b42f85abbe6b7befdb66a2447d5bb4614767ae94769ae850547c0ec18c SHA512 20c482a847d5b9511d54765ff0d7a8b634a5f5f14e4f0a2abdcc8fea4a424836ff80b7526ebfb39ccf2c848ce02bd52eb7b3088fedfde5b5760f5f9b0bf113c4
diff --git a/media-libs/munt-mt32emu/files/munt-mt32emu-2.6.1-docs.patch b/media-libs/munt-mt32emu/files/munt-mt32emu-2.6.1-docs.patch
new file mode 100644
index 000000000000..67c744ad20a5
--- /dev/null
+++ b/media-libs/munt-mt32emu/files/munt-mt32emu-2.6.1-docs.patch
@@ -0,0 +1,14 @@
+diff -Naur a/32emu/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2022-03-06 14:47:08.000000000 +0000
++++ b/CMakeLists.txt	2022-03-15 23:26:06.230301579 +0000
+@@ -377,8 +377,8 @@
+ endif()
+
+ install(FILES
+-  AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.md TODO.txt
+-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/munt/${PROJECT_NAME}
++  AUTHORS.txt NEWS.txt README.md TODO.txt
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/$ENV{PF}
+ )
+
+ # Facilitates usage of the library in another project either through
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.6.1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.6.1.ebuild
new file mode 100644
index 000000000000..4a07225533b4
--- /dev/null
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="libmt32emu_${PV//./_}"
+DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.1-docs.patch
+)
+
+src_configure() {
+	local libdir=${EPREFIX}/usr/$(get_libdir)
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${libdir}"
+		-Dlibmt32emu_PKGCONFIG_INSTALL_PREFIX="${libdir}"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 867aa7b9cec7..36cefc3a5a24 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,9 +1,7 @@
 AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3
-AUX nas-1.9.4-fno-config.patch 1525 BLAKE2B 82c6158ccad4b4de043309022fe8ecbbf02f1f934aaa6f41524920b9725e027d983eff49d85ea55ce866409c31137e9293c5f5b04a10b24f759fefc1043f540a SHA512 4619e6027590763195483af3b77b1802f8d3c9a2c54dbcbccd4a0c6814c0add7d8f89c85cfd5a6bb39654a1e2f95f1b4762f2b6f038b781f35773b5541b0d0fd
 AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459
-AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617d278c84bca2231ed55806301fbbd69f2b820327d06aad9f3ac5b763183fabc0282470bf396e08193ce35d4482d742e821 SHA512 bb8753e6dac817ec5df490ee385619ce39fff6c033aa6171e7ff3da5df649fd30dbf405729b1d27d2e37a24be5c6e7782a713f5cf452a2b68dab63d639e39ffb
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
-DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2603 BLAKE2B b1f3c96feeca4d97adef678829617ce2ae3c0adf39e2064228e7b8a5001b70002963ea4fea84250f1a4f806d9815ac21a26bbb11aceb966c17482c1d6047087e SHA512 77d9c6d62161e9f0191be43ceb0a8ceb28569a048e219fa65e94df3f80e42ea546012186ee7187f616a59a557d0de4ee9469907eeff8466ad944f16f37a14215
+DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a
+EBUILD nas-1.9.5.ebuild 2497 BLAKE2B e9f53faa88c9b56e3712234da1f8ace27ef3f11d3f22357c316367ba9f793a4b11e7166dbfcc8a7b5db0558c7a89de04feb16f6fab77667aab951e5868a7228d SHA512 fed3e19e17354b67c05b127a608335f46a1cd775431e55f0cc7706f5b0659d4fe13fa70bef6091ea1eecda564c7804dab0292295690b9cccbca9db21ddef32de
 MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7
diff --git a/media-libs/nas/files/nas-1.9.4-fno-config.patch b/media-libs/nas/files/nas-1.9.4-fno-config.patch
deleted file mode 100644
index e5ce72d37d9a..000000000000
--- a/media-libs/nas/files/nas-1.9.4-fno-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f1e8e0da221152560efcb097c00539476071047c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 23 Jan 2020 13:43:12 +0100
-Subject: [PATCH] Fix building with GCC 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 defaults to -fno-common and as a result raises an arror when
-linking nasd:
-
-gcc -o nasd -O2 -fno-strict-aliasing   -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld  -L../lib/audio -L/usr/lib64 -L/usr/lib64    dia/libdia.a dda/voxware/libvoxware.a os/libos.a
-/usr/bin/ld: dia/libdia.a(lex.o): in function `$d':
-lex.c:(.bss+0x48): multiple definition of `yyin'; dia/libdia.a(main.o):/builddir/build/BUILD/nas-1.9.4/server/dia/main.c:79: first defined here
-collect2: error: ld returned 1 exit status
-
-The reason is that both lex.c (generated from lex.l) and main.c
-define yyin global variable.
-
-This patch changes the main.c definition into a declaration.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- server/dia/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/dia/main.c b/server/dia/main.c
-index 462e89b..9ea2a12 100644
---- a/server/dia/main.c
-+++ b/server/dia/main.c
-@@ -76,7 +76,7 @@ static char *AuServerName(void);
- extern char *display;
- 
- static int restart = 0;
--FILE *yyin;                     /* for the config parser */
-+extern FILE *yyin;                     /* for the config parser */
- 
- void
- NotImplemented()
--- 
-2.26.2
-
diff --git a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch b/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
deleted file mode 100644
index 46ef6bb4610e..000000000000
--- a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 212309075d26668f6e25f30754e646952843cf61 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Tue, 28 Apr 2015 18:56:46 -0600
-Subject: [PATCH] 
-
-On a uClibc system, the macro definitions of abs() and fabs()
- cause the build to fail.  Since these are specified by POSIX, it is safe to
- just drop their definition.  This has been tested on uClibc, glibc and musl.
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=510766
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- server/include/misc.h | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/server/include/misc.h b/server/include/misc.h
-index 2267ae0..fb904c8 100644
---- a/server/include/misc.h
-+++ b/server/include/misc.h
-@@ -71,12 +71,6 @@ typedef int Bool;
- 
- #define min(a, b) (((a) < (b)) ? (a) : (b))
- #define max(a, b) (((a) > (b)) ? (a) : (b))
--#ifndef abs
--#define abs(a) ((a) > 0 ? (a) : -(a))
--#endif
--#ifndef fabs
--#define fabs(a) ((a) > 0.0 ? (a) : -(a))        /* floating absolute value */
--#endif
- #define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
- /* this assumes b > 0 */
- #define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)
--- 
-2.0.5
-
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index de678c811d99..5087f4f1231a 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -1,13 +1,13 @@
-# 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
 
 inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Network Audio System"
 HOMEPAGE="https://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
@@ -18,12 +18,12 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXpm
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+	x11-libs/libXt[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
@@ -31,16 +31,14 @@ BDEPEND="
 	sys-devel/flex
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	riscv? ( >=x11-misc/xorg-cf-files-1.0.7-r1 )
+	riscv? ( x11-misc/xorg-cf-files )
 	>=x11-misc/imake-1.0.8-r1"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.2-asneeded.patch"
-	"${FILESDIR}/${P}-remove-abs-fabs.patch"
-	"${FILESDIR}/${P}-libfl.patch"
-	"${FILESDIR}/${P}-fno-config.patch"
+	"${FILESDIR}/${PN}-1.9.4-libfl.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index ad7eca0b86ed..02aef3cc5842 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,5 +9,5 @@ DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46
 DIST netpbm-10.86.30.tar.xz 3692036 BLAKE2B 2529adfe7f93cf2400547c107cf04b03478aef95bce6573195a6a9e20767b04371bcff13744aa547885ffa3137d948076de01ad0a979f4464c13e3fdeeb37bf7 SHA512 7643b279c59717b30130e7178be82638085d2ae28c0cea8c7595f5ff3a1cd3c5dd0201a051bed8997f8a8354b5eeb08949d4e8587d3e807df7859a4cb1a44534
 EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
 EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
-EBUILD netpbm-10.86.30.ebuild 5866 BLAKE2B ff6660d6b3708122c09e56400d6ff95777ad100f5fded745e867092f3425a6bbd62efe14b52e8f0771b449f1979fc47f751f918ee017cdb8e04cced8e449f3fa SHA512 9987a1100498b5c74ad6b61c4e48eed9432f017ca50a3d15fb70cf2bf430f4cdbd85b899409edbde6f8593393f0efaf4103b55d339beb968783072bb00cce75a
+EBUILD netpbm-10.86.30.ebuild 5863 BLAKE2B 5c53e0e2e9b273966cd7cbac3e304da38e7ddefc4540136198d4dbabe7930dcda963a2257c1e8e1f43031fe96035aa30f06db3160616232e8fa97e426f1348af SHA512 9a6023c5711328028ad50d83c7a420c8af274748f23b57f6762faea1d9853f5535570196461b5ee57e79cf43b55a3f0d9afd23137ba3850199753909a4f8ff13
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.30.ebuild b/media-libs/netpbm/netpbm-10.86.30.ebuild
index 5800e9cbc6ef..f6fe77349f2f 100644
--- a/media-libs/netpbm/netpbm-10.86.30.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="GPL-2"
 SLOT="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="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 BDEPEND="
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index fbcd8aa4d0da..1709cea2e654 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,15 +1,5 @@
-DIST nv-codec-headers-10.0.26.0.tar.gz 61978 BLAKE2B 0f91a3e9f0be19658a519ad4d9091aea4e8a59c0a857d997ce49060d84f35ba7fe5f5fc2e19ee63ad054df16df08946990cc70abe867ceefd40867fb3a06f9ee SHA512 707a2151e5045939be69083bca8b8219439e1edb218a3eb3a8f1ebf38e6c8fd9ef2066e5f986c57b63573603c1fa2ae34f24acee118d1f69e39b3d7b747a28f0
-DIST nv-codec-headers-10.0.26.1.tar.gz 62544 BLAKE2B a19d87101fe0bb511383ca6d5f61fe5a8ecce54827a09ae5526d6b546f50cf14368887550f7689180041e8a36b61ba53c103b8a225a7765670b5d97169d62a62 SHA512 18c507d73efc8b7194bcc79a2e25f88c81390d10766511f9b0c4826cb7b9332e9d0f2667441dd5529575dd1d2c0e0625304ee489c643c9f66ec90f2dbab566c9
-DIST nv-codec-headers-11.0.10.0.tar.gz 66724 BLAKE2B 98fb8cd663ac61ad58f5d463ded9852e94b377991de2f980ec0a0088fcd5d0af98090b76f82e9e7ca242a0ff55e4d4c1ef91c9c6466a6de8d81e97ba2d721e66 SHA512 f4964499a834ba31e073f0b0deabba354eb8351cd135846efd3387313ef4af0750a875d450674ef416f2b2cc7176e9154c1e5033de07f6091b9d0cc7c7ef9cb1
 DIST nv-codec-headers-11.1.5.0.tar.gz 67850 BLAKE2B 27c1ae4a8710bbb1ca72d5009ec4b62c71f1899c128009bf7017603429dc9c47df9894bb0e1eb2fd21986ee713aa24a82e0753a4b196347ad51371d67b2f3dbf SHA512 b973ba763476b083870d7701b63cb98cc5e22d3698e431316c82b8ffd887d430df296938af52ed54478440105ac34f4282b0a8471eb541c1ff77cac9ad33ec3d
-DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
-DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
-DIST nv-codec-headers-9.1.23.1.tar.gz 59400 BLAKE2B a4f437b5abc8bac05bafde4f01a4fa42f7acf2fd4a1d8b7e58f6a5a5e54c95a6ef9d6b510829bed9ed63f804220de460adc6441bf3c0bd451774dacc6f11e43e SHA512 0c1112cb1db98f60e64eeee24e3592b65c31ea8a808de707d4d0a56efb71c9a483bb3af45a641bff1f8422ab44e6be4bffd548b6567305021a448bcd66202b29
-EBUILD nv-codec-headers-10.0.26.0.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977
-EBUILD nv-codec-headers-10.0.26.1.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977
-EBUILD nv-codec-headers-11.0.10.0.ebuild 729 BLAKE2B 201843335dc4dffb34ad67aa24736331d5913031f9a148edcdbf3a2d8e78112164b43d1eb583f1747fea65a7631473deda078051b6956259336ebd6bfda97807 SHA512 09a1e4d6dbc74c255f47ff0c09510de1fdc8d402f988e491dfe5d1742575e333e32a1e21683e043631e483f9eebfd58613e0263dbd900b76b61540215e1ed3c8
-EBUILD nv-codec-headers-11.1.5.0.ebuild 732 BLAKE2B 00dea0daf2a3437e6bb0536bd1c83eb70a0b9823ac30cb1347ac44d3a6b3d41be589102a88cd6d343715edec7f577169d46e9dce9f91451cc8a913e639f5b34a SHA512 9c4061aef95cb7c923ac39c2ad7080552cf2f2e8ec5fc4936b9b53dfeeda2ce0932e6cc4634f321cc268e607d38c4a302f2912a836bfaf461f95d3d6d255a349
-EBUILD nv-codec-headers-8.1.24.2.ebuild 791 BLAKE2B 1a30ee929c9619f0497c4912b709b3e860227ef5daf466e9319bb4799aaf6de7b377324f779d674b78b45ae23041d65188a4ede6827a1cf35cd913ad36a2c9fb SHA512 258ad2e47ed9dcfabe870010f15670e318d064e35bbc1ed60347b48b91d0be65c941125794e817df013851263657628ee844e08d1c000390ad244960f5b58675
-EBUILD nv-codec-headers-9.0.18.1.ebuild 791 BLAKE2B 883e69bfc8304eff9f48c6095f2356df69ad16f6cfcfe2f4ef23cc648641a69ea9a3f50740e1f1b8305e00d72e10812d69714603bd96c8f2dc42e0322a5b66b4 SHA512 0a947197e469c989d2fe76adc2f303c96ce6e9d441521daa7ca87c4aaf99d7890d19b59c3727d83be54bef1b2279097033d5441ba274b9212958289086e453e6
-EBUILD nv-codec-headers-9.1.23.1.ebuild 758 BLAKE2B 1e5096e56aababfe603c97bc548b18f44cd3f025f23ac2fc522bacc6029848e13a12d5cb9686e2b4b8a9ab4d4cd31849659897e97a1da9be8e2ed43bc4dbbbc8 SHA512 2f4e666dd3d801a775761f836c04b782a87b40aaf0936805b2abadb3c074b2314e1db0e98f7b91b64270367756682c0d72b437c677a5b3c3a66fc5e9e354805a
+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
 MISC metadata.xml 320 BLAKE2B 87b2f0f66194013fc14f77ab1d3cb940fba6d2194f8b17411cccd0fc3c5c86b850ceef3b05160d81929228392a4ceaaf8e7862ed0ed801f6f6af7dafb7624111 SHA512 589c3adde9ae93f2db628fe91710bc19e2d007ce0ab4810d17ab7dad6eede2a1e4e332e485c89fa542552f726a27a591a9894e0518663b9dd82063381b9126e5
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.0.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.0.ebuild
deleted file mode 100644
index 74d91fe786d8..000000000000
--- a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-drivers/nvidia-drivers-445.87[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	multilib_copy_sources
-	default
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild
deleted file mode 100644
index 74d91fe786d8..000000000000
--- a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-drivers/nvidia-drivers-445.87[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	multilib_copy_sources
-	default
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
index a00618c3dc95..fc9b99fc3cad 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND=">=x11-drivers/nvidia-drivers-470.57.02[${MULTILIB_USEDEP}]"
 
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.0.10.0.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1.ebuild
index 0a30ef8df8df..a6586dda664b 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-11.0.10.0.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1.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
 
 inherit multilib-minimal
 
@@ -11,19 +11,19 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
-RDEPEND=">=x11-drivers/nvidia-drivers-455.28[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-drivers/nvidia-drivers-470.57.02[${MULTILIB_USEDEP}]"
 
 src_prepare() {
-	multilib_copy_sources
 	default
+	multilib_copy_sources
 }
 
 multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
 }
 
 multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install
 }
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
deleted file mode 100644
index a981ee6a487b..000000000000
--- a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-drivers/nvidia-drivers-390.25[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-n${PV}"
-
-src_prepare() {
-	multilib_copy_sources
-	default
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild
deleted file mode 100644
index feb6261732fa..000000000000
--- a/media-libs/nv-codec-headers/nv-codec-headers-9.0.18.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-drivers/nvidia-drivers-390.25[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-n${PV}"
-
-src_prepare() {
-	multilib_copy_sources
-	default
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
deleted file mode 100644
index 81c82774fc00..000000000000
--- a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=x11-drivers/nvidia-drivers-435.21[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	multilib_copy_sources
-	default
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8af09901aeff..c0bb05fe0ed0 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -14,4 +14,5 @@ EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7
 EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
 EBUILD opencolorio-2.0.3.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
 EBUILD opencolorio-2.1.1-r2.ebuild 2987 BLAKE2B 84232f4da90329934d2dd430a058ee25cc9b9229f7cb583cd5a2ff103c71eab9a48013612410395c083f7d3cda02fc027f72c29f53753cf142e16736799e48c9 SHA512 59448793311c5833b07f5f7d5894178f92a787d208a08e13c93f3225884f0902e222e6066ae7f7090498a16b6da8a30561f916a4016257c767f4a12e06f0ce42
+EBUILD opencolorio-2.1.1-r7.ebuild 3190 BLAKE2B d49d2bb4d1ec714ef5d43a4488be16d785df6518043fe2fb70b2cb3f7181f6f10da12150c9c250bd8eb3d7ae698b415bf9988b4abac3648f367fd2c6683310c0 SHA512 8cc360bc62150e7ff1a6f4cf059a10bae3dfd6f5a457dd3ca1e1f34875a1d17e0924de77bd63e24b5e257ab2f3d9bea7ae56d2888bde1d3d1cd4270ac2e1efff
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
new file mode 100644
index 000000000000..942486329016
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
+# to force rebuild of consumers due to changing to openexr 3 changing API.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Works with older OIIO but need to force a version w/ OpenEXR 3
+RDEPEND="
+	dev-cpp/pystring
+	dev-python/pybind11
+	>=dev-cpp/yaml-cpp-0.7.0:=
+	>=dev-libs/imath-3.1.4-r2:=
+	dev-libs/tinyxml
+	opengl? (
+		media-libs/lcms:2
+		>=media-libs/openimageio-2.3.12.0-r3:=
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+
+	# Avoid automagic test dependency on OSL, bug #833933
+	# Can cause problems during e.g. OpenEXR unsplitting migration
+	cmake_run_in tests cmake_comment_add_subdirectory osl
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DOCIO_USE_OPENEXR_HALF=OFF
+
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
+		-DOCIO_BUILD_JAVA=OFF
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=$(usex test)
+		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+	)
+
+	# We need this to work around asserts that can trigger even in proper use cases.
+	# See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+	append-flags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 15decaa50684..72a8fc7d9c1d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,5 +17,6 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-4.5.2-r3.ebuild 20667 BLAKE2B 1482e70d2c5dcaa6d568f6c4326eac12a5380433fb40267cd1961a83f4ea3a2ca2b2d2c4351b0304d9882a84b144d81a52a9da6ccc34fb05987356a8d21f6e86 SHA512 121fa6c8b4297290808ea1fd67d56dec075c96d90c7b60484294cc939fb5bd9595d6aa9cf833eefcd93f36ea31e1c3c032791a21074ebe6da460bc01fd2d0945
 EBUILD opencv-4.5.2-r5.ebuild 20722 BLAKE2B 1eff4e40444049fa054ebe99b6675b9ae780310aaa85a678ac1216936773afffab32d372f181bbfc72bdd3ee86732639ae02383a16344a6fdb1a3bad55bec159 SHA512 c28a914751319a8fa7140838debba1d745fe09e4f2f6d5564549246c916f91b69446e823aa6262a7d94176d60404f37b271bf79299100f47d14a22a045ddc12b
 EBUILD opencv-4.5.4.ebuild 21206 BLAKE2B 4de0279868389f82d0ca24dc95fc597fc5ec20c8e8cb112164ff78e942f01b9119163e41b162ac409912f5b8a6d601ec065f3b51755114a4642cefc379a03ca2 SHA512 611816ed458371f63f870d1b1df2f73839a8005d23aaf14b72893d47a63f07807fbc7b7053afac620833e8f8fbe664f75ec851b0d5e73c9b9cdb4d79e4f55ef1
+EBUILD opencv-4.5.5-r1.ebuild 21072 BLAKE2B f79f65cf5e0b986117ffd70536cb4e63eb64478f55b0bea34a7ff986093fa7e03b5903e280419bc863c7cf004c0ab218e56a99489156dd0d07d9f9e68e5b750e SHA512 e626da1a6b335822bc563fe4fd8ad8eb50273c42c69320e157b2d15d9bb57722161c6339318dadf5319fc54f1abdf35670692cae57bae95c11afdbd8a8094a85
 EBUILD opencv-4.5.5.ebuild 21194 BLAKE2B b7251fe4655f7800ed2183b36b6c7c6bee778e08de1c75ac723e240daea951c8bf27a5bb4dcfbc9900bf0ad6cdd7c81d26c343a51bfab923669274348d050c28 SHA512 c11df51fa83b6477e0bd4e49b18e20936fbbfa153912d81712bb05fc764045558d18dc8ff0bec41bce51b9fbb407333e6122a2c6bd3369b23d11c7b626d3b2c5
 MISC metadata.xml 3186 BLAKE2B 0293399368d675e350992184bcaad2de17e68aae0ea3fa15bb885ac975f14f0350efc5a00a17737be22cf8b5c0808b3853c77b66ff43294f443305ee188aaa06 SHA512 6d3ee73a3b78581b3e4f12287578cae84afa8747d2432fa436860c265ae92f1072cb83a1b41a2f80ed9141f4c097224df6280c78970d7d68e1c9baa92d383395
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
new file mode 100644
index 000000000000..98288510a586
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( contrib
+		tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.8:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		>=virtual/lapack-3.10
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+	eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [contrib_sfm]
+	/usr/include/opencv4/opencv2/sfm.hpp
+	/usr/include/opencv4/opencv2/sfm/conditioning.hpp
+	/usr/include/opencv4/opencv2/sfm/fundamental.hpp
+	/usr/include/opencv4/opencv2/sfm/io.hpp
+	/usr/include/opencv4/opencv2/sfm/numeric.hpp
+	/usr/include/opencv4/opencv2/sfm/projection.hpp
+	/usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+	/usr/include/opencv4/opencv2/sfm/robust.hpp
+	/usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+	/usr/include/opencv4/opencv2/sfm/triangulation.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(multilib_native_usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f0e220cd74d3..c12e27571f76 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -9,7 +9,8 @@ DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b1
 DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
-EBUILD openexr-3.1.2.ebuild 2164 BLAKE2B 0854070dc3718954071b167178050914b8ef463deb7a64312cf03d5ce05929e4dd3064b2cf9952b74332b12f95eac5cd4db5e355e6a2a1f282b0506fcb1c78f6 SHA512 b5ac054271964dfa4509d27d0b3fb4bbae35b2619ba84879d828b4bf4b0f6dfe33eaa144717e70aee861acc29260769376877473c405bc19d84b57efc0706f6e
+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.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
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
index 9a8c70d88e64..5fb127134ee7 100644
--- a/media-libs/openexr/openexr-3.1.2.ebuild
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -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/openexr/openexr-3.1.4-r1.ebuild b/media-libs/openexr/openexr-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..dd4e602ea9d6
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/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"
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/imath-3.1.4-r1:=
+	sys-libs/zlib
+	!media-libs/openexr:3
+	!media-libs/ilmbase
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/breathe )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	cmake_src_prepare
+
+	#mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DDOCS=$(usex doc)
+		-DOPENEXR_BUILD_TOOLS=$(usex utils)
+		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DOPENEXR_ENABLE_THREADING=$(usex threads)
+		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
+		-DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+	)
+
+	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+
+	cmake_src_install
+}
diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild
index afd43341887c..ffe4572facba 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/openh264/Manifest b/media-libs/openh264/Manifest
index 5e19352c1580..f1ace9efd18c 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -3,5 +3,5 @@ DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLA
 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
 DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
 EBUILD openh264-2.1.1_p20190331.ebuild 3457 BLAKE2B 15c0bb913b6e97f0f3a3a08f44dff9bea5026d8f936573c0aeab2c7e077691d7be2123e2cf599c4de9a61c08323fa1cb9f2af2d1a2834c97b6f3e1e06dd3614a SHA512 4505c55440f1ae4f28aeee38e6ec02ab7537f1e997a45964a36eb3474a27c8306e590dd38b345834d6feba7dc73b2e6df8b82d8af78c32d99985b1eaa3109e80
-EBUILD openh264-2.2.0.ebuild 3486 BLAKE2B 4a2ddfad4af22f2151c4df3e6d53ef41feae3e95fa07d127cf802cef2a0945f2f18e23724237981125eefd8693071b23e2e7c8893c8093c255d89825e4229035 SHA512 d741e37d9f6bd919af3ab1d25fe479b905cb7dcc75bbd5d768f20640f39b0c9367a3fc26f9d86b79bcd3db5534e3d1f938ce97bce0534b2299e927c3592c98b0
+EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.2.0.ebuild b/media-libs/openh264/openh264-2.2.0.ebuild
index a99a1a7fb6aa..5eca5a26ae02 100644
--- a/media-libs/openh264/openh264-2.2.0.ebuild
+++ b/media-libs/openh264/openh264-2.2.0.ebuild
@@ -7,13 +7,18 @@ inherit toolchain-funcs multilib-minimal
 
 MOZVER=39
 MY_GMP_COMMIT="e3935759360861812d33cbd3b713e25f1de1ecb5"
+
 DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
 HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
 SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
 LICENSE="BSD"
-SLOT="0/6.1" # subslot = openh264 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# openh264 soname version.
+# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
+#  https://github.com/cisco/openh264/issues/3459 )
+SLOT="0/6.1"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 12719e1a8672..6ce67e41494b 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,7 +1,14 @@
 DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
+DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
 DIST openimageio-2.3.11.0.tar.gz 32439595 BLAKE2B 6e64284c36de87fc077e839db808d4fab0cb6ea4951639cfed21e68900782c03ef6c2e64dcae5c1bf9360ad0a838ee36396d31634ad0ddd20f8fc9f683fc9dc8 SHA512 7e973f4f1b00dfc2486d074f5fdd03aa612a650411c7440868a4846ecfda8b172be33110fce35801dfed92d80f338b989f3ee001191938c48edef5ca760eff3c
+DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
+DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
+EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d
+EBUILD openimageio-2.3.11.0-r2.ebuild 5138 BLAKE2B 047c02e1765c1bc1ada09fd7a7b84b2cc9ba0683634e8a8f09d31c776cde68ae82361b38816ab23b6e40fc9a81950ce47e421b5a2227cabeb617b1d8d789d56c SHA512 66b8150acb3cad204ba55b01a6353ce94c8da4bfda734b1481b003a980f925aab1fb078d1bf0371de920bf11635332ee3a657072f73cedbe2e198da4ce1a6c8a
 EBUILD openimageio-2.3.11.0.ebuild 4994 BLAKE2B bc098946528cdfc437abdcfdb18cc8c61910f7d9c32733c4d3052c6ae1d8e38eb0f59b7aebe751294980d54ac8bb70bab369ceb51a53e1c3fb40c3d50de030da SHA512 192508d42a4510817d7a2771a4391ef1c1f45e1f469e21b01a82ed2ac752a6edc978ce8e749f5a94d20eb18d935351001aa49378e7c161d3546c6f647d56eebe
+EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
+EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a
 MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
new file mode 100644
index 000000000000..c19e648e4dec
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+	# (because it mix and matches which version it uses; sed this to
+	# make sure it'll use OpenEXR 3 if it can, but it won't.)
+	# bug #821193
+	sed -i \
+		-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+		src/cmake/modules/FindOpenEXR.cmake || die
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
new file mode 100644
index 000000000000..79438a824283
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1 flag-o-matic
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	dev-libs/imath:=
+	>=media-libs/opencolorio-2.1.1-r3:=
+	media-libs/openexr:3=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.11.0-imath-openexr-3.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+	# (because it mix and matches which version it uses; sed this to
+	# make sure it'll use OpenEXR 3 if it can, but it won't.)
+	# bug #821193
+	#sed -i \
+	#	-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
+	#	src/cmake/modules/FindOpenEXR.cmake || die
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	append-cppflags -DOIIO_USING_OPENEXR_3
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
new file mode 100644
index 000000000000..ebf987eb33f7
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.3.13.0.ebuild b/media-libs/openimageio/openimageio-2.3.13.0.ebuild
new file mode 100644
index 000000000000..53d4cadea1db
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.13.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 5aaaf0e95513..2192b3956662 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,7 @@
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
+AUX openjpeg-2.4.0-r1-gnuinstalldirs.patch 15897 BLAKE2B ee5b28985348d9da58d930782420aa43d284efd64574d8f8b250e6d115d6bbb6f4756de2ce6e17251f03c1b6b3dbde2c0fa71b2308724eb84354b15fad650ea2 SHA512 899a112fc8dc65d1c17ec68bf80dc0e892e619bfc67b97784e72c0878ed1a0dc44345b9f5b86e4453df27124b20444ab81511fc66f3e871475a93d8f1f7700bc
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
+EBUILD openjpeg-2.4.0-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8ff10d3467cbdecb5c218870d0e74aeffafd0925c90de5650a775f1b6f417df6ec2afbda3591ad6e9d2b044a11fc315 SHA512 686fdd68d37aa2b40a712b1f51711f509653f553e0dc0d3ad232c721e58146150c23f4eb5ec8c61d4fd147b7a32210664c0990035b2027001cd84c2bfe81db12
 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
 MISC metadata.xml 311 BLAKE2B f7da3c88ae13437c6dbd48c7468f091d1b87bea39a53a85b4abc97d6beb3869c5bb9bd0aeafb065961611be1098a25fdafd8f9b0eb6e395a0de734fc2df53dd5 SHA512 a5a60bfea83513d0eba56f9873bc2d38ca89bc2fade19744d32b767120b5c9e29f56ebddb903648643517f6e2488525e538a1810d91cc864640312c05b7031b2
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..bc6771c0c4be
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
@@ -0,0 +1,435 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+(Later rebased by sam@gentoo.org for 2.4.0)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -105,58 +105,27 @@ endif()
+ # --------------------------------------------------------------------------
+ # Install directories
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
++include(GNUInstallDirs)
++
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+-	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
++	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+ endif()
+ 
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+ 
+ include (cmake/OpenJPEGCPack.cmake)
+ 
+@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ endif()
+ 
+--- a/cmake/OpenJPEGConfig.cmake.in
++++ b/cmake/OpenJPEGConfig.cmake.in
+@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/OpenJPEGTargets.cmake)
+ 
+-  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
++  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
+   get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
+ 
+ else()
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
+ 
+   # install HTML documentation (install png files too):
+   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+-    DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}
++    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+     PATTERN ".svn" EXCLUDE
+   )
+ else()
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+   if(OPJ_USE_DSYMUTIL)
+     add_custom_command(TARGET ${exe} POST_BUILD
+@@ -83,6 +83,6 @@ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ #
+ endif()
+--- a/src/bin/jp3d/CMakeLists.txt
++++ b/src/bin/jp3d/CMakeLists.txt
+@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJP3DTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+--- a/src/bin/jpip/CMakeLists.txt
++++ b/src/bin/jpip/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
+ # Install exe
+ install(TARGETS opj_jpip_addxml
+   EXPORT OpenJPEGTargets
+-  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
+   # Install exe
+   install(TARGETS opj_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endif()
+ 
+@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
+   target_link_libraries(${exe} openjpip)
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endforeach()
+ 
+@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   else()
+     # opj_viewer (simple, no xerces)
+@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   endif()
+ else()
+--- a/src/bin/jpwl/CMakeLists.txt
++++ b/src/bin/jpwl/CMakeLists.txt
+@@ -57,6 +57,6 @@ foreach(exe decompress compress)
+   endif()
+ 
+   install(TARGETS ${jpwl_exe}
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+--- a/src/bin/mj2/CMakeLists.txt
++++ b/src/bin/mj2/CMakeLists.txt
+@@ -43,5 +43,5 @@ foreach(exe
+   endif()
+ 
+   install(TARGETS ${exe}
+-  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
++  	DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endforeach()
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
+ 
+ #
+ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
+ 
+ include_directories(
+   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
+@@ -114,21 +114,21 @@ endif()
+ # Install library
+ install(TARGETS ${INSTALL_LIBS}
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjpeg.h opj_stdint.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
+ 
+ if(BUILD_DOC)
+ # install man page of the library
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ endif()
+ 
+ if(BUILD_LUTS_GENERATOR)
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=@CMAKE_INSTALL_MANDIR@
++docdir=@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp2
+ Description: JPEG2000 library (Part 1 and 2)
+--- a/src/lib/openjp3d/CMakeLists.txt
++++ b/src/lib/openjp3d/CMakeLists.txt
+@@ -34,12 +34,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENJP3D_LIBRARY_NAME}
+   EXPORT OpenJP3DTargets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjp3d.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+   COMPONENT Headers
+ )
+--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=@CMAKE_INSTALL_MANDIR@
++docdir=@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp3d
+ Description: JPEG2000 Extensions for three-dimensional data (Part 10)
+--- a/src/lib/openjpip/CMakeLists.txt
++++ b/src/lib/openjpip/CMakeLists.txt
+@@ -74,9 +74,9 @@ endif()
+ # Install library
+ install(TARGETS openjpip
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
+     PROPERTIES COMPILE_FLAGS "-DSERVER")
+   install(TARGETS openjpip_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+     )
+ endif()
+--- a/src/lib/openjpip/libopenjpip.pc.cmake.in
++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=@CMAKE_INSTALL_MANDIR@
++docdir=@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpip
+ Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
+--- a/src/lib/openjpwl/CMakeLists.txt
++++ b/src/lib/openjpwl/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
+ # Install library
+ install(TARGETS openjpwl
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=@CMAKE_INSTALL_MANDIR@
++docdir=@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpwl
+ Description: JPEG2000 Wireless library (Part 11)
+--- a/src/lib/openmj2/CMakeLists.txt
++++ b/src/lib/openmj2/CMakeLists.txt
+@@ -53,12 +53,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENMJ2_LIBRARY_NAME}
+   EXPORT OpenMJ2Targets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ #install(FILES mj2.h
+-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
++#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+ #  COMPONENT Headers
+ #)
+--- a/wrapping/java/openjp2/CMakeLists.txt
++++ b/wrapping/java/openjp2/CMakeLists.txt
+@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
+ )
+ 
+ install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+-  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+ )
diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..554c61b5304b
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	# Cheat a little bit and force disabling fixed point magic
+	# The test suite is extremely fragile to small changes
+	# bug 715130, bug 715422
+	# https://github.com/uclouvain/openjpeg/issues/1017
+	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	local myctestargs=
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	echo ctest "${myctestargs[@]}" "$@"
+	if ctest "${myctestargs[@]}" "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+			# Should never happen
+			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
+		fi
+
+		echo ""
+		einfo "Note: Upstream is maintaining a list of known test failures."
+		einfo "We will now compare our test results against this list and sort out any known failure."
+
+		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
+
+		local ARCH_SPECIFIC_FAILURES=
+		if use amd64 ; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		elif use x86 || use arm || use arm64; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		fi
+
+		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+		fi
+
+		# Logic copied from $S/tools/travis-ci/run.sh
+		local FAILEDTEST=
+		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+		local HAS_UNKNOWN_TEST_FAILURES=0
+
+		echo ""
+
+		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+		while read FAILEDTEST; do
+			# is this failure known?
+			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
+				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
+				continue
+			fi
+
+			eerror "New/unknown test failure found: '${FAILEDTEST}'"
+			HAS_UNKNOWN_TEST_FAILURES=1
+		done < "${FAILURES_LOG}"
+
+		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+			die "Test suite failed. New/unknown test failure(s) found!"
+		else
+			echo ""
+			einfo "Test suite passed. No new/unknown test failure(s) found!"
+		fi
+
+		return 0
+	fi
+}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 82bb0a35821c..d754c6c46c07 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,9 +3,11 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 AUX opensubdiv-3.4.4-add-CUDA11-compatibility.patch 846 BLAKE2B df2611fff3112eff3784306c6811285f895593a954f394d1a41b68a9e44ee2dbaae85b5f4e009dfe8edf95e8806f1c085728130c6e003a63a3918ab1ac586012 SHA512 c5c8e6705c0f93d632b45d3e645ff9b207b102ff7534f51b32400e4d60ab07afb18bf6b99a066d1556c55ba275ad586969d4460a6bd3d9c8a2bef83152183deb
+AUX opensubdiv-3.4.4-tbb-2021.patch 2147 BLAKE2B 69f1ae0689fa1a21cb6ee74ff1d6cedd474b38881e49cb5887fbc87bd2b2cc71c7b37b782751390426cc200ea2d488909555c698321c50b5891922f6eb7320ae SHA512 adc5a5126bd1433f4edf8239d7cf48755c8c84d688c8d877121598e8833a352cd3da399577dae918c66b1c4f7d90dd5af08e42d86e66a7532e3b0ae2ad59d048
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
 EBUILD opensubdiv-3.4.3-r1.ebuild 2376 BLAKE2B 5662809ca588bfe52c46fcf0c2b3e9c3feb56006a1e1ec1f277add0ef0e485a2c863ff1bc137cc8a05b3395b1a221666966d0c27117db4d962f9c7be57a62852 SHA512 fa96d571158a3f7d6bf3fea1e1478e9a0a5e10a6561235d6e58030fd4bac1007df7348fa589ed1aa8e97a09ca3f9f5263fcb04ca12fbb8d438dbe70962170bbe
 EBUILD opensubdiv-3.4.4-r1.ebuild 2252 BLAKE2B 11dc22f927daaee1bbcb8b5014efc303a37228439387ed9c89fc49509b13d46e484b1850c5b46cb95666064dfcae2455feda07295ec0bb04270b170d36f59c0f SHA512 a9a117a29ddb15de9bbfe079e6d5ddc97e3fc81804f0e52052880294f30216f2b1fb6dd7719a62f632ec113f73fe3449d2e997697a4b97391d6cc7f1f54dffc9
 EBUILD opensubdiv-3.4.4-r2.ebuild 2415 BLAKE2B 8191238ef11d63e09fa843dcad76c553d4fb2676f09dec82ad75af8d6075383c47040370259f4174b79d3596763e2c00716397a475a9533bc61e9c202fc1c5b8 SHA512 637f09451ce22279e1b7e1d6f8778dc6937680615e0ee8b500e8cbbda4f836f03f17922f16906bcb92688263725cf5fce70cf6d8a9dac7c9177e22ee6f853118
+EBUILD opensubdiv-3.4.4-r3.ebuild 2447 BLAKE2B c88e2b9c27020a74ceebd76adbc891c3536494039a6d6e1fe2eb4a38023a1de15a68e28c9f445ffb5dfc2890ec563e4abf970b51246e03ae65d6c611a5b2b84d SHA512 47ff663a6ffa2f210844bfa6646c0a404527c20c0e29472808c17647fbac2e5badbbaa6b35be759add2a32928df5ee8ae5665c8c55ac459b2b8f5d118e72a9cc
 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
new file mode 100644
index 000000000000..bae9c4a9d1f1
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
@@ -0,0 +1,65 @@
+https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1234
+https://bugs.gentoo.org/820824
+
+From 7375c99a4d1337f9b79775fb2c753e7865968642 Mon Sep 17 00:00:00 2001
+From: Artur Sinila <freesoftware@logarithmus.dev>
+Date: Sun, 25 Jul 2021 20:34:48 +0300
+Subject: [PATCH 1/2] Fix typo: schedular -> scheduler
+
+---
+ opensubdiv/osd/tbbEvaluator.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opensubdiv/osd/tbbEvaluator.h b/opensubdiv/osd/tbbEvaluator.h
+index 6bd365bc5..886a94837 100644
+--- a/opensubdiv/osd/tbbEvaluator.h
++++ b/opensubdiv/osd/tbbEvaluator.h
+@@ -1226,7 +1226,7 @@ class TbbEvaluator {
+     /// \brief synchronize all asynchronous computation invoked on this device.
+     static void Synchronize(void *deviceContext = NULL);
+ 
+-    /// \brief initialize tbb task schedular
++    /// \brief initialize tbb task scheduler
+     ///        (optional: client may use tbb::task_scheduler_init)
+     ///
+     /// @param numThreads      how many threads
+
+From 9079a517f406afba9ea50657b0a0786ad7a7bdcb Mon Sep 17 00:00:00 2001
+From: Artur Sinila <freesoftware@logarithmus.dev>
+Date: Sun, 25 Jul 2021 20:58:27 +0300
+Subject: [PATCH 2/2] Support oneTBB 2021
+
+---
+ opensubdiv/osd/tbbEvaluator.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f6d..66c2ed58f 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,8 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#define TBB_PREVIEW_GLOBAL_CONTROL true
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
new file mode 100644
index 000000000000..524b64930836
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/glew:=
+	media-libs/glfw:=
+	x11-libs/libXinerama
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )
+"
+DEPEND="
+	${RDEPEND}
+	tbb? ( dev-cpp/tbb:= )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+	"${FILESDIR}/${P}-add-CUDA11-compatibility.patch"
+	"${FILESDIR}/${PN}-3.4.4-tbb-2021.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	# GLTESTS are disabled as portage is unable to open a display during test phase
+	# TODO: virtx work?
+	local mycmakeargs=(
+		-DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DNO_CLEW=ON
+		-DNO_CUDA=$(usex !cuda)
+		# Docs needed Python 2 so disabled
+		# bug #815172
+		-DNO_DOC=ON
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_GLTESTS=ON
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_TESTS=$(usex !test)
+		-DNO_TUTORIALS=$(usex !tutorials)
+	)
+
+	if use cuda; then
+		# old cmake CUDA module doesn't use environment variable to initialize flags
+		mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS}" )
+
+		# check if user provided --gpu-architecture/-arch flag and prevent cmake from overriding it if so
+		for f in ${NVCCFLAGS}; do
+			if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then
+				mycmakeargs+=( -DOSD_CUDA_NVCC_FLAGS="" )
+				break
+			fi
+		done
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 485390d0911d..e45cfb50da33 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,3 +1,3 @@
 DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af
-EBUILD opusfile-0.12.ebuild 873 BLAKE2B 665273668c09e470854c2a2a35ea9f0538dee5807944d355e81a39dd4270f0e64f20e8953146d80bc8cbf05163ef7eebff1930510a11272adddc817a987319de SHA512 60a5e980b338da000f14791544776f86417bfb1e0d0e9b099c3594b1f512c8d25f9d0588795e1c37ebb0c7d7e3348da985d069cc532fb8d98a4fe08e482893b8
+EBUILD opusfile-0.12.ebuild 879 BLAKE2B 0cfdf0805d11da084bb8bd299f8e6cad48e61ee2481261d24df65b6ffcca15b779f248228d28303f513f5a844964b4f5220ab93256fa83eb31dd9ed3c878680b SHA512 070f0cb284108dad06da249f8b6a18457647c3ad51ccdb0baa3e164cb0fbe1f1607a9a4e5481cb93cb742376103d5ab66000db21f811e133781928e97f75d0d9
 MISC metadata.xml 575 BLAKE2B 2e91403f82dd5a8a772db511f2473ae4d7ae318163107d0ff6a9710e62521cd510a129eae38cd1afabbcc88af225b0a3035382c3130a838dac0f6850be255389 SHA512 6d15ee03dcdfc53a581d70e43a0884b0c4a52de9691fcacd9bc7ad80967c775d3f8f7636e112b4893964d6dea3be02bfbb825bc467003dd8de1bc987485e9a4c
diff --git a/media-libs/opusfile/opusfile-0.12.ebuild b/media-libs/opusfile/opusfile-0.12.ebuild
index f5a672ffcd5d..5fcb11da6630 100644
--- a/media-libs/opusfile/opusfile-0.12.ebuild
+++ b/media-libs/opusfile/opusfile-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 IUSE="doc fixed-point +float +http static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index ebc112f9c7ed..881f9d19e134 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,12 +1,8 @@
-AUX osl-1.11.15.0-fix-cmake.patch 644 BLAKE2B cd51bc2f59a59a80981d357c38a89ea2b7d4e128470616e9851ef28a0c55f3292e9ace6c681b7f15c5752b41ce1f07266adb97fffa5f1923c55242207a674fe9 SHA512 10546e4771f055fb06824113c9c77ec8cc8ea9929343a8a5a68a3ea7fc7d7e2ccb983269eed66782569275e6262fde872b56ce30008ee797ed65566f0f1359ba
 AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953
-AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
-AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
-DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
 DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
-DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
-EBUILD osl-1.11.15.0-r1.ebuild 2562 BLAKE2B 40df90315638c1651e2c5ab0e141de50eb59146baf900808a2db9757706f79e585f2904697fe479144d960f2c800c0d615203c1ba72904fc71589f39266e24a1 SHA512 108fc337ed3b098c32c8fa1a4c2f6d695b605aea00f4b65786413f722cbb04e77b4e9df64d76d181d4d123eed896d7603873fa0dff30e72ed429917638568004
+DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
+DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
 EBUILD osl-1.11.16.0-r2.ebuild 2633 BLAKE2B d1e43e8757c4e1ef6ff3ba2a4f1a7fd6e49ba6ca8c184255ca3c37ff48d72cbebf71f6bd264788dff705510122940e1513e624b6dbad3f26faa301032e1965b3 SHA512 8e100f80a8d7ab1c9fdaa17f0c0b7416db60097a3f1210771f0eff9f4fc83294fc81dae7a80331071a8018a5e48de8929da252acb997a9bae0b28c72c6ba7670
-EBUILD osl-1.12.0.2-r3.ebuild 2343 BLAKE2B b8bed7e7922021e888578a3471858097f8a4a30813922ed4c9e5ce8dec9def9c97f90fac719290f3be6d86b7d1ac8458838b78e9aa499a8f838c15c013572abb SHA512 1c8b2863239a25734e3638b052ffb3a0fcf3f3229652dc7e8b2c22b173c9b51342c335c315b9e4063b9aaa296a78cabb4e139fa5b66110d0b2e717a209182d67
-EBUILD osl-1.12.0.2.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
+EBUILD osl-1.11.17.0-r3.ebuild 2704 BLAKE2B 53468c8ae8a018fd9ceffba0e0c4879119eb0666a3be713dcc174e73e09cdd1cd7ccdb1851de77ebf752a29d9b4f45aeedf85138e580912cfc2fe2bf2eea65e5 SHA512 51cc54c36da4769594d578c0832fa9229b396f1df7b6ffaf7c110f98fbe3356a35d663840874a3a6e5c9cc372b56f6ecda24c28bed68308316d921df9f17400c
+EBUILD osl-1.12.4.1-r2.ebuild 2286 BLAKE2B d801190905ee4c7ef888fee39b1aeb6ecb3a9548bc58c5413b8f2fa1c9bbdf1abec6fff4cefcbec8f6784631461b38594c82eb8139c0c50fd29cbfdd239a7f19 SHA512 ac65dc72efd04d7b1078a66e19f3aa67c08dd50c5aaf451b8149650238bc5da3a83cefb1d274ae6441862379da7d0a59c0aa48d31ca4689d63be9c0b173c54da
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
deleted file mode 100644
index 020370d54bca..000000000000
--- a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
-
-From: debaetsd <debaetsd@gmail.com>
-Date: Tue, 29 Dec 2020 22:01:21 +0100
-Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
-         FILE ${OSL_TARGETS_EXPORT_NAME}
-         NAMESPACE ${PROJECT_NAME}::)
- 
--
--
--
--osl_add_all_tests()
--
-+if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-+	osl_add_all_tests()
-+endif ()
- 
- if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-     include (packaging)
-
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
deleted file mode 100644
index a47bcd4e47da..000000000000
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <brecht@blender.org>
-Date: Mon, 19 Apr 2021 13:49:22 +0200
-Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
-
-Generating code for prepare_closure and gen_closure was crashing.
-The code now matches the implementation of the removed LLVM function.
-
-Signed-off-by: Brecht Van Lommel <brecht@blender.org>
----
- src/liboslexec/llvm_util.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 445f64000..3d468de27 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
- #endif
-     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
- #if OSL_LLVM_VERSION >= 110
--    OSL_DASSERT(llvm::isa<llvm::Function>(func));
--    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
-+    llvm::Value* r = builder().CreateCall(
-+        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
-+        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
- #else
-     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
- #endif
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
deleted file mode 100644
index dcf9ac863f73..000000000000
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
-Author: Euan Haahr <euanhaahrmail2@gmail.com>
-Date:   Fri Feb 5 22:51:14 2021 +0000
-
-    Various fixes for LLVM 12 compatibility (1351)
-    
-    Removed use of options.PrintMachineCode since this has been removed as
-    of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
-    it has been deprecated and removed as of llvm 12.
-    
-    PrintMachine code will only be used if llvm is lower than version 12.
-    TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
-    have time to figure this out right now.)
-    
-    Pass adjustment as various things have been deprecated or changed
-    names. (LG)
-    
-    Signed-off-by: Euan Haahr <euanhaahrmail2@gmail.com>
-    Signed-off-by: Larry Gritz <lg@larrygritz.com>
-
-diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
-index 4ec3489c..7c14fc76 100644
---- a/src/liboslexec/llvm_passes.h
-+++ b/src/liboslexec/llvm_passes.h
-@@ -73,9 +73,14 @@ public:
-         // 16 bit and 32 bit native mask representation to be passed as a
-         // livein.
-         m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
-+#  if OSL_LLVM_VERSION >= 112
-+        m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
-+                llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
-+#  else
-         m_wide_zero_initializer = llvm::ConstantVector::getSplat(
-                                     llvm::ElementCount(WidthT, false),
-                                     llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
-+#  endif
- #else
-         m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
-         m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
-@@ -341,9 +346,8 @@ public:
-         // of the mask promotion will always be correct here.  Should 16 bit
-         // support be needed, this pass could be extended.
-         m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
--        m_wide_zero_initializer = llvm::ConstantVector::getSplat(
--                                    llvm::ElementCount(WidthT, false),
--                                    llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
-+        m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
-+                llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
- #else
-         m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
-         m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index fed8c5ec..b2a02f61 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -20,6 +20,7 @@
- #include "llvm_passes.h"
- 
- #include <llvm/InitializePasses.h>
-+#include <llvm/Pass.h>
- #include <llvm/IR/Constant.h>
- #include <llvm/IR/Constants.h>
- #include <llvm/IR/DebugInfo.h>
-@@ -59,6 +60,7 @@
- #include <llvm/Analysis/BasicAliasAnalysis.h>
- #include <llvm/Analysis/TypeBasedAliasAnalysis.h>
- #include <llvm/Analysis/TargetTransformInfo.h>
-+#include <llvm/IR/Function.h>
- #include <llvm/IR/Verifier.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Target/TargetOptions.h>
-@@ -74,10 +76,9 @@
- #include <llvm/Transforms/Scalar/GVN.h>
- #include <llvm/Transforms/Utils.h>
- 
--
--#include <llvm/Pass.h>
--#include <llvm/IR/Function.h>
--#include <llvm/Support/raw_ostream.h>
-+#if OSL_LLVM_VERSION >= 120
-+#include <llvm/CodeGen/Passes.h>
-+#endif
- 
- // additional includes for PTX generation
- #include <llvm/Transforms/Utils/SymbolRewriter.h>
-@@ -129,6 +130,11 @@ static bool setup_done = false;
- static std::unique_ptr<std::vector<std::shared_ptr<LLVMMemoryManager> >> jitmm_hold;
- static int jit_mem_hold_users = 0;
- 
-+
-+#if OSL_LLVM_VERSION >= 120
-+llvm::raw_os_ostream raw_cout(std::cout);
-+#endif
-+
- }; // end anon namespace
- 
- 
-@@ -701,7 +707,8 @@ LLVM_Util::debug_pop_function()
-     // that has been finalized, point it back to the compilation unit
-     OSL_ASSERT(m_builder);
-     OSL_ASSERT(m_builder->getCurrentDebugLocation().get() != nullptr);
--    m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
-+    m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
-+                static_cast<unsigned int>(1),
-                 static_cast<unsigned int>(0), /* column?  we don't know it, may be worth tracking through osl->oso*/
-                 getCurrentDebugScope()));
- 
-@@ -776,7 +783,8 @@ LLVM_Util::debug_set_location(ustring sourcefile, int sourceline)
-     }
-     if (newDebugLocation) {
-         llvm::DebugLoc debug_location =
--                llvm::DebugLoc::get(static_cast<unsigned int>(sourceline),
-+                llvm::DILocation::get(sp->getContext(),
-+                        static_cast<unsigned int>(sourceline),
-                         static_cast<unsigned int>(0), /* column?  we don't know it, may be worth tracking through osl->oso*/
-                         sp,
-                         inlineSite);
-@@ -958,7 +966,8 @@ LLVM_Util::new_builder (llvm::BasicBlock *block)
-     m_builder = new IRBuilder (block);
-     if (this->debug_is_enabled()) {
-         OSL_ASSERT(getCurrentDebugScope());
--        m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
-+        m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
-+                static_cast<unsigned int>(1),
-                 static_cast<unsigned int>(0), /* column?  we don't know it, may be worth tracking through osl->oso*/
-                 getCurrentDebugScope()));
-     }
-@@ -1386,7 +1395,13 @@ LLVM_Util::make_jit_execengine (std::string *err,
-     options.RelaxELFRelocations = false;
-     //options.DebuggerTuning = llvm::DebuggerKind::GDB;
- 
-+    // TODO: Find equivalent function for PrintMachineCode post LLVM 12
-+#if OSL_LLVM_VERSION < 120
-+    // This option disappeared from the TargetOptions struct in LLVM 12.
-+    // It is instead accomplished with a MachineFunctionPrinterPass.
-     options.PrintMachineCode = dumpasm();
-+#endif
-+
-     engine_builder.setTargetOptions(options);
- 
-     detect_cpu_features(requestedISA, !jit_fma());
-@@ -1715,14 +1730,14 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
- 
-         mpm.add(llvm::createReassociatePass());
-         mpm.add(llvm::createConstantPropagationPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+        mpm.add(llvm::createDeadCodeEliminationPass());
-         mpm.add(llvm::createCFGSimplificationPass());
- 
-         mpm.add(llvm::createPromoteMemoryToRegisterPass());
-         mpm.add(llvm::createAggressiveDCEPass());
- 
-         mpm.add(llvm::createInstructionCombiningPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+        mpm.add(llvm::createDeadCodeEliminationPass());
- 
-         mpm.add(llvm::createJumpThreadingPass());
-         mpm.add(llvm::createSROAPass());
-@@ -1746,8 +1761,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
- 
-         // Eliminate and remove as much as possible up front
-         mpm.add(llvm::createReassociatePass());
-+#if OSL_LLVM_VERSION < 120
-         mpm.add(llvm::createConstantPropagationPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+#endif
-+        mpm.add(llvm::createDeadCodeEliminationPass());
-         mpm.add(llvm::createCFGSimplificationPass());
- 
-         mpm.add(llvm::createPromoteMemoryToRegisterPass());
-@@ -1784,7 +1801,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         mpm.add(llvm::createInstructionCombiningPass());
- 
-         mpm.add(llvm::createPromoteMemoryToRegisterPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+        mpm.add(llvm::createDeadCodeEliminationPass());
- 
-         mpm.add(llvm::createGlobalDCEPass());
-         mpm.add(llvm::createConstantMergePass());
-@@ -1803,8 +1820,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         mpm.add(llvm::createLowerExpectIntrinsicPass());
- 
-         mpm.add(llvm::createReassociatePass());
-+#if OSL_LLVM_VERSION < 120
-         mpm.add(llvm::createConstantPropagationPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+#endif
-+        mpm.add(llvm::createDeadCodeEliminationPass());
-         mpm.add(llvm::createCFGSimplificationPass());
- 
-         mpm.add(llvm::createPromoteMemoryToRegisterPass());
-@@ -1814,7 +1833,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         // optimizations, should attempt to reduce the number of times it is
-         // executed, if at all
-         mpm.add(llvm::createInstructionCombiningPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+        mpm.add(llvm::createDeadCodeEliminationPass());
- 
-         mpm.add(llvm::createSROAPass());
-         mpm.add(llvm::createInstructionCombiningPass());
-@@ -1822,7 +1841,16 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         mpm.add(llvm::createPromoteMemoryToRegisterPass());
-         mpm.add(llvm::createGlobalOptimizerPass());
-         mpm.add(llvm::createReassociatePass());
-+#if OSL_LLVM_VERSION < 120
-         mpm.add(llvm::createIPConstantPropagationPass());
-+#else
-+        // createIPConstantPropagationPass disappeared with LLVM 12.
-+        // Comments in their PR indicate that IPSCCP is better, but I don't
-+        // know if that means such a pass should be *right here*. I leave it
-+        // to others who use opt==13 to continue to curate this particular
-+        // list of passes.
-+        mpm.add(llvm::createIPSCCPPass());
-+#endif
- 
-         mpm.add(llvm::createDeadArgEliminationPass());
-         mpm.add(llvm::createInstructionCombiningPass());
-@@ -1831,8 +1859,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         mpm.add(llvm::createPostOrderFunctionAttrsLegacyPass());
-         mpm.add(llvm::createReversePostOrderFunctionAttrsPass());
-         mpm.add(llvm::createFunctionInliningPass());
-+#if OSL_LLVM_VERSION < 120
-         mpm.add(llvm::createConstantPropagationPass());
--        mpm.add(llvm::createDeadInstEliminationPass());
-+#endif
-+        mpm.add(llvm::createDeadCodeEliminationPass());
-         mpm.add(llvm::createCFGSimplificationPass());
- 
-         mpm.add(llvm::createArgumentPromotionPass());
-@@ -1845,8 +1875,9 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
-         mpm.add(llvm::createTailCallEliminationPass());
- 
-         mpm.add(llvm::createFunctionInliningPass());
-+#if OSL_LLVM_VERSION < 120
-         mpm.add(llvm::createConstantPropagationPass());
--
-+#endif
- 
-         mpm.add(llvm::createIPSCCPPass());
-         mpm.add(llvm::createDeadArgEliminationPass());
diff --git a/media-libs/osl/osl-1.11.15.0-r1.ebuild b/media-libs/osl/osl-1.11.17.0-r3.ebuild
index 5f806806db4c..3f98563dd7a0 100644
--- a/media-libs/osl/osl-1.11.15.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 # check this on updates
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
 CMAKE_REMOVE_MODULES_LIST=()
 
@@ -17,8 +17,10 @@ HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/
 SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
+# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
+SLOT="0/$(ver_cut 2).1"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 X86_CPU_FEATURES=(
@@ -29,12 +31,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 
-# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:=
-	<media-libs/openimageio-2.3:=
+	>=media-libs/openexr-3:0=
+	>=dev-libs/imath-3.1.4-r2:=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib
 	partio? ( media-libs/partio )
@@ -57,10 +59,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-cmake.patch
-)
-
 # Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
@@ -85,7 +83,7 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	local gcc=$(tc-getCC)
+	local gcc="$(tc-getCC)"
 
 	local mycmakeargs=(
 		# LLVM 10+ needs C++14
@@ -95,7 +93,8 @@ src_configure() {
 		-DUSE_CCACHE=OFF
 		-DLLVM_STATIC=OFF
 		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DOSL_BUILD_TESTS=$(usex test)
+		# Breaks build for now: bug #827949
+		#-DOSL_BUILD_TESTS=$(usex test)
 		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
 		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
 		-DSTOP_ON_WARNING=OFF
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
deleted file mode 100644
index 155cb0665f23..000000000000
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=12
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml
-	media-libs/openexr:=
-	media-libs/openimageio:=
-	<=sys-devel/clang-13:=
-	sys-libs/zlib:=
-	dev-python/pybind11
-	partio? ( media-libs/partio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	${FILESDIR}/${P}-llvm-11.patch
-	${FILESDIR}/${P}-llvm-12.patch
-)
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
-
-llvm_check_deps() {
-	has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local gcc=$(tc-getCC)
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DLLVM_STATIC=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_PARTIO=$(usex partio)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/osl/osl-1.12.0.2-r3.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
index 1006a0b16368..8678e5483bcb 100644
--- a/media-libs/osl/osl-1.12.0.2-r3.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r2.ebuild
@@ -1,18 +1,19 @@
-# 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_{8,9,10} )
 
-# check this on updates
-LLVM_MAX_SLOT=12
+# Check this on updates
+LLVM_MAX_SLOT=13
 
 inherit cmake llvm toolchain-funcs python-single-r1
 
 DESCRIPTION="Advanced shading language for production GI renderers"
 HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}-dev.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}-dev"
 
 LICENSE="BSD"
 SLOT="0"
@@ -27,12 +28,11 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:=
-	<media-libs/openimageio-2.3:=
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (
@@ -56,15 +56,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	${FILESDIR}/${P}-llvm-11.patch
-	${FILESDIR}/${P}-llvm-12.patch
-)
-
 # Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch
+)
 
 llvm_check_deps() {
 	has_version -r "sys-devel/clang:${LLVM_SLOT}"
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
index ba7c9c0627e5..23b10a9760b0 100644
--- a/media-libs/pcaudiolib/Manifest
+++ b/media-libs/pcaudiolib/Manifest
@@ -1,3 +1,3 @@
 DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
-EBUILD pcaudiolib-1.1.ebuild 884 BLAKE2B 28a0c1daefce88df6131a2a7fe447cda85632004d1a46acfa05b8b34d770cd2e8728aa3ee94ec85838ca39b33b53e51ff26fef546395bce13b1c7f36b1d03465 SHA512 a95bc54466d014113bb318d792738c8a155a61726c98c10a27839c36d41dc079aace22f6f711ef10cc12a7a84643265568b786f18cfb6bc77aa2919c2ccb1852
+EBUILD pcaudiolib-1.1.ebuild 884 BLAKE2B a1931a188b549edfc5452194dd056a23b816a7ea0cb94d47b91f8c55c1ad3af0f06dde1a76d72eb528120f8cfdfa192f5da1cfbb03988e3422f920841cb91d6e SHA512 344e8dbabde9149f94bea6e082717a448bdd7a90c3d3a6f124825d27d4681c71f703bca4fae32df55bed2ec8a5fd3d53560b8100e8f223ba5aa5c8c25cd92d69
 MISC metadata.xml 588 BLAKE2B e148577ddfbf9688495e1a620708903f0bbe126ea9bff194e6b0f75a0e2a36ec52567f4d7a86381f89fb6c2e828ae372217e983d30810bb62dc60c0692420fed SHA512 d5de3f26535c7b147515cd9952951ed16be99345d309c7110c36a93fcd3f44f43373293d082c60170dfe5e05956d22b4c2cc1dd7343b3c28188f935ba8feaadf
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
index fdd01b25ad72..9708a61bcfed 100644
--- a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="+alsa oss pulseaudio"
 
 REQUIRED_USE="|| ( alsa oss pulseaudio )"
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index 9c41a433c17b..e03a893528e2 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,6 +1,5 @@
 AUX phat-0.4.1-libm-underlinking.patch 431 BLAKE2B 6407d04d95c966667905da12c35fada6f69c69fccc528bd4a3b8782843f3452f6b63ca582fbbfca4b30dc0f606fa09a7872b8f15836ae3f29f4c0e5036b96650 SHA512 28b63cd3b96c9ac076daa63909aad310c8c3d14f18cb500de0207b67c5cd94423dff20d259f151ef3effce0f5d5743d32b012b9d82f9457a6a4cefd260758705
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 760 BLAKE2B 9292934b4f85b5d9af8a963d3f492ed876f961a8875dc261bf0226afae4d909a66b9c592283601429a08fa1b736ab48204bb9a6ce6c2c6811b6ba2049fb5227e SHA512 5994d5edd43e4f5b893e3d89e8f1d00d4337bc7657d8e3afee492e9d8f1bb8aa34edc27d2dd4473e3dbc5cf8919e436c206b4566da324fbd829e8d160887e9bb
-EBUILD phat-0.4.1-r2.ebuild 794 BLAKE2B efad3cba50fd4ebba3191a3e411a9e6b0a3a2a3a39440761da20849d252bab1f354ac86ec3f83c8c64a2730e4da98685dad134833e8acb2d4c8868abe014aa72 SHA512 1a9612f84be1f76691699034c8ea821600b5822488f7968993deaea369c3a8c06f16a2bd087c3d0e406cca2dd239cb32750b4965923053cc2993ab7d96f4bb6b
+EBUILD phat-0.4.1-r2.ebuild 790 BLAKE2B b2259c3cf61891fda525b9f29f9b73adf44088e5a6b7dd64602e499cd2504b2d63da1d9f5e7e9147e1c20df32f679e6d27d688564714f6158bf638efb3a7e7d8 SHA512 95902dfe6fa31d142fdb93cee798adb9dddb77617669bce9b8f230d424a576945b98983bccb07786897f197c4a154e97048e1530be3d6d437e2bebfd2fe8fcd8
 MISC metadata.xml 336 BLAKE2B 1f574686d96616e8b59cb6bbc0efb7285866a3a2c37ef1989f20e164d821df99067d4241395c0c47ae3c0b7d681735acb77912aea25697af185f3d1dc4bfd428 SHA512 0be3906d05fcc120ada83070f44204cfc47bd786c55fbfeb48921c4e46c0b397697b0625a6cd018ca596499c3e58574eb6f1e0f776abe82f77c6e915c6b75c65
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
deleted file mode 100644
index b7854f4f01a6..000000000000
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="PHAT is a collection of GTK+ widgets geared toward pro-audio apps"
-HOMEPAGE="https://sourceforge.net/projects/phat.berlios/"
-SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	gnome-base/libgnomecanvas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gtk-doc"
-
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/phat/phat-0.4.1-r2.ebuild b/media-libs/phat/phat-0.4.1-r2.ebuild
index 206b47e5d396..23aa2055155a 100644
--- a/media-libs/phat/phat-0.4.1-r2.ebuild
+++ b/media-libs/phat/phat-0.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug"
 
 RDEPEND="gnome-base/libgnomecanvas
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 6ca93e250241..d3ff1a552d2b 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
-EBUILD ptex-2.3.2.ebuild 785 BLAKE2B a4bc5f8b72221dd7e13748113f19c383426e5157f68222ead0ed93b075aece503e8c2c5a4d9d35d550759fd6727ad113fee8a0410ca14f734a9a2159083f399d SHA512 ed1ed98de5a28af3c0922f69ce838206559cba02dbb478bc53d6c7815cbc31378eacef4ef3f6497ac178a498b45f490c95a171b6f33711df27782ade04518755
+EBUILD ptex-2.3.2.ebuild 792 BLAKE2B 9759109603da17ed5649107fd744feb96564be649e4c12d318e304c634c6dcea9b5eadbaf9de8f169ee86fed713cc6a0c47c2b365361855ecdeb655c9509fea8 SHA512 71ea5748f83cdda076fef5e33e4e408738b528e03573766051728fa5154695e53551dc8db89a21a1c2bb792f37fb8302a901a16b9c2d4fa7046edb3d36b81eb8
 MISC metadata.xml 473 BLAKE2B b6a1ac230c8814ca0ba8e5e62447343832334e35e7c9b8e959a88b550c2763eba1feec51ee232c11ac33157c35afd4fcceb0aa8152582242bc609364cee37cc5 SHA512 4f5021d1a448fd33e7aceb82cbe9bec47f0c3ea0f1e48db3149fc6262deff38383d8997241fbcee650f7baa7eb193427f27c411555ce4ffed00de89b76bdb0d1
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index 10406918b145..7a3f0ff151bf 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="static-libs"
 
 BDEPEND="app-doc/doxygen"
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index a70a46670dc9..260f99a3c5e2 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1518 BLAKE2B 9a3a33b694bb425278ba1eee3d1a9573ed41f4242a51700d3f02651e7bc9e19059754a7fff3eaa79ec4e6ef53d221c6b5bd398d88fa00b7489fb061338c4fa3b SHA512 be7558a04c208efcb3625f7f2a8aeeab88ba04b508396eb42113bcd84eb4e42de429630757b210811f6c52f43f746e023ef24235b43ebf3cde68893a68d75c0f
+EBUILD qhull-2020.2-r3.ebuild 1525 BLAKE2B f2de55336a4a57509237b14808d3fd7c748865bf97601cf67c6831593644632bc8aa1758e38ca0a9d3676c625b784bdc7a66099bfc1868c5dd266ad51f318d8f SHA512 b72ddeb9bf60d388ba666bf7c06263e8cdc2c8301f411a0cf6d32bb7456fdd8a6a93862ce1f080041c93ccfebf2f3a4693bad5561f73033f7d9ed831e3977e26
 MISC metadata.xml 1095 BLAKE2B 49dc96f8c6bf1b318b263cdc5f9d8e981cbed127dcf4c0dd485d98676665127c89600db3f6e177463529db183d95c117e31210c2270e19dcecc62d4d380fbe6a SHA512 a220f6870bf5d73f761b9b97ec51285c37ec77d5917aacc73cb43719f378c6045b27e772f12336e353238ffbcf3e30a7fe7b6f9c8b5d934b0a385a0d33712d51
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index f3e4d41461d7..bab49ad802b8 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/rtmidi/Manifest b/media-libs/rtmidi/Manifest
new file mode 100644
index 000000000000..73601a1cb434
--- /dev/null
+++ b/media-libs/rtmidi/Manifest
@@ -0,0 +1,3 @@
+DIST rtmidi-5.0.0.tar.gz 528747 BLAKE2B 7bc8f5d9109cf1fb81ced4ff3afb4a7a42200d7458315c7b33cf966c856ca13959a9ce99012eadf05f65ec1bb93d41b8d2b7c9c66082badb7598c519a7fe2531 SHA512 d2688b6777c09c213e1f6800c67bca6905ac9a0161480e7c167583322a64be086bb47f1452cc45d4a4e2c1d3d3fe626d57b4a187e79c0a20af4f6e23d4a3530a
+EBUILD rtmidi-5.0.0.ebuild 625 BLAKE2B dfa5e7823bd68085a01809b04fa40e07886c88cbd2a1267cb685a3674080bb2a343339cf0e87af95c33d37a678432c293938ddf20a6c37bee569f0301c2f2857 SHA512 2cd0970f68730773ed3dff434ee283a807d210670edda84cbd30811e4a17402c12ccf6abc06c2d851ce27da70befae048b59870ece8576879fee5dcf27a91456
+MISC metadata.xml 685 BLAKE2B 20a22f4c40cd51230f13c0cc46a9237bf49a326d4fada0060d42c8cf6ddc17b58517a3df82a19c491045c4d81705522871dff9af7b1fe9a4ef3e18fd8bde51f8 SHA512 dbba9fe55711732149801c6dd4a15685215507f23a080ce2be060b1dc48c6da18adc23de611dbfade2b64afde25703a6e460ab2c2b403450829d3982374507f2
diff --git a/media-libs/rtmidi/metadata.xml b/media-libs/rtmidi/metadata.xml
new file mode 100644
index 000000000000..bf25671cc1d3
--- /dev/null
+++ b/media-libs/rtmidi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut and API-specific classes)
+		that provides a common API (Application Programming Interface) for realtime MIDI
+		input/output across Linux (ALSA, JACK), Macintosh OS X (CoreMIDI, JACK),
+		and Windows (Multimedia Library) operating systems.
+		RtMidi significantly simplifies the process of interacting with computer MIDI hardware and software.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-libs/rtmidi/rtmidi-5.0.0.ebuild b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
new file mode 100644
index 000000000000..1689276e2d89
--- /dev/null
+++ b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A set of C++ classes that provide a common API for realtime MIDI input/output"
+HOMEPAGE="https://www.music.mcgill.ca/~gary/rtmidi"
+SRC_URI="https://www.music.mcgill.ca/~gary/rtmidi/release/${P}.tar.gz"
+
+LICENSE="RtMidi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DRTMIDI_API_ALSA=$(usex alsa)
+		-DRTMIDI_API_JACK=$(usex jack)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index aea1c22e14f1..fdbfcd408505 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,7 +1,4 @@
-AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
 AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912
-DIST rubberband-2.0.0.tar.bz2 175527 BLAKE2B 5b4b8c98ade57f8b7776902166e8aa33e8f89d4de3fe659425a7ef14c1cf3c8a48ad474d2fe0f13483844b4f931ca8128ca57bb7e6dbf6e9d96deadac8856ee0 SHA512 a915a3eea75f0345e83010cc3ffd3c5e0c68a0c1d88da11b11a5fd5010196167c81db611a38c2c2b8d5c5a1f828f2c74a134e6ca8bb3a543af3ef70ce8d56101
 DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
-EBUILD rubberband-2.0.0.ebuild 1543 BLAKE2B 03eedcdc50b08bb3a16c57afd30ab53a5242e058d7c5c673dff773b4c3ababa4a1ac3a10e345c74188ebbff36971d18949d8c2efcb1564215f652f87013fb8f9 SHA512 126bc35ee1920bdaeaf0e8bc2ae2fe36fd54cde303ade9d24e858b46a07cfd2f71a8bfc4eaf95fa5d01b1f4224b53a01cf3817afc3f8463196fd11cd88a0ac11
-EBUILD rubberband-2.0.2.ebuild 1586 BLAKE2B d161bbbee0e49c2a95d48c5d21cfca513a06c5e499ced26c54df6a0112992eaf35e0337bb20b615466a4049e73087dd0c2bd4a09d4dd6fe161ccf6a541116d79 SHA512 ae912021dfe95b60276987e94d6c0ae192775e72c0b602aca1eedc2331581c1844f641df76e5a256c1cd311ed4a79da6dcf0f9929ec97d37e28de7f89661932b
+EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/files/rubberband-1.9.2-build.patch b/media-libs/rubberband/files/rubberband-1.9.2-build.patch
deleted file mode 100644
index dea90db4ddb0..000000000000
--- a/media-libs/rubberband/files/rubberband-1.9.2-build.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 3f7218c..3d402de 100644
---- a/meson.build
-+++ b/meson.build
-@@ -97,17 +97,25 @@ endforeach
- 
- fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+if get_option('programs')
-+  sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
-+endif
-+if get_option('vamp')
-+  vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+endif
- thread_dep = dependency('threads')
--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+if get_option('ladspa')
-+  have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+endif
- have_sincos = cpp.has_function('sincos',
-                                prefix: '#define _GNU_SOURCE\n#include <math.h>',
-                                args: '-lm')
--have_jni = cpp.has_header('jni.h', args: extra_include_args)
-+if get_option('jni')
-+  have_jni = cpp.has_header('jni.h', args: extra_include_args)
- 
--javac = find_program('javac', required: false)
--jar = find_program('jar', required: false)
-+  javac = find_program('javac', required: false)
-+  jar = find_program('jar', required: false)
-+endif
- 
- 
- # Check FFT and resampler options and set up dependencies and paths
-@@ -273,37 +281,41 @@ if ipp_needed
-   endif
- endif # ipp_needed
- 
--if not vamp_dep.found()
--  vamp_dep = cpp.find_library('VampPluginSDK',
--                              dirs: get_option('extra_lib_dirs'),
--                              has_headers: ['vamp-sdk.h'],
--                              header_args: extra_include_args,
--                              required: false)
-+if get_option('vamp')
-   if not vamp_dep.found()
--    vamp_dep = cpp.find_library('vamp-sdk',
-+    vamp_dep = cpp.find_library('VampPluginSDK',
-                                 dirs: get_option('extra_lib_dirs'),
-                                 has_headers: ['vamp-sdk.h'],
-                                 header_args: extra_include_args,
-                                 required: false)
-+    if not vamp_dep.found()
-+      vamp_dep = cpp.find_library('vamp-sdk',
-+                                  dirs: get_option('extra_lib_dirs'),
-+                                  has_headers: ['vamp-sdk.h'],
-+                                  header_args: extra_include_args,
-+                                  required: false)
-+    endif
-   endif
-+  have_vamp = true
- endif
--have_vamp = vamp_dep.found()
--
--if not sndfile_dep.found()
--  sndfile_dep = cpp.find_library('sndfile',
--                                 dirs: get_option('extra_lib_dirs'),
--                                 has_headers: ['sndfile.h'],
--                                 header_args: extra_include_args,
--                                 required: false)
-+
-+if get_option('programs')
-   if not sndfile_dep.found()
--    sndfile_dep = cpp.find_library('sndfile-1',
-+    sndfile_dep = cpp.find_library('sndfile',
-                                    dirs: get_option('extra_lib_dirs'),
-                                    has_headers: ['sndfile.h'],
-                                    header_args: extra_include_args,
-                                    required: false)
-+    if not sndfile_dep.found()
-+      sndfile_dep = cpp.find_library('sndfile-1',
-+                                     dirs: get_option('extra_lib_dirs'),
-+                                     has_headers: ['sndfile.h'],
-+                                     header_args: extra_include_args,
-+                                     required: false)
-+    endif
-   endif
-+  have_sndfile = true
- endif
--have_sndfile = sndfile_dep.found()
- 
- 
- # General platform and compiler expectations
-@@ -404,8 +416,10 @@ endif
- # And the build targets: Static and dynamic libraries, command-line
- # utility, LADSPA plugin, Vamp plugin, JNI library
- 
--message('Will build Rubber Band Library static library')
--target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
-+if get_option('static')
-+  message('Will build Rubber Band Library static library')
-+  target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
-+endif
- rubberband_static = static_library(
-   rubberband_static_name,
-   library_sources,
-@@ -443,7 +457,7 @@ else
-   message('Not building Rubber Band Library dynamic library: no_shared option set')
- endif
- 
--if have_jni and javac.found() and jar.found()
-+if get_option('jni')
-   target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
-   message('Will build Java Native Interface')
-   rubberband_jni = shared_library(
-@@ -478,7 +492,7 @@ if have_jni and javac.found() and jar.found()
-   )
- else
-   target_summary += { 'JNI library': false }
--  if not have_jni
-+  if not get_option('jni')
-     message('Not building Java Native Interface: jni.h header not found')
-   else 
-     message('Not building Java Native Interface: Java compiler not found')
-@@ -492,7 +506,7 @@ install_headers(
-   subdir: 'rubberband'
- )
- 
--if have_ladspa
-+if get_option('ladspa')
-   target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
-   message('Will build LADSPA plugin')
-   rubberband_ladspa = shared_library(
-@@ -527,7 +541,7 @@ else
-   message('Not building LADSPA plugin: ladspa.h header not found')
- endif
- 
--if have_vamp
-+if get_option('vamp')
-   target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
-   message('Will build Vamp plugin')
-   rubberband_vamp = shared_library(
-@@ -559,7 +573,7 @@ else
-   message('Not building Vamp plugin: Vamp dependency not found')
- endif
- 
--if have_sndfile
-+if get_option('programs')
-   target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] }
-   message('Will build command-line utility')
-   rubberband_program = executable(
-diff --git a/meson_options.txt b/meson_options.txt
-index 86bf686..b99bb38 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -31,3 +31,22 @@ option('no_shared',
-        value: 'false',
-        description: 'Do not build shared libraries. On Windows this will also ensure that the static library is called simply rubberband.lib, not rubberband-static.lib as it is in the default build.')
- 
-+option('jni',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('ladspa',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('programs',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('static',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('vamp',
-+       type: 'boolean',
-+       value: 'false')
diff --git a/media-libs/rubberband/rubberband-2.0.0.ebuild b/media-libs/rubberband/rubberband-2.0.0.ebuild
deleted file mode 100644
index 47258d95fe93..000000000000
--- a/media-libs/rubberband/rubberband-2.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib flag-o-matic
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="ladspa jni static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( >=virtual/jdk-1.8:* )
-	ladspa? ( media-libs/ladspa-sdk )
-	programs? ( media-libs/libsndfile )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.2-build.patch"
-)
-
-multilib_src_configure() {
-	if use ppc ; then
-		# bug #827203
-		# meson doesn't respect/use LIBS but mangles LDFLAGS with libs
-		# correctly. Use this until we get a Meson test for libatomic.
-		append-ldflags -latomic
-	fi
-
-	local emesonargs=(
-		--buildtype=release
-		-Dfft=fftw
-		-Dresampler=libsamplerate
-		$(meson_use static-libs static)
-		$(meson_use ladspa)
-		$(meson_use jni)
-		$(meson_use programs)
-		$(meson_use vamp)
-	)
-	use jni && emesonargs+=(
-		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	! use jni && find "${ED}" -name "*.a" -delete
-}
diff --git a/media-libs/rubberband/rubberband-2.0.2.ebuild b/media-libs/rubberband/rubberband-2.0.2.ebuild
index 3a9d2a39197f..42b4ec3e69e4 100644
--- a/media-libs/rubberband/rubberband-2.0.2.ebuild
+++ b/media-libs/rubberband/rubberband-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index dbd92acf7568..78a7f3a5ef3e 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1228 BLAKE2B 25d908fa3a09098f8ef65ba1f8e95b797b9b0b33b19a7804da72ade4fe4890d24663330cb815dd155e440ed5f5fe21fe611330e744750b6597902cd47fb83449 SHA512 30599dd12fdd9b2fffd11f6c0a35882b589315f3c62ab5b4c566b6711c25820c6d171c4bb1974d1ad01f2f2203cd5763b821a3c5961153092417246bf83a4b91
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1235 BLAKE2B 6f93b3d4de10ab94a9db942992dda52abb4e70d2ea8bb5fa60cf9f81927c8650146ff986f61bb78b3775d4a3fbcaf671558d1019f1eff8b71e061cdc62f01c20 SHA512 64e5cff1522b743417d1f2122e16d469b39bcc6ac83ebd3eb2072fde8fec4e48fa056b4a1bf440a472f4ae60b87ee888384ed85ba14629c7c8ee3f0c373e4d59
 MISC metadata.xml 488 BLAKE2B f68c35cf8344372cd48c32170cb5aa7fcd8110773f6319a5cee824c1b8a7f95ab7a8e7d8c84df38fc25ddb4fac6b2ac59b59b1a4365b0876bad258b79e6c1d84 SHA512 c641f45fae365c6880180d51187ec8f247e81a2addf6eda5752fc428526b737fd2ac58244adc3792b69c9e0cf21f8c75f29f6f762f64607ccf0e10d8367bafb2
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 9b59a5446ed4..a2068af4c79a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 84d80827c326..f2c7ff13d260 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -3,5 +3,5 @@ AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91
 AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
 AUX sge-030809-freetype_pkgconfig.patch 701 BLAKE2B 036fbfbfdf76f8460b0b82d9abbf29c1ae0e20d7d779fa21925be9def41ebb9cc6d34a2b050b7b4b3b843ef3a4589e65636dc43d42699d2bee084d41598dd22e SHA512 9925452ea57a581869c7bd0d27af1bcb440a4e5a6fdd93084ca1c7cefecb9d78d2805a11d2b725fcedaeaf4e9f84f0efa093aee018b59ec34e7c00bf80f73b77
 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1315 BLAKE2B 1927382db509ba4d0c39bf9856c2d613c3b465bdbb79e7682f7b0575adcc425c4178a6ddd0c3c68dd623a9247f3a4113201695c70d0c713d8e7bf42febcf42e4 SHA512 f09f1973d8e2df0cdf4a0928a5b8b91533b0f25286f04bb4addf783fb3da828bed86bbbec9a2bf89d43478156b0ffdd49317610b200eeec52dfa1a6cce023381
+EBUILD sge-030809.ebuild 1329 BLAKE2B ad3c4cc7a10c94c17bca8d814019806a902858677368decd5406b4c08e0e4af6c28619c7e4638343c5174b7aafbc59b7bf1a3c05dc58f5fde8bba7026b2b529f SHA512 32b82982728f325897ed2f93d224c83e783e41286b2c99754200486a9f278df872456449ed93fe8ce1096e81ce68caeb3586093b7469af25cd5dc5aee51e11b6
 MISC metadata.xml 332 BLAKE2B 8a0ed915f74a92bdf297e5d14f38abe506292fffb96586aa834f243bd59c885efa441a05f354b96d5da458c917338b7a781799d8d3607c047aa7a7503ff1c1e0 SHA512 177d61a6ab76f02c443f6404e8234ae1adf70f0b5b8435bc37f133e00d05fcfbd594792808d228827b8e65dfdd9a6aa15e9e916a14cd48e8a6f172fa144a578e
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index a84e9aa3238f..8847d3d6aa9d 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.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
@@ -59,8 +59,8 @@ src_install() {
 		dodoc docs/*
 	fi
 
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 1be80def3a76..bc22e7f38501 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
+DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
 EBUILD shaderc-2021.3.ebuild 2101 BLAKE2B 42f3908ff4b993f0d42ebee384c8dcc5ca37b1519fcb4e46be80aeea3ff4bc3d6ae6b7c03900c50a78fd7b25d5b24bf3a8b7dedeb1ab6bd6764feb1aab56e95f SHA512 a64488699535d988181ff860af17010990d4db9abf467f00d3c579b9a64c7b8dd60eb256908f63fe9c5bfcbaf3701330729cd854b125b3160c5ab2a1c20a1fa0
+EBUILD shaderc-2022.1.ebuild 2104 BLAKE2B 8224d797fd9caf1b75bc12cc5f040fa06920823ab33d1a9dc242e579bd892359f857e88aceb72717e8af9329531bc76411dce0014ae2bfaa4c0275237007175c SHA512 29be822f9d7cf796171dd2cdd0469fc2d67025d7bb9dcd747c285d3b9b203c020d7cb1e694635a53fcc112e70e88a7d5c4b83e0a9cd3738fd5473774b834a5e3
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2022.1.ebuild b/media-libs/shaderc/shaderc-2022.1.ebuild
new file mode 100644
index 000000000000..6158ee5f04dc
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2022.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	~dev-util/glslang-1.3.204[${MULTILIB_USEDEP}]
+	~dev-util/spirv-tools-1.3.204[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/spirv-headers-1.3.204
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+python_check_deps() {
+	if use test; then
+		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index f5ff12b89cf6..ebcab58f500c 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 772 BLAKE2B b4eece6aee658b484b65856dfb851c1560af589825b8c99ed387f4a938d607f0c62d801373feee112d7226fa052fea8fbfdcde80c34f961cb66a26b198040ade SHA512 96681218f04db64414a8bc014260686f96817b914bb17f83865a2babc6f476069b12eea71b1b0956edbb3b7e4c776d6de7ebf2f4c87206146a4f2b031d5a9ed4
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r4.ebuild 1124 BLAKE2B f50e3cf77a5b4c8462ac909df08a8dd4ab129ecf8d1ec56a3e0ecf42256f935305fee64173024822896c45bacf150eb5ac94320d5fa47806070fb8fcf00a8b2e SHA512 0c0ca70afa6ae498691afdb5d57b305f00f3026496dec5847f145258e44561ff67ec3eeaae2ffe129fb96558f4dc4b1bebb2db50e08d5ffadfa47acdde862c5c
+EBUILD smpeg2-2.0.0-r4.ebuild 1131 BLAKE2B 5ea2ac5a60fb84fe8572f67655616b916d5558eb4d708eb94d923b1b531fbc8cad36b77c221985426043d73f4e4344da141f051da7fa0e0800344cb4af9ddda4 SHA512 84c7b8daa2348dd0610b3260f1dc2d0105ad952e0ad9a2f164503877d502a6ad602e54060bf9d14c944aaa03357f94bb6242e658b3b889cc3ca7f45dd068f3b4
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
index 8a534f8ecaa4..5a7bb92aeaad 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index dfbdcd8bc072..cf82c4b8467f 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,4 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6-r1.ebuild 1835 BLAKE2B 679bda38200fc9e1360fef7b7b9cf3347bb58a365c05c9a3c66062e36d0864f9d6f02f24d3ce9156a5582a3511616bde1486bb57889068cbf92b631a4cad8768 SHA512 0dfe3554992ffd2e6d304c1a1e1318ee122cb33254c0db2a904514f18155930f1a1c33074bd31d594d3ad79e3af5eb314292b0839ec42d83fc58ca9f9cb0aca9
-EBUILD spandsp-0.0.6.ebuild 1990 BLAKE2B 7665e0a1e4003e7f6c70331fdee881615df879f1f32272dbc8ff81ec53a4931a65cd458febf6e03ca700c4392f820858a7ca0b8f73f9f059e620266e3417a93e SHA512 9502da0b5fd038cdb6ed8e4f368ae1e6fc45d78ebe106f324653ed70b3be613da6f86a7b003050fcf920dcb52be4b6f63cf7a37662f12071fb0cdcf574a9af61
+EBUILD spandsp-0.0.6-r1.ebuild 1829 BLAKE2B 625aff01bdaca673461c6d2474fbdaeb3684b2e61a9a37479b321d255db5769106db200ac91c26c198c47c8bf6a5802773e88a50b12f6db980305e6af0962325 SHA512 f97a6ccbd7990e9611055ecadf7359edf8bd67bab8d5ece11be467af63428a5ed804c5dcf733595b06e46fc3c5f1489249a3506cf22612069e0668239346bffd
 MISC metadata.xml 244 BLAKE2B 55f7bb21fa829b545045078abd465615b8e8d3ba8ce19e1acf7466d14d45d695d771d9d78983749f8e0290166f3eab703ea332169a4fda45427ad4baa6ff8512 SHA512 2dde78e90a526f069d855081163e58cbcd9cd9e0429eb1615c9ef8bc5af93bcea4d145333feedd8adcf8421e3417c7ebf0b03b98227cad03431f20cb014f080a
diff --git a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
index 84eb7d57d4a6..89e857946a38 100644
--- a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3"
 
 RDEPEND="media-libs/tiff
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
deleted file mode 100644
index f5989411a1b1..000000000000
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib versionator
-
-DESCRIPTION="SpanDSP is a library of DSP functions for telephony"
-HOMEPAGE="http://www.soft-switch.org/"
-SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
-
-RDEPEND="media-libs/tiff
-	 virtual/jpeg"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		dev-libs/libxslt )"
-
-# Enabled implicitly by the build system. Really useless.
-REQUIRED_USE="
-	cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-# TODO:
-# there are two tests options: tests and test-data
-# 	they need audiofile, fftw, libxml and probably more
-
-src_configure() {
-	# Note: flags over sse3 aren't really used -- they're only
-	# boilerplate. They also make some silly assumptions, e.g. that
-	# every CPU with SSE4* has SSSE3.
-	# Reference: https://bugs.funtoo.org/browse/FL-2069.
-	# If you want to re-add them, first check if the code started
-	# using them. If it did, figure out if the flags can be unbundled
-	# from one another. Otherwise, you'd have to do REQUIRED_USE.
-
-	econf \
-		$(use_enable doc) \
-		$(use_enable fixed-point) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog DueDiligence NEWS README
-
-	if ! use static-libs; then
-		# remove useless la file when not installing static lib
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		dohtml -r doc/{api/html/*,t38_manual}
-	fi
-}
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 90451464e123..dd2bc1495722 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,8 +1,6 @@
 AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a096a6a4068b03139ec8b1d1c13097a1309265d53545109ae3a74f81e9b9bb32fefd73b69157037f76f470839b657bfdce10fea3c22 SHA512 7584c52c5e61c1bc8770bd776abe78a43d6a8f6ffcba1f4411c7674766d36220a38051eebd12515fe8d7db2b958d05c38f6940f676ca3aa0041321e81afdd5f4
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
-DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
 DIST stk-4.6.2.tar.gz 2618125 BLAKE2B 8673cabbc57c5b520af62def967bf3923a91c7b619bd29faaebaa4e3fa6aabcd9dc43e605663d8062650b105ae60ebefc44a3fa420ef711119861ce03e77f130 SHA512 35a7f559cca5c9b5998528a566ae27bace3cac56cefda7ae54c06179f5002d2906c6ede6274bf06100dd6aa9dc0d1459bb8fca4a2072c686c2abfd493b6f2f3c
-EBUILD stk-4.6.1.ebuild 1362 BLAKE2B 09add9614f9da7e45b8bc6850069ab55d70c7578824ab786ce6e6b84a6698ada3870de4b1af28bf9e2edeb555853bf67bddab480f54de1cf8ad9df35f9c53bc8 SHA512 6d040c30472a90c5f54c6b250a622d25da5d5abbfa99a6c3156181857dc4e66dd842df49a9337ee33374e506cfbc740541ddefa9d5219f178e0648e8ba78b7bd
-EBUILD stk-4.6.2.ebuild 1399 BLAKE2B ff00d9fad3d1ee62ada4ce85e7cb715ed615d1392f4aee34bee467726e08e7d9acc71c12cde971a79818d3858cf0b2d99f7caff5d965289798b7c4f42a068333 SHA512 0b36f4aa61e5869f178204439ebf29d56aa4a7e37f564853de8faff0f46c4fc55901de4c6352466bfc318d427cbe1e53aba9228f60773e3f65029d59289b90b5
+EBUILD stk-4.6.2.ebuild 1398 BLAKE2B da23193395c1c8b2b04eb00c65a1561a1923eccb8c2fe15d8c31b3868ee271f969a8a93166b0844c9b648d9892cebb16ac0bb433fff1917e511becd02fc57cf3 SHA512 e72aeabe3c65fa63a92d8df047b35f534912cf7ac2cd65329a112f73e2fb0651538266436fe6cfd798575a1885983602cef8835d08820a0df09d749487b3a5e1
 MISC metadata.xml 366 BLAKE2B eac66d7663dd4db0dba433e2e6a2715f6e5a41f111ae812ef32f661d03d04379eb8d5c47476ccdfff552d0722df65fd575d749411f7016dd575e17b05072e290 SHA512 0fb8de1d946df0c5e38e81e1a168fea0fdd80f5499b446e21bb68f7ec27046d3d3fae802cfbf3f1d59f8aa93495e742feae04587dabad9fe2ac393ad80bee9ab
diff --git a/media-libs/stk/stk-4.6.1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
deleted file mode 100644
index 7f4e3b6ed7c8..000000000000
--- a/media-libs/stk/stk-4.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
-SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc jack oss static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.1"
-)
-
-HTML_DOCS=(
-	doc/html/.
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#breaks with --disable-foo...uses as --enable-foo
-	local myconf
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-	fi
-	if use oss; then
-		myconf="${myconf} --with-oss"
-	fi
-	if use alsa; then
-		myconf="${myconf} --with-alsa"
-	fi
-	if use jack; then
-		myconf="${myconf} --with-jack"
-	fi
-
-	econf ${myconf} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves/
-}
-
-src_install() {
-	dodoc README.md
-
-	# install the lib
-	dolib.so src/libstk*
-	use static-libs && dolib.a src/libstk*
-
-	# install headers
-	insinto /usr/include/stk
-	doins include/*.h
-
-	# install rawwaves
-	insinto /usr/share/stk/rawwaves
-	doins rawwaves/*.raw
-
-	# install docs
-	if use doc; then
-		einstalldocs
-	fi
-}
diff --git a/media-libs/stk/stk-4.6.2.ebuild b/media-libs/stk/stk-4.6.2.ebuild
index c8993c4329bb..52b7e39ead65 100644
--- a/media-libs/stk/stk-4.6.2.ebuild
+++ b/media-libs/stk/stk-4.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc jack oss static-libs"
 REQUIRED_USE="|| ( alsa jack oss )"
 
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 29fdd1413856..16b27561fe66 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -2,7 +2,9 @@ AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d14
 AUX svt-av1-0.8.6-no-force-avx.patch 506 BLAKE2B 7cb33489a5777b39a5eb041560c1ea5c25c99ad21ceb9f41d419ffb7f40b794ad831432cebe56dd72d1f896550adfb3accffce3624250b5bc0225b32649d36d7 SHA512 36f3e599f93efbf1ffc4382f3b6823ac791804920db23232064452f1327755cd329530310c471078eff705e7eb2156d98341c032354e0bb04945d8dc5d1c8c3d
 DIST svt-av1-0.8.6-r1.tar.gz 6416293 BLAKE2B 98a0c5547f63a9d04b5365a242d1a6e7b8f54449547309e53e9907d11d61c853f07ea1d8a5988ec1b67ef94bfd137ff1664f4352d9181cf96b5629f292c97f1c SHA512 535c073e53d99ed55efa0b7577a886dff136ba41f2d92e84ef0463b707136e156b6c4029e3ff7709be8ce54b0a7e7257af833b706b4282d7fd2636635df757d5
 DIST svt-av1-0.8.7.tar.gz 6396358 BLAKE2B 21a0d319078887809d08276b1a11b6dcca1be90a79c6bda19b86749fabb623918b9112de8ae3c7740b14f23d52e4e1c12ec0190f49880b09993525a857f8e334 SHA512 812b794eda930f53dcba6bb02bc5a3f417346705d64f590d7acf2d45df8d10985bd40c313eaaed514601ab699e23c87852059b9eb0b0ff8a717ef9fd80a132f7
+DIST svt-av1-0.9.1.tar.gz 9718171 BLAKE2B b4247e0b060d34df9336b3cb54e116318120b0ca88ee00747b63ff133417ef941fc5953bbfc2d55e0c9836f579b2b6d64e7cd5a82943556d2d648788947ac6ef SHA512 3c4594bf4019de630e0c58bde3cfa71cc4a6b399a8405c8652b2d2ee26d9a4eed03203c12f1fd3837d5d54ed4a22de90d8f21064f8a3db339a80f9c6f8b0fb95
 EBUILD svt-av1-0.8.6.ebuild 1428 BLAKE2B e9fd41c7982d1ea876f99944e8a3bfb35d784e502ec7ad3450ff122ffcc925b948eeec73b96be8da0d16cccbfecde6e7654abcd82ea58f76d7a5a595823bb84e SHA512 452bce21bfd5740ad9a31f3e6aa044769202885ec0ff3104832dd059854ac8aceb331650a044938772d692c6b00c1d69fea5e83bf85d99dd8fef5e1dcadea7f0
 EBUILD svt-av1-0.8.7.ebuild 1217 BLAKE2B 01818865c8797121cd4430c4f79ca220a51154a60eac43b762b4f1175c5f4ccab2f404c2b69f4eb40b4ff5fa28ca1c323ca8a6744a69325db9b5cfd323ff8ae4 SHA512 9fb2486311e8612616a0da85ec7db2215fbd717c4fe6e58cc1fc420c981f1b3c34315bef30fb0d4df0da69b4ec93412984dcd8c1fedb2cf5c92361aa470091cd
-EBUILD svt-av1-9999.ebuild 1219 BLAKE2B 4d565f27a6b6c9a3f1058f185f424200acd0b7afcaf55600185afaa3c150d80bdc987a196f18d5dad28ad777738e97f77f3a3b1cfeeec32fcbc8960538ad8741 SHA512 1367ff846e66fedaa059759cd5ae9ad8d73d8ac1d3f7d5a070678d48cf5f6a4d3d1b285b11a987baf8b71992b9e7c3c0a02d2f88b96e1606dea38cb9f75b8956
+EBUILD svt-av1-0.9.1.ebuild 1224 BLAKE2B 299fc108459401a4a6194d9dbdc422eaa8520266ee49a2ea7a4adf41ea9927ef46f6c683c0e45b9be453ffbc368de63d234b85d4f1d95422c138476193cab6ce SHA512 a94dfb84b01d21bb6c579526bddb52bc612061cd2d5c7fa67c40caaef0113af91e32e97aac47084c3df14aa98afe8fe0790a780dac29d5c52c5a925ef30ab74d
+EBUILD svt-av1-9999.ebuild 1224 BLAKE2B 299fc108459401a4a6194d9dbdc422eaa8520266ee49a2ea7a4adf41ea9927ef46f6c683c0e45b9be453ffbc368de63d234b85d4f1d95422c138476193cab6ce SHA512 a94dfb84b01d21bb6c579526bddb52bc612061cd2d5c7fa67c40caaef0113af91e32e97aac47084c3df14aa98afe8fe0790a780dac29d5c52c5a925ef30ab74d
 MISC metadata.xml 561 BLAKE2B 1effb05644507ea39fe071f9de1fe4c1a4feb30f9bc429985cf464aea9f9bc1f525e0c6f5e75da47d373f0acd60394a2bcec3b71e68bc3ab031334f95717d3b8 SHA512 1042fb94a9c0b93c007843585e0ea075d187cdd6b77bb8eb94d5fcfaa7d083a98916aedcbfccd1fa3da3307ef8bbe7d623efa7e39ccc9714d23973497bec7a89
diff --git a/media-libs/svt-av1/svt-av1-0.9.1.ebuild b/media-libs/svt-av1/svt-av1-0.9.1.ebuild
new file mode 100644
index 000000000000..9d7d8f16b2cd
--- /dev/null
+++ b/media-libs/svt-av1/svt-av1-0.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
+HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
+else
+	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/SVT-AV1-v${PV}"
+fi
+
+# Also see "Alliance for Open Media Patent License 1.0"
+LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
+SLOT="0"
+
+BDEPEND="amd64? ( dev-lang/yasm )"
+
+multilib_src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+
+	local mycmakeargs=(
+		# Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
+		# undefined reference to `ifd_inspect'
+		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
+		-DBUILD_TESTING=OFF
+		-DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}"
+	)
+
+	[[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
+
+	cmake_src_configure
+}
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
index 5f5a2bb626bd..9d7d8f16b2cd 100644
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ b/media-libs/svt-av1/svt-av1-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 5f50a3523235..3544495560b8 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -5,5 +5,5 @@ AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r2.ebuild 1815 BLAKE2B e5b09453e09ecaf4276b3e5989bc2e834b5be7a696db8bdfe9dfa1aab2e0499b4cd820c53a960bca647a50101d51a83833554a5e6994d45a6d2ae66ff3b88552 SHA512 fc0bb49141d4c94790521b4d59c1861dcaf42dcb511a139f5bb73cf724dde36a58899d0327277021f1c1e09390f661d89dfd35e731f7df87b5119173e29bee1a
+EBUILD t1lib-5.1.2-r3.ebuild 1828 BLAKE2B 6b88643f891b11b55ee7ab36610558f86b0c7d0543b661d83e9a1e3c302cbdd350f29a7bd474b0ed73586b605b2e62d5ba5f42fe3ebeb6f7a808a93bdad16a0e SHA512 046896f96fa895afbb667c26c983ef659949c3617eb600f2c376f533347ebffdac990f40815bfc7516311843934b038c9165114a7fd6c3169ac44456f8a051e5
 MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r3.ebuild
index 7105ce7c4c54..59f9ec97632a 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r3.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"
@@ -72,8 +72,8 @@ src_install() {
 
 	dodoc Changes README*
 	if use doc; then
-		cd doc
-		insinto /usr/share/doc/${PF}
-		doins *.pdf *.dvi
+		docinto pdf
+		dodoc doc/*.pdf
+		docompress -x /usr/share/doc/${PF}/pdf
 	fi
 }
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 469d92b3bca0..23ac6ae3d9b7 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,11 +1,11 @@
-AUX tg_owt-0_pre20210626-allow-disabling-X11.patch 3969 BLAKE2B fb0cb1f04762ec0ccb6e5f1057a413d380356cccbe394679bb6168a15961e906cf6a6fa025b87ee78d98902314656e0973932c5c952fc6edf8650dc4dd40a6bb SHA512 ca74fb15ad43e6933ccc5d014c9219045fd0be4a0bc5a18e8c8c244455fa1dd72268cd14fa203df66acd411b8d1315339c7f29930da898d80c40e74c6e326fc4
 AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a1cfb148f0f64524a18ea48fb5cd01104137edb33e85a86c190418c0b8230564026527bea414c27b1a535415ad31279b705ea777241874ae3c1802 SHA512 8b16e49dad06aa71becb535600d411160e1cbef2c2cdc2258aebc282b4b64d87a0011b4c1ade4209116176965be3c2ee8ab2bf0ad5a33c451f184b32d0a7e77a
 AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
 AUX tg_owt-0_pre20211207-allow-disabling-X11.patch 4240 BLAKE2B 923aea93bcc64c946a5a3729e6e3e419ef78d99ed85195fdc7b364b5eb931350d09c4ae3bfadef4e72fdccfd7c322ac8b6a98fe8a789aa88ed490a57db355ab0 SHA512 d2e05f07a86381aea1bc2cdc7e4dffc6ff2b866769dd7fe20808fdea5e00514830f709bea30123097c5942cddee887aa98cfd4d6ce45dd772a06391e2df0761c
 AUX tg_owt-0_pre20211207-fix-dcsctp-references.patch 1337 BLAKE2B cf74aefd4a350ebdcef76bbded02fd86fdf499809aef338969d75c5f91ae68b00daac4f2778b5ce2ee89461b81f4702e5181e3ea4aaf7145aea23096b2ba341e SHA512 b21b0fe8f75c1ec03755197b3db82a0fe51d9ba3e2cf6b976392515ba04032f8a676e92ab992aed6525eabb81318282710460bbfa8aa594e7b152129d0314e85
+AUX tg_owt-0_pre20220209-allow-disabling-X11.patch 4382 BLAKE2B 26db92be5b8e75542a62618c7cda08dd7a54a95532df616cacb7d5fb2d39ab791758593e8f9a41494e23e529c0dc2a48aca2a87310fdb62acbd27a7eaf456e4e SHA512 dba0d14b14dc63f8372f50ab8cd4cb02067bcdb338d3dfb33ea2d8977eb2fa2738c93edd42b9a36ed97bcbfd2c7a123e27a7b161d318338d0ff1450780abe98a
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20210914.tar.gz 16266351 BLAKE2B 048d6a77046b10af63f4e5c1530b6aeb9d423702a6e34e6e0082a10b06262e19c30aa766cc9ea38549605d8d2cc08bfcd5a4e715ab53c46031c23938f94af27e SHA512 bd46393d9a85fa38fcd560af4f68a4868b25528b134731070e8578217cb0b9bb8b5cf7b3990f619d321ba373e5630a52e467e14d93f71b24de3a5b3e591b8866
 DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e SHA512 7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
-EBUILD tg_owt-0_pre20210914.ebuild 3563 BLAKE2B 76ef2fae542849611b71e814fb3602ffa28400a5f004acf06fd5bfc1d3d70bc73387a38d837e0426aecf9510ba8b8a8ea51f2b291d2c1e7408daaf75a844aca2 SHA512 036453f042f0870d32272c83bc24dd781c4078247edc2d994019c644acf134f431447a81a580afd1cd2eb226f35a8bf682899e97ed56606a1157367bc042522b
-EBUILD tg_owt-0_pre20211207.ebuild 3803 BLAKE2B 1af2e46495689906238a6625cb7a759db5c3238346e0f90c645eac5e73fb6b6e5a23edda4ff35f7e5099dd5f72e0a40fcfae69490b03454acd9c7613415b5ef2 SHA512 f8a6e83e07c9a439776d93b8c7e13f487e0f9aa86c835985a6da11d5ab6464ce93662f6d2669e0d60f8398ce9934ac6bef95ce1d0b3b097c20345cab35c7cb69
+DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
+EBUILD tg_owt-0_pre20211207.ebuild 3810 BLAKE2B b8922ae71f3ffc0d96c732c2fb9f7ebf18604fbdb3a1e3d2c56102a2be99e9da30a4ed859be1cef5917e1edf2dc1a3c15acba66a6407b8552ed104353c7b6445 SHA512 c32bf039c100cb47b8bddcb815272f8ccd6067c3adb79009c4b0fc15a2418467e03b4ae5eb68c041fcbcd1f363991d1b6b33fbebbe6beecb94f3eda048d6c1ba
+EBUILD tg_owt-0_pre20220209.ebuild 3386 BLAKE2B 6b76c34f64a8e836c7a790b48bcf24b50b59a1b9abc80a29cb6bfe64e38fa66a842af5f98b32f358b487fa48904d3efbc15e11d66218b261f15b776cdc6d6b01 SHA512 db152781be87ce5a2f18d31f41b45f2467bc981b1bc79d9e899108835bf75c65176551e360eed1fc77c90e251d6947806084e2d613b2da9db18ffdf641f351e0
 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch
index c6abf9660468..3d4acfd0d941 100644
--- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch
@@ -9,23 +9,23 @@ This setup is untested, but supported by the GNI build system, see:
 Toggling the WEBRTC_USE_X11 define also affects some files under
 src/modules/audio_device, but that falls under "X11 support", regardless...
 
---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
+--- tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7.orig/CMakeLists.txt
++++ tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7/CMakeLists.txt
 @@ -21,11 +21,13 @@
  
- option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." ${TG_OWT_PACKAGED_BUILD})
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF)
  option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
 +option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
  option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
  option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
- option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF)
  
  if (NOT UNIX OR APPLE)
 +    set(TG_OWT_USE_X11 OFF)
      set(TG_OWT_USE_PIPEWIRE OFF)
  endif()
  
-@@ -87,6 +89,10 @@
+@@ -97,6 +99,10 @@
  add_library(tg_owt)
  init_target(tg_owt)
  
@@ -34,22 +34,26 @@ src/modules/audio_device, but that falls under "X11 support", regardless...
 +endif()
 +
  if (TG_OWT_USE_PIPEWIRE)
-     link_glib(tg_owt)
      if (TG_OWT_DLOPEN_PIPEWIRE)
-@@ -169,7 +175,6 @@
+         include(cmake/generate_stubs.cmake)
+@@ -188,10 +194,6 @@
+ include(cmake/libwebrtcbuild.cmake)
  target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
  
- if (UNIX AND NOT APPLE)
+-if (UNIX AND NOT APPLE)
 -    link_x11(tg_owt)
- endif()
- 
+-endif()
+-
  function(add_sublibrary postfix)
-@@ -2161,6 +2166,37 @@
+     add_library(tg_owt_${postfix} OBJECT)
+     init_feature_target(tg_owt_${postfix} ${postfix})
+@@ -2258,6 +2260,39 @@
      )
  endif()
  
 +if (NOT TG_OWT_USE_X11)
 +    remove_target_sources(tg_owt ${webrtc_loc}
++        # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions)
 +        modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc
 +        modules/desktop_capture/linux/mouse_cursor_monitor_x11.h
 +        modules/desktop_capture/linux/screen_capturer_x11.cc
@@ -71,6 +75,7 @@ src/modules/audio_device, but that falls under "X11 support", regardless...
 +        modules/desktop_capture/linux/x_window_property.cc
 +        modules/desktop_capture/linux/x_window_property.h
 +
++        # screen_drawer_linux.cc depends on x11, rest are revdeps
 +        modules/desktop_capture/screen_drawer.cc
 +        modules/desktop_capture/screen_drawer.h
 +        modules/desktop_capture/screen_drawer_linux.cc
@@ -82,9 +87,9 @@ src/modules/audio_device, but that falls under "X11 support", regardless...
  if (NOT TG_OWT_USE_PIPEWIRE)
      remove_target_sources(tg_owt ${webrtc_loc}
          modules/desktop_capture/linux/base_capturer_pipewire.cc
---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/cmake/libwebrtcbuild.cmake
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/cmake/libwebrtcbuild.cmake
-@@ -27,6 +27,13 @@
+--- tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7.orig/cmake/libwebrtcbuild.cmake
++++ tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7/cmake/libwebrtcbuild.cmake
+@@ -28,6 +28,13 @@
      BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0
  )
  
@@ -98,11 +103,15 @@ src/modules/audio_device, but that falls under "X11 support", regardless...
  if (TG_OWT_USE_PIPEWIRE)
      target_compile_definitions(libwebrtcbuild
      INTERFACE
-@@ -63,7 +70,6 @@
-     INTERFACE
-         WEBRTC_POSIX
-         WEBRTC_LINUX
--        WEBRTC_USE_X11
-     )
- endif()
+@@ -64,11 +71,6 @@
+         INTERFACE
+             WEBRTC_MAC
+         )
+-    else()
+-        target_compile_definitions(libwebrtcbuild
+-        INTERFACE
+-            WEBRTC_USE_X11
+-        )
+     endif()
  
+     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
index b6dc20152178..a1476f496136 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
index bf747e3836fc..7e7a27774fea 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
@@ -1,14 +1,14 @@
 # Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="WebRTC build for Telegram"
 HOMEPAGE="https://github.com/desktop-app/tg_owt"
 
-TG_OWT_COMMIT="575fb17d2853c43329e45f6693370f5e41668055"
+TG_OWT_COMMIT="4cba1acdd718b700bb33945c0258283689d4eac7"
 LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
 SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
 	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
@@ -28,9 +28,8 @@ IUSE="screencast +X"
 # - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
 # - libsrtp (project uses private APIs)
 # - pffft (no stable versioning, patched)
-# media-libs/libjpeg-turbo is required for libyuv
 DEPEND="
-	dev-cpp/abseil-cpp:=[cxx17(+)]
+	>=dev-cpp/abseil-cpp-20211102.0:=[cxx17(+)]
 	dev-libs/libevent:=
 	dev-libs/openssl:=
 	dev-libs/protobuf:=
@@ -59,9 +58,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch"
-	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-X11.patch"
-	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch"
+	"${FILESDIR}/tg_owt-0_pre20220209-allow-disabling-X11.patch"
+	"${FILESDIR}/tg_owt-0_pre20211207-fix-dcsctp-references.patch"
 )
 
 src_unpack() {
@@ -71,31 +69,26 @@ src_unpack() {
 }
 
 src_prepare() {
-	# libvpx source files aren't included in the repository
-	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
-
 	# libopenh264 has GENERATED files with yasm that aren't excluded by
 	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
 	# These source files aren't used with system-openh264, anyway.
 	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
 
+	# "lol" said the scorpion, "lmao"
+	sed -i '/if (BUILD_SHARED_LIBS)/{n;n;s/WARNING/DEBUG/}' CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
 	# see https://bugs.gentoo.org/754012
+	# EAPI 8 still wipes this flag.
 	append-cppflags '-DNDEBUG'
 
 	local mycmakeargs=(
 		-DTG_OWT_USE_X11=$(usex X)
 		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
-
-		# Not required by net-im/telegram-desktop right now, I'd rather avoid
-		#  the (ABI compatibility) headache.
-		-DTG_OWT_BUILD_AUDIO_BACKENDS=OFF
-		#-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa)
-		#-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio)
 	)
 	cmake_src_configure
 }
@@ -104,13 +97,20 @@ src_install() {
 	cmake_src_install
 
 	# Save about 15MB of useless headers
-	rm -r "${ED}/usr/include/tg_owt/base/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die
 	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
 	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
 	rm -r "${ED}/usr/include/tg_owt/third_party" || die
 
-	# Install third_party/libyuv anyway...
-	dodir /usr/include/tg_owt/third_party/libyuv/include
-	cd "${S}/src/third_party/libyuv/include" || die
-	find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/third_party/libyuv/include/{}" \; || die
+	# Install a few headers anyway, as required by net-im/telegram-desktop...
+	local headers=(
+		third_party/libyuv/include
+		rtc_base/third_party/sigslot
+		rtc_base/third_party/base64
+	)
+	for dir in "${headers[@]}"; do
+		pushd "${S}/src/${dir}" > /dev/null || die
+		find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
+		popd > /dev/null || die
+	done
 }
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index d6e45364aba3..960772f56123 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -3,9 +3,12 @@ AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62
 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
 AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b73670da4069c7ffd5426f83666a163ecb20d71250ea30aac200ab129458ae090cd844c50e66741c72cc8b74d2c7c52a SHA512 166b0eceb0509dff80c9ca172601926398ffc3b0f780058b8f5dede4a914aeecfe259b3c31469ce01b317af675c62e33bbe5bbe56b922b74ffdd4e0b5655845e
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
+AUX vigra-1.11.1-openexr3.patch 1063 BLAKE2B 92a08dfdb56a006a6449ea8fa4def9d68aad820f71e6a8f23d40a3b925d664dc8be1156f0247d34fd0433e23baa4bfadac839ce3edba6462275d2db7322a8fd0 SHA512 8dfd95c67df159c258d0b19f7485eb1c5a73c58a4b36a0ec4472e1dc23551e52647e2cc1be5bc0f4d290816ba50bd5329b1c73cd0a25babf10421c43a6a6e125
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r3.ebuild 3676 BLAKE2B 70b2a540d238343b9a4d52ba1f952fd6fb7ffca34a411629e98d40dd5b341e44b87d520467f1e1d6fd5daeed7a09384f98b21f8c3327423102d4d9977c3741a5 SHA512 39c4098f1732798880af0222ad787582bc9850d1fe9e9fa31470b1faaa01457055e81c9d24bb1e676793156a078de2ebdd7e4b2b8a02a6298ac3d9a6873ec37e
-EBUILD vigra-9999.ebuild 3985 BLAKE2B 859cb2ecdfd49d2d2d74835e7d0917da2f0d07557946bf64d1bfecdc7e0de4381fbdd8fb04ffb911eaf9c361425192855b66ce4785f7d9fed4840fb402d8e4c4 SHA512 3215777489c73de11b1721077c8b456d43315a0277791366b46ad912266a8d42c9871736db5ac8d4ce5419a08c71d712ee4510159e90876c5bef358a82fdc46d
+EBUILD vigra-1.11.1-r4.ebuild 3674 BLAKE2B cf1890f16e8b4246b057affa681ec7cc625f15f800463f9e11cd6389152cf102817b84776c8f0a5b6df3d7efdee20a0a5fc56a3d74b6a62b1da4d0786fb944a3 SHA512 efae8eb542861c8aaa458330a08739a1ea3a273ec6e5da0f3c0668627ebba34cbafd8b26a28cf1a14dc2d1da38bf64054edf3e7e46737473c2c09d43aff67ce6
+EBUILD vigra-1.11.1-r6.ebuild 3724 BLAKE2B 2753e1c2b2e845b3059c6d1830933d2c0a3f65e52a2f6a911516ee7503166c574ef46ef1361d950e1f8ebb24419d493eadc214bf7f86b4535044b137d8b96b31 SHA512 420c4880a07a6d70cf9b5f74415620614ce8eb60f6ea485071edfa0878c84363b11a13bbde9be7229fa9b9dd700c2bf4a6438b1f94a088540df4826e77720638
+EBUILD vigra-9999.ebuild 3502 BLAKE2B d2ea17d2419a847f93d1da38d92a1e449a179be2dbcc3d434d2c65f361341f7fb35fc7397f46d15b16abb570c2134319055c3966ebde0f92fe49a67905024e02 SHA512 52b09a08590340ecfe27584ea2a91ed24e81539effd22b9aecb9ae0d35de230765b0d9829eccb55ecae52e0245220e596ea435a3e796f8e39318ce213903e32b
 MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
new file mode 100644
index 000000000000..703cd22b9321
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
@@ -0,0 +1,37 @@
+https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
+https://bugs.gentoo.org/823632
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+--- a/src/impex/CMakeLists.txt
++++ b/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
diff --git a/media-libs/vigra/vigra-1.11.1-r4.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild
new file mode 100644
index 000000000000..be3e2f9fe820
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+inherit cmake flag-o-matic python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+BDEPEND="
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
+# runtime dependency on python is required by the vigra-config script
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}
+"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+	"${FILESDIR}/${P}-boost-python.patch"
+	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
+	# TODO: upstream
+	"${FILESDIR}/${P}-lib_suffix.patch"
+	"${FILESDIR}/${P}-cmake-module-dir.patch"
+	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+)
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	vigra_disable() {
+		if ! use ${1}; then
+			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+				-i CMakeLists.txt || die "failed to disable ${1}"
+		fi
+	}
+
+	cmake_src_prepare
+
+	vigra_disable fftw fftw3
+	vigra_disable fftw fftw3f
+	vigra_disable jpeg
+	vigra_disable png
+	vigra_disable tiff
+	vigra_disable zlib
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+
+	use doc || cmake_comment_add_subdirectory docsrc
+
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
+	fi
+}
+
+src_configure() {
+	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+	# bug #808731
+	use hdf5 && append-cppflags -DH5_USE_110_API
+
+	vigra_configure() {
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCINSTALL="share/doc/${PF}/html"
+			-DWITH_HDF5=$(usex hdf5)
+			-DWITH_OPENEXR=$(usex openexr)
+			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VIGRANUMPY=$(usex python)
+		)
+		cmake_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake_src_install
+		python_optimize
+	else
+		cmake_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
new file mode 100644
index 000000000000..6724c62fa033
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -0,0 +1,161 @@
+# 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="threads(+),xml"
+inherit cmake flag-o-matic python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+
+REQUIRED_USE="
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+BDEPEND="
+	test? (
+		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
+		valgrind? ( dev-util/valgrind )
+	)
+"
+# runtime dependency on python is required by the vigra-config script
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	png? ( media-libs/libpng:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}
+"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+	"${FILESDIR}/${P}-boost-python.patch"
+	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
+	# TODO: upstream
+	"${FILESDIR}/${P}-lib_suffix.patch"
+	"${FILESDIR}/${P}-cmake-module-dir.patch"
+	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
+	"${FILESDIR}/${P}-openexr3.patch"
+)
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	vigra_disable() {
+		if ! use ${1}; then
+			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
+				-i CMakeLists.txt || die "failed to disable ${1}"
+		fi
+	}
+
+	cmake_src_prepare
+
+	vigra_disable fftw fftw3
+	vigra_disable fftw fftw3f
+	vigra_disable jpeg
+	vigra_disable png
+	vigra_disable tiff
+	vigra_disable zlib
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
+
+	use doc || cmake_comment_add_subdirectory docsrc
+
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
+	fi
+}
+
+src_configure() {
+	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
+	# bug #808731
+	use hdf5 && append-cppflags -DH5_USE_110_API
+
+	vigra_configure() {
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCINSTALL="share/doc/${PF}/html"
+			-DWITH_HDF5=$(usex hdf5)
+			-DWITH_OPENEXR=$(usex openexr)
+			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VIGRANUMPY=$(usex python)
+		)
+		cmake_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake_src_install
+		python_optimize
+	else
+		cmake_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 171eedd560f8..f842c53d7500 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-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,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 inherit cmake flag-o-matic python-r1
 
@@ -23,15 +23,10 @@ SLOT="0"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
 
 REQUIRED_USE="
-	doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} )
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
 	test? ( hdf5 python fftw )"
 
 BDEPEND="
-	doc? (
-		app-doc/doxygen
-		>=dev-python/sphinx-1.1.3-r5
-	)
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
 		valgrind? ( dev-util/valgrind )
@@ -39,12 +34,12 @@ BDEPEND="
 "
 # runtime dependency on python is required by the vigra-config script
 DEPEND="
-	fftw? ( sci-libs/fftw:3.0 )
+	fftw? ( sci-libs/fftw:3.0= )
 	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
 	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
 	)
 	png? ( media-libs/libpng:0= )
 	python? (
@@ -70,9 +65,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use python || use doc; then
-		python_setup
-	fi
+	use python && python_setup
 }
 
 src_prepare() {
@@ -85,10 +78,6 @@ src_prepare() {
 
 	cmake_src_prepare
 
-	if [[ ${PV} != *9999 ]]; then
-		rm -r doc || die "failed to remove shipped docs"
-	fi
-
 	vigra_disable fftw fftw3
 	vigra_disable fftw fftw3f
 	vigra_disable jpeg
@@ -99,6 +88,8 @@ src_prepare() {
 	# Don't use python_fix_shebang because we can't put this behind USE="python"
 	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
 
+	use doc || cmake_comment_add_subdirectory docsrc
+
 	if ! use test; then
 		cmake_comment_add_subdirectory test
 		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
@@ -113,8 +104,7 @@ src_configure() {
 	vigra_configure() {
 		local mycmakeargs=(
 			-DAUTOEXEC_TESTS=OFF
-			-DDOCDIR="${BUILD_DIR}/doc"
-			-DDOCINSTALL="share/doc/${PF}"
+			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
 			-DWITH_VALGRIND=$(usex valgrind)
@@ -126,8 +116,6 @@ src_configure() {
 	if use python; then
 		python_foreach_impl vigra_configure
 	else
-		# required for docdir
-		_cmake_check_build_dir init
 		vigra_configure
 	fi
 }
@@ -143,13 +131,6 @@ src_compile() {
 	else
 		vigra_compile
 	fi
-
-	if use doc; then
-		einfo "Generating Documentation"
-		doxygen -u ${VIGRA_BUILD_DIR}/docsrc/Doxyfile 2>/dev/null || die
-		# use build dir from last compile command
-		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
-	fi
 }
 
 src_install() {
diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index a494b93b2854..73db9d78084d 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,3 +1,3 @@
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
-EBUILD volpack-1.0_p7-r1.ebuild 672 BLAKE2B be312bc5320ba58e0b10c27be211fcca474937233c12d0b0b6b64750e2b551ee9c0097974f490e32cbfd5635b83daf21703a46a1868fc6bfbfb77694ebbab05d SHA512 b83e161838144a016d45647859411a95fa668a9f76c5693166575e4ccab54b86c6460514935f59015a1f11910b369b1c072a575c388d32c4bc8019601fb7bb63
+EBUILD volpack-1.0_p7-r1.ebuild 688 BLAKE2B 97796ceb39dbb83a92d4153c89aa9910a2ed8d358b0586297b5217fcf26cf4e1ef9147e413c9d3ff18188f949d27a2810e560ee6e73eef003156803fc5436658 SHA512 9cd1b7752268cee4523b97eef2e45b00a8b09e31a88adbccb0228abe19e38aacce9ab571f52a26e00310ee6d55261a63a9b82ee38713bb5ba3a541044a4e7a6d
 MISC metadata.xml 603 BLAKE2B 9a91539ff37b42e4dcd36373b76289ca1f427f33779bb32a2900d6b34b620443182289d0a5708505dd09e16465933439052338eb8e3d7a28d7f4ce3a993e23a2 SHA512 4fa26855d6014aec78fd2b5e444b6464991ac8c1b31244cb48fbcf893827a8ecc29b356083e928a66c07af4bc87501c275b7659f5ca0b9dec7628db0e8c6e19b
diff --git a/media-libs/volpack/volpack-1.0_p7-r1.ebuild b/media-libs/volpack/volpack-1.0_p7-r1.ebuild
index f09d6eb8b10f..b205f54d52bd 100644
--- a/media-libs/volpack/volpack-1.0_p7-r1.ebuild
+++ b/media-libs/volpack/volpack-1.0_p7-r1.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=7
@@ -33,8 +33,9 @@ src_install() {
 		docinto html
 		dodoc doc/*.html
 	fi
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 5503c28e8e06..d8996b56110c 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,8 @@
+AUX vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch 1068 BLAKE2B 4a91aa7fbebf2707c34dc228d6ba81989c07fefb1386b8293f6d7707be7c76ad1abb96b0e9ac7cf6830ba60de97bf32fdeb94fa3432440fdeeee2e7d57bd24a0 SHA512 7ccd1380dc2796a6b671014be0af40d2591cefb4e04c8260e924ebbfafbc336b3a8f3fde4a238a6bf013b6528e5aadbcef208a8fa4ad8042803e9366b999aefc
+AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd07855e38d52b5af7fa557f722b83e6afa1c22bba027f2ffd6d6fee71dd27e4782b40d5e62734e7b913e332dfbf2d01b69eaad1a563337f9ac5df19 SHA512 4d4323acac168e5d9ea2b530c69400e980278bf5ec4450dcb2ff865c9714e02646ce90918dc4aa2f9dda932e46e3ff90c1639e4507ce5bf498a512b26f6b0417
 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-9999.ebuild 1611 BLAKE2B 50fd48eb09f923675ba0eab56f6d47eecab42c1ea0cea439a9b741f402c5c0f79fdf39ef22e9ea2718439f34ffcbdf5e9b562cae10e0ec92d5d4ba34ca834b60 SHA512 47f1a60644c9ee16254d07db612f05d2a9a9367a7baba136499e26b1752fabe9dc5a2aff2a6aa413ab4eb478cbec1956037d9480e9082b877fbbd8677461e036
+EBUILD vulkan-layers-1.3.204.ebuild 1673 BLAKE2B 67a14dc9785acd9c61319e8772f6dc55f635a3b8c20d6f1bcef027472278b1ca5f327d25cb66b2223615352c1de44eef05aa85620a3ca801c8d64e30579d976d SHA512 3b3012e79208a4fc778c49c4344f7696fa48f30396df4c23c0a99a638a1760b570794f9fb6e70493bd972afd3b353b0c5d3a5a1e8ee26acf7d200896b7e92827
+EBUILD vulkan-layers-9999.ebuild 1620 BLAKE2B 9eed71962ec4bb21c802b5a8d511f853dc7d2fc2cb10a26956c3ca2fb7fa391ea0e9e870be32f9001e107c28e6b0c15ad8a998b0a52e7b0bc4d11be25a9afc43 SHA512 d34fec44047ff30b6681efc9fb0da9ed22a48e746d3edc570f949f0a889c97832826735030adbc431bddcf4ca16f21cdb4af88ff053739b567c2d30d4c124175
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
new file mode 100644
index 000000000000..791ac6764bce
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
@@ -0,0 +1,27 @@
+From 68f030f9e776d1f2549e471f40c9794f6056bb05 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Sat, 19 Feb 2022 20:41:44 -0500
+Subject: [PATCH] Dont use static spirv-tools
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ layers/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 59e294a07..5d30a9834 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -310,7 +310,7 @@ if(BUILD_LAYERS)
+         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
+     endif()
+     target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+-    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
++    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt)
+ 
+ 
+     # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled
+
+-- 
+2.35.1
+
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
new file mode 100644
index 000000000000..25f3b4bafd27
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
@@ -0,0 +1,90 @@
+From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001
+From: Jeremy Gebben <jeremyg@lunarg.com>
+Date: Thu, 17 Feb 2022 15:26:25 -0700
+Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations
+
+If the SPIRV-Headers package is not found, fall back to looking for
+headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR.
+
+Fixes #3765
+---
+ CMakeLists.txt        | 19 ++++++++++++++++---
+ layers/CMakeLists.txt |  7 +------
+ tests/CMakeLists.txt  |  6 +++---
+ 3 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4ca786ca07..58a966f03d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING)
+     endif()
+ endif()
+ 
+-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
+ if(BUILD_LAYERS OR BUILD_TESTS)
+-    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+-        find_package(SPIRV-Headers REQUIRED CONFIG)
++    find_package(SPIRV-Headers CONFIG QUIET)
++    if(SPIRV-Headers_FOUND)
++	# pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
++	# version of SPIRV-Headers, the package will be found.
++	get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
++    elseif(SPIRV_HEADERS_INCLUDE_DIR)
++	# This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
++	if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
++	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
++        endif()
++    elseif(SPIRV_HEADERS_INSTALL_DIR)
++        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
++	if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
++	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
++        endif()
++	set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
+     endif()
+ endif()
+ 
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 6edcf6eb5ab..59e294a0793 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -309,12 +309,7 @@ if(BUILD_LAYERS)
+     if (USE_ROBIN_HOOD_HASHING)
+         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
+     endif()
+-    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+-        target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
+-    else()
+-        target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+-    endif()
+-
++    target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+     target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
+ 
+ 
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2b98d109b7f..780c0538486 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # ~~~
+-# Copyright (c) 2014-2021 Valve Corporation
+-# Copyright (c) 2014-2021 LunarG, Inc.
++# Copyright (c) 2014-2022 Valve Corporation
++# Copyright (c) 2014-2022 LunarG, Inc.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+@@ -149,11 +149,11 @@ if (NOT MSVC)
+     target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare")
+ endif()
+ 
++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+ # Specify target_link_libraries
+ target_link_libraries(vk_layer_validation_tests
+                       PRIVATE VkLayer_utils
+                               ${GLSLANG_LIBRARIES}
+-			      SPIRV-Headers::SPIRV-Headers
+ 			      SPIRV-Tools-static SPIRV-Tools-opt
+ 			      GTest::gtest GTest::gtest_main)
+ 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
new file mode 100644
index 000000000000..2288a824c1fd
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-dependency-detection.patch
+	"${FILESDIR}"/${P}-Dont-use-static-spirv-tools.patch
+)
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-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 5beaf4f6dc7a..b4edb5a84d37 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ BDEPEND=">=dev-util/cmake-3.10.2"
 RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
+	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 4b41988840a6..3209ff94e197 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-loader-1.2.198.1.tar.gz 1441540 BLAKE2B c34fe5c0b97ee01038749754eb76b0fa7f1e4b9ad5ee78fa63ed9bf27e49362b215b39fd9fadcc5592097db80f3e655d109d6c92ae97829bdc75f5a28085d234 SHA512 dff0d8d9f6ffe4da6b94d491133c79d8fdbc724577387ae6f1522d7e557e39067ba66de60cc075bc469ad755dbe77d6e6728238a7ab4c07c36cf16964936e641
 DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
+DIST vulkan-loader-1.3.204.tar.gz 1465828 BLAKE2B 92716a01958a851374c037b325f7dcd1f3dcb45c1ee0086102c71424965255a3ce9423ed8c1312023f445050cf112c9312110c2d6f4d43ec9980270eca2bbb67 SHA512 f78778783a4981a2b0b38c651e87358afad5c15d220bd1cb95e907f9afe2a81073b6ee12992c7038d0c8227cadcd7a64c93d21b2155585db3d807982354989d1
 EBUILD vulkan-loader-1.2.198-r1.ebuild 1768 BLAKE2B 0b0369e7612be07e579dfdf9827d43c3c03251be8f0aef04ca6f79f260c89ec645fef83186aa573f830cbb898e58df3a778dc5a7da42c74d3195ce2dd2d24ce8 SHA512 362dcaedd4423ed385e6e03420f11570611abffbb413366ec9aca326783218693f8c9a378b722394f2f00a36196b87e173341f22b3ad6a70390a58c40ce42606
 EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
+EBUILD vulkan-loader-1.3.204.ebuild 1762 BLAKE2B 8974c48cc3d535cf8e97fa759a50d3116f036db664344b8fac392f60c144385c6ffbc1ca40b2ea4145c9385890232096815558b69ef82094c9775ffd65ca57f3 SHA512 bcda2e11f00a4198867eef6190603c5e4cbed54dc1c990df24d3a6c4a8efa8672a3a0533b2aa40a75a7ca3b31ab5c31757f21aeb52a7e75529541bf726c32086
 EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
new file mode 100644
index 000000000000..ce4d1ef79739
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_LOADER=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index 0a208a6f83dd..05ef2ba6ed97 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..21a221e8d610
--- /dev/null
+++ b/media-libs/woff2/woff2-1.0.2-r5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Encode/decode WOFF2 font format"
+HOMEPAGE="https://github.com/google/woff2"
+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"
+IUSE=""
+
+RDEPEND="app-arch/brotli:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # needed, causes QA warnings otherwise
+		-DCANONICAL_PREFIXES=ON #661942
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ${BUILD_DIR}/woff2_compress
+	dobin ${BUILD_DIR}/woff2_decompress
+	dobin ${BUILD_DIR}/woff2_info
+
+	einstalldocs
+}
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index b69f34d5e7cb..d566712b009e 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,3 +1,6 @@
+AUX ffmpeg5.patch 2264 BLAKE2B 35be30758a9c2c5b8f14d28a4c54dc26b0ec843ec7f9c1dda1b49f232de19cc114e3965f712cc4a158e24da3fd0ef058122c3d523a1519c72f9b71d584c23c2f SHA512 0d130f44f4b64ce369bf92d71c82c0b06b74470114dfe5b43787dffd3098d5642beb91a6d2d3c4fbee22c04cc810e5bc1f279bbfb753e732ba8c5b5195914245
 DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55 SHA512 d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
+DIST wxsvg-1.5.23.tar.bz2 500351 BLAKE2B 369bd7cee8581df72712183ecb997f0cebae6e7fe942d4cad123d77472b5e3f479f604854bc267990e7ec29c9420625433a4b8a3fe799fcae0e4d6173d411c50 SHA512 c15f58fecbee595f0f981c9347f1e1b929656b7d9c9dfb699252111df927d554cb88b6d7801b323451b0f906ec8c7d6935c9e15372e213f1921f0fdd90733422
 EBUILD wxsvg-1.5.11-r1.ebuild 917 BLAKE2B 73fcf2c6c52b0e81e57b019eb459f89736a92793e51aefcc4a19ddeaa691b8760a79c8a9d879fd70a5baa16bc00ae3b140fac5bab845e223ba1be3bd6d915518 SHA512 4f530f4e96ad23c06100b2fa119045a7ab825bde2d93dda74d1819d70385ce593c025e65a2e45812a2c91fd3a5c2ba763b0517cd77e76cf98ed692354dc50f7c
+EBUILD wxsvg-1.5.23.ebuild 964 BLAKE2B b199dadd10a3dcf9773b27f9c93f963be89fe9995b6cf2afe3ca10a697d005cccd3d66cb3979dedfa832dbe18d725ee073761c37fc95a4fe2e3aac55ed8fcc22 SHA512 f3320fd449d1758a9591b06049c6be776cd9de2b06ba38d33ad1beab3fce96a0e97deec540fb031fe7b5ef005cf4d0919c5e6f53750d4f6f07b1573d8b2f51d3
 MISC metadata.xml 337 BLAKE2B ff3fc593430adabb8ed657f5ce0ce689614750bf503c37c8b1a81aefccb2e5abb3b64e43febd8e0678db8d9b1c79ffbbd75d9912ac39ecd06d15434861ee6487 SHA512 a6a3cb4e46411e4dce39033cdb6fbe52d731c00919553ac8e40eb6260a228c80d6122b5a542b3863f7b743ce89d4248575aedefbe6b49654207476940ee2e71b
diff --git a/media-libs/wxsvg/files/ffmpeg5.patch b/media-libs/wxsvg/files/ffmpeg5.patch
new file mode 100644
index 000000000000..3b726ec79b5f
--- /dev/null
+++ b/media-libs/wxsvg/files/ffmpeg5.patch
@@ -0,0 +1,64 @@
+Index: wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h
+===================================================================
+--- wxsvg-1.5.23.orig/include/wxSVG/mediadec_ffmpeg.h
++++ wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h
+@@ -81,6 +81,7 @@ private:
+ 	bool OpenVideoDecoder();
+ 	void CloseVideoDecoder();
+ 	AVStream* GetVideoStream();
++	int64_t m_cur_dts;
+ };
+ 
+ #endif //FFMPEG_MEDIA_DECODER_H
+Index: wxsvg-1.5.23/src/mediadec_ffmpeg.cpp
+===================================================================
+--- wxsvg-1.5.23.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg-1.5.23/src/mediadec_ffmpeg.cpp
+@@ -20,6 +20,7 @@
+ #define UINT64_C(val) val##ULL
+ #endif
+ extern "C" {
++#include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ #include <libavutil/avutil.h>
+@@ -153,6 +154,9 @@ StreamType wxFfmpegMediaDecoder::GetStre
+ }
+ 
+ wxString wxFfmpegMediaDecoder::GetCodecName(unsigned int streamIndex) {
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++	const
++#endif
+ 	AVCodec *codec = avcodec_find_decoder(m_formatCtx->streams[streamIndex]->codecpar->codec_id);
+ 	if (codec) {
+ 		return wxString(codec->name, wxConvLocal);
+@@ -193,6 +197,9 @@ bool wxFfmpegMediaDecoder::OpenVideoDeco
+ 	
+ 	// find and open the decoder for the video stream 
+ 	AVStream* stream = m_formatCtx->streams[m_videoStream];
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++	const
++#endif
+ 	AVCodec* codec = avcodec_find_decoder(stream->codecpar->codec_id);
+ 	if (!codec)
+ 		return false;
+@@ -255,7 +262,11 @@ double wxFfmpegMediaDecoder::GetPosition
+ 	AVStream *st = GetVideoStream();
+ 	if (st == NULL)
+ 		return -1;
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++	int64_t timestamp = m_cur_dts;
++#else
+ 	int64_t timestamp = st->cur_dts;
++#endif
+ 	if (timestamp == (int64_t)AV_NOPTS_VALUE)
+ 		return -1;
+ 	timestamp = av_rescale(timestamp, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);
+@@ -308,6 +319,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
+ 				uint8_t *rgbSrc[3] = { img.GetData(), NULL, NULL };
+ 				int rgbStride[3] = { 3 * m_width, 0, 0 };
+ 				sws_scale(imgConvertCtx, m_frame->data, m_frame->linesize, 0, m_codecCtx->height, rgbSrc, rgbStride);
++				m_cur_dts = packet.dts;
+ 				av_packet_unref(&packet);
+ 				sws_freeContext(imgConvertCtx);
+ 				return img;
diff --git a/media-libs/wxsvg/wxsvg-1.5.23.ebuild b/media-libs/wxsvg/wxsvg-1.5.23.ebuild
new file mode 100644
index 000000000000..6ed6b1b15bf6
--- /dev/null
+++ b/media-libs/wxsvg/wxsvg-1.5.23.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+inherit wxwidgets
+
+DESCRIPTION="C++ library to create, manipulate and render SVG files"
+HOMEPAGE="http://wxsvg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="0/3" # based on SONAME of libwxsvg.so
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/expat-2:=
+	media-libs/libexif:=
+	>=dev-libs/glib-2.28:2=
+	dev-libs/libxml2:=
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	media-libs/harfbuzz:=
+	x11-libs/cairo:=
+	x11-libs/pango:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X]
+	>=media-video/ffmpeg-2.6:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
+
+src_configure() {
+	setup-wxwidgets base-unicode
+	econf \
+		--disable-static \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 9653a9db3262..f015cb0130b4 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,5 +1,7 @@
 AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
+DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190903-r1.ebuild 1983 BLAKE2B dfb3da21ebb5bfb045deb86815c589978a05197fb3de3c7f8cd2580a6a10c6856b061aaa8288c62e69149b67e9073b972842008c9edbfe87860c3ab0fc0a7469 SHA512 74a660838e027c3128784c7a5c7e74cc267910f20290c487aaaee88089e2b908cbc41946db374b9f236dafb352011981c242e52d94e907439f0a430b24507c1f
-EBUILD x264-9999.ebuild 1939 BLAKE2B 62087c6fde37550720193888c3e2772318eebeb46d93943b04300aa53a0c283bc24fa339e69ab1e1f2816950efa4b9ce1ebafc5bba53d2d11c98b1c03ac99652 SHA512 2429fc13b78e1c283ff5b9f7505f5890c4fc109aee4fb064324a41095e086ab753901fa1294a1de345814c42cc87154f573a6ab7a17cf2b3b3f2d6861510e37d
+EBUILD x264-0.0.20220222.ebuild 1982 BLAKE2B 337e0971e364d86cc9cd07fce36679f8d634bfecbd52c17a3fd0ed03f64bbe5ce04ade018e3d467883043bfa0e6a2ddd61f3878c4ddca5db44b3b6fa5214db55 SHA512 f7ff8f77f7b2ebae6743b5a5faf7e90b4640a3d3b2e2b2c09226149331527e4b7b92393f36e2e210a7feaa4c11217dcb131dc27465e016e1b17786ee22124c6b
+EBUILD x264-9999.ebuild 1982 BLAKE2B 337e0971e364d86cc9cd07fce36679f8d634bfecbd52c17a3fd0ed03f64bbe5ce04ade018e3d467883043bfa0e6a2ddd61f3878c4ddca5db44b3b6fa5214db55 SHA512 f7ff8f77f7b2ebae6743b5a5faf7e90b4640a3d3b2e2b2c09226149331527e4b7b92393f36e2e210a7feaa4c11217dcb131dc27465e016e1b17786ee22124c6b
 MISC metadata.xml 489 BLAKE2B b9c1e67f7b3bce14a0d3330717204b25bfccc55d77343dba21b8a4d01b915dd690627a7affea0de0e7940c42ac2378e2e06dff243099b70b5c6a1805095d5fd1 SHA512 1416496833de2a3e28ad0f407701c0a08b6d3435a3ba65c159beac19c7a64d0f5f04d5200cbaf9217846cef0a101827bf50824eedc2b6ae7414a7fc6fc10b250
diff --git a/media-libs/x264/x264-0.0.20220222.ebuild b/media-libs/x264/x264-0.0.20220222.ebuild
new file mode 100644
index 000000000000..a16cb3d6a416
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20220222.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+	# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
+	SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${PN}-master"
+fi
+
+SLOT="0/164" # SONAME
+
+LICENSE="GPL-2"
+IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+multilib_src_configure() {
+	tc-export CC
+
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then
+		asm_conf=" --disable-asm"
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		--cross-prefix="${CHOST}-" \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index b2963fe3f360..a16cb3d6a416 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,13 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
 else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}/${MY_P}"
+	# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
+	SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${PN}-master"
 fi
 
-SLOT="0/161" # SONAME
+SLOT="0/164" # SONAME
 
 LICENSE="GPL-2"
 IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index a5f0d76424f5..127879685599 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -8,7 +8,6 @@ AUX x265-9999-ppc64.patch 385 BLAKE2B c75bd6e0e7c1ded2b4858f4cbacc337d6015a0387a
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843
-EBUILD x265-3.5-r2.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d
-EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
-EBUILD x265-9999.ebuild 6361 BLAKE2B b48741992dbfbf59f5e67a2bfd0ffa0bb81aeea05ed27fe113e56d0ed3a713c6ddd686699b36539b8b7ef687ebeddfe519e117a25782eea229b8ac8eaa07ebd1 SHA512 d6f6a7b9562cf546f7baf7eee64ae93f9e25b5e17d264484487bdf88f217ef6b1f7b88cb5ef42350ae4e2085eadaa01443a32689410f2a97e1fe4d6f8d028375
+EBUILD x265-3.5-r2.ebuild 6351 BLAKE2B 6bbcb1a6e42a385fae266066290dabf0971e725fb4884a9bbb662f61d8720a931436579ada22b7b83c7b421965823a80501be90e7e7d1c3c3d9ebeda90921816 SHA512 eadd94dff032b4cd302fe714a0b07ee1caeed95b117ca7b21812e6e7656153579a6d88b7e96dcef89c325d7be0085774662c8c21e406e68999c127c37f4525cf
+EBUILD x265-9999.ebuild 6368 BLAKE2B 7949eef144fe0630957c7ee8d687c263ac50b9becf78833e9a5d8ea9db040cf3c574da7515458220b449145ed41cc5ec75a09c86bc5935900d38910e8ced9916 SHA512 b7766c09d856ecf39e604537c46a3d66ab4540d66e7ca6bc8e311b86674fecc1fd2495f01660dd6cafa4825bb8cc1b94d86e98cbd66b3c63800c98ddba2acfe4
 MISC metadata.xml 622 BLAKE2B 337e399c3be2dfc52c2f422a76ae80faad2424d221e074041e06cc0a10403bea1aca3975ae6afaf9bb4b50cc5069db8413928e8697458014c6f96d1856421f79 SHA512 be4f7c57f732fa836cda726da9426a0e4bdac2a681a4be3bb157e7cf7b8f517e3002653d9ee7a58ba81601d34fb6168680453bbdaa10389b65945f7b4d1a492c
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 58018488f52c..8ccbefead9ac 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/${P}/source
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
deleted file mode 100644
index e956de4eab01..000000000000
--- a/media-libs/x265/x265-3.5.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
-		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d686f028c1da..4f853abbc5bd 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/${P}/source
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 12da573786bd..99db4e7125a4 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,8 @@
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
+DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
 EBUILD xine-lib-1.2.11.ebuild 5213 BLAKE2B fb1aa47ca34bdc267a2923d55ecfc1d642248e9bb072f782e9dbbcc66a926a1c4278037650d0ae3809ac2021a89e3504bf2586031883979ce5cc7faad1e62333 SHA512 bf042d0761c3320e5a94fd83d6aed7642bb1b3f982befaf05697c9139e1e062bf25624fd23090a656654b2c62d4ed2fa2b75c20ca04b6db11172a76d117bf5a3
-EBUILD xine-lib-1.2.9999.ebuild 5211 BLAKE2B f8c2ae627ba412ae2d0dc19a293787a1395e81729ca20a70170e5521744faa538de5b8e074208d2ede249dd5b85fbb507e324106df37662e0912fcd52df1795f SHA512 6c49006f8a5ee75073a0c28cfce7ffed01d93001cce4bf59fac1eb8efad132ebc982306f66a1495930f78d8b1b8aaf55a37351e51650bf3748cac9512fcf6d05
+EBUILD xine-lib-1.2.12.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
+EBUILD xine-lib-1.2.9999.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
 MISC metadata.xml 2679 BLAKE2B e4a259e41b87a49e33a5313d436da9ec288b24a7a0a89f93e61e8ca86ce7da17b7614fa3445307d4cba1a7fedd8ee3578f98884c4523be1cdf2393b045f4a41c SHA512 8f6375ab89a851634acd40e8d749cc4d1347e26c0c2a524cd2452855edc3b6f2e7842b202e1d2b1584bd645c6087a487daec2aa54ccd72cb272dc88445e57d70
diff --git a/media-libs/xine-lib/xine-lib-1.2.12.ebuild b/media-libs/xine-lib/xine-lib-1.2.12.ebuild
new file mode 100644
index 000000000000..b3f3393bc258
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.12.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
+"
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	media-video/ffmpeg:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	nfs? ( net-fs/libnfs:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:0=[-minimal]
+	)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	vpx? ( media-libs/libvpx:0= )
+	wavpack? ( media-sound/wavpack )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libxcb
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--enable-avformat
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		--without-fusionsound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable nfs)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable sftp)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with X xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index e683322d35dd..b3f3393bc258 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 2bce0a837f6e..938405b3ca53 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -2,8 +2,10 @@ AUX zimg-2.9.2-gcc-10.patch 462 BLAKE2B 1066a231f220c6c114447065b4c0ad97f38e48fe
 DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
 DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe386ade6b7a5c1b86db696dd50ff72ff40e1edbd38ee9a8a10dd429f207061fdb2ea326018396dfb92707053 SHA512 ae117399772d2c35ffa61b8cf5d156edf4ed65e9ffeb2e9e0688c88244fdd1a89c098bd842e3795b33fb0951da97f844fb6ffe27045e3234720f70f842356936
 DIST zimg-3.0.2.tar.gz 326554 BLAKE2B 2ebea0060519a6912caf685ec551ed60f64f3e379629c607ad21d256daa549a2e85e2c8dbc0886846e9636508576680ed60353d569aef407879ba5fa7dd3001d SHA512 6aed45c19a07862d389dfc2903a7ed9c0c6b6faa23e1d5de5483f15f1c3fb44a31c954004b8b9f34def0d387a43590d9403d9e24a99a271bcadc373c6ce30d42
+DIST zimg-3.0.3.tar.gz 326585 BLAKE2B 30ef9063d05869a718ba450e2733dede74abb3f60ca827bba683cc1c21f7c4521c830089e800a2f704bb7a133514b00fbd245362765d07811dcb4d2970b28d09 SHA512 859c625599b412ecdd72c73d7618f6c7f9760337f7c8aec69fb97e30e1e65e4da51f6cbc5a2c8ad58cb7fbccdccb5322b95f24166c0204da6a3a8cd862cfb2ab
 EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d613ee779ae72114bc95b9e53344c8b2e75c1865eb90ee8710ad8c01cffdbc28afef92032dfc4b4d6721bf5 SHA512 51fcd2adae236f6083ac1ec669b78c8c4e190081d16d6afa2616e47980c20e41423662c4845b4f174f730c669bd30428f4088cb1fbe5fdd74506c07e6989847c
 EBUILD zimg-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
 EBUILD zimg-3.0.2.ebuild 790 BLAKE2B 82bb65dae94ebcb7297fcf7cd7d008a422948f1a8d5fb823e2ebd8e0f208822d6047a93df42a7060af67dacdbcaa685cf19ef105e6248577a7cf0b6993e1c397 SHA512 f99abe15acd9d55ab345b73a6e2e6ba2b1ece7b3fbb2b293d0a249c371d3f6d8a4b85b18563a6ff07de155289507d613b01bed6b16d3fdbed7936f1d7e9d39d0
-EBUILD zimg-9999.ebuild 783 BLAKE2B 15ad8bd1c1fea38a7a367d497d6bcf04019dc53fdfc866ba779a59b59d7f59202544d9e68e2a110559819297e1684c56f8a716e1dfb55b38e576a694252a3af3 SHA512 0fd908ecd7e65b12d1012d3f1c1f4deff2c13d94a215a50dc756f9138f6402f3cc35d59bf785b0d851116868b40087941051e00201c3768f8dd074d70f0a1bf8
+EBUILD zimg-3.0.3.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
+EBUILD zimg-9999.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
 MISC metadata.xml 312 BLAKE2B 278c7bce7361e1cb96725595df0c35f0e227db2e6732d3cf1b53c960ad4a319a831a0e7cbf51702b24785f0f8d7bc73d3443a17e88595509a62a476caec5c5f4 SHA512 c070a6ea9f0a64532f6aa33b12ad04b293e8a6e014245936a71d5ab6facdec8ffd2665a49cdf3562a3dbc60406b6a24261aa9e65f7b7b63ef0d005927967cac2
diff --git a/media-libs/zimg/zimg-3.0.3.ebuild b/media-libs/zimg/zimg-3.0.3.ebuild
new file mode 100644
index 000000000000..2c7c54c43cfe
--- /dev/null
+++ b/media-libs/zimg/zimg-3.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="debug static-libs"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index 306320548ba3..2c7c54c43cfe 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index 356fc252faf8..ccb511b47eea 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,6 +1,4 @@
 AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d4963885d34b3d52e4ec0bbf397d85d03c67ea22f82f6c2f8ef0c2e1e7f5e1f19b2adb5372f9c56cb60597dfe94623414ff9edf9a7 SHA512 aa9cae5d9d8fb7567b1723ce8334880bbdef1bf0f361ff5cdb8b1932316ed531e410b32e20d919cd1c7b0c24647e810f4cec754360d72c99c18dee9bb9894483
-DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
 DIST zita-alsa-pcmi-0.4.0.tar.bz2 21673 BLAKE2B 16e4adb9e531e70528b6128997a2b899036e21bd00aed24ad257c1247c08b59f6a33c30b1d3ae22c29893fadb31af84fc3b336b405dc50c39b9ef6c9b2a90beb SHA512 e06ae18e657d75b354c7269fcf1a4ae56241e3efbb182c7a64611855a49e086028d4f9bd91a6bbe8da2a64357ab7190d6e0dc5ae38dc9c3457fc8ce256930a50
-EBUILD zita-alsa-pcmi-0.3.2.ebuild 909 BLAKE2B a1c3c8876270c146a9b09e53d57c2656b295bb1f8123acd84568b0f3e0922c921944bfc17c90f2971b7a0cd28c9ee7d92ee146897f37ebc76dbac13323e29580 SHA512 cc4d32ab5e75f1d51b1d157623e2da1cf89c33039fa381f4872cf1bd15370782d62380662961ce832d46ba41a603a0e9fb2294693d5430ddd201d8e191cd1de1
-EBUILD zita-alsa-pcmi-0.4.0.ebuild 913 BLAKE2B abe5836c85549816c1608dd3afdbc804e1a1ff13ce8772932f0dfe793a472aa92338aea6453090e8edae5950072a1618041b6a6815f5f203aa362c2b6855c733 SHA512 4faa80c938baf16e5bb94615133cee37d611576e5a4a5931231aac98fde4481fd58bfb52352053ace5607c5246e368d99667b73fb6ab7e400fd366a143e81de8
+EBUILD zita-alsa-pcmi-0.4.0.ebuild 907 BLAKE2B 5c5f61d7053fc2b843d22f9524439ec8d23bc47eca618eeb789f02de41d858676c292ad49345df57a57310bccb646940232cf0c39b7a381d742f6e539cce3d3a SHA512 6a69d4b95ceecff087c1f599c588f65ec3292d5d6f69b2d8c4d01f4d60666c690923cdec34470b7927c57954106648c858f0942d7d79c89ad86b696db03af70a
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
deleted file mode 100644
index a51d506410e2..000000000000
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Provides easy access to ALSA PCM devices"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-CDEPEND="media-libs/alsa-lib"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS COPYING README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-)
-
-src_compile() {
-	tc-export CXX
-	cd "${S}"/source || "Failed to cd to sources dir"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-	cd "${S}"/source || "Failed to cd to sources dir"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-}
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
index 0fc784a9b3b8..60ea0ca7a8d0 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/alsa-lib"
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)