gentoo resync : 29.06.2021

39 files changed, 650 insertions, 157 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 39697a1cf64c..743c27e5cd76 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/elles_icc_profiles/Manifest b/media-libs/elles_icc_profiles/Manifest
index ff6d87b86f54..ea2931b22d8c 100644
--- a/media-libs/elles_icc_profiles/Manifest
+++ b/media-libs/elles_icc_profiles/Manifest
@@ -1,3 +1,3 @@
 DIST elles_icc_profiles-20160501.0932.tar.gz 334145 BLAKE2B c2aa9b8720a83d9296e87e0dc56c18e34536a395d80412589d29a5d39bb36ea8c83929afdc1c36b335f3bff4b6d19b5793fd25b8ec45ca49ad159008a70e1f2e SHA512 10a3df45aadf923b2d7ff9c8ee906b000e70ad7d17c1a5005f889b49c6d57849c8befb5c4ed92748908bd5506789b6877c0504666de43c1a8621f646ab665e2f
-EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 559 BLAKE2B 473ef32b6561276e8432848f52cef71fc5bfc2087eb77a5757bfe8041ba19e740a07c9c8291c4dabf8010e924564e2a1a6d78a2feb93fe7701dc42e1267d750c SHA512 5f594d399dcafdcba8e8dc7666fe7c6061e3420ae00cfa1682b070432f25094afb780e2f08e780821388ed1542587a5f84b7e80fc2e7c4de4c8f455c99b312dc
+EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 566 BLAKE2B 244cd876b0bb0e9aeb1af6eb60d7822849f921df2b6796a617cc5afe58f4b4ea6f8fdc432f9d94fbaed699e920a3f880eb74f8ac6890f988e47fee73a207a865 SHA512 f56fcc232011c10ad57f468c9479578375c808e033390a5f05cfe5d48f19566ae467a6e6ae8d5ce0a96d9a0cf0cc050c2c21c0b80529ddfd5df35c65404e5e81
 MISC metadata.xml 1179 BLAKE2B 6e99d727506a7e9e989b76d627bbc3d5b621ac07966536b4b626c5d0405acb2214df7c519c6ba0ca99e6409b62889974d3dc0fc9dc94e12b5c0a9444ba46b9a0 SHA512 e460b09626c0de8ad92dabce05528eceb13efa859224681b8d1e7df73c4d980a1084b0b6b28d41f1e936c18e253cc1e6cbe692cdbdfce69e482860ecf3f1fd38
diff --git a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild
index 109d626eb166..51164efcc48e 100644
--- a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild
+++ b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ellelstone/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index c3929920fcba..a5195e1e7393 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,6 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
+DIST glu-9.0.2.tar.xz 436176 BLAKE2B 90485938e4809ce7bb56da25bd60be9f3f7b7f40d511ea6635e40d749e519d1dca6241d891224d3cf331b911f545df4ef9aa2101baf4e3b18df69244edbcb8a4 SHA512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64
 EBUILD glu-9.0.1.ebuild 1010 BLAKE2B 078af9acf532164d49b0a31a3a3da31d6c7ee3dbe696a8113eb29fa0a1943915b0aacaf3d082688c4cb34ef046edd67f8dd9be4ae3517460a9d527b122b08fd7 SHA512 434aceecdf7108304d26b077e50978064471acf01399a72384c0d7e682ee996ba3aca1262a7edd0a82e26525c22798e0c6fce84b2af74cc0f4a1a96c0b9bfc31
-EBUILD glu-9999.ebuild 1010 BLAKE2B 969a6e9217035d36fa73b42e65318961b1f5c2b084d1af7720c0ad0afdba256c2f3bb1dcd88fdfc5e4e53c6b873dc4b69f1c3143e52f1e402d0dc3cc198a0c93 SHA512 5cbfce3faeb61fdfa05a950c78be9c2e60445461e28412f539195372ee0febff5dc7ef72bee80fde822dd6ad38ce2e4a85259882b259717a5021d3756ddc0cb0
+EBUILD glu-9.0.2.ebuild 901 BLAKE2B 2377cc6c78fd9bca5a1c31e2ad14cb30e5f97cb0e7f9be7d2900874e6b1d8481766afd939a6c312f98a6e55d3d35cc7eb30ed1f971e4ea5473f4572fa3b01f85 SHA512 4bc9bd397157b3bdc2767b75537650829502a278276479d8b5d153649286c32e39504ba8dbddfe79cb090f3d874eb730cb959af201374c89b7af3fb0aae8da0d
+EBUILD glu-9999.ebuild 901 BLAKE2B 2377cc6c78fd9bca5a1c31e2ad14cb30e5f97cb0e7f9be7d2900874e6b1d8481766afd939a6c312f98a6e55d3d35cc7eb30ed1f971e4ea5473f4572fa3b01f85 SHA512 4bc9bd397157b3bdc2767b75537650829502a278276479d8b5d153649286c32e39504ba8dbddfe79cb090f3d874eb730cb959af201374c89b7af3fb0aae8da0d
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild
new file mode 100644
index 000000000000..978531ce2bb7
--- /dev/null
+++ b/media-libs/glu/glu-9.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit meson-multilib ${GIT_ECLASS}
+
+DESCRIPTION="The OpenGL Utility Library"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="SGI-B-2.0"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgl_provider=glvnd
+	)
+	meson_src_configure
+}
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index a20186b9dad8..978531ce2bb7 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit autotools multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
 HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
@@ -28,20 +28,10 @@ IUSE="static-libs"
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	:;
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgl_provider=glvnd
+	)
+	meson_src_configure
 }
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 169fdf9636a2..98904d4a22e2 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -4,5 +4,5 @@ DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e8
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
 EBUILD ilmbase-2.5.6.ebuild 1082 BLAKE2B 53e4c6df7933cb12a162a83049233ecc46130a74b78d2d517d11fa0609abcb4ff25ad6cd32a758646a6791769b81552862625225825e72422f8e8e15437e788b SHA512 6c83dac92cc3ea34d9806269e8ebbbb13a78a096676e42f55520b95a8257b7dbe3e61cc6cc11a7d2a89938a54a5663b4e38f0d8c04cbd8ea48c24beba16c0584
