gentoo resync : 07.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
commit: d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree: 24cd2cf57f3932a24b96e4a0f6666489447e43ba /media-libs
parent: 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)
101 files changed, 2044 insertions, 1402 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 169e794fbf87..f6bd6f5fed6b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 889278f8e941..f90d3781f115 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,9 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
+AUX ctl-1.5.2-fix-to-build-with-gcc-11.patch 599 BLAKE2B a6251fcaf30b7e716968612cfcfe2efec308f77cd49b34940526e9de1ed2faa81551ed6464835836cffa3df5ec6b51dcf70a35ab6f76e3b6e0527cdcd5010a1d SHA512 3e8dbc56ba1db7d6c0bd880cabcc02e2ea44592e1099dd33f51fa22a8220643cc9ef08b83a75b22a3ff3df65e9d51bbb9989323de1cf2bc33e5266d828433e76
+AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c3781eeb728a674edf930f4e2e3e3bfc0747a5dfe2cc33891698ce86b23839fc3a472ed2f5d2ffc323e06ff08f777a989 SHA512 e5d994fac97da2e94ba5f9ef2542546e880d2d2ec1c61624f85249f6e75e3f4d19dcfa91158166c77d6d0c1aaec90832ff55bf88264bd987bb6fa851d6d05cd8
+AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.5.2-r1.ebuild 706 BLAKE2B 5750dfbd0b0d60de4002e06d908bd1ee00faf689cf4e20748d8909a72dbc2673f08977cb00b9640ced231d7b2169c142665d52ebf6d0a029606bf73abd3a43c3 SHA512 e3b36bc318a3bcfee03902122dc654d693c8ed0f5fc529596a2e7a6a9b34103684b8c30756bbfb92a812c47215b8ce7652918a1116323d3833bc491b56f58958
+EBUILD ctl-1.5.2-r2.ebuild 975 BLAKE2B 556b5fbb8d4162a7cf79a9f4892d38306ea219c1af64d1e80052f8172d3b1179741fb16f5c9487b27aa29b743eafc5950f622c9905e5d4deead10caab6db603e SHA512 a140089091ba258c36c64aacc373c9084ee85ba2e339b02cde8f66903cde0d1dbe26e777981b04badc59079ae43343cc782af2dbdc118881b5d527064beb19ea
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..31d4f99a3543
--- /dev/null
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="AMPAS' Color Transformation Language"
+HOMEPAGE="https://github.com/ampas/CTL"
+SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
+S="${WORKDIR}/CTL-ctl-${PV}"
+
+LICENSE="AMPAS"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/ilmbase:=
+	media-libs/openexr:0=
+	media-libs/tiff:=
+	!media-libs/openexr_ctl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
+	"${FILESDIR}/${P}-openexr-2.3.patch"
+	"${FILESDIR}/${P}-fix-to-build-with-gcc-11.patch"
+	"${FILESDIR}/${P}-install-dpx-library.patch"
+	"${FILESDIR}/${P}-fix-unit-tests.patch"
+)
+
+mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
+
+src_test() {
+	pushd ${BUILD_DIR} >/dev/null || die
+	eninja check
+	popd >/dev/null || die
+}
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
new file mode 100644
index 000000000000..47b4cb538676
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
@@ -0,0 +1,25 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 17:33:47 +0200
+Subject: [PATCH] fix to build with gcc-11
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ lib/dpx/dpx.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dpx/dpx.hh b/lib/dpx/dpx.hh
+index 02ae833..5639aaa 100644
+--- a/lib/dpx/dpx.hh
++++ b/lib/dpx/dpx.hh
+@@ -297,7 +297,7 @@ struct dpx {
+ 		compliance_e current_compliance;
+ 		endian_mode_e current_endian_mode;
+ 
+-		std::istream::streampos header_start;
++		std::streampos header_start;
+ 
+ 	public:
+ 		virtual ~dpx();
+-- 
+2.32.0
+
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
new file mode 100644
index 000000000000..56fa35de7a2a
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
@@ -0,0 +1,65 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 18:40:27 +0200
+Subject: [PATCH] fix unit tests
+
+Add cstring #include where necessary and drop segfaulting test
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ unittest/CMakeLists.txt               | 1 -
+ unittest/IlmCtl/testExamples.cpp      | 1 +
+ unittest/IlmCtl/testVarying.cpp       | 1 +
+ unittest/IlmCtl/testVaryingReturn.cpp | 1 +
+ 4 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 553b553..1cfbc9b 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -3,7 +3,6 @@ enable_testing()
+ 
+ add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} )
+ 
+-add_subdirectory( IlmCtl )
+ add_subdirectory( IlmCtlMath )
+ add_subdirectory( IlmImfCtl )
+ add_subdirectory( ctlrender )
+diff --git a/unittest/IlmCtl/testExamples.cpp b/unittest/IlmCtl/testExamples.cpp
+index ccd2183..180b7d3 100644
+--- a/unittest/IlmCtl/testExamples.cpp
++++ b/unittest/IlmCtl/testExamples.cpp
+@@ -56,6 +56,7 @@
+ #include <CtlFunctionCall.h>
+ #include <CtlType.h>
+ #include <assert.h>
++#include <cstring>
+ 
+ 
+ using namespace Ctl;
+diff --git a/unittest/IlmCtl/testVarying.cpp b/unittest/IlmCtl/testVarying.cpp
+index 90ab05d..4079ca6 100755
+--- a/unittest/IlmCtl/testVarying.cpp
++++ b/unittest/IlmCtl/testVarying.cpp
+@@ -62,6 +62,7 @@
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
++#include <cstring>
+ #include <half.h>
+ #include <testVarying.h>
+ 
+diff --git a/unittest/IlmCtl/testVaryingReturn.cpp b/unittest/IlmCtl/testVaryingReturn.cpp
+index eb91d31..d7ab083 100644
+--- a/unittest/IlmCtl/testVaryingReturn.cpp
++++ b/unittest/IlmCtl/testVaryingReturn.cpp
+@@ -62,6 +62,7 @@
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
++#include <cstring>
+ #include <half.h>
+ #include <testVarying.h>
+ 
+-- 
+2.32.0
+
diff --git a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
new file mode 100644
index 000000000000..96e8b268f49b
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
@@ -0,0 +1,21 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 17:54:15 +0200
+Subject: [PATCH] install dpx library
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ lib/dpx/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
+index 918890e..2ed69d1 100644
+--- a/lib/dpx/CMakeLists.txt
++++ b/lib/dpx/CMakeLists.txt
+@@ -12,3 +12,4 @@ add_library( ctldpx
+ )
+ 
+ target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
++install( TARGETS ctldpx DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-- 
+2.32.0
+
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index ddf3d15e18f2..ccc07df15d98 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,8 +1,10 @@
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
 DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
 DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
+DIST dav1d-0.9.1.tar.bz2 810641 BLAKE2B 6ad40f6a339a71bc2bf79c508bc7a8a58cda98c6814981d252a3a40ae8df1cc5ad120c42fc881cb560c84e01186ca3daa09cbb5f6152d7da475d9479aa306f2c SHA512 b688f4743106ceed5f450978a9c265391c0ee906dd5adb8632e563378b316ffb3a7098fb6ea2ef4b160ca880fc03c16e3e3b9d8aa3c90ee7341dd0cbfccecc46
 EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f6057e60ff607b295572fa147e1dbae99f15b748cab8eb5ce668e0b36353e56f2003c816d4c4a4f86db999f6d4 SHA512 1930d6aa4218d5940ed0483d27accae81f94ff9aa18a7f3a5ed4f50fe2e3b6042332faba9dfcbb61883e7489ef44807a9d85b5abd4e9d87bc41d70d6677af936
 EBUILD dav1d-0.8.2.ebuild 1140 BLAKE2B dc06909be0c6b8b10dcf967ab561e0b463433c21e342c629738023ef59f225f7e212c751eebfc0eddf21c25c1af50f87083bbc23c5dafd57468bd36b1b73509b SHA512 314b53ee0a37c017aa0d16507148a8935f2aa2a505cb87c12c8a69d3d849cbe39860cfd36d6863d61d585a0584c47436a2a06edb5fcdcb3fa00dc07b5d7dcb4c
-EBUILD dav1d-0.9.0.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
-EBUILD dav1d-9999.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
+EBUILD dav1d-0.9.0.ebuild 1153 BLAKE2B 34a0271631ec34a0acbcab9e43443c512485485abfa93d704514508658516ca0171dfcac7047bff3ed35a9f1c5ea51865f5ca790e46d6f0c686f454cf5a00389 SHA512 50368d81e65450bf69b755a3db09d07d593ff4c3aa9c3336266cee324cb8f944bb7fffe57cb0719d8579806d2c6f274f9b0e998498c541d285dc4b51d8da34f7
+EBUILD dav1d-0.9.1.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
+EBUILD dav1d-9999.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
index e8fc5114e038..ae26cc566f30 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
new file mode 100644
index 000000000000..850f1843db9a
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.9.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	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"
+fi
+
+inherit ${SCM} meson-multilib
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	local enable_asm
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		enable_asm=false
+	else
+		enable_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D enable_asm=${enable_asm}
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index e8fc5114e038..850f1843db9a 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -8,8 +8,8 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit ${SCM} meson-multilib
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 1e82bbc6dba3..581da6c2f229 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,3 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
-EBUILD embree-3.13.0.ebuild 3465 BLAKE2B b5e4e31760538f51c50ba1526ee29eebdab8c5ee720267ec65457d31112ac481c45fc76413460bb327975a79e7c89023b8d3c40bd14855e994d6bf3aabbeba11 SHA512 a9fee50a34340c78b0c21c6128fcb53f1f59e351557ede13bea0e9f2b54641b639911b2850c707f2248357bbcc54bb00b712af07263f17f7f2276a9bbe4d42a2
-MISC metadata.xml 1613 BLAKE2B 916b6146240c4615a8baa634e74b5548bc9bb3951754e29fcc1c7bbde5e0bf149b78aa188ae90f96e6f5635c849bdcddb53c71207f5404f3b13f919824026129 SHA512 0b12bb93ffa005da30ee1c7106d2adffd82fafe66d5fded8b199ab77392773db03cd88e380a2b861bcf502275deb1e2467c7637b7548356c8487387b532cb7e1
+EBUILD embree-3.13.0-r1.ebuild 3651 BLAKE2B 65fa6bda49493f6eef10eb47ebbff48aa04a2d0215db0c3d3b804bf463100c3f5d8eaab8ae2f1ef5957ac503d97ea425d51530b0829d4e20be8efa978336b850 SHA512 9dcfcc5703680ca291495205dd66f911d4c708e5cbf665c08579a6afc63de43074bc092c1bcd5565ed3a1fdb02ad3089031824da4b735684eb44ee393c9baa4f
+MISC metadata.xml 1704 BLAKE2B badfdc7f376750baf3cf4b6857651f0ef86c90a6acd1046694e49b2d641e53d6b31855a7326b66cc7f5473dd747da26c202d8433adb5ab7380269578ee46d6b1 SHA512 3bbe4c5d05bc4d5d7fde27bbd51ed9292fed45c03e72a6bdcbf163bfdadd3738249ac76c292bf4751e19b248dd4438e49fa5af0b78221d8cb0da2078bf0d5a87
diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild
index 7fb5564741fa..f77d5a1eb87c 100644
--- a/media-libs/embree/embree-3.13.0.ebuild
+++ b/media-libs/embree/embree-3.13.0-r1.ebuild
@@ -7,29 +7,32 @@ inherit cmake flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Collection of high-performance ray tracing kernels"
 HOMEPAGE="https://github.com/embree/embree"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
 SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
 SLOT="3"
+KEYWORDS="~amd64 ~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[@]%:*}"
+RESTRICT="mirror"
+
 BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND="
-	ispc? ( dev-lang/ispc )
 	>=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
+		>=media-libs/openimageio-1.8.7:0=
 		virtual/jpeg:0
 	)
-	virtual/opengl
 "
 DEPEND="${RDEPEND}"
