gentoo resync : 16.09.2021

9 files changed, 328 insertions, 19 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 02205eec8547..e126e10e097f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -4,15 +4,18 @@ AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ec
 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-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
-EBUILD pipewire-0.3.30-r2.ebuild 9676 BLAKE2B 0a830a07130fbbd97fb0e34ed02acb848e9dd1c6edb7f5e90f3b0f67a6fa9cf270ba914cb1b3db2439519f22b71ff63d78293589a68437610bf70855ada8ba25 SHA512 c5bab51ec5659176738b79ff2299794f84010cedfb6280198ee4c709f76d9cf8dc1b91bec70a132cfcbe074967b254098418b27e2dd9228445cf33b9e507140a
-EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 6e23d8b5fbc3f3a2a0369153cc59723f48755cbabfed1a7972de1b49b8a2b9493263d6a05e50868516232141f5e762be49faeb1487c2f0e887fa1f6ade9bf86b SHA512 700e6a4ac979a7fe90dcf8f14afc8a5fa5257ff0ae29797a5570f0df172c583b5d57883e94304bdcf7d1b1f0336a579e88d4dd5b45c04694641b585c754ae477
-EBUILD pipewire-0.3.33-r1.ebuild 9795 BLAKE2B 75e74e7779337370bba90c28cdf5cb960f7c5f490e3d6bb162d45cc6b7b579a35b509e2c744c9021b20957b5530b931461c6c0055a4f34da4ca0cbb070f6ae3f SHA512 4a9ac42b62301a377fbb165419e8ed7ed6cbd2899fc8e563f3ba37a240d89771598c8dd5957b2e13c692f6a0f4de29316e13b181dd8c7ad899eb12f882fe8d37
-EBUILD pipewire-0.3.34.ebuild 9814 BLAKE2B a69bbf960cbcd205fe494e45ae430453d1e53e0fd0d0fff717dd968fda0dd9a54c9d10ce54cc6af8b578caddd0dcb669476f9642a429d726276afcbbf677f7ed SHA512 bb24818c519fc9a5303f869fc8f6004e5a1073063473b2b606d241e4cf34b35812805cf319a08aa92f5ee00973c05f006a7bcfbcdb73cea3863e54662dc33c4f
-EBUILD pipewire-9999.ebuild 9814 BLAKE2B a69bbf960cbcd205fe494e45ae430453d1e53e0fd0d0fff717dd968fda0dd9a54c9d10ce54cc6af8b578caddd0dcb669476f9642a429d726276afcbbf677f7ed SHA512 bb24818c519fc9a5303f869fc8f6004e5a1073063473b2b606d241e4cf34b35812805cf319a08aa92f5ee00973c05f006a7bcfbcdb73cea3863e54662dc33c4f
-MISC metadata.xml 1181 BLAKE2B c6248f3b02728840b4264790122878d3badcb8cf674270af4fe0543a5eec659e3b1332f166ab7ec8d71d689db9f8f1cef154357b39dbc94db45f67d4c9a9decf SHA512 0a8d529ab19d3f6349b609daffe5c55d9e0dcb2f07c2c416bc209994c7623c964f72eeab148602ec5d7d35f700c2813f6c773902b761b65db9d783f6e284893b
+DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6
+EBUILD pipewire-0.3.30-r2.ebuild 9676 BLAKE2B 7ce07fb1a10797b988842acdeb71e43e92b96af7ebc42c2c14ab2e72bfcadedf843c38ee72af8901c03826d414b9beba55a81b6a2fae3e2f2099b814584e489a SHA512 a5fca98e84b2e12ed3c21ea027fd3f18d17e9ab1f65c6f783b0ae1d29aa8a71c332bf1e0ea4a7456e01e2b2271ee59650fbec6852943b6456232e9f64ca32cea
+EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d
+EBUILD pipewire-0.3.33-r1.ebuild 9795 BLAKE2B 59a275ed5543e9d5e5a2db1b68eb5f666b552b60fbaff32e91473110ad5ef9e3ba9ea2941271f28e615617db067969169024486504c2a1843db5d3477529ebad SHA512 e12c0b17980d9273ff30b95acb3f310290a3455df6f668fd9297e852de39f8a5b59feb6bbb627b0d2019657aebe70dd0778df02fe54ba3495bb0cc4fb9a56853
+EBUILD pipewire-0.3.34.ebuild 9814 BLAKE2B fa86ddd37b0eade61e0c60be27b382e122b2d960e1c17d091d7857eaee8da61ed6c3297c5922351930afcdffd83528afe17c49c6330d35f9865dd489b0de2c19 SHA512 713a47a206884860a10f118e83c608c334572472001990a381f25f99afbafdb3850ce6db944d78b537005a9545921d00a984537370453c64959f0b8401239708
+EBUILD pipewire-0.3.35.ebuild 9977 BLAKE2B 1c39473eb52ee33536f16367c98fa2219a3c6183ee45179c743174d37ab5421aab09f9aa1293dde8d42f493ddcde7aa7b6b69639df7b477eb838a88f3b352056 SHA512 dfeb33b87fd5ede5ca59f59c8a46f3b153a5eedfa6db42b6a9dc9430963c71a31c6db4b0f23e26d03cf98bdbe6326b106c0952d0459e87e14f6b49f14085d5c1
+EBUILD pipewire-9999.ebuild 9965 BLAKE2B 0e66e8dcdee43804e1974729c78334df787d178822d77c0199b4e47ae99f18c4737656f6888f936d48f520ec44db8068c61a27af21328626c3e37cae510a78b6 SHA512 a59e05171658926d5efee5aae1c9f9fa35f4df866bf9e2c81f6a14e14066a64751e1dc9391b8064653142d2cced23fba6e79d6a668a39f2d473f72124ac38f08
+MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
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
new file mode 100644
index 000000000000..3edab5b924c8
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch
@@ -0,0 +1,20 @@
+--- 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/metadata.xml b/media-video/pipewire/metadata.xml
index 153ba4a9087a..d6ee6bc2024f 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
index b9e8cc5883d7..07b96608c2c4 100644
--- a/media-video/pipewire/pipewire-0.3.30-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
@@ -265,7 +265,7 @@ pkg_postinst() {
 	elog
 
 	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	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
diff --git a/media-video/pipewire/pipewire-0.3.32.ebuild b/media-video/pipewire/pipewire-0.3.32.ebuild
index a0e138f40226..7c5256744eed 100644
--- a/media-video/pipewire/pipewire-0.3.32.ebuild
+++ b/media-video/pipewire/pipewire-0.3.32.ebuild
@@ -263,7 +263,7 @@ pkg_postinst() {
 	elog
 
 	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	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
diff --git a/media-video/pipewire/pipewire-0.3.33-r1.ebuild b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
index a857388669ed..b5167316316d 100644
--- a/media-video/pipewire/pipewire-0.3.33-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
@@ -266,7 +266,7 @@ pkg_postinst() {
 	elog
 
 	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	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
diff --git a/media-video/pipewire/pipewire-0.3.34.ebuild b/media-video/pipewire/pipewire-0.3.34.ebuild
index 1c3229408a40..3c4d544cb906 100644
--- a/media-video/pipewire/pipewire-0.3.34.ebuild
+++ b/media-video/pipewire/pipewire-0.3.34.ebuild
@@ -267,7 +267,7 @@ pkg_postinst() {
 	elog
 
 	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	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
diff --git a/media-video/pipewire/pipewire-0.3.35.ebuild b/media-video/pipewire/pipewire-0.3.35.ebuild
new file mode 100644
index 000000000000..fc34f8ee3e18
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.35.ebuild
@@ -0,0 +1,281 @@
+# 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 )
+	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-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 1c3229408a40..3ea2e98cae96 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib optfeature python-any-r1 udev
 
@@ -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"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -37,6 +37,7 @@ BDEPEND="
 	>=dev-util/meson-0.59
 	virtual/pkgconfig
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
@@ -52,7 +53,7 @@ RDEPEND="
 	bluetooth? (
 		media-libs/fdk-aac
 		media-libs/libldac
-		media-libs/libopenaptx
+		media-libs/libfreeaptx
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
 	)
@@ -98,21 +99,23 @@ 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
 
+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.31-non-systemd-integration.patch
+		eapply "${FILESDIR}"/${PN}-0.3.35-non-systemd-integration.patch
 	fi
 
 	einfo "Generating ${limitsdfile}"
@@ -130,7 +133,9 @@ multilib_src_configure() {
 		-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)
+		# 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
@@ -267,7 +272,7 @@ pkg_postinst() {
 	elog
 
 	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	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