-EBUILD ilmbase-2.5.7.ebuild 1087 BLAKE2B 9a88cab002d0c6c62dfe38b9a2406f57547676e652e85dc00ec76a42b1ae1ae88e83c08368cf605abdac195abe2993453a50bfd203bc77ab6317ec567cb392b5 SHA512 902c1765c8661a0fb39f50f866f0e2fc987ac0bca3d175d75150632e852078dda21bf961000088ff0b889c54a5509fb4e8525961358f1f3c0a81aafe90509449
+EBUILD ilmbase-2.5.7.ebuild 1094 BLAKE2B 57ac6d3eaa517ebebf6ef7096023d5ae9db6a32d33c99a2815528bece8f118abb4f5895dbe69dc3a37bf5db098b7b160621f71bfcf20792c02bbe7f84b24d366 SHA512 489d668a514e7ab5a389328712e72eaeb7fda69449d0a4ac2486761dcc5b9849fe000616ab2a4b30dd36924ccb88b4c48e006eb8b00dc343317a1ad41fe85ee0
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
index e3c77c825e62..54ab57444991 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 7cf8aae49169..443dbe3df31a 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -7,9 +7,11 @@ DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc
 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
 DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
 DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
+DIST libaom-3.1.1.tar.gz 4604400 BLAKE2B b5e5030639fd7e33a4d0479cf0b5a174f2e0d0f67f6338bec6df7de333fd9bafa3821c7eb721959c1733a678209981f4893e4f228ed339e93f7b0b6fd136d967 SHA512 de91a47c23200ae83c34899c487db7f3b71872890f0506ffa7e2d9a1153ec389fc121b4df5ab1b30b28020599af34bb5d301eac3cdf2a34ce48dd26e07d7fc5b
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
 EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
+EBUILD libaom-3.1.1.ebuild 2321 BLAKE2B bf027ec5967d22a8adeeec00371b7e012c6c56b84ad9dea44796682655db131d8b5f9644b1ad0f70c0ce2400ada0ab8a079fc16e63457c73bdcd4bb5a06de087 SHA512 e95482c75610c84ca3a9b64cdff171ee63a069c8812e389d51d0d8a55a0ac96db061cfccdd52a3e15a33a25b5c74cedbad79751da2b8b97bef8bc585e5ab5ebb
 EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-3.1.1.ebuild b/media-libs/libaom/libaom-3.1.1.ebuild
new file mode 100644
index 000000000000..ec2266a2d2d6
--- /dev/null
+++ b/media-libs/libaom/libaom-3.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 6da4ea6265cb..764d06182ffc 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,4 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10.ebuild 981 BLAKE2B 298fce7edd22f8acaf89055ba9df0ec1a1d6ab93bfb19d291ed14f9c2aa0d5e3a0f8623743f9594a4b9ce8a6de8119baaa433dd0130c20e6ec4dee8b6de4bd51 SHA512 f5a070e31f50b2240c665f18ed6aa996aec8e5ed9572efe3cb03155ed94f464e092a154aaf6c6b5415cd9c86b691d213f18ceba40fe8e905e0aef863d803722b
+EBUILD libfpx-1.3.1_p10.ebuild 988 BLAKE2B 05e951ed01112ced23099a464bcca11be6f9d2cf768b8a4273de1402c0b1f3510c7acdb9bbb24eeab6e363dd6bfcd900528bf2ea5e6888e9e0c38e5e556774be SHA512 6c83f36c8fc4176ea738523940e0c71fb77bc1fb51d02243c40b9b8144d31bc757551feb747e0bc480584068c00a0bbefd9a1dcbddc227bf4a290d20b733a4cb
 MISC metadata.xml 333 BLAKE2B ded0f3e7a01b6a7c6b9073b5970f4760cde2230e21dc53ef3285cd9a69aae162acdaafe34aeefd66a7f4761cf54c62889cc990cdb1de9404df7a14d30eea91af SHA512 ea962485ec3f07a7d60d17a16dec78a249b76007e51bfac544028d343634b981077e6bf9fa72499fb504f2412661acafbfce47d5ceb87701c68d54e43f606f4b
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 5d056e5f60a6..74cc58c20d49 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 4a633f17587f..9082f455d161 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -7,5 +7,5 @@ DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c
-EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3226 BLAKE2B f134b0e4fd3206ce77015cd407e64d12afcab079ad7ff8c140cfa07a19100ed469bddb0c3e63edc7cbf54dce42d5094b9c8040c5d58e6622ed9c6aa3b015cf4b SHA512 b8f9e85e4ff78a11b1f40f874c195f3834e8edc2b24f7bad9f5cb28ba00e87fc93783a919ce8181551a028643fecfdba64ee6da452c385fac36d5bfba6cec88c
+EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3225 BLAKE2B 492a9e3844838a0c3721bd47ae1754e58eca57a4503d7f6e6280039975e491f3685a884e7531867a50f5ba0a62e23771efd357b456af0289519beee2741ca960 SHA512 6a38deec62fb680e391e0b20213625a048eb9dd785e2139a62b68308dbce0e9943b7a170da7707251b5deec31c06a5b673f45c75b11490d8c2d01fc74fa7b5a4
 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