-RESTRICT="mirror"
+
 DOCS=( CHANGELOG.md README.md readme.pdf )
 
 pkg_setup() {
@@ -62,6 +65,9 @@ src_configure() {
 	filter-flags -march=*
 
 	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
 		-DEMBREE_BACKFACE_CULLING=OFF	   	# default
@@ -93,7 +99,7 @@ src_configure() {
 		-DEMBREE_TUTORIALS=$(usex tutorial) )
 
 	# Disable asserts
-	append-flags  -DNDEBUG
+	append-cppflags -DNDEBUG
 
 	if use tutorial; then
 		mycmakeargs+=(
diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml
index 9fb89375a782..dcaede1dd583 100644
--- a/media-libs/embree/metadata.xml
+++ b/media-libs/embree/metadata.xml
@@ -20,15 +20,16 @@
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="compact-polys">
 			Enables double indexed poly layout.
 		</flag>
-		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ssp">
-			When enabled, Embree compiles with stack protection against return address overrides.
-		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ispc">
 			Build Embree with support for ISPC applications.
 		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="raymask">
 			Enables ray mask support.
 		</flag>
+		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ssp">
+			When enabled, Embree compiles with stack protection against return address overrides.
+			Stack protection will wield a minor performance decrease in return for higher security.
+		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="tbb">
 			Use TBB instead of the built-in Embree tasking system.
 		</flag>
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index ea97edd479d7..fc18c2bc5b6d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-base-1.18.4_wayland_registry_remove.patch 2041 BLAKE2B 88830f067
 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
 EBUILD gst-plugins-base-1.16.3.ebuild 5954 BLAKE2B 744b3bec6a4d7b6c1ad44276a6641ae960b21d3ee3b5be92a739f0798ff468564a2e776f135e16c67be42d325d6ce2806ffbce6a24b477f27bfbd50b24127006 SHA512 9ec447c3176369f521829a3b2882f73f579f1b608c4bb3c54eb9d290f9200b39f0679ab4ec5ec8d2180821f55efe7c4d89132fe7c968a51b6f1457051a3cd2ca
-EBUILD gst-plugins-base-1.18.4.ebuild 5718 BLAKE2B a70a9b46e6471263455c049bdf7c8a887c66ed0d50f23fc1e3faa8a4abfc32ab98df4f8484362d696c2041c92c0f95430a05476d526635709914e99dc5072521 SHA512 f42a746757febf46af978caa95ae51eb10ee2b3379f294cc5f48d086ea85408777c56b18cf4768472658fc674f3c17e07e08f368723b8fe6c79e4c823adf9186
+EBUILD gst-plugins-base-1.18.4.ebuild 5725 BLAKE2B 8f68c475ec71a6964db00cd1dbba5a4b11f11c4bbbfbeeb197b1df00e0ea1503d2d67f6739d9d39bcc3824aa51752c1e118bacae41525db75087f6faf398b01f SHA512 afc79eed90e324bab56c9984a64323cad7ba64aca6af21d348da544cbce28086cb3160cb47a2e7dde149c8f106c5fa6a6d5c5559d4d5d62abf0cf1d6cf363958
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
index a158631adf0a..1c069c4398d7 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 72c10c2c83dc..4bf0b7279260 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,5 +1,5 @@
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
 DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
 EBUILD gstreamer-1.16.3.ebuild 2854 BLAKE2B a573111c26ab04f84025d4a83e7c8f4827fec79d0e8e21b92f1fe6851c97f11b1267b0ed7baff1a910ca644fde428bc1cf3f3396aca689f0e74c721b47ac4843 SHA512 a2d2b8a8ffd4d1772c54bf1571748d0cf2150fab5442081f39de141ceaf7d5c0c17db70a2e889ba51d33586716c7ed9d0e66d0d217807ebf42ae9c39ae16a05b
-EBUILD gstreamer-1.18.4.ebuild 1922 BLAKE2B f3e4ec09155b677dce89b6a39220380f7bf0cf04fd1da86e13aa9738ed1c3078e4203173163cac4a7e04b514d59bee3a23f7902d4adaf7c9a2cb901e17dc0afb SHA512 105cdbf7d06e5ed35f2def0f8be2cf7753bf83deafdb1735b770f0531b96e9887d664bbf333d49cb85ffa35205d23f0c1c46aa8c188dba6b76c111540c4b5580
+EBUILD gstreamer-1.18.4.ebuild 1929 BLAKE2B d6483412659ff14cd6c741757f059f1e06c39a550506a21f52944a02f2414cff7febcfde49e7423b5224fc0035bb55e5fc54f63a8a112ac204872c73b6f86fb3 SHA512 3bb1276bdb35edce25f526f43b6a0409d7d7dc6571b6f36705ad02256c753b790202001bb7e19a3259d46c9a1b8c9f23ca1c64ee4dfec0787a151b13e49d37fa
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
index 02d997439af9..1685855ab71f 100644
--- a/media-libs/gstreamer/gstreamer-1.18.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection +orc unwind"
 
 RDEPEND="
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7f26b3b180cc..b30729f8aa05 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
 DIST hamlib-4.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
 DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
 EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
-EBUILD hamlib-4.2.ebuild 2061 BLAKE2B 40a91c8e73c98777f912854454f5421854b36dc4bb583f82b0ecae91246521146e9cdb7da4f627d01feebac0fd0e44345a54874b573301314666aa256b45757e SHA512 a8d3bd260b343b77fd96800aad6a9c53ab7e4c1f323d38dcafd959f2cd05767b8f5c983d7b4ff4fc64aae6a5a19eb808fd0edc899b043c293eb5207f04c3178e
+EBUILD hamlib-4.2.ebuild 2059 BLAKE2B bf20a9cf50751f9c569838e4e8e23a9f88b5fe2c2b8768c7dca910b7bd9e6f65ea5f81dda22df0e4aaf2c4e8851b179a184594a6a88debb53f7e2c1a2945560f SHA512 3d6caa23d7cf43e9744eb88aaee4ec978331bb02dedee767ddcdce81a7f02419a34f2bec2ffd91dd0757e934af4903879ad3485b70784aace027340ceebd4002
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.2.ebuild b/media-libs/hamlib/hamlib-4.2.ebuild
index a1babce2a0e4..c26283d90ea6 100644
--- a/media-libs/hamlib/hamlib-4.2.ebuild
+++ b/media-libs/hamlib/hamlib-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0/4.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 9ffbb45cfd23..c7834cbd4696 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 EBUILD ilmbase-2.5.6.ebuild 1080 BLAKE2B 6d186c002551cde60e7c6d2642bbea2087e247a6619cbb625558130bb7c743b3c4d9dae94c7078165eb78be1c51d4f02301706a67cb71b63e111403eb80a871e SHA512 1431d949d5687df526a45d8bc41e0e6c958c15d4e0c873e82548ab5f22414fcfedd5a12a59fee6a105b92813c14decc4271cba7c6e68acf2fe4017b675525359
-EBUILD ilmbase-2.5.7.ebuild 1090 BLAKE2B c7bb12c40a49c20ed403985f85d50b27f8da9d68bf5682ee09e766bbcb3072fdf112f00724d3ba2f316856d619cab9110c69a253b0169d304d529411e89e66a8 SHA512 e57f77c2d2fded932af373aa3e1d29696cd4184ae6a6354b8c04b1a14eb5c14b3506fbac0fb18d79e618881b0631f97d42e7c2a625ac62e36f17b97e86333255
+EBUILD ilmbase-2.5.7.ebuild 1089 BLAKE2B 3be2d25a4f410fa55508396bb8aeee554f6747f61b9edb130d99ba2576fe533cef6b5f41e1af58efdecb8d0c7da8e06972257877b111041855d201163ac5e415 SHA512 fead430fb6a6ea5e906ed37a391ae5aaadff56f065aa494f7d3aefdd2f9dcd72635817de87df4247977af2e3ae3d059af9c53d772ec05ed7fec77fb7ee4ff2f0
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
index f4151651546a..9b78d8f34758 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ 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"
+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 )"
 
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index a37724090828..ebd8377ecb62 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,4 +1,5 @@
+AUX intel-mediasdk-20.3.0-missing-limits-include.patch 751 BLAKE2B a43734984dad9be29ae79677c05d20c245e704d6cef9c6d69d06d38973eb2dadae34cbcba74a120061dfeef6bc10a5ca76fd9a252d35c25025158aaf251bc122 SHA512 a5a681d43613a20b9c8cd1549d6b4fa4288c401716cd95ab08e314855fea01acc24d4fc0f5c687a002ca2440b7eb4f14c64c727b2b0382ca9c99ab8981e051b3
 DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4
-EBUILD intel-mediasdk-20.3.0.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192
-EBUILD intel-mediasdk-9999.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192
+EBUILD intel-mediasdk-20.3.0-r1.ebuild 975 BLAKE2B 89348fe099e7cc04aca1cf0783db27a23db5c4b38bcbb01608c7127d9ca3e276818b13dd3f56335dd2e19f0c277059de25d8874e5ae04aa08dbac606ba3bf7d5 SHA512 86f3a0092e8108bf824e7d66d4060e65444140728a3937bd0490ee3fd5d6c8ec7cae901b0a2ca01ebdb9c1f0dcfdf03d2345dbebd1811461fcac24dadf073b8d
+EBUILD intel-mediasdk-9999.ebuild 905 BLAKE2B 6d20e929400fa7bbdfa328167d1bb77630ff1f0db2c429689759d3684ef7bdd6a98abc35abc2afc296fcee22f6db40ea85f4e8227658790ad8ed2a7c209d7bef SHA512 0a1111fd1d60b63b922322d89f308ea5cf4e999425cc679e11e5e2a852fd684b6780a08be98023005026979677dbbe3dca9a603769169a3d9e995641aff4ff1e
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
new file mode 100644
index 000000000000..a3a5c1e06ec4
--- /dev/null
+++ b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/789726
+
+From fb9829058e35405081c8b361fb402eeaa6b78ed9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 21:47:49 +0100
+Subject: [PATCH] Add missing limits include
+
+---
+ _studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+index 5774702..ed1c1b7 100644
+--- a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
++++ b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+@@ -44,6 +44,7 @@
+ #include <algorithm>
+ #include <climits>
+ #include <cmath>
++#include <limits>
+ #include "cmrt_cross_platform.h"
+ 
+ using std::min;
+-- 
+2.32.0
+
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
index 930261567424..2849dead015e 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
@@ -25,13 +25,19 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
 DEPEND="
 	>=x11-libs/libva-intel-media-driver-${PV}
+	x11-libs/libdrm[video_cards_intel]
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.3.0-missing-limits-include.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENCL=OFF
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 930261567424..33349a103358 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -25,10 +25,12 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
 DEPEND="
 	>=x11-libs/libva-intel-media-driver-${PV}
+	x11-libs/libdrm[video_cards_intel]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 1aba1def8b84..5888849ff273 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,6 +1,5 @@
 AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689bb66b7abcd93552a6a87aed0a8677c5d1352944071f3621b6298d27bcad0e02dfe54c2abf386396e71fae2b923747dae5999684 SHA512 8aae4dc353f6299e7790743694d7c67ddaba1cc02a8cba81a36962112f3a0ecbf4e078ef27d5d3c28bf779fbfdc6e5c3935ca5437ccfcf84b3e2e5ed5cba1f63
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-EBUILD libao-1.2.2-r2.ebuild 1673 BLAKE2B e9cb19b6edca77165583e62ffdee238c6c95e223612fedb1fe77b84a064bdc1007398b0b837ce5204a2e592f20c757d8fcf105f4ed6d733516b468eacbd61711 SHA512 91dc0f1606e0e17e435db638a53dc6ec88629cfaeeb035051f0f77f87ccb291d140b60bfb32b3fa0d1ce37bf5b450d9f68fcf8b6cea7490651a7d27e44f62f18
+EBUILD libao-1.2.2-r2.ebuild 1672 BLAKE2B 957ccd681083dd4eb55e648bb41f73938401033d2a0383ec7814fa310ac4a044cc47fb6acda5b50f8b1dd9edd8074351c15552ef994d2bafeda365ded6fe0359 SHA512 bd0e334eeec769b7af6ff087e7eaba9c93ea49c8830603c567d020a41a3f0f9f823cbd42b9860c12dd17c5a6e7d729c957b4e0a3d178e250668d90f10d6a6973
 MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
deleted file mode 100644
index dda461774e57..000000000000
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib multilib-minimal
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="https://www.xiph.org/ao/"
-#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
-#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-implicit.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-arts
-		--disable-esd
-		--disable-static
-		$(use_enable alsa alsa)
-		$(use_enable mmap alsa-mmap)
-		$(use_enable nas)
-		$(use_enable pulseaudio pulse)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CHANGES README TODO
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
index eb03b8bb5fad..da2b67d21cd9 100644
--- a/media-libs/libao/libao-1.2.2-r2.ebuild
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio sndio"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 443dbe3df31a..060600c3113e 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -12,6 +12,6 @@ EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51a
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
 EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
-EBUILD libaom-3.1.1.ebuild 2321 BLAKE2B bf027ec5967d22a8adeeec00371b7e012c6c56b84ad9dea44796682655db131d8b5f9644b1ad0f70c0ce2400ada0ab8a079fc16e63457c73bdcd4bb5a06de087 SHA512 e95482c75610c84ca3a9b64cdff171ee63a069c8812e389d51d0d8a55a0ac96db061cfccdd52a3e15a33a25b5c74cedbad79751da2b8b97bef8bc585e5ab5ebb
+EBUILD libaom-3.1.1.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
 EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-3.1.1.ebuild b/media-libs/libaom/libaom-3.1.1.ebuild
index ec2266a2d2d6..32590cb16b0a 100644
--- a/media-libs/libaom/libaom-3.1.1.ebuild
+++ b/media-libs/libaom/libaom-3.1.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 8629b3cd62f0..118bdc320ad4 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -6,6 +6,6 @@ DIST libavif-0.9.2.tar.gz 1987058 BLAKE2B a734014945498d29121d64e54f34b367582688
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
 EBUILD libavif-0.9.0-r2.ebuild 2723 BLAKE2B 897b538c7b198edd03168c70877eff541327ab439fac2f844b45dc97070e85caa2cf1cc58217225624ca0c2dd81c649f932b7cd0be05a41e23ca56ef50b0dbb7 SHA512 2e334002bbf2bba95a8182b2091ebab4a1f7ff1695cc0e098a16b56641310cddb1a0d74f28c35e258de52ece7a66fc99676db7562303ce9a21eb4f6a878632ef
 EBUILD libavif-0.9.1.ebuild 2676 BLAKE2B f7bc18c5ff496903a50754a83aa5389726a6758879e978f602221770a952b6d0e9dfc8f2642e9782325bbe9041d2c13ed4eb77e712461f2e73d6a95c794dc0e1 SHA512 bf7780568db50757782179613174d49eb89b5a9ad6f02d68ce99adb84e36e83b5543220d49dc491152b13f9457a2de850d045fa6965c803112f854b3e647916a
-EBUILD libavif-0.9.2.ebuild 2678 BLAKE2B c724ac6686d1ee86235450acb49dd6511c7db25bdc55d426f1572435bc56a8de01c7abdc2aa423902b0179d1ef052aaff148fa77b065aacb8eef502d03098172 SHA512 a894a1042468be7fab7a8cde9612bef7613a41f96419a186f5edc1e6c6a717db2ed70b6fddfe957d947c5002836e8e086852a2f265d55d02e35758d50264925d
+EBUILD libavif-0.9.2.ebuild 2685 BLAKE2B b5fd74a300dd3167c34ea9f871a35406884c9112cf27d708029099bd5b5bf42ce0521b0a4fcd31e738d8ed649962905413155eda86ddeb79047c7c5fc6a7548d SHA512 1087e0d6b53ec58c8ed480b04698effb05d21023ab61c46721926cc964398e76434db47c34605ff1d2d16a1874992b4cd4917d36e098b9963b80770139cb3f25
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.2.ebuild b/media-libs/libavif/libavif-0.9.2.ebuild
index 1aae436f27eb..4a9f25f041f9 100644
--- a/media-libs/libavif/libavif-0.9.2.ebuild
+++ b/media-libs/libavif/libavif-0.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 REQUIRED_USE="|| ( aom dav1d )"
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 43ffd8bc16ae..ab0a16e64841 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,5 +1,5 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
-EBUILD libde265-1.0.8.ebuild 2351 BLAKE2B 1846ded7d2ac6d8caff86bc6141dcabf309c05d2cfec1ee41155cd4ccf4bd05047a7624222732cbe82a618a12c41d1c8d0a332a55649f9b0b75e7be960e6c9b1 SHA512 c5cec886324f8a0bacac396dc26109104fe228299d5a1e05a45be8c95c40cd91b6553f14b9b935adabf2108cd176d98d47300a04bf187363e28adf22250df00a
+EBUILD libde265-1.0.8.ebuild 2358 BLAKE2B 903784edcca458ade518c4d1868d00f590c174651168c02f0b68067711fc1f871ecb4402cbdc1adedafbf837819fb8dd724ebf9017a2c4014f839a09a2a43809 SHA512 1d9ae549e55e1dcc0ecb2825736d2fd2c6cca3581ae3a987ab29c8a00d44c5fba18285954ddbfbfa177b5d87bb355aee9b96c12c585141bf0af6cbea5ea37bd6
 EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
 MISC metadata.xml 660 BLAKE2B ad29eca8291fd1d09bc3964b23fcadb61d952be12dc54ea451e1b420ce158cc05b97a549bc2d98e62747d3d26765785be1e3249cfc86838fe04f2a62553ab335 SHA512 bd446c5bc5317e7ecce0a0f910d23efc65fe61f6ee81d13e7c2a813e09c773e2d35b3d8deb57b89ee171feb88b86e64251c4680010461313f9e135f7af95cac3
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
index d532ac429877..a8e64d68e746 100644
--- a/media-libs/libde265/libde265-1.0.8.ebuild
+++ b/media-libs/libde265/libde265-1.0.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index 9e485bcb3dcb..6620d0da395b 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,5 +1,5 @@
 AUX altivec.patch 1627 BLAKE2B 306742b8fea3fcbf21bf7839c05252284c4d05f33022f1f5655a633b421b1e3ae5db165dc870d4c1f2706620d6c0618bae8ca7a730da453332d4641610a4dbeb SHA512 290ac3aa86a932923c3332b7bcc910907e07dfc5a401d28ca8918b3b90b3d40a24724d8ffc18ead1ed6c5b9fa4cc2c886bcbea78f4528fb2e18fc7cf113ee6f2
 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0-r1.ebuild 1174 BLAKE2B f0f20496b3eaf1cab744f9aa8825194881f84c58e3123aea957a528a1549a8ea974464a767c7a3e905b8325dcf680d9fc228938d0d6d9fe0dee30a049e2fde48 SHA512 182d76d45d559fd7c5fe64771270249da3fa701cfa1d05026f475d3ccd93821dfa0013da62c55e8d3ba491931b32389580bcfc8eb1876cd0f7ca0bfc4d27c8d5
+EBUILD libdvbcsa-1.1.0-r1.ebuild 1173 BLAKE2B 368991aa45ecb8577ee47dd9fcbb0e1202bd7b5f47537cc2de5edb735dad9243355877bb81fcd220c5749ac8cd277879ce328f9601a6729fbd3ee989bfc591a3 SHA512 c3c753669d857d9637a7dd460e66d7f0205be5660f288387a07a4d689d3b70d304b0b2e6e41ccee9d3f44ecac7c5b67358c51e0ae736dba5eb89044cadc1c535
 EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
index f57c4314130e..bc96ad4de4b6 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug"
 
 # https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 45790f15dec3..cb7a00d58b87 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -2,5 +2,5 @@ AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
-EBUILD libhdhomerun-20200521.ebuild 743 BLAKE2B 4d0c8729a70f1a3d4d3ab8a5c469dea3f650e9778160458f1eafa8b7a92fb569563f792a36598c41d024979f08519522ae26a5f9b51ca5d54294e0d630d3b2b6 SHA512 12ea5a2751e9f82e7bfc848d1532a91f86a19831f4834492a537711b5206a97f1e27bf94da8d6329717c9f4be7c24d64d6952fdf2adf1f6286974609d5451f5d
+EBUILD libhdhomerun-20200521.ebuild 742 BLAKE2B bc67df4970091743232dacd42215b137c13a1a4f9fca12f9e86dbd286d1df28bc6c12b04a3a57eb61872377c89b12024b904b29fa6f53c75354877e3656b5848 SHA512 d45dcf9259225696ea7660a88ff0a5e57309ed84e1b3044d3f7f150acc153ccb1cd521efa76885d37193aa5c4ed9705d0c5f3d66b51bdd8ead50c5b3fd65d6de
 MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
index a47b92cd0696..ba9622a7b375 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}/20190621-use_shared_library.patch"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index bf8ad8933482..0c325bc9e257 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1831 BLAKE2B d4dcb3a09dc6031152a89f01cf9ef58e9a3a8f9cb8b9dee77834cab99b0e3cb9d6badefa619b8696d45478461b7dbc31128ab6ca0dc67d2248ba473c51992f2f SHA512 12004e9b44197701e8322184321c9074112c63b277e96f68456f614aed8dfc57c824ffdebf943a40c52104f3a0ae7347b7fb1cd573e8e5802bde690d54f76413
+EBUILD libheif-1.12.0.ebuild 1837 BLAKE2B c6c87a75d91519617af899d80ade1fdcd6801e359df5c43d562c6166e935ea168cd135d9d0b37f8b5dd3f9ec791714c36357b7b2eccda929ac9fb89cf8bf07ab SHA512 71a2f4f35a4c62ddd4ac2588ddc36a53a544f0c0cf3ffa6afa71d224138d10788f18c32f55f797512cc0d9801560e5e8b5502ce3f950b0d68b154b665acaac8f
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 7189425c7796..432f1f81e29d 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 2cf4bdcbef75..dfb46875cd4b 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,4 +1,3 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1436 BLAKE2B c1f235d61390dadda14abf70a615591b1d9bb8a0dd913fad5557062191062e963e292244f328cf1a5db8401046573251d826aec61876cf7eb2dd6ac75d1e58f6 SHA512 59cf755a6e123466c8379c00623dada86d0cca48de15f6e89ac212c4e0be593fef6e45b7e5be3223315e5f89ed6f33476a2171b45c8f10ccb47571e12f4413ed
-EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1438 BLAKE2B f5543fcdd2bf3cf87261ae68419e857823727644df0bd850f46b6938fa28a2fa5cbbdcb7a19f4489446ee0ad7ae425ffc906fcbb82d2475c3df17ace1da2e98a SHA512 61e29e8589f9abc1e3e3ab8c3fd51a89ff0f80dab462e094b3ce3fc9da9ec78622aef135539306dacd965e6a0059ad71526171c1160db6ad2f242960a015b0c2
+EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1437 BLAKE2B 09e583c81ae311569e4efa058e8ef191c293a093b5c28fd340b4802577d5625cebe2306f20d0d89e6fdb8ad5925f6728b6472c355637c40686acf113cfeb3e1d SHA512 5517782545491e9813bb6141f1f02bcd18a0f629e0290bc621c45bd68be316262678ae0fcaee20669962dd4c1b5ffe1154665bddda1cd39b53b773f14e84d9fd
 MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
deleted file mode 100644
index 63e5f5b38f12..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools
-
-LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dsp +alsa pulseaudio"
-
-DEPEND="
-	media-libs/opus:=
-	alsa? ( media-libs/alsa-lib )
-	dsp? ( media-libs/tg_owt )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
-
-src_prepare() {
-	# Will be controlled by us
-	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
-	default
-	# https://bugs.gentoo.org/717210
-	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-dsp  # WebRTC is linked from tg_owt
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-	if use dsp; then
-		append-cppflags '-I/usr/include/tg_owt'
-		append-cppflags '-I/usr/include/tg_owt/third_party/abseil-cpp'
-		append-libs '-ltg_owt'
-	else
-		append-cppflags '-DTGVOIP_NO_DSP'
-	fi
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
index 96b273ee47fb..99fafdec5f31 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 582af43d60e6..8c4670203a5a 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1,4 @@
 AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD libv4l-1.20.0.ebuild 1509 BLAKE2B 723c9051eac7841dbfee921ebd77688c55f58070087dd3775fb18f5aa4f841d645f8b0fc38c6a6cf8ccc9dcc13aef2059d3efe463253f5d1748db46de040534b SHA512 941fd642e4ba5116aaa95a2dcee8a6907d1f75a2211cd5c9944afa22f7114917edd3e680fb8aa90f0921361493dc246961875924b1d64e5b564ce5b471665bd0
+EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 9c9efeeb9d02ea98df998efc4a0996fb64a60837941cc4095a1bd3ff7c03d57cc21c68796fef729281d782095c14ce4bfaa429c59aa99dd647062da31291700c SHA512 d857040a48458d67154d08ef5d70b55a25a192b41278a1f098f215f025a098b35d8d69391b14b855dd6b989a2afec56c0437056843082318c8bdcc8d73213147
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index c00574fbf535..653db36f66ce 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index fe4ca2f38214..a29d1b1f63fd 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
 EBUILD libzmf-0.0.2.ebuild 1045 BLAKE2B 5007b0ccc92ce90a80477557c2bf4ff0b3a74fb3ec006be97d63db78af7aa67887387fd4bbffa0942c3ae75e8d53b635beea19150f2b163672fec31fdc23d476 SHA512 3eef2082d76da8f828e88e15b1f011773d65cbff393fc9b4b3e66b592fc462bd4ab6cb49e35e8b29158cfb91e79b2cd9476dcf4bf001689185f359e44de4e837
-EBUILD libzmf-9999.ebuild 1038 BLAKE2B 59ff70c72dde0cbd532f574b09b088e4e6b39a842d351ea8369d8e99e5e1b5064c786d8de449791152de2bbebce9adb30c24dec5bd9ea44ccd98ae3236c64c20 SHA512 599b94e7651b8f64aab01e2ef78af5ff79197f2c252ab43d2de160a8658a65c29150bdd8b774f83b72070619a8a92c70835c9357117d1b87de3169238e438513
+EBUILD libzmf-9999.ebuild 1067 BLAKE2B ab5d5058ac4d0621fb946575660abebbb7b38b6a40e81ccc47eaffb24a91669a0d4317f36fc86a86ad222aac96097a2fecd5317c4ef272624a3249d2703a084d SHA512 1feffc1087522b915ae254e4a80f257adc0bdfbfd77ad66d85124914b036a723babeaf9e7fdd58fa28dd258cccb2ae544882e9bf2b3b11abf29cb6b331b55798
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-9999.ebuild b/media-libs/libzmf/libzmf-9999.ebuild
index f58ce3535bde..5979e0f48940 100644
--- a/media-libs/libzmf/libzmf-9999.ebuild
+++ b/media-libs/libzmf/libzmf-9999.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libzmf"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.libreoffice.org/libzmf"
+	inherit git-r3 autotools
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Library for parsing Zoner Callisto/Draw documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
 IUSE="debug doc test tools"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -26,25 +28,27 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable test tests)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 78a1d4459ec0..6b4318c561a7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,12 @@
 DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
 DIST mesa-21.1.5.tar.xz 15286704 BLAKE2B 3cf5577e3c47e07ad52460383843e2f9147b76128301c7e993e71d0e84b39b0d968dbb4176b13c283f0e9c9f18823ec001ea39a874e0a5b077c9d573a05486bf SHA512 d9e0e1b6a1d717febee2aa67b06620c9a21e061ea7e594be5b4c382db1ed6f5acf5d13a75a9f2bba9c32621466ebc816708606e16e8b34700d987158fd8f0b7b
+DIST mesa-21.1.6.tar.xz 15371108 BLAKE2B fb44778cc552d96bcc4e73c82c28a2a763be99d67e2d8cdea36e7b8e589b36afc2315ec0f984003c52bd27956baf2d6ddf787f34beae41c4944d95fc6cbcb05c SHA512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c
 DIST mesa-21.2.0-rc2.tar.xz 15599008 BLAKE2B 546ea33262b5349f3267ae68f9e2dfb636573ef962c636669241c904f0756187a4caf8cd4150307d2d7243f7bf3e0aa723571f36b7387635fe717363f62d105d SHA512 1701489fa56731170c9ef1ba209498f5c6219cfcc6a1a55c3c387497df997c089d17c66ce621609f6346bfc1b3b3c836280f448a3233ac35eef60b4b5a48424b
+DIST mesa-21.2.0.tar.xz 15678224 BLAKE2B 75630a00ac0fcb0e0600a00f51bbe4b5e8be8c95520dea89e157b7a555585b205b266595c0bf0838931f9c6dbb406257d690ccf65d2bc7564c9068510bbb3a85 SHA512 14323ac474bbcf178177506b5a68976238d2e7bdbdcdf4d1355dd43f5bd551c6cdebed76558c34f49ed057477ec88775306b7b8484b437325e4cb4a77e16127e
 EBUILD mesa-21.1.4.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
 EBUILD mesa-21.1.5.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
+EBUILD mesa-21.1.6.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
+EBUILD mesa-21.2.0.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-21.2.0_rc2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.6.ebuild b/media-libs/mesa/mesa-21.1.6.ebuild
new file mode 100644
index 000000000000..2849134b7198
--- /dev/null
+++ b/media-libs/mesa/mesa-21.1.6.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+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="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${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[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	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
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--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.0.ebuild b/media-libs/mesa/mesa-21.2.0.ebuild
new file mode 100644
index 000000000000..e3fd921bbaa0
--- /dev/null
+++ b/media-libs/mesa/mesa-21.2.0.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+	|| (
+		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[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	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
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto 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/mlt/Manifest b/media-libs/mlt/Manifest
index a2700ace775a..c74b35526f5d 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,6 +1,9 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 AUX mlt-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e014313499691431863cffd4b87aa9ee06b21a557b63cef3166d73b977acb9818267b0b21335929aa72c2444ec52b935faffe44e31f043cc2fc6acc SHA512 0961298be7798af4a4618224ed9b7d36d3ab0e5f976d087c01c455fce3220e282e03bef53cdb7532ff84ca64fab1d23cb1c4c2179c85d0a1475f4597ac963426
+AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
 DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
+DIST mlt-7.0.1.tar.gz 1181298 BLAKE2B 90547ebeeb90b5ab20ec39e3fa97454e9c502af08981f20e433deafc5bbbb45caeea485c18b4229821fcdcef2ed7767e8936af273200a233f18251fa8bc73dd0 SHA512 9268889f0fbe69180651a592ac0b328d18f8b60c7d83f9d6c506dc21254afcb2281662f4d19faf3520976ae100600d00cd6eb2aa42c83880fa4c4c36e760c68a
 EBUILD mlt-6.26.1-r1.ebuild 5385 BLAKE2B 64c6779bf90e459905f1b93c28d7f21b4974a1fa8d7b0df205fb6ffe32d57b8516cf43968fc9af140cfdeafa9dce1a85d1b93411ad2f83587a7e837383af6579 SHA512 3f33ed0fd4d22fe7df7a53ed8810f296c1b4829410b7ddde3424bc55e6a321597dc80537488541490bc3536bf8f3de6d995a740f1adb7b65a99c3af74a701a84
+EBUILD mlt-7.0.1.ebuild 4811 BLAKE2B 2ae0c88a932abbb81e18666bb1ff1c363065212c737262798e058cd41e7ac11c9b2e176b49eb278736b9a2e09060cff73e0c0765f808ea5cf4f5716530bc97a9 SHA512 357119e172a6c259326a7920b7053047996448e48e37ad310a3af48edd2cdd5166a326e3bddbdf94d26cac942a9c1a5f1dd19c7c61a6681e17cd99abe22b4627
 MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch b/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch
new file mode 100644
index 000000000000..c36e0c20ab52
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch
@@ -0,0 +1,14 @@
+Fully respect DESTDIR.
+
+https://bugs.gentoo.org/796557#c1
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -436,7 +436,7 @@
+ if(UNIX AND NOT APPLE)
+   install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME melt-${MLT_VERSION_MAJOR}.1)
+   install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink melt-${MLT_VERSION_MAJOR}.1 melt.1 \
+-                                WORKING_DIRECTORY ${CMAKE_INSTALL_FULL_MANDIR}/man1)"
++                                WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_MANDIR}/man1)"
+   )
+ endif()
+ 
diff --git a/media-libs/mlt/mlt-7.0.1.ebuild b/media-libs/mlt/mlt-7.0.1.ebuild
new file mode 100644
index 000000000000..c2028151188d
--- /dev/null
+++ b/media-libs/mlt/mlt-7.0.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit lua python-single-r1 cmake toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ffmpeg frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
+# TODO: swig bindings for java perl php tcl
+
+# Needs unpackaged 'kwalify'
+RESTRICT="test"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+#	ruby? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+"
+# rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( ${LUA_DEPS} )
+	opencv? ( >=media-libs/opencv-4.5.1:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		sci-libs/fftw:3.0=
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	rubberband? ( media-libs/rubberband )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
+	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	local x
+	for x in python lua; do
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/${x}/build || die
+	done
+
+	use python && python_fix_shebang src/swig/python
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DGPL=ON
+		-DGPL3=ON
+		-DBUILD_TESTING=$(usex test)
+		-DMOD_KDENLIVE=ON
+		-DMOD_SDL1=OFF
+		-DMOD_SDL2=$(usex sdl)
+		-DMOD_AVFORMAT=$(usex ffmpeg)
+		# TODO: does anything need plus?
+		# plus or qt
+		#$(use_enable fftw plus)
+		-DMOD_FREI0R=$(usex frei0r)
+		-DMOD_GDK=$(usex gtk)
+		-DMOD_JACKRACK=$(usex jack)
+		-DMOD_RESAMPLE=$(usex libsamplerate)
+		-DMOD_OPENCV=$(usex opencv)
+		-DMOD_MOVIT=$(usex opengl)
+		-DMOD_QT=$(usex qt5)
+		-DMOD_RTAUDIO=$(usex rtaudio)
+		-DMOD_RUBBERBAND=$(usex rubberband)
+		-DMOD_VIDSTAB=$(usex vidstab)
+		-DMOD_XINE=$(usex xine)
+		-DMOD_XML=$(usex xml)
+		-DMOD_SOX=OFF
+	)
+
+	# TODO: We currently have USE=fftw but both Qt and plus require it, removing flag for now.
+	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# Not done: java perl php ruby tcl
+	# Handled separately: lua
+	for i in python; do
+		# bug #806484 wrt capitalisation
+		use ${i} && mycmakeargs+=( -DSWIG_${i^^}=ON )
+	done
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use lua; then
+		# Only copy sources now to avoid unnecessary rebuilds
+		lua_copy_sources
+
+		lua_compile() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
+			./build || die
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use lua; then
+		lua_install() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			exeinto "$(lua_get_cmod_dir)"
+			doexe mlt.so
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_install
+
+		dodoc "${S}"/src/swig/lua/play.lua
+	fi
+
+	if use python; then
+		dodoc "${S}"/src/swig/python/play.py
+		python_optimize
+	fi
+
+	# Not done: java perl php ruby tcl
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 9b7c37ace5bc..8d4ceb855b6f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -7,6 +7,6 @@ DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e8
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
 EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
