gentoo resync : 25.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
commit: 401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree: c2bef4719f6787550f0916aeaa8f4f403a9296af /media-libs
parent: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
71 files changed, 682 insertions, 794 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 35c99fc82639..ea83e446e261 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 001c58e87528..5b49bc1a6e05 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -12,5 +12,5 @@ DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716de
 DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
 DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
 EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b
-EBUILD assimp-5.2.2.ebuild 1172 BLAKE2B 598eb79aa6d39bbd8f55904949da69cb662811ac4f8012e57c3218c5f870bd671298b747241458484d7a30abb5491c55072e111b65d2b07140655a1290062170 SHA512 c684e1b2de17bd8769e01afae68a20bbd360e166ec58206783077229a3a8f9e57ba9c0d94cc010168a4452b6a1c19a07d40a15d5ad1cd0ea8df7443bae62357c
+EBUILD assimp-5.2.2.ebuild 1170 BLAKE2B 0e87a8edaa8e4fe0b9a33d1dd5c95f63e041eafec91d40af902bc39f5be2aff4c998c4cc43b33b585f3b4a6a302a95f6f288599c29979e60a6aeb04c2c283e24 SHA512 dcc9ee9470c6b63f87c20e1ae2f3d75f8cc9e8b28ef25838b2558f932f0e775b3521380a903f3cffbfc1a9137403d2ffec2ff2386c2d74c227a8789ffcf8166d
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
index d2628095f7fb..b6c80ce8206b 100644
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
 IUSE="samples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index d2794cd30eda..6e317a94c42a 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,13 +1,7 @@
 AUX build-avoid-meson-s-symbols_have_underscore_prefix.patch 1300 BLAKE2B edb4998f3722b0a4da1ea4b7ea77c05f4a7d7be5dcdf6b3898c4930cbdb015dc63217a9ec6af03eece5c4209f62b8f7a855231c7ebc97f94df93193c92fec0d7 SHA512 82c12e98016cb1247ded7a1d5bc913b92632a99dba5b35881c2d35badfdf652fed77a9d70904c224bb909d9209b28e75205718f8495e6f41651ef387a684d047
-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
 DIST dav1d-0.9.2.tar.bz2 833722 BLAKE2B b05edd1ca627906e57923be08f1ecd73469f9a8e2ed585edf81f1fe1ffc173f1e4ba52eb766b82d9ea1349a6c1cf2a5a48cc9a5bcf2debeb9d640d9842e266f4 SHA512 adfb822734a3fc8b73e9cf5f757bfd78fb144b00d95f1e942254c5caf1d801b05438d39571486ef37a94d2226166937fc56160a862e8d6d45c4f6d790531dc3f
-EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f6057e60ff607b295572fa147e1dbae99f15b748cab8eb5ce668e0b36353e56f2003c816d4c4a4f86db999f6d4 SHA512 1930d6aa4218d5940ed0483d27accae81f94ff9aa18a7f3a5ed4f50fe2e3b6042332faba9dfcbb61883e7489ef44807a9d85b5abd4e9d87bc41d70d6677af936
-EBUILD dav1d-0.8.2.ebuild 1385 BLAKE2B 07afc7effebb6a91327be86b1373ef96a7128c085b60d50a31872b9562393b907a462e4ca224a5bda8a321797f01d6e591aac1b1a441dbf74ad67d3fcc8c1f2e SHA512 fdb3117cdc548992547914ce24fb357eb114f5e4df3615ce481426fc88cfb833426da4308e9b00c83d1272aed071b13e6ccfc698d9325c2eb6e3bc45e98e8b17
-EBUILD dav1d-0.9.0.ebuild 1398 BLAKE2B ba98a74ef08264dd06f10530c26abd743520b80de2249227314b5353afdc2faf67844c4aa8ab4f8e8380f6e2f4a23b5f20f318c1e98bb14d54f91d5d9e38bfa1 SHA512 275f5ab2201789b78c7660779f45e302812fcc65dabd3066aced0dd7aad5aaafc4f95d995674991fbe03f1699f4946498c1460bc218938b81b9de5c7f3a435b7
-EBUILD dav1d-0.9.1.ebuild 1392 BLAKE2B 7b4b06cc144b9854810e59cab5960f21073447ff8ccdc27cd41ea30d59dce505e69639fc5064875352bd2830482a6383758c1ebdedd6cf81cd15691f4ed4690d SHA512 ed2af7eaec02836bc2f63e5ab919162b04b909293e3a335e6f4f084f9fb8a8c657a48e623d127d99874f99615f0e24cbf67723df96a73a591f16f8beef5c683f
+DIST dav1d-1.0.0.tar.bz2 960470 BLAKE2B 79355eeceea37df81e30be49dfea3dee9747fbbb82c0a08be3bbda525881112a8eb847afe3c3ccd0447fd6ee67ae540c5120ea00d4f891ac422850c611850c97 SHA512 86c6481e787fb6b8c28521e1efb1876d1be99f5fa5332cddab1111059b44775e05203cfc5c80a1b404ee00f35a1f5e1099e21b1f0851d77fb0101567e8b1a892
 EBUILD dav1d-0.9.2.ebuild 1392 BLAKE2B bfc3a4e00ab29a8492a714e27ae9577ef5fa0963dbf041eea653a007d4fee4121cfa9c74279084ec1e83292d25ca3ade0cb4bf17ae1bbf49aee781a2af1dd26e SHA512 50521384c4d9d2a54f011e64a0ec9605bcbae244da3408c71c77cfc21633816e1573f4035e8d38565ef624fd136519475ef95c69e7abc7fd6ea1e377e921173d
-EBUILD dav1d-9999.ebuild 1315 BLAKE2B d0b8b18c1305696de2db882c054ff3913f4d5733d8d267ce8eb25be5cfd2c2cc5d79c2ceafb5c2209203a72705dbc65488fcf34641f5cc961c8ffe3e25228794 SHA512 9bd5fd0589832f0738c76a55a1815bde76a99b30489d0c4598bf3b7c0f5557d7a05bf1d4596fa976729bd22e7fdef3f9d4012240a94d8178f282884162a89dd5
+EBUILD dav1d-1.0.0.ebuild 1308 BLAKE2B 414234818d0563e1c5fa2594dfe376dc54d840fda4155afca9e5c027e1b4f870dd71860583d659906c580eccd7dd38a2c3cb195297340e3152f639818ff5daa6 SHA512 090d9c778b76a71d75381945a46effe1154ddb908299ce3736662e70b738bc7caa84f61a8a44aa1c2302b3769435d7b5602264b8aeb8962d3ad67a14bd12cf5a
+EBUILD dav1d-9999.ebuild 1308 BLAKE2B 414234818d0563e1c5fa2594dfe376dc54d840fda4155afca9e5c027e1b4f870dd71860583d659906c580eccd7dd38a2c3cb195297340e3152f639818ff5daa6 SHA512 090d9c778b76a71d75381945a46effe1154ddb908299ce3736662e70b738bc7caa84f61a8a44aa1c2302b3769435d7b5602264b8aeb8962d3ad67a14bd12cf5a
 MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-0.8.0.ebuild b/media-libs/dav1d/dav1d-0.8.0.ebuild
deleted file mode 100644
index 68aff46355e3..000000000000
--- a/media-libs/dav1d/dav1d-0.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-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
-}
diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
deleted file mode 100644
index caaf9cb8784f..000000000000
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-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"
-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 test xxhash"
-RESTRICT="!test? ( test )"
-
-ASM_DEPEND=">=dev-lang/nasm-2.15.05"
-BDEPEND="asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)
-	xxhash? ( dev-libs/xxhash )
-	"
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
-
-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}
-		-D enable_tests=$(usex test true false)
-		-D xxhash_muxer=$(usex xxhash enabled disabled)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		meson_src_test
-	fi
-}
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
deleted file mode 100644
index f7ae3e3273bf..000000000000
--- a/media-libs/dav1d/dav1d-0.9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 test xxhash"
-RESTRICT="!test? ( test )"
-
-ASM_DEPEND=">=dev-lang/nasm-2.15.05"
-BDEPEND="asm? (
-		abi_x86_32? ( ${ASM_DEPEND} )
-		abi_x86_64? ( ${ASM_DEPEND} )
-	)
-	xxhash? ( dev-libs/xxhash )
-	"
-
-DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
-
-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}
-		-D enable_tests=$(usex test true false)
-		-D xxhash_muxer=$(usex xxhash enabled disabled)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		meson_src_test
-	fi
-}
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-1.0.0.ebuild
index f111b62346ef..bffdc9405eb9 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-1.0.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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
+inherit meson-multilib
 
 DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/5"
+# Check SONAME on version bumps!
+SLOT="0/6"
 IUSE="+8bit +10bit +asm test xxhash"
 RESTRICT="!test? ( test )"
 
@@ -27,11 +27,9 @@ BDEPEND="asm? (
 		abi_x86_32? ( ${ASM_DEPEND} )
 		abi_x86_64? ( ${ASM_DEPEND} )
 	)
-	xxhash? ( dev-libs/xxhash )
-	"
+	xxhash? ( dev-libs/xxhash )"
 
 DOCS=( README.md doc/PATENTS THANKS.md )
-PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
 
 multilib_src_configure() {
 	local -a bits=()
@@ -46,10 +44,10 @@ multilib_src_configure() {
 	fi
 
 	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D enable_asm=${enable_asm}
-		-D enable_tests=$(usex test true false)
-		-D xxhash_muxer=$(usex xxhash enabled disabled)
+		-Dbitdepths=$(IFS=,; echo "${bits[*]}")
+		-Denable_asm=${enable_asm}
+		$(meson_use test enable_tests)
+		$(meson_feature xxhash xxhash_muxer)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index c0d92e63904d..bffdc9405eb9 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-SCM=""
-if [[ "${PV}" == "9999" ]]; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+	inherit git-r3
 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
+inherit meson-multilib
 
 DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/5"
+# Check SONAME on version bumps!
+SLOT="0/6"
 IUSE="+8bit +10bit +asm test xxhash"
 RESTRICT="!test? ( test )"
 
@@ -27,8 +27,7 @@ BDEPEND="asm? (
 		abi_x86_32? ( ${ASM_DEPEND} )
 		abi_x86_64? ( ${ASM_DEPEND} )
 	)
-	xxhash? ( dev-libs/xxhash )
-	"
+	xxhash? ( dev-libs/xxhash )"
 
 DOCS=( README.md doc/PATENTS THANKS.md )
 
@@ -45,10 +44,10 @@ multilib_src_configure() {
 	fi
 
 	local emesonargs=(
-		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D enable_asm=${enable_asm}
-		-D enable_tests=$(usex test true false)
-		-D xxhash_muxer=$(usex xxhash enabled disabled)
+		-Dbitdepths=$(IFS=,; echo "${bits[*]}")
+		-Denable_asm=${enable_asm}
+		$(meson_use test enable_tests)
+		$(meson_feature xxhash xxhash_muxer)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 6962cb3eeb81..881d1ec007a3 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,12 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
+AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
 DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
+DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e
 EBUILD gmmlib-22.0.2.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
 EBUILD gmmlib-22.0.3-r1.ebuild 962 BLAKE2B b985222af586f9481786480fa90fcb9d53ca94526ee12a52050a557d04d92d7dccbf12738c857ea121e918f53a07b7cd438d26aa4bf83e03fa247b1d7c5c8d7f SHA512 dfbad61d40e0d7ef12b1802e360ea884cd0c6721873cc56f2ea4a201ccdcbcfaf9e3103472966ab04b0361ca8fff81b17c12fc455d63837afc9143e079028048
+EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
 EBUILD gmmlib-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
new file mode 100644
index 000000000000..d4acb515bf3d
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-22.1.1_custom_cflags.patch
@@ -0,0 +1,102 @@
+Prevent overriding of user-define CFLAGS, including -march flag.
+The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code.
+Note: code should detect CPU features at runtime and use sse4.1 paths only if supported by CPU.
+
+--- a/Source/GmmLib/CMakeLists.txt
++++ b/Source/GmmLib/CMakeLists.txt
+@@ -74,6 +74,10 @@
+     endif()
+ endif()
+ 
++if(NOT DEFINED OVERRIDE_COMPILER_FLAGS)
++    option(OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
++endif()
++
+ # begin -- label bldsys file prologue
+ # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE
+ #   and so must precede the inclusion below of bs_init.cmake .
+--- a/Source/GmmLib/Linux.cmake
++++ b/Source/GmmLib/Linux.cmake
+@@ -76,7 +76,10 @@
+     -Werror=format-security
+     -Werror=non-virtual-dtor
+     -Werror=return-type
++    )
+ 
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # General optimization options
+     -march=${GMMLIB_MARCH}
+     -mpopcnt
+@@ -85,19 +88,31 @@
+     -msse3
+     -mssse3
+     -msse4
+-    -msse4.1
+     -msse4.2
++    )
++endif()
++
++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
++    -msse4.1 # SSE4.1 compiler support is required to build
+     -mfpmath=sse
+     -finline-functions
+     -fno-short-enums
+     -Wa,--noexecstack
+     -fno-strict-aliasing
++    )
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # Common defines
+     -DUSE_MMX
+     -DUSE_SSE
+     -DUSE_SSE2
+     -DUSE_SSE3
+     -DUSE_SSSE3
++    )
++endif()
++
++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     # Other common flags
+     -fstack-protector
+     -fdata-sections
+@@ -105,11 +120,16 @@
+     -fmessage-length=0
+     -fvisibility=hidden
+     -fPIC
++    )
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
+     -g
+     # -m32 or -m64
+     -m${GMMLIB_ARCH}
+     )
+ endif()
++endif()
+ 
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ #Gcc only flags
+@@ -167,10 +187,12 @@
+ 
+ #set predefined compiler flags set
+ add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+ add_compile_options("$<$<CONFIG:Debug>:${GMMLIB_COMPILER_FLAGS_DEBUG}>")
+ add_compile_options("$<$<CONFIG:Release>:${GMMLIB_COMPILER_FLAGS_RELEASE}>")
+ add_compile_options("$<$<CONFIG:ReleaseInternal>:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>")
+ #cmake 3.3+, add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>")
++endif()
+ foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON})
+     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ endforeach()
+@@ -179,6 +201,8 @@
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ else()
++    if (OVERRIDE_COMPILER_FLAGS)
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}")
++    endif()
+ endif()
diff --git a/media-libs/gmmlib/gmmlib-22.1.1.ebuild b/media-libs/gmmlib/gmmlib-22.1.1.ebuild
new file mode 100644
index 000000000000..f0fd281de976
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.1"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 757b09d46b0e..fb406fb6cfa4 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,4 +1,6 @@
 AUX 1.10.6-fix-vector-check.patch 822 BLAKE2B 2a364853cd085fdfc1be38caf792667cc97b0834337abf441bd3fe3dc5e4ffb47496226c8bd93d9935b3725bc3a118b037404317c3d7b70566727e7f48283bd8 SHA512 e4e2d318369b9cc58ac39ece05dbfa919ea614a7d1984ab0ba5128400751843b290dbe921297f86dc54977244378acf76977351e831500d217acf67f1191a825
 DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
+DIST graphene-1.10.8.tar.gz 178557 BLAKE2B 57739a9cfc246a38968fa8352e0c05ce9e32e50753e7d18b8b25ecebd1ea294cfad26168437e290209011b51085fad7d8a47852b99510a7402f9a7dd00ac17f0 SHA512 526b0c17049459b687ceb7f6c26c9d982535e4048e74a0b6282704f9811d3c2e7e0e6cfef166aa953306b6cf77add6677bc600ae0c66cc052dc04c3d0345bd68
 EBUILD graphene-1.10.6-r1.ebuild 1588 BLAKE2B 32190e6be87361dc968579eb5c6ff548595b90dd4e8e93eba90ac5319062c629073435c7259cde7563ffb773a8714670217cbb61a6ab149a86d9cd5095fb9030 SHA512 1de7fdfc0af41108271e1aefa8407f7da31e064b10fc64563f560506ce2b8aef66dabaa99210044405c8d2a97827da532915bf30c8a61385437539c35bb9a27d
+EBUILD graphene-1.10.8.ebuild 1549 BLAKE2B d1d5e4869c9edd215f74919486fc560267671168bd41bc5cce0032ef901dce0e50601754608f278af0d12e5e0ccfc510edb391395383399bbce6244951f53398 SHA512 828a8ceeb4ece4d7868471f787d468233ff0e76a9bca0c40bd707c693ed91011977742e10555d62166edf6e871015313729d356b3e05e7faabb20764561c1a00
 MISC metadata.xml 334 BLAKE2B 72027568b7436430c57d6ca3e522368786b9219c7b139eeb3c1e04f398539c2f1e78d63c741546813e4118904777c202dc56be114cd27b7056ef289e14cfd074 SHA512 8300692156435706d82417194a9d8fcc6865560b67d723ea38d0a985f7b910f4f9c65cea31049e30fdf854ab2d4d4983197a006803b2b6fb6d28cc7e40746959
diff --git a/media-libs/graphene/graphene-1.10.8.ebuild b/media-libs/graphene/graphene-1.10.8.ebuild
new file mode 100644
index 000000000000..7e96a061cac6
--- /dev/null
+++ b/media-libs/graphene/graphene-1.10.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit xdg-utils meson-multilib python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+SRC_URI="https://github.com/ebassi/graphene/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+	local emesonargs=(
+		$(meson_native_use_bool doc gtk_doc)
+		-Dgobject_types=true
+		$(meson_native_use_feature introspection)
+		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use cpu_flags_arm_neon arm_neon)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 174a89f2293a..7e50c6a4ab83 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,11 +1,11 @@
 AUX harfbuzz-3.4.0-multiple_icu_defs.patch 777 BLAKE2B 78eabdcdfc8dc54c53113157b9a05d44f90fb75bea1c4333837519b3782a7cd8107919a98c19a19bd792be1192f02dee441a8ca1932ca2309248a278ec0f589e SHA512 0d993fa05fc2b783c50edfb6309448c12d45ed7a434a9b2a6a9930e87bca08bb380a2329b7807ce2b3519512f24e445cf55ac483b38cd00f50a523b21483ec31
 DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd10312533addc975a8871e549ad33f27f4a6da33cc190e3de17bd12c9716258bd0cb165c4c04da5057f92cc53e8673d4c10a SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
 DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
-DIST harfbuzz-4.0.0.tar.gz 29060304 BLAKE2B f49693d3329a44c7e614d27a491076dd00e725ac85f64bdaacc128a9573e459b84c247c1585adb2e3ce194bd7b3d01ce7c517ff2e27f04d23985b8655188a239 SHA512 d2b740f3392cd2763f467298dcd384e74fdbf592ebc066125451f886163c24bfe7993eb43f34d0ea3933ad16eee1c6f6ebe4e95f48cc13ac6650c64dd0b4ba8c
 DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
+DIST harfbuzz-4.1.0.tar.gz 29069953 BLAKE2B 6f8fd1889e36b20309609cc0e0d75c06167345273c78998a481c00e14fb219c3f61538c85e1956d14141b475bbe7cbffed5dfe26313e30ac970231c4e1eb50fb SHA512 e558b58233a13570693cc35764ce2824dea8b6388f47ced228f1317a9f08b6f482c1bc8d5c46352b74e84e709f569b164bea81647212c7e82467e19dfcb703a6
 EBUILD harfbuzz-3.2.0.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
 EBUILD harfbuzz-3.4.0-r1.ebuild 2635 BLAKE2B dbf9df9b91f507cdc1d04e672780691bf514eb3f6c7e257025c0b017a7d3d68e6bec0ef0f8bf4fdf3cabb18935ec1b2d762bc4dd34a68eb1f2184bbb0db4e7ac SHA512 f5eb7784845dd4f4f6982966fb7fad0ec27465261aec72f6f79eacc73e7a17fd6f45272db2749d89047eea89ce742eb183b63c8039f422443b249fd7b846fd5e