index b41b2d8363d2..ca4189f486a7 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
diff --git a/media-libs/liblqr/Manifest b/media-libs/liblqr/Manifest
index e708279eaa2f..f36717853f3e 100644
--- a/media-libs/liblqr/Manifest
+++ b/media-libs/liblqr/Manifest
@@ -1,3 +1,3 @@
 DIST liblqr-1-0.4.2.tar.bz2 344739 BLAKE2B 90ae891603dc525d460b1f180342b2a998ef3081a7504c642d0ddbbc5feef1ceb512a046a5366311d2a86869c8988f24f03faaafd3e7c77b1ff1f82b8a23acc0 SHA512 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
-EBUILD liblqr-0.4.2-r1.ebuild 568 BLAKE2B 9f5f7bbf771c936a84b6fea62649add70dc9738aab77be5eafd3dd37cfed96a6b85b7c0d4b444659cef832b1fda0b5c38acdd82965339ab26be590a887e8079f SHA512 b08afbd12c0b7945c49718b0d833a1efc4047c9fba11fd8168e77ad5cc641efa67ac7cda54c5374075f9795fc94c53d040b682c393cd49f54dcea39712b53272
+EBUILD liblqr-0.4.2-r1.ebuild 575 BLAKE2B d231fe4d445c08b713c54e4fb1318d75f82f882287a968487e889a61f1cfea3334f21e899c960e247e4cc738e84464ec81b7a02a72caa80359820f9077223370 SHA512 625b1fa1efaa74671c6823d1e6245757d92d130309ef76b60d6f5cfc73843daf41c01c1c0b8db643d929995d9a07e9d3a32cd170cd00b4ce6f1f79294c8f3f52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index 99053158003a..87cf2abe4855 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 7dc78c2fcb88..639404064195 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,5 @@
 DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac
 DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a
 EBUILD libraw-0.20.0.ebuild 1382 BLAKE2B f37c63dcdbbf7bdd93af2fd7bf67d04c02d0c5c3d95b9b89c30ae806f6a5c31ab8862f4a7cc1c4851584e46f76a2805e6981f0a088f672e609ed1424ebdcf2ab SHA512 4941a712d519ac88903e1912de2e8bea816339fce8695af416a6229b627df14718576d43d30b715775eb26c5f5ba5d9bce152293cce96ea3289682f367d302cb
-EBUILD libraw-0.20.2.ebuild 1382 BLAKE2B 40bdf98afe011d6754a1476e96612ae5e5ffe657de738573a472a71329cbf59973ea7ab3b880739d9f252f47f083f92662f433adec3f213129762a866f0d7b93 SHA512 5f100e8dade61085db182b07777a6d24d716185e46055aae44b1f33bb6a8a285544ca1dcb9d5214738fdcc2583c571d079a7b8919e5060b5632e8023093da198
+EBUILD libraw-0.20.2.ebuild 1389 BLAKE2B 87de555467fced89142b59ee0b2be5f59ac92f0b512c2764b71e9b28d2244c6b8af20a1ff2143268fae09acf4d1ae83551667465628307b47253ddcd1448c61e SHA512 cb98d1bd142f9e8a3904e0e447fb985284ae2b732ec408b79f19b980de9a121e305ad85ad4476cbfa7757cf24a45d70de094d67299530df210666408783cd971
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild
index 62c86a68ef2f..29cc29f4f705 100644
--- a/media-libs/libraw/libraw-0.20.2.ebuild
+++ b/media-libs/libraw/libraw-0.20.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index b5c9443af47f..2cf4bdcbef75 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,4 +1,4 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
 EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1436 BLAKE2B c1f235d61390dadda14abf70a615591b1d9bb8a0dd913fad5557062191062e963e292244f328cf1a5db8401046573251d826aec61876cf7eb2dd6ac75d1e58f6 SHA512 59cf755a6e123466c8379c00623dada86d0cca48de15f6e89ac212c4e0be593fef6e45b7e5be3223315e5f89ed6f33476a2171b45c8f10ccb47571e12f4413ed
-EBUILD libtgvoip-2.4.4_p20210302.ebuild 1449 BLAKE2B 856046ffa58f3f0064b381b35da7ef356641d0b8212737d9939d2c8e4c3490b85b0297f01dcc475a5e14bec2253590383ec8205686ffcb1294ae7c5a9c96f346 SHA512 594e3ca3432dbd336b03a9c630be73d5e8c7a9256927f8c0cccfb4a148d1f5ab88fa500c9a221576dc4b7e427086e7cf8c94f725f416baf38d8756c482395c3e
+EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1438 BLAKE2B f5543fcdd2bf3cf87261ae68419e857823727644df0bd850f46b6938fa28a2fa5cbbdcb7a19f4489446ee0ad7ae425ffc906fcbb82d2475c3df17ace1da2e98a SHA512 61e29e8589f9abc1e3e3ab8c3fd51a89ff0f80dab462e094b3ce3fc9da9ec78622aef135539306dacd965e6a0059ad71526171c1160db6ad2f242960a015b0c2
 MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
index 05168f911606..96b273ee47fb 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
@@ -5,47 +5,46 @@ EAPI=7
 
 inherit flag-o-matic autotools
 
-LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
-
 DESCRIPTION="VoIP library for Telegram clients"
 HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+
+LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
 SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dsp pulseaudio"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
-	dev-libs/openssl:0=
 	media-libs/opus:=
-	media-libs/alsa-lib
-	!pulseaudio? ( media-sound/apulse[sdk] )
+	alsa? ( media-libs/alsa-lib )
+	dsp? ( media-libs/tg_owt:= )
 	pulseaudio? ( media-sound/pulseaudio )
-	dsp? ( media-libs/tg_owt )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
 
 src_prepare() {
 	# Will be controlled by us
 	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
-	default
 	# https://bugs.gentoo.org/717210
 	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
+	default
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
 		--disable-static
-		--with-alsa
-		--with-pulse
 		--disable-dsp  # WebRTC is linked from tg_owt
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
 	)
