gentoo resync : 05.12.2021

45 files changed, 487 insertions, 1071 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0d6d53676fb7..ca3a9b244fef 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
index b695cf6f4694..f2551bde69b9 100644
--- a/media-video/dirac/Manifest
+++ b/media-video/dirac/Manifest
@@ -1,4 +1,4 @@
 AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099
 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c
-EBUILD dirac-1.0.2-r1.ebuild 1460 BLAKE2B cc5c935962dc19f88e87dc8ae32923fbd4d7e9e74096c75b23624ff704998064d2f80f1bc65263b4d1c3863b979e4e74d3273f7f744d4ca5363c825f9ec36d3f SHA512 02b75487780b3e69127742c0bc50bdc06208e429c2872213ca88228d1799891ffc4ea49ffd9e19ee613c2f593777bfb4a3736d8eb9beb189b9c9f65507bbe1cb
+EBUILD dirac-1.0.2-r1.ebuild 1416 BLAKE2B 8b004d1e2ee48bf3d219b9985b97269f85ed082e6e8fd3d3868127e6573733ef8ff86ea501a17dcb29e4e9b7df1c2d259f8c3043d6ffd6eecfd3cf8e7c11debc SHA512 ad03bfae43596099b336dc9fb5276bc28a2b02222d878aa9045c0057a4cea76eefb410df076d4e9f9e8aa52edd8945abac665cd4fc0d299e5e7f0b4547be5581
 MISC metadata.xml 299 BLAKE2B c422a088126043b93d6200f1b0c5d2689b8e74c6ad0f8b13931f68ef5b85c3876c495e080676c19b78fb2730c59d0e8f73683e948d5bd28a68cc2e5c285828f8 SHA512 7bc9431cd2068b8af841d4e63873e6ecfb95e1372017c738eedbc4741212fbbffb46afbb38ee4a9f434090a3e32d37d6d97091601cbdd8de7c713c3bc4fceb6f
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index a7b84f26f577..5dd58acb05b3 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=8
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="Open Source video codec"
 HOMEPAGE="http://dirac.sourceforge.net/"
@@ -13,18 +14,21 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc cpu_flags_x86_mmx static-libs"
 
-RDEPEND=""
-DEPEND="
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		virtual/latex-base
 		media-gfx/graphviz
 		>=app-text/texlive-core-2014
 	)"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.2-doc.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.2-doc.patch
+	default
+
 	AT_M4DIR="m4" eautoreconf
 	export VARTEXFONTS="${T}/fonts"
 }
diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest
new file mode 100644
index 000000000000..556840fac0c8
--- /dev/null
+++ b/media-video/jellyfin-media-player/Manifest
@@ -0,0 +1,3 @@
+DIST jellyfin-media-player-1.6.1.tar.gz 573443 BLAKE2B d5a4d6b8d3ee2c5651b1d1be32514722e1b300231760d22d9929eb4b3579b723f72e24b403a875186cd8646bbe799db6b7ff7d0641ab592b68205ef71a8c40d6 SHA512 12e22f6a0d0769427aad01a37d18a68f057d0c5fa93ee308c5f7fe2e7a1a27ceea3b05f5cbf232264467e159bcdac18aa5042838ad7888dd008f0fb3a6751081
+EBUILD jellyfin-media-player-1.6.1.ebuild 1713 BLAKE2B ef0056539995539369eb3df0fe0e537f578d2ed1f2b3e60befd52566ceade5d54c8a7d73f4dfff995cce1f1e154bc1951951e32f2261b2912d1a7e50e5ddc3a5 SHA512 7aed4852ef1608b1ffd190da01ade031299d6a536c2c2dc950372bf582ca9d11e4a9684c156efc86a99ec73f65f8f6644b0fb051f02d01044849c205d3b33fef
+MISC metadata.xml 470 BLAKE2B 1e3d4d4957a4f595140019d7c668a25b4092de02db1ebe91974cf74ffb64aeb1c29e628c657018ca1d2629154b8e00cd62e165349f1fdf7c2b0d0270099e8f1f SHA512 e1e5d386488500305f25e531c0d0093097ff35f2567c774dc82e49a9d822310cdba7030eb78d2e0191c8bd2d1825a0ca17e8f76cacfcddeb04cba9c7f85f56a9
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
new file mode 100644
index 000000000000..418d9eddf93e
--- /dev/null
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player"
+HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
+
+SRC_URI="
+	https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+"
+# GPL-2.0 for JMP itself
+# licenses for code in external/:
+#   MIT for qhttp
+#   BSD for qslog
+LICENSE="
+	GPL-2
+	BSD
+	MIT
+"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="+dbus"
+
+DEPEND="
+	dev-libs/libcec
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/libsdl2
+	media-video/mpv[libmpv]
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	dbus? ( dev-qt/qtdbus:5 )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+# x11-misc/xdg-utils is used for xdg-screensaver, which is used to inhibit
+# screen locking
+
+RDEPEND="
+	${DEPEND}
+	media-video/jellyfin-web-jmp-bin
+	!dbus? ( x11-misc/xdg-utils )
+"
+
+src_prepare() {
+	# disable jmp installing jwc in it's build system
+	sed -i '/..\/dist\//d' src/CMakeLists.txt || die 'sed failed'
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOpenGL_GL_PREFERENCE=GLVND
+		# PMP, at least prior to the fork into JMP, used to download codecs,
+		# for safe measure, disable that.
+		-DENABLE_CODECS=OFF
+		# LINUX_X11POWER instructs JMP to use xdg-screensaver instead of dbus
+		# for inhibiting screen saving.
+		-DLINUX_X11POWER="$(usex dbus OFF ON)"
+	)
+	cmake_src_configure
+}
diff --git a/media-video/jellyfin-media-player/metadata.xml b/media-video/jellyfin-media-player/metadata.xml
new file mode 100644
index 000000000000..830b7c1f6baa
--- /dev/null
+++ b/media-video/jellyfin-media-player/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>James Beddek</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/jellyfin-web-jmp-bin/Manifest b/media-video/jellyfin-web-jmp-bin/Manifest
new file mode 100644
index 000000000000..5c478347f2de
--- /dev/null
+++ b/media-video/jellyfin-web-jmp-bin/Manifest
@@ -0,0 +1,3 @@
+DIST jellyfin-web-jmp-bin-10.7.6.zip 37127792 BLAKE2B 9756d1d2a2f00970291464c6b667d14df058ddace7d2ddc49c3e9072ca9ecc7f6388255afa701165bc7d8cf6dad12067afd3cdfae082de533faf2aa483868e87 SHA512 e4cd2d63c724e6ede78007c58f5e405b2ca97d1de0e0e86710fdf8756fedac2d50b1da10b61efd4888ffea3738bfde8f3510e49e38c61bf0bd47613634bc20c3
+EBUILD jellyfin-web-jmp-bin-10.7.6.ebuild 539 BLAKE2B 36e0bbd48ac238720b1639551843456c44c2248cab9a1aed7eaaf35d5da33d76e456ea2e572955f77d8084687e4d66dd486733eb9644a45c26c3859ee27998d0 SHA512 1cfbdb293e4f54085cf8eec8352a89e3b2558a0b0d544e97339904664de8be13472fe903296f6c9f8b1ca9f9bda6540c5e6b0ce52bd9228dfe23c1328e3c4995
+MISC metadata.xml 470 BLAKE2B 1e3d4d4957a4f595140019d7c668a25b4092de02db1ebe91974cf74ffb64aeb1c29e628c657018ca1d2629154b8e00cd62e165349f1fdf7c2b0d0270099e8f1f SHA512 e1e5d386488500305f25e531c0d0093097ff35f2567c774dc82e49a9d822310cdba7030eb78d2e0191c8bd2d1825a0ca17e8f76cacfcddeb04cba9c7f85f56a9
diff --git a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
new file mode 100644
index 000000000000..47145956d5eb
--- /dev/null
+++ b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modified Jellyfin Web Client for use inside Jellyfin Media Player."
+HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
+SRC_URI="
+	https://github.com/iwalton3/${PN%-bin}/releases/download/jwc-${PV}/dist.zip -> ${P}.zip
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+S="${WORKDIR}/dist"
+
+src_install() {
+	insinto /usr/share/jellyfinmediaplayer/web-client/desktop
+	doins -r .
+}
diff --git a/media-video/jellyfin-web-jmp-bin/metadata.xml b/media-video/jellyfin-web-jmp-bin/metadata.xml
new file mode 100644
index 000000000000..830b7c1f6baa
--- /dev/null
+++ b/media-video/jellyfin-web-jmp-bin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>James Beddek</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c16494033e04..209198a28213 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -10,7 +10,7 @@ DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a04
 EBUILD libva-utils-2.10.0.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.11.1.ebuild 2368 BLAKE2B a95caf61fe2b9f5f70101bdb163cbd0f856e79c79828a313b5120e69405153c6e3a934272f154db246d6d1e57be044ebe0eba3fdd6bfe5ead7acede20ebc7cdc SHA512 46e34b227bccb4bb9a97c1069b4a3def2c7e87eb5119220f50151e7814ab986776e721b9930c3d26756b95b74a615c6a5d58205e0f8eea78d1f7e1c291b03aff
 EBUILD libva-utils-2.12.0.ebuild 2365 BLAKE2B 92ec7de337502e258cc2cd4b379389c0afc09f2b9254ce7aa6a8b6a84b885b3c8f85f1f2d76ec62a64e21af0a1c16ed177ec44d346a1dd3f0dae07fb6874c284 SHA512 03471a71432a8dd6717061ecf99d56ee1ec91b84626affcf61d82c73fedadd51e19d0e854d66a1fc75b7f1debe8e94a5da42eee780c2852812d2ef6c649d12e4
-EBUILD libva-utils-2.13.0.ebuild 2369 BLAKE2B 3685bf3d3c73824ff81b79a24e9997fb163d3625fabc2c69a179ad7474c22a268fa79e1ccf7eda593b34fb7018e5f4e838f54668eec1c88814cb80c079dbad75 SHA512 cf1e632c2a0236f7f7b370ad2c47fc1c363fcb391ac38c46d545f22ec9653f9916fc84e6f817320fb3381b2e0ef693ea3631907af0913532f05b579df869046f
+EBUILD libva-utils-2.13.0.ebuild 2366 BLAKE2B e5136a33bb3d33f6f993ffe6dcf1c4e48ac5dccb1e58f26e771bfd9fb590b2889c458e32c994a82730bf20cf1509e36487f0d431549896f37000ffc2d98047c7 SHA512 d103d51518c1216986526667984ed086cefa8563029921d970afedb674d1222d8f01af59f35439ede01e255700fa745ddc9059bba479ed4697a2f1a44d2c5ab3
 EBUILD libva-utils-2.4.0.ebuild 1259 BLAKE2B 228e9161a295447362bed7e34d422e1291c184b426e00741b56990ba3d0a36c69966926a902ce4d1e5c065bde7c79b8a2ae01709e67dd319c02e7a8bbeb7d601 SHA512 6a0b6ad30e76bdeef7a2faaf55bee12eddd4c4f2ce23692d9fa2ed9a27754f4221c8c88c83f4dcc389a55337d00f70daf7fb037569e0176cf396ec99a24cb1ce
 EBUILD libva-utils-2.8.0-r1.ebuild 1537 BLAKE2B 2c1f7727f4b9c1bbc3360dd20133a56ce641c1fd53ec56ab5b0f736db0ae343c9efbf5b523de2bb9bb50dac477a45f005256fac98ae25b2ffefe8c07469f5f18 SHA512 5f36c0614e05d5ceb11af1bae4aa698cf2a45f3535eb947088546d0f74bf5a725c74d92b054f6cb3a70fd572742d359ab92f68af45e51cfbf8093540a12d95ff
 EBUILD libva-utils-2.8.0-r2.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild
index 2f790d95839d..5f77a232170e 100644
--- a/media-video/libva-utils/libva-utils-2.13.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.13.0.ebuild
@@ -15,7 +15,7 @@ else
 	# without pre-built 'configure' as they are always available upstream.
 	# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 76fc625d7629..72b4c04baf9f 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,4 +1,7 @@
 DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
-EBUILD movit-1.6.2.ebuild 906 BLAKE2B 574b53d64ebbd16390e6f4ce04cbfd14518fdab6550b553f4ad3b84a9dcb009bd3c6847aa7719d5c0c698c4ddf9617b03cf478645f37cc1f512ee92afdce1bd7 SHA512 271e978b544d899539b8b80fc7631526dbf0c1b3f2c28ea83580789006b803a642a62be422c398567e0524bed71771dcbe6ed76f9053243aa89d48921b545bd4
+DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5
+DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+EBUILD movit-1.6.2.ebuild 911 BLAKE2B 2d96623c830c9d35355684d5c87cbda78b1714cdf963c3402542e87b2be248af5d0cf50de216d86067715b21365757ad4aeefa70a924fda3f8bf3aa5088d2189 SHA512 06110a012dd7782c377eb99186facc4daa81ce178e900d18a3b03fd3ff42a6305682cf95a4ef645815c1f262df752f43f46c2de17fa62c919c1df4951cb25df9
+EBUILD movit-1.6.3.ebuild 1041 BLAKE2B 68f61124294e92c5c256e01e2d6cdca2bbd4c3eac86aff018836fbce79d52cf5ff68d9e85029a4617d526a5f1732f4d76a0c66fb53217179094e948a4103c26e SHA512 bea603b710572d86eeab148f40f1ab7eeaa854d1c913fbd2a23b499abd7d2217e0a2be67acee26f9f55c87a519a32f781c806d7fe1d46595bd9346b2f04e9985
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index 8b00c734b0f2..f84a2283a7fa 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -21,7 +21,7 @@ IUSE=""
 
 RDEPEND="media-libs/mesa[X(+)]
 	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
+	media-libs/libepoxy[egl]
 	>=sci-libs/fftw-3
 	media-libs/libsdl2
 	"
diff --git a/media-video/movit/movit-1.6.3.ebuild b/media-video/movit/movit-1.6.3.ebuild
new file mode 100644
index 000000000000..01c10ef697ac
--- /dev/null
+++ b/media-video/movit/movit-1.6.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GTEST_PV="1.8.1"
+
+DESCRIPTION="High-performance, high-quality video filters for the GPU"
+HOMEPAGE="https://movit.sesse.net/"
+# Tests need gtest sources, makefile unconditionally builds tests, so ... yey!
+SRC_URI="https://movit.sesse.net/${P}.tar.gz
+	https://github.com/google/googletest/archive/refs/tags/release-${GTEST_PV}.tar.gz -> ${PN}-googletest-${GTEST_PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+RDEPEND="media-libs/mesa[X(+)]
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy[egl]
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/googletest-release-${GTEST_PV}/googletest" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/googletest-release-${GTEST_PV}/googletest" emake check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 4631014e0b34..70b26f2b3246 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,3 +1,3 @@
 DIST ogmrip-1.0.1.tar.gz 3276396 BLAKE2B eed64f401483a44a5df17faeb51cc95a1626f71d0e074ca33a084f74dc8fb485339ed74b1a8d8958700f0d1b7689e653abc9ab6b8a1230217b416c9518b0c3be SHA512 22261b1a5086fc05139e8b9924b75d9a5a5e85b18e245e32545687e72273b485fe1c5041b89db653c6e2e9714518e17ea955435a20ac26fcc875fa8d1a90994c
-EBUILD ogmrip-1.0.1.ebuild 2203 BLAKE2B 383f774ba262eb6cc846ec551bd84dac3e53bde7714d9633ea9dae9b9cc149058099c80d34d5a2358cf26e3fbb39de14aea00ca349df0559872aa0c9c129fae9 SHA512 40c681bbe91860d01ee060264b6f07294f5248245ec552f54b7f72264c6367940bcfbaa6448d3442692108c9127a7e003da5da6261ff28a290de6685e1790345
+EBUILD ogmrip-1.0.1.ebuild 2159 BLAKE2B c6c7548ee235eac026ffc4f78ca2e7d8ae7fd3b533ad742dde67b3aee8755e5e14c1269b2ee239cd29a08e29df2fdd46dc06de5987f66cd8b7033df3ed226f0c SHA512 e3498b4da5b90fe7b533e4b589ff6403de242eaef0e6cde2cd22593ff9a55486fcd56c952717d0db65c492eb105ec2cc067fbcccd27d2caad6a7cc5b0902641b
 MISC metadata.xml 484 BLAKE2B 62f523614a04106e887ba82aad1e21b9f10970566921c450036ec6d67742bea9cace03f82fb7d7034a8d8845be493c29317b088e738dbaefd9c9bf328acf6caa SHA512 32a3a57f27c5539daea26a8d125ff1b74ed02417909edd7eb488f89e4663e6027ea160bb0e0f8d3cf9072cfe9005432e1d4a073e4ee5bee12e80ef14e560c6e5
diff --git a/media-video/ogmrip/ogmrip-1.0.1.ebuild b/media-video/ogmrip/ogmrip-1.0.1.ebuild
index 0c63e0d65033..c0d8008fc0a1 100644
--- a/media-video/ogmrip/ogmrip-1.0.1.ebuild
+++ b/media-video/ogmrip/ogmrip-1.0.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG=no
+EAPI=7
 
 inherit gnome2
 
@@ -15,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="aac dbus debug dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.16:2
 	>=app-i18n/enca-1.9
 	dev-libs/libxml2
@@ -45,10 +44,10 @@ COMMON_DEPEND="
 	theora? ( media-libs/libtheora )
 	vorbis? ( media-sound/vorbis-tools )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-util/gtk-doc-am
 	nls? ( sys-devel/gettext
 		dev-util/intltool )
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index d0007cdf4383..3dd30049dc89 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,3 +1,3 @@
 DIST openshot-2.6.1.tar.gz 68566443 BLAKE2B b3a163983bdb811103e5d9307beeb38938719747f743dd58520a0166c08eb11f4592d47bf24224062f9db323a66a2f353eb22f087982b929d60a519cd2c40789 SHA512 9e2d1eae5d72ec2deab914e464dac0d84a864ba2ca63104fad57c90fc907764d5683149fb8136d50030cae993cef9a977e995b0783868988de4668e71a3a5ee2
-EBUILD openshot-2.6.1.ebuild 1399 BLAKE2B ec7aac8b80aaa9204390d6f874044c46bc3e2a7cc1b85a377a083e580909993a0db0b49a7279b99f3ed9fab6ab996a0261ecbce3dfbc04f2bc6c264446df7134 SHA512 b8fad7214d387979a2959d0f54ea6acd60ce5136db8842f9ebaad36f36a0fdedad157b6a70ba69cbb5b084402811556f4161d7226d4ee2efcd6ff6dcba24ab89
+EBUILD openshot-2.6.1.ebuild 1399 BLAKE2B 742e27e493b6b04aa13b8baac50aed5d3bc29a7516c77927c871a294cf941b7d890690f7ef6d77ddba8c90208592b8a1d69b33a78e3cb9dcd3721b48a991e77b SHA512 8bf224e7f294e88d0409a77f04414962927114e3cbc8855a45a1aaa54c02619e730d938b8c14c3cfb27f552aa1fcf84e9755642df597df115fd1deee5c033f60
 MISC metadata.xml 521 BLAKE2B 0594441c26e88ba0aa7ea85be94580dd73588711f4a9c529ab7525b7535a3753579f7ab17d71a9ee4d801b269eeb214a4a5886a9bf2c89752ea6d9540a191294 SHA512 1028c0ac29289a8507d9e23e963c4f3341fdc59d36d06780f6d212f667212509d50781be5544636827af141d8f0d16c45ece1bd8010f37ee6c91464b9dd14687
diff --git a/media-video/openshot/openshot-2.6.1.ebuild b/media-video/openshot/openshot-2.6.1.ebuild
index 9add97810814..48be05d13972 100644
--- a/media-video/openshot/openshot-2.6.1.ebuild
+++ b/media-video/openshot/openshot-2.6.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="$(python_gen_cond_dep '
 		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 	')
-	>=media-libs/libopenshot-0.2.6:0=[python,${PYTHON_SINGLE_USEDEP}]"
+	>=media-libs/libopenshot-0.2.7:0=[python,${PYTHON_SINGLE_USEDEP}]"
 DEPEND=""
 BDEPEND="$(python_gen_cond_dep '
 		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index ef1d5c9c68be..49f3b4773437 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -10,22 +10,16 @@ AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa17
 AUX pipewire-0.3.38-find-readline.patch 1546 BLAKE2B c8d6a8d53e8f71792c5055dabb0a66d8a2b93641e4ade45542fbcb3269ebabb3319c1225f63433cccf8000f4585607383a903045112e9bd204f95bed4e92546e SHA512 c09d604e09552c1dca29b9709c8571a9bc1393fa885e249d8e71403a5669ef732d0e14b9a7c9f315a55b03c2dd2022bfa9f71f4430ae7f93a8d01b686f6bf246
 AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a8d2f5c4ac09ba9fd448b3c77446dc523a07d8ed090f08fec1029357c5cb67ea696f57aa3c22de1df5aa01d789c5c96cfdab5 SHA512 e35d35905da4f35b1db5c1e8a8dada24e83320dc38c4353f7c7dc4cc442c9a73aed02b4df99d66983683f36a004f85bdba9a287ff9e0e8ce71624e1703fced7b
 AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0
-AUX pipewire-0.3.39-endian-test-fix.patch 3368 BLAKE2B 1118b19aa84075a936884c638f895104cbc732199bba6e0d1101c3a0366e9f8ec93fbb7c458e11686e0884a53ad7467bcd32252906f9d5b1883d3ee35d3d03a7 SHA512 f1a83c761f3b49b3782e17190454718d15ad6e5a9c2f729c95c04a419cf5fb3f2222d86acc0df14a1467feb7381663fa639997711614ebfbfe6f5a6ada335263
-AUX pipewire-0.3.39-fix-build-some-arches.patch 1310 BLAKE2B 31e9f8030ef0f131de9c987371cd9fe62a900792de9c93ebe95ec489f7d1a20475ea128ea6a78d98807788a6ec0319ba39880033e2e8aa17c8a66119d482654a SHA512 0230f63612ff3b551e24ac9fba88df6920d4f23cc726e55a81aaa82b18293059815743b10043603010f7e42573f2f3f3344a4c7462eb8060ac9394651595fda9
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
-DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
 DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
-DIST pipewire-0.3.39.tar.gz 1671751 BLAKE2B 6ed56d43a45244c29a29f714eba1dbf911997f91d3e3df2cc1547051d52a2853f4d4c745aaf866ae18b63668f3fb9b7d3338deaad90d229c5fab1641482c6761 SHA512 75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d
 DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371 SHA512 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
-EBUILD pipewire-0.3.36.ebuild 10264 BLAKE2B 4c34ce0089bf417366a1cc2eb6e5a83d84af4816db5da53fe0293504c26ddd3d0caef8e4cb48fd3c1a48cb4424720f31319e6f3d99729213595498d447ace0dd SHA512 a4ad4dfe0969fd41533e6742843e8b4332fc0122c4327e3198ae8c7a84be166f008c9ed694f14a56b56bfc129a6678651a17a168b96b13329485be2af378930d
-EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
+EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
 EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
