gentoo resync : 16.04.2022

10 files changed, 433 insertions, 14 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 6dddcbf438eb..868c7ca86277 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -10,6 +10,7 @@ AUX pipewire-0.3.43-systemd-user-unit-dir.patch 1310 BLAKE2B 7068220b1581b73c2c6
 AUX pipewire-0.3.44-musl-build.patch 802 BLAKE2B 906313a422d477f28e69bec2fb2e931999e9875dd595c7c040bccdd2a34223fffbc303861d215f618053b899a386af32dc7192271d3e3b8d4751ac16e0088eef SHA512 9290ae00017df0eec1c41e4528bc4f4fb53df5779e83086e4f1fdfaef5aaf27a20a5cedf92382a22304c9266b6c40997af811212d54fb65ddc188acc0d34d792
 AUX pipewire-0.3.47-pulse-server-pending-sample-reply-crash.patch 3595 BLAKE2B 9c76203afebdfd00465006751d8abb3ed6fae22d72a27e0e89e89b7fe5a72aa0701adc47de68c7e8f02070d4bca592b9c281e7df5b901e3ae1efa6b449fa3779 SHA512 639f766965186e17a2ae8cf8ec3202342a42ce0eccc1c8644bdd9dea8d281ede8b408c8d485def35671e29d26ce014ea986e0514f4f465b032c35273c26eec9b
 AUX pipewire-0.3.47-revert-loop-remove-destroy-list-mpd.patch 5719 BLAKE2B 4540fea92d596ac9e437559a64e98f3962e52d7c71aece9d189b3708b4e825e63c118ac90c4269f47043092ec3e0c3daec7a375bb52cbbda1818bca975610546 SHA512 739f22521b04303e436a64c0195ee238ad3980959a3f0c6098b4d5d67f522a23ff91b5db021f7bce6b7ae33260a9b13258470137e6b4fc3850dadcf60da7d5b8