-	append-cppflags '-DNDEBUG'
 	if use dsp; then
 		append-cppflags '-I/usr/include/tg_owt'
 		append-cppflags '-I/usr/include/tg_owt/third_party/abseil-cpp'
diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest
new file mode 100644
index 000000000000..0ac808b81e87
--- /dev/null
+++ b/media-libs/rnnoise/Manifest
@@ -0,0 +1,3 @@
+DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3
+EBUILD rnnoise-0.4.1_p20210122.ebuild 944 BLAKE2B 7ec07028a5477c3a3f478c544fb6ec140f00db254c7dbc178f73746d25f246f7227db0d36d0580d47e9943ebb966e5f95f4a7dda0cc976c59a9d2dae0418da60 SHA512 7106750dcab80d1121a94f75cf90c323a408cbb6cda3d42e96ca9cf9bdd1699943fec3d8454716bc0c6a50287d13df25365d0ecac4dc9ac71d0837dc35f0cf61
+MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
diff --git a/media-libs/rnnoise/metadata.xml b/media-libs/rnnoise/metadata.xml
new file mode 100644
index 000000000000..631cf5ff785f
--- /dev/null
+++ b/media-libs/rnnoise/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>esteve.varela@gmail.com</email>
+		<name>Esteve Varela Colominas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
new file mode 100644
index 000000000000..0397c02dfbc5
--- /dev/null
+++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Recurrent neural network for audio noise reduction"
+HOMEPAGE="https://jmvalin.ca/demo/rnnoise/ https://gitlab.xiph.org/xiph/rnnoise"
+
+COMMIT="1cbdbcf1283499bbb2230a6b0f126eb9b236defd"
+SRC_URI="https://gitlab.xiph.org/xiph/rnnoise/-/archive/${COMMIT}/rnnoise-${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="doc"
+# NOTE: Documentation currently empty (version 0.4.1_p20210122)
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-examples
+		$(use_enable doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	rm "${ED}/usr/share/doc/${PF}/COPYING" || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 02ee7b9e7db8..7d33de0f3b35 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,8 +1,11 @@
 AUX Allow-using-packaged-third_party.patch 15523 BLAKE2B c6513ada2654d0c100054c8dc8781e50026681bb315b85a7d7fd906fd5b2d9c29b55bb86d2b8bb9a8fd6eaeb5f97b7e0fcea2c0122f6faa5d048631c6f72c093 SHA512 e89bbde19f3f91037311e67c6effb8b222da769f3b01268f3e11e33a70959c792b1f46cb968363ef26acf70c0d4a45008a7b42444e97668ad7ce9594098f4333
-DIST libvpx-5b63f0f821e94f8072eb483014cfc33b05978bb9.tar.gz 5337558 BLAKE2B 795f613cee5efc4f6382b09063978b772ebb283fb1f5f621f5fbac018a6aca4721319de89dba02cf66202fe92bf9df681c27b94657a67acea66293b9cf3e1b0c SHA512 ad151972dc6077ddc520d7b6aa14d64e3183e010ceddd5acc6e2d9407f3476006a92461f61662b826feab623a65e748df60d5478af56bd657fbacbdb71dddec6
+AUX tg_owt-0_pre20210626-allow-disabling-X11.patch 3969 BLAKE2B fb0cb1f04762ec0ccb6e5f1057a413d380356cccbe394679bb6168a15961e906cf6a6fa025b87ee78d98902314656e0973932c5c952fc6edf8650dc4dd40a6bb SHA512 ca74fb15ad43e6933ccc5d014c9219045fd0be4a0bc5a18e8c8c244455fa1dd72268cd14fa203df66acd411b8d1315339c7f29930da898d80c40e74c6e326fc4
+AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a1cfb148f0f64524a18ea48fb5cd01104137edb33e85a86c190418c0b8230564026527bea414c27b1a535415ad31279b705ea777241874ae3c1802 SHA512 8b16e49dad06aa71becb535600d411160e1cbef2c2cdc2258aebc282b4b64d87a0011b4c1ade4209116176965be3c2ee8ab2bf0ad5a33c451f184b32d0a7e77a
+AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
+AUX tg_owt-0_pre20210626-expose-set_allow_pipewire.patch 720 BLAKE2B 22c1aacf44dfc9b814c2d7f3dbe186ef9b86473a6cd967357d9a786cbef2734f356e04487a3225e04fcee2282fea61e679787280682dbd339bdc68fcfade8261 SHA512 d163a8c27231ddbf930259c8dd52c1bd304a228cdba1d76bcc77efacae097f1c743de5ab79066d0d4367a783c530fa62169a9d3e09ff5e4498d5d8f3790ed563
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20210309.tar.gz 16159542 BLAKE2B 354992fca17f6217daa7294a8b60aa96f16b1198a07c79599ce676770cde068bf3ebf83c3935613ab181d4f7f23abbf2e4dd3ba41988b7505f27f537ada87fc2 SHA512 eca2c249d4837f8564218ea969390579b7f07c40879a80249310d978ba6d8865b85ec12e324fdba92af2d0b9bd501f2328fad5475028211013239dc35f508bb0
 DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6
-EBUILD tg_owt-0_pre20210309-r1.ebuild 2572 BLAKE2B 1a6fa3110b55b71c5fd5b35c8a2143af554d10b1d76ccdd08f8deaf73f2ad26d48eda46cc54879d0a8e013bb09995c0cde72b520508461de6b8b87208e628e48 SHA512 f3fd874d29fa468266c918d0882168bccae193b4a5cc90ef80488a10de8c83a36003d85c90ab302d9773ef0fc7d5ae6947287d0ecf26fc21cb6d3c98d462f304
+DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
 EBUILD tg_owt-0_pre20210422.ebuild 2690 BLAKE2B 5142fed528e99f63e0ab0fa3f56cc33c0abe29975e7e5814fd40eeb5c9796a2c745b1b2e2a8569309411585907ba383cf3a581514d9dcd802768bf17bb3d4b61 SHA512 d7d4c545b6026f22c5d4bac967837bf630eca7b1c7aa432526571a5d3be470d71f7fde2e33e1eedc996388d8b36f4c037130fad732ccb5548202835b424e16e3
-MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
+EBUILD tg_owt-0_pre20210626.ebuild 2959 BLAKE2B 230b4d41768905517205f9095e0dbd06e255f68900daf9dc69c731fb792a95196afb52a449598410b756a2e479eb91131e45d602a37984fa4102f6466d7985a6 SHA512 678af2e504902f1aa0d8e7ae192d526d12dfffc652e74f9b5ef5ff1115e8a09ae30624edd37d05d117dc2788098ebaf1895728ae30a7b5f9206941f3dc216484
+MISC metadata.xml 545 BLAKE2B 43a53f1c6c985be6e22cf2cd686a20637871b0351b4e5698d4a84abb78ad1e78080d32b295b87de7bc00a59bb49a749dcca562ddeeef8c54f315f26752c3f9d0 SHA512 24d6883333db2468df9529211f984c20a049d728794d43dc9608eb61f8154a7d15a92a4aba0bfcabc309c073947e3fb5fe22d258882c89adb5a1dcfb9889aecc
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
new file mode 100644
index 000000000000..c6abf9660468
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
@@ -0,0 +1,108 @@
+Add -DTG_OWT_USE_X11
+
+Allows disabling X11 desktop capturing independently of pipewire support, for
+the few people that run wayland without any X11 support whatsoever.
+
+This setup is untested, but supported by the GNI build system, see:
+* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
+
+Toggling the WEBRTC_USE_X11 define also affects some files under
+src/modules/audio_device, but that falls under "X11 support", regardless...
+
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
+@@ -21,11 +21,13 @@
+ 
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." ${TG_OWT_PACKAGED_BUILD})
+ option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
++option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
+ 
+ if (NOT UNIX OR APPLE)
++    set(TG_OWT_USE_X11 OFF)
+     set(TG_OWT_USE_PIPEWIRE OFF)
+ endif()
+ 
+@@ -87,6 +89,10 @@
+ add_library(tg_owt)
+ init_target(tg_owt)
+ 
++if (TG_OWT_USE_X11)
++    link_x11(tg_owt)
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+     link_glib(tg_owt)
+     if (TG_OWT_DLOPEN_PIPEWIRE)
+@@ -169,7 +175,6 @@
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+ 
+ if (UNIX AND NOT APPLE)
+-    link_x11(tg_owt)
+ endif()
+ 
+ function(add_sublibrary postfix)
+@@ -2161,6 +2166,37 @@
+     )
+ endif()
+ 
++if (NOT TG_OWT_USE_X11)
++    remove_target_sources(tg_owt ${webrtc_loc}
++        modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc
++        modules/desktop_capture/linux/mouse_cursor_monitor_x11.h
++        modules/desktop_capture/linux/screen_capturer_x11.cc
++        modules/desktop_capture/linux/screen_capturer_x11.h
++        modules/desktop_capture/linux/shared_x_display.cc
++        modules/desktop_capture/linux/shared_x_display.h
++        modules/desktop_capture/linux/window_capturer_x11.cc
++        modules/desktop_capture/linux/window_capturer_x11.h
++        modules/desktop_capture/linux/window_finder_x11.cc
++        modules/desktop_capture/linux/window_finder_x11.h
++        modules/desktop_capture/linux/window_list_utils.cc
++        modules/desktop_capture/linux/window_list_utils.h
++        modules/desktop_capture/linux/x_atom_cache.cc
++        modules/desktop_capture/linux/x_atom_cache.h
++        modules/desktop_capture/linux/x_error_trap.cc
++        modules/desktop_capture/linux/x_error_trap.h
++        modules/desktop_capture/linux/x_server_pixel_buffer.cc
++        modules/desktop_capture/linux/x_server_pixel_buffer.h
++        modules/desktop_capture/linux/x_window_property.cc
++        modules/desktop_capture/linux/x_window_property.h
++
++        modules/desktop_capture/screen_drawer.cc
++        modules/desktop_capture/screen_drawer.h
++        modules/desktop_capture/screen_drawer_linux.cc
++        modules/desktop_capture/screen_drawer_lock_posix.cc
++        modules/desktop_capture/screen_drawer_lock_posix.h
++    )
++endif()
++
+ if (NOT TG_OWT_USE_PIPEWIRE)
+     remove_target_sources(tg_owt ${webrtc_loc}
+         modules/desktop_capture/linux/base_capturer_pipewire.cc
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/cmake/libwebrtcbuild.cmake
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/cmake/libwebrtcbuild.cmake
+@@ -27,6 +27,13 @@
+     BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0
+ )
+ 
++if (TG_OWT_USE_X11)
++    target_compile_definitions(libwebrtcbuild
++    INTERFACE
++        WEBRTC_USE_X11
++    )
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+     target_compile_definitions(libwebrtcbuild
+     INTERFACE
+@@ -63,7 +70,6 @@
+     INTERFACE
+         WEBRTC_POSIX
+         WEBRTC_LINUX
+-        WEBRTC_USE_X11
+     )
+ endif()
+ 
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
new file mode 100644
index 000000000000..9cc55585a561
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
@@ -0,0 +1,36 @@
+Fix an issue with -DTG_OWT_USE_PIPEWIRE=OFF
+
+Some files were erroneously being included despite the option being turned off
+
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
+@@ -88,6 +88,7 @@
+ init_target(tg_owt)
+ 
+ if (TG_OWT_USE_PIPEWIRE)
++    link_glib(tg_owt)
+     if (TG_OWT_DLOPEN_PIPEWIRE)
+         include(cmake/generate_stubs.cmake)
+         set(stubs_loc ${webrtc_loc}/modules/desktop_capture/linux)
+@@ -169,7 +170,6 @@
+ 
+ if (UNIX AND NOT APPLE)
+     link_x11(tg_owt)
+-    link_glib(tg_owt)
+ endif()
+ 
+ function(add_sublibrary postfix)
+@@ -2161,6 +2161,13 @@
+     )
+ endif()
+ 
++if (NOT TG_OWT_USE_PIPEWIRE)
++    remove_target_sources(tg_owt ${webrtc_loc}
++        modules/desktop_capture/linux/base_capturer_pipewire.cc
++        modules/desktop_capture/linux/base_capturer_pipewire.h
++    )
++endif()
++
+ if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
+     remove_target_sources(tg_owt ${webrtc_loc}
+         rtc_base/win/windows_version.cc
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
new file mode 100644
index 000000000000..0bddb5fd00f6
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
@@ -0,0 +1,90 @@
+Add support for -DTG_OWT_BUILD_PULSE_BACKEND
+
+This is based off of the rtc_include_pulse_audio option in:
+* src/modules/audio_device/BUILD.gn
+
+ALSA must be enabled unless audio support is removed as a whole, see:
+* src/modules/audio_device/audio_device_impl.cc
+
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
+@@ -25,12 +25,17 @@
+ option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
++option(TG_OWT_BUILD_PULSE_BACKEND "Build pulseaudio audio backend on non-Apple Unix." ON)
+ 
+ if (NOT UNIX OR APPLE)
+     set(TG_OWT_USE_X11 OFF)
+     set(TG_OWT_USE_PIPEWIRE OFF)
+ endif()
+ 
++if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
++    set(TG_OWT_BUILD_PULSE_BACKEND OFF)
++endif()
++
+ if (BUILD_SHARED_LIBS)
+     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ endif()
+@@ -162,9 +167,11 @@
+ link_libvpx(tg_owt)
+ 
+ if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE))
+-    link_libalsa(tg_owt)
+-    link_libpulse(tg_owt)
+     link_dl(tg_owt)
++    link_libalsa(tg_owt)
++    if (TG_OWT_BUILD_PULSE_BACKEND)
++        link_libpulse(tg_owt)
++    endif()
+ endif()
+ 
+ if (NOT WIN32 AND NOT APPLE)
+@@ -2218,12 +2225,6 @@
+         modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
+         modules/audio_device/linux/latebindingsymboltable_linux.cc
+         modules/audio_device/linux/latebindingsymboltable_linux.h
+-        modules/audio_device/linux/audio_device_pulse_linux.cc
+-        modules/audio_device/linux/audio_device_pulse_linux.h
+-        modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
+-        modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
+-        modules/audio_device/linux/pulseaudiosymboltable_linux.cc
+-        modules/audio_device/linux/pulseaudiosymboltable_linux.h
+         modules/audio_device/mac/audio_device_mac.cc
+         modules/audio_device/mac/audio_device_mac.h
+         modules/audio_device/mac/audio_mixer_manager_mac.cc
+@@ -2243,6 +2244,17 @@
+     )
+ endif()
+ 
++if (NOT TG_OWT_BUILD_PULSE_BACKEND)
++    remove_target_sources(tg_owt ${webrtc_loc}
++        modules/audio_device/linux/audio_device_pulse_linux.cc
++        modules/audio_device/linux/audio_device_pulse_linux.h
++        modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
++        modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
++        modules/audio_device/linux/pulseaudiosymboltable_linux.cc
++        modules/audio_device/linux/pulseaudiosymboltable_linux.h
++    )
++endif()
++
+ if (NOT WIN32)
+     remove_target_sources(tg_owt ${webrtc_loc}
+         rtc_base/win32.cc
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/cmake/libwebrtcbuild.cmake
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/cmake/libwebrtcbuild.cmake
+@@ -50,8 +50,13 @@
+     target_compile_definitions(libwebrtcbuild
+     INTERFACE
+         WEBRTC_ENABLE_LINUX_ALSA
+-        WEBRTC_ENABLE_LINUX_PULSE
+     )
++    if (TG_OWT_BUILD_PULSE_BACKEND)
++        target_compile_definitions(libwebrtcbuild
++        INTERFACE
++            WEBRTC_ENABLE_LINUX_PULSE
++        )
++    endif()
+ endif()
+ 
+ if (WIN32)
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch
new file mode 100644
index 000000000000..ef93ea24101c
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch
@@ -0,0 +1,16 @@
+Exposes a dummy version of set_allow_pipewire in case the library is built
+without WEBRTC_USE_PIPEWIRE. This function is expected to be used by
+applications, and removing it completely breaks the ABI.
+
+--- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/src/modules/desktop_capture/desktop_capture_options.h
++++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/src/modules/desktop_capture/desktop_capture_options.h
+@@ -131,6 +131,9 @@
+ #if defined(WEBRTC_USE_PIPEWIRE)
+   bool allow_pipewire() const { return allow_pipewire_; }
+   void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; }
++#else
++  bool allow_pipewire() const { return false; }
++  void set_allow_pipewire(bool allow) { }
+ #endif
+ 
+  private:
diff --git a/media-libs/tg_owt/metadata.xml b/media-libs/tg_owt/metadata.xml
index 631cf5ff785f..704c25c1b2f8 100644
--- a/media-libs/tg_owt/metadata.xml
+++ b/media-libs/tg_owt/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild
deleted file mode 100644
index 8a01480de92e..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-TG_OWT_COMMIT="7f965710b93c4dadd7e6f1ac739e708694df7929"
-LIBVPX_COMMIT="5b63f0f821e94f8072eb483014cfc33b05978bb9"
-LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/webmproject/libvpx/archive/${LIBVPX_COMMIT}.tar.gz -> libvpx-${LIBVPX_COMMIT}.tar.gz
-	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
-# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="pulseaudio"
-
-# Bundled libs:
-# - libvpx (media-libs/libvpx, requires git version, post v1.9.0)
-# - libyuv (no stable versioning)
-# - libsrtp (project uses private APIs)
-# - pffft (no stable versioning, patched)
-# Bundled libs that will be unbundled at a later date (upstream support is in the works):
-# - net-libs/usrsctp
-# - dev-libs/libevent:=
-# - dev-cpp/abseil-cpp
-# - media-libs/openh264:=
-# dev-lang/yasm is required for libvpx
-# media-libs/libjpeg-turbo is required for libyuv
-DEPEND="
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	x11-libs/libXtst
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-"
-
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	unpack "libvpx-${LIBVPX_COMMIT}.tar.gz"
-	mv -T "libvpx-${LIBVPX_COMMIT}" "$S/src/third_party/libvpx/source/libvpx" || die
-	cd "$S/src/third_party/libyuv" || die
-	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
-}
-
-src_prepare() {
-	# Can cause race conditions when no webcam is available or webcam is blocked
-	# See https://bugs.debian.org/982556
-	sed -i -e 's/#ifndef NO_MAIN_THREAD_WRAPPING/#if 0/' src/rtc_base/thread.cc || die
-
-	# Causes forced inclusion of SSE2, so we strip it out on x86* arches
-	# https://github.com/desktop-app/tg_owt/pull/57
-	if ! use amd64 && ! use x86; then
-		sed -i '/modules\/desktop_capture/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
-	# see https://bugs.gentoo.org/754012
-	append-cppflags '-DNDEBUG'
-
-	append-flags '-fPIC'
-	cmake_src_configure
-}
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
new file mode 100644
index 000000000000..e07ba6135d99
--- /dev/null
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="WebRTC build for Telegram"
+HOMEPAGE="https://github.com/desktop-app/tg_owt"
+
+TG_OWT_COMMIT="91d836dc84a16584c6ac52b36c04c0de504d9c34"
+LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
+SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
+# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
+
+LICENSE="BSD"
+SLOT="0/${PV##*pre}"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa pulseaudio screencast +X"
+REQUIRED_USE="pulseaudio? ( alsa )"
+
+# Bundled libs:
+# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
+# - libsrtp (project uses private APIs)
+# - pffft (no stable versioning, patched)
+# media-libs/libjpeg-turbo is required for libyuv
+DEPEND="
+	dev-cpp/abseil-cpp:=[cxx17(+)]
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libvpx-1.10.0:=
+	media-libs/openh264:=
+	media-libs/opus
+	media-video/ffmpeg:=
+	net-libs/usrsctp
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch"
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-X11.patch"
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch"
+	"${FILESDIR}/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src/third_party/libyuv" || die
+	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
+}
+
+src_prepare() {
+	# libvpx source files aren't included in the repository
+	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
+	# see https://bugs.gentoo.org/754012
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DTG_OWT_USE_X11=$(usex X ON OFF)
+		-DTG_OWT_USE_PIPEWIRE=$(usex screencast ON OFF)
+		-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa ON OFF)
+		-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Save about 15MB of useless headers
+	rm -r "${ED}/usr/include/tg_owt/third_party" || die
+
+	# Install third_party/libyuv anyway...
+	dodir /usr/include/tg_owt/third_party/libyuv/include
+	cd "${S}/src/third_party/libyuv/include"
+	find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/third_party/libyuv/include/{}" \;
+}
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index 29ac4ef13074..1474c1a66662 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,4 +1,6 @@
 DIST virglrenderer-0.8.2.tar.gz 2697672 BLAKE2B 2c5b14fcca8ed778a674c35f3a88213d017f0cb30afcd5c28a13f8ea8d9d2fcb052150451cf0c9e7b48f0619fa93c9cc9036b59677fdae09ec97517984af43c1 SHA512 a64069bf6a28e5b77da53b5226a447decc3fe07a5c28bc49c2c15413b7651605170c5644a24f6a0ce9216a0f55afcee0246c3e4d9bc8f32dad771be3115e0f2a
