[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/, media-video/pipewire/files/

[Sam James]

commit:     83048813c27caef3b8d3e0ba27acdab663ebc2a8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 23:35:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 23:36:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83048813

media-video/pipewire: drop 0.3.30-r2, 0.3.36

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/pipewire/Manifest                      |   2 -
 .../pipewire-0.3.25-non-systemd-integration.patch  |  18 --
 ...pewire-0.3.29-revert-openaptx-restriction.patch |  30 ---
 .../pipewire-0.3.35-non-systemd-integration.patch  |  20 --
 ...pewire-0.3.36-fix-crash-uaf-media-session.patch |  36 ---
 .../files/pipewire-0.3.36-fix-version.patch        |  25 --
 .../pipewire-0.3.36-missing-limits-include.patch   |  17 --
 media-video/pipewire/pipewire-0.3.30-r2.ebuild     | 274 --------------------
 media-video/pipewire/pipewire-0.3.36.ebuild        | 284 ---------------------
 9 files changed, 706 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index d473d3c32798..4d01a2bceef0 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
-DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
-DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a

diff --git a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
deleted file mode 100644
index 51455a3b84b8..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
---- a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -204,12 +204,12 @@ context.exec = [
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @comment@{ path = "@media_session_path@"  args = "" }
-+    { path = "@media_session_path@"  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.29-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
deleted file mode 100644
index 9da495f12d0d..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@g.o>
-Date: Thu, 3 Jun 2021 14:15:44 +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 263af4c2..7671c74b 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled()
-     sbc_dep = dependency('sbc', required: get_option('bluez5'))
-     ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac'))
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
--    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-   endif
-   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
--- 
-2.32.0.rc3
-

diff --git a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch
deleted file mode 100644
index 3edab5b924c8..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -235,12 +235,12 @@ context.exec = [
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_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).
-     #
--    @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
--- 
-2.33.0
-

diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
deleted file mode 100644
index 6080ff4fd7ab..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629
-
-From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@×××.fi>
-Date: Thu, 16 Sep 2021 19:18:52 +0300
-Subject: [PATCH] media-session: don't use-after-free if linking node removed
-
-Should fix an ASAN crash.
----
- src/examples/media-session/policy-node.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c
-index d83613d0b..e273434fa 100644
---- a/src/examples/media-session/policy-node.c
-+++ b/src/examples/media-session/policy-node.c
-@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer)
- 	struct pw_properties *props;
- 	struct node *output, *input;
- 	int res;
-+	uint32_t node_id = node->id;
- 
- 	pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl,
- 			node->id, peer->id, !node->dont_remix);
-@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer)
- 
- 	if (impl->linking_node_removed) {
- 		impl->linking_node_removed = false;
--		pw_log_info("linking node %d was removed", node->id);
-+		pw_log_info("linking node %d was removed", node_id);
- 		return -ENOENT;
- 	}
- 	node->linking = false;
--- 
-GitLab
-

diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
deleted file mode 100644
index ace05b9e4a14..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2
-
-From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@××××××.com>
-Date: Thu, 16 Sep 2021 17:57:47 +0200
-Subject: [PATCH] update version number as well
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c9b98c8ba..ea35ac674 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- project('pipewire', ['c' ],
--  version : '0.3.35',
-+  version : '0.3.36',
-   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
-   meson_version : '>= 0.54.0',
-   default_options : [ 'warning_level=3',
--- 
-GitLab
-

diff --git a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
deleted file mode 100644
index c7ed7b973a91..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/6168067cb2a45ffa3c92aff1135659feaf9c1240
-
-From: Leonardo Neumann <leonardo@×××××××××××.br>
-Date: Sat, 18 Sep 2021 04:36:20 -0300
-Subject: [PATCH] fix missing limits.h include
-
---- a/src/pipewire/impl-module.c
-+++ b/src/pipewire/impl-module.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <dlfcn.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <sys/stat.h>
- #include <errno.h>
- 
-GitLab

diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
deleted file mode 100644
index c27f6c9196f0..000000000000
--- a/media-video/pipewire/pipewire-0.3.30-r2.ebuild
+++ /dev/null
@@ -1,274 +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 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.29-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.25-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
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		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
deleted file mode 100644
index 3225dc16d442..000000000000
--- a/media-video/pipewire/pipewire-0.3.36.ebuild
+++ /dev/null
@@ -1,284 +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 arm64 ppc ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${P}-fix-crash-uaf-media-session.patch
-	"${FILESDIR}"/${P}-fix-version.patch
-	"${FILESDIR}"/${P}-missing-limits-include.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 "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
-		elog
-		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user enable --now pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-		elog "autospawning of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	# 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
-}