-EBUILD harfbuzz-4.0.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
 EBUILD harfbuzz-4.0.1.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+EBUILD harfbuzz-4.1.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
 EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
index 5513b4acfdb6..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index ebc940c74273..7a4a3f718cdf 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,5 +1,5 @@
 DIST kImageAnnotator-0.5.2.tar.gz 219008 BLAKE2B 6d2d53a55b013b8bb87291ffcb13126437291145a4d869c9e4b031711b8592ef465eb2b24b6473c09f9d02067d2404da15a4170a2f4e288cb1475d3c5d7d00be SHA512 42785f92954bf8fe28f5114d8ba7da9a1a22e79d1c0356642e34754218e580b147670a119d94e3b6b704deb1230a0d0f4d998541d5532783e4d569c66789af99
 DIST kImageAnnotator-0.5.3.tar.gz 219782 BLAKE2B 30f532a563761a665da1f926629ebd66888f820b305c98f2b0afc316d8a94010196e68221a4ffd4871ffbae19582eee685af56c763f873b38a7ac5219f4a3b3d SHA512 a858e0f8694f3f989c36db586e6e3a302ad2aa9bf32b26afa170c165327fa33b6f3053682420c788f701abdea4daa35158058edddf52af1566364976b2d2f9f7
 EBUILD kimageannotator-0.5.2.ebuild 844 BLAKE2B cfb64f43519cc673715dd7bac1d96f9e523223d12ba4165577e93f5239568612bd1d5f5639e682c558923b2a5259701d2d10dcbd9f87813da6ae8b8ae82f4ea8 SHA512 9378cf9e8a52a23f68cd743822d41a3c59673449971b8768c5455f95f3bda3ec0d9f47e1eef6100c2f99b8ce2621969e511eeae54224c4441eab9770dbe293a2
-EBUILD kimageannotator-0.5.3.ebuild 846 BLAKE2B 06e62015aa15f44349792f0dd9b3cbf3547de0c09aaa176c73a01b4de8f06c093a657c6ad20bae52fb8ecc0231a368f27669bedd5f8488fd20849ae43ae2dd57 SHA512 a430992cf16e743b7315969f78e1bbb1e7bcae8924ae53f04cf99b691f2a1c81b74f7e3f2b1e44b4364cc9dc4b83e1ea571d89240ea58fba7f517a03e50889a8
+EBUILD kimageannotator-0.5.3.ebuild 843 BLAKE2B ffe4a7b9328e2e14e2e336a50d9c2ff8a216c7dedcee21f970dcc84c8373a872393115c232d333b4f125b7c7ae581189d54dc0a6aaa37a8787cd22fe58020f02 SHA512 de46ae33b992cf10c772d3ecef8f8df34bb210b0aad92d0423467370a922e089c40c236ed342a94c6f87ef9e5ff9be0a92e6350887a715a543f6cc9fe132d222
 MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
index 1fc3ed36ab23..5212919e215b 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 6eca4ee865a1..f0b04216e01b 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,8 +1,7 @@
 AUX lib3ds-1.3.0-mesh.c.patch 682 BLAKE2B 01d62c09d0def3d7851550bb971b3695da887e396826bab935b3bf7fcb77e3ac3a0878daa4a0301c68edc03f7a7eb32919ecd918cf02e358ea727c276f11662e SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e
 AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca61e2852af3e3ab7b06c72a9aea148dd242b003ef0be7ca9eb2ee710347e86cfb22f0f1909a53651d2064ba8fcf1feb5 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394
-AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
-EBUILD lib3ds-1.3.0-r2.ebuild 636 BLAKE2B 256b9a06dacf3eb3a43328bc3f1721ab1c5a58bb767c4b32180831c42906542ea8657052ae1bd36a35a7746186c216f012db1427befea6d62991f214cd4d5748 SHA512 b1193d3d5dc13f0bccc66694b15cf73674582efbfbe1aa3a8afca83b9b688e3ce1f4e3cbfcf06d57e41b8b4cafda2680e758397afde0b438fe54cb8f0018e859
-EBUILD lib3ds-2.0.0_rc1-r1.ebuild 700 BLAKE2B c63dbd3f85d989c68103819b954dc1d4c2dfb00da876ba86a361150a5035f8361b25d89871811030cb90cd4b0ee900ae529b9738f50ce002df51c30aae124e07 SHA512 5588428b6a41a384c40473a396b060f9ea32c37d66e898f4d625916c3b74bc1ccc6edb8a88c1fa74a0bef2ca00a182b6ff1bb899a2830300ec5eeb799c63f209
+EBUILD lib3ds-1.3.0-r2.ebuild 750 BLAKE2B 80525700489d42266f54a88bc5d0d488d0a86b9fcb2889d1afbbc03db58357e690049c573fe857caf8121f03ce42ec5abd8b1854553bb58423f051eaa708d08a SHA512 9e2faad79da1d9ac56a3b3f581adef3ab35e31c1de0ca3956348a2bd380fd27a7af0836772be180551d90fe10719ff3d37087aa18b9780a798b53c241c021b29
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 748 BLAKE2B 66c470eff4826cb038c02de2f2ac3335b296549cdd19eae3f4b211029f0a5f669e9a4e4fbe0daaf66434d091875417f5488edd4314f73fd1049a6c7a16deffb8 SHA512 17724d8b10e38e39f7faada87c84c4b07dd9b10cba7176fd323cff09b7370763b1c34bb17f9b38231dfd81afd5ade93c3ff9f65c114dbf27a5a77f99743d4ecd
 MISC metadata.xml 597 BLAKE2B f36443b4e7047530b32949750b0b0c3e3b7163243c93e38390379bda9e5d08dd5c9da9f7a6df8c51c2c08b6206ffd15f31f63590f4a2e2b901ccad2268892298 SHA512 c91019a51555c0f26cacca2bf6f68e3d47d2d94b243127703f042219f71c60df91676f8c8a826797a003ed1d1435d64706ef19b8eb8c307102014c95f7e28dc3
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
deleted file mode 100644
index af9040883c10..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 26 20:49:44 2013 +0200
-
-    avoid autoreconf
-
-diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
-index 1b5b1fe..d2fda8a 100644
---- a/examples/3ds2obj/Makefile.in
-+++ b/examples/3ds2obj/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3ds2obj_SOURCES = 3ds2obj.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3ds2obj.vcproj
- all: all-am
- 
-diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
-index 4c915cc..f9f7bba 100644
---- a/examples/3dsdump/Makefile.in
-+++ b/examples/3dsdump/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3dsdump_SOURCES = 3dsdump.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3dsdump.vcproj
- all: all-am
- 
-diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
-index 76b7946..1c4b5b6 100644
---- a/examples/cube/Makefile.in
-+++ b/examples/cube/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src 
- cube_SOURCES = cube.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = cube.vcproj cube.tga 
- all: all-am
- 
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 22bfc9ac8e31..a2a9fdb2ba6c 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
 HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
@@ -18,6 +21,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-mesh.c.patch
 )
 