+DIST virglrenderer-0.9.1.tar.gz 2945799 BLAKE2B 86740155a824263b8ecb3a917db59996650e90a095e64be3cb6119eb2b6c5a64b6b3f5d40354fdf9d5bb4dae7d247749a8ddcfb33031aa2607057d18cedc319c SHA512 4edba82c83a6183871f74f365d55af88935edf9abad97c1617c569f21a16b008481364f50491dfbc7ed89832a6b618fce98d182f84cc1cbab9d2c7443a2ae936
 EBUILD virglrenderer-0.8.2.ebuild 965 BLAKE2B 80a530f2799085f5dd234dac0bc3dadcf01b02d2dc928729dcd618efe58619c16f70616fa695a64d5abdd72832c561cb728e20caaf3550ab0350a6de54bc2a30 SHA512 71eb7c0f75ac412376297e20605f344bf639f41eeef7bce0405876dd01dc9203e7df7517922fb4198a413009e4c10ad1e7fa30d318fd709639cfde7d30546ac7
+EBUILD virglrenderer-0.9.1.ebuild 967 BLAKE2B ca1dffd8d749c9ac0cf82d1debd8c8a58c23f2cff098f785780bd9955609ddd83b6fa342f7d2cfb241c696398bf929587a6255bca61556671789f5c9f28ceca9 SHA512 8df7540a7baf02c86f8b8f01235dfe2564e07516c7ceb8639be47de1c1b7bc7725ad1cdb77bdcfcf3c32732ae3be03977d245d58497e88b89bb1eb793b0fa67f
 EBUILD virglrenderer-9999.ebuild 942 BLAKE2B a17fbff964ec6e6a664738d37437e786a8505cc74283a36133dbfa1dd98a19ef19c4de7c3fbe7ae0fcc4c92067394df0224fc0882b92486bd6ceb1cd8a07b0de SHA512 2380fdec62258309db09746db46ce47a2a14b29e03e5e666e5722a651414bb8432a41844f563f9081b5879f6f54add3e7282447a26c6ea4a487b2a8325cedc7b
 MISC metadata.xml 371 BLAKE2B 3e3bdb314577f4b67ad0b800c37da42bf1f94200938519c39a3fd4020154065a86925b9afe83aab994ef0cc9b3480005691fbbb7277c367fac72d6e4ce608510 SHA512 94fcfe4653d16579ae9fab9dede61165c0b45ef1f97b642b4d50f0933909fe6ba04e3aa0f0f0e3311d780f126b7860295746caadd1a0245cb950e1012784902d