+AUX pipewire-0.3.50-fix-spa-header.patch 1256 BLAKE2B 728296383a96f3b1e283132d2e97c2b26f5edc676d6ae6f7d697d997ba67fad0aedcf30642ca2bfb72c8bef1ef90c7ffb27e1dda8c8d452a71719530bed03f70 SHA512 d3062ea859c3310481395b9d622ee3ada0bae14ee56e3f7d8678b5cb1f5ab4af2d38ecc718e56f5330150f3af999bbd80603048ced66a73c51723a719bf753af
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
@@ -21,13 +22,15 @@ DIST pipewire-0.3.45_p20220205.tar.bz2 1296767 BLAKE2B 2dbdb1db9ffdaa36579d7a6ee
 DIST pipewire-0.3.47.tar.gz 1746286 BLAKE2B a34e5378d99b2b3c98731baaabf695b7aab882e557635b1a7f1cf542a5012014685bcf4254e4a81d4aab2ec2c8dd804115d5a57eaf13cbb042db2d4232f4bdfc SHA512 2f188910b6a04ebc6ebf288e2f6eab8a227056fd9c5c97a8a279ebff0f88cd6b98b9bfc3bf6aff55104fa537ca04f2c89a8d45da7f2104e07e1b2e531f6cc21c
 DIST pipewire-0.3.48.tar.gz 1754730 BLAKE2B 2ba562cdfdb179ab7c36e1227405dd83cc2a9fda3b3496e8d9339a4efc607cfbc1866eb2a9b2be9d44a2e3e4412a2c8af593028086c7c6b81dd14aa7158f19a5 SHA512 67699015612dfafd12f8e0908fa028a1ae91f8ce3a6cd7aeaf313ce991c6cfa206ace24a559bf64631c0a690ea8aa03f878c7f73e3c123881f1b015cf6627c50
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
+DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc SHA512 e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
-EBUILD pipewire-0.3.43-r3.ebuild 11620 BLAKE2B 64ff8aaaec2894008dfb32bbbcd6f8e6f9c0480089d3f19b5b1b2dec57b2ddf5880a11f9b4e383efd0ce05e1a4480671042947586deae5a849404dc7d9de17b7 SHA512 86e838d0792b78b46186e1645acc241e0bce35bae2ff58e3bf41c41f491cbf24e9cb82fa68f18adb1016d5df51659963e74c66578bdefe599f6f7c0f6ceade98
-EBUILD pipewire-0.3.44-r1.ebuild 11766 BLAKE2B bbd2c2da083e950bc17440871c8d5120e6b375f5111d3b23387472b46769511958132c57aa7ff389c62f40dd7e925dc704c9f0df0a24f0476d27739246c606a6 SHA512 c93720c87b01a6fe777a5fbb88ec2f8c11dad853522a4d0cb3e2c27f8c6c00eb73d40231099350ebfc73a9c1c62db54df3b1e73d452aea34b6109bbb83aa5bbf
-EBUILD pipewire-0.3.45_p20220205.ebuild 12746 BLAKE2B ea55e2256447631293e8cb5b509202d14c3ada1fe6589cfc0a75ce7028a3f3f5cf5d68bc7b6bca7c8059a56d1c1c0f5fb99a494170d9b8c2238b37da7e1ecd84 SHA512 eb0d8ad4df48c8265159ac75c340be3b20d665bcfb9610dbc45dc3ea0cfb6408e01b9ec6374ce53fb536075725b09a9d5381edfedad3c3ccab812db153c739b5
-EBUILD pipewire-0.3.47-r1.ebuild 12835 BLAKE2B 4276d587ae84c78692676853430541e454a252ce54d5909dcfa1c8e9bb69aefdc3178073618a91354865faf0b14b30651b2cedd95b079e138e6e32817d2de3d7 SHA512 46f43ace5ec82aac295e70b95904227961c2fbaf242d31809b1bc3f17b38c4943f62de29bcbfeea94d63cc545e2d05e2f3726562fa8f5931cf062065ad8acb98
-EBUILD pipewire-0.3.48-r1.ebuild 12781 BLAKE2B 41ee2277e1f8b823e0c1cafd66061596cc3228e048ed0d33711df3821ad3721960d87a762e1cac58097835fe7faf0164356136eba45412efc8dfb0174bca4d36 SHA512 21ec3b4a6698d040685cf97d67f7e09ccd20f8e1b7c4225300020ec703dfd6b7e58ba57d325e048b7504506baa108f5179f264c2f10231e839e7d0251e89af5c
-EBUILD pipewire-0.3.49.ebuild 12781 BLAKE2B 41ee2277e1f8b823e0c1cafd66061596cc3228e048ed0d33711df3821ad3721960d87a762e1cac58097835fe7faf0164356136eba45412efc8dfb0174bca4d36 SHA512 21ec3b4a6698d040685cf97d67f7e09ccd20f8e1b7c4225300020ec703dfd6b7e58ba57d325e048b7504506baa108f5179f264c2f10231e839e7d0251e89af5c
-EBUILD pipewire-9999.ebuild 12781 BLAKE2B 41ee2277e1f8b823e0c1cafd66061596cc3228e048ed0d33711df3821ad3721960d87a762e1cac58097835fe7faf0164356136eba45412efc8dfb0174bca4d36 SHA512 21ec3b4a6698d040685cf97d67f7e09ccd20f8e1b7c4225300020ec703dfd6b7e58ba57d325e048b7504506baa108f5179f264c2f10231e839e7d0251e89af5c
+EBUILD pipewire-0.3.43-r3.ebuild 11710 BLAKE2B 03b24308291f9e7c8211805a7b83f4d754eeb6e8f3829c59d251baa01a31b5b62eb2d6c92896e8b6a517b41646eede130e0c9cd771baa1478e2ede04f700249c SHA512 de7e91095f810570a81bd740ce166973b1af82de882c52206a22f6932ee8b3317f8e12a9509e0d39537b31db1864e4383c0b9d62927f02aded9c69f1a79e937f
+EBUILD pipewire-0.3.44-r1.ebuild 11856 BLAKE2B 09596d14d58e62c66312965d4b114099f6c7289424314fa375d0747fb94be8d774f8638b16f1cb31309b74eed3d9df16399eb315c5a41cccaad7fb8e89dd59d3 SHA512 56ee54cad22973eda1710fe934e478936360e64e156a319f44ed670900875fa075568029c91979d31d3c21be9440d73785f41f15bcfe16b137fc8a7a751781b1
+EBUILD pipewire-0.3.45_p20220205.ebuild 12836 BLAKE2B 3dc53db39b4b6756dbeba3c119bc1c25d45d535e4f4a8c42314a8bdb8b1c396cdac535b523664faf1cf2cb9905c9a514029f35a4cec501154e39fcdae7efefbe SHA512 cc34053f6912b0b402977e188e3de71c118aae5ee45b6a83665df37d731815e8e2b8947c1143e0039934ed4ac8306b736417cbcc8086f2bd8313773de4fd434d
+EBUILD pipewire-0.3.47-r1.ebuild 12925 BLAKE2B 7b8ac68c6fec687276d1c885d645f514d95adce43add8f5bce1220300e30778e8459e434db44230c73d04bc8389950551be160d40e668c687c73d843bc1b1e33 SHA512 9c6cadab163596f2817a53e5675b7124f655c829ce4cba471d502fa7d685a95c4f8a81060a265d22ab7b8a5fa2d23d350c51c28439b5102a2bd14b1c49c68951
+EBUILD pipewire-0.3.48-r1.ebuild 12871 BLAKE2B 9a226694447777c6f02271e78e66d1838a5ed26a8500583dbe6884e46baf12d565a1f915d454ad805fc9b3ed24730ed75bb16b392d26ee18bfd7cacc09af15f1 SHA512 3500122f67d60f69ef56070430ad1d746571fb51d8fa729be17231aef795d4a290c6b3ddd637ee353b34ad466c65dcb378106003774aedac7267755d6ce4e004
+EBUILD pipewire-0.3.49.ebuild 12871 BLAKE2B 9a226694447777c6f02271e78e66d1838a5ed26a8500583dbe6884e46baf12d565a1f915d454ad805fc9b3ed24730ed75bb16b392d26ee18bfd7cacc09af15f1 SHA512 3500122f67d60f69ef56070430ad1d746571fb51d8fa729be17231aef795d4a290c6b3ddd637ee353b34ad466c65dcb378106003774aedac7267755d6ce4e004
+EBUILD pipewire-0.3.50-r1.ebuild 12912 BLAKE2B b2dc21bacb032a3992d78c74346547dbb3428609bafe94ac2af675115b00d53a0815920cbff2a03b3189d7d08202b68d471d4270b0e379b5a1dbad4034a63879 SHA512 03d473da5a7b4136fb6478828c3ebe0681c07dcd8115ccbb84082c38f086c26ad97f6eac108fe12327f803b7802ec1243fad7710464f5e6a06c172913e7c4688
+EBUILD pipewire-9999.ebuild 12871 BLAKE2B 9a226694447777c6f02271e78e66d1838a5ed26a8500583dbe6884e46baf12d565a1f915d454ad805fc9b3ed24730ed75bb16b392d26ee18bfd7cacc09af15f1 SHA512 3500122f67d60f69ef56070430ad1d746571fb51d8fa729be17231aef795d4a290c6b3ddd637ee353b34ad466c65dcb378106003774aedac7267755d6ce4e004
 MISC metadata.xml 1617 BLAKE2B e24aeb1644a4fe0a9ca35ad078149c1736de01820ee78d78cd733b06313a82294913601ceab2f35eee98a608bc5c25d184d285810916c42902515058a57e13b4 SHA512 992b300e69e808ecd51c4e3073941d7e577889e4d8d8573b7643a49fb3bb7de1fb2c48d4f99c8e703c5cd7d03bd55f6cffa2c1ccca052f89d6a4cabccb09a76e
diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
new file mode 100644
index 000000000000..5b9ad3cf2d7c
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
+https://bugs.gentoo.org/838427
+
+From: psykose <alice@ayaya.dev>
+Date: Wed, 13 Apr 2022 21:57:49 +0000
+Subject: [PATCH] spa: fix c90 header include
+
+placing declarations after code is invalid under ISO c90
+
+Fixes !1211
+--- a/spa/include/spa/utils/string.h
++++ b/spa/include/spa/utils/string.h
+@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	float v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtof(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	double v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtod(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.43-r3.ebuild b/media-video/pipewire/pipewire-0.3.43-r3.ebuild
index c5225496882f..73c1168fb309 100644
--- a/media-video/pipewire/pipewire-0.3.43-r3.ebuild
+++ b/media-video/pipewire/pipewire-0.3.43-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -132,6 +132,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(meson_native_use_feature zeroconf avahi)
diff --git a/media-video/pipewire/pipewire-0.3.44-r1.ebuild b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
index 14762acb4998..9e704ef7ddc4 100644
--- a/media-video/pipewire/pipewire-0.3.44-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -135,6 +135,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 
diff --git a/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild b/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild
index 2e19306a378e..00347f15856f 100644
--- a/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild
+++ b/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -153,6 +153,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 
diff --git a/media-video/pipewire/pipewire-0.3.47-r1.ebuild b/media-video/pipewire/pipewire-0.3.47-r1.ebuild
index 25c024b05e01..5b34dd267621 100644
--- a/media-video/pipewire/pipewire-0.3.47-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.47-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -156,6 +156,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 
diff --git a/media-video/pipewire/pipewire-0.3.48-r1.ebuild b/media-video/pipewire/pipewire-0.3.48-r1.ebuild
index 0a674de08b12..6a066b48013e 100644
--- a/media-video/pipewire/pipewire-0.3.48-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.48-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -154,6 +154,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 
diff --git a/media-video/pipewire/pipewire-0.3.49.ebuild b/media-video/pipewire/pipewire-0.3.49.ebuild
index 0a674de08b12..6a066b48013e 100644
--- a/media-video/pipewire/pipewire-0.3.49.ebuild
+++ b/media-video/pipewire/pipewire-0.3.49.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -154,6 +154,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 
diff --git a/media-video/pipewire/pipewire-0.3.50-r1.ebuild b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
new file mode 100644
index 000000000000..486d6073c4d1
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	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.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~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="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa 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)!
+
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	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
+	)
+	lv2? ( media-libs/lilv )
+	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] )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/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-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-spa-header.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - priority -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(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
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature 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
+		-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 lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(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)
+		$(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
+
+		# 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_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "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."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
+			elog "autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: 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"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 0a674de08b12..6a066b48013e 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -154,6 +154,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}