gentoo auto-resync : 10:05:2024 - 00:01:13

13 files changed, 83 insertions, 645 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 558e8e8c50c0..66f4780cabcb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/celluloid/Manifest b/media-video/celluloid/Manifest
index 1c19e86e8622..9c7a1403e274 100644
--- a/media-video/celluloid/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,3 +1,5 @@
 DIST celluloid-0.21.tar.xz 413072 BLAKE2B 726eb035f15c24333151833ded843be611b6d6340d77de13f38d29f92307da1e30c63c657e654327f10b617987f8800e59b72e28bcc65cdcad4ef9ab002214c4 SHA512 6e48d982be127c21cc6afeec8e94ae5c78c667f865690f8fad6db2f0b8290922682334c4d905827e99765dc2084c1b8a36927ff3de485a7a456f4a2fb7058ae6
+DIST celluloid-0.26.tar.xz 305420 BLAKE2B d74f5be26427ac0798f67e37066f0840d6af1a5a43e4bf714d02519e57231c57c34e191a678d11ebdca0ccbfd8f40eed4a23410f054394cc9f42559c6bbc934c SHA512 bcbb970b8ce512d4d7e64833a309a2e32631b262989ee7f9e1ec4b7f0015387b3978c8cbc0206a5aa86bd9e74fae3b7d38776e71be8c16996444d234bc37d42f
 EBUILD celluloid-0.21-r1.ebuild 717 BLAKE2B 3b4e362fb63f14a372a61e5c960270763d57399f60df5f1e266c8422380355fe78374ecb8b376f670d7eaecbffd2840b22f335eca7329425a972b78687be9720 SHA512 8e4cecfff17f61f1b4c0b8b3dc635bd7b8dce22801ea9638961e56d2b836b6f5cc0e2c4e8edcbb9d14394aa7d6a3ae2249e073e12e72395b46cb90d3d0cbaa9e
-MISC metadata.xml 241 BLAKE2B 976bb17a5de85e86e06973e02e7dfe782e7b4c2942907deaa9ec15a2d9a47d7eec5ff256069f78e789b7059a061c98641aaff1d21618b68c27fdccdc9474b08d SHA512 6a57f01af8ea264571202d1dcce35b702a444fb9da3e3fdc3930a349b19f9edac50fc04fa4facea682e9584c585c145aec629b2845a4c344332d7dac7d7005e3
+EBUILD celluloid-0.26.ebuild 795 BLAKE2B 269a2ced7d76a7851c02d52bbe1722b91db747065caa79c14b9b0c848d14f16fca12a7d84657d4be27cc363c347244585cfb75c6f87f3ce540bb088a3d214567 SHA512 f441d151ac503fc666fa4396d1445c588303f164a5899ce8a5d50e4dd6851af0cde95d479e641852ea83941ee96c6187049ca4b7fe84342b55a25fb60b321e72
+MISC metadata.xml 329 BLAKE2B 7434173a6d1de1bb8f30af8945b50699bd2fde6229cef9e094a3c3d2505a726ff273af4f8ecf34b91abb4277b28293af20129c6c2f14724a1fc30921f64bc8d3 SHA512 95c3095211a04591b7bfc01da5d9027a47b94d802d89713cd2df54f5f9bf0d676fa5af63ecd4217d8a8c077a81b6201b3c6948cc7e04faff01f148a2c1d63db9
diff --git a/media-video/celluloid/celluloid-0.26.ebuild b/media-video/celluloid/celluloid-0.26.ebuild
new file mode 100644
index 000000000000..00062ed05b0b
--- /dev/null
+++ b/media-video/celluloid/celluloid-0.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="Simple GTK+ frontend for mpv"
+HOMEPAGE="https://celluloid-player.github.io/"
+SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND=">=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.6.1:4
+	>=gui-libs/libadwaita-1.2.0:1
+	>=media-video/mpv-0.32:=[libmpv]
+	media-libs/libepoxy"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-video/celluloid/metadata.xml b/media-video/celluloid/metadata.xml
index 68bfde632f76..a6bfe1cb747e 100644
--- a/media-video/celluloid/metadata.xml
+++ b/media-video/celluloid/metadata.xml
@@ -5,4 +5,7 @@
 	<email>leio@gentoo.org</email>
 	<name>Mart Raudsepp</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">celluloid-player/celluloid</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 7899477fa29e..ce03bf496e28 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