diff --git a/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild b/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild
new file mode 100644
index 000000000000..5f4fcc2eef17
--- /dev/null
+++ b/media-libs/virglrenderer/virglrenderer-0.9.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/virglrenderer.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/virgl/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
+HOMEPAGE="https://virgil3d.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.50
+	media-libs/libepoxy"
+
+DEPEND="${RDEPEND}"
+
+# Most of the testuiste cannot run in our sandboxed environment, just don't
+# deal with it for now.
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	find "${ED}"/usr -name 'lib*.la' -delete
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 0eb22a18fb60..85f81bb631a0 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b12
 DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-1.2.179.ebuild 1506 BLAKE2B 629d570ffd1689ba3432e9c7b968558ceaa78c03488acb8899c286491425cbd4c22f19177241190828f7720cb9867ef6b1f3a0f53bd9a8460ec85d4486b0e4f6 SHA512 219316065e2dec1b97e2b770da03cf162923adf75eb4c6ee089abe82f51682d9805af2ea7f4e36e8e2fbc9adc2ed7f7e945876483937582a81ccf43048e05f55
-EBUILD vulkan-layers-9999.ebuild 1482 BLAKE2B dec0bead5a4c7cbdffc429cfa352f82ba3233c5cb0c94476815dbe6dea75f34a586454c128837ead1f44bc9a12f56c098ff3a22ffa555f4ac6f2d5c3d4358051 SHA512 0fd1f1695bab45ebbdac3868caaf259845f8c11300fa8320c059a6f81389e5ad6f75bf95453272613a72d61558b870dc8b076d36e1fb37e918f7663fdd016126
+EBUILD vulkan-layers-1.2.179.ebuild 1534 BLAKE2B 9c39b60f587bdf3e460380fe84f83488e8dff9d8ddca4419145bdd097b1775e2794c3a59d7f953dfe58bd30e9129621862d1c17549f5c7c1cd903dbdeab365fb SHA512 58108bb6284c69313b0b61c977dfacfa8ab52fc4ab476946c5d83faaeb02db9cfb1547ec5ae1f298742858892227deb8fd80cea07ec79665bdfa8437bcc4585b
+EBUILD vulkan-layers-9999.ebuild 1505 BLAKE2B 94dfb5ab9dc9195f9501de3a0cdc7679ef517d2747623468c40f20bfb5beef6d41fa860534a46dff043123d6d7702add97cfc68a8603e01ffef0c032fddb910b SHA512 8cc5bcfb36ff94fac0df024b255861c7db2955f2c046ec0086d72bc092033b273b7c8d8bc2b234293e80337ab8cafa3fe34408d2f6f545a4da724fb3c9e317fe
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
index 07c02145ee3c..3efb8bf7a9cd 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -26,10 +26,11 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
+RDEPEND=">=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-cpp/robin-hood-hashing
 	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