-EBUILD openexr-2.5.7.ebuild 2120 BLAKE2B c31fbd571fc53343e733419e90f84ad1648506acb8bd66d87bf239bbe1e22c588c0e0cd906ac43c27f82936e1c42c33e990619655961220e9e7219aaae0d00c1 SHA512 56db8658cde7e044056949d4a4704435ce4f8fea3519e3d1c823f92cd2579d29a2a6c6ca2e3393ced9a77628e36962b35303ef01be06dc491dbcd5eea5ed7b7b
+EBUILD openexr-2.5.7.ebuild 2119 BLAKE2B 2859ee7c6f2e23540602129626218829275be14f45104f4bc3e1c712303cc1d1d1c79e109712a49406a890024bbd346355901e5b0654e75d2fee96c05275437f SHA512 c62b232f81eab0d2ace75e0616f91a04ac926e4e0d83c49b1aa87b489860b5060bd0f61dcf8dfc0e4c5792fcc4a570d8bf720caf0657f9aa234a34cb9cbf34a4
 EBUILD openexr-3.0.5.ebuild 2147 BLAKE2B 4620226043268d73a1e290003849584d46604e42b04e18cf67ed918a41cb376b5951387a485cef227295ee4630d3e137a829081baf7c16ab53d701ec96bac88c SHA512 198c920c8457c94148a9880c7ab4c843bb3cedad6c60b6d42305962e251885ef2ea81c3ef0f584d42f663584832e448e65d6c971bfd2184fc27e77e10683d6dd
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index d9bb63b65698..241131a5bc3a 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 3ca1736e5524..ff4aabecd62c 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,9 +1,6 @@
 AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
 AUX portaudio-19.06.00-slibtool.patch 1722 BLAKE2B 938ad05ed0dc708d3617503273cb1fbd4ee1885ce7cd96025f115ec9073c831a9d500c4d43ece1ce0b2c38591faa8823ab24c9b54fb8523ab6d8db7349d26425 SHA512 7e472350e3bfdaad566ce68333bcacbf5d3353743d003916d7b8f0036cfe2bcee2cd619f05d955723f7ef58188ab5096620fafbb074f153e9b88cff1ed30ccd9
-DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST pa_stable_v190700_20210406.tgz 1462695 BLAKE2B 2e00cc0f7bfccf732bd3256b4379007fc1be57282309e36ed54396f6b30621d626c54ff136b259e6594a299bea7689b668df3885321612f7f653697b6895f810 SHA512 77393bf0628ad9c9d5fb1b0d9b1732d403e23513b1332553964bdafcc80878b2798141011d2615688150d753a594285e718cf716e990b2396f1d8dea7babd02d
-DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
 DIST portaudio-19.07.00-audacity.patch.bz2 2750 BLAKE2B 479cdc76615b60e454a6712c26bd4ac9d9e577f83d4c11a8f3e75c0a1c13ab0a443c91441a57da8cd2b9656649bd53ee0d2e23c23fd788ba7f95c67985b941c6 SHA512 d0e40b5df2b498ce3d9c56b0c7a896cd22ac3dd79b4ab3ebac151a82a824f7e74d62c3848c3ad0f3c499c9d1262b9c1f9cbfc2c5fdd0a5f20e9570357b7670b2
-EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
-EBUILD portaudio-19.07.00-r2.ebuild 1733 BLAKE2B b72a08dc0f2af54176d4a7924a01bc7c0ad2923dc1c11bcd271ebbf229721eaab67c8d9fde92e28ee3b8500bba37d0d61466521f725ee7ae63c58af03b256d6c SHA512 2185eddc45eb0e43b05ed668edc223d14699903b3a5fe93c6a85be169d3a74d507e0883c16aef154d758449e3e8697d1420630b0ae68169b6f85b702516e007a
+EBUILD portaudio-19.07.00-r2.ebuild 1732 BLAKE2B 58de4eb956bcc0ea3e6c0caf57ef8d5211c54be66433768b4888286cb00f0ed4791568b30cccd34a3edc597d50c5a0bf455f73e9fc309f6028d2d1514766b29f SHA512 8ed85452fe0c5b5b2394cc9d23e50bcca06ceafdde38405d961691a3c8002095564908e1c31feadb93c7fbca65dc3ce2b9e7ac646563b7c083bbbb21721e8408
 MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