+src_prepare() {
+	default
+
+	# Always eautoreconf to renew libtool (e.g. Clang)
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index b7da0c9e8a8c..54f706d22467 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 MY_PV="20080909"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
 HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
+
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
@@ -18,9 +21,12 @@ BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-)
+src_prepare() {
+	default
+
+	# Always eautoreconf to renew libtool (e.g. Clang)
+	eautoreconf
+}
 
 src_configure() {
 	econf $(use_enable static-libs static)
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 57fe547dfff2..f96a4fc49a84 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,4 +1,6 @@
+AUX libavif-0.9.3-dav1d-1.0.0.patch 1428 BLAKE2B 51780bdeb22874bb23b8f461da1a98dad9b88f6e559ee9de60588a586c7009726d5b9a2db40d53ee660705110d1a61730b60c3caed876b359cdc1302e7a09c6e SHA512 905d5893d2a82717d0e488220a4e6e8dc46c0a3c04b2bea1feb5f618cddb9171e2c8d9fa72d6eabf898d0cc8abe41e3a9f510c7a1eef68c55cbe81b2736130e3
 DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
-EBUILD libavif-0.9.3-r1.ebuild 2715 BLAKE2B eb10e2a6db7b4ab3ac3a4708a4839a872061da25ae9b6a6dd95611d74e82c3caa3f4bfa7748b86d6ecc3878934ce031c2a13e733e7f0f5d7309b7d469c904fbc SHA512 9f981584d3751fd2e06704fad399e442f5f2091e0edd1b7a76b9ea0bf8b635444db8143d65d9de399d70e1645a0207cb53f9359a0abbac6fd75de9ca8323edc8
-EBUILD libavif-9999.ebuild 2663 BLAKE2B 1e85ce787146edafbaa33e9391a025e92761bdf86122438203479e72b2c90fae43e5d417981d7eb25c7212bea2035959cf293c81023617bf4319192f47e35710 SHA512 753acb2952f0f9e486d7776b058651c32242fc3045557fd207f1818dd1661546b5ec69c7275b5596acddb1e9625337a95bfb0664841cfe4b6799d52fe74ca54f
+EBUILD libavif-0.9.3-r2.ebuild 2717 BLAKE2B 88dbe135fd388326eb14beb585e57d241760679839433bf7ba8dc6d2a195e4b5e266a50177b77d061d8c3824fa422613bd65b48bed42017592b50ef1582dff23 SHA512 ad18814f39af7148b016341f7a0a88cb343050a2f4c39acb4202999e2753d3921b3651780f4ead68b581c6ffe657c1e69dacab0da37b3e536acbb7611421eb97
+EBUILD libavif-0.9.3-r3.ebuild 2754 BLAKE2B f6dfc1db692f53625edbe69ae667dd31f1cd99a12d45e5503ea4c226dcc7894e32781923714deef7200f327dc81e4a6672e5ef4145a97adbb808a9cf0142ae01 SHA512 2a232a397fede6063ef17a6886ff3543675d4bd24a5723dd7157f0a41785cab58262454ba421df4a8a5348119f6b3d7184c7623c943b4242a247cb5bab69dd6b
+EBUILD libavif-9999.ebuild 2665 BLAKE2B 24519aec2d7556da651acff664ec486fccbd88a0fa362ea6d06c34441a53cb2dc7d5cce56a3aa6d42a58aca59e385609aaba0fcfd82c74f3b46b19ef4e86f24d SHA512 e7d9bd31c3bbc293069809a6bb39664a474608b91a22a9fd6849e764e97e8d9a46ad40ed51c039a7a73fab4f1c38c73a4e0968d8bce89d642a40133a6272405c
 MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f
diff --git a/media-libs/libavif/files/libavif-0.9.3-dav1d-1.0.0.patch b/media-libs/libavif/files/libavif-0.9.3-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..a4358e7223cd
--- /dev/null
+++ b/media-libs/libavif/files/libavif-0.9.3-dav1d-1.0.0.patch
@@ -0,0 +1,32 @@
+https://github.com/AOMediaCodec/libavif/commit/74a21444397e323a088fa1f274c9fc942ee7a870.patch
+https://bugs.gentoo.org/834262
+
+From: Jamaika1 <lukaszcz18@wp.pl>
+Date: Wed, 26 Jan 2022 18:24:31 +0100
+Subject: [PATCH] Change function in SVT-AV1 0.9.0 (#807)
+
+--- a/src/codec_svt.c
++++ b/src/codec_svt.c
+@@ -92,7 +92,9 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+         }
+         svt_config->encoder_color_format = color_format;
+         svt_config->encoder_bit_depth = (uint8_t)image->depth;
++#if !SVT_AV1_CHECK_VERSION(0, 9, 0)
+         svt_config->is_16bit_pipeline = image->depth > 8;
++#endif
+ 
+         // Follow comment in svt header: set if input is HDR10 BT2020 using SMPTE ST2084.
+         svt_config->high_dynamic_range_input = (image->depth == 10 && image->colorPrimaries == AVIF_COLOR_PRIMARIES_BT2020 &&
+@@ -104,8 +106,12 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+         svt_config->logical_processors = encoder->maxThreads;
+         svt_config->enable_adaptive_quantization = AVIF_FALSE;
+         // disable 2-pass
++#if SVT_AV1_CHECK_VERSION(0, 9, 0)
++        svt_config->rc_stats_buffer = (SvtAv1FixedBuf) { NULL, 0 };
++#else
+         svt_config->rc_firstpass_stats_out = AVIF_FALSE;
+         svt_config->rc_twopass_stats_in = (SvtAv1FixedBuf) { NULL, 0 };
++#endif
+ 
+         if (alpha) {
+             svt_config->min_qp_allowed = AVIF_CLAMP(encoder->minQuantizerAlpha, 0, 63);
diff --git a/media-libs/libavif/libavif-0.9.3-r1.ebuild b/media-libs/libavif/libavif-0.9.3-r2.ebuild
index fcbde27db210..672f5e5b162d 100644
--- a/media-libs/libavif/libavif-0.9.3-r1.ebuild
+++ b/media-libs/libavif/libavif-0.9.3-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/jpeg[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
-	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e[capi] )
 	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
diff --git a/media-libs/libavif/libavif-0.9.3-r3.ebuild b/media-libs/libavif/libavif-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..6af014af342c
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.3-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dav1d-1.0.0.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 3b89a6e53244..80ef7d093431 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/jpeg[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
-	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e[capi] )
 	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index c35e4d1cb99d..b81a61c8b14c 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,6 +1,6 @@
 AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e57384751ee9b708960a2a471e32c68cd5acf71fa2c649a00c9dcc4f7c5322e1a51b0ceadd793dfaf0eba0a3840485e38e2 SHA512 49f2c44f8b565edb65b625f4ca21f4751ad3b2ec8c636d0cfda4f65db75cc0382d0e06ebd7dbaeb71fc7bd478b9ffa126e13786809f8e882af0478f6a814caaf
 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 742 BLAKE2B bc67df4970091743232dacd42215b137c13a1a4f9fca12f9e86dbd286d1df28bc6c12b04a3a57eb61872377c89b12024b904b29fa6f53c75354877e3656b5848 SHA512 d45dcf9259225696ea7660a88ff0a5e57309ed84e1b3044d3f7f150acc153ccb1cd521efa76885d37193aa5c4ed9705d0c5f3d66b51bdd8ead50c5b3fd65d6de
+EBUILD libhdhomerun-20190621.ebuild 745 BLAKE2B dffbd0a7e7cbe2363a9242071794569f9e51e3854ece9e9e57a3341fc52653df77ed5ae7571388d793011635cba1b2f1048f60f4696e051e28c562d3c7745d08 SHA512 da8ceb6856f7556426fc5c06f0d333e3ee53a760df16cb8230aba473da3071249445c627cce6132b7cfbafa9d5531c8405d5c19a861a900e0186cac7b4411d50
+EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B ee23b5ec0c65b491eda72a65808ee23a108cd24ea3b25bdb46ec7d7f9eaa618c97e27301e1983aac2dd3bd035d329c9689d98e15995c913b85ebad8bc4a0f838 SHA512 93c477f9779a003ee55494489418c08232738a4c0813a554182257d6255f63e9429c5b9c5b99aa1e81460faed25adc4530e6d23ed8eedf8441d49285f9c298d8
 MISC metadata.xml 412 BLAKE2B 269dbfe3205f3520151a0d18ab4d2b8a1854a85020e0246471c4ed78dc7f57d7dab5dee7fe0fe12de2505410da9221183267ef9f09c6f903b5b1e4feaf98b4aa SHA512 093a35b0ee0dfbb9c841467bdb78c52699c712e94e8965c076a98be872f9a7cf545b75ccb8d44048488c6ec6d169c8c3ecf198c7e551f427bb9e0940102c054e
diff --git a/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild b/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
index 0d2414e0360f..5bf973e3ce9b 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,12 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	default
-	#Remove forced optimization from Makefile
+	# Remove forced optimization from Makefile
 	sed -i 's:-O2::' Makefile || die "Was the Makefile changed?"
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) STRIP=:
+	emake CC="$(tc-getCC)" STRIP=:
 }
 
 src_install() {
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
index ba9622a7b375..a1673c6f3123 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,12 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	default
-	#Remove forced optimization from Makefile
+	# Remove forced optimization from Makefile
 	sed -i 's:-O2::' Makefile || die "Was the Makefile changed?"
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) STRIP=:
+	emake CC="$(tc-getCC)" STRIP=:
 }
 
 src_install() {
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
new file mode 100644
index 000000000000..11db8a9376a7
--- /dev/null
+++ b/media-libs/libjxl/Manifest
@@ -0,0 +1,4 @@
+DIST libjxl-0.7.0_pre20220311.tar.gz 17322724 BLAKE2B a3cf970ea3db67e0890e94a5c74ea66610d4fed608fa3d079e6934a1d5f2bdc3ef4264c1df85e4b4efcd22c060087c712009f6c4a6b69a41f6e96ff3674c6de5 SHA512 f3e46ddea462b31de6df3c615c3cd628adc58c7ff41588e2ec4cc8929590c9272603a66ed4620b9ba550d85b3d1a6da3f51b1c4f8650ef8901347fea8af5d474
+EBUILD libjxl-0.7.0_pre20220311.ebuild 2041 BLAKE2B df2cf000bbea7746788b04b88c2826dd10d1be2998f856746a15dc0af44e7436f506be0fc8f5254e52df79e3e5e578cefc1c6837bbc59f5f7f7847c4b36607a2 SHA512 7f65d81181a3c4472c8f9686ba504ffa524f1ee331b6999e5ac2c1f3ed9be33a9e70b9e295bf4496cfff9f8557991cf962829aae25b20e3d479019f7fc314bfc
+EBUILD libjxl-9999.ebuild 2007 BLAKE2B 48c2a0965cc8db89d318f616fc93128e9e998f5535a74dcf3235a423adc04408972edee79a046b868958d39e83a2c2508e345d5af544cd709994058810546496 SHA512 5ab1f5b1dd76cef89ba945e5c3ed6b8837c87f137fedb60be68591dfe904b1cadeae27806dfd409151d698146ae52a0014b676ccc9489c8e281fa18de308025c
+MISC metadata.xml 736 BLAKE2B b4c49d06f4888fe4714add21be0d8c8b0e5961a03307165384692a07dda463cc0438dfe5a99a878555e5d15f0ad56fe4c66c4dd39c90603147150b4d9d3e088b SHA512 feb1910542331c2c3e8769e172081d59c20bfa082cb353787cb718dbd562114210e5da38c5dd87bba9f11ee5756f426c71b835cd178c5d2bd7bfd661cbeb10ce
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
new file mode 100644
index 000000000000..1afe0678670a
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib xdg
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+
+SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/3f8e77fcfabe8ca8ddee6be4e662de525667c570 -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples openexr"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	media-libs/lcms:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	openexr? ( media-libs/openexr:= )
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/libjxl-libjxl-3f8e77f"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTING=OFF
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_EXAMPLES=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi; then
+		if use examples; then
+			dobin "${BUILD_DIR}/jxlinfo"
+		fi
+
+		insinto /usr/share/mime/packages
+		doins -r "${S}"/plugins/mime/image-jxl.xml
+	fi
+
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
new file mode 100644
index 000000000000..1a2abbce5e64
--- /dev/null
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib git-r3 xdg
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+
+EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
+EGIT_SUBMODULES=(third_party/skcms)
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples gdk-pixbuf gimp210 openexr"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	gdk-pixbuf? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+	)
+	gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
+	openexr? ( media-libs/openexr:= )
+"
+
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTING=OFF
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=ON
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DJPEGXL_ENABLE_PLUGINS=ON
+			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_EXAMPLES=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DJPEGXL_ENABLE_PLUGINS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if use examples && multilib_is_native_abi; then
+		dobin "${BUILD_DIR}/jxlinfo"
+	fi
+}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
new file mode 100644
index 000000000000..fe211671a1a3
--- /dev/null
+++ b/media-libs/libjxl/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>dnovomesky@gmail.com</email>
+    <name>Daniel Novomesky</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    JPEG XL reference implementation
+    (encoder and decoder), called libjxl.
+    Contains command line utilities: cjxl, djxl, jxlinfo.
+  </longdescription>
+  <use>
+    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
+    <flag name="gimp210">Enable plugin for GIMP 2.10.x series</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 335a17932435..6191af33c12f 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,3 +1,3 @@
 DIST libnsbmp-0.1.6-src.tar.gz 463348 BLAKE2B 546f26c0ebbc2b93aec3002424c8e6d5aaeaa06f06fea13712675dd33c71b431c7f6d296c55a4d091cba7c9d5eaf053960b3d7e16e24b0832e42f8f4881f675d SHA512 7e987a47d56216b2e2a795c1233c63599d474fdd9dd495f31bc9a902f92072078ae79e73323da457fd5059908a65f44bacc6c8742f92f0950af80196a4bb4732