-AUX 1.0.0/0001-fix-compile-with-no-examples.patch 1388 BLAKE2B 9cf02967d8723f41c0bb456a064d90237fffef66cf8cb3e6678b3bce1d58418a0b4e347e71cf4c45240c150cdd8d08b1448efd1fad594886e3041558730b20c2 SHA512 65e1d6e572dff5fe63a05580696b8ec304477e58726dc7e0723dcae9bc03332111af131f57584ad8d62ca1e6bada982387c1df47dfcb9cfed8a47bf86831a2b5
-AUX 1.0.0/0002-fix-x11-bell-segfault.patch 988 BLAKE2B 2281275262157fa2545820e155d1182873b05738b6314c6b9d73c89f928cddf34a135ca02a552c6d124402439636a986f8aaab899ee8e872bdd6582ce60327b2 SHA512 24732d8c8c9d0ac951a9d7d30da68488da1b8da3b94652492706dd02859f7beeb8499a08a130b10332f50f81854825c80cffc5dca951d93e2eeab43a0bc786fe
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
 AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
@@ -7,14 +5,12 @@ AUX gentoo-sound-server-enable-audio-bluetooth.conf 106 BLAKE2B 79945d2dac9671d9
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab SHA512 14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
-DIST pipewire-1.0.0.tar.bz2 1682155 BLAKE2B de48de0f486a530ee060acdc6d35e27bf298e195e2c3d21a9444da7459ef02b44d97147b3bd3a820bdf28ebffbee910f77306a28ffb1b12eeaf8ce37f8d97a6f SHA512 8955bd16ba8508d5838e960ae8c089efaeb9dab0c08719baea8f8f8047cd53b84a46b2459ecd7f000f21b0025a52e93f052025e71c07dc4a2aef89237c5c87f1
-DIST pipewire-1.0.3.tar.bz2 1682330 BLAKE2B cf7f69ee8db703b3e441b6ca34aec4e41cc9cd5c0a21344adee2adcbf5b1b9d5fc3913dece88946e34cf7081402d21ea617cfcd0d09bc2780394bc20a5149296 SHA512 e568b9eb328d701c06a93c4f1556bf8db6e972877a7f2a5776fe77a20130a63972b3f78d52da66ccb1b2ee9df5451a403ab83aef5662dc5d93a6dfbedb23f66a
 DIST pipewire-1.0.4.tar.bz2 1698660 BLAKE2B 0842a5fca65c8a91eadd9f0594864ae0f0d428b3c03d2c5fecc3b7f62ff6f5d24fc1190eb351279c002e26596148b23b4b576551502be21beb2eeaa0d2ad4dac SHA512 42e8e28b1fd497f5329b5966abd5cfb7d7976fb0ca9f8f39bccf44195dd11f227cdec2448ba7db4559e866ea2dccf64b8172a2ae069c5204cd8f66c0f8a9e2d9
 DIST pipewire-1.0.5.tar.bz2 1698291 BLAKE2B 0f919a01b5f84060fb2ce560a7790a0d59374671f52a941492930fe21ac39178688f27f00cad649d239901f88b392e16895648efae2ec2785c394c1f6d186ddf SHA512 18fbbe36c8752eb0f1df5ee3f3fffee279addcec9825281bd165ad8316f17af7e91bb5759f63c16139c074b03e5a77ef9d596a87f584d1580bbb754101b70a0f
-EBUILD pipewire-1.0.0-r1.ebuild 19657 BLAKE2B 3b82a4e466937ee6d1d0f21a5837071ff0730530e1bc7c09066ee1b666a36169b4284ae4296f693e60e2f11b1699140bb20cf1153f56f390a5e564b05235db0e SHA512 57c5c699a13cf8288e0cfbd08ef412405d50f6e5be9babe6d63a7a86cdc66b4c5e781364b83885925567e6ac4f91c09ebeeedcc55deb63ae02ac3a01f7022cdd
-EBUILD pipewire-1.0.3.ebuild 19576 BLAKE2B a83be9a9cf0473e41fc3098f23818325c3306d8a9e7d527047b16324c490b711cf799c4a7d892533e625c42a4e36fda6016f425541d718a18d23beedd91f9b7e SHA512 02ef47740b9a30f451718e923a51161dca4bfabe16317e46db1e412fb6247b2bd04bc0128b5769d9106617d938baa6e4c7854fba93ac7c67774ecad707c74d6a
+DIST pipewire-1.0.6.tar.bz2 1698889 BLAKE2B f782efa2aa8fa0976fd3025f58041f450505c63acd9028c3d79368d0c41465a51b4472059a1c13092aa72dc6110fc12589b03de653d7eac3c93bc5498cc17154 SHA512 09e5c951c835dcc2654ec284aaaad6be4254744e943f95556c494cd22a4fc67bdc481982856f2aa439e33ec84e7fbdb6df45a1d4b9ced261b01cd91b0ee4d2ed
 EBUILD pipewire-1.0.4.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3
 EBUILD pipewire-1.0.5-r1.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
-EBUILD pipewire-1.0.5.ebuild 19994 BLAKE2B 2d369e36d27151586e4a6b9e6775577f43597bfe3489ba2c9006983bfea48482702e689cd11fbc50a8e52a04792fe01e9b29854bb5ea0721a390bdb75d6c3cc9 SHA512 24f4dd50e4d2681d5c61c26c733a75a1bd93a9fd36cc9827f42fceaf8a9a26dcd5bd5714cae6fe137c97d597741d2b5bc50a1f6f8a87e5f7d0caec02c05ed338
+EBUILD pipewire-1.0.5.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3
+EBUILD pipewire-1.0.6.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
 EBUILD pipewire-9999.ebuild 19274 BLAKE2B 86ec3c9efdaa0fd53839c261ae7e23a570d534df6670fd78cab1f0c31b5065017b4c483f9249407a32a928df9b127586fa523fe27e1dabe359c1e247c7bbcc94 SHA512 bdc4d9a357dd5839614aca7b2fbe52ea27a818bc660db55b08e1d696b648e2801ab2f2b1078123e4bf084479918eaf6ec39a9e7f4a6dfe89b54188989956070d
 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
diff --git a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch b/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch
deleted file mode 100644
index fee0ac1bc328..000000000000
--- a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3675
-https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1790
-
-From 6b4cdab57a0678e88992fb4e5b216e481b051808 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@iki.fi>
-Date: Sun, 26 Nov 2023 18:31:43 +0200
-Subject: [PATCH] meson.build: fix compile with -Dexamples=disabled
-
---- a/spa/examples/meson.build
-+++ b/spa/examples/meson.build
-@@ -6,6 +6,10 @@ spa_examples = [
-   'local-v4l2',
- ]
- 
-+if not get_option('examples').allowed()
-+  subdir_done()
-+endif
-+
- spa_examples_extra_deps = {
-   'local-v4l2': [sdl_dep],
-   'local-libcamera': [sdl_dep, libcamera_dep],
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -113,6 +113,4 @@ endif
- 
- subdir('tools')
- subdir('tests')
--if get_option('examples').allowed()
--  subdir('examples')
--endif
-+subdir('examples')
---- a/src/examples/meson.build
-+++ b/src/examples/meson.build
-@@ -22,6 +22,10 @@ examples = [
-   'local-v4l2',
- ]
- 
-+if not get_option('examples').allowed()
-+  subdir_done()
-+endif
-+
- examples_extra_deps = {
-   'video-src-fixate': [drm_dep],
-   'video-play': [sdl_dep],
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -3,9 +3,7 @@ subdir('pipewire')
- subdir('daemon')
- subdir('tools')
- subdir('modules')
--if get_option('examples').allowed()
--  subdir('examples')
--endif
-+subdir('examples')
- if get_option('tests').allowed()
-   subdir('tests')
- endif
--- 
-GitLab
diff --git a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch b/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch
deleted file mode 100644
index ecf7ded220f4..000000000000
--- a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/919133
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3688
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8ecc61e1177c94e78fa171ee359cfbbd239942bc
-
-From 8ecc61e1177c94e78fa171ee359cfbbd239942bc Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 5 Dec 2023 16:18:30 +0100
-Subject: [PATCH] module-x11-bell: force pulse backend
-
-The libcanberra ALSA backend has some races and causes crashes, we
-should try to not use that one.
-
-Fixes #3688
---- a/src/modules/module-x11-bell.c
-+++ b/src/modules/module-x11-bell.c
-@@ -104,6 +104,11 @@ static int play_sample(struct impl *impl)
- 		res = -EIO;
- 		goto exit;
- 	}
-+	if ((res = ca_context_set_driver(ca, "pulse")) < 0) {
-+		pw_log_error("canberra context set backend error: %s", ca_strerror(res));
-+		res = -EIO;
-+		goto exit_destroy;
-+	}
- 	if ((res = ca_context_open(ca)) < 0) {
- 		pw_log_error("canberra context open error: %s", ca_strerror(res));
- 		res = -EIO;
--- 
-GitLab
diff --git a/media-video/pipewire/pipewire-1.0.0-r1.ebuild b/media-video/pipewire/pipewire-1.0.0-r1.ebuild
deleted file mode 100644
index 2a642ac6f537..000000000000
--- a/media-video/pipewire/pipewire-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-# TODO: Maybe get upstream to produce `meson dist` tarballs:
-# - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3663
-# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1788
-#
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pipewire-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${PIPEWIRE_DOCS_PREBUILT:=1}
-
-PIPEWIRE_DOCS_PREBUILT_DEV=sam
-PIPEWIRE_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-PIPEWIRE_DOCS_USEFLAG="+man"
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
-
-if [[ ${PV} == 9999 ]]; then
-	PIPEWIRE_DOCS_PREBUILT=0
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	fi
-
-	if [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !man? ( https://dev.gentoo.org/~${PIPEWIRE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PIPEWIRE_DOCS_VERSION}-docs.tar.xz )"
-		PIPEWIRE_DOCS_USEFLAG="man"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2"
-IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf"
-
-# 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)!
-
-# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
-#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
-REQUIRED_USE="
-	ffmpeg? ( extra )
-	bluetooth? ( dbus )
-	jack-sdk? ( !jack-client )
-	modemmanager? ( bluetooth )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-build/meson-0.59
-	virtual/pkgconfig
-	dbus? ( dev-util/gdbus-codegen )
-	doc? (
-		${PYTHON_DEPS}
-		>=app-text/doxygen-1.9.8
-		media-gfx/graphviz
-	)
-	man? (
-		${PYTHON_DEPS}
-		>=app-text/doxygen-1.9.8
-	)
-"
-# * While udev could technically be optional, it's needed for a number of options,
-# and not really worth it, bug #877769.
-#
-# * Supports both legacy webrtc-audio-processing:0 and new webrtc-audio-processing:1.
-# We depend on :1 as it prefers that, it's not legacy, and to avoid automagic.
-#
-# * Older Doxygen (<1.9.8) may work but inferior output is created:
-#   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
-#   - https://github.com/doxygen/doxygen/issues/9254
-RDEPEND="
-	acct-group/audio
-	acct-group/pipewire
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		dev-libs/glib
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/opus
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:1 )
-	extra? ( >=media-libs/libsndfile-1.0.20 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flatpak? ( dev-libs/glib )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gsettings? ( >=dev-libs/glib-2.26.0:2 )
-	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	liblc3? ( media-sound/liblc3 )
-	lv2? ( media-libs/lilv )
-	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
-	pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
-	sound-server? ( !media-sound/pulseaudio-daemon )
-	roc? ( >=media-libs/roc-toolkit-0.3.0:= )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? ( acct-user/pipewire )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# 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-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-pkg_setup() {
-	if use doc || use man ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Used for upstream backports
-	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature man)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_feature ieee1394 libffado)
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		$(meson_feature selinux)
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
-		-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)
-		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
-		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
-		$(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 bluetooth opus)
-		$(meson_native_use_feature bluetooth bluez5-codec-opus)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(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
-		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
-		$(meson_native_use_feature flatpak)
-		-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
-		-Dbluez5-codec-lc3plus=disabled # unpackaged
-		$(meson_native_use_feature liblc3 bluez5-codec-lc3)
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature roc)
-		$(meson_native_use_feature readline)
-		$(meson_native_use_feature ssl raop)
-		-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)
-		-Dlibmysofa=disabled # libmysofa is unpackaged
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
-		# just became stable, with 5.15 being the previous LTS. Many people
-		# are still on it.
-		-Dpam-defaults-install=true
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --timeout-multiplier 10
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use man && [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${PIPEWIRE_DOCS_VERSION}-docs/man/*/*.[0-8]
-	fi
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if use system-service; then
-		newtmpfiles - pipewire.conf <<-EOF || die
-			d /run/pipewire 0755 pipewire pipewire - -
-		EOF
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 gentoo-pipewire-launcher
-
-		doman "${FILESDIR}"/gentoo-pipewire-launcher.1
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_preinst() {
-	HAD_SOUND_SERVER=0
-	HAD_SYSTEM_SERVICE=0
-
-	if has_version "media-video/pipewire[sound-server(-)]" ; then
-		HAD_SOUND_SERVER=1
-	fi
-
-	if has_version "media-video/pipewire[system-service(-)]" ; then
-		HAD_SYSTEM_SERVICE=1
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	use system-service && tmpfiles_process pipewire.conf
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then
-			# https://bugs.gentoo.org/908490
-			# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243
-			ewarn "Please restart KWin/Mutter after upgrading PipeWire."
-			ewarn "Screencasting may not work until you do."
-		fi
-
-		if ver_test ${ver} -le 0.3.66-r1 ; then
-			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
-			elog "and limits needed to function smoothly:"
-			elog
-			elog "1. Please make sure your user is in the 'pipewire' group for"
-			elog "the best experience with realtime scheduling (PAM limits behavior)!"
-			elog "You can add your account with:"
-			elog " usermod -aG pipewire <youruser>"
-			elog
-			elog "2. For the best experience with fast user switching, it is recommended"
-			elog "that you remove your user from the 'audio' group unless you rely on the"
-			elog "audio group for device access control or ACLs.:"
-			elog " usermod -rG audio <youruser>"
-			elog
-
-			if ! use jack-sdk ; then
-				elog
-				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
-				ewarn
-				ewarn "PipeWire daemon startup has been moved to a launcher script!"
-				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-				ewarn
-				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-				ewarn "advised that a D-Bus user session is set up before starting the script."
-				ewarn
-			fi
-
-			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-				elog
-				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-				elog "are recommended to edit pulseaudio client configuration files:"
-				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-				elog "if it exists, and disable autospawning of the original daemon by setting:"
-				elog
-				elog "  autospawn = no"
-				elog
-				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-				elog
-				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-				elog "command:"
-				elog
-				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-				elog
-			fi
-
-			if has_version 'net-misc/ofono' ; then
-				ewarn "Native backend has become default. Please disable oFono via:"
-				if systemd_is_booted ; then
-					ewarn "systemctl disable ofono"
-				else
-					ewarn "rc-update delete ofono"
-				fi
-			fi
-		fi
-	done
-
-	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
-		# TODO: We could drop most of this if we set up systemd presets?
-		# They're worth looking into because right now, the out-of-the-box experience
-		# is automatic on OpenRC, while it needs manual intervention on systemd.
-		if use sound-server && use systemd ; then
-			elog
-			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-			elog
-			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-			elog
-			elog "To use PipeWire, the user units must be manually enabled"
-			elog "by running this command as each user you use for desktop activities:"
-			elog
-			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-			elog
-			elog "A reboot is recommended to avoid interferences from still running"
-			elog "PulseAudio daemon."
-			elog
-			elog "Both new users and those upgrading need to enable WirePlumber"
-			elog "for relevant users:"
-			elog
-			elog "  systemctl --user disable pipewire-media-session.service"
-			elog "  systemctl --user --force enable wireplumber.service"
-			elog
-			elog "Root user may replace --user with --global to change system default"
-			elog "configuration for all of the above commands."
-			elog
-		fi
-
-		if ! use sound-server ; then
-			ewarn
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-			ewarn
-		fi
-	fi
-
-	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
-		ewarn
-		ewarn "You have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of the"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information, and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-}
diff --git a/media-video/pipewire/pipewire-1.0.5.ebuild b/media-video/pipewire/pipewire-1.0.5.ebuild
index 88312367a689..0115d177525b 100644
--- a/media-video/pipewire/pipewire-1.0.5.ebuild
+++ b/media-video/pipewire/pipewire-1.0.5.ebuild
@@ -47,7 +47,7 @@ else
 		PIPEWIRE_DOCS_USEFLAG="man"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-1.0.3.ebuild b/media-video/pipewire/pipewire-1.0.6.ebuild
index ddb46df4ee73..1373789d2b11 100644
--- a/media-video/pipewire/pipewire-1.0.3.ebuild
+++ b/media-video/pipewire/pipewire-1.0.6.ebuild
@@ -47,7 +47,7 @@ else
 		PIPEWIRE_DOCS_USEFLAG="man"
 	fi
 
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -162,9 +162,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
 
 # Present RDEPEND that are currently always disabled due to the PW
 # code using them being required to be disabled by Gentoo guidelines
@@ -313,11 +311,9 @@ multilib_src_install_all() {
 
 	# Enable required wireplumber alsa and bluez monitors
 	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+		# Install sound-server enabler for wireplumber 0.5.0+ conf syntax
+		insinto /etc/wireplumber/wireplumber.conf.d
+		doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
 	fi
 
 	if use system-service; then
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 29adc7aba914..39e4519b9216 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -3,6 +3,6 @@ AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373b
 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8
 DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb
 EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89
-EBUILD wireplumber-0.5.2.ebuild 3793 BLAKE2B b3632f12b90b1049751b866eca67c370b0ed064384c8d45396b30d5c4b2f9a317cee81ad32eea178e328fa1f1ec628dc713a2224c2a8da38539aa6e3254eadcb SHA512 524b7a5d50a395e9c202d700debc27788c76497c5430eeb80a0742b09f9145220acfb766bae3cbff33d08659b2f627bbe594bb5d339d56d6e147fde30408fe65
-EBUILD wireplumber-9999.ebuild 3793 BLAKE2B b3632f12b90b1049751b866eca67c370b0ed064384c8d45396b30d5c4b2f9a317cee81ad32eea178e328fa1f1ec628dc713a2224c2a8da38539aa6e3254eadcb SHA512 524b7a5d50a395e9c202d700debc27788c76497c5430eeb80a0742b09f9145220acfb766bae3cbff33d08659b2f627bbe594bb5d339d56d6e147fde30408fe65
+EBUILD wireplumber-0.5.2.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
+EBUILD wireplumber-9999.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.5.2.ebuild b/media-video/wireplumber/wireplumber-0.5.2.ebuild
index 21dc5de57874..ea1b71883dbb 100644
--- a/media-video/wireplumber/wireplumber-0.5.2.ebuild
+++ b/media-video/wireplumber/wireplumber-0.5.2.ebuild
@@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single meson systemd
 
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
 	EGIT_BRANCH="master"
@@ -23,9 +26,6 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
 LICENSE="MIT"
 SLOT="0/0.5"
 IUSE="elogind system-service systemd test"
@@ -46,7 +46,6 @@ BDEPEND="
 	sys-devel/gettext
 	test? ( sys-apps/dbus )
 "
-
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.68
@@ -55,12 +54,8 @@ DEPEND="
 	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}
+RDEPEND="
+	${DEPEND}
 	system-service? (
 		acct-user/pipewire
 		acct-group/pipewire
@@ -70,7 +65,10 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
 )
 
 src_configure() {
@@ -78,9 +76,11 @@ src_configure() {
 		-Ddaemon=true
 		-Dtools=true
 		-Dmodules=true
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
 		$(meson_feature elogind)
 		$(meson_feature systemd)
@@ -109,6 +109,7 @@ pkg_postinst() {
 		ewarn "or, if it does exist, that any reference to"
 		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
+
 	if use system-service; then
 		ewarn
 		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 21dc5de57874..ea1b71883dbb 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single meson systemd
 
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
 	EGIT_BRANCH="master"
@@ -23,9 +26,6 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
 LICENSE="MIT"
 SLOT="0/0.5"
 IUSE="elogind system-service systemd test"
@@ -46,7 +46,6 @@ BDEPEND="
 	sys-devel/gettext
 	test? ( sys-apps/dbus )
 "
-
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.68
@@ -55,12 +54,8 @@ DEPEND="
 	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}
+RDEPEND="
+	${DEPEND}
 	system-service? (
 		acct-user/pipewire
 		acct-group/pipewire
@@ -70,7 +65,10 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
 )
 
 src_configure() {
@@ -78,9 +76,11 @@ src_configure() {
 		-Ddaemon=true
 		-Dtools=true
 		-Dmodules=true
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
 		$(meson_feature elogind)
 		$(meson_feature systemd)
@@ -109,6 +109,7 @@ pkg_postinst() {
 		ewarn "or, if it does exist, that any reference to"
 		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
+
 	if use system-service; then
 		ewarn
 		ewarn "WARNING: you have enabled the system-service USE flag, which installs"