deleted file mode 100644
index d19d45237994..000000000000
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
-HOMEPAGE="http://www.portaudio.com/"
-SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
-	https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> ${PN}-19.06.00-audacity-portmixer.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alsa +cxx debug doc jack oss static-libs"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.txt )
-
-PATCHES=(
-	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
-	"${FILESDIR}"/${PN}-19.06.00-AR.patch # bug #720966, trigger reconf
-	"${FILESDIR}"/${PN}-19.06.00-slibtool.patch
-)
-
-src_prepare() {
-	default
-
-	eautoconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with oss)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# workaround parallel build issue
-	emake lib/libportaudio.la
-	emake
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_install_all() {
-	default
-
-	use doc && dodoc -r doc/html
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
index ea0764f96597..33588f85e80d 100644
--- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index c0c6f98b532f..1061e7380f83 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,6 +2,5 @@ AUX 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch 1197 BLAKE2B
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r3.ebuild 1713 BLAKE2B 9c61a997c410dc4600384ec53b8995ea4782dd2169179c49073b0812953ef399a9ce360b8b6c4d626aae7351e80d50763abe76ea2c85eb9c482bbef04817ec6b SHA512 bb56a414bd06bcf3ee8a656e87e1e7171e2e7fd4bf3c690995d97e3aedd7a99418083f19a0ab2da8772ea6d985a888757e8ba393d02a1c9298c1eaabd7f06ad5
-EBUILD raptor-2.0.15-r4.ebuild 1881 BLAKE2B 664cab272ace46c9e3bbfd63599fda487fd80f30f5fed914a8e701a1ff69cd8eec3b5487c277b9aee03329b64fe710deec18698e424f0ef74c40c7c2a044836f SHA512 c3fb47567f101ef6a916739f18743fb9975499a2fec0f360888686d1036c1b9653ca247086bd74ad3c19e88313549ed080354bb80d6f8cc46ee276d22d838094
+EBUILD raptor-2.0.15-r4.ebuild 1880 BLAKE2B 9af0525af3655fc0ff8f22df2aab20b640e29c9b15fb1f8e56261170e8733ccd7d73335442ac1ed80324b09e46dafd7fa5119c4b6f8a49ce72e925a874f42f84 SHA512 b2e484378154b24f902231c5a6b6fae38a6bd8c464027facfede582d4c38b8baa6372c7a7dc485d879d4f52a83c3c712c63148d12f3d7e864af0527a1bb9677f
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r3.ebuild b/media-libs/raptor/raptor-2.0.15-r3.ebuild
deleted file mode 100644
index 1f3f7e84c669..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	unicode? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=(
-	"${FILESDIR}/${P}-heap-overflow.patch"
-	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
-	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf #552474
-	elibtoolize # Keep this for ~*-fbsd
-}
-
-src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
index 3917c369d040..da9e0385ac9f 100644
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest
index 0ac808b81e87..5044549476bc 100644
--- a/media-libs/rnnoise/Manifest
+++ b/media-libs/rnnoise/Manifest
@@ -1,3 +1,3 @@
 DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3
-EBUILD rnnoise-0.4.1_p20210122.ebuild 944 BLAKE2B 7ec07028a5477c3a3f478c544fb6ec140f00db254c7dbc178f73746d25f246f7227db0d36d0580d47e9943ebb966e5f95f4a7dda0cc976c59a9d2dae0418da60 SHA512 7106750dcab80d1121a94f75cf90c323a408cbb6cda3d42e96ca9cf9bdd1699943fec3d8454716bc0c6a50287d13df25365d0ecac4dc9ac71d0837dc35f0cf61
+EBUILD rnnoise-0.4.1_p20210122.ebuild 943 BLAKE2B 7bec7e530a6436403d81c4dc1de1d81a20abb44b5abf4cff7592f66ae99d3ab5d2ae7d39f7deced1dca2a817efade6c7b485f670140b985a4e35d375993ba1a2 SHA512 5b4f4aa4a3e4b8b6f85be2227f2e13daad9c299ea34126ac47a8a83b8afdb4b87fe9c16b4aa1911f005fbb445b2a45091b6ee42cfbc3e6c1796b05b4c3ef4308
 MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
index 0397c02dfbc5..0638152a8640 100644
--- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
+++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="doc"
 # NOTE: Documentation currently empty (version 0.4.1_p20210122)
 
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4753b0fe4c83..91fb59cd4a6a 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -4,5 +4,5 @@ DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6
 DIST shaderc-2021.0.tar.gz 220308 BLAKE2B 7178b99ce726f73e4eee2eb1b81b9575cf5a97a1d29bf0ed6a64ffde1095f91e14ae2c7f62d21f33bf2f7551e94b6d3e3c8fd149446899276a67d7df33a8e679 SHA512 cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c
 EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
 EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
-EBUILD shaderc-2021.0.ebuild 2155 BLAKE2B 0923a326dbb4ade19457254aebb3d245e48c0121675c93cd637e696e88313200bd4b863280fba80da6b3784b1ac06dc0107767399ed2fab162058247a5765418 SHA512 f2a5b2b1c698b42f1cc133dc5c1b3706a49aae36b757f6e8ae2297aece4719d4dc2e44caedaf5309692bcc0f75fc417b1e0c817e29fb657f1b8c5f3d5eac48e9
+EBUILD shaderc-2021.0.ebuild 2152 BLAKE2B a3d9bd6c67b5cc94e30ca130b6b74f565a24544e6678ee05ece37d1c2a958c8159e8d2585c07f1dd1e88e8419fe1b3b4f9faaee1375641a6e9aa4b51e61ff0de SHA512 39bf17ef5ad6c7830bfd92e508cbc0b852fa8cfea649540b2a0657ba6e9a84c75ae5a8b33ff6230527b21738bcbc7cb4ddc1bb1dbe525a8f0d12d84a758927b3
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2021.0.ebuild b/media-libs/shaderc/shaderc-2021.0.ebuild
index 0cd81867acc0..fda813225084 100644
--- a/media-libs/shaderc/shaderc-2021.0.ebuild
+++ b/media-libs/shaderc/shaderc-2021.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 84aee896b490..260cdc2547ad 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,16 +1,17 @@
-AUX smpeg-0.4.4-PIC.patch 9472 BLAKE2B 4b628b59cd0be9ce59194baae5b093fa3b371674ce837d244d4d48efaabf547cfa421c4918cecb8bea2bfd8f9191a8ac5929c391f66d47a38cfb5c3aee88e809 SHA512 39e86f3a227a350bbb2f039d30a44820a63abc6041db906dad7920aec59e822b9a0aa9f0a37b9a1cc055f33aca94bd7d206c7a4c85aecc97974d2c4a5a4463aa
-AUX smpeg-0.4.4-automake.patch 320 BLAKE2B 52477eed96ac6a165ffeffc376f7f9eb3c8bf5da6b55add93beba619e48884e826d61b53dafe6b53f195b1241f54b531edb3d81b406c73bec6b2b2c7d391f3f1 SHA512 ad3ecd69f03c9ea5e746036d56103adcab9d28be0ff40b038b26e6b2cac41d3d05dc0c5dcf09612eca5a805711405aeb33547bdd7f8128782a848dec67b5dea4
-AUX smpeg-0.4.4-config.patch 472 BLAKE2B 957c0baebe62775c030140cd1752188085b7f32b486d606e4d15cad10ca3599d191fee357416712b240f833f3fa456adcebc8fcee150b43b86912a5db39dbbe9 SHA512 f50aa1246d02d209d75d9597f6c5141d3778fadae334ce3e63bccc680caa7fcfacbb637e2754ea91a0e9163768ed8b3e7bf06338d91b91886253b9b63a1a60a2
-AUX smpeg-0.4.4-flags.patch 4576 BLAKE2B 0afc6b8e882dd33ef239dedef2b5e4c3b47af64b9c544f28b238ce8701928a284f3bf4a52fc20eeaa5c3cdd386641c931cf111320864fcbb8007e2fa26ad6697 SHA512 bee56aff1549e6e15d2bef432588682d1fee868fca77385f31e4b194853128201982bb0f678faae9c2b2f1e678919a5564c460af44d3c59ffd4b884bec3550b4
-AUX smpeg-0.4.4-format.patch 284 BLAKE2B 420b78b83d7324d3d50a76572a6eddf93c3a0feb4b3f3459045f7d08c801c0acc217f8194421898a6ac38489c308a7d88172a6a2cd09553505fc197b99137189 SHA512 8d276bb7b3070eb1a87f29f27faed7df23479e5d7938a1b8764f2f229956f64e2255a312410bc37d408ea7a46c4e606a730f59a95b96deb1643a7bbd896b121b
-AUX smpeg-0.4.4-gcc41.patch 1390 BLAKE2B 9f00ef0a80574f029410e22a2de11ec08483c20f3865f61e701080c2f9f64c81538d05dcc110757211aaceb2b51d1a8e6ac4010c3a18cb39e2e7451385127956 SHA512 8d905c0bb5c973979295f8814577c205aed20bf5ee32caa77be5bb66d6653c0a4327be0ef5ede1dd62966d02b68eab2ff06d0c52c98e7667cbd0a04bc243455e
-AUX smpeg-0.4.4-gcc6.patch 893 BLAKE2B 002426a2450a0410f339190fa5b960c5a4e8d9b8a1efc90b308d1314a366e1de18733c43f69c11f4021a1633a455753f2909358e73b86221d3fd5a96b06d857b SHA512 13e5bf10ed81357f06567aec319571f068f63ac4fc0606c8d21f7ed45966ec072182ad30409a0d4f9f5d82bd4f9c7414c793049ec641dcc2a8de270f31d41f78
+AUX smpeg-0.4.4-PIC.patch 9480 BLAKE2B d916b5a6f0c9ebb8806ea66e246687b33b2583441ae6885ab7f04d0cf3979fad87d7fc7171816e8f8bde66d34908ce1a91703910d9b2340ff312ea42323ec765 SHA512 b39d3a66de3dd98bd364b9bac624a0146481fe6d2d850eeaa991ec64b3ee3f18db944ee16ba7f315782f45e3d6dc27b927023f5d5a1a611ae4d15baefdd6f79d
+AUX smpeg-0.4.4-automake.patch 220 BLAKE2B eb3c2ffe20480c37bbf281b82c991f3d19c0ed8260a97c68b067b6c9d6e9acee2db7b24e21b22cb72835efc7cf83ca49168e012bfb8009735356be2370703ee0 SHA512 213f56dd0dacb52772e109f9cceb4e11491bbe4f277a0c72a85f85b4f0968474de080ca0d6dbdf28265dee0a0b08996ee47894167208a8c7455cbeb60e793bd4
+AUX smpeg-0.4.4-config.patch 476 BLAKE2B e676811a0e2dcfa44035eed04f300fff5fcad0075d3cce7f036db8746409e5b9b3065aba9d18400c72b5cd2912273b717d77d380bd63e9c2700ac940b21dbc09 SHA512 a100ef8904f519e940ca585869f4b5b3768e2b09a13d00b428906fd107a69ba74cdb7a5341a38f94af8a78a7e8315e59634d58ec7a72c9a9bdd0905c3205adfc
+AUX smpeg-0.4.4-flags.patch 4476 BLAKE2B 9f447fe75f7f310577c8b2d2e5e293a4c29506f6e74a67bffc9d0060a6ac7832bc22a1bc53b199f0216b9f477f010266abf29232ef744a85ec132878f17c3b86 SHA512 f02937de6a83cca826fb51ca853664ee35860d491bc58ddc9da1545cda2499eec3d5c96e1083cf7f23fe412ecb162f9c5b40b07aeb3cc14af5bb8c15285617b7
+AUX smpeg-0.4.4-format.patch 212 BLAKE2B 053b9461f634f4d3a989e22ea2f9f8258bede20c1c724c7d1f0c85436b9d31b841ffc75c76312dff1875d50e2f6e30caeec3a32cecf7316965676e6414e83cf4 SHA512 2918698768640715247f57e3ec4cfa13ed30f555cb86ceec42ed8910a40e79fb48cd0a736d5f5a39cdcf73f8aa546e398632e4916cd4cca9c4884e0d69664f7f
+AUX smpeg-0.4.4-gcc41.patch 1147 BLAKE2B 0fba7167fe330862f32120e5f519d1bd76bc6306419b7acad30eabd4924c0e4e994c60b41e8f1199c130fa6ff9b670e9eab39c3dc3a700cbfaaaae5e4e21a48a SHA512 0e50e88bc2fd8a9f869a43ec6ec4dac1bf61f931fb0c57c2830af5011d6ffe16fa6bb1ce13b7ace9572217b8d83e5f1359b61fda357290411f89ef6fa898adab
+AUX smpeg-0.4.4-gcc6.patch 821 BLAKE2B aa08bf63d1054cef1a68d88c5ea50109e664ade22810e8cdcad8b170c9d5ea13f1edfa9accf6793b8180e790071ab3e945c523f39854396a4bd21584f8657d57 SHA512 06163946f43674116894ad340a0c3ab75038c4e30ebed38474eda8fe4877f73751e142a41b80c68bf36ebd371e1471937f156c97a08acda8958c68194ca1541d
 AUX smpeg-0.4.4-gnu-stack.patch 955 BLAKE2B e307a7f9c652599f8331b09e35d8b0870d323b3241228cf147889cd489e11b5834d413ef78102593a08b5e6cc36e05dd882ba29d69c911a4794caa3022992eb7 SHA512 5f01ab8ed666deb8fd874c088af910e96b237aa9203e8a9aaf685c8ebe9bcabd9d3ec049fb29e2b55a3e981372de6ed490c06b7cc5d512999d75179ef68c4c94
 AUX smpeg-0.4.4-m4.patch 233 BLAKE2B eb185ba994b1477744072f785deb9144e1f82836afeeb468596fddc5d00db4fb225c08cd1ef01c207c13b9856e0f2cc2af812b11c0ce25923835b4e1f0a07357 SHA512 e5995f87fffbc8ff09953294568dc779f16a2a8d57b7266dd7787734dde4ad6b2c0d447917b508db095d83c50c933052b938e28fe160a9f04ba869d007b02c80
-AUX smpeg-0.4.4-malloc.patch 640 BLAKE2B 458ef7a27cba2ca6e9ddf14f296a7a08f639c40e99df667050201b49994fc31c244995d0474fa52d909111e8a02383d1a2d86f4daffc5baecc3cb92628540715 SHA512 56594c9cc516f8dae5cd487f259116bcbc0d770e33867324b477d6b342a27c671ce9c4c0c4305d5bdd0bb677c1d6e7ae4c20ced516bb3b84af59708dbcd61316
-AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9d8be23aed9ec81aded49b2806ccc7f84ff47d3157f5b3de8009d8ac9eabb3ad80b59d3cfd385bf4f3350a779002352d SHA512 7aa97924cbd6ccb599190599055ed715a72ea1595d7d2949e9babdeb3315b1bd8fa09e392c6d2d8b2eff96d72593333b8ab780f327c766345ee75b4220f8ee58
-AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
+AUX smpeg-0.4.4-malloc.patch 441 BLAKE2B 1c1f6d54964876bb62b80e86dc51c177e3848dca7ae72e421cc2fbb3947f775390bc99d9042d90990270b3399c48cb003133bd39fd7db7dba0dfdb6455064525 SHA512 6df4fa28c0888322127aeee13a8acea4245a8cb9264319bf201e98750c1953cd2cd6c0dbcfba78e13e225a45ae5d8510ba251e7cbf96026a0b99b0970ed9521a
+AUX smpeg-0.4.4-missing-init.patch 194 BLAKE2B 38082e5d0ebfeb085e1c54ebfa9fa706f0031d2b2f3c062dca2f4b00645b16b5f1993c6ba1494f6cce74abd63a568ef1e8732def1a81c97a54b6b93e8c275edf SHA512 96dc6b65dc4309fb199cf72598cdcd00b67b5d8152b1f65aded9b9496bbffaa23046161f7814752c488cecd81c2fea086c371a5fc5e35675aefb710f8fc7de21
+AUX smpeg-0.4.4-mmx.patch 252 BLAKE2B f5d0761bb38c021996eb19b534122d8fd9e697c5ee8005169494b82f0ae76cdb78b2476a7c6a8115c19fddf6b39d50ab5d01e9b671d31524b704665c00174c08 SHA512 c393fed067e09a9f22311e6b7b87851026f5416cad9c82d0f82428251de76ad0c15456c36d0895143fdc4ad47ad97ae210e7f83b19cf00f9a93147043896db67
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
 EBUILD smpeg-0.4.4-r10.ebuild 2079 BLAKE2B 93b766c2825d23e4624d1cd8e9c6af891bc0f59d8d007609e311a5e67871f97f790da9dda29010d469e03da60bb103622ba5bccc32b6a4bdf5df9fa48729076c SHA512 36dcdbbbb3c40c987320b7639b50d5ddcb120b5286bad751e2bb16f198530ee002739b9527b5fa9463de474028d824f4f2d1e046548e4dee65e6b7cbaf937c7f
+EBUILD smpeg-0.4.4-r11.ebuild 1705 BLAKE2B 3975d6a5b57cc25ebb469b5cabd5f44ffbebe228cb45a1d3925cbbd70b9391a6d8194eb71bf829b31ac6a1466ebe594dada3b6fc4709007f7311b214e68b2750 SHA512 4450f327c620ddcab539250b4bbd3416bd482f9afdb55a04e93e5e5fd5272c7efd4425da8c8bca09b8a714297963d1be749008a196d00983a1217b2415fc665a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
index 88663011713b..b7ef6609cf28 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
@@ -1,7 +1,7 @@
 Fix PIC issues in mmx routines
 
---- video/mmxflags_asm.S
-+++ video/mmxflags_asm.S
+--- a/video/mmxflags_asm.S
++++ b/video/mmxflags_asm.S
 @@ -1,11 +1,6 @@
  
  #if defined(i386) && defined(USE_MMX)
@@ -34,8 +34,8 @@ Fix PIC issues in mmx routines
  
  cpu_flags.L1: 
          ret
---- video/mmxidct_asm.S
-+++ video/mmxidct_asm.S
+--- a/video/mmxidct_asm.S
++++ b/video/mmxidct_asm.S
 @@ -31,11 +31,6 @@ preSC:  .short  16384,22725,21407,19266,
  x0005000200010001:
  	.long	0x00010001,0x00050002
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
index e541e1950113..3ad592e709ad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -53,6 +53,8 @@ AC_LIBTOOL_WIN32_DLL
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-config.patch b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
index 2175276c351f..1a4726bdbfad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-config.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
@@ -1,7 +1,7 @@
 Only dump -L/-rpath if libdir is non-standard
 
---- smpeg-config.in
-+++ smpeg-config.in
+--- a/smpeg-config.in
++++ b/smpeg-config.in
 @@ -45,11 +45,13 @@
        echo $includes -I@includedir@/smpeg `@SDL_CONFIG@ --cflags`
        ;;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
index d6b50f30d1bf..98099421769e 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -60,7 +60,7 @@ dnl The alpha architecture needs special
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-format.patch b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
index 8503f032286a..c82260a8967d 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-format.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
@@ -1,5 +1,5 @@
---- plaympeg.c.old	2014-09-04 08:55:10.646132150 +0200
-+++ plaympeg.c	2014-09-04 08:56:57.465210820 +0200
+--- a/plaympeg.c
++++ b/plaympeg.c
 @@ -262,7 +262,7 @@
        answer[i] = c;
      }
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
index 4a0eeb4530ae..d06b08ce8945 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
@@ -1,10 +1,5 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+--- smpeg/MPEGaudio.h
++++ smpeg/MPEGaudio.h
 @@ -151,12 +151,6 @@ private:
  /* The actual MPEG audio class */
  class MPEGaudio : public MPEGerror, public MPEGaudioaction {
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
index 4419bec4e2ee..f4c4a2b6d9cb 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
@@ -1,5 +1,5 @@
---- smpeg-0.4.4/audio/huffmantable.cpp.old	2016-09-21 17:28:34.497031221 -0400
-+++ smpeg-0.4.4/audio/huffmantable.cpp	2016-09-21 17:30:24.346141555 -0400
+--- smpeg-0.4.4/audio/huffmantable.cpp.old
++++ smpeg-0.4.4/audio/huffmantable.cpp
 @@ -550,11 +550,11 @@
  
  const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
index be54e58b4d23..c4939e36e939 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/glmovie.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie.c
 +++ smpeg-0.4.4/glmovie.c
 @@ -6,7 +6,6 @@
@@ -10,8 +8,6 @@ Index: smpeg-0.4.4/glmovie.c
  #include <string.h>
  #include <unistd.h>
  #include "glmovie.h"
-Index: smpeg-0.4.4/glmovie-tile.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie-tile.c
 +++ smpeg-0.4.4/glmovie-tile.c
 @@ -16,7 +16,7 @@
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
index 594c5546ebf7..62f260094440 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
@@ -1,5 +1,5 @@
---- MPEG_old.cpp	2007-01-07 23:24:45.000000000 +0100
-+++ MPEG.cpp	2007-01-07 23:25:11.000000000 +0100
+--- a/MPEG.cpp
++++ b/MPEG.cpp
 @@ -133,6 +133,7 @@
      video = NULL;
      system = NULL;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
index 71db62d055b4..fb0fdc89a476 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -148,6 +148,7 @@ if test x$enable_mmx = xyes; then
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
new file mode 100644
index 000000000000..e79dae9392a0
--- /dev/null
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
+	mirror://gentoo/${P}-gtkm4.patch.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_mmx opengl"
+
+RDEPEND="
+	media-libs/libsdl[opengl?,sound,video,${MULTILIB_USEDEP}]
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gnu-stack.patch
+	"${FILESDIR}"/${P}-m4.patch
+	"${FILESDIR}"/${P}-malloc.patch
+	"${FILESDIR}"/${P}-missing-init.patch
+	"${FILESDIR}"/${P}-mmx.patch
+	"${FILESDIR}"/${P}-PIC.patch
+	"${WORKDIR}"/${P}-gtkm4.patch
+)
+
+src_prepare() {
+	default
+
+	rm acinclude.m4 || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+multilib_src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lnsl -lsocket
+
+	local myeconfargs=(
+		--disable-gtk-player
+		--enable-debug # disabling this only passes extra optimizations
+		--without-x # does not actually use X, only causes a headers check
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable opengl opengl-player)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 24370ad8fc9a..0e1b7705c902 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,6 @@
-AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
+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-r3.ebuild 1351 BLAKE2B d9bbba882d9e765495ce653ed2cb37023f7abe1088c1dcd8e5b19f9b168de0dfb362f3a70062324058a076c7ac89d7008c086f117d305b2e46e1a51bd1199851 SHA512 7e57e72f115bc2d2f779b0dbf41d240577ffb0ec637a65245fc6cdb0b7ae2511252e052424a7bdf5f354f3a12a84b0fb16f313c6c4bddecd0fe826cbde873644
+EBUILD smpeg2-2.0.0-r4.ebuild 1131 BLAKE2B 703aaf59c86bd5140dda05b0b869b7e954198dcf0a160b43e73f0a0292188d4f3bafb0e921375857716c9eebd4ffe14218d77cd3d70444dffa6a163fe33ad332 SHA512 30364d9e187038465dce5b1b14b42e8cba82a4b09862865e6d76594bd625bf96398a000e006d8163940efad1e22eb4852b7e28bf11e76fc28db1caca5c0c6023
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
index 4094c61ba432..943b7ed552d9 100644
--- a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
@@ -2,8 +2,6 @@ gcc-6 is more strict WRT narrowing:
 error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing]
 
 https://bugs.gentoo.org/594912
-diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
-index 6bc8e86..5414ae3 100644
 --- a/audio/hufftable.cpp
 +++ b/audio/hufftable.cpp
 @@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
new file mode 100644
index 000000000000..fc1598ddc4aa
--- /dev/null
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P="smpeg-${PV}"
+
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx"
+
+DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-smpeg2-config.patch
+)
+
+src_prepare() {
+	default
+
+	# avoid file collision with media-libs/smpeg
+	sed -i -e '/plaympeg/d' Makefile.am || die
+
+	AT_M4DIR="${ESYSROOT}/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		--disable-sdltest
+		--enable-debug # disabling this only passes extra optimizations
+		$(use_enable cpu_flags_x86_mmx mmx)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 9cbdf6346521..bd7797172799 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,5 +1,5 @@
 AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
-EBUILD svt-av1-0.8.6.ebuild 1184 BLAKE2B f3ed01e5b0afd5a8651a70d39c379c821da594d8ee20c4eebe2a86a0dc9b6a5832f43bd4883be8af8a04f323b5d39677f9fc3eb711a4682ae9e9ae4528582229 SHA512 502d049655a4ba6b20e83bcb93cfdf5ddae75ff3ea18ae375d896eb62a825e4da3d2ca16e63d5e839293daadbde6d95c5a6a355f0224d01a9a5ab34761ee04f4
+EBUILD svt-av1-0.8.6.ebuild 1191 BLAKE2B 6b0b88fa8b2a1b1dd2510769e0858abe1c468426ee6710f9b42f1850295e86ad8804d95cfc02574adb525f143c61331cb30c60ac87d2aa406057883815dfa46c SHA512 be80ee02629c09ac967f5c371f928e10ba45e2153fab5979027cb3e3a7d99b0cd1f104c3c7814a45beb6f78f8129a99c9799e3377b9c98939b27ed47a60c0079
 EBUILD svt-av1-9999.ebuild 1090 BLAKE2B 130f31f96ac34ec20e237ff7134f09132b98795aaf1a4c94f3e4d12789e21599a8128fbbc12f94903cc9699de97cf769585f891917d32864a63fe2f0af873922 SHA512 0d40431b5fe9f11137499595ae6cf41d86ed05843ed121f01f499208db76814b83577a7ad7b18528a18698d098f098b0865d981b4b6614dea484c72b7c025da2
 MISC metadata.xml 560 BLAKE2B 461a02e90deb5b56feb939e7816accaa73f64b1771b6e3f257a550e12e1530c4523b3faea357ffaa5180dc5245f2e8e3cf62b0718823c7af342742e27b39fc65 SHA512 90b97116c665fa0a020825e00dcda7f14af528e68104867b3106068c2fe80a5f6a7e50d4d30591d45857386e05caec18eb8921bb2347e785ae2e8f6adbd81cdf
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index 10541f1ec51c..d2eed5042817 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 7d33de0f3b35..f0afc4557592 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,11 +1,8 @@
-AUX Allow-using-packaged-third_party.patch 15523 BLAKE2B c6513ada2654d0c100054c8dc8781e50026681bb315b85a7d7fd906fd5b2d9c29b55bb86d2b8bb9a8fd6eaeb5f97b7e0fcea2c0122f6faa5d048631c6f72c093 SHA512 e89bbde19f3f91037311e67c6effb8b222da769f3b01268f3e11e33a70959c792b1f46cb968363ef26acf70c0d4a45008a7b42444e97668ad7ce9594098f4333
 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_pre20210626-expose-set_allow_pipewire.patch 720 BLAKE2B 22c1aacf44dfc9b814c2d7f3dbe186ef9b86473a6cd967357d9a786cbef2734f356e04487a3225e04fcee2282fea61e679787280682dbd339bdc68fcfade8261 SHA512 d163a8c27231ddbf930259c8dd52c1bd304a228cdba1d76bcc77efacae097f1c743de5ab79066d0d4367a783c530fa62169a9d3e09ff5e4498d5d8f3790ed563
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
-EBUILD tg_owt-0_pre20210422.ebuild 2690 BLAKE2B 5142fed528e99f63e0ab0fa3f56cc33c0abe29975e7e5814fd40eeb5c9796a2c745b1b2e2a8569309411585907ba383cf3a581514d9dcd802768bf17bb3d4b61 SHA512 d7d4c545b6026f22c5d4bac967837bf630eca7b1c7aa432526571a5d3be470d71f7fde2e33e1eedc996388d8b36f4c037130fad732ccb5548202835b424e16e3
-EBUILD tg_owt-0_pre20210626.ebuild 2959 BLAKE2B 230b4d41768905517205f9095e0dbd06e255f68900daf9dc69c731fb792a95196afb52a449598410b756a2e479eb91131e45d602a37984fa4102f6466d7985a6 SHA512 678af2e504902f1aa0d8e7ae192d526d12dfffc652e74f9b5ef5ff1115e8a09ae30624edd37d05d117dc2788098ebaf1895728ae30a7b5f9206941f3dc216484
+EBUILD tg_owt-0_pre20210626.ebuild 2958 BLAKE2B 7a965b4ced599c5b06d9b09b8cfd49c9a9a622e9a9d3f2fd9ed4c6900022c9f5028534125b2dcbb036662a1dafcf80c2ec3c1dbda2adfdf67d2d59a476ec76e9 SHA512 69323de9376e97de06506ccc815e71babb04ae8c898f58859e5ee78b203394476b27a0274a55c93bdedb09908baae47a274933e23c6dda3c7be4843e15619dbb
 MISC metadata.xml 545 BLAKE2B 43a53f1c6c985be6e22cf2cd686a20637871b0351b4e5698d4a84abb78ad1e78080d32b295b87de7bc00a59bb49a749dcca562ddeeef8c54f315f26752c3f9d0 SHA512 24d6883333db2468df9529211f984c20a049d728794d43dc9608eb61f8154a7d15a92a4aba0bfcabc309c073947e3fb5fe22d258882c89adb5a1dcfb9889aecc
diff --git a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch b/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch
deleted file mode 100644
index 17025826a48a..000000000000
--- a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-From dbfceeea4280412358202d511e02e95a040d0297 Mon Sep 17 00:00:00 2001
-From: mid-kid <esteve.varela@gmail.com>
-Date: Sun, 7 Mar 2021 17:12:34 +0100
-Subject: [PATCH] Allow using packaged third_party
-
-This patch adds support for building tg_owt using system libraries
-instead of bundled third_party modules.
-
-Some libraries haven't been converted for the following reasons:
-- pffft: No stable ABI, patched, and not available in major distributions.
-- rnnoise: All of the remaining files are custom.
-- libsrtp: This project uses private APIs.
-- libyuv: No stable ABI, frequent breaking updates, and not available in major distributions.
-
-Note that: This still installs the system headers for the third_party
-modules (albeit in a convenient sub-directory). I haven't figured out a
-method to avoid this.
----
- CMakeLists.txt                                | 78 +++++++---------
- cmake/external.cmake                          | 91 +++++++++++++++++++
- cmake/libabsl.cmake                           |  2 +-
- cmake/libevent.cmake                          |  5 +-
- cmake/libopenh264.cmake                       | 17 +++-
- cmake/libpffft.cmake                          |  2 +-
- cmake/librnnoise.cmake                        |  2 +-
- cmake/libsrtp.cmake                           |  2 +-
- cmake/libusrsctp.cmake                        |  2 +-
- cmake/libvpx.cmake                            |  2 +-
- cmake/libwebrtcbuild.cmake                    |  4 +-
- cmake/libyuv.cmake                            |  2 +-
- cmake/tg_owtConfig.cmake                      |  5 +
- .../codecs/h264/h264_encoder_impl.cc          |  8 +-
- .../codecs/h264/h264_encoder_impl.h           |  2 +-
- src/rtc_base/task_queue_libevent.cc           |  2 +-
- 16 files changed, 166 insertions(+), 60 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f8e3bd..3462351 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,6 @@ include(cmake/librnnoise.cmake)
- include(cmake/libsrtp.cmake)
- include(cmake/libusrsctp.cmake)
- include(cmake/libvpx.cmake)
--include(cmake/libwebrtcbuild.cmake)
- include(cmake/libyuv.cmake)
- if (NOT WIN32 AND NOT APPLE)
-     include(cmake/libevent.cmake)
-@@ -80,41 +79,19 @@ init_target(tg_owt)
- 
- set_target_properties(tg_owt PROPERTIES SOVERSION 0 VERSION 0.0.0)
- 
-+target_link_libraries(tg_owt
-+PRIVATE
-+    tg_owt::libpffft
-+    tg_owt::librnnoise
-+    tg_owt::libsrtp
-+    tg_owt::libyuv
-+)
-+
- if (is_x86 OR is_x64)
-     target_link_libraries(tg_owt
--    PUBLIC
--        tg_owt::libwebrtcbuild
-     PRIVATE
-         tg_owt::tg_owt_avx2
-         tg_owt::tg_owt_sse2
--        tg_owt::libabsl
--        tg_owt::libopenh264
--        tg_owt::libpffft
--        tg_owt::librnnoise
--        tg_owt::libsrtp
--        tg_owt::libusrsctp
--        tg_owt::libvpx
--        tg_owt::libvpx_mmx
--        tg_owt::libvpx_sse2
--        tg_owt::libvpx_ssse3
--        tg_owt::libvpx_sse4
--        tg_owt::libvpx_avx
--        tg_owt::libvpx_avx2
--        tg_owt::libyuv
--    )
--else()
--    target_link_libraries(tg_owt
--    PUBLIC
--        tg_owt::libwebrtcbuild
--    PRIVATE
--        tg_owt::libabsl
--        tg_owt::libopenh264
--        tg_owt::libpffft
--        tg_owt::librnnoise
--        tg_owt::libsrtp
--        tg_owt::libusrsctp
--        tg_owt::libvpx
--        tg_owt::libyuv
-     )
- endif()
- 
-@@ -131,9 +108,6 @@ PRIVATE
-     ${libopenh264_yasm_objects}
- )
- 
--if (NOT WIN32 AND NOT APPLE)
--    target_link_libraries(tg_owt PRIVATE tg_owt::libevent)
--endif()
- if (APPLE)
-     target_link_libraries(tg_owt PUBLIC tg_owt::libsdkmacos)
- endif()
-@@ -141,6 +115,17 @@ endif()
- link_openssl(tg_owt)
- link_ffmpeg(tg_owt)
- link_opus(tg_owt)
-+link_libabsl(tg_owt)
-+link_libopenh264(tg_owt)
-+link_libusrsctp(tg_owt)
-+link_libvpx(tg_owt)
-+
-+if (NOT WIN32 AND NOT APPLE)
-+    link_libevent(tg_owt)
-+endif()
-+
-+include(cmake/libwebrtcbuild.cmake)
-+target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
- 
- function(add_sublibrary postfix)
-     add_library(tg_owt_${postfix} OBJECT)
-@@ -149,9 +134,8 @@ function(add_sublibrary postfix)
-     target_link_libraries(tg_owt_${postfix}
-     PUBLIC
-         tg_owt::libwebrtcbuild
--    PRIVATE
--        tg_owt::libabsl
-     )
-+    link_libabsl(tg_owt_${postfix})
-     target_include_directories(tg_owt_${postfix}
-     PUBLIC
-         $<BUILD_INTERFACE:${webrtc_loc}>
-@@ -2165,7 +2149,7 @@ else()
- endif()
- 
- set(platform_export)
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT APPLE AND NOT LIBEVENT_FOUND)
-     set(platform_export
-         libevent
-     )
-@@ -2198,14 +2182,9 @@ endif()
- 
- set(export_targets
-     ${tg_owt_export}
--    libabsl
--    libopenh264
-     libpffft
-     librnnoise
-     libsrtp
--    libusrsctp
--    libvpx
--    ${vpx_export}
-     libwebrtcbuild
-     libyuv
-     ${platform_export}
-@@ -2214,6 +2193,19 @@ if (TG_OWT_USE_PROTOBUF)
-     list(APPEND export_targets proto)
- endif()
- 
-+if (NOT absl_FOUND)
-+    list(APPEND export_targets libabsl)
-+endif()
-+if (NOT LIBOPENH264_FOUND)
-+    list(APPEND export_targets libopenh264)
-+endif()
-+if (NOT LIBUSRSCTP_FOUND)
-+    list(APPEND export_targets libusrsctp)
-+endif()
-+if (NOT LIBVPX_FOUND)
-+    list(APPEND export_targets libvpx ${vpx_export})
-+endif()
-+
- export(
-     TARGETS ${export_targets}
-     NAMESPACE tg_owt::
-@@ -2223,7 +2215,7 @@ export(
- configure_file(
-     "cmake/tg_owtConfig.cmake"
-     "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
--    COPYONLY
-+    @ONLY
- )
- 
- target_include_directories(tg_owt
-diff --git a/cmake/external.cmake b/cmake/external.cmake
-index 2132546..e09af96 100644
---- a/cmake/external.cmake
-+++ b/cmake/external.cmake
-@@ -105,3 +105,94 @@ function(link_libjpeg target_name)
-         )
-     endif()
- endfunction()
-+
-+# libabsl
-+# HINT: System abseil should be built with -DCMAKE_CXX_STANDARD=17
-+function(link_libabsl target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(absl)
-+        set(absl_FOUND ${absl_FOUND} PARENT_SCOPE)
-+        if (absl_FOUND)
-+            target_link_libraries(${target_name} INTERFACE absl::strings)
-+        endif()
-+    endif()
-+    if (NOT absl_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libabsl)
-+    endif()
-+endfunction()
-+
-+# libopenh264
-+function(link_libopenh264 target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBOPENH264 openh264)
-+        set(LIBOPENH264_FOUND ${LIBOPENH264_FOUND} PARENT_SCOPE)
-+        if (LIBOPENH264_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBOPENH264_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBOPENH264_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBOPENH264_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libopenh264)
-+        target_include_directories(${target_name} PRIVATE ${libopenh264_loc}/include)
-+    endif()
-+endfunction()
-+
-+# libusrsctp
-+function(link_libusrsctp target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBUSRSCTP usrsctp)
-+        set(LIBUSRSCTP_FOUND ${LIBUSRSCTP_FOUND} PARENT_SCOPE)
-+        if (LIBUSRSCTP_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBUSRSCTP_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBUSRSCTP_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBUSRSCTP_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libusrsctp)
-+    endif()
-+endfunction()
-+
-+# libvpx
-+function(link_libvpx target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBVPX vpx>=1.10.0)
-+        set(LIBVPX_FOUND ${LIBVPX_FOUND} PARENT_SCOPE)
-+        if (LIBVPX_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBVPX_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBVPX_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBVPX_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libvpx)
-+        if (is_x86 OR is_x64)
-+            target_link_libraries(${target_name}
-+            PRIVATE
-+                tg_owt::libvpx_mmx
-+                tg_owt::libvpx_sse2
-+                tg_owt::libvpx_ssse3
-+                tg_owt::libvpx_sse4
-+                tg_owt::libvpx_avx
-+                tg_owt::libvpx_avx2
-+            )
-+        endif()
-+    endif()
-+endfunction()
-+
-+# libevent
-+function(link_libevent target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBEVENT libevent)
-+        set(LIBEVENT_FOUND ${LIBEVENT_FOUND} PARENT_SCOPE)
-+        if (LIBEVENT_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBEVENT_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBEVENT_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBEVENT_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libevent)
-+    endif()
-+endfunction()
-diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
-index 0cc8920..a82732a 100644
---- a/cmake/libabsl.cmake
-+++ b/cmake/libabsl.cmake
-@@ -1,4 +1,4 @@
--add_library(libabsl OBJECT)
-+add_library(libabsl OBJECT EXCLUDE_FROM_ALL)
- init_target(libabsl)
- add_library(tg_owt::libabsl ALIAS libabsl)
- 
-diff --git a/cmake/libevent.cmake b/cmake/libevent.cmake
-index 0192896..31248fb 100644
---- a/cmake/libevent.cmake
-+++ b/cmake/libevent.cmake
-@@ -1,4 +1,4 @@
--add_library(libevent OBJECT)
-+add_library(libevent OBJECT EXCLUDE_FROM_ALL)
- init_target(libevent)
- add_library(tg_owt::libevent ALIAS libevent)
- 
-@@ -40,7 +40,8 @@ PRIVATE
- )
- 
- target_include_directories(libevent
-+PUBLIC
-+    $<BUILD_INTERFACE:${libevent_loc}>
- PRIVATE
-     ${webrtc_loc}
--    ${libevent_loc}
- )
-diff --git a/cmake/libopenh264.cmake b/cmake/libopenh264.cmake
-index 45ce7c9..7d4742e 100644
---- a/cmake/libopenh264.cmake
-+++ b/cmake/libopenh264.cmake
-@@ -1,4 +1,4 @@
--add_library(libopenh264 OBJECT)
-+add_library(libopenh264 OBJECT EXCLUDE_FROM_ALL)
- init_target(libopenh264)
- add_library(tg_owt::libopenh264 ALIAS libopenh264)
- 
-@@ -207,6 +207,21 @@ set(include_directories
- 
- target_include_directories(libopenh264 PRIVATE ${include_directories})
- 
-+# Create include-able wels/ directory for public use of the library
-+set(GEN_INC ${CMAKE_CURRENT_BINARY_DIR}/openh264_include)
-+add_custom_command(OUTPUT ${GEN_INC}/wels
-+COMMAND ${CMAKE_COMMAND} -E make_directory ${GEN_INC}/wels
-+COMMAND ${CMAKE_COMMAND} -E copy
-+    ${libopenh264_loc}/codec/api/svc/codec_api.h
-+    ${libopenh264_loc}/codec/api/svc/codec_app_def.h
-+    ${libopenh264_loc}/codec/api/svc/codec_def.h
-+    ${libopenh264_loc}/codec/api/svc/codec_ver.h
-+    ${GEN_INC}/wels
-+VERBATIM
-+)
-+target_sources(libopenh264 PRIVATE ${GEN_INC}/wels)
-+target_include_directories(libopenh264 PUBLIC $<BUILD_INTERFACE:${GEN_INC}>)
-+
- if (is_x86)
-     set(yasm_defines X86_32)
- else()
-diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
-index fa2e66f..02c3db4 100644
---- a/cmake/libpffft.cmake
-+++ b/cmake/libpffft.cmake
-@@ -1,4 +1,4 @@
--add_library(libpffft OBJECT)
-+add_library(libpffft OBJECT EXCLUDE_FROM_ALL)
- init_target(libpffft)
- add_library(tg_owt::libpffft ALIAS libpffft)
- 
-diff --git a/cmake/librnnoise.cmake b/cmake/librnnoise.cmake
-index 04f72ae..a3e682e 100644
---- a/cmake/librnnoise.cmake
-+++ b/cmake/librnnoise.cmake
-@@ -1,4 +1,4 @@
--add_library(librnnoise OBJECT)
-+add_library(librnnoise OBJECT EXCLUDE_FROM_ALL)
- init_target(librnnoise)
- add_library(tg_owt::librnnoise ALIAS librnnoise)
- 
-diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
-index ce4ff64..4754f13 100644
---- a/cmake/libsrtp.cmake
-+++ b/cmake/libsrtp.cmake
-@@ -1,4 +1,4 @@
--add_library(libsrtp OBJECT)
-+add_library(libsrtp OBJECT EXCLUDE_FROM_ALL)
- init_target(libsrtp)
- add_library(tg_owt::libsrtp ALIAS libsrtp)
- 
-diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index ad41d12..1dc5e5e 100644
---- a/cmake/libusrsctp.cmake
-+++ b/cmake/libusrsctp.cmake
-@@ -1,4 +1,4 @@
--add_library(libusrsctp OBJECT)
-+add_library(libusrsctp OBJECT EXCLUDE_FROM_ALL)
- init_target(libusrsctp)
- add_library(tg_owt::libusrsctp ALIAS libusrsctp)
- 
-diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
-index e6775c4..0fdfbac 100644
---- a/cmake/libvpx.cmake
-+++ b/cmake/libvpx.cmake
-@@ -1,4 +1,4 @@
--add_library(libvpx OBJECT)
-+add_library(libvpx OBJECT EXCLUDE_FROM_ALL)
- init_target(libvpx)
- add_library(tg_owt::libvpx ALIAS libvpx)
- 
-diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index 15f854e..8efd18d 100644
---- a/cmake/libwebrtcbuild.cmake
-+++ b/cmake/libwebrtcbuild.cmake
-@@ -3,9 +3,11 @@ add_library(tg_owt::libwebrtcbuild ALIAS libwebrtcbuild)
- 
- target_link_libraries(libwebrtcbuild
- INTERFACE
--    tg_owt::libabsl
-     tg_owt::libyuv
- )
-+if (NOT absl_FOUND)
-+    target_link_libraries(libwebrtcbuild INTERFACE tg_owt::libabsl)
-+endif()
- 
- target_compile_definitions(libwebrtcbuild
- INTERFACE
-diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
-index 881f9db..143e239 100644
---- a/cmake/libyuv.cmake
-+++ b/cmake/libyuv.cmake
-@@ -1,4 +1,4 @@
--add_library(libyuv OBJECT)
-+add_library(libyuv OBJECT EXCLUDE_FROM_ALL)
- init_target(libyuv)
- add_library(tg_owt::libyuv ALIAS libyuv)
- 
-diff --git a/cmake/tg_owtConfig.cmake b/cmake/tg_owtConfig.cmake
-index d0001ac..e9f4388 100644
---- a/cmake/tg_owtConfig.cmake
-+++ b/cmake/tg_owtConfig.cmake
-@@ -1 +1,6 @@
-+if (@absl_FOUND@)
-+    include(CMakeFindDependencyMacro)
-+    find_dependency(absl REQUIRED)
-+endif()
-+
- include("${CMAKE_CURRENT_LIST_DIR}/tg_owtTargets.cmake")
-diff --git a/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-index ccf0bc5..85ddc90 100644
---- a/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-+++ b/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-@@ -29,10 +29,10 @@
- #include "system_wrappers/include/metrics.h"
- #include "third_party/libyuv/include/libyuv/convert.h"
- #include "third_party/libyuv/include/libyuv/scale.h"
--#include "third_party/openh264/src/codec/api/svc/codec_api.h"
--#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
--#include "third_party/openh264/src/codec/api/svc/codec_def.h"
--#include "third_party/openh264/src/codec/api/svc/codec_ver.h"
-+#include <wels/codec_api.h>
-+#include <wels/codec_app_def.h>
-+#include <wels/codec_def.h>
-+#include <wels/codec_ver.h>
- 
- namespace webrtc {
- 
-diff --git a/src/modules/video_coding/codecs/h264/h264_encoder_impl.h b/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-index 4eb4ad3..98e4c2f 100644
---- a/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-+++ b/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-@@ -25,7 +25,7 @@
- #include "common_video/h264/h264_bitstream_parser.h"
- #include "modules/video_coding/codecs/h264/include/h264.h"
- #include "modules/video_coding/utility/quality_scaler.h"
--#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
-+#include <wels/codec_app_def.h>
- 
- class ISVCEncoder;
- 
-diff --git a/src/rtc_base/task_queue_libevent.cc b/src/rtc_base/task_queue_libevent.cc
-index 38660cd..04bc278 100644
---- a/src/rtc_base/task_queue_libevent.cc
-+++ b/src/rtc_base/task_queue_libevent.cc
-@@ -27,7 +27,7 @@
- #include "absl/strings/string_view.h"
- #include "api/task_queue/queued_task.h"
- #include "api/task_queue/task_queue_base.h"
--#include "base/third_party/libevent/event.h"
-+#include <event.h>
- #include "rtc_base/checks.h"
- #include "rtc_base/logging.h"
- #include "rtc_base/numerics/safe_conversions.h"
--- 
-2.26.3
-
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
deleted file mode 100644
index 3e8e01ec1d26..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-TG_OWT_COMMIT="18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf"
-LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-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"
-# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-# Bundled libs:
-# - 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-libs/libevent:=
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libvpx-1.10.0:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	net-libs/usrsctp
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}/src/third_party/libyuv" || die
-	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
-}
-
-src_prepare() {
-	# https://github.com/desktop-app/tg_owt/pull/55
-	eapply "${FILESDIR}/Allow-using-packaged-third_party.patch"
-
-	# We aren't installing any third_party headers
-	sed -i '/third_party\/libyuv/d' cmake/libyuv.cmake || die
-
-	# libvpx source files aren't included in the repository
-	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
-
-	# Remove screen_drawer files that cause linking errors
-	# (not used right now I don't think, maybe in a future version)
-	# https://github.com/desktop-app/tg_owt/issues/58
-	sed -i -e '/desktop_capture\/screen_drawer\.cc/d' \
-		-e '/desktop_capture\/screen_drawer_lock_posix\.cc/d' CMakeLists.txt || die
-
-	# HACK
-	# build/headers don't have ppc64 condition and force SSE2.
-	# sed it out and force C version on ppc64
-	# without this linking tdesktop will fail with undef reference to `webrtc::VectorDifference_SSE2_W32
-	if use ppc64; then
-		sed -i 's/VectorDifference_SSE2_W.*/VectorDifference_C;/g' src/modules/desktop_capture/differ_block.cc || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
-	# see https://bugs.gentoo.org/754012
-	append-cppflags '-DNDEBUG'
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Save about 15MB of useless headers
-	rm -r "${ED}/usr/include/tg_owt/third_party" || die
-}
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
index e07ba6135d99..6fd83cb3e00f 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa pulseaudio screencast +X"
 REQUIRED_USE="pulseaudio? ( alsa )"
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 12187b8da7c0..0787a6bb06a0 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,10 +1,4 @@
-DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
-DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b121586ebbd4e5375189f38715c52afc24b1bed04b1a4f05e17875b15fee3815492c357ad84316ea0abc359a97026418b490d SHA512 199e64c6d2ca34a604bb611fd231bfccf4608078a777369039597dadc209a23b7e7ea4ce71dc8b48826bd7874a7ea623d8af7dc47945914405fd99ce8bdf8de6
-DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
 DIST vulkan-layers-1.2.182.tar.gz 2791196 BLAKE2B e4c2a80708b7805425eb58bc360db8aa8ac9a671ef88a261f09887f59cbacb56e1375a868589864c30a9a812c91a7dc2c7d3ebc0eda5afc7cb99dfb7f70af2de SHA512 2c7541d18926507fb7f36193a5901e2d3f864749e5c9e456c32bc8e64bae58e661d01f8871c596a2b05e2e5bf86a4c80c6207d7cc942a51cafab81f052d91805
-EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
-EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-1.2.179.ebuild 1534 BLAKE2B 9c39b60f587bdf3e460380fe84f83488e8dff9d8ddca4419145bdd097b1775e2794c3a59d7f953dfe58bd30e9129621862d1c17549f5c7c1cd903dbdeab365fb SHA512 58108bb6284c69313b0b61c977dfacfa8ab52fc4ab476946c5d83faaeb02db9cfb1547ec5ae1f298742858892227deb8fd80cea07ec79665bdfa8437bcc4585b
-EBUILD vulkan-layers-1.2.182.ebuild 1539 BLAKE2B 61485f0d3de3e32298a4c374cda1c3ef4891ab68e58c507481d966710f7de278638f9b79b942312a7b7955c5dac203e672ad1dc8bb38b20121c323686d7e2170 SHA512 b2f1038ef6a2dae26a33c1f6286703a511bcdace6b0bc46749c3aa840b8c4b45013b5fe0b64313e1915d31ec76509ecf2abfb7d9b9578ce2dcba7d7915bf6162
+EBUILD vulkan-layers-1.2.182.ebuild 1533 BLAKE2B 992ec98e7c6d6787254dc7ceb65dbf23bc1eec6035fd1ea70800d578f3b1d16997249482492c9af907a88287571725f3445bdd3ad3f9f1d7ed83fdd6cb6d1518 SHA512 828502e90aac0998009a8def204569b7b87a341656e8dfa353f6447f695b1552023d357223a7ef9834338d435e5a4113347de238137a9de14d1239b763fe28c4
 EBUILD vulkan-layers-9999.ebuild 1505 BLAKE2B 94dfb5ab9dc9195f9501de3a0cdc7679ef517d2747623468c40f20bfb5beef6d41fa860534a46dff043123d6d7702add97cfc68a8603e01ffef0c032fddb910b SHA512 8cc5bcfb36ff94fac0df024b255861c7db2955f2c046ec0086d72bc092033b273b7c8d8bc2b234293e80337ab8cafa3fe34408d2f6f545a4da724fb3c9e317fe
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
deleted file mode 100644
index 63373bcbcb50..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 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_{7,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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-10.11.0.0_pre20201216:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.6:=[${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_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="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
deleted file mode 100644
index f286c75ea3e1..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 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_{7,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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-11.2.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2021.0_pre20210327:=[${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_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="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
deleted file mode 100644
index 3efb8bf7a9cd..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND=">=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.4.0:=[${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_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/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
index a71fc5a1b174..5766faaceda9 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 3e04757c5fc2..71e25240637c 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,11 +1,4 @@
-AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
-DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
-DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9ceb3c4d21d380061c9442cf6c3c07412e5568f7d4653591bf53128088b928d7db8050782e9a90441b66e12ba12135e5c242 SHA512 b9512c8b30b68799a6cc2905e7a5593a1c03214edae7a99fd7bc27b1761f17ef70a61f422fc318dd805ac089bbfc6cf18dfe69d1b8a91789a1774ee396058747
-DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efcc637b73fd75ad5ca349740d7f8d6944b2974828cb055a32150c4db4eb94f1b420d94852228d91e46bd8340229fa0ad30fd SHA512 06cf308caae1fd1992b279e8130b8f40bdcc7df44294c73e221d537950c689e552afeda4ae9406645b1d773693fa27c7727ab012daecbcff2793c4995c7f0db0
-EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
-EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
-EBUILD vulkan-loader-1.2.179.ebuild 1668 BLAKE2B c8ca59fef9eb31bbc22fce91dd6e9d9aea5fc603886d0aab00837c4d6d3b2d69322fa34782873ae6bf9f25494fb86f850c2a4b933c96a835d0b51104c1f8680a SHA512 52cd7b5ea6045a67d35413b02f31d73c53b8c5d69217f3fba5606094e49167d6feec3c5df50d422a82e10afbe2644a506f1c174cefd62b1144d4fcfae24cd3e2
-EBUILD vulkan-loader-1.2.182.ebuild 1673 BLAKE2B 3e45c82125a5395bd3e3f253070c49717f8f7b74b054a507da45e7422afd7a9611ef33dd9cb187b3c26081d639eea8f127a07896827c0dbbf7b15bd19eb6bcb5 SHA512 1a6cd99e950caa5987b9282d80c7323ca08c82fe2697c0c4ff8eec59b8a43586b7624e7f5f30a39f0c77b29fad9b531184ae0e4093e510459c1e2078f1364c53
+EBUILD vulkan-loader-1.2.182.ebuild 1667 BLAKE2B 75d53c06a5e6e626a5bcb760e39906067b90fca29e4ddf8fca11f9f3da90541a7d3fc08fd4975e6a2c106c8473e3ec2fc852b3f2e37bbfc3ba9c33dc9dda7bf3 SHA512 43696cc21f3b86c0a6877e55477f50bc28c98794679b164266a3bd77f16ec98f4db8f0085c4551a698287c384f847a0d2e3cecf2072bb38eead9d3ebf87efe64
 EBUILD vulkan-loader-9999.ebuild 1667 BLAKE2B d38d07a8a692f11f283dee022a248f654ec0e09c989ad4afbc89e44c45ad57ed98973010e41b3481eae25a78f9a30890ec99de644473dbdd39eb319730b90683 SHA512 7e48048f046935cec040935b5a4c28ce454fe91d4bced38e7932d3645319fc6f721e508b46d43609a6ce00e2e30009598bba3e76f9fb7ef24b3e9a5f43e85c66
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
deleted file mode 100644
index f06f5cffdad3..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Wed, 16 Dec 2020 23:38:00 -0500
-Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32"
-
-This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575.
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- loader/CMakeLists.txt | 3 ---
- loader/vulkan.pc.in   | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 659511855..f7b9916b2 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND)
-     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
-     endforeach()
--    if(WIN32)
--        set(LIB_SUFFIX "-1")
--    endif ()
-     configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
-diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index fc17cb1f3..f1588c412 100644
---- a/loader/vulkan.pc.in
-+++ b/loader/vulkan.pc.in
-@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: @CMAKE_PROJECT_NAME@
- Description: Vulkan Loader
- Version: @VK_API_VERSION@
--Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
-+Libs: -L${libdir} -lvulkan
- Libs.private: @PRIVATE_LIBS@
- Cflags: -I${includedir}
- 
--- 
-2.29.2
-
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
deleted file mode 100644
index ab38465a7c77..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${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="${PYTHON_DEPS}
-	~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}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-pkgconfig.patch" )
-
-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_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/vulkan-loader/vulkan-loader-1.2.170.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
deleted file mode 100644
index d86459f89855..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${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="${PYTHON_DEPS}
-	~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_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/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
deleted file mode 100644
index 5eecd8d168e1..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${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_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/vulkan-loader/vulkan-loader-1.2.182.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
index 10ff6e200be1..3261c3ef4893 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 065107d1c328..23e73f8be78e 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -4,6 +4,8 @@ AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdd
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
-EBUILD x265-3.4.ebuild 6370 BLAKE2B a3c2d028f58871382d8f2f8440bb8b3f4f88acd1573fbf319f7ffe786c4ff2ad007cde5e7ee5500ab297f3a69f3b3c1b0ae8f6f6dcbe599ef32ea5e000b6aa08 SHA512 2431ae3e83a6b35d709517f816b84a46c0141f411a9ff0435ce46073dbd280cbc92b2abeb27046d223ddc35c9f2a218982eafe78e1100387e60be2df6d64f47e
-EBUILD x265-9999.ebuild 6296 BLAKE2B f1f2dfb04c6667c37dfd2681570237364441f73cc7325680376d0aa805581ed722970ea8060b9e4fee7e34b21dabed95da2cdedd62f130cff2a646747a7298a6 SHA512 55b83ca021856960b849dd893ad34d3153acc93f389a2185492cea8377657027f9bd89b0ff12823763f4e34b4d19f6a51b2abe04dc15ab1d70793486262dfe1a
+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.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
+EBUILD x265-9999.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
 MISC metadata.xml 621 BLAKE2B afdaa9cc6deae7cb65a9b3242abe446201ec8f53f0c19b866f63c8f26011b7f6f0ea5561ff56b0ea2c4832bfc5f6d95c14a8526f4bfaca2d7ee7fa807dfa1db8 SHA512 9862b540eca3b214ad9ba049c9f6721fbb6559bb00b82208eec63e05e81b1805e498357e8689be1b4042c51202030e4c62125599b0736358c4fb7e566dba1809
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 76b1480fcc04..feab1dee8c84 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/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
new file mode 100644
index 000000000000..e956de4eab01
--- /dev/null
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -0,0 +1,218 @@
+# 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 3bd31a5364ce..e956de4eab01 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
 	S=${WORKDIR}/${P}/source
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	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/wiki/Home"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/195"
+SLOT="0/199"
 IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-08-07 00:16:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-07 00:16:33 +0100
commit	d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree	24cd2cf57f3932a24b96e4a0f6666489447e43ba /media-libs
parent	590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)