-EBUILD libnsbmp-0.1.6-r1.ebuild 671 BLAKE2B 67aaff0a0ce75ffed874d55e04628a4089fa52b2112934d0c12c6d2c24d8a07fb6b536bb1e3714b3a2ff3b32dac37d810cf820b57d482bb852034ef9bbc27758 SHA512 04581680b467727da6e98489cb6de621bb1dc37e6ab4a65aff3729ba913e66b27db686e13b65600f5479cb719bda8b6580da3690c8ad580b7147fe539b76b1f7
+EBUILD libnsbmp-0.1.6-r1.ebuild 678 BLAKE2B 5c0d3750c097df934069a6f527642c155d1fb2455ee13048dc790022a022e7d317d70b5ef2fbd037ed4c8762e5cf2b525585b4cc7e6b71fb7711cd242a2c01e5 SHA512 07f2c8853686e7a98d52be847d1fbe033b81227be784a5f1b89befbdf9882808df024063508be38c27950e2524c0012dd85a7fc9d637c3dfd58411240d64faff
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
index 614724d0ed80..d700b8c37951 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index 14c0e6f0aef9..65bb3b8d1bf4 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,3 +1,3 @@
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.6-r1.ebuild 638 BLAKE2B 5a53c7d56fcbd356a7cf3e2ebb6a7b479c8933f8acbec8b3c476aaf189209cc257cfacf2797a9dc39a3bb940b8459a493105269a1be60f820494faddd48f9dad SHA512 f5738557c6feafde51bad69be572ed4350433f135b3d2ef960ed21d3d066913437ce8dd3227db882f6f50459c94f7fd970b051d060a4cba537043eca4c339a92
+EBUILD libnspsl-0.1.6-r1.ebuild 645 BLAKE2B a64401e77b97a57898bbf099fe3856dbe500924426979f56c7884386509e390ba9fbf1156e8e83b766d27f9ca88d5444e0a222704d0cf49c395fad995c45e6de SHA512 b634fa2b8eafbd5e04d0c6ee15de95c56635d49bf6343ccea218c15ac411e8fc86b1989db834b4aa57be7f1de4232943058f6c51a8b2e02509fa76d061bd2d2e
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index 8e2c5470d5f6..c4edd4e29e29 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 4c648d6a3076..07a5fe97924a 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,4 +1,4 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
 DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
-EBUILD librosprite-0.1.3-r2.ebuild 678 BLAKE2B 46c8e21c2390513de0185f182570f736b537737d7edf53e8da94be749168a8ef0d42ef3c25d20714507860b6f618709fdb7b924fa05a8d43c96e19a56aadc62f SHA512 57688200699a8b8322f06a98ab7c9185566875f817d02b1e1d3a0b0795b8647c0835068bfd7ea54f7066319456d6b11eb278f40782f3bfbfd0a58ac2fa92f52e
+EBUILD librosprite-0.1.3-r2.ebuild 685 BLAKE2B 63f90f64f3a6a0dbae9a643c4aaa1abd1579a81bf9999bf1ac65f46b8e2e28908261c8ec6c52e734c8bd66221906150a2ec86ae7bea9711f30a51b67d175c492 SHA512 c2789653279023d0aaeae4dbd8ee74be62c571543b22fb6a539cb2c64f91c4d560247139fc41d1ec581b0c22d3b8e20906d5f71814a7f65d0c7f40c153e60a10
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
index 5cfed1d13e16..b293a83495f6 100644
--- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index f434b7164ad2..5873666f4064 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-EBUILD libsvgtiny-0.1.7-r2.ebuild 816 BLAKE2B 770c5170dc191f3dd69ce9a0e3a5138bf5522add4830f13e1d6c354b4c8f34d375f4e929701dc0f272b2c9a5e6a0239a75320d7895e1d8de172b84cdd66b92e6 SHA512 a2f495ba5b69dcbd4a7f8118e77b515163918c8e53f6f489caf3d896d10f74bf95546a973b2e01c7055d0ee0d688101ad9dfdfbcc0f3efc6d5cb8119d668fdb3
+EBUILD libsvgtiny-0.1.7-r2.ebuild 823 BLAKE2B 7e0ef22d212d29ee7dd1e71aaab4e2f58569e692db22a85391ce2ce8ebc3b76b6c261d9917a03854254d1b84ac2631e38996aa144721671b5f8565ca5fa1b071 SHA512 79bdf8051146f6be4321b0c9e0b41cdca1b3e2ed27af03ab0f1999b33143d4ae7313aeaa06f74c57abe4373710d63f2be60c414b4ef132da2e4721cfaa2f2852
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
index 7efd6b88007a..6b87c0131b1a 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 401ad410d58e..29b4d05dd600 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,5 @@
 DIST libtgvoip-2.4.4_p20211129.tar.gz 1098091 BLAKE2B 20d90b10a2f87d05fdb5bf723e87045262cfa06a33a0543a9a73e946f44d7017e04faeba19a13d20ab531c4c335d234c172d0cc93819b35477a990cfcb87dab3 SHA512 e55f05e5459e453d33ff717b928324c39adcb0ab2e6aaefa0f2deb35ca76c956ffc723d7138964a3bc10a7bc1e3bc66360ff8c55a080eb3210f5728542ec7d96
 DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77
 EBUILD libtgvoip-2.4.4_p20211129.ebuild 1472 BLAKE2B 80eb1ec657b03564c40074717ddcfffadaeeef7764a97ee9f2720b50d0d787eda07e028256d6e762ac0343825d178a256f2fcb3adcf8c53cd3f7f83a9e577462 SHA512 562654cb431b6fbc2baa7d152acdd6fb0c9767117ecfada99c9b860544cf40444729365ffa4d268596ab63365af0d778dd8a9a1a11ed97892451bfa33cccba78
-EBUILD libtgvoip-2.4.4_p20220117.ebuild 1587 BLAKE2B 220ab20273a76fab9c3ec704491303318382d20684a115edbc53e2fc2d621b9fa744397f3efe37acc72af667ed859e20dc8401a0383544d5a779818357de370b SHA512 3ac4c177d968b192a4a3a33edf5a034eef0fba3b8a21d8d9e165872367eb4bcc2c4ce497c0e92d6b9e61bb852008076b733d989c0f9f6674e88a36a0d972168c
+EBUILD libtgvoip-2.4.4_p20220117.ebuild 1586 BLAKE2B 8ee4658a921472e3c5aaa2cccb6059620041f71ee4c8fb24fdcf3759b4f5bbb99c481c888f71300cc82a49ec4037fec96065f89c36145b57b293a9818cba3e54 SHA512 0159bdc29c80a8c2ac03783bded57b68908d814a1113431db85b62042b1c00b433f9bce4359201ec43a79205e27463c84b33a33254cf3aa3b25a9343fe1039e2
 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild
index d07f0de37ad7..dacbfd4d1e58 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest
index 9e51fb46f5b4..3489ec9eec62 100644
--- a/media-libs/libvmaf/Manifest
+++ b/media-libs/libvmaf/Manifest
@@ -1,3 +1,3 @@
 DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b
-EBUILD libvmaf-2.3.0.ebuild 794 BLAKE2B db1e216260c6df43833d887d50916be281da55b2d8c7a4db95383814554dd72d50e34fec9bc047db8674f26b8ef69da2f1d5d483942476ccf55185ed113c5b18 SHA512 2af72ad89522043161115ad9d1090ea5b940f4b6594ae37fddcca58afcc961ff74d05e652e5b68009ea2439854e46aa30e20ff8c83b9ed87ccaf146f85c422ed
+EBUILD libvmaf-2.3.0.ebuild 956 BLAKE2B 4eae65d0a60b7a35814eb0450fed6810f6df17a300932947fd05cde7f90d90da354526536be3497e0b3932f384f73bc0fe4ce442eb8a47aa11df779e3fd5c916 SHA512 77e59212f4604f39ced71a8cf2f6b50ba1da0fa0732388de8236dfadef08aad672f39520a23d07fe8227fee23f57fbe46f601bbaf36fc9ac1c8f784625204dd4
 MISC metadata.xml 721 BLAKE2B f0e82d2d6d28429c7d0a91b111b82d3a5df006f27142f063d527b73ee37ed82892c4d85db473098ca32ce09d3a1eca926666830e2d1ea3256f0598b413861c7d SHA512 741de386e11eeb0cde13121604fa60d1c22012f9e4c351ec423ce3d7cbc164006441e37d49682c0f1ab64dffc6b949a39ed971755b2f026bb6964e53acc6ff95
diff --git a/media-libs/libvmaf/libvmaf-2.3.0.ebuild b/media-libs/libvmaf/libvmaf-2.3.0.ebuild
index 33cbad2ec7f4..7adc3c9eca99 100644
--- a/media-libs/libvmaf/libvmaf-2.3.0.ebuild
+++ b/media-libs/libvmaf/libvmaf-2.3.0.ebuild
@@ -21,6 +21,9 @@ fi
 LICENSE="BSD-2-with-patent"
 SLOT="0"
 
+# upstream issue, see bug #835471
+RESTRICT="test"
+
 BDEPEND="
 	dev-lang/nasm
 "