@@ -46,9 +47,9 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
+		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index f00991f25ee4..581d5596cddd 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -26,10 +26,11 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
+RDEPEND=">=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-cpp/robin-hood-hashing
 	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
@@ -46,9 +47,9 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
+		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 58c743bc32cd..6bd1caae6965 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,6 +4,6 @@ DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9c
 DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
 EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
-EBUILD vulkan-loader-1.2.179.ebuild 1723 BLAKE2B cdd03e4754af95391cdd06fcac58361b869974f114f31018322497e4e12d4726f4e991c5cbee62e763ebb65f7058cb8e28b70a5b49f539284f833ca6f00d3fe7 SHA512 9a111e74fb6c6efae372ae29cf0533bd3c5e0ee8dbe3cf04abbc124028c413e875777057b33dd9b57fda90f785cfb21d1eea9a802bd344d04952f267a967ae5b
-EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
+EBUILD vulkan-loader-1.2.179.ebuild 1668 BLAKE2B c8ca59fef9eb31bbc22fce91dd6e9d9aea5fc603886d0aab00837c4d6d3b2d69322fa34782873ae6bf9f25494fb86f850c2a4b933c96a835d0b51104c1f8680a SHA512 52cd7b5ea6045a67d35413b02f31d73c53b8c5d69217f3fba5606094e49167d6feec3c5df50d422a82e10afbe2644a506f1c174cefd62b1144d4fcfae24cd3e2
+EBUILD vulkan-loader-9999.ebuild 1667 BLAKE2B d38d07a8a692f11f283dee022a248f654ec0e09c989ad4afbc89e44c45ad57ed98973010e41b3481eae25a78f9a30890ec99de644473dbdd39eb319730b90683 SHA512 7e48048f046935cec040935b5a4c28ce454fe91d4bced38e7932d3645319fc6f721e508b46d43609a6ce00e2e30009598bba3e76f9fb7ef24b3e9a5f43e85c66
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
index 52680c705249..5eecd8d168e1 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
@@ -14,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -26,7 +25,7 @@ SLOT="0"
 IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
+DEPEND="
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index c4eb156e64f8..22fae7e60678 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
@@ -26,7 +25,7 @@ SLOT="0"
 IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
+DEPEND="
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (