gentoo resync : 20.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
commit: 46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree: db33a91259730be84999e13a8d8168c799f50ac0 /media-video
parent: e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
32 files changed, 429 insertions, 1242 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 68683e9cd602..14a67b56f035 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 391eb81b7f0b..d04bc9b98829 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,8 +1,10 @@
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
+AUX handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch 1016 BLAKE2B ffe0a1dc7d693352010eeeafbc61c9d4df43f148ae2a67449c252d71dfc888589161aa88938ee333d9f082aed6873a2d8f2461c0da14d1af388e311a3f8f6058 SHA512 d6237cf24e97a80a6f407209199af281f31f3b2745051db270f9ff2e887a5da98323c6c48be5d7aa3e59a5da17f2691e503b00137c670a6569baed67d8bd39a0
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
-EBUILD handbrake-9999.ebuild 4177 BLAKE2B 25cb3cfc7d3ceb109bec0000e28c686774135de354e247c05c065c04da16902f7e7f9865aa857358b6c34dabbc0973081d4c89528c5d4a477182f7ea3692a675 SHA512 7f3d69592b79bfa420f60d692cc6c2e6ed17220fb782a93686ae0d84e3c95f953e3faddf85af2d4f7d204d4ced7d0f9a6c92127a59ddf09ef912a03d720bb82c
+EBUILD handbrake-1.3.3-r3.ebuild 4340 BLAKE2B 36a49d49b47572a8b3e19e85f1c03ba6e799fb32d1adc14a771fbe1cc2a88eb7f57d99e48b93df28743e6dcc9c0a7250d9dc74261ccdcc192d212852f66f6b69 SHA512 daaccfe49fdaed9081e4358ec507de703d1b5db020611462595a87f4ab636db3f5a695fb552408431ed2cb009b17101bf486602915e133a9bf2c8853212ec984
+EBUILD handbrake-9999.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
 MISC metadata.xml 887 BLAKE2B b1d57d0087bfd584903bfb4866e385ba5ec6802f6122cce50ad16b558df1f07f85f4e1fe61c2247aec2fa982d7093fb2741c9cb9c93f782f1fd99477f08582ae SHA512 f677e455ad104d74a9ae6a35cf76f87bedde7a96f92c34b951bffd0cf0591857dc52ec43d1226de2918363475b94ad2e9a9035d4e274693c73c95aa9b922e2d4
diff --git a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
new file mode 100644
index 000000000000..d7cc565377fd
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
@@ -0,0 +1,28 @@
+From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
+From: Damiano Galassi <damiog@gmail.com>
+Date: Sat, 10 Apr 2021 13:18:02 +0200
+Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
+
+---
+ libhb/encavcodecaudio.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
+index 52fc4565d..e6cf42414 100644
+--- a/libhb/encavcodecaudio.c
++++ b/libhb/encavcodecaudio.c
+@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list)
+ 
+         // Prepare input frame
+         int     out_size;
+-        AVFrame frame = { .nb_samples = pv->samples_per_frame, };
++        AVFrame frame = { .nb_samples = pv->samples_per_frame,
++                          .format = pv->context->sample_fmt,
++                          .channels = pv->context->channels
++        };
+ 
+         out_size = av_samples_get_buffer_size(NULL,
+                                               pv->context->channels,
+-- 
+2.26.3
+
diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..a02d836a04b5
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	app-arch/xz-utils
+	media-libs/speex
+	dev-libs/jansson:=
+	dev-libs/libxml2
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	>=media-libs/dav1d-0.5.1
+	media-libs/libdvdnav
+	media-libs/libdvdread:=
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=media-libs/libvpx-1.8
+	nvenc? ( media-libs/nv-codec-headers )
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+		media-plugins/gst-plugins-gdkpixbuf:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		dev-libs/libgudev:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/nasm
+	dev-util/intltool"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+	# Fix x265 linkage... again again #730034
+	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+
+	# Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
+	"${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
+)
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(usex !gtk --disable-gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
+		$(use_enable nvenc) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	if use gtk ; then
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index f90d1b9f1528..a0fb60145610 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -68,8 +68,7 @@ RDEPEND="
 		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-	"
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index b22c86b58b58..c16494033e04 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -2,6 +2,7 @@ AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730
 DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
 DIST libva-utils-2.11.1.tar.gz 1205472 BLAKE2B 251a318d10eb5907e0ee54f101a153cfe76a98d61fc1f4fabf890901b52e980439d77acfbb4e1b566d361a7cda5c7ab504e575067eb932b0e121904be34b801f SHA512 d64c4767269a810386e02426fce3bde6aa693ac899ace22900e4ae4918dfe461736fe0a031db36751281d5bd78960354cdfa4ca13c5f7c30cc67d05abdd0bcd2
 DIST libva-utils-2.12.0.tar.gz 1213135 BLAKE2B 259ed063e178adc22aa9d69d92715420dd82f25c8b85ce946e13539d96723ee80d406052e4f7a646721f3d4ee4743ffea816c6916f4a5fd6aeeabf9bce1e6671 SHA512 38ef214fa8cb67b5252915e134333fab46d911cc4c9884576013083023e782bccf045ec01534024e901de1143f1ae85f52cdf6e6fe087cb9f3bf727c206d9746
+DIST libva-utils-2.13.0.tar.gz 1230036 BLAKE2B 4e70a13fb9b4362713b6f461a0ee199b8f7e9d9cbac7bc664c11870db92a87873d73306b5777c554830b932a15e726965e1db3591fd1349fb62f068617dd8558 SHA512 81c7c122a4d1bdf8d390a4ea3e0d34499158fb7b7fe0f7aa9d556158895e755139975fd01d73d883897c0a4390612d131b6349febbdf16fa5edcd46a6a82acd2
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
 DIST libva-utils-2.8.0.tar.gz 1198057 BLAKE2B 7c3332fcd2f4631cb2f77d0775e7f542b8ffbbb77aac0fb0629fb2474563320dbbefa546999fc7c991e8081e82a2c48b1406a34d2f075c80fca391088d779fcc SHA512 2102c5bc2b9b1caa99852892b2b7c1f5db7846283781cec84fe9683ac245ea366120096c1032a2c8b36a7c5fc8e4cd68e3939b0a2712a15f453c33560217585d
@@ -9,11 +10,12 @@ 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.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
 EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788
 EBUILD libva-utils-2.9.1-r1.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
-EBUILD libva-utils-9999.ebuild 2368 BLAKE2B 8cc7157a1d31a9e6b0ab4755b14a275dac66935cf013b35a002e0cafba61ea8fef9fc82177e7ab1ff60ed41a947e170080c97f0299ee645a7103c052a3c73673 SHA512 f16400d93c37e7f0661720b1364bf4125b33f394c4898a5cd76235d72ca9c3413cdb975906f4619e2b87619bb43f573740b7b5eb17cbf6599817808598939fac
+EBUILD libva-utils-9999.ebuild 2369 BLAKE2B 3685bf3d3c73824ff81b79a24e9997fb163d3625fabc2c69a179ad7474c22a268fa79e1ccf7eda593b34fb7018e5f4e838f54668eec1c88814cb80c079dbad75 SHA512 cf1e632c2a0236f7f7b370ad2c47fc1c363fcb391ac38c46d545f22ec9653f9916fc84e6f817320fb3381b2e0ef693ea3631907af0913532f05b579df869046f
 MISC metadata.xml 761 BLAKE2B 5aaf0b0be9bf41a00d7df2bfd5975ea0f0e2b257e091b77752db8e29ed358a919fd9c9aaf6296f665a2d5f8864766893044064f8ccff9be7d66c41993d6bd454 SHA512 e5fdc3992abc81021b2ec939ea4ab11a997ae0374e3bc6ba87b49127a7478e023283614a9fc39ec9f33f5221469587196d932bf85da9f0a99f134673d6d5f006
diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild
new file mode 100644
index 000000000000..2f790d95839d
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.13.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+	# Tarball with pre-built 'configure' not always available, portage use tarballs
+	# 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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	putsurface? ( drm )
+	|| ( examples putsurface test-va-api vainfo )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} = *9999 ]] ; then
+	DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
+else
+	DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
+fi
+
+DEPEND+="
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
+
+# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
+DOCS=( NEWS CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 0155912ee582..2f790d95839d 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	# Tarball with pre-built 'configure' not always available, portage use tarballs
-	# without pre-built 'configure' as they are always avaialbe upstream.
+	# 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"
diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index c1db6b702dab..47d839ea5d38 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,3 +1,3 @@
 DIST oxine-0.7.1.tar.gz 3653511 BLAKE2B 33f9e213d1bd379b3faca0d8bba01c656838109a1b47c4dde87aa385c5ecf478e3655b3fd4fffecf6d01d0f95a138d926d55124846f581450c5635eadd9722a9 SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257
-EBUILD oxine-0.7.1-r4.ebuild 1789 BLAKE2B f8f3a6a2798f7a061a5e95a4b38dd47587bb1a442161ddc1051fabe46905e31df6d1c9e6a02e44ca2cf0b94a6e5aa22e448f40ae6a02e7cd3ace64f0585b3eb8 SHA512 5ac31a27297e0ffe83ab53015ed6e6658eb97247da8fb97175d303f9a85ae9ef029e90b1143e0f126e48c36edb520494ed7944f4953834d9ff944e4bd7d62fad
+EBUILD oxine-0.7.1-r5.ebuild 1795 BLAKE2B 29ea98b40b58c135833a6a7c308437fd68aac50e348e314d9a442b98179d4bff776dc87757fc8d99ce0bd51254633d2202525df33609db5d17203aa681c8f2cf SHA512 5fad6f80c3949b0900cf6d18f39513e600118b4970c3cdd5e3fdaff1dfd25ba7e91d06e14df2de5aab3b936d9c9640cd7fab7c698ac062d2b117c36ccaa1d1f3
 MISC metadata.xml 307 BLAKE2B a1f867899fb89719d20c336c4452db7298d0dafd16c20203e4f188e89c8c3da6428456ceb91fac343f8a9b1233c979ef6e7e3229b3ca6af2aabe95128352e8e4 SHA512 ba9be1c84f47a0200720c51cec4d0a069c3711b7f56482222ebf4391fc344be6f24754785f4471d0b1a67ed97b5bd71510d813707de7fe92f35a5ea7d888fb0c
diff --git a/media-video/oxine/oxine-0.7.1-r4.ebuild b/media-video/oxine/oxine-0.7.1-r5.ebuild
index c827c4ee2203..6cbda902137b 100644
--- a/media-video/oxine/oxine-0.7.1-r4.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r5.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	joystick? ( media-libs/libjsw )
 	jpeg? (
 		media-gfx/imagemagick
-		media-libs/netpbm[jpeg,zlib]
+		media-libs/netpbm[jpeg,zlib(+)]
 		media-video/mjpegtools
 	)
 	lirc? ( app-misc/lirc )
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	)
 	png? (
 		media-gfx/imagemagick
-		media-libs/netpbm[png,zlib]
+		media-libs/netpbm[png,zlib(+)]
 		media-video/mjpegtools
 	)
 	X? (
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3ea27ed4f2ad..d8ffeedeb160 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,6 @@
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
-AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768edd33881ebfa78e15006d346612422cc11817df6cc6c5079d166f3185b8d48312294a6a225ecdb607f180339f416131c7acd638b6efe3fb SHA512 495a7568a1c19e0a24edab7d0572032234efd2380fc9c0fe282a891ff316a235cdb97d5df4524233ed6d8ebfc7724ba9870393b8a5c2a192974865aa706760ab
-AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
-AUX pipewire-0.3.33-revert-libfreeaptx-switch.patch 1709 BLAKE2B e66bd84b0e297899dfa5167179394b2e5b0d7e98da35171cd9f37c0c100fb593d21955e44643ac7df00d4aa087d7e4e7d26017fc8d2b60477adb7c619978c874 SHA512 d91a7985d32e33d24e05145c567483b50d2a0049f0641a06abc295be776c1eb1a8c2935aa96118d1d71dce2e0538837bf4a18e3c235a2bdab6f9188f012da41b
 AUX pipewire-0.3.35-non-systemd-integration.patch 820 BLAKE2B bbde90ab174a0101f7c48f682d40b0457a19db23c42c9df9b50d29af9643dcb29d5c03fd5faaa467ef94090c00c9022a01ed699f15bf4b69239ead6a41586880 SHA512 8a545da244ad3cbba35c75c9ea15607ff012bb10143cc349c1feea077ac2db09a28f7e06b3b04095b39b217f4b97af679027aee631d93ea3b281801e799bf60e
 AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2cdcaab5cba0315845026ce4feadd2531724e92aa0932f20783253aa00ff4c6f96eeb6124f4ac6011c22afee07fd4cc22488c6ad4619655972155 SHA512 a46341fa86b61f0bf8b80736b411b870d7ac809d556358f4994aaa876a7827811073f99591fb1269ee70dc3b62157d2f1f3d4db63c1cd7729c9f160bf0e621a9
 AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
@@ -15,20 +12,12 @@ AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
-DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
-DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b SHA512 bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b
-DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3fc53a86d6160083f36c7a42fb7c71c873a0dc9eea04cfb08cbec08807557c2b83efc1ac403adf6a9998d83441338 SHA512 cbf8eb410d2cd1923e67ac9ee9eca0e74567bb7e8ea407a536e64b3ec27b5bbb1e7fdd74a5a7cbffbac3f9996d8a08f8c723401fb44cb2920f044a3a2f3a6c18
-DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6
 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
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
-EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d
-EBUILD pipewire-0.3.33-r1.ebuild 9797 BLAKE2B ef2472ea8e6e06d286a72b00cc77fa04dbf6ffef5cf93cb1db75fca910114bf09442a72fe06709ab40f54f36206de47ff2b068381bb8d82c1e8077c79a7f683c SHA512 f2fcd471370696005008ec8614493cab105e08faf07f13effc76866c7f022f474a9e255c184069d5a371507713b1ca1e967ef0d254ea8e314dec3a105c13ec6e
-EBUILD pipewire-0.3.34.ebuild 9816 BLAKE2B 067c01652c0dbb7981606af3818735c37772ad4c2852761ccba4f94c1983246699b6445351458faed259024454052f69ca2ea03e5ad9b47581900ce32f458a0d SHA512 1b7ee3e5ebf11b27bf6c276d83dccc8c3b0fc013e9b75f82ffdedf70e712e9de1bd268b06e8c7cbeed4a71bd0ab5ec249055c817e17c655a011666e35bf62801
-EBUILD pipewire-0.3.35.ebuild 9979 BLAKE2B 12d3135ef817c2266c911dd3182f9f876acee795038b77b7674d41521dd603fa7c8d874887cf841d4dcbb0376a4d0fcbd36f9e03245a9e359810338f69303b58 SHA512 5c3c314dca12e15736c4a16fd28799c3c982a5bca9bddc0ba0033727696aa685d4d52d2d7c5fe25e23e95c0930d11420845fc531b3388de7a33a9ee0a8d25587
-EBUILD pipewire-0.3.36.ebuild 10265 BLAKE2B 2f8126a2b17057613566895fea3d83fdb72fb305cd838144145aac61fb83dee6e6b49cba0a5745d2ae7451aedbcd9c72b67a716220a82858215bb549c9f3b7aa SHA512 378cdac981be1f8d55e5aafc7e869ef7ab49619784c4f91065aa94368fc5338b7cb4dc602c83ea0ae543aa29b39c616e96df37cc985f9d26dfeb3f1ea334d91e
+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.38.ebuild 10331 BLAKE2B b4d2175802683b15af627551c6f7911c1a79979d8544987b3be4bbdd910621b7847667050d5605798e2cf17d1bbb130083ec0a9f3421ed167d18ca9abd84cf20 SHA512 21caf157edf054945b92b0ac7a402bb7e51c8bb03e740bac33fb2f392cb5ee76d276f3d88f3e9cbcd9108f535b6017f657889ca0a37f0c992e053124ffc62698
+EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
 EBUILD pipewire-9999.ebuild 10126 BLAKE2B 26b722b3d6b6b603e9b73fc0272bd75b9e99fbb39c314e2cd8f864147cebe20b777d26d3ac922eef43addfdf94c1faf785279f0f6540b7b38fd6ef7f8c76e9cc SHA512 cd811868b41e04bf2c65884839910010d0641bea72f4afd3d2df9f23dd4a0a87d863f3481955dc1bde2db86893cbc08d4ddbe478f68e65a5aef2171ef4429dad
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
deleted file mode 100644
index ccc89f1310b7..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/daemon/pipewire.conf.in	2021-06-30 22:22:09.520402459 +0200
-+++ b/src/daemon/pipewire.conf.in	2021-06-30 22:22:30.620404999 +0200
-@@ -234,12 +234,12 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
-+    { path = "@session_manager_path@"  args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
-     # It can be interesting to start another daemon here that listens
-     # on another address with the -a option (eg. -a tcp:4713).
-     #
--    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
diff --git a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
deleted file mode 100644
index d8496bc5a694..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Fri, 21 May 2021 10:32:52 +0200
-Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
-
-This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
-
-Doesn't apply to us.
-
-Bug: https://bugs.gentoo.org/785634
----
- spa/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/meson.build b/spa/meson.build
-index e13802e94..885b25405 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
-     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
-     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
-     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--- 
-2.32.0
-
diff --git a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
deleted file mode 100644
index 94d4b7dcb0c3..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit f405a4e6069725934f9ae0f1b978497a34197d8d
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue Aug 24 14:22:36 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue Aug 24 14:22:43 2021 +0200
-
-    Revert "bluez5: Use libfreeaptx instead of libopenaptx"
-    
-    This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436.
-    
-    Delay decision for now since both aptx libs haven't diverged yet.
-
-diff --git a/spa/meson.build b/spa/meson.build
-index 483536b54..e13802e94 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
-     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
-     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--    aptx_dep = dependency('libfreeaptx', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c b/spa/plugins/bluez5/a2dp-codec-aptx.c
-index f8d7d6dd8..62ecde348 100644
---- a/spa/plugins/bluez5/a2dp-codec-aptx.c
-+++ b/spa/plugins/bluez5/a2dp-codec-aptx.c
-@@ -32,7 +32,7 @@
- 
- #include <sbc/sbc.h>
- 
--#include <freeaptx.h>
-+#include <openaptx.h>
- 
- #include "defs.h"
- #include "rtp.h"
diff --git a/media-video/pipewire/pipewire-0.3.32.ebuild b/media-video/pipewire/pipewire-0.3.32.ebuild
deleted file mode 100644
index 7c5256744eed..000000000000
--- a/media-video/pipewire/pipewire-0.3.32.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 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 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
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	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/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	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[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!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
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-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.31-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
-		$(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)
-		-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_feature 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
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable 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
-		elog "  systemctl --user enable 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 "autospawn'ing 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, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override 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
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.33-r1.ebuild b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
deleted file mode 100644
index d0320fcb4b38..000000000000
--- a/media-video/pipewire/pipewire-0.3.33-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 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
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	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/libopenaptx
-		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[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!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
-	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-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.31-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
-		$(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_feature 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
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable 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
-		elog "  systemctl --user enable 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 "autospawn'ing 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, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override 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
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.34.ebuild b/media-video/pipewire/pipewire-0.3.34.ebuild
deleted file mode 100644
index 2ce80ce5a7d4..000000000000
--- a/media-video/pipewire/pipewire-0.3.34.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 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}
-	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/libopenaptx
-		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[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!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
-	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-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.31-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
-		$(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
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable 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
-		elog "  systemctl --user enable 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 "autospawn'ing 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, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override 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
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.35.ebuild b/media-video/pipewire/pipewire-0.3.35.ebuild
deleted file mode 100644
index d68355c9f4c4..000000000000
--- a/media-video/pipewire/pipewire-0.3.35.ebuild
+++ /dev/null
@@ -1,281 +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 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 ~riscv"
-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[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!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.35-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
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable 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
-		elog "  systemctl --user enable 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 "autospawn'ing 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, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override 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
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild
index ed38e2d391cb..8c7b2820b89b 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.38.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild
index 9b2951c07937..a9e1b729e5b0 100644
--- a/media-video/pipewire/pipewire-0.3.38.ebuild
+++ b/media-video/pipewire/pipewire-0.3.38.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 ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index ab54ffc9b62f..6a33023fbe10 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,4 +1,4 @@
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
-EBUILD totem-3.38.1.ebuild 2777 BLAKE2B 682bad8bd9eac4408b33e285306d137be365625b7621bc60f13ac57d994293e79fb818dc47548046564f523b9998e33a5d414e6f94bbd9114670b9e74e0c8760 SHA512 31a9d00ea794d3dac208df22d0c5ae4a1fb92db79c063e122f4d84c474c141fd0adab40e5b7c43b8bf11fa37349edc0b6781a13c45401015f9c6f815ba86fe79
+EBUILD totem-3.38.1.ebuild 2829 BLAKE2B a0cafb192ae7fc7d6416d48be2d8d04590a7ec786c3f81bad2f02848b1e7cfd77842171f5a75f67f793f75b5d2e6e3c91ffaaa95672cc0f2826f9410f51e24b4 SHA512 d4a50e2a85e822faef1ad4f7692c0bfbbf5f1ed13459ac20fe1863884aa19d9f55827706a9daa7692d2b0077205437c2a96281f2978b4a715122704a4a2f0116
 MISC metadata.xml 1018 BLAKE2B 1cb6fbaa86e0aa6bc60901e7e0b30765de1bea563666af206bfd75c8ed779332e1536dfebbe8d83d0a940bb4266157d0673b19f64021c76e3fa549a208945335 SHA512 3cb85a567ae7573ec0cf7cc12440ff3d879a3566b4773930752142b9e83ab366b983a470d3ae1f212acd78b217136c1ee681ff7d98d1e980e769867b1791d1d6
diff --git a/media-video/totem/totem-3.38.1.ebuild b/media-video/totem/totem-3.38.1.ebuild
index 4f5cac066acb..717a1d6b7eff 100644
--- a/media-video/totem/totem-3.38.1.ebuild
+++ b/media-video/totem/totem-3.38.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.19.4:3[introspection]
+	>=x11-libs/gtk+-3.22.0:3[introspection]
 	>=media-libs/gstreamer-1.6.0:1.0
 	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
 	>=media-libs/gst-plugins-good-1.6.0:1.0
@@ -98,6 +98,7 @@ src_configure() {
 }
 
 src_install() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0= # bug 812170
 	meson_src_install
 	if use python ; then
 		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1512d0fddfca..f2aced530621 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,8 +12,8 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
-EBUILD vlc-3.0.16-r6.ebuild 13943 BLAKE2B d723108fe54d617f050da68e70e9ef18efb5dcb34744fb7ae3fe7af0c4da83b32df5e2ce0beb19ad6232f8b4a77c98918a05c6d1d1535651cfde98f908403f1e SHA512 111168b0229b80e9e48d47f09528673e424bc76eb63b1fc4e89b2bc3b6e208a5f79567371e1b5775c62faa9105f14a07d8389314bd4cbc38b545b95b30fe799a
-EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
-EBUILD vlc-9999.ebuild 13496 BLAKE2B 34f910ff15c32ccd8394a2ff55743e242ad89a81188f3f14a064c35825f6bec3cfeb5a07921e3e90aa84a4e4a7f69e9c0e1f3a921335ca64e57200a11461f02d SHA512 1b6da672d51b83c8fab3adca52c4b77cbb731f9d4d0158f41009230cfb384e9c1e0541dad652c5af325df5cf3ac0a612e4f6774e42ff6a44259109f9c2b25d16
+EBUILD vlc-3.0.14-r7.ebuild 13813 BLAKE2B c65604fa710fd31c775fcc9b27b66c6756c7f3ff8b87427f46df59edf38629ef27080b8dac49cb87cf485d4981167753a4143c7ba6d2e961922ffd41d57b211f SHA512 06f1e5a6c2e92a2f49556f78ec2aa2f20af263a73038c892f0b8c93a83a5bdc7c11cd0adab8fe2aee0d9ba4c8b1157119c12ed7f338521ef954722925a6c9173
+EBUILD vlc-3.0.16-r7.ebuild 13944 BLAKE2B 3d5bf8d410492da8614845eab3e1fb58756f5b01559f014856dab785df4f5877df92d16e776fc73e6fd3be8d44d10aa3dd4b76bbd8d32129ccecb36d768665a7 SHA512 c459f6b79d293ca0ca42c80331b0948044042eee77d97308b4540738332c26bbc9dd556f1d7dc08d20018bfa301eb25b5d281c985373c1a8ceff0788e368669e
+EBUILD vlc-3.0.9999.ebuild 13486 BLAKE2B 51ee12e042e6d656b4a5cb016397e70e1fcd5d9c13a37170dffc4100b127ded3817764d68591b7303695e697fd004f184c251c332908ecc0f68236dca6d5eb1f SHA512 f88809f93fde7e0190cc8fdca801446a212d2e15b83b7511be24a353ca8e45555f57a3218195d973f2b8b1ab6473f9b3313715f7d53cb8632e8b2bcc5a962cf0
+EBUILD vlc-9999.ebuild 13498 BLAKE2B 5c5dcc2579d2935b643298f17ad8ca7e21c9602fa17eac72f63324efb29ff25c39d6ce4a4509daccaf9a63b86da55e9aeeca4923802bcb21849d7d55aed1deae SHA512 dd8094cb589b74dfbfd5e802e0e8de52c9c724b4a5cde660615beccca3af9d490e645f85070e196f0dac46231cb2e1bcfc946640e96b30820e474489e8c92145
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r7.ebuild
index 8cc409ebdb5d..dadbb25cc1af 100644
--- a/media-video/vlc/vlc-3.0.14-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r7.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r7.ebuild
index 71358f7fda0c..6c0852eb7fb2 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r7.ebuild
@@ -24,7 +24,7 @@ else
 	#else
 	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	#fi
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv -sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv -sparc x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -80,7 +80,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 2c90e88cc44a..fb2127172d31 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 88345ff41a5f..62677697baa2 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index f06e74d81047..eb5726772562 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,6 +4,8 @@ AUX wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch 2
 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
+DIST wireplumber-0.4.4.tar.gz 346770 BLAKE2B cc2768db3a4f6f26a176c9fff759384fedb020c98540ecbe1e02e28a7f16fa3ecc4ec25de50a65021cabb4e5746c41c683b714e0bc5cf5003f2a7d9c9414516c SHA512 f8d764c1728c2e550fc41044a8ebbbeba27157540077648431796d7de5a04281df00d9742b04c6f76b50e446b2a723f2555520cb953d432f90b05148967de4ef
 EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679
-EBUILD wireplumber-9999.ebuild 2194 BLAKE2B 7fa180a3b5c16004076a955e2973dd80f7704a88de1e9038911f82707850517d11a08e6e2c7d372eabab311f8dbbe7e43c3dee90df31e4c81334601056444bb1 SHA512 b37500fd4fa62152de475b3061d5759b3f5fa6085e0d3097598b90c9a30728d636d7418b9f69e5b9096f10758a816d98d7e594210dcfbf8222bb9fb668f04c3b
+EBUILD wireplumber-0.4.4.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
+EBUILD wireplumber-9999.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/wireplumber-0.4.4.ebuild b/media-video/wireplumber/wireplumber-0.4.4.ebuild
new file mode 100644
index 000000000000..bcb971cdf84c
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.37
+	virtual/libc
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}"
+
+DOCS=( {NEWS,README}.rst )
+
+src_configure() {
+	local emesonargs=(
+		-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)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_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"
+	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."
+	fi
+	elog
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 88f08ce12c07..bcb971cdf84c 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 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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.37
 	virtual/libc
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
 "
 
@@ -55,6 +59,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)
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index a46e55736a59..7b3c32867444 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,5 +1,5 @@
 AUX xvattr-1.3-gtk.patch 1255 BLAKE2B 471cfe05fbeaaa405771543d5c3b8900be848642724078a583321aa997b5e8c442894e6d2f6bf4ccb0eeed283f5f059b2be741c654c9a18f888034a105eb2eff SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138
 AUX xvattr-1.3-pod-encoding.patch 303 BLAKE2B 127fa43fe4ab6586d30d85a685d98038f226f54286147c98fc4fa738cc996c2bb802cf8fa962bb9143dfc506d64243b1d3f8af5218705b24f0f435fff85f3256 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484
 DIST xvattr-1.3.tar.gz 82263 BLAKE2B 5e12c3001640c50294693eccf4e6b04c0e034634cc25a7be9e70dcd84c6da73e87be5a092ba4e9d9e5a70469d5018ac016d9812c2099bd68d35247ac6c522730 SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
-EBUILD xvattr-1.3-r3.ebuild 770 BLAKE2B fcac1d11ea60af2b838fb9303c314f99ae4d01559e132c35022d963c7104af685f1ed0ff4bcf643a014d3758bc805869b7c3fc2fb7edd9cbaa8c69bae02d5d8f SHA512 4f2323510ba6bafacc719719d9bec4da5b002f028a9efec6107fd7fa13e0bc53fc03dbc62bb13b2d0093198440a140a9aa4903bb7c63207b135c74ecb080ae6a
+EBUILD xvattr-1.3-r3.ebuild 696 BLAKE2B 200a1c5318b14179733f60bb5fb2255fff69c8323482d6ab709e89c774ddb07b5b9e30952435406006b54d4b508d15819a18bd055a805b55e32e703a4ec495a1 SHA512 1b813172e152136528dadec79da8a6699517fb9bf5d369b6de3193405ecf93c478e058077159d0f07722e9ddef00d7f7e3a98e06c0d572448ac705c7a4b77209
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild
index 54db3e63fb5a..7a16d54cbe19 100644
--- a/media-video/xvattr/xvattr-1.3-r3.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch autotools
+inherit autotools
 
 DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd"
@@ -14,25 +14,25 @@ SLOT=0
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXv
 	x11-libs/libXext
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-	x11-libs/libXt
-	virtual/pkgconfig"
+	x11-libs/libXt"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-pod-encoding.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk.patch
-	epatch "${FILESDIR}"/${P}-pod-encoding.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_with gtk)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
author	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
commit	46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree	db33a91259730be84999e13a8d8168c799f50ac0 /media-video
parent	e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)