@@ -34,6 +37,11 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_install() {
+	meson_src_install
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 43c41b909da2..66b00e61ed26 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -9,5 +9,5 @@ AUX openctm-1.0.3-no-strip.patch 1272 BLAKE2B 78cceaee9185d913d06bcd4ca61447c45c
 AUX openctm-1.0.3-respect-flags.patch 2937 BLAKE2B 4c3d1c435bccfc67bef5a1647384d22c6084b816ff28bab2be762f73d85994e962b4898bd45431b5cc45cfc316c01e8f3c90f17c559fa46967c7c09a0571ab05 SHA512 0f0a1baa97345586bfb82645ecd9afe3dafde8dae97d92e3e8fbd14576838be3ab1cae141e1c634118404bdae022bf4517350d680aabc4ddcbb4d1cbee2269b0
 AUX openctm-1.0.3-use-system-libs.patch 3295 BLAKE2B c837257274c0cb923d04ac0cbba66dd9a693b24370721758678fc6e52da3b07e477cb8317f4fb08f12e8d6c89b06b6cfb3ab93c9e6d26a88b654a562072fe16e SHA512 c68c3c42bdede730083d3e27dbe9a8d33f5e5907e4d7c541408a1f18ed56e889be28c4d8c4c61a01d1ed4111d27b04127bbd1295ddcb66b2a0f71fcd9d72a386
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-EBUILD openctm-1.0.3-r1.ebuild 1450 BLAKE2B 0529d1ad697ee4f9c696a35434ec552864c2615d80ac83af206931d5f310dd2263a3053fcfb3b270ea59b380814ddf9a8014b4c2fffee47d5a00dfeffcea0c8b SHA512 57641cca20d7dafd9e223e0bdad3dda73ab8662a1e49ad7795b16b4d7e21891de5b584da937881babb6d5d1cc63a52d91c8e0f542f5a40210f22412dd16ef68e
+EBUILD openctm-1.0.3-r1.ebuild 1452 BLAKE2B 22226587fcc8d997bbccc9450a8b07c5974a3eb83ed5b57c850cd1bbfff667dc58c40c8a5e84ffa8308d86d4cc2338572395f853fa39399067b135c6661d4753 SHA512 7e6e30daa5cf77725f6ff04bbf5fa6bc67da617866c15ce5f0ac387014e38779a2d3167b1b9bb64805ccbf01492ab1218489fc6ace9d7bf7fdd4eaaaa3fa8746
 MISC metadata.xml 734 BLAKE2B 2c96c03a13a6910c0d1c9f7d06539de23bdfe9060ff2a63275c3b881c8962ecd428fc0aaef4111a1e95a50774aad8400060b471bf7a320829aefcebc170a2128 SHA512 79fda93315919c710acd2ba38d128536f2f5917a8eabf36933665e7ee6fdba5fb52349d5b448aa7a891580e705d17fe226292a5af4e3a1dfe8bdd9f40693e06f
diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
index c77dbee3d4ba..aa222819106b 100644
--- a/media-libs/openctm/openctm-1.0.3-r1.ebuild
+++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,7 +51,7 @@ src_prepare() {
 src_compile() {
 	tc-export PKG_CONFIG
 
-	emake CC=$(tc-getCC) CXX="$(tc-getCXX)" -f Makefile.linux
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f Makefile.linux
 }
 
 src_install() {
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index f1ace9efd18c..7c00b2e35c6f 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,7 +1,5 @@
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLAKE2B 92379258f2664778baee50b99573dbeae50e723a3f7605c62a4ca3aedd9129fbd1991d7b3ead1b8a3689e71f783ded0b15dca5e6d910345c95a6f28898bbdda3 SHA512 85e4b58cc66072fad2b6dbaa65a955a8931f73eb3664f05ddca65157ac5c2547225910c36b4507d88179a95cfb35a5aff6edadd3c0fa5418529c80ae6d736f44
-DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
 DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
-EBUILD openh264-2.1.1_p20190331.ebuild 3457 BLAKE2B 15c0bb913b6e97f0f3a3a08f44dff9bea5026d8f936573c0aeab2c7e077691d7be2123e2cf599c4de9a61c08323fa1cb9f2af2d1a2834c97b6f3e1e06dd3614a SHA512 4505c55440f1ae4f28aeee38e6ec02ab7537f1e997a45964a36eb3474a27c8306e590dd38b345834d6feba7dc73b2e6df8b82d8af78c32d99985b1eaa3109e80
 EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.1.1_p20190331.ebuild b/media-libs/openh264/openh264-2.1.1_p20190331.ebuild
deleted file mode 100644
index 0121478cca8a..000000000000
--- a/media-libs/openh264/openh264-2.1.1_p20190331.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal
-
-MOZVER=39
-MY_COMMIT="e3935759360861812d33cbd3b713e25f1de1ecb5"
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="https://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV/_p*/}.tar.gz -> ${P/_p*/}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/${MY_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_COMMIT}.tar.gz"
-LICENSE="BSD"
-SLOT="0/6" # subslot = openh264 soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
-
-RESTRICT="bindist test"
-
-BDEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
-
-S="${WORKDIR}/${PN}-${PV/_p*/}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's/ | generate-version//g' Makefile || die
-	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
-		codec/common/inc/version_gen.h
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-${MY_COMMIT} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
-		ARCH="$(tc-arch)" \
-		$@
-}
-
-multilib_src_compile() {
-	local myopts="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
-	esac
-
-	if use arm; then
-		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
-	fi
-
-	emakecmd ${myopts}
-	use plugin && emakecmd ${myopts} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
-		insinto "${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index d754c6c46c07..7f9f53469d25 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,13 +1,7 @@
-AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 AUX opensubdiv-3.4.4-add-CUDA11-compatibility.patch 846 BLAKE2B df2611fff3112eff3784306c6811285f895593a954f394d1a41b68a9e44ee2dbaae85b5f4e009dfe8edf95e8806f1c085728130c6e003a63a3918ab1ac586012 SHA512 c5c8e6705c0f93d632b45d3e645ff9b207b102ff7534f51b32400e4d60ab07afb18bf6b99a066d1556c55ba275ad586969d4460a6bd3d9c8a2bef83152183deb
 AUX opensubdiv-3.4.4-tbb-2021.patch 2147 BLAKE2B 69f1ae0689fa1a21cb6ee74ff1d6cedd474b38881e49cb5887fbc87bd2b2cc71c7b37b782751390426cc200ea2d488909555c698321c50b5891922f6eb7320ae SHA512 adc5a5126bd1433f4edf8239d7cf48755c8c84d688c8d877121598e8833a352cd3da399577dae918c66b1c4f7d90dd5af08e42d86e66a7532e3b0ae2ad59d048
-DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
-EBUILD opensubdiv-3.4.3-r1.ebuild 2376 BLAKE2B 5662809ca588bfe52c46fcf0c2b3e9c3feb56006a1e1ec1f277add0ef0e485a2c863ff1bc137cc8a05b3395b1a221666966d0c27117db4d962f9c7be57a62852 SHA512 fa96d571158a3f7d6bf3fea1e1478e9a0a5e10a6561235d6e58030fd4bac1007df7348fa589ed1aa8e97a09ca3f9f5263fcb04ca12fbb8d438dbe70962170bbe
-EBUILD opensubdiv-3.4.4-r1.ebuild 2252 BLAKE2B 11dc22f927daaee1bbcb8b5014efc303a37228439387ed9c89fc49509b13d46e484b1850c5b46cb95666064dfcae2455feda07295ec0bb04270b170d36f59c0f SHA512 a9a117a29ddb15de9bbfe079e6d5ddc97e3fc81804f0e52052880294f30216f2b1fb6dd7719a62f632ec113f73fe3449d2e997697a4b97391d6cc7f1f54dffc9
-EBUILD opensubdiv-3.4.4-r2.ebuild 2415 BLAKE2B 8191238ef11d63e09fa843dcad76c553d4fb2676f09dec82ad75af8d6075383c47040370259f4174b79d3596763e2c00716397a475a9533bc61e9c202fc1c5b8 SHA512 637f09451ce22279e1b7e1d6f8778dc6937680615e0ee8b500e8cbbda4f836f03f17922f16906bcb92688263725cf5fce70cf6d8a9dac7c9177e22ee6f853118
-EBUILD opensubdiv-3.4.4-r3.ebuild 2447 BLAKE2B c88e2b9c27020a74ceebd76adbc891c3536494039a6d6e1fe2eb4a38023a1de15a68e28c9f445ffb5dfc2890ec563e4abf970b51246e03ae65d6c611a5b2b84d SHA512 47ff663a6ffa2f210844bfa6646c0a404527c20c0e29472808c17647fbac2e5badbbaa6b35be759add2a32928df5ee8ae5665c8c55ac459b2b8f5d118e72a9cc
+EBUILD opensubdiv-3.4.4-r3.ebuild 2446 BLAKE2B 0f613fee98fa1feae0aa4dd2f29aec068147ff966d543af80cc5a6cad8c841d2a824f2d70708fdff7b27b3371085fdbcf95eced07d0069386ca521e65684079a SHA512 23e04d277443f66a777acebfed7ca85ac4da09ae53ef5a3eca1eaf4116209227550542a4175cc27c085ca5334033ea5980456ad66ac8c40f53f29b07451773e6
 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
deleted file mode 100644
index 9fe81c4ee199..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7b9157bca7138480c387ef3d5b69b6cf1eb498e5 Mon Sep 17 00:00:00 2001
-From: "Daniel M. Weeks" <dan@danweeks.net>
-Date: Fri, 15 Dec 2017 22:45:55 -0500
-Subject: [PATCH] CUDA 9 compatible gpu-architecture default
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f3cd9d4..fa438b46 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -513,8 +513,10 @@ if(CUDA_FOUND)
-         if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
-             if (CUDA_VERSION_MAJOR LESS 6)
-                 set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
--            else()
-+            elseif (CUDA_VERSION_MAJOR LESS 9)
-                 set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
-+            else()
-+                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
-             endif()
-         endif()
-     endif()
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
deleted file mode 100644
index 5455ba98e317..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From dc9d14c97fc22ad5b00c9ffb0f83931e42cf2eb0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 2 Aug 2019 19:27:17 +0200
-Subject: [PATCH] documentation/CMakeLists.txt: force python2
-
-The patch forces to use Python-2.x to build the documentation
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- documentation/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
-index 32b12a3..a93414e 100644
---- a/documentation/CMakeLists.txt
-+++ b/documentation/CMakeLists.txt
-@@ -54,10 +54,10 @@ else()
- 
- endif()
- 
--find_package(PythonInterp 2.6)
-+find_package(Python2 COMPONENTS Interpreter)
- 
- # ReST - HTML documentation
--if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
-+if (DOCUTILS_FOUND AND Python2_Interpreter_FOUND)
- 
-     set(HTML_FILES
-          search.html
-@@ -198,7 +198,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
-             OUTPUT
-                 "${rstfile}"
-             COMMAND
--                "${PYTHON_EXECUTABLE}"
-+                "${Python2_EXECUTABLE}"
-             ARGS
-                 "${CMAKE_CURRENT_SOURCE_DIR}/processTutorials.py"
-                 "${infile}"
-@@ -291,7 +291,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
-     # build search index and insert navigation tab
-     add_custom_target(search_index
-         COMMAND
--            "${PYTHON_EXECUTABLE}"
-+            "${Python2_EXECUTABLE}"
-             "${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py"
-             "${CMAKE_CURRENT_BINARY_DIR}"
-             "${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt"
--- 
-2.22.0
-
-
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
deleted file mode 100644
index f9593b44235b..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-utils-r1 toolchain-funcs
-
-MY_PV="$(ver_rs "1-3" '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-# Modfied Apache-2.0 license, where section 6 has been replaced.
-# See for example CMakeLists.txt for details.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/glew:=
-	media-libs/glfw:=
-	x11-libs/libXinerama
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )
-"
-DEPEND="
-	${RDEPEND}
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/docutils
-	)
-	cuda? ( <sys-devel/gcc-9[cxx] )
-"
-
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
-	"${FILESDIR}/${PN}-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch"
-	"${FILESDIR}/${P}-install-tutorials-into-bin.patch"
-)
-
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if use cuda; then
-		[[ $(gcc-major-version) -gt 8 ]] && \
-		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
-		die "Need gcc version earlier than 9"
-	fi
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	# GLTESTS are disabled as portage is unable to open a display during test phase
-	local mycmakeargs=(
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DNO_CLEW=ON
-		-DNO_CUDA=$(usex !cuda)
-		-DNO_DOC=$(usex !doc)
-		-DNO_EXAMPLES=$(usex !examples)
-		-DNO_GLTESTS=ON
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_REGRESSION=$(usex !test)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_TESTS=$(usex !test)
-		-DNO_TUTORIALS=$(usex !tutorials)
-	)
-
-	# fails with building cuda kernels when using multiple jobs
-	export MAKEOPTS="-j1"
-	cmake_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
deleted file mode 100644
index fe2e02e7075d..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake toolchain-funcs
-
-MY_PV="$(ver_rs "1-3" '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-# Modfied Apache-2.0 license, where section 6 has been replaced.
-# See for example CMakeLists.txt for details.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="cuda examples opencl openmp ptex tbb test tutorials"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/glew:=
-	media-libs/glfw:=
-	x11-libs/libXinerama
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )
-"
-DEPEND="
-	${RDEPEND}
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-"
-BDEPEND="
-	cuda? ( <sys-devel/gcc-9[cxx] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
-	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
-)
-
-pkg_pretend() {
-	if use cuda; then
-		[[ $(gcc-major-version) -gt 8 ]] && \
-		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
-		die "Need gcc version earlier than 9"
-	fi
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	# GLTESTS are disabled as portage is unable to open a display during test phase
-	# TODO: virtx work?
-	local mycmakeargs=(
-		-DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
-		-DNO_CLEW=ON
-		-DNO_CUDA=$(usex !cuda)
-		# Docs needed Python 2 so disabled
-		# bug #815172
-		-DNO_DOC=ON
-		-DNO_EXAMPLES=$(usex !examples)
-		-DNO_GLTESTS=ON
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_REGRESSION=$(usex !test)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_TESTS=$(usex !test)
-		-DNO_TUTORIALS=$(usex !tutorials)
-	)
-
-	# Fails with building cuda kernels when using multiple jobs
-	export MAKEOPTS="-j1"
-
-	cmake_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
deleted file mode 100644
index e175e9f49681..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake cuda toolchain-funcs
-
-MY_PV="$(ver_rs "1-3" '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-# Modfied Apache-2.0 license, where section 6 has been replaced.
-# See for example CMakeLists.txt for details.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="cuda examples opencl openmp ptex tbb test tutorials"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/glew:=
-	media-libs/glfw:=
-	x11-libs/libXinerama
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )
-"
-DEPEND="
-	${RDEPEND}
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
-	"${FILESDIR}/${P}-add-CUDA11-compatibility.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	# GLTESTS are disabled as portage is unable to open a display during test phase
-	# TODO: virtx work?
-	local mycmakeargs=(
-		-DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
-		-DNO_CLEW=ON
-		-DNO_CUDA=$(usex !cuda)
-		# Docs needed Python 2 so disabled
-		# bug #815172
-		-DNO_DOC=ON
-		-DNO_EXAMPLES=$(usex !examples)
-		-DNO_GLTESTS=ON
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_REGRESSION=$(usex !test)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_TESTS=$(usex !test)
-		-DNO_TUTORIALS=$(usex !tutorials)
-	)
-
-	if use cuda; then
-		# old cmake CUDA module doesn't use environment variable to initialize flags
-		mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS}" )
-
-		# check if user provided --gpu-architecture/-arch flag and prevent cmake from overriding it if so
-		for f in ${NVCCFLAGS}; do
-			if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then
-				mycmakeargs+=( -DOSD_CUDA_NVCC_FLAGS="" )
-				break
-			fi
-		done
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
index 524b64930836..97c11871340d 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="cuda examples opencl openmp ptex tbb test tutorials"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 881f9d19e134..070fa2980d2e 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -2,7 +2,7 @@ AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89b
 DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
 DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