-EBUILD pipewire-0.3.39-r4.ebuild 10888 BLAKE2B 9a229f85583bd255a3f2ad0c432db4e8b5cd0f628a778ddca5ca7a7d97acf90f0af4cb8a22a238f7a0a4706cc268f7278a5d44406457e5026e9a00a8d76c0cee SHA512 a95610efddadb30ee1db556bd6fef7d5d090b416354f39bab80a8cf912eaed78f50c4d8333a82fb617a822c22b97c8541d83d425fbac73959fa5577c8bafc294
-EBUILD pipewire-0.3.40-r1.ebuild 10786 BLAKE2B 2dd1b5222a5622c95b981d2279db8a2ca91dd39193c3c5df101adba4d8f349c22fa8f53452afda7ff4b5df932f049a5de93b0337f00b7153c799da64af2be3cc SHA512 1fca338325deda74acfd0c2bc673e2329e109b943e27e61b9d042d58a4b32f3ae92ef76ff5237b30407bf13c200fff50943d6d329d5775e24969e5cccaba6554
-EBUILD pipewire-9999.ebuild 10786 BLAKE2B 2dd1b5222a5622c95b981d2279db8a2ca91dd39193c3c5df101adba4d8f349c22fa8f53452afda7ff4b5df932f049a5de93b0337f00b7153c799da64af2be3cc SHA512 1fca338325deda74acfd0c2bc673e2329e109b943e27e61b9d042d58a4b32f3ae92ef76ff5237b30407bf13c200fff50943d6d329d5775e24969e5cccaba6554
+EBUILD pipewire-0.3.40-r1.ebuild 10959 BLAKE2B 1869effe51d3304a72e2895e5189f4bd7e38098eadd06be89cc9530751c49facf65381fc2ad0567f87fa98611fb467c495ddfb5e94d6a5b2ccad4766e187d0b0 SHA512 50b03556c10ef02a3e2e4edf8d4aeb219936ee8adb696e421e1bee59f11862e329bf622710fa193471e222d05ba4f0054450947f60b934a87e9adfa6ad16a99d
+EBUILD pipewire-9999.ebuild 10959 BLAKE2B 1869effe51d3304a72e2895e5189f4bd7e38098eadd06be89cc9530751c49facf65381fc2ad0567f87fa98611fb467c495ddfb5e94d6a5b2ccad4766e187d0b0 SHA512 50b03556c10ef02a3e2e4edf8d4aeb219936ee8adb696e421e1bee59f11862e329bf622710fa193471e222d05ba4f0054450947f60b934a87e9adfa6ad16a99d
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
deleted file mode 100644
index 2687299b235d..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5dfc3494dc4635918e74b9f3d717a39a74b28554.patch
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2.patch
-
-From 5dfc3494dc4635918e74b9f3d717a39a74b28554 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:15:17 +0200
-Subject: [PATCH] map: use uintptr_t for the next pointer
-
-This aligns the low bits of the next field with the low bits of the
-pointer on big endian cpus.
-
-Fixes #1747
----
- src/pipewire/map.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pipewire/map.h b/src/pipewire/map.h
-index f47dfa6b3..1867fa4d3 100644
---- a/src/pipewire/map.h
-+++ b/src/pipewire/map.h
-@@ -74,7 +74,7 @@ extern "C" {
-  * first item to get re-used on the next insert.
-  */
- union pw_map_item {
--	uint32_t next;	/* next free index */
-+	uintptr_t next;	/* next free index */
- 	void *data;	/* data of this item, must be an even address */
- };
- 
--- 
-GitLab
-
-From c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:11:56 +0200
-Subject: [PATCH] map: make _insert_at() fail on a removed item
-
-You are only supposed to use _insert_new()/_remove() or _insert_at()
-on the map, If we detect a _insert_at() to a removed item,
-return an error because else we might corrupt the free list.
-
-Update unit test accordingly.
----
- src/pipewire/map.h | 15 ++-------------
- test/test-map.c    | 17 +----------------
- 2 files changed, 3 insertions(+), 29 deletions(-)
-
-diff --git a/src/pipewire/map.h b/src/pipewire/map.h
-index fd57f7f7c..f47dfa6b3 100644
---- a/src/pipewire/map.h
-+++ b/src/pipewire/map.h
-@@ -182,20 +182,9 @@ static inline int pw_map_insert_at(struct pw_map *map, uint32_t id, void *data)
- 		if (item == NULL)
- 			return -errno;
- 	} else {
--		if (pw_map_id_is_free(map, id)) {
--			uint32_t *current = &map->free_list;
--			while (*current != SPA_ID_INVALID) {
--				uint32_t current_id = (*current) >> 1;
--				uint32_t *next = &pw_map_get_item(map, current_id)->next;
--
--				if (current_id == id) {
--					*current = *next;
--					break;
--				}
--				current = next;
--			}
--		}
- 		item = pw_map_get_item(map, id);
-+		if (pw_map_item_is_free(item))
-+			return -EINVAL;
- 	}
- 	item->data = data;
- 	return 0;
-diff --git a/test/test-map.c b/test/test-map.c
-index dd1df77a8..b6d7681ce 100644
---- a/test/test-map.c
-+++ b/test/test-map.c
-@@ -188,7 +188,6 @@ PWTEST(map_insert_at_free)
- 	int data[3] = {1, 2, 3};
- 	int new_data = 4;
- 	int *ptr[3] = {&data[0], &data[1], &data[3]};
--	int *new_ptr = &new_data;
- 	int idx[3];
- 	int rc;
- 
-@@ -225,21 +224,7 @@ PWTEST(map_insert_at_free)
- 	}
- 
- 	rc = pw_map_insert_at(&map, item_idx, &new_data);
--	pwtest_neg_errno_ok(rc);
--	pwtest_ptr_eq(new_ptr, pw_map_lookup(&map, item_idx));
--
--	if (before_idx != SKIP && before_idx != item_idx) {
--		rc = pw_map_insert_at(&map, before_idx, &ptr[before_idx]);
--		pwtest_neg_errno_ok(rc);
--		pwtest_ptr_eq(&ptr[before_idx], pw_map_lookup(&map, before_idx));
--	}
--
--	if (after_idx != SKIP && after_idx != item_idx) {
--		rc = pw_map_insert_at(&map, after_idx, &ptr[after_idx]);
--		pwtest_neg_errno_ok(rc);
--		pwtest_ptr_eq(&ptr[after_idx], pw_map_lookup(&map, after_idx));
--	}
--
-+	pwtest_neg_errno(rc, -EINVAL);
- 	pw_map_clear(&map);
- 
- 	return PWTEST_PASS;
--- 
-GitLab
-
diff --git a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
deleted file mode 100644
index fe5392e29a3a..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 21 Oct 2021 11:09:48 +0200
-Subject: [PATCH] cpu: fix compilation on some architectures
-
---- a/spa/plugins/support/cpu.c
-+++ b/spa/plugins/support/cpu.c
-@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
- 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
- 			this->vm_type = atoi(str);
- 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL)
--			impl_cpu_zero_denormals(this, spa_atob(str));
-+			spa_cpu_zero_denormals(&this->cpu, spa_atob(str));
- 	}
- 
- 	spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:32:16 +0200
-Subject: [PATCH] cpu: disable VFP asm when not available
-
-Fixes #1746
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable)
- 			"msr	fpcr, %0		\n"
- 			"isb				\n"
- 			: "=r"(cw)::"memory");
--#else
-+#elif (defined(__VFP_FP__) && !defined(__SOFTFP__))
- 	uint32_t cw;
- 	if (enable)
- 		__asm__ __volatile__(
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild
index 8c7b2820b89b..3225dc16d442 100644
--- a/media-video/pipewire/pipewire-0.3.36.ebuild
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.37.ebuild b/media-video/pipewire/pipewire-0.3.37.ebuild
deleted file mode 100644
index 7725dfa300f5..000000000000
--- a/media-video/pipewire/pipewire-0.3.37.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		# Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
-		# but default is same as before and right now, this is fatal with unreleased Meson.
-		#$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
-		elog
-		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user enable --now pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-		elog "autospawning of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable --now ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.39-r4.ebuild b/media-video/pipewire/pipewire-0.3.39-r4.ebuild
deleted file mode 100644
index 96a68064f996..000000000000
--- a/media-video/pipewire/pipewire-0.3.39-r4.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND="media-video/wireplumber"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	# Upstream
-	"${FILESDIR}"/${P}-fix-build-some-arches.patch
-	"${FILESDIR}"/${P}-endian-test-fix.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
-		elog
-		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user enable --now wireplumber.service"
-		elog
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-			elog "autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable --now ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.40-r1.ebuild b/media-video/pipewire/pipewire-0.3.40-r1.ebuild
index 9de3b924f048..93882727fc56 100644
--- a/media-video/pipewire/pipewire-0.3.40-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.40-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -224,23 +224,26 @@ pkg_postinst() {
 	fi
 
 	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
 		elog
-		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
 		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
 		elog
-		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
 		elog
 		elog "A reboot is recommended to avoid interferences from still running"
 		elog "PulseAudio daemon."
 		elog
-		elog "Both, new users and those upgrading, need to enable WirePlumber"
+		elog "Both new users and those upgrading need to enable WirePlumber"
 		elog "for relevant users:"
 		elog
-		elog "  systemctl --user enable --now wireplumber.service"
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
 		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
 	else
 		ewarn "PipeWire daemon startup has been moved to a launcher script!"
 		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
@@ -273,6 +276,7 @@ pkg_postinst() {
 		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
 		elog "and just override the sections you want to change."
 	fi
+	elog
 
 	elog "For latest tips and tricks, troubleshooting information and documentation"
 	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
@@ -284,7 +288,7 @@ pkg_postinst() {
 	if has_version 'net-misc/ofono' ; then
 		ewarn "Native backend has become default. Please disable oFono via:"
 		if systemd_is_booted ; then
-			ewarn "systemctl disable --now ofono"
+			ewarn "systemctl disable ofono"
 		else
 			ewarn "rc-update delete ofono"
 		fi
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 9de3b924f048..93882727fc56 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -224,23 +224,26 @@ pkg_postinst() {
 	fi
 
 	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
 		elog
-		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
 		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
 		elog
-		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
 		elog
 		elog "A reboot is recommended to avoid interferences from still running"
 		elog "PulseAudio daemon."
 		elog
-		elog "Both, new users and those upgrading, need to enable WirePlumber"
+		elog "Both new users and those upgrading need to enable WirePlumber"
 		elog "for relevant users:"
 		elog
-		elog "  systemctl --user enable --now wireplumber.service"
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
 		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
 	else
 		ewarn "PipeWire daemon startup has been moved to a launcher script!"
 		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
@@ -273,6 +276,7 @@ pkg_postinst() {
 		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
 		elog "and just override the sections you want to change."
 	fi
+	elog
 
 	elog "For latest tips and tricks, troubleshooting information and documentation"
 	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
@@ -284,7 +288,7 @@ pkg_postinst() {
 	if has_version 'net-misc/ofono' ; then
 		ewarn "Native backend has become default. Please disable oFono via:"
 		if systemd_is_booted ; then
-			ewarn "systemctl disable --now ofono"
+			ewarn "systemctl disable ofono"
 		else
 			ewarn "rc-update delete ofono"
 		fi
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index a2ef47803ac8..37faf3f89736 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,6 +1,6 @@
-DIST shotcut-21.03.21.tar.gz 4101401 BLAKE2B fb716215ba31b4b057080f05a59462a674aebfa364924240f96ebf87bb94e4ccb649c2452e952b507037a8e62840cb7c805ee258761bb21d515173bba26dfdd1 SHA512 402d714df7285d49269891e5def0b8a1a46f54b6ec88b0201981bdf8d866c49e83bbbf513805795630e39335e0fddc2457e1a7db582affe4a4d057ac5ab4e2bb
 DIST shotcut-21.09.20.tar.gz 4358591 BLAKE2B 3919cb0f5c3f0aaa665729227d077cdeac1569102509bbf6be7f9451cadda8e22b38a8e796ef5fd2f5dd84bff2abbd98103a0917eb9acacdc9db771968f723ef SHA512 6c2463c8d81c4e61b59d97ba2ee8f9aba5c420ee50b6c46c0e5f1c177e44cea6bc1fab5a7184ce8b13d2818b207efffe3c12f4d1682ce002279ba16c1c9bd624
-EBUILD shotcut-21.03.21.ebuild 1388 BLAKE2B 00e1700637768e7559366da0a1e4a7b523ee41e8a07104696cc81298d5617dc032ab9cdd08d4a258b5872f1ef806d04bf3733dfa4097601d15ab5c3471d17e86 SHA512 2745d89a9e8b0eb25afe019994f207aa9d63d07fa34d5baf6972a1af1524516b6fae61f6dbcb9f57fc596d7b3426b07e1980706d186c72500f8965a3edb52ef7
+DIST shotcut-21.10.31.tar.gz 4408987 BLAKE2B 88c77503475de21a4989d0e412a214c2d5c2c30d60abf11e06326a599e14c4b1a7d7b678c494d13223cf7e11c6dd12c810e7d112750f4f18308250693316a8cd SHA512 de5d9992a41217323b3d96cc7618ed5adc633e7d0e65b6f8f189405008f6faba011a80f38cda0126b18ab28a359f6784078cb298b2ee29dcdfdc6769963714f3
 EBUILD shotcut-21.09.20.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68
+EBUILD shotcut-21.10.31.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68
 EBUILD shotcut-9999.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68
 MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7
diff --git a/media-video/shotcut/shotcut-21.03.21.ebuild b/media-video/shotcut/shotcut-21.10.31.ebuild
index ef956ac31c78..c758f989295d 100644
--- a/media-video/shotcut/shotcut-21.03.21.ebuild
+++ b/media-video/shotcut/shotcut-21.10.31.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils xdg
 
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml]
+	>=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
 	media-video/ffmpeg
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest
index c51813c586ff..d46964f03cc0 100644
--- a/media-video/videotrans/Manifest
+++ b/media-video/videotrans/Manifest
@@ -1,3 +1,3 @@
 DIST videotrans-1.6.1.tar.bz2 98091 BLAKE2B 47adcceb81889979a3af14deb214369fac792fd340e47383b8296082071db9d5b53f389869b478f4ea0faaf14744a99f9538750f6267e60e0683fc6156b701d9 SHA512 8d2ab30316d099d7bf37e712eab04089bcc24d2f8b59cb1fd464970a66ca1c480e4b9bb67b0a3e26b509c7711e92ea346713e3ec5d2fd3e8d4ff0a4372e2787a
-EBUILD videotrans-1.6.1-r2.ebuild 698 BLAKE2B e3da74c005c63245ab6bcdc27ff74402d0e677915949d4ece86708d1af00c94a199becfbaf72c800d39074c70c8ab637ec3d5a1a5f80c86d7ba503e5cb05d410 SHA512 16f393be9e235780d29e0edf6e53cbe1e50fc327b937bb13452deddd327563039e8f9a69667b0d59b8082c03f615baf49789995b2dcf5cf4438c37b15f62b57f
+EBUILD videotrans-1.6.1-r2.ebuild 719 BLAKE2B 5a9e8c91f4046eea7088bf5f700f8d1a0a5df488f12c16d43d2d3b62e0244d0c6f7cf3234d19f9934f92aec2c5570b07796b8d0e7e8bd7ef56c906d881da1680 SHA512 a5c9386d6019b6b7e6f74d8f371e6164600ad27cce82c85045722aa21982ba54086e6b8be83185009ef5ebea1e52631fb8af94b0b70c91743defbd6ba45879d2
 MISC metadata.xml 627 BLAKE2B 609a9d3e4fe9da353d6031f65bb3c8555e22ced390bb3f85fd989a83366d2510cbc09759fa1e4bfd145927e5a0293103bcefb61d48b000efbfed097c399f5751 SHA512 7c03087b664ff1b813c4712bbe207257c126a76a387ee179b1d6397e86d37edc2aa38389c206581b37682f7de668cea8d397b9a4077585293b7f8593f481cd46
diff --git a/media-video/videotrans/videotrans-1.6.1-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
index ea33b07bb2a6..93db7f9ec91e 100644
--- a/media-video/videotrans/videotrans-1.6.1-r2.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=8
 
 DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
 HOMEPAGE="http://videotrans.sourceforge.net/"
@@ -10,6 +9,7 @@ SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64"
 
 DEPEND="
 	media-video/mplayer
@@ -25,10 +25,11 @@ RDEPEND="${DEPEND}
 	sys-devel/bc
 "
 
-DOCS="aspects.txt CHANGES THANKS TODO"
+DOCS=( aspects.txt CHANGES THANKS TODO )
 
 src_prepare() {
+	default
 	# fixing LDFLAGS usage
-	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in || die
 
 }
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 4d6a61ef5bff..ba91fb439e52 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,11 +1,9 @@
-AUX wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch 1495 BLAKE2B 2611a44c7602adf962aea0f4ab1871e662034ae86602c827c62d788ab516c392434bd9e5b6e4e180f322ee0e217eed2f7e78376d47a48f5d00e448e965abe201 SHA512 eaee2bd3e3609f896a297d44107bb527009e3898a9a033e5ce61fc69fedab1571403139c4dd2b9a63f6c3ba9db0da8ca7dcb94ec86e634a45ad44ae22018422f
-AUX wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch 1027 BLAKE2B 26af0a13f5cb588587132b839245bdf76c2974d38e28da9e7a3f5e0bce1635e22ee9336d9bffa80950b858d03c5140394a38578b8602fd95ef84172b207fba93 SHA512 fa63fdf61ead8c6efff1d64da80902bdb0994e298021863d1cc7a1425eae233a429a99cfb80a15d583010ab5b9225f8ad3ca9097242d51d4feb3193c1bc03170
-AUX wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch 2567 BLAKE2B adb6cb0d5bdd19bb386838aee18c3f0d2b81194786abcd1e79a27e45492790fbf797e1a92efa11b99405bbac3d339b6e5e4fd761743ff445c21bd92af098dca6 SHA512 90c2adcc4d4e70a3432cb07dd053b37bd925b0807ba49439df41b105c25157a66f5fed5494a072010ff24f2d7b7b065616b99971f17330117b27ea17760cc938
-AUX wireplumber-0.4.2-meson-Build-tests-conditionally.patch 1232 BLAKE2B f828160ff6e86f3a6b693a4e09fcc6f0647d742998777264483906d8974e294fa1fb9522d67c7a12c3893f6182a248cc14c50c785a50115d65a6f0779b615079 SHA512 b89c1519fb10c1b59ea8ed42f24cfff9b03c7024b33fb88ad8d5bfa57042ee6d1baf8f1a17e897b7da97b4fd4b91c04e7a66ee5105762a4ae690998145b20995
-AUX wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch 1466 BLAKE2B bfbec8088c33d38a637cbdc517c1bad3b472b296c6302872cefaa444b1524248ce73b14aef3b9d1d7ef35528b46cadce8dd9a846c2e9b43d8b232f894c58a839 SHA512 4b654808c2e3c9b5b8f401d2874040e32efaa25bfb76cd5080c529c75922685e3466d570bd7278e2b6079f6fa28134e5b493f3d54c26d06993572f7aa08ce142
-DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c
+AUX wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch 1009 BLAKE2B 32d9e359a705db1b60d0ed8c53a6e7c7bab85c73b0e8bce02fac5ee76e090393969a4abe041e585f0b32724f7946540677dd85b5ebdc380e6982823352ecfc75 SHA512 1b9a8aba86969dfb3a0372147596181e34088b42eacd4725df99ec627fa70cbe23d55c56d46f4f1780cb396e40c39720de96ce7fa4893af8e5acf697709614f6
+AUX wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch 742 BLAKE2B 480dfc48954a13323bc171e3b4672cedad27fdde05d8f28e263eddffd80c51ecdaa5046c30f57cd1a28a08270e59a38a3202fe496e4af84494d3b52614858880 SHA512 5400a2d4d1e61abe8d6c22c6540a83fafb25b6f4555156b66de9ad8350ce176faed00099c7a40b5286c82644ee09b5890da2521078f91e51d5a66fce7ed82a2a
+AUX wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch 1672 BLAKE2B a5d8911754670c9303e35d15df45ecdd5bb4b2d837dea2000ff5e102bfb789ea678ace39356579f0fc86273ec58a7c5cc6eea701c3b7a274d742cddfaa3575d3 SHA512 8605622ed43fef37e1ca49edaae4812618e5ad83904b682b2b903e9de92060fd9b4a0a025d5716cd16339b94ae67b1ee9622949fae73153df0bbc5b9b3c2ebd9
+AUX wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch 1203 BLAKE2B 12e07a42d99187cba61d5428c235aba9207bd708e9346d53618b92c0ed06893e6295dbb49b9529e198f53c7ce4b573b897c349de8bb688273656de237ab3bca1 SHA512 4a5bb0a79c507945652a5600304fae1c9bf6fe028053a890c1633be2c82491ada487c9943ac29c6ed26f9e86a5d7f76140ec78bbaa394e41e1f082d50a7b56ef
 DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
-EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679
-EBUILD wireplumber-0.4.5.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a
-EBUILD wireplumber-9999.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a
+EBUILD wireplumber-0.4.5-r1.ebuild 2830 BLAKE2B c40cc607cf0ad9e563d6e539514ac1875828c54511202a1ac51e585c576db36d127475533a94f3bb40e028860fc237e4564049ef0d526139892f18155412b75b SHA512 a5278113619ee405d88897e55481e4b985f77793667a8e6d0279123a9fa3e170fa05bcdd0f4b0532187777b679eb66717ca6307c19e3143fecedfe4c2e5fe5f4
+EBUILD wireplumber-0.4.5.ebuild 2487 BLAKE2B f0e2ef02c38c1d37656d38fe42515f9a29b4d205f1d6cc77a89e015ed23ef944c1ffac03f1abd7e95bd7408b25b914cebdffb2a71afdcab9b9f3e4f0c2af90ff SHA512 bf2be2d1c6caae3d3e4a994fcb5ff913b539bbcec96b1fc3729cb8971b2eb83adecc50edd9ccf2f15f35dd94a1aeccc89a599fc0f08546ef4a7cadcc4620f367
+EBUILD wireplumber-9999.ebuild 2487 BLAKE2B f0e2ef02c38c1d37656d38fe42515f9a29b4d205f1d6cc77a89e015ed23ef944c1ffac03f1abd7e95bd7408b25b914cebdffb2a71afdcab9b9f3e4f0c2af90ff SHA512 bf2be2d1c6caae3d3e4a994fcb5ff913b539bbcec96b1fc3729cb8971b2eb83adecc50edd9ccf2f15f35dd94a1aeccc89a599fc0f08546ef4a7cadcc4620f367
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch b/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch
deleted file mode 100644
index a519e4212828..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 32d96189b807ab53317a33217c661ce4b1ac8e49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
- <89q1r14hd@relay.firefox.com>
-Date: Wed, 15 Sep 2021 12:21:40 +0300
-Subject: [PATCH 3/5] bluez: add basic check for nil monitor
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If PipeWire is built without Bluetooth support, then
-
-`monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props)`
-
-will result in a nil monitor. This commit adds a basic sanity check
-to avoid further using the nil variable.
-
-Thanks-to: Pascal Flöschel (initial bug report)
-Thanks-to: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Bug: https://bugs.gentoo.org/813043
----
- src/scripts/monitors/bluez.lua | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/scripts/monitors/bluez.lua b/src/scripts/monitors/bluez.lua
-index fc229fa..4066536 100644
---- a/src/scripts/monitors/bluez.lua
-+++ b/src/scripts/monitors/bluez.lua
-@@ -129,5 +129,9 @@ local monitor_props = config.properties or {}
- monitor_props["api.bluez5.connection-info"] = true
- 
- monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props)
--monitor:connect("create-object", createDevice)
--monitor:activate(Feature.SpaDevice.ENABLED)
-+if monitor then
-+  monitor:connect("create-object", createDevice)
-+  monitor:activate(Feature.SpaDevice.ENABLED)
-+else
-+  Log.message("PipeWire's BlueZ SPA missing or broken. Bluetooth not supported.")
-+end
--- 
-2.33.0
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch b/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch
deleted file mode 100644
index 7653de28bbbb..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 05334c1ec72af68f915ea18e32b230857918f600 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
- <89q1r14hd@relay.firefox.com>
-Date: Wed, 15 Sep 2021 13:23:45 +0300
-Subject: [PATCH 5/5] lib/wp/device: demote missing SPA warning to message
-
-Warnings can be scary, so best not to scare users with what's likely
-intentional omission of a particular SPA plugin (currently V4L & BlueZ).
----
- lib/wp/device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/wp/device.c b/lib/wp/device.c
-index f0c32af..9a0b995 100644
---- a/lib/wp/device.c
-+++ b/lib/wp/device.c
-@@ -617,7 +617,7 @@ wp_spa_device_new_from_spa_factory (WpCore * core,
-   handle = pw_context_load_spa_handle (pw_context, factory_name,
-       props ? wp_properties_peek_dict (props) : NULL);
-   if (!handle) {
--    wp_warning ("SPA handle '%s' could not be loaded; is it installed?",
-+    wp_message ("SPA handle '%s' could not be loaded; is it installed?",
-         factory_name);
-     return NULL;
-   }
--- 
-2.33.0
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch b/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch
deleted file mode 100644
index 2bb3a8d653e8..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 2a5f9c51f2f8dd29cd19a14f165ca2b425a172fc Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Wed, 15 Sep 2021 12:51:47 +0300
-Subject: [PATCH 2/5] lua/api: fix object constructors to fail gracefully
-
----
- modules/module-lua-scripting/api.c | 35 ++++++++++++++++++------------
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/modules/module-lua-scripting/api.c b/modules/module-lua-scripting/api.c
-index 5691b63..2830477 100644
---- a/modules/module-lua-scripting/api.c
-+++ b/modules/module-lua-scripting/api.c
-@@ -836,8 +836,9 @@ device_new (lua_State *L)
- 
-   WpDevice *d = wp_device_new_from_factory (get_wp_export_core (L),
-       factory, properties);
--  wplua_pushobject (L, d);
--  return 1;
-+  if (d)
-+    wplua_pushobject (L, d);
-+  return d ? 1 : 0;
- }
- 
- /* WpSpaDevice */
-@@ -855,8 +856,9 @@ spa_device_new (lua_State *L)
- 
-   WpSpaDevice *d = wp_spa_device_new_from_spa_factory (get_wp_export_core (L),
-       factory, properties);
--  wplua_pushobject (L, d);
--  return 1;
-+  if (d)
-+    wplua_pushobject (L, d);
-+  return d ? 1 : 0;
- }
- 
- static int
-@@ -903,8 +905,9 @@ node_new (lua_State *L)
- 
-   WpNode *d = wp_node_new_from_factory (get_wp_export_core (L),
-       factory, properties);
--  wplua_pushobject (L, d);
--  return 1;
-+  if (d)
-+    wplua_pushobject (L, d);
-+  return d ? 1 : 0;
- }
- 
- static int
-@@ -1011,8 +1014,9 @@ impl_node_new (lua_State *L)
- 
-   WpImplNode *d = wp_impl_node_new_from_pw_factory (get_wp_export_core (L),
-      factory, properties);
--  wplua_pushobject (L, d);
--  return 1;
-+  if (d)
-+    wplua_pushobject (L, d);
-+  return d ? 1 : 0;
- }
- 
- /* Port */
-@@ -1045,8 +1049,9 @@ link_new (lua_State *L)
-   }
- 
-   WpLink *l = wp_link_new_from_factory (get_wp_core (L), factory, properties);
--  wplua_pushobject (L, l);
--  return 1;
-+  if (l)
-+    wplua_pushobject (L, l);
-+  return l ? 1 : 0;
- }
- 
- /* Client */
-@@ -1124,8 +1129,9 @@ session_item_new (lua_State *L)
- {
-   const char *type = luaL_checkstring (L, 1);
-   WpSessionItem *si = wp_session_item_make (get_wp_core (L), type);
--  wplua_pushobject (L, si);
--  return 1;
-+  if (si)
-+    wplua_pushobject (L, si);
-+  return si ? 1 : 0;
- }
- 
- static int
-@@ -1135,8 +1141,9 @@ session_item_get_associated_proxy (lua_State *L)
-   const char *typestr = luaL_checkstring (L, 2);
-   WpProxy *proxy = wp_session_item_get_associated_proxy (si,
-       parse_gtype (typestr));
--  wplua_pushobject (L, proxy);
--  return 1;
-+  if (proxy)
-+    wplua_pushobject (L, proxy);
-+  return proxy ? 1 : 0;
- }
- 
- static int
--- 
-2.33.0
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch b/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch
deleted file mode 100644
index dab53c71bf4a..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3b24c419b497c283e64df23b3b5eecd4c3d51927 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 14 Sep 2021 05:07:41 +0100
-Subject: [PATCH 1/5] meson: Build tests conditionally
-
-It's useful downstream to be able to control building
-tests, as there's not much use building them if we're
-not going to run them.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- meson.build       | 5 ++++-
- meson_options.txt | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3712a82..5f87ade 100644
---- a/meson.build
-+++ b/meson.build
-@@ -109,4 +109,7 @@ subdir('lib')
- subdir('docs')
- subdir('modules')
- subdir('src')
--subdir('tests')
-+
-+if get_option('tests')
-+  subdir('tests')
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index a7a0a89..4008864 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -24,3 +24,5 @@ option('systemd-user-unit-dir',
-        description : 'Directory for user systemd units')
- option('glib-supp', type : 'string', value : '',
-        description: 'The glib.supp valgrind suppressions file to be used when running valgrind')
-+option('tests', type : 'boolean', value : 'true',
-+       description : 'Build the test suite')
--- 
-2.33.0
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch b/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch
deleted file mode 100644
index f7fee3d11e4a..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3b41df35a885b4db04528d839b87e88bf1345240 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
- <89q1r14hd@relay.firefox.com>
-Date: Wed, 15 Sep 2021 13:08:04 +0300
-Subject: [PATCH 4/5] v4l: add basic check for nil monitor
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If PipeWire is built without V4L support, then
-
-`monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {})`
-
-will result in a nil monitor. This commit adds a basic sanity check
-to avoid further using the nil variable.
-
-Thanks-to: Pascal Flöschel (initial bug report)
-Thanks-to: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Bug: https://bugs.gentoo.org/813043
----
- src/scripts/monitors/v4l2.lua | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/scripts/monitors/v4l2.lua b/src/scripts/monitors/v4l2.lua
-index e698cd7..fd9a20d 100644
---- a/src/scripts/monitors/v4l2.lua
-+++ b/src/scripts/monitors/v4l2.lua
-@@ -131,5 +131,9 @@ function createDevice(parent, id, type, factory, properties)
- end
- 
- monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {})
--monitor:connect("create-object", createDevice)
--monitor:activate(Feature.SpaDevice.ENABLED)
-+if monitor then
-+  monitor:connect("create-object", createDevice)
-+  monitor:activate(Feature.SpaDevice.ENABLED)
-+else
-+  Log.message("PipeWire's V4L SPA missing or broken. Video4Linux not supported.")
-+end
--- 
-2.33.0
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch b/media-video/wireplumber/files/wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch
new file mode 100644
index 000000000000..511dc6df377e
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch
@@ -0,0 +1,33 @@
+From efd24584182903bf5ee4660a3b3360cc47ad895b Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 23 Nov 2021 13:17:29 +0100
+Subject: [PATCH] alsa: handle the release-requested signal
+
+Handle the release-requested signal by destroying the device and
+then calling release.
+
+Fixes pipewire/pipewire#1846
+---
+ src/scripts/monitors/alsa.lua | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua
+index 68c39d8..be4648e 100644
+--- a/src/scripts/monitors/alsa.lua
++++ b/src/scripts/monitors/alsa.lua
+@@ -287,6 +287,12 @@ function prepareDevice(parent, id, type, factory, properties)
+       end
+     end)
+ 
++    rd:connect("release-requested", function (rd)
++        Log.info("release requested")
++        parent:store_managed_object(id, nil)
++        rd:call("release")
++    end)
++
+     if jack_device then
+       rd:connect("notify::owner-name-changed", function (rd, pspec)
+         if rd["state"] == "busy" and
+-- 
+2.34.1
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch b/media-video/wireplumber/files/wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch
new file mode 100644
index 000000000000..1554c65e27da
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch
@@ -0,0 +1,27 @@
+From ee5f3f2f195b01fd89ee148da5799b02f99ebb6e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Sun, 14 Nov 2021 19:44:30 +1000
+Subject: [PATCH 3/3] lib: don't read hidden files from the config directory
+
+Fixes #104
+---
+ lib/wp/wp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/wp/wp.c b/lib/wp/wp.c
+index ffdff1a..c356133 100644
+--- a/lib/wp/wp.c
++++ b/lib/wp/wp.c
+@@ -315,6 +315,9 @@ wp_new_files_iterator (WpLookupDirs dirs, const gchar *subdir,
+     if (dir) {
+       const gchar *filename;
+       while ((filename = g_dir_read_name (dir))) {
++        if (filename[0] == '.')
++          continue;
++
+         if (suffix && !g_str_has_suffix (filename, suffix))
+           continue;
+ 
+-- 
+2.34.0
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch b/media-video/wireplumber/files/wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch
new file mode 100644
index 000000000000..70d69093d082
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch
@@ -0,0 +1,47 @@
+From f4546a18e871537be698916178b40091a4a0b377 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 12 Nov 2021 11:19:54 +1000
+Subject: [PATCH 3/3] m-reserve-device: replace the hash table key on new
+ insert
+
+We're using the WpReserveDevice's name as key in the hash table, so we
+must update the key as well when we replace an item in the hashtable -
+the old device (and its name) will be released.
+
+The side-effect of this is that the *third* device with an identical
+name will no longer replace the previous device. This results in the
+following sequence:
+
+- dev1 added: name Audio0
+  - dev1 requests name owner Audio0
+- dev2 added: name Audio0
+  - replace dev1 in the hashtable
+     - dev1 emits "release" signal
+     - dev1 unowns the Audio0 name
+  - dev2 requests name owner Audio0
+- dev3 added: name Audio0
+  - adds to the hashtable because the existing key is now undefined
+  - dev3 requests name owner Audio0
+     - error, you cannot request ownership for the same name twice
+
+Fixes #93
+---
+ modules/module-reserve-device/plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/module-reserve-device/plugin.c b/modules/module-reserve-device/plugin.c
+index d8e4e09..68df6ee 100644
+--- a/modules/module-reserve-device/plugin.c
++++ b/modules/module-reserve-device/plugin.c
+@@ -221,7 +221,7 @@ wp_reserve_device_plugin_create_reservation (WpReserveDevicePlugin *self,
+       NULL);
+ 
+   /* use rd->name to avoid copying @em name again */
+-  g_hash_table_insert (self->reserve_devices, rd->name, rd);
++  g_hash_table_replace (self->reserve_devices, rd->name, rd);
+ 
+   return g_object_ref (rd);
+ }
+-- 
+2.34.0
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch b/media-video/wireplumber/files/wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch
new file mode 100644
index 000000000000..0ce16a647697
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch
@@ -0,0 +1,34 @@
+From 83041b0ce277c95afaf1824f525ea0bec516f03f Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 18 Nov 2021 15:23:23 +0100
+Subject: [PATCH 2/3] policy-node: wait for nodes when we become unlinked
+
+If we were linked before but our node is removed, wait until a new node
+becomes available instead of failing.
+
+This fixes an issue where there is only 1 sink available and the card
+profile is toggeled between pro and stereo. After the profile is
+toggled, the sink is removed and the node would be killed with an error
+because there is no fallback sink. The fix is similar to the
+pipewire-media-session logic.
+---
+ src/scripts/policy-node.lua | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
+index 5029d1b..445b1a7 100644
+--- a/src/scripts/policy-node.lua
++++ b/src/scripts/policy-node.lua
+@@ -493,6 +493,9 @@ function handleLinkable (si)
+     if not reconnect then
+       Log.info (si, "... destroy node")
+       node:request_destroy()
++    elseif si_flags[si.id].was_handled then
++      Log.info (si, "... waiting reconnect")
++      return
+     end
+ 
+     local client_id = node.properties["client.id"]
+-- 
+2.34.0
+
diff --git a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.5-r1.ebuild
index dbee3e92073a..977f3e5b79a7 100644
--- a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -21,9 +21,12 @@ HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
 
 LICENSE="MIT"
 SLOT="0/0.4"
-IUSE="systemd test"
+IUSE="elogind systemd test"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -37,8 +40,9 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.32
+	>=media-video/pipewire-0.3.39
 	virtual/libc
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
 "
 
@@ -51,11 +55,10 @@ RDEPEND="${DEPEND}"
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.2-meson-Build-tests-conditionally.patch
-	"${FILESDIR}"/${PN}-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch
-	"${FILESDIR}"/${PN}-0.4.2-bluez-add-basic-check-for-nil-monitor.patch
-	"${FILESDIR}"/${PN}-0.4.2-v4l-add-basic-check-for-nil-monitor.patch
-	"${FILESDIR}"/${PN}-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch
+	"${FILESDIR}"/${PN}-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch
+	"${FILESDIR}"/${PN}-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch
+	"${FILESDIR}"/${PN}-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch
+	"${FILESDIR}"/${PN}-0.4.5-alsa-handle-the-release-requested-signal.patch
 )
 
 src_configure() {
@@ -63,6 +66,7 @@ src_configure() {
 		-Dintrospection=disabled # Only used for Sphinx doc generation
 		-Dsystem-lua=true # We always unbundle everything we can
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
 		$(meson_feature systemd)
 		-Dsystemd-system-service=false # Matches upstream
 		$(meson_use systemd systemd-user-service)
@@ -76,14 +80,17 @@ src_configure() {
 
 pkg_postinst() {
 	if systemd_is_booted ; then
-		elog "To replace media-session with WirePlumber immediately:"
-		elog "systemctl --user disable --now pipewire-media-session.service"
-		elog "systemctl --user enable --now wireplumber.service"
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
 	else
-		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
-		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
-		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
-		elog "The switch to WirePlumber will happen the next time pipewire is started."
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
-	elog
+	ewarn
 }
diff --git a/media-video/wireplumber/wireplumber-0.4.5.ebuild b/media-video/wireplumber/wireplumber-0.4.5.ebuild
index 8bac4b024755..4773af0d6c42 100644
--- a/media-video/wireplumber/wireplumber-0.4.5.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -75,8 +75,8 @@ pkg_postinst() {
 	if systemd_is_booted ; then
 		ewarn "pipewire-media-session.service is no longer installed. You must switch"
 		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable --now pipewire-media-session.service"
-		ewarn "systemctl --user enable --now wireplumber.service"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
 	else
 		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
 		ewarn "is started (a replacement for directly calling pipewire binary)."
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 8bac4b024755..4773af0d6c42 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -75,8 +75,8 @@ pkg_postinst() {
 	if systemd_is_booted ; then
 		ewarn "pipewire-media-session.service is no longer installed. You must switch"
 		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable --now pipewire-media-session.service"
-		ewarn "systemctl --user enable --now wireplumber.service"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
 	else
 		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
 		ewarn "is started (a replacement for directly calling pipewire binary)."
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index be828e2b2eb5..8a380465b71a 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,5 @@
 DIST yle-dl-20210917.tar.gz 66746 BLAKE2B 91849a5d88615fc01f12ac19cd6c5bc3acf40548c5c024eff6141b6996d0b7b2c9363d1a2d2820cd61f99105fdd1bca835506ba199bf05d2a3b537dc88f41f10 SHA512 a26d4516f932561fe49da4a2c5e7dbc5eb65bcc4e5a7073f3636b70825c54fa9ba74feea55b3f6fcc538f4a300f99262eb4f26ba1e73efd56ff612a86971ac81
+DIST yle-dl-20211203.tar.gz 67057 BLAKE2B 79646d1251ae6e7d99d2b85d5a30d932ff1c8733d4403628561cb5261764349af7a284505b8c1afe2247730e4f1fc523e1d2e862a8df728a26c77102caf412fc SHA512 c407d185a5c703a6e840d1e9c375b492cb2154d568f35f9e33bba06aa79469c4a5c51ea52d6dd67f8757a171fc7344a476c3214339cf3387276a790a9ae574f0
 EBUILD yle-dl-20210917.ebuild 1416 BLAKE2B 907d00143913da09ace5c35e88dccc76559677059eb3332b7f451fb8ee77a6096ee018bde13b8a2f25665b31916336fec467c7cad3ce39efd9408df824dd2770 SHA512 e069ac257aa7aa01e0e419a31ff8c3c12985e5ab1b422f9b6d3f6d0781c171e6f7ded419de8c64b766c1be534fe7fb465271bb35167d3c102bf732abc6818de8
+EBUILD yle-dl-20211203.ebuild 1434 BLAKE2B 555e801edf7a081ef526b32f17f00f96b54ced6a060abc959edcd0699769c2907c7cbb60333a5d72ac851f81b56560b8174d57374a4f016d7f3437f1d36b8ac5 SHA512 5956a60898bb0103e125681852aa0a72505027b6ea369c1fb0a9a92aa5db85dbc7d5a445751131b0c6fab5bede8d452ce59b3e6b24f1e199140d894747e3305f
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/yle-dl/yle-dl-20211203.ebuild b/media-video/yle-dl/yle-dl-20211203.ebuild
new file mode 100644
index 000000000000..afbe7baaaff1
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20211203.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Requires an active internet connection during tests,
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="media-video/ffmpeg
+	net-misc/wget
+	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		${RDEPEND}
+		media-video/ffmpeg[gnutls]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	elog "Sample configuration file has been installed to "
+	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
+	elog
+	optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp
+}