-EBUILD osl-1.11.16.0-r2.ebuild 2633 BLAKE2B d1e43e8757c4e1ef6ff3ba2a4f1a7fd6e49ba6ca8c184255ca3c37ff48d72cbebf71f6bd264788dff705510122940e1513e624b6dbad3f26faa301032e1965b3 SHA512 8e100f80a8d7ab1c9fdaa17f0c0b7416db60097a3f1210771f0eff9f4fc83294fc81dae7a80331071a8018a5e48de8929da252acb997a9bae0b28c72c6ba7670
+EBUILD osl-1.11.16.0-r2.ebuild 2635 BLAKE2B 24f64387c1eae64bfeb8268d1116244d1e0c848c977aa3c5a6df23dc8f345a13c3ea9d9bc31a41ecd5931b43945ceb0cd89693cc4c0f7d8257822d21aa05baa3 SHA512 ad335e35b5d2e99bc552511fe7192e19b73fb5cc8382ce935db31540362bcd7961566a432c2d527dbf57bf793f8229b7202700a53aa090150f249465dc453233
 EBUILD osl-1.11.17.0-r3.ebuild 2704 BLAKE2B 53468c8ae8a018fd9ceffba0e0c4879119eb0666a3be713dcc174e73e09cdd1cd7ccdb1851de77ebf752a29d9b4f45aeedf85138e580912cfc2fe2bf2eea65e5 SHA512 51cc54c36da4769594d578c0832fa9229b396f1df7b6ffaf7c110f98fbe3356a35d663840874a3a6e5c9cc372b56f6ecda24c28bed68308316d921df9f17400c
-EBUILD osl-1.12.4.1-r2.ebuild 2286 BLAKE2B d801190905ee4c7ef888fee39b1aeb6ecb3a9548bc58c5413b8f2fa1c9bbdf1abec6fff4cefcbec8f6784631461b38594c82eb8139c0c50fd29cbfdd239a7f19 SHA512 ac65dc72efd04d7b1078a66e19f3aa67c08dd50c5aaf451b8149650238bc5da3a83cefb1d274ae6441862379da7d0a59c0aa48d31ca4689d63be9c0b173c54da
+EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
index 3dd9f84f2cf7..fe9c14961b1f 100644
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,7 +86,7 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	local gcc=$(tc-getCC)
+	local gcc="$(tc-getCC)"
 
 	local mycmakeargs=(
 		# LLVM 10+ needs C++14
diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
index 8678e5483bcb..b04804eadb45 100644
--- a/media-libs/osl/osl-1.12.4.1-r2.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r2.ebuild
@@ -82,7 +82,7 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	local gcc=$(tc-getCC)
+	local gcc="$(tc-getCC)"
 	# LLVM needs CPP11. Do not disable.
 	local mycmakeargs=(
 		-DCMAKE_CXX_STANDARD=14
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 3820bdc2eb90..2e7cfb163e65 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -15,5 +15,5 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r8.ebuild 3502 BLAKE2B 150bd395483c32965bf3858fcb0d42b7834af751e3bdfabbaa5adcb4822792da735324956469c17e1b440dea51cd701b0504d20770b3c1b08c17165967efa8a2 SHA512 3f8004bfc89776162dbe4c5c99219d4c90b737c5e5a8e76bd5746960eb9362fe2601837d75e18cb0dbb75694de491df7957c67a002f1b332e7756ff9c26026d8
+EBUILD svgalib-1.9.25-r8.ebuild 3504 BLAKE2B 2ec78840d5c87d819eaff0d23d92b961069b8b454714d55e470ece080019dfb73965057b67434edd62528f5ed66d052234e57880db81590b5e75e0a220384c0b SHA512 64614af94bfc89abe7d03b030fa4dc5c5450a01e4a7f59d94e3c89ecc7a6a6df448c066110865c2a83827ed2fdd0d1c1538abf285572f4092c419ad032716b22
 MISC metadata.xml 326 BLAKE2B 4403b7e534ef31f31b3cad2ea20647984808446350df90be49f97cc712edc687970b380ccfdb43feaadca48f01396fab9c309221595ada96f1aa29add601a978 SHA512 c313667c47c7b201ae46f1c46bbe448db0b8bb9a11b54057dd379121f97f6110069047e856c3ecb12b172e7b328714b55787edf0ca8d13263791b1804021f145
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 9fea5896e39d..4199e5163324 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ src_prepare() {
 src_compile() {
 	use kernel-helper || export NO_HELPER=y
 
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	# C89 extern inlines are needed, see #576260
 	append-cflags -fgnu89-inline
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 23ac6ae3d9b7..2b27bc5016f0 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -7,5 +7,5 @@ DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be
 DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e SHA512 7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
 DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
 EBUILD tg_owt-0_pre20211207.ebuild 3810 BLAKE2B b8922ae71f3ffc0d96c732c2fb9f7ebf18604fbdb3a1e3d2c56102a2be99e9da30a4ed859be1cef5917e1edf2dc1a3c15acba66a6407b8552ed104353c7b6445 SHA512 c32bf039c100cb47b8bddcb815272f8ccd6067c3adb79009c4b0fc15a2418467e03b4ae5eb68c041fcbcd1f363991d1b6b33fbebbe6beecb94f3eda048d6c1ba
-EBUILD tg_owt-0_pre20220209.ebuild 3386 BLAKE2B 6b76c34f64a8e836c7a790b48bcf24b50b59a1b9abc80a29cb6bfe64e38fa66a842af5f98b32f358b487fa48904d3efbc15e11d66218b261f15b776cdc6d6b01 SHA512 db152781be87ce5a2f18d31f41b45f2467bc981b1bc79d9e899108835bf75c65176551e360eed1fc77c90e251d6947806084e2d613b2da9db18ffdf641f351e0
+EBUILD tg_owt-0_pre20220209.ebuild 3385 BLAKE2B e92281e6da83c725b319e33d3a1c4aa9eaad8a9959cd11d8155a0d62d85e4eb08f51873807b3e24006ae8bb3e1ef93bd4dbc8bedd02b024ab0ca35b903ef50c8 SHA512 217d00d45983c28416e3549846cff8c07c0c33a39059b1634e0c67d700f11dc49dab6b9a46dbbc11ea0da47939df255220a7c94cc1d9120af89d8c0744291d68
 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760
diff --git a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
index 7e7a27774fea..c67d2f3d5870 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index b7df5f70623c..e1fe2f4107f1 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -8,5 +8,5 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r3.ebuild 2373 BLAKE2B c60b28a56aff709c549f5d0184c8f3aff75022fafd624c7e8ad09ca27a08d33e6f9f5279b3998bb21754ed00d1a6b914f091805e241db7a5a27fed20ba2413ad SHA512 8cd65d6534ad28a32d0294dec03363a69d8528e132e9d1677fc6a24570bed7ae0833c8ce4a3d38175e6d1b0f9f7eef969acc79cab6a1d56616d6a64890731d2a
+EBUILD urt-3.1b-r3.ebuild 2377 BLAKE2B 4dcbc27fa3ba0c4b0d31a2221e2b6febc9fbb9d784a36b8855f59b027aa73e4eb71d52685dc07e23165ac9646cc58a0a1aa2b1b9724a866d0efa084e266b69ba SHA512 e68f6eea1ae1ca9b5741d4e4f353bca8a611a966049aced3781d316014f222d258d3d24bd8499443b68e0ff2d5330476db889a5a37dab9c234b7efae95e082b3
 MISC metadata.xml 225 BLAKE2B a54914e6c67f39dfe7ff921407b1ec063e68eab8292fbc6863e5bb41481f26cf474b7d3281669ea23545cedbed586350a99c305fb3d3a888a3848de13aeac5a4 SHA512 3fd10f5461db46d8be442335e29cdcfba7425e0d93443d45e4238c6767669ce5a0371fd4eb31df6129c089fd90e5433ed9d4366d288d6d2e8ac673bf435d4256
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 4bb63a9695dd..a1f40effaf39 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -76,8 +76,8 @@ src_configure() {
 src_compile() {
 	tc-export AR RANLIB
 
-	emake CC=$(tc-getCC) -C lib buildlibso
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)" -C lib buildlibso
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 99db4e7125a4..5b9002da1ba2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,8 +1,9 @@
+AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4ace2213f3d75dc258071bf2be040f37dd6c53c4201f13201d511c1df9651d9c381bfe7c10d51a437ad424e184f9acedfd6 SHA512 3182d082b028b664abd1899c19a689213a02214cce13f7f3c9a7dc95deb2ec7c8f13438ec812b2151476d638b170be8e1d832b303b73eb962c2389d2ecb161b4
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
 EBUILD xine-lib-1.2.11.ebuild 5213 BLAKE2B fb1aa47ca34bdc267a2923d55ecfc1d642248e9bb072f782e9dbbcc66a926a1c4278037650d0ae3809ac2021a89e3504bf2586031883979ce5cc7faad1e62333 SHA512 bf042d0761c3320e5a94fd83d6aed7642bb1b3f982befaf05697c9139e1e062bf25624fd23090a656654b2c62d4ed2fa2b75c20ca04b6db11172a76d117bf5a3
-EBUILD xine-lib-1.2.12.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
-EBUILD xine-lib-1.2.9999.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
-MISC metadata.xml 2679 BLAKE2B e4a259e41b87a49e33a5313d436da9ec288b24a7a0a89f93e61e8ca86ce7da17b7614fa3445307d4cba1a7fedd8ee3578f98884c4523be1cdf2393b045f4a41c SHA512 8f6375ab89a851634acd40e8d749cc4d1347e26c0c2a524cd2452855edc3b6f2e7842b202e1d2b1584bd645c6087a487daec2aa54ccd72cb272dc88445e57d70
+EBUILD xine-lib-1.2.12-r1.ebuild 5393 BLAKE2B 0d6a58768d9f722a2577d81b850d76980ce88584c1da50da164b0673c0f2523dc32c92079571732d83ccf3e4052bd1f8e5c598884a12977e3c44e8212d488fd3 SHA512 b40304d09c5a5dd11a708b57168da37acf467d8952230b7c18f42c8ac0ca920692a1bf74c8784331e8c72d3cff08beedf08dc19d0bd228d803643e4c515282d3
+EBUILD xine-lib-1.2.9999.ebuild 5334 BLAKE2B 578ebe981aeb5ad23b40a0ae3a88947c194d5733a6296a9709b72bb1661554ff18206ee2f9796284aca3a76d63d3f34fb478f26fede38e07ea74f15f3f036bbd SHA512 2d0435f0de8ca9f5920bbbdf93d90de0e9f8ead98b96d3225fa7f45dfe5bfc26033760faf53a955c19167fc40b7942d0f531021cb4c7c022f9e939d0f861db51
+MISC metadata.xml 2773 BLAKE2B 5f143a245bde88888f0b8e73601f62cfa7e8c23b9ed9c44b6baa13d8f78e8a05aba513996c323ecdcea83c91c938e86ef454571065eb110b11e9ea6285d89231 SHA512 9ed8a950a2c87b1c63ccab900a5cd80b37a0330bd5c859100559c7e8ec68581f7fda45ad6dc01dca98665798265dd0611e2cde4f9e7d2b9bff84249dfe2fd0c2
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..cb3253cf99a5
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/835791
+https://sourceforge.net/p/xine/tickets/11/
+--- a/src/video_dec/dav1d.c
++++ b/src/video_dec/dav1d.c
+@@ -544,11 +544,17 @@
+
+   /* multithreading */
+   ncpu = xine_cpu_count();
++#if DAV1D_API_VERSION_MAJOR > 5
++  settings.n_threads = ncpu + 1;
++  xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
++            "Using %d threads\n", settings.n_threads);
++#else
+   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
+   settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
+   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
+             "Using %d frame threads, %d tile threads\n",
+             settings.n_frame_threads, settings.n_tile_threads);
++#endif
+
+   /* dri frame allocator */
+   settings.allocator.cookie = this;
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 387486f97a70..8eb50e96f2ff 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -8,6 +8,9 @@
 		<flag name="bluray">
 			Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg>
 		</flag>
+		<flag name="dav1d">
+			Enable support for <pkg>media-libs/dav1d</pkg> AV1 decoder
+		</flag>
 		<flag name="dxr3">
 			Enable support for DXR3 mpeg acceleration cards.
 		</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.12.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index b3f3393bc258..29f22fbfac90 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -24,14 +24,14 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
 	app-arch/xz-utils
 	>=sys-devel/libtool-2.2.6b
 	virtual/pkgconfig
 "
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
 	xvmc? ( x11-libs/libXvMC )
 "
 DEPEND="${RDEPEND}
-	${NLS_DEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -117,6 +117,10 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.12-dav1d-1.0.0.patch
+)
+
 src_prepare() {
 	default
 
@@ -158,6 +162,8 @@ src_configure() {
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
 		--without-fusionsound
+		# Added dav1d for now. Could support both? Does it need to be XOR?
+		--without-libaom
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -194,6 +200,7 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with alsa)
+		$(use_with dav1d)
 		$(use_with flac libflac)
 		$(use_with imagemagick)
 		$(use_with jack)
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index b3f3393bc258..4552c8b34a71 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,14 +24,14 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
 	app-arch/xz-utils
 	>=sys-devel/libtool-2.2.6b
 	virtual/pkgconfig
 "
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
 	xvmc? ( x11-libs/libXvMC )
 "
 DEPEND="${RDEPEND}
-	${NLS_DEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -158,6 +158,8 @@ src_configure() {
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
 		--without-fusionsound
+		# Added dav1d for now. Could support both? Does it need to be XOR?
+		--without-libaom
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -194,6 +196,7 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with alsa)
+		$(use_with dav1d)
 		$(use_with flac libflac)
 		$(use_with imagemagick)
 		$(use_with jack)
author	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
commit	401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree	c2bef4719f6787550f0916aeaa8f4f403a9296af /media-libs
parent	4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)