gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /media-sound
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
168 files changed, 1790 insertions, 1817 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4e0a781be700..82341e086fa7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 46b2480352cc..eb6bf7612e4b 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r2.ebuild 1853 BLAKE2B 6564722302779ea37fda3cae939e62f3cc921415e157993a78fb64c6a55e9ff473ce6d385ef5c269896bdbde3fbcf4f1db3e795cf599d9382befdde7063c2e0c SHA512 d8063567c0ed0f0007456788eebc21db9d349529126af5da110dbedc84494a5e6ef54a9b8cbaad3802e328493f31239f4ecfc0ba58df682526ef15483a1a5194
+EBUILD abcde-2.9.3-r2.ebuild 1810 BLAKE2B 239bd049c79e1ddf1f354f0207a1edfcfe2bcd165b95e4cfeb08b245900d37104d3ede58ca429052152f8a4f38378fdb5b923aded21debe1e2d008434f7e3be7 SHA512 3873db9bc3ef42195868837e9ddb6da411e6bc0d0f22178d7c9ce6722b3afca3aeecbbf796178737edeb7379d74680a7ec338f7f2d5f399caacc1adacf6692f1
 MISC metadata.xml 688 BLAKE2B 1b7fa0f469d0875c859efba67704f3f879a4aacdf1265e4e420ac9061d90233f60720fe9ff7c8af1d192c7c164225388db4ceaefec047c309cbe319f54d33ca4 SHA512 494ec16cb838014916286f73e1fe215afbf35ee420bd5b5451f4e53e6a0b71a168cfee109c489752ae2a39668fca07ceb2b8127f5fdfe17a141472d7f2187ada
diff --git a/media-sound/abcde/abcde-2.9.3-r2.ebuild b/media-sound/abcde/abcde-2.9.3-r2.ebuild
index 146aa1487595..a3751c7b1951 100644
--- a/media-sound/abcde/abcde-2.9.3-r2.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,11 +24,7 @@ RDEPEND="
 		media-sound/dagrab
 	)
 	aac? (
-		media-libs/faac
-		|| (
-			media-video/atomicparsley
-			media-video/atomicparsley-wez
-		)
+		media-libs/faac ( media-video/atomicparsley )
 	)
 	aiff? ( media-video/ffmpeg )
 	cdr? ( app-cdr/cdrtools )
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 49d250e7dac5..ed8b85153891 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,5 +1,3 @@
-DIST abcm2ps-8.14.12.tar.gz 259618 BLAKE2B d0efa0b8a624447791a56591b4a2c0d775c3c3f628dab437a0cb02d49614e21e587d13467f7fa72955a2846704dde0a0da28ae6888faa0032edcb6d026365f47 SHA512 a9bd26b21ed057be11f0de6c89e76615820c476b18e521fb7f478e6f685fb768824879d441d616b3de1bbb4a4335ec169aa819a609bea295e0d522d1466e42ed
 DIST abcm2ps-8.14.13.tar.gz 259695 BLAKE2B 7554976bc55a0f254dd6645bb0b7ca36566a98b0b2cb76f5fcd01ddf243fba92426aadc0e5f5e71d2644048fa9b1aba6cf091f23ac4bac7f4e634288186a015f SHA512 d48f44051aa62b3ee0dcd5cd4a32199d36d4ba056e6473b3c5eb378afabd40831f2a9abb2bbad2acb1c8bd3197a5b36177fabfb4e712b71589f835cba6c87c25
-EBUILD abcm2ps-8.14.12.ebuild 878 BLAKE2B 36b88fa45779d165602ae5b5805d501e3dda59ebf6d0712e0201b6af0922a8e7cc7a3322d7b9ac0efbaee636f59079caf3fa14b83d28071efb3e50b931139901 SHA512 8d166545f746551422117be43d011fcab1efc2591065a8e599089537c098f39220de25354f7963040d462c6faf203ee13957993bc66d6ca1c7ee0daaec2404eb
-EBUILD abcm2ps-8.14.13.ebuild 880 BLAKE2B 04b11064df17602877ef0e5c849327b5197179b1a008517858af2d7ad4613a903566ee101b90b896789bd72ee8de432a0e02f762ee57fd6a2a5c346c18041925 SHA512 2f9a732eda8314534652df24c17ff40ccac99c9335ea4f36ca420525e655794c85ece549394ffe89c237c672762743646d11886adbae2bb9d1fd7a9d43b463f6
+EBUILD abcm2ps-8.14.13.ebuild 878 BLAKE2B fe84af02dbf7716903ccfd98a8d70fe3133cc3697873fc900c8310d6cdebdeba80dbb393e52400ad41dc6cdf5d857f6bb2c4c9ed7a2355240c18aa3c89bdfe0f SHA512 b6e4ee3e554b10534ef496ac6b401d101d83c2d2d58c02a1a91dda197c92b3926170af4bffd4a69bc3c2ad07efb578e3e529c8e5652e3f1a5a8c5ca705edbacc
 MISC metadata.xml 443 BLAKE2B 24e8ba1f04b867fa9b4e5ac6f195f696e417213feb6232f77b8ad266e57dea92a53b65fd252eda339e6a6a733a05e0aaa747f8a386c94de78d768dec387cfa68 SHA512 d213b82bddb08dd5624ce85deaf9d7962af180df83ac33288ee2b716ab3b50b590e1693f11fd68640728221b1dbad8c86389f09a24b883e3430862854cc39f9b
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
deleted file mode 100644
index 1af8b60d3f2d..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="https://github.com/leesavide/abcm2ps"
-SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples pango"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	pango? (
-		media-libs/freetype:2
-		x11-libs/pango
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc README.md
-
-	if use examples ; then
-		docinto examples
-		dodoc sample*.*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.13.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.13.ebuild
index 725e2681b729..f48a4a9b7448 100644
--- a/media-sound/abcm2ps/abcm2ps-8.14.13.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.14.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples pango"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 9cc44914aba0..a10d6fceffcc 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,7 @@
-DIST abcMIDI-2021.12.12.zip 607868 BLAKE2B 89b978b3a8a635617e44a870a6d1f36c1053fafdee189fce5c1d419c51cea94f77b1ca1a8ecb6a7bd0cc0c4d92309a8f4d590ccba8d581f9793ae94fc8e4abb3 SHA512 909c25cbef04b9aada3914bbed1a13bc1ca47414a104601fdea733adc37bc7c7fd19be09c1dbdeac76e10df778a0d9481469d5df4d2b6a94622e157531d866e1
-DIST abcMIDI-2022.01.13.zip 608407 BLAKE2B a61a0b536b268082a60638d05ac40bf40453b44751f36647515e31511600f2530037e53dea931e212321a8cdab40571dbbe97c63a7b88ac79823cf4cbf4c5871 SHA512 eaaee84e269cb7bc5a171906ada72d65be3f44e6fc5f1426333e03962c032bc709becfce9bf5aee66cfd18e6200afe855e1f703436f2cc61e3b64facd13837cb
-DIST abcMIDI-2022.01.28.zip 608759 BLAKE2B 21e1b6fcd89dbecb759251ec4419704b22548d86f35166a81b5b87ddee4825d6f369886bb351b3ff9f9c33c34d81b994e7025d63c6ff1c8d555f511f031c4591 SHA512 4fab766e86a4f5da10c8f6368383a4b4dad50d7677d85b6a9f5fe7cf7681d23cab117fdf39d9fce6ec078c5af4a49115b14477866543e9eb4ce9a80e983f5d21
-EBUILD abcmidi-2021.12.12.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.01.13.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
-EBUILD abcmidi-2022.01.28.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+DIST abcMIDI-2022.02.13.zip 608999 BLAKE2B 5b98d7cb4a51fbc1afca4a2423bb0904b224740bfb1a966fd540bb0dea546292c5c730b5a586422009ebb3090d3b063aa2e850369c95b789a71b59610c97d50e SHA512 b6f26f06a7dddb54f70c176e51a1ed21d78f96691d26bd6fd9780a098f1a1305325cbfa68b0c80cad2773e608005ac9814118bc93f0bf2a86633e89baa3408aa
+DIST abcMIDI-2022.02.21.zip 609368 BLAKE2B 0608d9539d0a66f739a820693c5a9884d1b39b68e4bcd3d21ce020ef240de6e19eacb52bc35ed7a9d4c4fde47e6265c415cf4d80711853904ccdc1ffd752cefe SHA512 515c6ebef75a5b0592578dab6f5d940ed5e25811dd66f15f85ebb1e6fdd7bcbcffdd4d361e0f16a78144323fac14a0cbd1a7ed6b14c7039e2d48986d40765171
+DIST abcMIDI-2022.03.08.zip 609510 BLAKE2B 231eb517a2d47993ed39e509d377d14ec2311fe49128bf559799ea1fabd3ba79c69307f2d7b9d44fec2279e42d0575141088463ca96aa0f9dda5bbecc305a92b SHA512 3267bcecad586e0aadc5fbc2801c0c992ba765094fdf5d3b71a8634f4433a950c64b0c863bec496bd21f8a630c0e768cbc39d50d58e6cf9d2769a66bf265a8c7
+EBUILD abcmidi-2022.02.13.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
+EBUILD abcmidi-2022.02.21.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.03.08.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.12.12.ebuild b/media-sound/abcmidi/abcmidi-2022.02.13.ebuild
index 3b11050a4f44..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2021.12.12.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.02.13.ebuild
diff --git a/media-sound/abcmidi/abcmidi-2022.01.13.ebuild b/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
index 11f547f4cb8e..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2022.01.13.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
diff --git a/media-sound/abcmidi/abcmidi-2022.01.28.ebuild b/media-sound/abcmidi/abcmidi-2022.03.08.ebuild
index 11f547f4cb8e..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2022.01.28.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.03.08.ebuild
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 17b9035bae4e..998234df7580 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,4 +1,4 @@
 AUX aeolus-0.9.9-fix-Makefile.patch 612 BLAKE2B d036968f8cefc735d993f4d4a5cb8f177cd026b72cac830c505880e9b09351100705668084b937603a6ef4dd85a39137284fc7f01cfdd7db948c33a733a134ce SHA512 1847ab48321d1d478ec4842fc96f09dcea57799c630f7b49edac0297d7a5c7c21fcd699d3a001801d319e9a4520ad1c6f79494a2dbc91f7ba9a34a38cdcfe01f
 DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2
-EBUILD aeolus-0.9.9.ebuild 1264 BLAKE2B 6c8dde9dd876c2ffdc210eae1c87ac724bc48c3809f618b0af71c9a2b25185ecdd7e840420af434e23ba9fc4f61730d4b85aac1f74c7c394f08147da50325f02 SHA512 a1602519c246877ca23a3eca28db3f1ee24e3f14fc1ec819bfa6a2c79bc75e888df30bbcc1b116b09e910589ce6e7ecd0895b8b59c59bf3e3c7ba64a853fedb0
+EBUILD aeolus-0.9.9.ebuild 1255 BLAKE2B edd31e3eb988212c7fe3dc5bf127135d875752f408a72ca97e5ec2ea84925d038f254cd9a7156c9728cde0c3aabbae4ee5e75d3315e32e07745b807bf6078db8 SHA512 49c7b8a8588f7f85b6fd28c6c394d1847bb9e27662b27158d113683f449e789898a2745bfd04f05a809f210963fff691af20017eb5c9f4825e7e2011a6674531
 MISC metadata.xml 827 BLAKE2B 2f0a0beb1172d7e417a83bba3bc9f33240585bc4f05f0aa5651889d32a17ca5b8eb519d3fb4753704269cad902a51501c7b776aabf9ebbb3a8a3c2940d777d1a SHA512 6271eb77c2c463f2767651ef23b07db9d8df54f0908aaf1a04e76878fea28453d992a7b7119c7679e64858f30e8d32b498dd4294a670bb5890f8014efb5cb82e
diff --git a/media-sound/aeolus/aeolus-0.9.9.ebuild b/media-sound/aeolus/aeolus-0.9.9.ebuild
index 4d71f3088f41..9d6558e3be4e 100644
--- a/media-sound/aeolus/aeolus-0.9.9.ebuild
+++ b/media-sound/aeolus/aeolus-0.9.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic multilib desktop xdg
+inherit toolchain-funcs flag-o-matic desktop xdg
 
 DESCRIPTION="A synthesised pipe organ emulator"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 97ab375217f3..8b2c0ee5bea7 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,9 +1,5 @@
 AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
-DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
-DIST amsynth-1.12.3.tar.gz 1624332 BLAKE2B a78317a08c4b02c14578f68fb0fbd7de9380f439c8bc737321c253df5effcd23219ff02d50520768ed5c698b4f284a87435640e965ee4f1cd6023ae770dfd10a SHA512 ac4f32b2a35ebe15c0c63ded213c2ab73bb3a105ce9c857811f095807a1c032dfd518eea5709ea58594c54324bca194236d5fe4606fac274772c9012be2b1110
 DIST amsynth-1.12.4.tar.gz 1624416 BLAKE2B 1dcd2454d94200b76097d4215ed419123a3b8427064c8f674a1e7cb27620fb5b2977470ea7feb8114c429ed904511ec73c73461b7f38e1388e4cfeabc4e68ec3 SHA512 502fdd1d6c4e54a57482d266977d78008efa26717c173be0bf98e907a111366fd80b65d667b9448e751085901dc5f2a61ac0bf5b1d02e35c695ecd99c9d1df00
-EBUILD amsynth-1.12.2.ebuild 1135 BLAKE2B d1642af920eee3a3f40cdcca6802996ae7c44a2f070288b4639493dd2587c7a0c4b3c2271374d89ff186ff75d2de7a6fc175db10a10182854e35c550333a47ae SHA512 072dd5c9a8f8766db10f61ae69d4c98b4e9df33f2779d966bc8ef999c357b27fcd64bdf0b72e38aac8e2cbcd0a366be6d4c5662a69ba8dd996a35f9b7a2c0368
-EBUILD amsynth-1.12.3.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
-EBUILD amsynth-1.12.4.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
+EBUILD amsynth-1.12.4.ebuild 1151 BLAKE2B 4feb08fe1ab1b3817709aca28d7f659566e76e5b819905ff2c4a1aa2e63209bd617aa8fa3b3f0196f343331483eb5c0595918675cd72761f0343fb9cdcc91350 SHA512 532c7810d7cd4a5dc5b033d9e197a26b898db708a5c4318d967e4565a1c8d21c4a20c2a6205021357e6ad54d13c9810a6c0357eda48e7ea9fa9c126afc4f5062
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.12.2.ebuild b/media-sound/amsynth/amsynth-1.12.2.ebuild
deleted file mode 100644
index 892e1eb063c9..000000000000
--- a/media-sound/amsynth/amsynth-1.12.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
-
-REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-RDEPEND="
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-	)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		x11-libs/libX11
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-metadata.patch"
-)
-
-src_prepare() {
-	default
-	! use gtk && eapply "${FILESDIR}/${P}-x11.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with dssi) \
-		$(use_with gtk gui) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with lv2) \
-		$(use_with nsm) \
-		$(use_with oss) \
-		$(use_with vst)
-}
diff --git a/media-sound/amsynth/amsynth-1.12.3.ebuild b/media-sound/amsynth/amsynth-1.12.3.ebuild
deleted file mode 100644
index e42fb11b9d12..000000000000
--- a/media-sound/amsynth/amsynth-1.12.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
-
-REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-RDEPEND="
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-	)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		x11-libs/libX11
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
-)
-
-src_prepare() {
-	default
-	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with dssi) \
-		$(use_with gtk gui) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with lv2) \
-		$(use_with nsm) \
-		$(use_with oss) \
-		$(use_with vst)
-}
diff --git a/media-sound/amsynth/amsynth-1.12.4.ebuild b/media-sound/amsynth/amsynth-1.12.4.ebuild
index e42fb11b9d12..b9a94fcf40e0 100644
--- a/media-sound/amsynth/amsynth-1.12.4.ebuild
+++ b/media-sound/amsynth/amsynth-1.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
 
 REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index ff4ce46c6c9e..ea988de48aae 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -3,5 +3,5 @@ AUX check-key-before-remove.patch 1888 BLAKE2B d8bee7f8acac213396d18d44740703746
 AUX man.patch 1054 BLAKE2B 37228832250f1c1e06edf79d00a4a4d7d5433f2d9b28ebb10eacb54bcfb7478d9ef64459e87f7f43a94be0b194eba024cde60175fc324ef6dad7a4ef9e2c1db3 SHA512 c2b05dd8c42f79994ae3be5df5ac495e95bfbc14355423faa75b23863418bad4bbc33524e2b86abc9e346678256c1ff454c160ebb5e09f48d466ef99cdfa407c
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
-EBUILD apulse-0.1.13.ebuild 1665 BLAKE2B f200dcf1e3ff2829528f20d70d4a4d1d8e9a6b1c5a743c43d4e718f33533de85e022b8b66dabb1098e873994888c52389c8e41dd6df744a69493cfdfb447cebb SHA512 464984d964c6e4615ff6185f8483cd832f5b69427e1aed92b12ec14ef47df023faafeaf0439d3250f9a7ae119bf33bc140f39aff1af2c6e12b672629c2e17d2e
+EBUILD apulse-0.1.13-r2.ebuild 1692 BLAKE2B 23f577ad3345be230218c771a5bdfd8c6f4cb1f4f3b2a60259710ffbe8f4e234736c69315007e81c35739ff9998b867ba08f9cf50c557560879e709a81852029 SHA512 cc12f3319c90eeaa70e5df92c90f5f758211543073b61af824b045acdb1d940661bc264ee67d8035621c576e4e9a733234943254c14217c745c7c786e42bd55f
 MISC metadata.xml 540 BLAKE2B adfeb63ea98458e891afdeb373620c00774de647fc651be12cf36318242cfd66ed28893ac21ef8e2addf6b25cf1e9c7debd805db74bc0f6abe384108f17e17e0 SHA512 80dc8622f0d2420fde5a0f67540ea004cec95ccb965ed816c5fed2ca5f44ae4313ef3adc0213f72ecef33372ad78893b26e602d88f0be2eb34a9960ee2e944d7
diff --git a/media-sound/apulse/apulse-0.1.13.ebuild b/media-sound/apulse/apulse-0.1.13-r2.ebuild
index 8fc4e08becf5..dc9642b78a9b 100644
--- a/media-sound/apulse/apulse-0.1.13.ebuild
+++ b/media-sound/apulse/apulse-0.1.13-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit multilib cmake-multilib
+inherit cmake-multilib multiprocessing
 
 DESCRIPTION="PulseAudio emulation for ALSA"
 HOMEPAGE="https://github.com/i-rinat/apulse"
@@ -19,9 +19,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sdk? ( !media-sound/pulseaudio ) "
+	sdk? ( !media-libs/libpulse !media-sound/pulseaudio ) "
 RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
+	!media-plugins/alsa-plugins[pulseaudio]"
 
 PATCHES=(
 	"${FILESDIR}/sdk.patch"
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index acb83c5787f2..d64ee3ad5739 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1,3 +1,3 @@
 DIST audiotag-0.19.tar.bz2 15016 BLAKE2B d650887a72242d1258fa2d60a876a6c5984369074d16e4f9028468f6520b38afad4a5cf92ba5c2a92f7f2a26b1aaf515998fa1a3fbd6d8d49d15074c68940c14 SHA512 a2e117deb78c3141ca1e17a12ee17033eb762fee822187d8aa708715ee4077b120ea2f7acf09d683d9dd292c0826e1152d09286830976b65d08738ced9a0529e
-EBUILD audiotag-0.19-r1.ebuild 728 BLAKE2B 6efb1025b0aea8334c2d0ec2ceae9a2a8b5f5b742174fd94a5ae215d40edc04e95fd5c3b53079b4119a878ff5c4ff283844c70502bdfad416cb3054814ea3538 SHA512 88b735e008f4eb72f7825208e7220778f92d734bf8f1b8f32891a54323d96e59f749a312cfd4b305d7045403d955eef0a5ab99e2301c6974a2bce7d5cd19bdf2
+EBUILD audiotag-0.19-r1.ebuild 698 BLAKE2B 62d0cee140b758ebd151ee90a96165f1a91a7f2d18a089588da1a037667116b2ee1b908c1afcd6b65df7b267d7b00c4115c0a1d5a342b23eb05c6819ceed53e3 SHA512 a351b329e62de718d8eaed86373ecbc4a8f73e2d92390214ccdcc0d705b55c4b902056bd6bac65731d83784ee239b8bbf95b3ee2b420cada0b3cbbae7c8dbad3
 MISC metadata.xml 336 BLAKE2B 734266a4430a4717379f514eefa7cf95bdf22523b0d379ca075ead8bcd2023f461f06a293f483ceccd5041dadf1bbd5a39c52610018c6f5f17e320bc85d79444 SHA512 eca2a7695a67024e48b017ea8402cc32d4f5de8caa41cf0aa99fb67370e9bfae3d3e7c286f33457c2ac5f92101a0b92f2649960f3e352195158766fd2099b87b
diff --git a/media-sound/audiotag/audiotag-0.19-r1.ebuild b/media-sound/audiotag/audiotag-0.19-r1.ebuild
index bffb56f6602f..7e58345a74d0 100644
--- a/media-sound/audiotag/audiotag-0.19-r1.ebuild
+++ b/media-sound/audiotag/audiotag-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "for m4a/mp4 support" media-video/atomicparsley media-video/atomicparsley-wez
+	optfeature "for m4a/mp4 support" media-video/atomicparsley
 	optfeature "for flac support" media-libs/flac
 	optfeature "for mp3 support" media-libs/id3lib
 	optfeature "for vorbis support" media-sound/vorbis-tools
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index 15c0dfcd5eae..3245bfa69a87 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -2,5 +2,5 @@ DIST baudline_1.08_linux_i686.tar.gz 1945014 BLAKE2B 01dfd3c03a7d5dab3f3d65d6602
 DIST baudline_1.08_linux_ppc.tar.gz 2369780 BLAKE2B 45bb73d76860f7cfb608ffb42e4ecf2c03bc8b32288a51e51ec02998085d7718f88047ec567a3960768003d3e201b0282cc80ac1bc6abc3a6c530690e1b8922d SHA512 7cb43cfec5cced3a6c051fcb56485b9a55d543a988f311f9130a41514d44a47fc0565415b5c9106cdd495283c62f03a137940afae4386fd4e87e3234fdece41f
 DIST baudline_1.08_linux_s390.tar.gz 459868 BLAKE2B 41cb33a5def0caacdf2850e04c3a348bb1181d010b5c2e06387c6a36c55473c44d99d3058614cdae104b04f2f94c0150c81a64c2ee509774ce15c82948fdb658 SHA512 636380e7b67b7885676ab9ae89a2ee97ac5a7934c1636f984ecbabc3bc78a3d1cd2b15a7e0572bb0f7a78d65a69df60550edad424dd102b5b85e244ae87ea5c7
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
-EBUILD baudline-1.08-r1.ebuild 1697 BLAKE2B 17258f14d6899dce9dd8269805a922c0d919f9ac05d59017b8151090e2071db73e228f9d9514c36dd76f94e434941fcd8c8fe50a6cd95c3b255c4c3630e71a0b SHA512 7a864cf511bbc333f7f2e35618376a92a4063249e983c8637376ff598f1dd5e45cd6f19b74fe73f2571c9646ed67b3bb036b56bfcf80544da0d4d207d7c47411
+EBUILD baudline-1.08-r1.ebuild 1697 BLAKE2B ce81bcb65fa3213f872a232f1dd48d324e9ad0a137ae5d07d30a427e745cda82a4a428e8bd05a394bcf8d8b4410def8f898da5473d6e59a876cb9c6d6f30a7ec SHA512 2382ddb2a5d5bd336b43ced5822eb880acd7736a1752b920f5fb675eb19d3a51afe57021ca8c0baccb7fcf95680f049b2265930423924601f3446fec45f5e6df
 MISC metadata.xml 784 BLAKE2B 86498481988ca19326620eee3726c8b95c538337659a4f137c21c0a4603fa98864b4c03d342f33c009f7659ff1e8ea5ccaf776fde3f6f343f6d537ea140d273f SHA512 9d8bee3fa27b88fc243af752f7145ba0fa12673a30a0b59be11fa679fa1a912538e20c5d131beda9b75db93536e3b20aa97984a59dd3ffd471409f951169ec7e
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r1.ebuild
index 54a34b12b4d5..3f4b55ef60a9 100644
--- a/media-sound/baudline/baudline-1.08-r1.ebuild
+++ b/media-sound/baudline/baudline-1.08-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils xdg
+inherit desktop xdg
 
 DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
 HOMEPAGE="http://www.baudline.com/"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~x86"
 IUSE="jack"
 
 RESTRICT="mirror bindist"
-QA_PREBUILT="/opt/baudline/baudline*"
+QA_PREBUILT="opt/baudline/baudline*"
 
 RDEPEND="media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 8212dc52e8eb..4f00dcb2abdd 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -9,6 +9,6 @@ DIST beets-1.5.0.tar.gz 1694845 BLAKE2B e4a4ad880edcc396170bca9e7d04548f22a55eac
 DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc
 EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B 875d18123f6494160f550ee63a5deeaea8166afd891de2265d2e6236144676a8c11e273206fd8cec3cd1a21c4efdc7a3488cbcb5c2451c5187807cea0cb5910c SHA512 b722b45ead4f00788d5b2fbae80af7f46dbdf6a94fb7f55424cdb7252bc04ab85aac99238055f30c74adbb5c9c0e40b2057ea90b10293e379bdede302cb8b29a
 EBUILD beets-1.5.0-r2.ebuild 3792 BLAKE2B 1d710f86dd553e1ce40156604b0cb704a60e8279af09d0e54d2e56c6ded3a43e8cb68e234b6a71853c4d4e60c7d42c142cdfe4ed84c89270c73697311cea8865 SHA512 467079e422111da50a1a9435d43ccb4d4163905437ca2ecc170420c511fa92eed109791a82e9c5efb4298b66e929b1467677ccee0e15d714ed7f3b43ebf803f9
-EBUILD beets-1.6.0.ebuild 3751 BLAKE2B 63419af5f7958d4017123b93ee8f03052a1bb1055f7c57339b00913afd29a013bd15799a11c8f7918fc82c7124c722e54585f5373549d5e3edea7b5c836a4ba6 SHA512 978760d98f2e01857fdbdef5468312a547a757eed8ddf6c377631a5690a1655beea32675a3ebf260c1de09a8d168066e8c09f753b2a4738a31b4a843742a5200
+EBUILD beets-1.6.0.ebuild 3756 BLAKE2B 0faed5c481e7d401431dded7149bdb74ec42e922fdb1311087b4dfa6c5f1c6234d4c845ab291149a6876bef430be1e91161c7c302713ad7ac6eeb1229ea79ef6 SHA512 37e39cad1c07d7537bd7ca49c107c862547b9b35ac4c0826f389ab12930f8d8d3aadb105ce681c835cf44a40a4082a1f6a91fd8d2eb34008900297f50a8cf979
 EBUILD beets-9999.ebuild 3724 BLAKE2B 712cfa973f438b1fe1f2600886d3ab0ad5237eb85df8b8b3cfee77f290327b93dee15f2d6e68013143fde3828f1b4418cc4ae928ee2a08f8841f01f32a85d84c SHA512 e63c0218deb1fee665161dae656978fb21aa3d2abd9ebee0bcb8dff436049faf56a222d8f94bc9625c3023e5a948981c1a3bf54a149aec7cb0f7080ebe9c85a4
 MISC metadata.xml 1782 BLAKE2B d06aa5a90768970a9327f134c1314896d888d4c4e78eca01665809a650af67890753698efcc18fc3f57e128a9443f283b4b11b613f0c04be1772e218d789f1d4 SHA512 7d8dc8ca0c7ed4bd8438736ac7f2bc003b07c1c2899e7e0b3d97e89113ff565049cded486c14be9b2026d7446318cfdc0cf4f9a61731c66e61ab7b6c0f9c5dca
diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index 77fc9c07cd2b..37b074a88990 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index b8a4ea3ec01d..92fd82be4291 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,5 +3,5 @@ AUX bristol-0.60.11-dontcompress.patch 504 BLAKE2B 387cc99241f4d39bf64dca83ddb74
 AUX bristol-0.60.11-implicit-dec.patch 292 BLAKE2B 6d9f900f00e7ca1642fe80d7cdfcf929954d9ef4948ca7d3037fc26f80ab1505ab33ab74ee6a0ff40e460f5305b2f2f2eb093c209d8900825e82637a6b0ae8df SHA512 88b528fd5a492bf77d87fc629e542315948a08cbec0abc8b4cbddc113bcb2f36ed6ed52f1f98c1083ba99adf8febc143736352817d5e2f21ec484cc689e59e5b
 AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 899 BLAKE2B 98fb23ca63f58099e06704d1cfb24c543b6e41cc8a37cab82097a526e66056006263ef8125b696e35572bc8b4646b96620c77415df6fcad38e13f61c6723a076 SHA512 3c7a9642f21fc21437468968ff54aeb958bec6251ef318ad6e27a689aebfde19c73a1c420d9a92bae0f6d63bbbb202106dad4a8199e14c066273ad2b6768008b
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r2.ebuild 1197 BLAKE2B 880c8ab7d9de0830d221c803eea631404591310353b2e0650e56bb4ed9f258f6a7e19cb677aedb7386fc22d64a76c3cbaf5e6137ea378373f8f798bdec1f0f7e SHA512 4b0f8945bbf36824411176e918fe3f5f5cd4f1682930af298145ea6f82631a52091c5c97f1e7528bf25235564b9b8e854f3c6aca639b65f3d1bb9386ffee69e0
+EBUILD bristol-0.60.11-r2.ebuild 1213 BLAKE2B c27ff4aa23c6350b463bd59946663d740d1c8a5d78a7812396a3260ed507ce7a1c3b6e2e1e83d3da657fa9202d018dad27be22df02a021e203ff4e38d7bae968 SHA512 175b2808bf875cb04dc1f4d81a9594f6e6f4f73d15dc50eaa15deceecb33bf3885fdbef30b6957a75b18f19aae1000a03d55d71392fad3582f877a250e2dd6a2
 MISC metadata.xml 600 BLAKE2B 8e3fb348d7bec7909eb04960200d7e61e62a2a19a6a424fa66853430cf4642cce40852acdf50defc46c862a021c6b842d9327ef32634e32b73467790989e7b9c SHA512 87169797c5b80dc6cb84dc8497055382c808e78a5f8171c45383a29fff39cf3ce3232999235538973bad8c2e5d087a15bde9463ae79ab011953de5c10a762aae
diff --git a/media-sound/bristol/bristol-0.60.11-r2.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild
index b23ac9b3f46b..839690ec6fd9 100644
--- a/media-sound/bristol/bristol-0.60.11-r2.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
 HOMEPAGE="https://sourceforge.net/projects/bristol"
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index a4e53aa4b8cf..1b66a6b2cbad 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2400 BLAKE2B 1a4ebfc57a21ebb69a4852fdb10767a21f8310d93ccab1aefbf9cabd7936df119a8b13775586c0da35b8697539f406ae8701eb23bcbdb4aa4515b91ab61c3737 SHA512 3ea75d54a08a6e49dc35624cbeafd9681381c118c5bfb3878edd064c8f3ae766133b38939c74a165f708ad9bea4b150c94e89a66f9b0deeb9e4118fc4d312efd
-EBUILD cadence-9999.ebuild 2371 BLAKE2B c3a7f029aed508edd6c101ad37d8c2e4fcb0c31a87b36cc5b72e489b5ffa38c7fde095a089f5c90b9213d673319241a1aec75d74f70c5d36def47fc9de30fb89 SHA512 e2fc0edeb8259fb68cf87c5d2c676db3c3d0d7b600a9ccdf8a73360a13115cc80911218465e84c4ff0223e8963832851a10d10a4f16da2b5440dfd8cbd292f6c
+EBUILD cadence-0.9.1-r2.ebuild 2462 BLAKE2B 65b72e898f71865095e2080665a2a96db5df31173659e154ac62e4a097f02e15699aec981c1747ecc15d34fcd727cccac9a11b32d42642b89dcf0a7d476d48ed SHA512 5a92d5643031174c91d1344bfd52eee0574ca85ac8dafd8e7516ec98138845c36c771497d7463a9c3154751820fba4c2b0cd9258352ff275ea3cf634c043e232
+EBUILD cadence-9999.ebuild 2433 BLAKE2B bdd8ae3994bdebc171b28a904f0b1390af6b2fd29d18828baf0e55e99d1843cb00680607bd22b69e371d8220330ffcf8adebdb3477b649a7a2a47e28bda1649f SHA512 b742319b37c5013cbd437db10e18f45c1475e7cbbc292190dbee3209dc0b88e9d2c9f2e930adc6367326ebd3f8ea3de631976a1de7b8dca406a712250a5c68f1
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1-r2.ebuild
index b58caa5bcf98..a6a6a44e2de5 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( media-sound/pulseaudio[jack] )
+	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index d8aac43cc777..0100e16f1a3f 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( media-sound/pulseaudio[jack] )
+	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index d8ce5a563738..9b707b745c27 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -2,5 +2,7 @@ AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c4
 AUX cantata-2.4.2-main-musl.patch 1196 BLAKE2B 13272e8b73aa97d4bac7b81de362dc9b58fc79e576f94fd8f314249072d3d32e83113f8cf7c1126d4af02f27c0cc025217a33665d36f4a75bc6e5dc664a7dcaf SHA512 23d22e126ea39739c67331b3db3a17d61bb4d0a462273c6bd7e652c8ca421fe3d15e264e3f752c6b0b6a7349753bd4396e061e5280fce2e7a26b2058453e4dcd
 AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
+DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2
 EBUILD cantata-2.4.2.ebuild 3122 BLAKE2B 5b63451d54fc89b3bf5d73248cf52f907b144899fbe807811d790d2e1c3ff715cb858938be19203bef55eed785f867ffb8466a3130ab90f93bf6215d04f9e595 SHA512 eab98c659bd6cf62ca4e2399336c0daf91b4a64f53289d9069c8d016a41c21ce80e3cf626cfbcfa5a3517352978b07594b59af63e9325fb57b6886a53cc67f9e
+EBUILD cantata-2.5.0.ebuild 2968 BLAKE2B 8e6bff8542f5110d9fe282cf0414b0adda93a150e9b5f651903f04975e0d321ae047416ccd4e06c5eda57a60807b1df6a1bef947809c47596ef0365f017e8de1 SHA512 f14144950e1f255816e41dfd3b53da08152559650283d778e97494595a592f696bbcdff75b5d88f3daa837e130178a5605bcf5090f35f470146b0cca8f40dbff
 MISC metadata.xml 740 BLAKE2B 20184d3cb15c328f809d6d182cd2a9c93df568e0cdcdd74aec83e0a2d66424da412d7b1432212e70857af62c49da2ca390070b452d34e50ecf7f91d2ab782582 SHA512 f9d6d49ab1977f21a8014acc34cab6334c9e3e7d9524d021f821ee20ad38d55dc47274986759f458d1f495b91b4dce0a95e6ff4b23ddf8375514e8b7e8e0165c
diff --git a/media-sound/cantata/cantata-2.5.0.ebuild b/media-sound/cantata/cantata-2.5.0.ebuild
new file mode 100644
index 000000000000..47c0c06bb587
--- /dev/null
+++ b/media-sound/cantata/cantata-2.5.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
+inherit cmake plocale qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+# cantata has no tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia:= )
+	mtp? ( media-libs/libmtp:= )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128:=
+		media-sound/mpg123
+		media-video/ffmpeg:0=
+	)
+	streaming? ( dev-qt/qtmultimedia:5 )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		udisks? ( sys-fs/udisks:2 )
+	)
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	plocale_find_changes "translations" "${PN}_" ".ts"
+	plocale_for_each_disabled_locale remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+
+	if ! has_version app-misc/media-player-info; then
+		elog "Install app-misc/media-player-info to enable identification"
+		elog "and querying of portable media players"
+	fi
+}
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index d69c21430535..c022c1311748 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,5 +1,5 @@
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
 EBUILD deadbeef-1.8.8-r1.ebuild 4013 BLAKE2B bd62bccf7d2c3fb49f8b80648dee1d8752b4af837dc8a40b7fa95458668cb335505d6b23c3c395702ac100e21ee8ce61befca5677a1f323762c0c89101008410 SHA512 53791b05f7f5985939961670aa3364c98a555d5ca6e0ff3deea22031d4f499a4374ab3c78802eb065c1c64aa6a63066a9c714d4f1b31cd133bd64b9a903ff5f2
-EBUILD deadbeef-1.8.8-r2.ebuild 4019 BLAKE2B 62239ca5d1417d1052c4d32e4bdc8090c62a8032ff072bf7ab8369c45312256e5c29e94f31e2bf83e387105b14ba8f6e5688718ca9fb2227d6c02c1caec5e062 SHA512 44571382588b47434445f8e63111294da1feb5ebbca0a50ef07228d783db7674ccedc4e35694c9c451887216ceb773bcaa20cea42a6912c9a97508f23cfa3156
+EBUILD deadbeef-1.8.8-r2.ebuild 4035 BLAKE2B dcd52189ac5fcc9aace73203a0ad4508ac5f52ff6e091baf73efb8980eda3bed4c7305788b216e7d26fc4e971ac57395acc95f8d7301045267ab88a5a69df756 SHA512 363cb51e9531c807553af222aee27025387f5209aca28660620a4440000b78367a30f7dc5eb8c8bea0b9f6da432f80431c4fdc0f9173d4195378c2f2e113baea
 MISC metadata.xml 892 BLAKE2B f13f0c59c3f1085f2b14a480d1c0fceca3cae3aa72523fe8ea7c92ec44f392e2f005df3bd46442d9d7bd1b9cfbf087319b679bcded7a53549789c2e481b8f5cc SHA512 a1fb3ea4e169b3b02345977dd6032bdf790b993be96778348b7eefc3900b2d2faa285d6a5e4cfdc9c48148397f5e58e9b6d48986e6f8245758bd06e4dfda51c0
diff --git a/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
index d31640a2e649..a8a01b55ea5e 100644
--- a/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg flag-o-matic plocale
+inherit autotools xdg flag-o-matic toolchain-funcs plocale
 
 DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
 HOMEPAGE="https://deadbeef.sourceforge.io/"
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 783f4ad2d361..14e53628afa4 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,7 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
-DIST din-52.tar.gz 3706694 BLAKE2B 054d3857bed1b4f4affbeffa0fc5c27ef356f200a60f9d6c5145327311accc5f0b1c8deaf425b745ea4cd2c1accee1195b2e840e9125d105edf67e09062b8574 SHA512 c2ec779746d07ad6579aeebadff45e218fd29715ac446f00840b513d3f9c8d1ef79f556a1f5c7d931adb3451b547f58fb58d6da699170755ae62f25d70b95158
-EBUILD din-52.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
+DIST din-53.1.tar.gz 3708022 BLAKE2B 882d4ae6cbe24c3d7fc326df3f3630d7ea7cd65b5d53c4751844dc3edcf9d533cd7cfe58fed4c46766fab6b4983e75f75145206b5362bceb27382d02705b9a36 SHA512 42058b00402e726869af8a5cb8eb9b34e7b1709185c972d3f3b633a980ad7de57a143ca0ce854ce681ec67b81cd6dd2b2b06023a15d3f1b1bd54c4ac643b6096
+DIST din-53.tar.gz 3707794 BLAKE2B f1631c4b923a5f737181120c2a20dd4079e31b9fe02552a9895cab0f0913b2e4d8185404611795e9379178755168c1975c7520b0ae549708f4916a67631b922c SHA512 b359eb84085be80c13f5cf2a5af0c15903778fec677f91c9aa9029849df39d4bda95e537d7f85f290a8bb38932ef0da35c240921154788b5e89e347d7ac90a7e
+EBUILD din-53.1.ebuild 1089 BLAKE2B f13e0c8b3c0e02ffb6817e2da3b32e4c4d3de3c3e59db322659c32f3db94bce061f8f3b9aa8fa9c2eea234e321ef6bb7c3dafc74b3449f2c11ac5250813b1f78 SHA512 1f12458f2a2801c61a00069e32071c27e1b1331ce5e9ac1fad9fb46fa6eaf36a9cc89ed5f2d25489c06eab896e7f6ba7b24bb4c2e65b57c261bd2d1b2e951315
+EBUILD din-53.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-53.1.ebuild b/media-sound/din/din-53.1.ebuild
new file mode 100644
index 000000000000..1ff40dd5f7de
--- /dev/null
+++ b/media-sound/din/din-53.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-52-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/din-52.ebuild b/media-sound/din/din-53.ebuild
index 13c24db52183..a12ad9ed2cc6 100644
--- a/media-sound/din/din-52.ebuild
+++ b/media-sound/din/din-53.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-52-makefile.patch"
 	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
 )
 
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index af1656d39645..3eea3d687733 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
+DIST drumstick-2.5.1.tar.gz 1917814 BLAKE2B b4e9957288a05cf74347e39d05a638a26abb72b1dbbda856ad81e7dab87069e9bd4d57ff9eadece1673c0cd5fc9e9149bc4c9a06ff1fadef77c1ad38fc58d24f SHA512 9dba509bb5ef519f78251787a7a2607cf1cee0255d74ab1f6707a0611abbf8963e51b2114d41d347e55d293336e2ca34d9e2b5ac7989fcfe24e355392bae024a
 EBUILD drumstick-2.5.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
+EBUILD drumstick-2.5.1.ebuild 1281 BLAKE2B 78089f7deaf51b1aafbbfb2c68194a7190f68e27d9d247b5213edd77d777ee30862dca284380400e6d0d0129e375301c242c32410584dea9ff3b2a66cd2432f6 SHA512 27adaff70d81701478b6c997812fe3cad3cb8606dda584f7182e8f0313883b31c597ccb6b1f1b14899cd4d7b9f5d2015dfc33898e145e5185fd829e071866749
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.5.1.ebuild b/media-sound/drumstick/drumstick-2.5.1.ebuild
new file mode 100644
index 000000000000..818e06285dc5
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.5.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index ac7d48d61d83..9c0f9ed8b4eb 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,7 @@
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
-DIST easyeffects-6.2.2.tar.gz 2614684 BLAKE2B 9a7e3cd53ce31fef424d38f5591130a6f1fd6648b73f72b504c006b8cc3712320fe6eddca7209568b0272820053ea0179d80b0acf198fa9956a4a86c3fc1865b SHA512 d2200d66b54f9d125c36d306b36a71f477ed9ae8bb7c72f06a1a180903edb768ba0dc153322f82859dd6140d9e2f5d92a52506728e0ec06b79db1b400ca9a111
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
+DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
 EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
-EBUILD easyeffects-6.2.2.ebuild 1992 BLAKE2B 15bf4a205539d3f4a3d44ded39405e1e10fee799f0fb101edb050623e91ff6e00585857aa2fbea6ec4b1d78c716f4e8452905a329fe730f25df06e02dfd8e1bb SHA512 1b8ca4a5b9c71d1a247a83812e2b41c152c5c2891d899b16ced184490aef04711499ebe84d88d8cbebf177a1f441665ea52dc87215c9d3f534b9374f3d0f2fb2
-EBUILD easyeffects-6.2.3.ebuild 1992 BLAKE2B 15bf4a205539d3f4a3d44ded39405e1e10fee799f0fb101edb050623e91ff6e00585857aa2fbea6ec4b1d78c716f4e8452905a329fe730f25df06e02dfd8e1bb SHA512 1b8ca4a5b9c71d1a247a83812e2b41c152c5c2891d899b16ced184490aef04711499ebe84d88d8cbebf177a1f441665ea52dc87215c9d3f534b9374f3d0f2fb2
+EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
+EBUILD easyeffects-6.2.4.ebuild 2009 BLAKE2B c8f52c14419c2dc8ce34bdc69c7adfc259bd63042ab8677925800fe25d68f7fb5ecb6fea41c4576716eb3e367044a251412bac3435b35d1bf6fac1494e36ebbd SHA512 6d4d9b07d2e08cc971a9ea543fa38830a9901444453ec80a0e65f8c0bfd28281477cab48944a559effb650744361c0229402c10cc0569372390b3d9d3f3e02e4
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.3.ebuild b/media-sound/easyeffects/easyeffects-6.2.3.ebuild
index c7f50ff049df..4dd8004fcaa1 100644
--- a/media-sound/easyeffects/easyeffects-6.2.3.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/easyeffects/easyeffects-6.2.2.ebuild b/media-sound/easyeffects/easyeffects-6.2.4.ebuild
index c7f50ff049df..fe870ff42fa7 100644
--- a/media-sound/easyeffects/easyeffects-6.2.2.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -40,7 +40,7 @@ DEPEND="dev-cpp/nlohmann_json
 	media-libs/rubberband[ladspa]
 	media-libs/speexdsp
 	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.31
+	>=media-video/pipewire-0.3.41
 	sci-libs/fftw:3.0"
 RDEPEND="${DEPEND}
 	>=media-libs/lsp-plugins-1.1.24[lv2]
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 92059b9e6ef4..9f55c57f9a6c 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.08.3.tar.xz 1739368 BLAKE2B ba802dd260e2061bcb652511c732b4c6c9431ca4c3af30f71980f06637bf9942b94874b56312eaa24a3b764132db290d73165bae0c6b967f84293ca07c656196 SHA512 839a35d3bd69b6c57eff85b583d78d8a630536f7911283e407776ada8c69625d2c3e06a0ac1591cf91420eb05ff1cd9bfbfe6eb8dccbbb26a31845a3ab9f2018
-DIST elisa-21.12.1.tar.xz 1745640 BLAKE2B d6b9ccd41820454069522dbd49321e3234f8cc4082175b22d70c7094d806ebd6d17a1d9f38981064fb163abda8c59759fe2e84700f2bc0ba09b6aa34cdb8356f SHA512 27d3855e3d7fae986581a4e8b9cdb8b69f584bfae0a065876b8b5b01be606c3c1e0e49ffe149f0ac23d502308a7dcfeffb7bcfce987560b85c2428427ac6c68d
+DIST elisa-21.12.3.tar.xz 1748236 BLAKE2B 5e3ea6a5cd1f7bb9aa7a99e33ddfe97f7f239f3594d8e7684639861966b16e812ba9f46cbc5a6c9ceb5c19acd75c3bb56567875dacb01ebade88a59ec81cb865 SHA512 f2ef0c2669d171e42e55460d464f019751a4fdea174cf8224c90bf6002d7d181e101cac46c8fb3e8e13bfac0b0f79bd16fae3b55f02808a4172ba994f8ac667b
 EBUILD elisa-21.08.3.ebuild 1645 BLAKE2B 1eeb11af3bba9667ac966d084e44138c73b18f8d24b5e54f8f951c03edeee36580de42dc4de8c8d4d15e2067db5962116e3900ff28d9db0a5625f993a706815a SHA512 105c60d1091c90941af584ce31f46c9cb131a1a1c31c57cd42569e0566898a57f9a4edd505ffa071d6d737ea6afe27acee6d6ef9abffd68570ae28075d7ab1c8
-EBUILD elisa-21.12.1.ebuild 1648 BLAKE2B e7309aadf1779490bcdf79f53a57076ddd3c0e4f2d4e209eaef25e963ae46b0df33a26669d62b58a431c57f6b18994c8909eb0181e71b4396189f07b8fbb71e2 SHA512 0306ef949803a105263bb7d840a80336594b4e4d232cd8a42844ba75565b244f13f5cd0bd5365bcaa3e7a9cdff6737b4584b2a08f518197cf25bb4f114577d1f
+EBUILD elisa-21.12.3.ebuild 1648 BLAKE2B e7309aadf1779490bcdf79f53a57076ddd3c0e4f2d4e209eaef25e963ae46b0df33a26669d62b58a431c57f6b18994c8909eb0181e71b4396189f07b8fbb71e2 SHA512 0306ef949803a105263bb7d840a80336594b4e4d232cd8a42844ba75565b244f13f5cd0bd5365bcaa3e7a9cdff6737b4584b2a08f518197cf25bb4f114577d1f
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-21.12.1.ebuild b/media-sound/elisa/elisa-21.12.3.ebuild
index 593d43270229..593d43270229 100644
--- a/media-sound/elisa/elisa-21.12.1.ebuild
+++ b/media-sound/elisa/elisa-21.12.3.ebuild
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index d5f4ede9d11d..c6d6dba450c1 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.4.tar.gz 1746638 BLAKE2B 28a2a8048ad3f652afd424358b1b268d42672eb8fba0bdb30c72c06041617844fb5b90bc922e905d80ca2818eac03e9e5ce7f9a57b4cf68a43f60ed4bfddcd49 SHA512 46c3f0759cc011f34e5ba80684df4e8b593315d564da2341aaea14a5f0ba9cf732933f6ebc8712506f194b044a8e2b198b9e50879ff4221e6a9ab8051e79b48f
 DIST fluidsynth-2.2.5.tar.gz 1747610 BLAKE2B a658e5fb66ebb091560d9e0b8bddd99ec7e7e84c58d9074057fd612a2eb0abf637778ea06c3481dd4d5179a917d47a08f25533d9002c1a915037a83279e2381a SHA512 9ba96da560d3e0a3e38febc6f10d2b3d8019b63ffa0a4c6fa9032efd019333df0367bdd3056faba22517f59f4ef27b18d52429606ed2b8306f69778fd755beb2
-EBUILD fluidsynth-2.2.4.ebuild 3360 BLAKE2B 0e319d650cdc52bd9f53fc1e06b648ce37c98a9c757800828e7a9fcd98f475e1ec465116f68bcbfd813438ef9690d41e166b50d9148536b2dcc027a8d29f4e0b SHA512 ed077ad3818d3a2c606f3862cef14d59c6db0fcd56e395595bd728108ae486d8ad11d1450b38aa417849ecaf7f795ddc27ea2b5181105256b699a8cc19f7f7b1
-EBUILD fluidsynth-2.2.5.ebuild 3367 BLAKE2B c15ab1035cb3c198ee74b9c3429803ed0d4d3edd2f251cce08e0f9a88da4c85a4b15c3fe9394cffe8d4e35deec87d411134b965cb57e4d59c61d81aed1c789ec SHA512 837b85dc95152f7b00ee6aebdef06ea223ec50691cd02121a951ec823ab58ebaec373d5fe30e47656e677ef3029677e88ed6f4ffde3b84d11bb8a42a2d70f198
+EBUILD fluidsynth-2.2.5.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
deleted file mode 100644
index fd161f332594..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.5.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.5.ebuild
index 90271801e90c..387ff481a6d0 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
+inherit cmake-multilib systemd toolchain-funcs
 
 DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
 HOMEPAGE="https://www.fluidsynth.org"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
@@ -42,6 +42,7 @@ DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
 		-Denable-alsa=$(usex alsa)
 		-Denable-aufile=ON
 		-Denable-dbus=$(usex dbus)
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index e4c8ad9e1d51..e2cc08790a66 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,6 +1,4 @@
 AUX 40.1.1-fix-build-with-meson-0.61.1.patch 941 BLAKE2B b55eeaf227b092e11855fbd00ffadb3bc63c8cecb4689ea23351b525f4c8d1452b772edb344c07b6533b2831451e3c522f76290b85314e8db8760559f8c2aaab SHA512 a0e2940c11f8513b501e9f3561e68cbee93932a8b4ef967513399267b21f307b8b7a27eb1ffe89f6edfedf9e36f15a517dbef3fd3c0c4fc8d169356a80e7bbbe
-DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
 DIST gnome-music-41.0.tar.xz 898652 BLAKE2B cc72eb7be553ccefe10620a85aa3ee75aa30c1809e810a8ebb30a2ffbccebb9dc173cc79859e098be97fea9c964f0f6969f55c7c84ea9540a93a920376746ac1 SHA512 883f8862d5216ab30c3208a316378c2ef016ba52861c9261b8fa9ceb44f935e4dc35608ea66b333c3bf61c9dcc950fa338adfadc2d5e7f67a7a84467228d28a2
-EBUILD gnome-music-40.1.1.ebuild 1990 BLAKE2B 8621499508927fd17467b03a24fb2c1d0b9e14ae43d19303437c10975779fbdc1cab2ff55ab597385d996177bd9567636a1dc59e19b04b1215bcb32f71de0aeb SHA512 94ca4e4b51b1226f67312249f7a0bf7fa6381a3e39d610e29b9a75d45f35b6035d590ade31f5592c902670cf42ef4922bd97d0aaf4fbd92de9f4f6a91fc16f4c
-EBUILD gnome-music-41.0.ebuild 2041 BLAKE2B 5532cfeb72dd94ec3bfcf64b36843c2f46fb91b28b4d4818e1398f57a6ccd861f30d98cc7ccab48d43c7dcdbff7325b703fb04e736e17cb3524f1d6600b76ac3 SHA512 00f2e51f3eb21cfbd5be7e4575a060ebf00f81a9f9dc9e2cdcc5f83b2b123b5e7e4cc0b4d19d88a371ea4416cf39b1e7fd3db70bbc4105cde206df51892b835c
+EBUILD gnome-music-41.0.ebuild 2038 BLAKE2B 320ae70e53fbf0fd10d422c9474e8ad51e9fec306d44286fbf00cb204b4b7bdfdbf1b3353e34d233e7dde1f99dda502874c3fcb4afa6c7ed59c43797b5d68275 SHA512 c39ca3701a2d60bb50c410159307ef08eda5af203e13fc1d023bc003578d15d3cfd04081d3aba6b429bc03305dd7db3a20c079c04db1623d3b69837d995a1e82
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
deleted file mode 100644
index ff9dc73cd09e..000000000000
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	app-misc/tracker:3=[introspection(+)]
-	>=x11-libs/pango-1.44:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.13:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.13:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		app-misc/tracker-miners:3[gstreamer]
-		app-misc/tracker-miners:3[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-41.0.ebuild b/media-sound/gnome-music/gnome-music-41.0.ebuild
index dc330de8c9a2..a60fd556fd2b 100644
--- a/media-sound/gnome-music/gnome-music-41.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-41.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.67.1:2
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 010de13cf697..56b394f4d66f 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,3 @@
-DIST grip-4.2.0.tar.gz 1209972 BLAKE2B 087118b0871b149745fa083f3eeaa79ac8c00c2b094a486cb9c5188e215dd7ce4cb06d13fb362914d7b688c89989e3b6b86ee889b4027e38b727876a06f06dd1 SHA512 26cb32064019da1d1683c44caa3c52ae513cec5b1fb435930e8e4c62433a70f14145d92f2215bf54a5bface96945d3e5e879302e2824029650d2a34218528e94
 DIST grip-4.2.3.tar.gz 1210695 BLAKE2B d4b5cde336fd9db3a68d6ded2375d12c0ac42af86b34067d5eb4b3356bead13e3c5fe967a7932ae9f4be418dbf5136a889fecc0362bf453f4b1d92193013f739 SHA512 05b66c363af31835e534547ae5dcb21340a7b3a824e46b337b511a8ddd0bbd161ab16470b658eb1df3887838b391d71702069da9207160a692e1a8ebae0d52e0
-EBUILD grip-4.2.0.ebuild 1078 BLAKE2B ee5035d64431048f35105df93a21c7134359902d62f753153b05c333183126aff91562a7a3de7a8f2ddd36d458d9639eb70616e0cde0cb38e85ce232a5222c36 SHA512 8e7fef6928b40371e25e1f4351c638857f5ac484a6e4a8d650e06f601b45d6e7e813648f9c6f1fd4dfab27c6cf84d6e2685ebe9c0cb4a31e08260547a7d1ea4a
-EBUILD grip-4.2.3.ebuild 1082 BLAKE2B 12619ef9856be9a0662d58bb60eed383b7778b954151128bc21f3eb3a5319bbf4474bb77e107998c773841cc8e4b0fecb80d1a3a9e3207ff2a17fd3962e38be6 SHA512 f41957a65bfcd8a6b1488ab0deae14e7463b05c2cfc244800db83a8b50573463e4b07fc2d0c549a2d9fc170285d37e258127ddadbaf469f626229fdbccfb3a14
+EBUILD grip-4.2.3.ebuild 1077 BLAKE2B 0bd30aad441c24bed4d4c8c8470db29ddda3fb205de881d72284bd3673a7e7d0ae533b72045e8e0e947d0c6d7f1bdb9f63b721207d600420aa8ca2c95c175772 SHA512 30f0cce595c4e88344eb6a2697d8bf455172c41895676d462db5040f19f1f7bad83bbd80fea810196dd8cd4bdc634199f896a857f0de473b0ea45e195209c279
 MISC metadata.xml 328 BLAKE2B 069257071d00003496464c8990afebb2d35428231b1b787ff65237c6ddf69c40c6f402939696915d781d21c13fd823183e0c2266b26176f9e58ce47324f07bfc SHA512 e6d401ccb1682cf890600714a33d51650901e9c4724b0b08bad99c2c85a17571fb877489e8f4ae33b1db760c5de5f9150ebf4fb6ab50303186402fad624b6d86
diff --git a/media-sound/grip/grip-4.2.0.ebuild b/media-sound/grip/grip-4.2.0.ebuild
deleted file mode 100644
index 0879f66ffe97..000000000000
--- a/media-sound/grip/grip-4.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic toolchain-funcs libtool xdg
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	!app-text/grip
-	dev-libs/glib:2
-	media-libs/id3lib
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-4.2.3.ebuild b/media-sound/grip/grip-4.2.3.ebuild
index 09c22db206c4..a721c772c057 100644
--- a/media-sound/grip/grip-4.2.3.ebuild
+++ b/media-sound/grip/grip-4.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
index 00a3e4a35272..fa233e3ba83d 100644
--- a/media-sound/gstreamripper/Manifest
+++ b/media-sound/gstreamripper/Manifest
@@ -1,3 +1,3 @@
 DIST GStreamripperX-0.2.tar.gz 187186 BLAKE2B 66beccb382316331efcea25b5c97d31a3a7c8e59c3f50026909872f761704182bdca1ec919a4350d8324688634c3b9e654e86db1c750cf0992aa538db9c7939a SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c
-EBUILD gstreamripper-0.2.ebuild 825 BLAKE2B 288c02c93b509d55939fdb81eaa98708e4559b40a79d469b51c9a40bd5e5cbe4ca4f057b5c380f753b975f11cbaafb1b9095a88e7e061355f2fe8560fad0c870 SHA512 a7635844356d65546321c2072f6f47f142b1b48a624008ffaec17b613b1be8915f308c55f03764affb560a1a68750efc55053dc3802f4f6f715632e74917adc7
+EBUILD gstreamripper-0.2.ebuild 815 BLAKE2B 193a5fa7a11c8a637e090c7031aef98ad79171a28990eb1e31c47b58f5f9edbfa44dc4a5399d73b02d47a4bb66aa047bf228ee510737cb340582ce844e82ea91 SHA512 6a7de5b237fea259b0a94c4a82ff617fa21c0a34a32401c6c0807cb4c2b2cd2dbd9140e984c0e754e073ef6660dad05810dae2db995c4ee79943215d62796935
 MISC metadata.xml 337 BLAKE2B 5eb27b94b412037f04979c8e241c9b37a8dfde78ec88e2941d01eeba2c7b35b07f0eae16bf2d5d9c9cb2a94758e15a44fd3d8e9b6a28ba43308793b9fdf4253e SHA512 7ab6ae6f749d188077b9398638c55229234e0fe76e1af2baeb2c6041b3d02d42f1291e257d0b7935d9c85aa9106ffc95630aabf4b21dafb62509635d494cb76e
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
index 38325af58bec..5e95bb7b5d9b 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop
+inherit desktop
 
 MY_P=GStreamripperX-${PV}
 
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 62096c578e49..1644201b12f8 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,5 +1,4 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
-AUX guitarix-0.42.1-fix-build-with-glib-2.68.patch 535 BLAKE2B 0281b89eca6dc32051226c09ddb6255e5c8bfd4a278aced69f995954d2dcc5c7d7ad9299d6827afa37cdb857f8b236976663fa63165b94fb5029a473ae07bb09 SHA512 05d66714c72e1c2a647d3d769f4d81f6a48d653f9bd3094a5306343b3838fe34d137d6c34b0955a3889a6feb7f1b2a9ac237ca2ec42190dffff0822b3ac706b2
 DIST guitarix2-0.43.1.tar.xz 71742288 BLAKE2B bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101 SHA512 30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def
 EBUILD guitarix-0.43.1.ebuild 1798 BLAKE2B 05cdbd8f5681d4013c8ee8893b9ed9baa913fc3675e4f8310e08dad930435e88fe5dbfe538ca2f1b19fa515cbeba95b80e4d0901325594606524c46ef6b2e618 SHA512 16f6e3b7417830b444eab1bd6f84db738ced2827497e2c0bb99ec8cb892df7d01b2ddf7e41afd5e2cb0d63b7dbbdd9b056cdf50faee6c0a27b0b76dcd8c8574c
 EBUILD guitarix-9999.ebuild 1762 BLAKE2B 6bc5e9ef78e46f02196e6866d081801774af2cde30b65b7035e81e85168f099c449608922d7694b0f74b9768c6eddae195b51c5485f7401f8cf35e4066144d99 SHA512 f5b0d0c1ad5d4d7fc52744ac187f26153cb7f5681395be416bf83dc1a46ae4cb42ad8b0fe6a6ed84df3248b26ac4a32c8abe614c9dfcaf5555775e7f46803cf1
diff --git a/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch b/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
deleted file mode 100644
index 345f5e9a0aab..000000000000
--- a/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/headers/gx_system.h b/src/headers/gx_system.h
-index d334ecfc..88d97567 100644
---- a/src/headers/gx_system.h
-+++ b/src/headers/gx_system.h
-@@ -132,7 +132,7 @@ inline T *atomic_get(T*& p) {
- 
- template <class T>
- inline bool atomic_compare_and_exchange(T **p, T *oldv, T *newv) {
--    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void* volatile*>(p), static_cast<void*>(oldv), newv);
-+    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void**>(p), static_cast<void*>(oldv), newv);
- }
- 
- 
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 13edce1f470a..772924b86c21 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2170 BLAKE2B f675cb84ae4bf6b6edb87367e909cca92dd442c87a8293639510b97953fb9e7e786958f5b722338f05f9b8259454e766e0b6706d0c187042aad820ff5fee8374 SHA512 cd9b23ebd43089c5846e895d11b451bb48505058f6e756199314388a4ae0b62a7d42216c02a77e1b88e535894febf0bfca202a35cfd7b182354895f56351610e
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2157 BLAKE2B 2c00a9dcfe203ecc6b654783bdb206eb7d126ccc71080b36ced1daed10b5aff34fcd384ef565260a22c09bfea375762703657bd6118a9db45fc55d0315bee827 SHA512 6319a8ab119fb23c7d49443bab5e73e5f61364771e19bd32ce1780d86388a5d2995fa9c4502406788c97477d89d982ac4ee3137ab1b746523fa2210e8694cfe9
 MISC metadata.xml 372 BLAKE2B 66c633666e2c8a5b8d8ef71fba7385592793402402a1ae68e056942bb8f42a83db9d040f37bd3bf4ed5b49fa98c5a4cb827e634a0f9eff31f50b9db18e814baa SHA512 b9816869688b653d145e3eb2aee1dcc911ebd292b81855a079104fa0a93306b61cd4658323a1985c8a2c735f6f44b62e8d4a54b1761725d8c66db2bf2ac48025
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index 265de42f5781..425629e7ae82 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org"
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index c1118d74b0f3..96e2ca1f7688 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,3 +1,3 @@
 DIST jack-4.0.0_pre20201220.tar.gz 199310 BLAKE2B d36f52d0cf1ce0744929c1d3da2e0929d3a0bfcfe3f7088bd4f1b170cafa0989921ac1a5a4d8ffec17a86c6eeca4f233c9ca0a159ec76629a5ba48d1686d22cd SHA512 8ff5b5abcfc39ffa373cd215ae5d1fdc9838e92040621e8455485e1243ec6e4bf0fb1675f3280441b2ecc993f996c30c77871e2ba14020ae76ed50634cff15f9
-EBUILD jack-4.0.0_pre20201220-r1.ebuild 1316 BLAKE2B 4509c9f8e8930d35f6ab07040fac767ba5e999f4032ac0787d62f5502c530e6a45428fdd22bf0020af2bc57e4cb5b8d8319baad9eccd7295290155f041d158ef SHA512 42b459c2a4b2c287581e6773934449ab355e21d3965cf822c749e53c46fcd648729ad2f42e03fd0a5458cea0178681c7681ecccfe618f3f232c22ee7c8874bdd
+EBUILD jack-4.0.0_pre20201220-r1.ebuild 1324 BLAKE2B 2e62cc7693611b24424c46a1e8029f5a4e9b7ae66b8d4acfb7aeb021e26c61c7d472ece2c1637514c1e55ee183c7e7fc6d3980d6bf4a62bfc1b42a4cbda24a96 SHA512 0f4ee738ef166d1441d2f74ab6e0a4770e11b86bce9621d0a364f1225f0c31a8cc00ca2a62b1f8e8294fad0be1c9517ae7a583ac53532ff98d9ccf957a9daa35
 MISC metadata.xml 512 BLAKE2B 6ee061afa344fb624dc530966c5bacd954c3d13b72c2b7f11671bf5dce87980243c30e0ec6db133ffece64d444ed159296a06a7408e916ce29375b575ca976b2 SHA512 c139c1546e6dc3ecc50a1c70ee3cd084a33d456a13b76f4beb7484263c4a6c34a7e6d11151e8b1b50e79289f0cbf4167521a6b56670d34f7e7b60663a7fba966
diff --git a/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild b/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild
index 6148092efbb1..eb05279432da 100644
--- a/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20201220-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
 DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
-HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack http://www.home.unix-ag.org/arne/jack/"
+HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack https://www.home.unix-ag.org/arne/jack/"
 GIT_COMMIT_HASH="5f3e5f43f476b0d506144c103eb8d4edf76fc5de" # branch "python3-mb"
 SRC_URI="https://github.com/jack-cli-cd-ripper/jack/archive/${GIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${GIT_COMMIT_HASH}"
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 39868cb10639..55556c7fe586 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,14 +1,15 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
 AUX lilypond-2.22.1-fix-font-size.patch 567 BLAKE2B 7a2988db6af343f32475e0e49867b09137459765624177fb255ee6ff3b947e9f8bd278929733413ce63759249ea27c83b3547a1fa7ccc415d1c56c6e4e3157ab SHA512 be8b2c1a2173a539c7d58c918056b8768898f14a982df50ed279340f6c6621365176e3dd564e76826ef7bf49c10057ed57f174bb8d23c9cfee0e16c76cd47493
+AUX lilypond-2.22.1-free_font.patch 669 BLAKE2B 49092e7d2a6f8e86d13159af89600cd451abda5a1cca72fc48dc8402cef405c42ec0f4e7d4a886a990a71a22710f4277663188d68c6b363671c237a479bcb69e SHA512 9de0925c442ff412395c5fbb7b8268f6b3e492aad3b5b0305252ea1cac67dfa1c1922e5fde9bb1ff893cffbeb38c1be869d95a596c41622f3e8f7ec017ad4244
 AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
 DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d
 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
 DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269
-EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 34c9bc2171a85cff5b02886e578195d44559302641c04a5b626c92b788134c73fa3f0eb6483ae6228c52580fb0ba3b17bb5be399fcd28a35e24f230f9453e034 SHA512 6441a2cb9dc97a70dd8d258a183116dcd95949fb0b30dcdada1bd2ca21529a87dec441969fe4dade21284ffbf93987e121579f43548c501ef46bf3c6f452ee4f
-EBUILD lilypond-2.22.1.ebuild 3254 BLAKE2B 01ce9c46004b87b209537f0abe90fcfdd0791056247c64f7c1617a9c65b73c2d2083aeeb8f71efe3e53922f619cf488faba5ce918e2491d27f858e3d3dbb0f22 SHA512 e039f1e478ba5838a612924e2532cf6520757887f0381e3961a4fc47a6e4f64556609bc7f048f2eea5331238a77e2056942557773bd0ce4760be2c7b10d8deb1
-EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B cc75ce170b7808b0b4873b50a0cc8d4e9f3c663b900122e7920cdc797e898c93d8a80c8655380163057b38b876335bbab18ad3215e8d7b51c083210955895005 SHA512 977dcb4ab03848244317f437c03cac79ec3b28294c2539ea216e6e0281d8963f345284ad80ec9b9fc71b9126365a5ad3daab5fd48e7ffac9bcb75f82edd71d5f
-EBUILD lilypond-2.23.2.ebuild 3140 BLAKE2B 0451a53cebba96b961c4f5bb0bfd47e99cd1b6a544597b5b0f39e98e608330fb1d7f9a30232aca809317c17c602bef3e1314e6d0f031142fb8a60c08dfe9943b SHA512 c890a263d464f49617244e3981d960ddc3fda7e662484eb8be5b1007035c6366556331b74de5d047e24d4756b93e2ead3b955813e9cab04b779047860a2a893a
-EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0bdc00c6b4bb019de37e3135a0d00c9233a805c4608912396dfafc5cdaf96704b9e336aa48c885db92a23031a66484c7999f21e5a29e3efc366c0b9390f94735 SHA512 64390cce7a554bc8226b892820f40ee22215f51f96ec56aa8fffd2438485c82a4bda5ee8d81b29cdaec324c2d4ed6c4100cba2147e8638c13f86f58cc7f38006
+EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B f3bc95cf64354299ad77cb0da56c46258226335f664448d75ec3535e30e56d54be0426d6e0261cc58fc59e31b97901b24a9da12adce7a972b125b9febe58abcc SHA512 0687175e98dd09f39d31e7b93e32dcc5f292981feb02fa06af1170489bcb40aad12a5149030557a0c2d75c25e021fbd5328509318396a4af7f3309a9b9983866
+EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B d51b27c68230683b98804d4174c9cecb6a50df32bb1b26b01831c5ae35872ec3b7e0cec63bb1399e74ffd4b0e94904138a71b13416ac10f1d5f6cfca438988b7 SHA512 68629733fdd9410c5e23ca51c1daf1f8edb5558c68d1d42bd90a76725392c2342aeac825628a3f1eb8a0c8bd7e0273148750e752b17f0d1618d67df3fa024b1a
+EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 15e747e6e410eed769cd5d883f2361995c5e58feae7103ec5fa65720729325596508896c79a5878fae36e985f38852efbaf07c9985caaf1799bfe5c4432280da SHA512 50ff4c48395c6ef77a9ac731b2bf8d4329dc6bbdcf1b5be9356ddfd56adbe3481c6e655186bd524154368d47f06d7577c280ca5e04ea80f3a966aea43591b5eb
+EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 8f320fc9784a793a5bce35904aa2cb09b3965e60d0df4a061456011bea591764e31df6d2d19f81f8e8e3bb44aa8c1c3fcb1b2739ad38c9220ea28db7619322cb SHA512 15b9624f641514a8925526f9a010fc9160fe41eb8162dd4b66488dc9e03235b4d68b346312a527c941e058c2e9577ac9b1eb38617f7f6a17c1d1f37f77d79961
+EBUILD lilypond-9999.ebuild 3184 BLAKE2B 8f320fc9784a793a5bce35904aa2cb09b3965e60d0df4a061456011bea591764e31df6d2d19f81f8e8e3bb44aa8c1c3fcb1b2739ad38c9220ea28db7619322cb SHA512 15b9624f641514a8925526f9a010fc9160fe41eb8162dd4b66488dc9e03235b4d68b346312a527c941e058c2e9577ac9b1eb38617f7f6a17c1d1f37f77d79961
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
new file mode 100644
index 000000000000..2d27291551d4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
@@ -0,0 +1,14 @@
+Revert "Pango_font: Free temporary font description"
+This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327.
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17143..1a63b18338 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+   PangoFontDescription *descr = pango_font_describe (pa->font);
+   Real size = pango_font_description_get_size (descr)
+               / (static_cast<Real> (PANGO_SCALE));
+-  pango_font_description_free (descr);
+ 
+   if (ps_name_str0.empty ())
+     warning (_f ("no PostScript font name for font `%s'", file_name));
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
index 60368b530796..1cba135cc210 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
index cf3311c16dd4..48e98a5be8f0 100644
--- a/media-sound/lilypond/lilypond-2.22.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -64,6 +64,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${P}-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
index c82db90488df..e20ef84346b3 100644
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
index adb492fe79e4..267d1a8af4de 100644
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index fea5dc370d4b..267d1a8af4de 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
index 71ccdc84ac75..22a1bae0347f 100644
--- a/media-sound/lltag/Manifest
+++ b/media-sound/lltag/Manifest
@@ -1,3 +1,3 @@
 DIST lltag-0.14.6.tar.gz 57162 BLAKE2B 9b21fa026644722bdb0cbb91e3a5f27247c4e8470273823aca71b71253e5ee50703e3cb14b1c4e8e6079e9d5d46dccc03d7a4892782c1c53189d5a13992ddd11 SHA512 9eb488ac1444ec11b02ca9c396903b5c6ef1e2f19558a6ef9d5e8d3fadb639fad902b4d6cdde8f4374768fdea553cfd6550c4151df9a755c9ae4a5652128a836
-EBUILD lltag-0.14.6.ebuild 1076 BLAKE2B 49f65836acf36cee3cf7419c1880468447fcbe1d33bdb2edad0636d62614c9f5ce9ee1aa23a4ab9d31eff0004d62391ef735737a4929f3d7956690de6c131f01 SHA512 efc874f98817d443b1d502669321afcf7526e450253d3c0320f2ac11fac32b40443db8bce08680f24ce9513eba069df65dfb547b2839730b744fb8e761e47a54
+EBUILD lltag-0.14.6.ebuild 1058 BLAKE2B 01e11b3a83fd39038c77df004b9d764572ec6557cef5985b25af3d3c371cb9b12f8d61de72f0b1fcbfa42797a57ad8230dcdd5e4a34e7d32c7d036ab12e94280 SHA512 43e8b74f6c895de8c9ecabfd4a162e33e5114d6eb80eb820d0a0f9ccb23f997b706ef4604d74e178d859e357f5771e2018da0e3baa639b07e03bf6482adf6492
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/lltag/lltag-0.14.6.ebuild b/media-sound/lltag/lltag-0.14.6.ebuild
index c4d43b6f07c3..f9c3cdedb575 100644
--- a/media-sound/lltag/lltag-0.14.6.ebuild
+++ b/media-sound/lltag/lltag-0.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,23 +27,20 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
-pkg_setup() {
+src_compile() {
 	mylltagopts=(
-		DESTDIR="${D}"
 		PREFIX=/usr
 		SYSCONFDIR=/etc
 		MANDIR=/usr/share/man
 		PERL_INSTALLDIRS=vendor
 		DOCDIR=/usr/share/doc/${PF}
 	)
-}
 
-src_compile() {
 	emake "${mylltagopts[@]}"
 }
 
 src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man}
+	emake DESTDIR="${D}" "${mylltagopts[@]}" install{,-doc,-man}
 	dodoc Changes
 	perl_delete_localpod
 	# Move config to recommended location
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 6e4c4c81dc28..233071ee7dc9 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,7 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
-EBUILD lollypop-1.2.35.ebuild 1485 BLAKE2B b2259b9ad1469a62faa46800ad2bdf9830b4fa28aa46266ab3b13dd99f1e5b48c80d7194bb48f0c6bef833b9c7093ced5f51adcb6898eed293e7a4648906a551 SHA512 04235991552dc76decd9ff1430f30bbc1e99f050fe5e244163a2f1f5b7768ea09d47dec9eec4b5fb6e2f8376bae5b003465b95c23be077acb7381bd45c70d5bc
-EBUILD lollypop-1.4.18.ebuild 1509 BLAKE2B 4e9d46ad8ce25f14dc0d39f58ed0dc58d5ba7578c6d3fb947044725855ef5baaa7348b2b908e82ed9931fe85e11c1c41be6b79357fc6b230fa2d71b3356ba41e SHA512 a840729b46f12905702088b27fe62e80361beff30d5cecb486184b4ffb2b2982ce78382b1cfb30d1dc6299ee8ffe6d3efcb0492b566470bdb76a9933c6646316
+DIST lollypop-1.4.29.tar.xz 593980 BLAKE2B 8a3a985cb18c196665377c7c29670b98f352a86284ee8bb5af13b1017346b0b2b938dee6e53d56d0b8d98b191a64e5efd1c7126879c7017c3f10d5aa96570a39 SHA512 f81315a94cbcc726cd453d58faffe5c33ebcbdaef55a5a36d2a9dc20dec9340c2d263d935b5115148b049fca52e57c88eac36386e56f0965f22674eba26ae813
+EBUILD lollypop-1.2.35.ebuild 1486 BLAKE2B e3aa9b6c542c534cb8604b496f720c3f169aa2d2fad9ad42425e8c83469a71c70bff69db2d4931b7ab8867d106d5b882450f6c0abcb6aa945f0054b22f833fb0 SHA512 2991f22830609458fa978a7f780fcc41d0a60e24553aadf1e2c22c549c227c2225926581ca20d2e191744db7fafdd7968049bbceb2e8e4d1cced5ddb2b5054e8
+EBUILD lollypop-1.4.18.ebuild 1510 BLAKE2B d83df553154e9b877566350e892718b809885a841f1a631453e1b85ba7b5cb438e4700b171b49fcda3111487401adc2b9ee8328bea1499c49343bbf628d31578 SHA512 0bf50827296c1ae0ebf32277f6d54ea0a9e00799be2347ddd0c34ce132c4bad25aadc29d36b908d4f33311de391183e059a32a56c8c91673433e93ba071e21e5
+EBUILD lollypop-1.4.29.ebuild 1405 BLAKE2B a2045bad4bbe2e9c98d7385da95e69e374e16f225a89946e90dc48321b9570633c5cdcb53190fcbd9d4567bc3d5a128fa9aeb3ebf32dc25d1c50fb4400cb9cc4 SHA512 71f4d63d112431e7b33595cc213bdc403c9446d36c32141d53b18a79cf3a78a97c3fc73c848d7b9c501df22934f9f641301a1af35857014cb776f686ce8ccfc2
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 401c080fe933..8ed4f0212a13 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
 KEYWORDS="amd64"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index 43b03562b2c9..d5c1b55e9ec0 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
 KEYWORDS="amd64 ~arm64"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/media-sound/lollypop/lollypop-1.4.29.ebuild b/media-sound/lollypop/lollypop-1.4.29.ebuild
new file mode 100644
index 000000000000..c123937bb8ea
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.29.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 gnome2-utils meson xdg
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Dependencies being checked by Meson
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/gtk+:3[introspection]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser[introspection]
+	gui-libs/libhandy:1[introspection]
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	')
+"
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}/usr/bin"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0ba7e3c6dd65..4cc153d93861 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -8,6 +8,7 @@ AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be SHA512 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
+DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4 SHA512 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
@@ -32,7 +33,8 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.2.4-r1.ebuild 3354 BLAKE2B 6be93d4f897357f38bc65d5e0f4a3a6c42c9a701e1e0e452d2549b40eeac346fe7bcb7f0f3cc803db8cdb248e8d894ec70c165e7a86c28dedd0a1036fc09d63c SHA512 5f4cd8ef58b8eec7c608bdc796d393e28c9b397df58a74acf78ed530c85702708953135522f7546b259195e007b914a935c53b8ebf6ee6a96d34b3af5516f19b
-EBUILD mixxx-2.3.1-r4.ebuild 3761 BLAKE2B aab85ed765d52e6ed9796fec1d3afd70cb2b65866c6f050d2132137070654943a94b89d3fd0685aace7f442d01716f0360a91772a24071cc8b1e97330814e805 SHA512 b21b6910cf4a183afd7585d884979a49e9d7afa4ca0dc07477acb3dbce6da3af8395080d73089277d9fee94926f4a8ff2d9ae4e77896a462d0d7a06e4856be02
+EBUILD mixxx-2.3.1-r4.ebuild 3760 BLAKE2B 62c3a8a3b2ed00678e16f1ab6e83a4ddcf738fcdb50e2cf3f5080b3d071c1e9d6c8015fd409ed40ed145cf87f244b836bc68360482c587b525eb8e9fe10fef78 SHA512 56ac8d4b9234951af4d165ec41ade7acc6bd8aa13b0034ced63b9249e4e0edb715dfd8cfe8ff10e7af599a93f7041bd50a17aee51e60e3e9f4afc487bf821985
+EBUILD mixxx-2.3.2.ebuild 3761 BLAKE2B aab85ed765d52e6ed9796fec1d3afd70cb2b65866c6f050d2132137070654943a94b89d3fd0685aace7f442d01716f0360a91772a24071cc8b1e97330814e805 SHA512 b21b6910cf4a183afd7585d884979a49e9d7afa4ca0dc07477acb3dbce6da3af8395080d73089277d9fee94926f4a8ff2d9ae4e77896a462d0d7a06e4856be02
 EBUILD mixxx-2.3.9999.ebuild 3667 BLAKE2B a110809c0f831aaa12707c87a3befe96898a4ede480b141684af14ee651c7af97ab36e827ae35a729388b8487d08d387a2d94de6589202dc0f911ec775569dda SHA512 0ef19fd437b1c957d31470ecbefd1fa38a4596479f73f96a4da903c4457c0892dc833f34b5d4ecf1fce7e580ed7d1a39c4d7e5ffe8042d3bfd3b3ec1ce10c582
 EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
index fff5c84c8171..1fa6847ab681 100644
--- a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild b/media-sound/mixxx/mixxx-2.3.2.ebuild
new file mode 100644
index 000000000000..fff5c84c8171
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	if [[ "${PV}" == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain )
+	wavpack? ( media-sound/wavpack )
+	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-docs.patch
+	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+}
+mixxx_set_globals
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ "${PV}" == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 33d24ecd925a..88250688bc8e 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,7 +4,7 @@ AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
 DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
-EBUILD mpd-0.22.11.ebuild 8443 BLAKE2B feec210b7c18ee035be6ae785d80a93cec9d76af775146655834933a05e6962025b2ad2a119f45bb55bf5a187aa541689bbadc0ab9d9ff639fbd70d5923a42b1 SHA512 e4abf4bac79a66e3f8ac058d7be22761a904501adae91d38485e1ab3cf984cd9269e696530b7fd08b1e6386e6b5e0487451e49e7eabb2ba918ca85b1c6f1f3f4
-EBUILD mpd-0.22.3-r1.ebuild 8133 BLAKE2B a627f1a5641ce7a3253aaf140bdc3afbf917ba43a3ba5e6a0271559ae144e13f55ad3abd7d280c39ba9486f4f48c50b06c1465560496f82949ce8c455b4aaec7 SHA512 c688ccf84623fe0e1a3f350587ba34c79cb3bf0ed6cc5f9f61369ceabcf92279fc7c31838148db9d7b43ece61090e498c3e045869d00e27e3f3065e65eff2c1c
-EBUILD mpd-0.23.5.ebuild 9032 BLAKE2B 9815ae7d9ecc7471512d5ff38c3f1f99fa5b7aed1a517bf65cc6daee8d5743194d3b6b0619aa14b0cf3b533222c20be447a7f4d65261be12a9e87a17a873d965 SHA512 6f3ea96bba2c542bcfb4262476af0c22017c3923aaa9ef82825d52cdc357dbbc6111333f4af68ac04c0ab129ddbd4a2daa7007c391ae275da937e259280635f0
+EBUILD mpd-0.22.11.ebuild 8436 BLAKE2B a07747651ca6a8bcb3afefd608dd889c0db955eea2f023765f222b9bb6a69758a8723a1407a94c37781a065689435f23967d8065dba411a02a94066ea0739874 SHA512 4910fd0569efbbc21f8b592c11a29db6ddcc5a9bf426b596b358888028481f7e5fa6c919fab656383100e112f82568a914e8c5d1770c253c94e80f4c7ca3d0ae
+EBUILD mpd-0.22.3-r1.ebuild 8126 BLAKE2B 818d798cd6bc84639490e60456023bad57ba0b5e08533b903744e03fff1627811dde55f3b67f7600af10e00b17c6b490acf7fa3a616e3574001ffc5494f95aae SHA512 30f4ce07449598a93429ca88307fd5e9ee9471ce742f350ee0521ea68a6a9b4c7144c2c6ee8c93116a797dd36170189ef907d9cae77cc46b77a58df6be79ad1c
+EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b2d44e7c7e176a5f8a17126b1dea267b34ada121e39286fd8b90875750e7e75f9129d20a10562a84d331fb0 SHA512 76f547fee10a657ece1d41cbe9b0f4479525973ef616f6b1a5848096322326bd99d47d7f70c55bf48cbc83608c84f18ec60ab296c535a3ea870a2ad04625cb83
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 14851ac1ad98..213a39d7a11d 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.22.3-r1.ebuild b/media-sound/mpd/mpd-0.22.3-r1.ebuild
index 6639fe7e08eb..0bcbcf6d2a6b 100644
--- a/media-sound/mpd/mpd-0.22.3-r1.ebuild
+++ b/media-sound/mpd/mpd-0.22.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.23.5.ebuild b/media-sound/mpd/mpd-0.23.5.ebuild
index b2311a5604ec..38b5120fa23e 100644
--- a/media-sound/mpd/mpd-0.23.5.ebuild
+++ b/media-sound/mpd/mpd-0.23.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
@@ -139,17 +139,17 @@ pkg_setup() {
 
 src_prepare() {
 	 sed -i \
-                -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-                -e 's:^#user.*$:user "mpd":' \
-                -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-                -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-                -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-                -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-                -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-                -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-                -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-                -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-                doc/mpdconf.example || die
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
 	default
 }
 
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index dcb09b387150..46ab2c6aef9b 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -3,6 +3,8 @@ AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAK
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
 DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825
+DIST mpdscribble-0.24.tar.xz 69856 BLAKE2B 84143ed7f6978aff32fa759bbe90c934ba5c58df294d375921ffb1cd45de13ecd867fb832940088228fdad4c09948cd82c8dfe9b7fe77d6652743d522bfde8b7 SHA512 cca57f54f69ec1c870805cc58057e6325b6f5897370c315dcd6a64c5dd28ac07fdbddaa8b56f8c1fd88e71d27505f1a87decd68fbdff1f3fe1eaadec8ae80dae
 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
 EBUILD mpdscribble-0.23.ebuild 1006 BLAKE2B 07297a75cee5e1c3ab03420fa971c86360cba4a45cbcce3ba30f30085724593195560587b11e3f678bbb422045496c489a74de923e855c0c2a309ac03ebb74ae SHA512 831bc63481bdb6474d906c45b6af9a9720dfb394f6ec83f71fa680428f5a016fc5a4a86d157a8a7380a2c1cbd0af42bffcd38cde46808bfeed94a2652cb41518
+EBUILD mpdscribble-0.24.ebuild 1006 BLAKE2B 6e1d134e86c00e23be443d48103ef094138378be767f87eeefb73eb101a0acfd7518c2a49ddfaa9b445778fba6658e6022b9bbd8ae8c6a154188b6829ed0e028 SHA512 ae4b2a9cfeee25a9c58cf7d0a60208cabd6fb3e241b59cb73a923a54e1d869c33e5d9911e260b0c17136de5bb2f166dae8d25fab22d05abcd72c5a5476f67960
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/mpdscribble-0.24.ebuild b/media-sound/mpdscribble/mpdscribble-0.24.ebuild
new file mode 100644
index 000000000000..9265bd6c5a2d
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.24.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="
+	https://www.musicpd.org/clients/mpdscribble/
+	https://github.com/MusicPlayerDaemon/mpdscribble
+"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/libgcrypt:=
+	media-libs/libmpdclient
+	net-misc/curl
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS COPYING NEWS README.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch
+	"${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
+)
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	keepdir /var/cache/mpdscribble
+
+	systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service
+	systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 00ba28620f86..e5344a6af2ca 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,7 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
+DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
 DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 EBUILD mumble-1.3.4.ebuild 3775 BLAKE2B dcf342af9e2a3ad6e19ac795931fd6df8bf8b1f9932dd12c78d58db453604da80e1c59cde9b87055777ab463ccec0b1e18da2fd8b025125d13ae88bc6b687f12 SHA512 157d75a84cdc693f34533aced498f57c28e19d00ca1b49d5f1a13736cc5d8fddb6e06bfafa5e48e154d3ae3e11ab8a10dd40a86501264ca148a5776438bb127e
-EBUILD mumble-1.4.230.ebuild 3227 BLAKE2B 81096ad43811ab6319e8a351e976433562993be83f893f96c9476a7e73d12becd245a8ee4c15bcb9f115d8ff7ef9685e287da0921bf47f46d6078473b31cfe8c SHA512 d7eab2d63ded30a7e0fbe44b57c07e7fb960dc64b0ecfc8c1bb75ef8ebc02a1def8e4df4b2397f7689eebf82881eb40330d052c4e2310a2cbc136185557e7760
-EBUILD mumble-9999.ebuild 3234 BLAKE2B 9395a98a310ea3fed8c05806d6a8d1bbbd3de10ae4f8682a45a1ad51c23f496767e2b1eaf175d86d67f021c75f4c7a98903a36581da95b44e26a77e674e94dfd SHA512 360d075e9d057b3377cdf807665903475f0443337e9d184f2e9ecffd5cfaf22ada64ad15cf96d5eaa3c23c7ebd9ca7b79a33bc0790217d5a1ec774398a5a3642
+EBUILD mumble-1.4.230.ebuild 3400 BLAKE2B 1ef0d0e6c49f217e587d81a58ed5ba06f09f48b299762da821cf11631ab802e1f7392012b3ec4b3c55d6e18ca95c0c2dc0383de3d8337414bd1b119ecd27eba9 SHA512 958dc534aa4b59b2b47e9a7708d941bb724c6b7099b8508d5622dcb1a0e9a58d872b81e9dda86f38b12298941bfce62258ccd74a172ba5949e7f0826000aa4f4
+EBUILD mumble-9999.ebuild 3408 BLAKE2B 065794182eeb1d240a75d54f7432610241ea4153ce851d5919cc8ac7bd95bc93d00051d83e02a907cb45c30c713d7ef7f5cd56f8801ad8388ff2a6102882fcfb SHA512 cb0e373de223c22d1b05f261a8d46157e47271bfd6d44bbc8f20aa2d5641d76a08792be5c00e4e9cafa1a9c6635575e93c64f891e0c263491b3a99cbe7e3e9aa
 MISC metadata.xml 670 BLAKE2B fe98e9c1906942bac7fb7c5f66dd14ca201b7be96580c627a21f768507d2700e7c3bb6d63ac29a3402daf2ccbfc64096c61b73414b70489f43fd99ad78abbf6a SHA512 4902e6f6900e479f4c55fce2833b87149cd0175cb261fa08d2835431995472db794c1b47e7b6ade3812b007afe0e0ec8fa252bab7ae3c7bb02378f26a9287fc4
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild
index 8326c431832d..f2f4c7655554 100644
--- a/media-sound/mumble/mumble-1.4.230.ebuild
+++ b/media-sound/mumble/mumble-1.4.230.ebuild
@@ -20,9 +20,11 @@ else
 		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}.src"
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.4-openssl3.patch.xz"
+
 LICENSE="BSD MIT"
 SLOT="0"
 IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
@@ -67,6 +69,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${WORKDIR}/${PN}-1.4-openssl3.patch"
+)
+
 src_prepare() {
 	# required because of xdg.eclass also providing src_prepare
 	cmake_src_prepare
@@ -93,6 +99,7 @@ src_configure() {
 		-Dspeechd="$(usex speech)"
 		-Dtranslations="$(usex nls)"
 		-Dupdate="OFF"
+		-Dwarnings-as-errors="OFF"
 		-Dzeroconf="$(usex zeroconf)"
 	)
 
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 632f8eab78d9..7574a19a1ad6 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy )
 else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
@@ -57,6 +57,7 @@ RDEPEND="
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
 	dev-qt/qtconcurrent:5
 	dev-qt/qttest:5
 	>=dev-libs/boost-1.41.0
@@ -68,6 +69,8 @@ BDEPEND="
 "
 
 src_prepare() {
+	sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
+
 	# required because of xdg.eclass also providing src_prepare
 	cmake_src_prepare
 }
@@ -76,8 +79,8 @@ src_configure() {
 
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
-		-Dtests="$(usex test)"
 		-Dbundled-celt="ON"
+		-Dbundled-json="OFF"
 		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
 		-Ddbus="$(usex dbus)"
@@ -91,8 +94,11 @@ src_configure() {
 		-Drnnoise="$(usex rnnoise)"
 		-Dserver="OFF"
 		-Dspeechd="$(usex speech)"
+		-Dtests="$(usex test)"
+		-Dtracy="OFF"
 		-Dtranslations="$(usex nls)"
 		-Dupdate="OFF"
+		-Dwarnings-as-errors="OFF"
 		-Dzeroconf="$(usex zeroconf)"
 	)
 
diff --git a/media-sound/munt-mt32emu-alsadrv/Manifest b/media-sound/munt-mt32emu-alsadrv/Manifest
index 68b34d232bf6..28c3da133922 100644
--- a/media-sound/munt-mt32emu-alsadrv/Manifest
+++ b/media-sound/munt-mt32emu-alsadrv/Manifest
@@ -1,3 +1,5 @@
+DIST libmt32emu_2_6_1.tar.gz 572860 BLAKE2B 3ba8ec7d9b73a83341eafc990e2c5a2c5c439564ad43ac3d6f9ab3325225c863418fd901e5424e57343b40cb8cc873345003fd299d6a22d02ff3872681ff164e SHA512 888c417cce04b31b45858220a6615105611471567be8cce91c2053885c4b677a09667310bfab702bbf62f4b7230bb7c2357cb480087f6e4daecbd58e464e4212
 DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
 EBUILD munt-mt32emu-alsadrv-2.3.0.ebuild 1136 BLAKE2B 93659786cae61437cf4b723b00b94a9fae11bcbafe901887af3ad8d82bdc4cc4e68063dd9d01f8ca5c67ca9455d8c74563451850b574f3582e57851a534e42d4 SHA512 8e05f033cda128954fda8fd85d61f94afb10ba459e58a929446716a686572665eb7598cf669469bec9bff476064ccabd7dad1d1ed343856ff818f57e20939864
+EBUILD munt-mt32emu-alsadrv-2.6.1.ebuild 1147 BLAKE2B 1b0e8f53c90e25ab9caa800890bd4c6e7ff6b8e6f1a9b6d70eb3e4a011c46a645f9e083f06f3b23df19cdd355b8c1ea31f14b0dac2ca71fc11077aac848c4540 SHA512 d35bd5b27a3e1d0b061dbfc16e631bd622cb61da95b372f950a9488f4def4637671c767c3ae6cc271178bce82dce4da343f63f14a9312345b73e7947c7ae1157
 MISC metadata.xml 620 BLAKE2B 126eeb7cd91bf8b9c132ccaa95ac0cfd2639246461e47559dae9317707b38dc6f24ec6ca0b6826a8824cd03e208742500f5e36850694eb231583eb5be237515b SHA512 c4f47862d29d4b3b69fa98a8c9803c8409e8c88475105e4e1cb7b1a433bc5468f4e2f30ceca140dc23de8ad590781e79ca4b08260a7b996f46d253cee2b68113
diff --git a/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.6.1.ebuild b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.6.1.ebuild
new file mode 100644
index 000000000000..63bdf8498eeb
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs prefix
+
+MY_P="libmt32emu_${PV//./_}"
+DESCRIPTION="ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/munt-mt32emu-2.6.0
+	X? (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu_alsadrv"
+DATA="/usr/share/mt32-rom-data"
+
+src_prepare() {
+	default
+
+	# Fix MT32 ROM path.
+	hprefixify src/alsadrv.cpp
+}
+
+src_compile() {
+	emake mt32d CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+	use X && emake xmt32 CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin mt32d
+	use X && dobin xmt32
+	dodoc {AUTHORS,README}.txt
+	keepdir "${DATA}"
+}
+
+pkg_postinst() {
+	einfo "MT32_CONTROL.ROM and MT32_PCM.ROM cannot be legally included so you must"
+	einfo "obtain them and place them in ${EPREFIX}${DATA}."
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index cc1dfe650177..b3ff6886c4c0 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -5,9 +5,10 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
+DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
 DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bccac3dd02729865a8d9f0b12b5d9f75648099d1b43d374e5cba18ff99c89cbec7174130e8c4598d6569c86958 SHA512 a76d12a2cc60d016cd4527b9776898e7dae75a4aa438eee36617afa40d118cd619396cec8db5eff2cd5579aac2cf61941cc77e027120a5996fbe5f574e7b0320
 EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27
-EBUILD murmur-1.4.230-r2.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec
-EBUILD murmur-9999.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec
+EBUILD murmur-1.4.230-r2.ebuild 4016 BLAKE2B 6a7350a393ae2b6b3a4d24d61599d26743aaf44bdd3f169d2278530170e6f6e566f15e1088de4b3d3d45c93bfce39e532984b2659e14935e9c301f34a67388cd SHA512 593f839dc5424fa882dfac43a77e1ff666a44981e6d0a6445b125684789a6154cb6dc2dc6532105538cc0add6f41515c58dbe3335381fd45e997aa48621930fc
+EBUILD murmur-9999.ebuild 3884 BLAKE2B bbfa6d7cd82edb3ac5397899683135c1e0c57e9fda5f15ea2651c992ec669ad7a1fac6bd554255e8a351a08643b0560b2778b54a8cea54144f5b2bc2296e9e8a SHA512 bf9c39c4e2da08252330ac1910d26dfa3292521532ef372ed2d1ce36fae6d4167d19ae586513e8ef530020389351658268d4f971a5166673268dba1a995dc761
 MISC metadata.xml 531 BLAKE2B 26cf46acdb8163b6afed12a320ef3a4f776dc1dad34191544da5525c75a5af718bbee12fd1505294bee016fbe40cc0fb3c923fdac9b07428419f0de6efb44c4c SHA512 a11789a617bbf4f78bdf3ab2b406dff874d1db2bc1c24ac48b8eccdb49049d2679b511a809be6004967798fc0d89b52adcdc6e855420eebf2e7bfcba424953fc
diff --git a/media-sound/murmur/murmur-1.4.230-r2.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild
index 50cc111347c0..d0e26545bd3d 100644
--- a/media-sound/murmur/murmur-1.4.230-r2.ebuild
+++ b/media-sound/murmur/murmur-1.4.230-r2.ebuild
@@ -27,6 +27,8 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz"
+
 LICENSE="BSD"
 SLOT="0"
 IUSE="+dbus grpc +ice test zeroconf"
@@ -79,9 +81,11 @@ DOC_CONTENTS="
 	registration will fail.
 "
 
-src_prepare() {
-	default
+PATCHES=(
+	"${WORKDIR}/mumble-1.4-openssl3.patch"
+)
 
+src_prepare() {
 	if [[ "${PV}" == *9999 ]] ; then
 		pushd scripts &>/dev/null || die
 		./mkini.sh || die
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 50cc111347c0..d5c37496cf5d 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -80,8 +80,6 @@ DOC_CONTENTS="
 "
 
 src_prepare() {
-	default
-
 	if [[ "${PV}" == *9999 ]] ; then
 		pushd scripts &>/dev/null || die
 		./mkini.sh || die
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index df8ca03a2e6f..45f4fb844e86 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,3 @@
-DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
-EBUILD ncmpc-0.39-r1.ebuild 2021 BLAKE2B c0ac007d43d06172db4f2bc577dd8e8acd20517b68c63fd207fdcbc92ad83ccfd3c6c952ba0087ad343c9a7dc68672e9394c04962bd16c0210ef0b63fddb9372 SHA512 7737148d61219a7e9cdc9785f3223ab5f0f7b43a0bb85fa38ddad689ffbd5c9d81b58e610f73b831a128eed9f602157f57a4960f62fabdd43c7e86e05970f64f
+DIST ncmpc-0.46.tar.xz 289332 BLAKE2B e57a931f5a512c543d48a9b6e532c7944e655d28d02fe9ec2b5b41563e2e6a5806924a668ae592f3fee58a2bb04a681fee0903b8046a61ce39a453092dfd8623 SHA512 34cbb9ff527bfa4d849069694b6d1a1e54c932b64538e799c9ef9b9ccc42ed24932b6bcbf3552af6ce846af6b7399916e1aabc6c79ac564f1c9fe56a33b6332f
+EBUILD ncmpc-0.46.ebuild 1998 BLAKE2B df0ed8f7a833b4199a642f37c0b00b87ff74fcd9fe36d68f65b7873f842db2802fbfc27f8734d6419096973efdf63a8eac129c73f19363ae696a020519b7f151 SHA512 134fd475dc962dae8feca0994c9fe42dafc71f025c631bca508b184a078e39e9a3b41062a005a7a8d064706b85837e23501eb9a25a7ecfbc668ba53dc8e2cf19
 MISC metadata.xml 948 BLAKE2B 712f8c8832f3c6ff6c35609c2042ae62f00b59753ebd648457c919d78f03297b646fc704331e6a605018115fd25ed3752cb5ff41d12c2b072d7929d7357d5e14 SHA512 231ff1ad361ee547df64e26ab6a37bfcddcc373e8e8421e0bc8e594547c844fe3c73fa7d8aa3fb7594f4c2b83b91bb2f52a1268f711a6c8a2a295cdf94f59d72
diff --git a/media-sound/ncmpc/ncmpc-0.39-r1.ebuild b/media-sound/ncmpc/ncmpc-0.46.ebuild
index e20c6b48d5a3..a57957c157b9 100644
--- a/media-sound/ncmpc/ncmpc-0.39-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.46.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -22,11 +22,9 @@ RDEPEND="
 	>=media-libs/libmpdclient-2.9
 	sys-libs/ncurses:=[unicode(+)]
 	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
+	pcre? ( dev-libs/libpcre2 )
 "
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 5d0b119f332c..3c1b245c5907 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,5 +1,3 @@
-DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
-DIST libopenmpt-0.6.0+release.autotools.tar.gz 1506911 BLAKE2B 44cf8c5f725d2b11409d23e293dca0c151cad17c029da7f70a22366e75baa1b49b763f67d617d84a142efd3933b90344ccca5d881e5c724e2cfe0210170593dc SHA512 8da6cf1f2dbf683c32f45cbf884784360cced5e21f9862c96a1a679bd90b36be9a7cc59accbf82271a804722986cb81e75915f6564aeaaa248ed3e967dfdfb1a
-EBUILD openmpt123-0.5.14.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
-EBUILD openmpt123-0.6.0.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
+DIST libopenmpt-0.6.2+release.autotools.tar.gz 1514140 BLAKE2B 38e8d24352cce92b38ddf8e1f33af7fb72571b88b8f4cbddff626affe2f00bdb73635872d502417e37c68aa0f2254338088bb493b47c688a22d342b3ba54f725 SHA512 a4bbf804d4be72d11216173371ab81703877071cf15e2daaaf59b0eb892d5948072af00bd1ec8c097c23bb3f77bc2c0be6cf853dcf3c7c24aa6109a9f74d0948
+EBUILD openmpt123-0.6.2.ebuild 1719 BLAKE2B 88ee5e279c0edf0757bb1f7c33bb59aa5500e562b2f1181112e233e203081f4b01a4ae8631d3654e44b763d0fecee7c0056c7b640ee3bc297487f75e37ecf32b SHA512 2cf02a52f6932e39818e3727cbc38dd6ccf6dca9aa5924c03d7f17c488eef0e25f15788a2546422d69a40d094a9e4805af78e625e89dae1dd8cea67673ea6d8c
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.5.14.ebuild b/media-sound/openmpt123/openmpt123-0.5.14.ebuild
deleted file mode 100644
index 82cbe36ce684..000000000000
--- a/media-sound/openmpt123/openmpt123-0.5.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib
-
-MY_P="libopenmpt-${PV}+release.autotools"
-DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
-HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
-SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="flac portaudio pulseaudio sdl sndfile"
-
-RDEPEND="
-	~media-libs/libopenmpt-${PV}
-	flac? ( media-libs/flac )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( >=media-libs/libsdl2-2.0.4 )
-	sndfile? ( media-libs/libsndfile )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Normally libopenmpt is built alongside openmpt123. Avoid the
-	# internal dependency and link it externally.
-	rm -r libopenmpt/ || die
-	sed -i \
-		-e "s:libopenmpt/libopenmpt\.pc::g" \
-		configure || die
-	sed -i \
-		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
-		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
-		Makefile.in || die
-}
-
-src_configure() {
-	# A lot of these optional dependencies relate to libopenmpt, which
-	# we package separately, so we disable them here.
-	econf \
-		--disable-static \
-		--enable-openmpt123 \
-		--disable-examples \
-		--disable-tests \
-		--disable-doxygen-doc \
-		--without-zlib \
-		--without-mpg123 \
-		--without-ogg \
-		--without-vorbis \
-		--without-vorbisfile \
-		$(use_with pulseaudio) \
-		$(use_with portaudio) \
-		--without-portaudiocpp \
-		$(use_with sdl sdl2) \
-		$(use_with sndfile) \
-		$(use_with flac)
-}
-
-src_compile() {
-	emake "bin/${PN}$(get_exeext)"
-}
-
-src_install() {
-	dobin "bin/${PN}$(get_exeext)"
-}
diff --git a/media-sound/openmpt123/openmpt123-0.6.0.ebuild b/media-sound/openmpt123/openmpt123-0.6.2.ebuild
index 82cbe36ce684..f9f538ff0464 100644
--- a/media-sound/openmpt123/openmpt123-0.6.0.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index cc80c8acb8eb..03d2f9ce9502 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,3 @@
 DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
-EBUILD paprefs-1.2.ebuild 821 BLAKE2B 8a4a6544daef81f7380dc3748c40802e32052d5c5d9390368f14dd2cb4902c0fd254b65666ffd57939873771b556e5d41dfe6fc4994bfdee74d1c12950c6d7a7 SHA512 cd1977ab72ce74740355d19e713b9d03e17e0ff60b27515a365a8488709205839025527929a1a66590ce329d910d1669fa585f022a268136d37e84ef21759ca9
+EBUILD paprefs-1.2-r1.ebuild 874 BLAKE2B d80a61d6419d41dcfe98f0591a63b09047034b24eab1a7df7bb579be96b1bab48849c1e8eab368897f78714c1ea1053529633c5ea053190ba9aa338cc53b9a34 SHA512 0dfc8d53ab9c16bf8c0252ff74b5200e587c98fb0f1093bdd1c70a442d57d35c7365cf1d0b4dbf35ef457dc389d2cbdc80b67496213ec3a579b90c0c8d0ba002
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/paprefs/paprefs-1.2.ebuild b/media-sound/paprefs/paprefs-1.2-r1.ebuild
index 0e6bd7270503..299081971142 100644
--- a/media-sound/paprefs/paprefs-1.2.ebuild
+++ b/media-sound/paprefs/paprefs-1.2-r1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="dev-cpp/atkmm:0
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	media-sound/pulseaudio[glib]
+	|| ( media-sound/pulseaudio-daemon[glib] media-sound/pulseaudio[daemon(+),glib] )
 	x11-libs/gtk+:3
 	|| (
 		x11-themes/tango-icon-theme
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index cc2c1d8ca8b2..4a7b1b9b4cc1 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,3 +1,3 @@
 DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
-EBUILD pasystray-0.8.0.ebuild 761 BLAKE2B eaaea52da0a581800446fbd3fe37d88195dad259b5ab1a3d5d8e4c91872f00d7b9421bc3e9ce6fda4a172266f0bb230efad6fcb0d66d95243fc04116069a5f08 SHA512 5ba573f74b1ec5f468863738b4d5a28aae4a07d5b74a2f0baad1333e358ff91253c5491e050b3881adce4891f5b8c8a4d511b47159e54d2aaf5ba0605438ba77
+EBUILD pasystray-0.8.0-r1.ebuild 823 BLAKE2B 0022d224711b071c37d87d97804ca8ff37bed9b68aa237d3e5fa70933ce4f594195f17b9317cec38649e7990079e7486b34174c280a4afd6995951c1ed8fd7ce SHA512 d76c55fe739ffd67ec3dd398e6fd316ddd8433bb2ead0df628dd6203acbb72d9b953a15229d44d942d55e0129b39a1c5b514f50ceb91d977d3c4ac077bf400fb
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0.ebuild b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
index 06a1e5a40adc..a58c48834bef 100644
--- a/media-sound/pasystray/pasystray-0.8.0.ebuild
+++ b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="libnotify zeroconf"
 
 RDEPEND="
 	dev-libs/glib
-	media-sound/pulseaudio[glib,zeroconf?]
+	|| ( media-sound/pulseaudio-daemon[glib,zeroconf?] <media-sound/pulseaudio-15.99.1[glib,zeroconf?] )
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	zeroconf? ( net-dns/avahi )
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 8763e85c43d1..7d22898754ba 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.7.1.tar.gz 4884448 BLAKE2B b9f5ac2b6205aadbb707dcaee2dc6c89c333568d8fc6ca85da3fe8f9d308d0a54076d17b3f14be52e0154767c4f24ee2fd89d9df909ce1c74b9fc57c970ff0b1 SHA512 e3cffc538bdb7bf851e378b5ce7d4155fd6a2c13e77c42eb4c10a6cd129d45bb0c52d295bc209694fd89eadd60b0f04eb2d7c9eedbcec0a03ab00b7ee1f4e0be
 DIST picard-2.7.3.tar.gz 4887533 BLAKE2B 65a10be3dafcdd99e20d6c193d1238b0edfa66425a28c705bd6df0f57f75ddcf874f3bf09cef3c331e583a35f49ec780a63d2960081188081c8f0687f6a0b4d1 SHA512 33cd37ce19e261d14882b4400054c289bf921d3c74313db634f3876bc7f51ecca184aa29a9cb1d673fe799c53eda81de45d23c83caaf2f71b74fe341c258d2f7
-EBUILD picard-2.7.1-r1.ebuild 1411 BLAKE2B 1eca988cde74b9b7ca3de813b8d5262e432b2c9f055fa8f528b0551842e0192d7f28ba8f3eae283309ed3265d3bb4fda5b0f134e36bfd55e9b3924a50789c07b SHA512 b73760154b1d29344a91fbfc8e5406de9ac4d561e01384ba84a4f631d1cfad54bb743fc6020da26fa69d4bb9fbb4e43f8e2c8971ddcd99edb32355dd8989023d
-EBUILD picard-2.7.3.ebuild 1413 BLAKE2B ef1c81a19e42fedffb65c47278e340c0b7ca27b0f2da934c3f4d232db314f05efd7499c1a818c842a0a94f18afdf18b01e16ab8f8a75ee3d1a03026a2002e8c4 SHA512 d464908123fc47a3770b920ac36d649913a08322d1dfedf4f748fc91bffe2e4eb0ef0a411326411d561aaf312faaf1de890619dacf8c7e5cacd0f51d62ac0786
+EBUILD picard-2.7.3.ebuild 1411 BLAKE2B 1eca988cde74b9b7ca3de813b8d5262e432b2c9f055fa8f528b0551842e0192d7f28ba8f3eae283309ed3265d3bb4fda5b0f134e36bfd55e9b3924a50789c07b SHA512 b73760154b1d29344a91fbfc8e5406de9ac4d561e01384ba84a4f631d1cfad54bb743fc6020da26fa69d4bb9fbb4e43f8e2c8971ddcd99edb32355dd8989023d
 EBUILD picard-9999.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.7.1-r1.ebuild b/media-sound/picard/picard-2.7.1-r1.ebuild
deleted file mode 100644
index c57f433dd767..000000000000
--- a/media-sound/picard/picard-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
diff --git a/media-sound/picard/picard-2.7.3.ebuild b/media-sound/picard/picard-2.7.3.ebuild
index accbc2910dfb..c57f433dd767 100644
--- a/media-sound/picard/picard-2.7.3.ebuild
+++ b/media-sound/picard/picard-2.7.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index d8fe83e7ad37..a0dbafdb65d1 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -3,4 +3,4 @@ AUX pnmixer-0.7.2-fix-possible-garbage-value.patch 1173 BLAKE2B e4a874f9ffcaaa6d
 AUX pnmixer-0.7.2-fix-possible-memleak.patch 620 BLAKE2B 1eb39431bdb5d7597575687c03175b8b0b41a4a64a2fd9fc704775154f048f6400ce7a38e7611484314d643caf2422660442bb0e38a631e8689c1816ba46900d SHA512 df1b824a5219d299ab69c83064156d425ee257594f49d632c745647be4497d70f071d3ba7ac5256749461d5f04a82d1a5faff32e9198e5e2246f35bf537f91f9
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
 EBUILD pnmixer-0.7.2-r1.ebuild 1150 BLAKE2B 5a48be6d3eeb7efe1255db69f206da64d78104529a052949afbc583be20aa1666132221b564178bbd372860acede18e5c392c27942f6f7bafd94723d7c2bf0e0 SHA512 0bcbbe319368f9467156434af65ed9716dfb9d8d32c8fcb5d69c45c8080ab146be24d7ef166f725759c738cc07e219f1e21b2e0e5cef29412127ab724487ff7a
-MISC metadata.xml 2342 BLAKE2B 1cf09b9e11ee65be7d88c6dcea1f5ef7781ba3d0b017ff48401f729a70b95ca57869cefd8c848f4899a60e3201ca7da3fef633e8c2cbfb845cef2ba799abb8ee SHA512 db9a8d36ff0c3a8be8f7d248f6205b37f06406a55dbc1306aeb3d433c93cfdb776526015d805fb3617ce2306376c56abbd859f155f1b3a412f1f0e17ab75ac6b
+MISC metadata.xml 2114 BLAKE2B ef3c102e9cf36bffa1c06882f0d13f96638d027e19f1882ae352e3ad63a2028e0317310c49a610bfd35976c53c0f0dc09163175f2ca9e2ad8c8b0efd6c9d70e9 SHA512 308bd8e9313c3545f6476cbf8b3e94d1a36f0d4564c4a96edb6400e83506982465b9f21b1cf1c3525162258a10d3f2bf0eaf8eaa0afc3d437a55ae28e52a99e9
diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index ceb23cf014a0..7bfeefe2367d 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		PNMixer is a simple mixer application designed to run in your system
 		tray. It integrates nicely into desktop environments that don't have
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
index 18a1443b43a3..2356c4720793 100644
--- a/media-sound/puddletag/Manifest
+++ b/media-sound/puddletag/Manifest
@@ -1,3 +1,7 @@
 DIST puddletag-2.0.1.tar.gz 1227152 BLAKE2B 804e9ca9629a9d78114d6f4b6afbe9032cb414678ea6325679c21ac18867bafed8f1b16aae5fbea18995ecc800d35594c478a5164b377f3b4e5dd75148fd3246 SHA512 d84ba360a6cd8c3ddb6628e30276df58d059d9e8cbb2d1255320ca273436c69f05584059c2e768a15871d3f56dc08d7ac96fef9a9c7c077811bb9fdfde444610
+DIST puddletag-2.1.0.tar.gz 14628824 BLAKE2B 52ac6291682710eed81aa6176b1a53eb15aec8885a8421361d3da8850e8b1719d0d1c9b2f131ad826febc328244ec890cf6283f1945275458d75b1f923890dd2 SHA512 638c12be894d157d0456f336972f0064c4f4087d1c689f58b7b01f0e88cd773319b9c447e6f2b606f6e482b6d1e2328f5bc2aca556bab427b764d6525b8c2d5e
+DIST puddletag-2.1.1.tar.gz 14628014 BLAKE2B 14343cc5731bd060dc836b14707948ef103c3e4c968974e7c578ac975a12d6d2b9d3dfa9750e6d0ac94e8a8466c85b82f409b93cc787a32d8950f5de1b60dd3e SHA512 b05ab8a09d5ad4d21f8384fa85beebe039b8ee7e775630a23981bfe88ac389fc34a6ac6eac6660a99f38e34157e6bd841ba12237f45e290fe96ded3ab6d44d77
 EBUILD puddletag-2.0.1-r1.ebuild 1103 BLAKE2B 4ae7c9475756de655d0bcd372c437a8b5ff2402686feb252b127a307184e2c15d30aac9634257491d1e311692ad72e309f19e28fa4cc5722959a5fdb15648ff2 SHA512 344971ce17a67d5173c33deac101395f86492229660d58b1647de50714801c27624084bb737806f9917442d167bc4e404f530cacab5cb0e9bab161ac8ed251cf
+EBUILD puddletag-2.1.0.ebuild 1148 BLAKE2B f9e8e2c778d08d158516e4aef6b2fb1f30f14aebd16a37dbede2e65b6738cd49a6cea802a201544f80342d1ed630bcb0f3aa330c7ccc677a6282ad6742fc109d SHA512 e4ac798f89666f6da5b8cf32f620dbc855bc579a885d8569c4ee6328f8ed81e471e74d900ddb086429007f62099919f8fe18c9b3845015c2438714197ebae5b9
+EBUILD puddletag-2.1.1.ebuild 892 BLAKE2B cf6ce1fca7b383ffd303b08a4f69078134c933014b6565eefa7b7cd76c20e4c4f039040f9175db8c3b8837e44696ec9419b7ec2c8ab106a0a095879b49315d84 SHA512 7903edf2912017094b6abf1a18b748135dbd3c29b6aa812689d02f069e1e294079c53860b9a2927088e99471c40bcb2146a36a31c62c0260fe7bab610c4e8168
 MISC metadata.xml 625 BLAKE2B 53148d8c908987d7bae7246c123e72638270848c8458a18f1839a8046995eb156d25c75b0312d0dfd5b1949d16062362b7c4af09f74843fb3dbf81015f706de5 SHA512 b49b68c45205f4f465263983d94bbb5289412ab7567e210f98b98587bd3103db426a375fecf7c2e99929df623d1bbd603330561fffccdc4bf70170f2312d2769
diff --git a/media-sound/puddletag/puddletag-2.1.0.ebuild b/media-sound/puddletag/puddletag-2.1.0.ebuild
new file mode 100644
index 000000000000..2e182ebcb057
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+DEPEND=""
+RDEPEND="
+	>=dev-python/configobj-5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
+	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
+	acoustid? ( >=media-libs/chromaprint-1.4.3 )
+	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+"
+# docs
+#	>=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
+#	>=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
+#	>=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
+#	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/puddletag/puddletag-2.1.1.ebuild b/media-sound/puddletag/puddletag-2.1.1.ebuild
new file mode 100644
index 000000000000..86eec8aa99bf
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+DEPEND=""
+RDEPEND="
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
+	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
+	acoustid? ( >=media-libs/chromaprint-1.5.0 )
+	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.7.1[${PYTHON_USEDEP}]
+"
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 46f9bae8bf2e..332849afa27f 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -5,5 +5,5 @@ DIST pulseaudio-ctl-1.70.tar.gz 6513 BLAKE2B bd752c42a6ec7c205112637a11e2abae147
 EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
 EBUILD pulseaudio-ctl-1.68.ebuild 615 BLAKE2B 7c751c3dd17cd4a51e142ec436dcea1620c5e24bd5bc87a03a4b81e8933dfa885a65bcd5275929afbac1cbfb41f28aa30ded77812b6ffc629f111c0fc715112b SHA512 66c38fb2cc349bd2ef934f6760a14669463d9985c575a7ff63a8250419d7a6e8609460dfc26e66f217f75a79535f6e66cc8bc4b2c88fea11cbc00b67e8b36b4a
 EBUILD pulseaudio-ctl-1.69.ebuild 615 BLAKE2B 5aca5a348d7b120ec3bf68b560fa9ed9d4e9e748312909c2c7dcf53cdb2273dba7753554221df1901fde969ce8849d1d42ef57566f05c2a01401abc9a6d38892 SHA512 5b7d59037fee4103d8498f3c71fce30035a8b3b5aea68486851efb816cc0adb7747722e3ecbebbc038476bcee476962a10590876f47c3224ca2f08e183daa873
-EBUILD pulseaudio-ctl-1.70.ebuild 622 BLAKE2B 2b91aa6495a20af6d9be805e4018f4a8dfd65a3b20ba069570a44d6752f9706eda37844beedcef3af1bcbcfdc294b3ab857afc70d40ca01d306b65b18f7c5ecd SHA512 7c47150667b4f6598e63b78474099e7024981396e7575ce401dca77afbc0e26ed4a94964e5c5308390de3fdaee22fda06e120ea1d4ead7297827b341a6edb714
+EBUILD pulseaudio-ctl-1.70-r1.ebuild 670 BLAKE2B 6dcc3111467d0e9a80d77d7e69c0a10df14cc49a8a2d8dda7472486125103ea892987891990fe4b7f9fdcc96327544ab17d5d35c6a8ec0d0b1f365a2dcb968b7 SHA512 29cc31c597a22aaf82fb661046a865497c8c00dd853179741590a5fd376cf13aec42cd9be4404abfebc607836945189bb4911e7dee83ce9f9424f8eb5f75d1a8
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
index fc2d4914d693..757d436aadd5 100644
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ IUSE=""
 
 # Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
 # in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )"
 
 src_install() {
 	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 32fb42eb6036..1f9d41cf738d 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -1,9 +1,7 @@
-AUX 15.0-daemon-only.patch 9282 BLAKE2B 9a73eb993c5ca018ac59ce18544f8273fa9c96a3a1b97fbe6744bce764368bce8873ca0145c5c227a94ed17083d1200e70ae016fbdde1b7e8bf1ac632cf1073c SHA512 35b093f7d5dc7603a34584e66579af0519d1dceea960812878676f5c0ab4e7e08f6b9923a195690313a7c9a0a759e91c6d08b087f0d4e99dac6b4619eab4e4fe
-AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
 AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
-DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-daemon-15.0.ebuild 9692 BLAKE2B b00c8b2fbda1e985f4b1cdaa9df8697721aafa14be152b652961be93eead93290924aa71a187c5d95f2b875d66433e3d9a7fd93824556a87ef2803dd64956a5d SHA512 3e8de26cde8d3c1f4ecb15e7a68ccb200af2f3c20d84f5d31e3f9efbe43c64e3e89e50377c9954058070996488c69dba5687c1d772df3eea3e76a23b67d67260
-MISC metadata.xml 2745 BLAKE2B b8ff0973c3b5bdee1a05c598a7070e67ad385bfb32f51acaf80081ce9607d2bfb6a99233be9df31409dbac6a85a48f32f763f71be3ab960090ba104a613094a0 SHA512 42872d8b934e8216c30c525072977df9abc9e9487ba7de8d4a1df9343236ebb735bcb89109cd97cc0e7ddf0261370aa605aee8cdb8f5b457e26904b023a1990c
+DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
+EBUILD pulseaudio-daemon-15.99.1.ebuild 10068 BLAKE2B 2ba9ced46da22c3d8f7c2ca5463297ac8570233ebda4063118e03c40e0f075663847916eb3d0e1b3dc2624a08f5a921e24105770c6425d08c003f2fa2c1dbe23 SHA512 fcf96d0bf03b14b689b56fd12eacdbd73aafd17c0ccff76383cc737c7c9b9e8a4a0442b8a0d4dfcb6a6ccd33005fef208156dc8e23f1bfb952553c52637281f8
+MISC metadata.xml 3219 BLAKE2B fd8c28b21c9fc9d2185d2f92481b5cdf1b344dbd95a7d668f5fa14320f90698654ae68cca14789fd9f83fe9fe9b46f906988acdbce36c5e0102846baaf10e7e0 SHA512 9b1c4d4a5077d6e7dae69c4f54d82586d77d32dca078ae39f63995b2b2320ec9804be24688657ed47823ee034ce8b54a8f9e0229e9b35849778b0204ef97352c
diff --git a/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch b/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch
deleted file mode 100644
index 4d99c1ebe639..000000000000
--- a/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From f4f28cc436a506d1dfbd514968b2976ab31cdf5f Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <mart@leio.tech>
-Date: Fri, 24 Sep 2021 15:19:05 +0300
-Subject: [PATCH] build-sys: meson: Allow building the daemon only
-
----
- man/meson.build                   |  2 ++
- meson.build                       | 23 ++++++++++++++++++++---
- meson_options.txt                 |  3 +++
- po/meson.build                    |  3 ---
- shell-completion/bash/meson.build |  2 ++
- src/daemon/meson.build            |  4 ++--
- src/meson.build                   | 11 +++++++++++
- src/modules/gsettings/meson.build |  3 +--
- src/tests/meson.build             |  9 +++++++--
- src/utils/meson.build             | 10 ++++++----
- 10 files changed, 54 insertions(+), 16 deletions(-)
-
-diff --git a/man/meson.build b/man/meson.build
-index 31c581a8f..c12ad5e6a 100644
---- a/man/meson.build
-+++ b/man/meson.build
-@@ -14,6 +14,7 @@ if get_option('daemon')
-   ]
- endif
- 
-+if not get_option('daemon-only')
- manpages += [
-   ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
-   ['pactl', '1'],
-@@ -31,6 +32,7 @@ if x11_dep.found()
-     ['pax11publish', '1'],
-   ]
- endif
-+endif
- 
- # FIXME: Add esdcompat if HAVE_ESOUND
- #manpages += ['esdcompat', '1'],
-diff --git a/meson.build b/meson.build
-index 63ed62342..420cc6fac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,6 +53,8 @@ libpulse_mainloop_glib_version = '@0@.@1@.@2@'.format(
-   libpulse_mainloop_glib_version_info[1],
- )
- 
-+i18n = import('i18n')
-+
- # Paths
- 
- prefix = get_option('prefix')
-@@ -68,6 +70,7 @@ localedir = join_paths(prefix, get_option('localedir'))
- localstatedir = join_paths(prefix, get_option('localstatedir'))
- sysconfdir = join_paths(prefix, get_option('sysconfdir'))
- privlibdir = join_paths(libdir, 'pulseaudio')
-+po_dir = join_paths(meson.current_source_dir(), 'po')
- 
- if host_machine.system() == 'windows'
-   # Windows only supports loading libraries from the same dir as the executable
-@@ -796,20 +799,28 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
- if get_option('doxygen')
-   subdir('doxygen')
- endif
--subdir('po')
-+if not get_option('daemon-only')
-+  subdir('po')
-+endif
- if get_option('man')
-   subdir('man')
- endif
- subdir('shell-completion/bash')
--subdir('shell-completion/zsh')
-+if not get_option('daemon-only')
-+  subdir('shell-completion/zsh')
-+endif
- subdir('src')
--subdir('vala')
-+if not get_option('daemon-only')
-+ subdir('vala')
-+endif
- 
- # Now generate config.h from everything above
- configure_file(output : 'config.h', configuration : cdata)
- 
- # pkg-config files
- 
-+if not get_option('daemon-only')
-+
- pc_cdata = configuration_data()
- 
- pc_cdata.set('prefix', prefix)
-@@ -842,8 +853,12 @@ foreach file : pc_files
-     install_dir : pkgconfigdir)
- endforeach
- 
-+endif # !daemon-only
-+
- # CMake files
- 
-+if not get_option('daemon-only')
-+
- m4 = find_program('m4', required: true)
- 
- cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
-@@ -872,6 +887,8 @@ configure_file(
-   install_dir : cmakedir,
- )
- 
-+endif # !daemon-only
-+
- ############################################################
- 
- # Final summary
-diff --git a/meson_options.txt b/meson_options.txt
-index bb41a42a7..62828ac5c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,6 +1,9 @@
- option('daemon',
-        type : 'boolean', value : true,
-        description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
-+option('daemon-only',
-+       type : 'boolean', value : false,
-+       description : 'Build and install only the pulseaudio daemon and supporting configuration files, relying on a system installation of libpulse')
- option('doxygen',
-        type : 'boolean', value : true,
-        description : 'Enable building and installation of documentation generated with doxygen')
-diff --git a/po/meson.build b/po/meson.build
-index 34278db47..33429373c 100644
---- a/po/meson.build
-+++ b/po/meson.build
-@@ -1,4 +1,3 @@
--i18n = import('i18n')
- i18n.gettext(
-   meson.project_name(),
-   preset: 'glib',
-@@ -7,5 +6,3 @@ i18n.gettext(
-   args: ['--msgid-bugs-address=https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/new',
-          '--width=90'],
- )
--
--po_dir = meson.current_source_dir()
-diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
-index 3ba5cb16f..83d90b94b 100644
---- a/shell-completion/bash/meson.build
-+++ b/shell-completion/bash/meson.build
-@@ -8,6 +8,7 @@ if bashcompletiondir != 'no'
-     ]
-   endif
- 
-+  if not get_option('daemon-only')
-   aliases += [
-     'pacat',
-     'pactl',
-@@ -16,6 +17,7 @@ if bashcompletiondir != 'no'
-     'parec',
-     'parecord',
-   ]
-+  endif
- 
-   install_data('pulseaudio', install_dir : bashcompletiondir)
- 
-diff --git a/src/daemon/meson.build b/src/daemon/meson.build
-index 262e193b2..e8f70a453 100644
---- a/src/daemon/meson.build
-+++ b/src/daemon/meson.build
-@@ -30,8 +30,8 @@ executable('pulseaudio',
-   install_rpath : privlibdir,
-   include_directories : [configinc, topinc],
-   link_args : ['-ffast-math'],
--  link_with : [libpulsecore, libpulsecommon, libpulse],
--  dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep],
-+  link_with : [libpulsecore],
-+  dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep, libpulsecommon_dep, libpulse_dep],
-   c_args : pa_c_args,
- )
- 
-diff --git a/src/meson.build b/src/meson.build
-index e2860811b..a56667271 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -188,6 +188,15 @@ else
- endif
- # FIXME: Do SIMD things
- 
-+if get_option('daemon-only')
-+  libpulsecommon_dep = cc.find_library('pulsecommon-' + pa_version_major_minor, dirs : privlibdir, required : true)
-+  libpulse_dep = dependency('libpulse', required : true)
-+  libpulse_simple_dep = dependency('libpulse-simple', required : true)
-+  if glib_dep.found()
-+    libpulse_mainloop_glib_dep = dependency('libpulse-mainloop-glib', required : true)
-+  endif
-+else
-+
- libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
-   libpulsecommon_sources,
-   libpulsecommon_headers,
-@@ -207,6 +216,8 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
- libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
- 
- subdir('pulse')
-+endif
-+
- if get_option('daemon')
-   subdir('pulsecore')
-   subdir('daemon')
-diff --git a/src/modules/gsettings/meson.build b/src/modules/gsettings/meson.build
-index 68a72c3ff..9604699e7 100644
---- a/src/modules/gsettings/meson.build
-+++ b/src/modules/gsettings/meson.build
-@@ -8,8 +8,7 @@ gsettings_helper = executable('gsettings-helper',
-   gsettings_helper_sources,
-   c_args : pa_c_args,
-   include_directories : [configinc, topinc],
--  link_with : [libpulsecommon, libpulse],
--  dependencies : [gio_dep],
-+  dependencies : [gio_dep, libpulsecommon_dep, libpulse_dep],
-   install_dir : pulselibexecdir,
-   install_rpath : privlibdir,
-   install : true,
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index acd301037..56d71299f 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -20,8 +20,6 @@ default_tests += [
-     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
-   [ 'json-test', 'json-test.c',
-     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
--  [ 'mainloop-test', 'mainloop-test.c',
--    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
-   [ 'proplist-test', 'proplist-test.c',
-     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
-   [ 'thread-mainloop-test', 'thread-mainloop-test.c',
-@@ -32,6 +30,13 @@ default_tests += [
-     [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
- ]
- 
-+if not get_option('daemon-only')
-+  default_tests += [
-+    [ 'mainloop-test', 'mainloop-test.c',
-+      [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
-+  ]
-+endif
-+
- if get_option('daemon')
-   default_tests += [
-     [ 'asyncmsgq-test', 'asyncmsgq-test.c',
-diff --git a/src/utils/meson.build b/src/utils/meson.build
-index c9635fdb6..7ed6e738f 100644
---- a/src/utils/meson.build
-+++ b/src/utils/meson.build
-@@ -1,3 +1,4 @@
-+if not get_option('daemon-only')
- pacat_sources = [
-   'pacat.c',
- ]
-@@ -41,6 +42,7 @@ executable('pactl',
-   dependencies : [sndfile_dep, libintl_dep],
-   c_args : pa_c_args,
- )
-+endif
- 
- if get_option('daemon')
-   if host_machine.system() != 'windows'
-@@ -53,8 +55,7 @@ if get_option('daemon')
-       install: true,
-       install_rpath : privlibdir,
-       include_directories : [configinc, topinc],
--      link_with : [libpulsecommon, libpulse],
--      dependencies: [libintl_dep],
-+      dependencies: [libintl_dep, libpulsecommon_dep, libpulse_dep],
-       c_args : pa_c_args,
-     )
- 
-@@ -67,13 +68,13 @@ if get_option('daemon')
-       install: true,
-       install_rpath : privlibdir,
-       include_directories : [configinc, topinc],
--      link_with : [libpulsecommon, libpulse],
--      dependencies: [libintl_dep],
-+      dependencies: [libintl_dep, libpulsecommon_dep, libpulse_dep],
-       c_args : pa_c_args,
-     )
-   endif
- endif
- 
-+if not get_option('daemon-only')
- if x11_dep.found()
-   pax11publish_sources = [
-     'pax11publish.c',
-@@ -121,3 +122,4 @@ if dbus_dep.found() and fftw_dep.found()
- endif
- 
- install_data('pa-info', install_dir : bindir)
-+endif
--- 
-2.32.0
-
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
deleted file mode 100644
index f3df62031d34..000000000000
--- a/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/806052
-
-commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Tue Aug 3 09:43:32 2021 +0300
-
-    build-sys: meson: Require xice, xsm and xtst for daemon only
-    
-    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
-
---- a/meson.build
-+++ b/meson.build
-@@ -681,9 +681,9 @@ endif
- x11_dep = dependency('x11-xcb', required : get_option('x11'))
- if x11_dep.found()
-   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
--  ice_dep  = dependency('ice',  required : true)
--  sm_dep   = dependency('sm',   required : true)
--  xtst_dep = dependency('xtst', required : true)
-+  ice_dep  = dependency('ice',  required : get_option('daemon'))
-+  sm_dep   = dependency('sm',   required : get_option('daemon'))
-+  xtst_dep = dependency('xtst', required : get_option('daemon'))
-   cdata.set('HAVE_X11', 1)
-   if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
-     cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml
index 9808d54c65cf..0a4437e23510 100644
--- a/media-sound/pulseaudio-daemon/metadata.xml
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -62,5 +62,15 @@
     <flag name="ofono-headset">
       Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
     </flag>
+    <flag name="gstreamer">
+      Build with support for gstreamer including ability to use bluetooth codecs.
+      For bluetooth codecs see USE ldac and aptx.
+    </flag>
+    <flag name="aptx">
+      aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
+    </flag>
+    <flag name="ldac">
+      LDAC over Bluetooth (primarily Sony headphones), requires <pkg>media-plugins/gst-plugins-ldac</pkg>.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1.ebuild
index 2af849121400..71655e65efbd 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1.ebuild
@@ -5,7 +5,6 @@ EAPI="7"
 
 MY_PV="${PV/_pre*}"
 MY_P="pulseaudio-${MY_PV}"
-
 inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
@@ -31,10 +30,9 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 
 # +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
 # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack lirc
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc
 native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf"
 
 RESTRICT="!test? ( test )"
@@ -126,6 +124,12 @@ RDEPEND="
 		acct-group/audio
 		acct-group/pulse-access
 	)
+	bluetooth? (
+		gstreamer? (
+			ldac? ( media-plugins/gst-plugins-ldac )
+			aptx? ( media-plugins/gst-plugins-openaptx )
+		)
+	)
 "
 
 # This is a PDEPEND to avoid a circular dep
@@ -148,9 +152,8 @@ DOCS=( NEWS README )
 
 S="${WORKDIR}/${MY_P}"
 
+# patches merged upstream, to be removed with 16.0 bump
 PATCHES=(
-	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-	"${FILESDIR}"/${PV}-daemon-only.patch
 )
 
 src_prepare() {
@@ -164,7 +167,7 @@ src_configure() {
 		--localstatedir="${EPREFIX}"/var
 
 		-Ddaemon=true
-		-Ddaemon-only=true
+		-Dclient=false
 		-Ddoxygen=false
 		-Dgcov=false
 		-Dman=true
@@ -185,7 +188,7 @@ src_configure() {
 		$(meson_feature asyncns)
 		$(meson_feature zeroconf avahi)
 		$(meson_feature bluetooth bluez5)
-		-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
+		$(meson_feature gstreamer bluez5-gstreamer)
 		$(meson_use native-headset bluez5-native-headset)
 		$(meson_use ofono-headset bluez5-ofono-headset)
 		$(meson_feature dbus)
@@ -222,8 +225,14 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	# Installed by media-libs/libpulse
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
 	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+	rm "${D}/$(get_bashcompdir)"/pacmd || die
+	rm "${D}/$(get_bashcompdir)"/pasuspender || die
 
 	if use system-wide; then
 		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 95d7a9016717..72c095872ac6 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,7 +1,6 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
-EBUILD pulseaudio-modules-bt-1.4-r1.ebuild 2170 BLAKE2B b692c89de2f16c30586737d6577531086f3cc6794f638de1dd7251711bfe9188c9d7ab341d9c8e73d3f4edbb517247d6ad6fd19e8996b576b2063d98b5170abf SHA512 7c28546f9eb9d1e4758d403d04eac9c76e7cac9c20c3b1e96891ba0be9cd6f77fbed171861d57315e967ed41b5f40171e99b6def9c5c24fb6df1c79d0216ac51
-EBUILD pulseaudio-modules-bt-1.4-r2.ebuild 2216 BLAKE2B cd82ba965af111a44f5c486ba4c333da1c1ccb84823bf1e92b296df3333dcb5e3b246c8bffcaf7f39419fe11a7035166da6f584c183b56143e52bfaa634a502d SHA512 fa5965f4a3c9f4a84b5d0af4ae3be2877fee1eb1f25c95d9654284cf147f9f842ab9681672e6b397d595730ee24dc2192eafa694b5ae418faf40d379b2084db2
-EBUILD pulseaudio-modules-bt-1.4.ebuild 2170 BLAKE2B 9e09eaf4e2ba634bb05c48a8db1a813a201589c7dc41a44653de6d630e03571f5d73c6071ff03dc292218b47881eb9cab717ee71ee61ea1941777021e5d58e56 SHA512 af3d8e0303cd3eec86155cf390fdca9d0ea68000bd6c84f91a772be354a630fc20e06cf4c172ac9a702ec2bef5884f532c78cd2c9fb5c1243f3bc40c03628546
+EBUILD pulseaudio-modules-bt-1.4-r4.ebuild 2370 BLAKE2B 6e877c3ec88ef1aca75e39ec91318d8ca0d7ebf940e09648d81d1e4c6ac0435646747c556b4291041e446280697a0d33be64238e3eef5f0ba336590e758bde49 SHA512 a028f1c06200aa1f4a79ddca859e425fa093d865be2ec263f8af1e95fa20fd18bab932d7a2fda81f12e8b1040f262bee3eaffc4065c64018b657337a62044762
+EBUILD pulseaudio-modules-bt-1.4.ebuild 2209 BLAKE2B 3a7000e9dbfd49674f25bbb5715406f59c20c54df7077f9e4ba51835c9df3ea62540297cad6b79f5de233e1efc802d925d4947f9ae9c9be1f13ab254a1d33656 SHA512 17a6ba15fd737067031d65ce0bdc2d776260f62f2327f900fbce0b21248980f8ac78884c8c9bc07d766514544191003bc2be91308e11ec1f80921d5b309f4b6e
 MISC metadata.xml 767 BLAKE2B 7787505018f779a109f761f1ad5d73bc19654491d1a9adb900fb97cb023abcb76753f964d9c39eb9a98924391bd8a08e916c652b21e942dda31c84e8e16dce01 SHA512 2b12af8d5dda44c9cb5f58685f49c65a865f29e9f1506f5d5e5c4cce6629b19e49774e71c7b078c877ed053ee5c6530d219cf9fbe1c2a8c9a4e4628c497d5848
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild
deleted file mode 100644
index dd8941809a38..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-
-PULSE_VER="15.0"
-SRC_URI="
-	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild
index 5ce55a2c7a12..725cf735ad5c 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild
@@ -26,8 +26,12 @@ DEPEND="
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
 	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth,daemon(+)]
-	!media-sound/pulseaudio[bluetooth]
+	|| (
+		>=media-sound/pulseaudio-daemon-${PULSE_VER}[-bluetooth]
+		( >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth(-),daemon(+)] <media-sound/pulseaudio-15.99.1 )
+	)
+	!media-sound/pulseaudio[bluetooth(-)]
+	!media-sound/pulseaudio-daemon[bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
 RDEPEND="${DEPEND}"
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
index 4b41f381f58c..b1b9841188e7 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ DEPEND="
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
 	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
+	( >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth(-)] <media-sound/pulseaudio-15.99.1 )
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
 RDEPEND="${DEPEND}"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index e680c455c5f7..8eaaab29d820 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -10,6 +10,7 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b499dfa2d48c67289936c4211c07a72512251efc2e61688571ed5a0b6406a85f78efecaa8f5385283ea40d1659ceb54a86 SHA512 d5a27a4a1382dbaf0df03f72c020ed35ca221f98e3231cbd8a210656fd45a355091c7fdf1754e20ab63a97eeafedffa49b6a307a7bf0ce410a5cfaff998989c8
-EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
 EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
-MISC metadata.xml 3400 BLAKE2B 5e80f40f078e30e51975512fc465417c647106cdd5076c41f6bdd9b2a8757759a1e72391a2f8a90666c60b7ffa968e5b28b2b9aeae6906ef8837a7c959ace18a SHA512 6b81f6a80d6aaf72f56d00256e2715cd53758fc6adbd0a7a5b2836d9dc30ce61fd8a591e52ebb7e33288d6a87b172f75ae610dc9b13d4c28101eea5c2d2eb073
+EBUILD pulseaudio-15.0-r3.ebuild 11212 BLAKE2B cbf1479051d982919197e9013a00dc42e738dcefe38b58c019004d5ecf5b38e1da9d4d3aa20d1faf9eb9c10cd47453eadd8409f8c394fbdcb38739a325c254d7 SHA512 6dbe1a97baa02969d5552d4bf41369146db6f2892130a5181ef8817cc008a9b97dc456a2c3de3b9f9d63ade2e9966a4091b677bc5b0572d699d2d00344a83c8d
+EBUILD pulseaudio-15.99.1-r1.ebuild 927 BLAKE2B 88797ff7961be78ed9803c91b4a6c84698375013da41f45ffdb65c2704ce9e05caa2513d83ae8a98d1efffa91eb1d08ed7460959ed438d1946bc2521a4092996 SHA512 cae78b9ebcc65803ffde0b09300c5ff43fb7c085a6785f220a549f2e32cd5f8ac2db148487e452bc535d9b85055bc71cd00150aa36418f7128fbdeef4a646d7e
+MISC metadata.xml 3874 BLAKE2B 0aa44014b4b731a193e4bbf4f0eca2e3df5946d8e210f90679d7625b61f18ff29c5b3dd18999b489997471885fd1f3f8fcf722eae2cf1e4210e236f8b025540a SHA512 01c4d22c01cc92570dbfeaa749c82b434ae25520ace0258bc61f74fc51beba1235affb39b4eb1609c9e39d6215b46b721524f606bc391dbc6955084186cb1efd
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index f549ed258967..fff0ae344a5d 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -74,5 +74,15 @@
     <flag name="ofono-headset">
       Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
     </flag>
+    <flag name="gstreamer">
+      Build with support for gstreamer including ability to use bluetooth codecs.
+      For bluetooth codecs see USE ldac and aptx.
+    </flag>
+    <flag name="aptx">
+      aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
+    </flag>
+    <flag name="ldac">
+      LDAC over Bluetooth (primarily Sony headphones), requires <pkg>media-plugins/gst-plugins-ldac</pkg>.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
deleted file mode 100644
index bc04ffed9af7..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="metapackage"
-
-SLOT="0"
-
-IUSE="+alsa +alsa-plugin bluetooth +daemon +glib jack zeroconf"
-
-# TODO: Get rid of the REQUIRED_USE by adapting the consumers to the splits with correct USE deps and dropping IUSE here
-REQUIRED_USE="
-	!daemon? (
-		!alsa
-		!alsa-plugin
-		!bluetooth
-		!jack
-		!zeroconf
-	)
-"
-
-RDEPEND="
-	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
-	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[alsa?,bluetooth?,jack?,zeroconf?] )
-"
-DEPEND="${RDEPEND}"
-# TODO: Figure out alsa-plugin handling, where pulseaudio-daemon isn't a multilib-minimal package
-PDEPEND="alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )"
-BDEPEND=""
-
-S="${WORKDIR}"
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
new file mode 100644
index 000000000000..21060b033fd1
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
+else
+	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
+gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	alsa-plugin? ( alsa )
+	bluetooth? ( dbus )
+	daemon? ( ?? ( elogind systemd ) )
+	!daemon? (
+		!alsa
+		!alsa-plugin
+		!bluetooth
+		!equalizer
+		!gdbm
+		!gstreamer
+		!gtk
+		!jack
+		!lirc
+		!native-headset
+		!ofono-headset
+		!orc
+		!oss
+		!sox
+		!ssl
+		!system-wide
+		!udev
+		!webrtc-aec
+		!zeroconf
+	)
+	equalizer? ( dbus )
+	native-headset? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation
+COMMON_DEPEND="
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	>=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
+	virtual/libc
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	daemon? (
+		dev-libs/libltdl
+		sys-kernel/linux-headers
+		>=sys-libs/libcap-2.22-r2
+	)
+	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gst-plugins-base
+		>=media-libs/gstreamer-1.14
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jack? ( virtual/jack )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		daemon? (
+			x11-libs/libICE
+			x11-libs/libSM
+			>=x11-libs/libX11-1.4.0
+			>=x11-libs/libXtst-1.0.99.2
+		)
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libatomic_ops
+	dev-libs/libpcre:*
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+	daemon? (
+		bluetooth? (
+			gstreamer? (
+				ldac? ( media-plugins/gst-plugins-ldac )
+				aptx? ( media-plugins/gst-plugins-openaptx )
+			)
+		)
+	)
+"
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		$(meson_native_use_bool daemon)
+		$(meson_native_use_bool doc doxygen)
+		-Dgcov=false
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_native_use_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_feature gstreamer bluez5-gstreamer)
+		$(meson_native_use_bool native-headset bluez5-native-headset)
+		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
+		$(meson_feature dbus)
+		$(meson_native_use_feature elogind)
+		$(meson_native_use_feature equalizer fftw)
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_native_use_feature glib gsettings) # Supposedly correct?
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gtk)
+		-Dhal-compat=true # Consider disabling on next revbump
+		$(meson_use ipv6)
+		$(meson_native_use_feature jack)
+		$(meson_native_use_feature lirc)
+		$(meson_native_use_feature ssl openssl)
+		$(meson_native_use_feature orc)
+		$(meson_native_use_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_native_use_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_native_use_feature systemd)
+		$(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
+		$(meson_native_use_feature udev)
+		-Dvalgrind=auto
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_native_use_feature webrtc-aec)
+	)
+
+	if multilib_is_native_abi; then
+		# Make padsp work for non-native ABI, supposedly only possible with glibc;
+		# this is used by /usr/bin/padsp that comes from native build, thus we need
+		# this argument for native build
+		if use elibc_glibc; then
+			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	else
+		emesonargs+=( -Dman=false )
+		if ! use elibc_glibc; then
+			# Non-glibc multilib is probably non-existent but just in case:
+			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
+		fi
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Generating documentation ..."
+			meson_src_compile doxygen
+		fi
+	fi
+}
+
+multilib_src_install() {
+	# The files referenced in the DOCS array do not exist in the multilib source directory,
+	# therefore clear the variable when calling the function that will access it.
+	DOCS= meson_src_install
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Installing documentation ..."
+			docinto html
+			dodoc -r doxygen/html/.
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/${PN}.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus && use daemon; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	if use system-wide; then
+		tmpfiles_process "${PN}.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use equalizer; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+		elog ""
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use systemd && use daemon; then
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
new file mode 100644
index 000000000000..cb446d289297
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+# NOTE: bluetooth, native-headset and ofono-headset are passed through to
+# pulseaudio-daemon dependency to make sure users who have bluetooth enabled
+# just for pulseaudio package will also get these enabled via metapackage.
+IUSE="bluetooth +daemon +glib jack native-headset ofono-headset"
+
+RDEPEND="
+	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 4d09adf16153..6d961e947bd4 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
-DIST qjackctl-0.9.5.tar.gz 1336079 BLAKE2B 3446b0cb5cd34541d5761f3f6e2361dcfb50656997c723b5972aa60466a1eb1a720fb5d97684079832705b084d8d1ca082f652145d51ff89aedfab71a90d5c5e SHA512 2edceefd30a57b3b2277db271dd95c2b47b4a85106762eb3149dff94328265c096c5a26d301bd0edcd8f5d948dfc24ff2d3da532ac297121e4fee6982fb6ba56
 DIST qjackctl-0.9.6.tar.gz 1271177 BLAKE2B 8d4d6a5ddb712c7ea8c7494a0392250e8128b4284addce797031294c19059e05f7db43ca2b421d7ebaf0abe8db95e2cf098dec3fb2b520a3ff282383fe169455 SHA512 0af54ffc9a4afa3672e5996273f2ba20c7b0aec2d64831944a3aed16b7d33a48eca7d71dd799f197e450c44010065ea9e8ca9d5cc307af926697a2f95a4fa023
-EBUILD qjackctl-0.9.5.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
-EBUILD qjackctl-0.9.6.ebuild 978 BLAKE2B 1cd97fba1596268e1b574e7712d53a4632c05f3e8dff249baf579ececaebb2e72fa03b3e7a24f6dd8843241ab13e6a5e0d19ab43607102955b4b074b609e5f30 SHA512 e14fba2be8e4de5a4781ea3806a8f60ff3ab430fb9f57860ed502efd83d5efb6d53cf983a34c3b3bcec218d39cf21b585561fdcf952d2dcb88cb84e760118339
+EBUILD qjackctl-0.9.6.ebuild 976 BLAKE2B a6a05372bde75dd58333c396065004ac4a1dcca0740602b66607c2034102c222e78e0df210a3232c9c1fe4889e0dadd1184453c5f6f851c7081b741398303589 SHA512 36e100173b637c3b4bea81f7f4134dbd6cd65a285be5ce93ee0b60cbb06551e7fb41f901fb4f9bf0c2aa27cd38b5cfe5c68c8cbcaa612c9e8f8aad7717838eab
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.5.ebuild b/media-sound/qjackctl/qjackctl-0.9.5.ebuild
deleted file mode 100644
index 200a042d00bc..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.6.ebuild b/media-sound/qjackctl/qjackctl-0.9.6.ebuild
index 127871210489..42aae0d3e969 100644
--- a/media-sound/qjackctl/qjackctl-0.9.6.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index fe431b542b7d..373838323a16 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,4 @@
-DIST qmmp-1.5.1.tar.bz2 1363593 BLAKE2B 7c344ce2d9c1bc419b17c8d3727afa6f95273e7487f539b0e2f8cb5328f0185a7aab184d9df01a023f896e8b516135fd58ebe0e2204fb1f5ca283f4e0c04d78f SHA512 4b866e7b53ea1757a94e028730dd99bab3b56917e6835b46284cce148e779e00a5fe0a396667283aa13c980a9ee33d0fe76df0198320f1897ec3b73bcd1f275e
 DIST qmmp-1.5.3.tar.bz2 1388836 BLAKE2B 90fe166204125773d888f54f7f2b044215816ca337f079a73bca708440dc011c31a17afd7070a43103374f21879932527c123d5fe3066b46331abbdc91f8c224 SHA512 135802fde0d8ec0cad4ea1968dc6a4ab418d403ce2fd8fb4f96535420c84f7c56b67491e80b700960ab7d99600657dfe661cb2fd6bec3ae3a7c8cd809f16d9ba
-EBUILD qmmp-1.5.1.ebuild 4131 BLAKE2B 9a1ad81f31602acdefc2e9c3a30d3953c61d19edc5186f796399bbb5a24e7e078d9deebb35d09594b66a56a9e396c4f141832b259c7739c8a06ca8299c78a224 SHA512 6f39f9ee519e07872d6c73eb51f78bb4c71fb1c1665d905cc511064ab86e8cf0c541e8cd4a6440682e57371bfbc30b51dba98ac309bb65fa19af7e50ffbd55b3
-EBUILD qmmp-1.5.3.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
+EBUILD qmmp-1.5.3.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
 EBUILD qmmp-9999.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
 MISC metadata.xml 1883 BLAKE2B 8f252d3c02181fe5c7897a6f23b689dc75b507af80e765248ba856c8cd6564d162cfa60190fdd57350e1cf00229391f5057c1a51853dd2e291b3bc7311049d8f SHA512 affecdc44bc4b87cae10aba228f52b6eee63f759fa70e609206c9a4e627dab7d89741cdf51a22fe4b502f8c8d62077512494c893c7963afeb7d0cc0c23f945c0
diff --git a/media-sound/qmmp/qmmp-1.5.1.ebuild b/media-sound/qmmp/qmmp-1.5.1.ebuild
deleted file mode 100644
index 3f6f68e35de6..000000000000
--- a/media-sound/qmmp/qmmp-1.5.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
-ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
-notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		virtual/jack
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? (
-		media-libs/libmad:=
-		media-sound/mpg123:=
-	)
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	pipewire? ( media-video/pipewire )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia ; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PIPEWIRE="$(usex pipewire)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-1.5.3.ebuild b/media-sound/qmmp/qmmp-1.5.3.ebuild
index ee881e5be18c..14e58416acd2 100644
--- a/media-sound/qmmp/qmmp-1.5.3.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	inherit subversion
 	QMMP_DEV_BRANCH="1.3"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 8b0b3657487f..dbe6d0087b55 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,7 +1,5 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
-DIST qsampler-0.9.4.tar.gz 284055 BLAKE2B 83f0eb7102d6dbba994d2efeee59ebc46ce2b07d40b9dcfe97ed3059fefd449fa90167718ef65ef41f04709ef9c985c86e2b35a0572b47a948172cf5b1a5dc23 SHA512 0e43a335c503bd76d41bfe88967b199bcd8c34a44a65293c1460daa342ca1e35f236984af74e30404637e9f6c8428b4cc52fc27501af7d52e1c9e30f1a80d35e
 DIST qsampler-0.9.5.tar.gz 222375 BLAKE2B 0051fc3bee7b3c544336b68ae36acbab265eb5dfd7750d525402d5ffea6ed69481fcccd77ba54df37c4eb2305ad25a6a56181aa4fa12d6a3afa86e012be5cb84 SHA512 2f79e4928ccb2cecafe63fc0b35349ed2ad4b26fe4436bdea0446f1d54a61478dbd5df87445bdd77c5ffd6c5e93e478c90b1576f4c1105276abe34a99b6a30e3
-EBUILD qsampler-0.9.4.ebuild 1137 BLAKE2B 840ed40ce55f34e831abc36184174e7efbfb9cbd811042df77fd2ae7e8691d73f0a05b47ff1fb121634d2e389e05fc888cbd8eb1fc2d4ae534e4e923e31d02fe SHA512 ffe1374211b4aabda05bd4d4fb8b829806759f7ea3873bc8714e71fee7e82d8cf0df200860a50a23e38ca98e702e8474b7c7118b86a07db3a75b085391561614
-EBUILD qsampler-0.9.5.ebuild 1125 BLAKE2B a1c614c76d6bdb057cb7d82c595822b3fc3e0277547e6d49503a45805108c2bd2202677fdfcfc638ca6355160570a5f9795b1e42271fd445a93e7b5d00276ad0 SHA512 622132777a24f8e2ae8a8cf211bb553c895b967c93f8d5533681d35f1662b43b1f8eb087d54b03d85ab1ddbb2bda6b75f80c6bd0fb048c835319da984e3e7874
+EBUILD qsampler-0.9.5.ebuild 1124 BLAKE2B c678830f8637123b03ab9b76ff3011646b3300a96bb97e714aee0371ed138315ae0db880e142706b0e9eaa791f920ac8dfed6b3ce6f3d156e16d2786cee39262 SHA512 a001fd94db2b62d6b8be35058e5a25af2b20e73ce67e073345ac20599e5e2d4f17a92fe6ae4b27d4294e1b512368e585ee87a5576dcbc128fe0a73e988dc60a5
 EBUILD qsampler-9999.ebuild 1066 BLAKE2B fb8717ad1c4fa88cc5a0177a6fff158cfca12c0b5ef717d808ae70b721f733534895dc80ac9f3ae1a0862d44e3e1354535e72fceff18ba62d5d66794177659a2 SHA512 fb773e6378edccd26ad0e6be0deb16481b604432e505ac2581c4cdb5c431aaf70b9055abf5dcb6e5dd84d5e8b9d23467113e8bc7ba118aba40ffe873af3ae57e
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.4.ebuild b/media-sound/qsampler/qsampler-0.9.4.ebuild
deleted file mode 100644
index 6e2be545d90a..000000000000
--- a/media-sound/qsampler/qsampler-0.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +libgig"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/liblscp:=
-	x11-libs/libX11
-	libgig? ( media-libs/libgig:= )
-"
-RDEPEND="${DEPEND}
-	media-sound/linuxsampler
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch"
-)
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qsampler/qsampler-0.9.5.ebuild b/media-sound/qsampler/qsampler-0.9.5.ebuild
index f286d8199e11..04342be82314 100644
--- a/media-sound/qsampler/qsampler-0.9.5.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 7b16925ef630..f8f3250092df 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
-DIST qsynth-0.9.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
-DIST qsynth-0.9.5.tar.gz 331213 BLAKE2B 3973c2ea0599b8bf9f12c3ce1bb7eff00b5d20b4f051ebcb578f556dbfce714cbe0bf77038b553289f27cfedc521bd7e179af652c721375e6bedc4d22ce061d5 SHA512 157e49e8ebfcf550754379c4f2bae221354cffbfe47dcaea747749c00520339f59de5fe7f17e105674ecc6099a98af5f2326d2d258fe359c0c7522366f4267d4
-EBUILD qsynth-0.9.4.ebuild 1399 BLAKE2B 594db33af2cff57be2c05950bdadeae487ac4f931f213d4e528479972d594fdb842353e7248246e178310dd571869ded4587bdbb53cce8ed3cdc14753db01304 SHA512 7d1211bb2c892a6641dc5454be2accc3103be8bd0eefab1186d4aa62f218aee7c810d6f31b2da1458fe0dd56f2193a7641edbc5a170cd58840c6b51e533b6fdc
-EBUILD qsynth-0.9.5.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+DIST qsynth-0.9.6.tar.gz 334419 BLAKE2B daeb82f102a9a754b708b3d3ebc1963a1cf08180ec16971b4b6fb2ea3b35d7f1ca3a663bd9381d4c90052e1c781a6fef64c4cbf0d456f47ac12791da485979ea SHA512 4f596fefda29fad9298539aaf83bdcc699846416d10b1259041a414f3d89ecc76a6cad338742bac8ffa0ed78ff462fe70147e1ef6437c20241598bd7a1d41a84
+EBUILD qsynth-0.9.6.ebuild 1409 BLAKE2B 3da591d928a9b272f52f4cb9a52701df395e07e6a5595b44bae22405c433de7a3d42f7831ad99e9a545e7abb50306bac1ef0f8b9ae170ba5200c29015bad303b SHA512 97c625f61f97787d161296943cd12582919faf498c44a09e43898bad69513dcf3b27bfd286cd0b48693b3aa4b62c4e7acf1dbba20fab8c1c029b7b4554a02310
 EBUILD qsynth-9999.ebuild 1347 BLAKE2B f1e4103cd0ba4bbdb8e8b5e263d00027002501f0d8ad47045956722873959d7c3583bfd9793d44e2dd7f9cc7dcb9926daa7b5e9888dc5646aee72fa304b937a3 SHA512 6079d681effc6f56514d40d79be09c28edf24562e8348467182a06ae06649a3df11303f7832a02de59736993ec173ff9635aa3a7c966facdcaf53d8dbb270aa1
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
deleted file mode 100644
index 42c724b0c2e2..000000000000
--- a/media-sound/qsynth/qsynth-0.9.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.9.5.ebuild b/media-sound/qsynth/qsynth-0.9.6.ebuild
index 802d146a7511..adcfb131ef7b 100644
--- a/media-sound/qsynth/qsynth-0.9.5.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 31ed69a4f88a..1e3fe5ce7cfe 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,3 @@
-DIST qtractor-0.9.24.tar.gz 1960092 BLAKE2B a94822b20544aa0675a4b1208b7f1dcb726973c3ffb4705ef10ef284e21433c2b92747eca189667e2e8d8cec4569421e8492ea330d7b51cb80a6157dffdd8e41 SHA512 b65dc90566023e06edc08a437e3a9f1e8a6e524cb1c9cf78afe90cdc1437ce345b7bb4907619ced7886966923facb7dbe8f22ac23076531e95e149a71286187b
 DIST qtractor-0.9.25.tar.gz 1874329 BLAKE2B 94e653724582ebb6be417574e4bc357b58fe79deca686745607dcdf75f14b813cfccdb1d976dc98f89a19c23450ff52ef6060417ce986882374ba36c8f724a7f SHA512 057add530356bd81c4afc9e5527fbf2f6ec21b2f0455f0f8739efb82730ea834a5d2397683e3622071fa75dde31e9d0a1f36d9381618d4a2604100f1b8dd5aa4
-EBUILD qtractor-0.9.24.ebuild 2443 BLAKE2B f0969d8e2d78258f02d0b1a2292ae49725034e2b12585c1a0e9a4e6fdc15a9888755c719bc028f65761ccc2e6a8a684bdc7ec6f28ed66c8609bdc407b0af0016 SHA512 2b94252e99cc4d48ed123665e609f7ff8cfccbdd0b5a6ac36e05ec5ca277fbf14140fbba0b2dd086b16eeb5e42b9049663edf51f59466adfe9ebe651470dca4d
-EBUILD qtractor-0.9.25.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
+EBUILD qtractor-0.9.25.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.24.ebuild b/media-sound/qtractor/qtractor-0.9.24.ebuild
deleted file mode 100644
index bdc1030a6ddf..000000000000
--- a/media-sound/qtractor/qtractor-0.9.24.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=0
-		-DCONFIG_VST=0
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-0.9.25.ebuild b/media-sound/qtractor/qtractor-0.9.25.ebuild
index f9f6cb16552b..29f0addc226e 100644
--- a/media-sound/qtractor/qtractor-0.9.25.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 57d39e920884..7bdb7c06c2a2 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,7 +1,3 @@
-DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
-DIST schismtracker-20211116.tar.gz 1309344 BLAKE2B 9c6475779cb28955acffa708d8a54b4d6be28d107624a3fc0d3604fc4edbab04cc730da08e78f623e287bcee5ffa337dc56215004aa1a67bc99377c0971cbda1 SHA512 5f666995ac2f0785c3f39077dbd39d6549b9d0d5b9ee85dc72b3bbc1e77d5d7d2465df9f64cff77ee2896c148f8c4166ed6eb88efc1e7121736017bc56a00026
 DIST schismtracker-20220125.tar.gz 1309919 BLAKE2B 54fedd4936e51db248b8b237d53b2338488c8332866a221bdd03bc1598aabca80f644052bdc48d8be2f95ad3b10bc6cfc9065a37b62f09df7c0ef4d304a8adde SHA512 c34979cf6cda75a4e5533631b8134b2994a5491f1182b69bfa6e1c97fd2f2e0dc90d883c6184fb24e68e60351e91ca1a2bcccb3708fc0099d0051452b5a44851
-EBUILD schismtracker-20210525.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
-EBUILD schismtracker-20211116.ebuild 1430 BLAKE2B fc04c0a8c3a4dc72e1f17a56b2661a118f9eb5f55288800ca174de3867d8d3abd4e66dd686d94639635e7ecc5238e1b32580453c45161c83f3d3f6469483d8fe SHA512 a865b8e70e7a5d56ffa05291e999391e059fd6f0060c2a3d666a6f30581ec89af5af4aeb495e85c92f979c66b85e1efdfb2c387b45d59a86d609e5a0832122c1
-EBUILD schismtracker-20220125.ebuild 1432 BLAKE2B 6deb4efd60e063e0cc0dcad049e14d712cbd4919ed5e54eaec283c3c41fdbd8f54adc3c44e78805b3d2491b970b9074bd4017bd05f6664653a70f9e7d94b454e SHA512 d0f4d36af940ab82414fcdce3c6aac8422e3a0a1697c096a86aa2b8e24e6434a20cfa5ac59d39c1ca2099a29b2d6eb8e779a42b7d9b1cbe92ae1a5ba1ce6eec3
+EBUILD schismtracker-20220125.ebuild 1430 BLAKE2B 8c7de70c82a69d2ec57425df0197f13e2a16f01959e86d458f4af586a676975bd9bd81be50b8a190c4be5dd7936790b1221e838ff587ae47354aadd536e24bd7 SHA512 192951e2e5d28c930d7e08fe0056316f0936af63b76f6c41bb095dc353c09869ddebca868db1f07ea2fb46a69d456b244bc5a3285f2143b232884fc21f0ed0a0
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20210525.ebuild b/media-sound/schismtracker/schismtracker-20210525.ebuild
deleted file mode 100644
index 1c2988cf91b2..000000000000
--- a/media-sound/schismtracker/schismtracker-20210525.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20211116.ebuild b/media-sound/schismtracker/schismtracker-20211116.ebuild
deleted file mode 100644
index ea22c48958de..000000000000
--- a/media-sound/schismtracker/schismtracker-20211116.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20220125.ebuild b/media-sound/schismtracker/schismtracker-20220125.ebuild
index c5e2f717127a..3701e3cf3a68 100644
--- a/media-sound/schismtracker/schismtracker-20220125.ebuild
+++ b/media-sound/schismtracker/schismtracker-20220125.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 9c958f564625..7410109479d9 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -7,5 +7,5 @@ AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d6617
 DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d
 DIST snapcast-0.26.0.tar.gz 1537036 BLAKE2B f6ef4393f3601c749140a9505f57515582147aacf25072d9114491aafb108c202c3631142171858d2b8f914be8105bbd9c66054c6d36d0b4a443e5b9a642cf51 SHA512 fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
 EBUILD snapcast-0.25.0-r2.ebuild 1644 BLAKE2B 064b1fa8101911973d6e2ca077982e5dcff7ffc3c7af92b8bd6fd8b1df435e458b7ff46e9a31fa27fb4a1556b0831980845d04644d5fe60e993e2107f5729671 SHA512 403c1b3347f50a49f87b205ecca22f048963b586752adb8eec6e7f0b3ae3d87772e641b681d25e578463f538afabe35480dff03779f052935b2264659120631d
-EBUILD snapcast-0.26.0.ebuild 1565 BLAKE2B 24e27bfb9452a5b6d4492f5909411d99f4f9f97743f5b49c3eaf7a521cdea32df5fe9f422dfcea6c736cee67bf5d27333a47bcaf7dec83a3805045d0322c6a2a SHA512 3804d35d45acc32fc2e28ea9136aabd1d8e7e20770a4b01936d557d9b143aae9a985c8f1e4945fa03fd6f844d936d9a3465b1a1275c4857fe5d01aebc3652ad2
+EBUILD snapcast-0.26.0.ebuild 1570 BLAKE2B 4a2a6854bef2c3cf300cdd5c0d5d65fa01a3aa65dcc90d4021fd7628d344411328da96d8e429cdcafc9ef72470e73d0f22092858a24248f6df9691dca2e8bc3e SHA512 865ce1604a3737eda0d1286bb06650a5f1abd8016f7c41d7ff3a7109aee5b8f9e7e50ebeb4ddc893b417c06c448d3748200fd9babf7717698d1758b4c5aad8a5
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/snapcast-0.26.0.ebuild b/media-sound/snapcast/snapcast-0.26.0.ebuild
index d6c4df9a9d74..8ac5e9b7a1b7 100644
--- a/media-sound/snapcast/snapcast-0.26.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.26.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
 REQUIRED_USE="|| ( server client )"
 
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 16ccb00c61d2..23355a4f506e 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,4 @@
+AUX 3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch 1077 BLAKE2B 813074214af2c8d479eee0044211c38a528e96708a8363e42c1f6b8f14d08e13345cbf9e8e7f7228e8b369044e185aa9763fa4f4c50c38de940a29aa97c90e5f SHA512 730e5e460db085bf7e5eedf2737e4699ff8495c66115d4d96349b36083a1ff1b27b172dbd216f4af0bcf4ada72f77eca41b05c3c3c7935eb0f9fafe9bf2cd03e
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.38.0.ebuild 1364 BLAKE2B c048c8bec57b7878a586f655ae3d086d4294a6f64981dfc36c575c4252c7f4cdf4c61f4efd0e8d7ee1ded51b3dbb086148e0a983e6189a4c5041706fc9cf22cc SHA512 2764efb286b7eb3c5fffb103fd872d5967fa648b954fd57d2e9457608854a68e832c2bfee4e4cdca84c797bea3d00af0ebc892282519f512bd95faaf50a841ca
+EBUILD sound-juicer-3.38.0.ebuild 1450 BLAKE2B 0138bce06c2da0fc2bc95aaa0c11f633ba9d329fc8e264ad7766e2171d875bfd399cc2ea83fb28f440cf1baa5d2d619dbfa1423135cdb4ac213d6f7ab89607d7 SHA512 87f852fadc10c63921ece632d864d86778e1a6c98e2ca5585ecf88d5ddc15849b0d23269f02afa9eeedd017ef0094b3a878488ebc5f90c70fa6db0d2cbcfc59d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch
new file mode 100644
index 000000000000..586fc118921f
--- /dev/null
+++ b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: 'org.gnome.SoundJuicer.desktop.in.in',
+     output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+ 
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+-  'metainfo',
+   input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+   output: 'org.gnome.SoundJuicer.metainfo.xml',
+   po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index 3516bda7b7e5..b2f27d0e4e6a 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="flac vorbis"
 RESTRICT="test" # only does appdata validation, which fails with network-sandbox
 
@@ -47,6 +47,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-drop-unused-argument-for-i18n.merge_file.patch
+)
+
 src_prepare() {
 	# Avoid sandbox failures
 	sed -i -e '/gst_inspect/d' meson.build || die
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index c688f5a3faf1..125d3c3ae336 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
-DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
 DIST strawberry-1.0.1.tar.xz 11191132 BLAKE2B e182ec5db26b22b60e9393b3a418cf44c01b647ab268bafe6d3f098d879817563d68faf7962f0670017f70b7f9f64f3a680056002e7041a2dc956fdc1dceeb95 SHA512 6a668ba6dbdcd5c60e78190c2cc8c04ad4ed920102c7555fdd42f6bf47c5b4004f9580c0f009cade642b404f6884b2b5dac386d326bf6f234403e4ba7612a2bb
-EBUILD strawberry-1.0.0-r3.ebuild 3050 BLAKE2B cc7af3d47d128f8bf0ec448100c413f2a8575e1e777967fd1fbab801393ae22fa984a326215c3d0f7effda78a247e194fc7d1f805524fb6a9dbd79e9a80b8c68 SHA512 05985dafb6975a6a2a94cc91d3a5c19fbd2d883ad79483adb1f9428aced426a37dc1520899f7588edd8717e483a8e804317af2f2587c62e38a1eb10bfb153405
-EBUILD strawberry-1.0.1.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
-EBUILD strawberry-9999.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
+DIST strawberry-1.0.2.tar.xz 11202768 BLAKE2B 555c9492a6c10e9df579d4e9b1c718c722531f21784f68a436d8bd313a6950f0cfc58ded85f9a144de12a73ab07a0cc4d0e028223122dd4fde6604eb92145bd8 SHA512 196be23dde8fee531b2996bc7dacaf5b00dcd3f1aaaeb6630ed2a2fdeb777abb66d6c19928fc157dde7d5bceffdc646ff615a6d52bc0e6ee5ddcc14de6ee7a59
+EBUILD strawberry-1.0.1-r1.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
+EBUILD strawberry-1.0.2.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
+EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.0-r3.ebuild b/media-sound/strawberry/strawberry-1.0.1-r1.ebuild
index ab29187dd035..721ef2158d3d 100644
--- a/media-sound/strawberry/strawberry-1.0.0-r3.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
diff --git a/media-sound/strawberry/strawberry-1.0.1.ebuild b/media-sound/strawberry/strawberry-1.0.2.ebuild
index 3649ac2be758..af868219fe69 100644
--- a/media-sound/strawberry/strawberry-1.0.1.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3649ac2be758..af868219fe69 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 995b1c9dc3bd..b999732981d3 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta67.tar.gz 126459577 BLAKE2B 95081e26f2effde3bc70c1dd1566114f1a7526a7a7faa8959a1f67f716bae4ef12fe026bf57c5423a85c8e743f460741cd2d30105f71d8f54be5b5a2cd2aec0b SHA512 9d2527651f88315b404da474160497cfbb73791ecc11ead59a04b3c47d991723da207434ebbf689baa2288abc669131e063b7ed355da2019d5a1ec54acb04fd4
-EBUILD teamspeak-client-3.5.6-r4.ebuild 3105 BLAKE2B 5be9bb40652e30ebf3975216fad766fc303200edad749fa087113d1aa16cf8b36812b7bb256b509c34528f8b1984d7ed2e4de99f4c25cae290bde5265cdc9e76 SHA512 8597838502d4792e2e2b6fa8281586aec7c763af9374f5ce928c8728d53a99dad3888229dc540e1df43678f81d6b78124c37176586b76e9f64202297210125da
-EBUILD teamspeak-client-5.0.0_beta67.ebuild 2076 BLAKE2B 60f9699640444bf70257b6576cdae0b9ec975481d495fd529d771696f2c74dcd7808f755e52e4a92d740d7454f803c82f3e42d2c5b1aa1672122d0caa7b46280 SHA512 9f26dfedaf9b2c5ece6df780d26efbbde5a2f635eafd769165e33e42f2a78e61c939794b33228a27b6b0a0893d98f236aa1894d9dbee1944620a59644515fd0b
+DIST teamspeak-client-5.0.0_beta68.tar.gz 134468631 BLAKE2B ddc02ec9b5e9b8a3ea3fb629bd39ab4973b6e9cf610d90a37d1ebde08fc893ea087e18efa599eac497771ee31aa7f4e835d6e2b6a07fb536eee150d0747be9d7 SHA512 3c3061b1e42fa7a90ddcadde9d27d543529dea45e4da023bf0519588fc64ff5336f1fe0abdf4f9ab42f255959f766bc6fbfae9d6daa2e3d8b3ba1fc76b74b293
+EBUILD teamspeak-client-3.5.6-r5.ebuild 3105 BLAKE2B 29a4525ca62fc90de46920dd38029198be11bd97e553cfaaa87f5ba79496094d824cbe9742a86faced27f06ca7b34b9ada944f47dd91414956028aa19fac89e4 SHA512 6333998819e86707782c2cf6a68cdc4eaf9c03dfaca2530caf783da46f4885f68aabbb9e1c0fd3802d22ee21d397a0ec1dca5b59939a92819df47c8ed565f89c
+EBUILD teamspeak-client-5.0.0_beta68.ebuild 2075 BLAKE2B cd5eb95b21fd55c8fefa3f24a75764e2c7df52a0017345ba34c4f33fce78b32135b4339b806817c044d26e0f48869be5fa4f47a5af175bd9ff4be600e9f7e6cf SHA512 ecc9335e0b16ae2e4ab451744831f94ebbfd177286a8279852c363d18af4fcd6c456405b1a0c6bb4773a6494faa140cb5efacbbbd51fb489cfb97e1927b29cde
 MISC metadata.xml 745 BLAKE2B cc8da59b725c8cc083242d9d73524c83feb0087781f67c2dd9ff29964aa044002081f2bf275ea043dc4e0afecbcd755d6dbcd91e9cf507515adbc1a6a3fdf9ab SHA512 b98d58cb14675ef68ba2e3c76dfec1a463359a84f0d3cdc1a5c225a1ee595d967aabc10c86cded433a932ab0770a34fe98f0307c05369025bfa6401e7c9e0be6
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r5.ebuild
index 151c902c854a..101a018b22a3 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="${PV/_/-}"
+
 inherit desktop toolchain-funcs unpacker xdg-utils
 
 DESCRIPTION="A client software for quality voice communication via the internet"
@@ -12,6 +13,7 @@ SRC_URI="
 	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
 	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
 "
+S="${WORKDIR}"
 
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
@@ -43,8 +45,6 @@ RDEPEND="
 	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/teamspeak3-client/libc++.so.1
 	opt/teamspeak3-client/libc++abi.so.1
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta67.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta68.ebuild
index 5b5951a987f8..03442d215256 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta67.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,6 +8,7 @@ inherit desktop xdg-utils
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
 SRC_URI="https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
 
 KEYWORDS=""
 LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
@@ -45,8 +46,6 @@ RDEPEND="
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/teamspeak5-client/chrome-sandbox
 	opt/teamspeak5-client/hotkey_helper
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 1ad707ab6f3c..784a2ecba5a1 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -7,5 +7,5 @@ AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea984
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.13.6.tar.bz2 9948972 BLAKE2B 397e96751e6688b5579ff7828e4998e3b26183b0b10980e89748d51207428059e7d8cfa6f2f6fb961b77f735f61e1ba00ac13a077c76b5d22a7b2abb28d67e48 SHA512 dc007cdc924fd284da4a206cf615816b53c2f03ccb2573a29aa2bce6874e09ce5764a3953f8e84de8a3cc02aee306b1505d8c7edf8d48713bbf5f172c3be3422
 DIST teamspeak3-server_linux_x86-3.13.6.tar.bz2 9785491 BLAKE2B f0d196a72e9a4283006c4dfd9a1d86e96a3b435d8bf14dfca178ea0240e94b88bcf3b9e20b6c99638e04019065fa79d28ac2d9ad452e306c4c27966e32464c69 SHA512 ef124964590c106bacd3bc98847a5e8f64fbbf69ccb2a216f9af6548f5f2d200c0bd307d283f48cb08c254fddb92fe03f6cff2c3c87e7ca593edf3023b053bee
-EBUILD teamspeak-server-3.13.6.ebuild 3510 BLAKE2B 8b7c969ca30aa7683c506f730e135ba127ecb6b7d0eac50dcd7b6286e445c8bdeabacf96cd79cb1a591e00aa29193eb29d98e7816da386c426afe97309166a44 SHA512 a6d75c808865c5f8a48ce3a17671ff242b34e82bf83672be8dc779945db8f02816a0d55c28900b1a96e77e1e067db0c375bd9d6082d21b3ba8b1c927148fa551
+EBUILD teamspeak-server-3.13.6-r1.ebuild 3510 BLAKE2B 1cc38840e47143772fe861213a2600cc1c2d0cf49573f33dd17709a0cac406d495b2ee3b20b21d726d12b16fd1c8e90d43a50f7bf7d716b0a286a15531bc23bd SHA512 923e0a4e1f22b74d4a9f0f7d5abd430b046086c8cb129c7ff1e754781d7b20ace30836a7913b95ffc6890ff5317d4021f0d182edf7494bff8d3ea37a790188b2
 MISC metadata.xml 704 BLAKE2B 68e04b7596542e2549233e228e8db2bf5943c2b859133b55a41800ef7048730e5298ee5cc5d034e8ec2f4187230f1bf470c2195d2c88b451faaf4ae0b6f53128 SHA512 f517abc5ee9903df810da51cd0fa86fd8c4b9bfcae05816d6d2596e645a59a1596007da5634ce33d3cb7efcf252b238dc197da0dc992b06654b17f12a1f5b239
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.6.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild
index 04a06cc4ff6e..689e764c78d3 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.6.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 13eb943100b0..7b7109415c41 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -3,5 +3,5 @@ AUX toolame-02l-fno-common.patch 389 BLAKE2B 2dc0b94bb4fcd1b7692d6922dd62b7a4353
 AUX toolame-02l-uint.patch 950 BLAKE2B 6f689e4ff7eb5aa8b6f9f5603813882e2a2fe80b4b37b2a88876b770f6d25c40437b378c7a5df03a57e2f49ba9f7460e7268c90af33a878104edff26be14c2b9 SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d
 AUX toolame-02l-uint32_t.patch 624 BLAKE2B 9a07c69bc91f4a90c6169d5c820ceda37dcbad90cb964025c786e8b8d4081434f76f8d0fdf2532abba6ab0a88ee07e07266a9fb0eab8617a0f76bc3c753566aa SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05
 DIST toolame-02l.tgz 127493 BLAKE2B eaa20e1bdc966003401b6fe720bcb6d81aa1c9bf3f8a7aa4f05732ca3c43a71cc55f979a65536197e236e536ada445cfb0c31e3296307100f6d43f64cfb5d16a SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e
-EBUILD toolame-02l-r4.ebuild 682 BLAKE2B 5802aabff25ae0ebe2697977175a217d2fd2a1cc05dce5cba702da80aee3e3be8b4afbdea8e11a17e9617792aac169f56e0cda9d62aa15040ba27316e5edc938 SHA512 deb29c9ab552ee7333d7a4011a9d80d3ebae1d1120f71d21aa1144e004aa79e59ff100cca6e55bd3777c5fc6117fbf2df021895a8208e7159ec0ba777b895df8
+EBUILD toolame-02l-r4.ebuild 689 BLAKE2B 0ed2eca51bd1be13adb5ef9baecf451e8e132d165369a48919ce7b938b663e73a2fd2958ed576bdf7da3ac9d680885385b017f580a8c9666ae02f8cff8e92421 SHA512 4a3bb4483a872a650217e0052315e7e5f6f9e48262f154f7e2959f34f5fb5046080a98f16134d343c9a08aa9d62bb21c1bb4687fe5a4f9595f6e31653631e130
 MISC metadata.xml 331 BLAKE2B fae7c17b836e5270b7481731de2b84f9949b9849ac1ae44cc4f2a32254ee5119cf9b28536c9d9be5835621db0490d0d186623a8290133424cdeee236bbbaa5dd SHA512 2279cc7dfa1b0f02e498d335fc396f3e3c61d1ece8ca65aa8bc5eecfa4920c8a12287c160b7f1f032f1b4ded2ab4732ecd247a65b9b07b9bbbd93bfa5a93fa74
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index f18124de23e0..4c3615817535 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 99eacc2ab081..d760fcfdfa27 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,3 +1,4 @@
+AUX umurmur-0.2.20-openssl3.patch 246 BLAKE2B b14bf838f72d901f2a6f99b6e33447e5a7dd51c767a88f90842d5f5aa6495cd86793b3a5d7a8f03e067e4784e89aa8f4ceaf52cd3e70180f9f4884b6893e8733 SHA512 0a12c34c870c050f46790fb387bd6b5313f0c0cf98dd5232d960963a9c1b88d6314b69c96b6c148c9f6c8dc5bece2d2fc3fa4a221cd966a0f1c7efbc76978171
 AUX umurmur.conf 1637 BLAKE2B ba9519dc2a09512c3b8398009c1ee41a8d49f1a18de5800dd53ad38e927c21dd58790504b4434b394ec3fa1c35614f49c512db55bde01e2956f90564b6d96ba5 SHA512 563573c405013bdf9d76003d68eb9619064659dc1e1b8b1fde24c0e587a807202bf62efe7f227cc95ff8b6db68a2ace3f0f359cef74c1bf5f1582815dd623501
 AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc4507528370b1b77d5c3335f61e0c0ab6cc28bb8530aa9876345bb9ff01bdb1db56f0d0e44b09ef7d6a12eff SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
@@ -7,6 +8,6 @@ DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5
 DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
 EBUILD umurmur-0.2.17-r4.ebuild 2458 BLAKE2B f1d911fc058436e206787a66db17628553a189a5d481821f503f7eb1bf24948f3fe4c21cb903583326c94ff61a12d04dd490be8396488c732d1fd95a9b9ec46a SHA512 6f41066f29204504cbd530bac321f7cbc263e9ac15d7abc33a5145026807300db11a852902bf3a6b039a4c9950df3bf7a1606085ebbca4197cdffeff63e7b30f
 EBUILD umurmur-0.2.19.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
-EBUILD umurmur-0.2.20.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
+EBUILD umurmur-0.2.20.ebuild 2524 BLAKE2B 62d098501b0363cea6fba3bbbb66baad7258fd440abe6d0b2b59c3f29f87ee979cd76188ce61e5e8d7be15a21a2842257c8cc7ea35ae43336e8082c96895a288 SHA512 117bee1f600a4533f4f56541b6bd5c1235c7749fbe8436de54a4eddb46abcbbb46b03f9e5353115aa06b177ae13ae4ca188e7bd31ed0ea49fdb2010db2ef28b0
 EBUILD umurmur-9999.ebuild 2460 BLAKE2B 343e6d943fb866fb6fa2d9937cb4af430e2805f4b2a4ef8271b1409640aa88d9591ceae172b737532faedfc720c30ba180571f9936e6e3109bd5ed6378ff1322 SHA512 8337bf02e5591f36ce388ebc93336aa1a76732f528c2d7ab57bb9443c950ca174f7ff466a022903790ecf9b695a9e9cbfa80d60d6f103048b079109d59b3b5ca
 MISC metadata.xml 1092 BLAKE2B 0cfdd9dcce2501b5c317c854576f1d5a62a5d145caf7d21f27e94efc527e13f7963cb6062d75e3cf4ac3308c5159cbbbc2b460b6ac3f5d648f864750e56d1242 SHA512 0fc12dfdf74591f0174d0bc9a2c1ca3fe7bbb310d456a63b1e1cb78107c13384f30d62b5abd6f38acaf840a24da8f331c3437774d3ff6c5add9fc0e0ef771ff8
diff --git a/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch b/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
new file mode 100644
index 000000000000..ad7cc1177874
--- /dev/null
+++ b/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
@@ -0,0 +1,11 @@
+--- umurmur-0.2.20/src/ssli_openssl.c
++++ umurmur-0.2.20/src/ssli_openssl.c
+@@ -142,8 +142,6 @@
+ 	
+ 	Log_info("Generating new server certificate.");
+ 	
+-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+-	
+ 	x509 = X509_new();
+ 	if (!x509)
+ 		goto err_out;
diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild
index ca21485b1db5..677e6fa4f97a 100644
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,10 @@ DOC_CONTENTS="
 	may want to review it. See also\n
 	https://github.com/umurmur/umurmur/wiki/Configuration "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
+)
+
 S="${WORKDIR}/${P/_}"
 
 get_ssl_impl() {
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index ef7fcee39be2..46ff65f2ef18 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,4 +1,6 @@
 AUX wavbreaker-0.13-QA-desktop-file.patch 323 BLAKE2B 7a4414df32591399f7fe99a2f15e2a8d78a4da6ac435e69943cfa4b50bad5f41842a386f2de6ab048bdc9bd1cac0f26fa68b95923530cb140cb2a58e4fd7019f SHA512 a167b438504b7b88bc538ca45fd700ee5072e671c20830a72749f0bb07d1ac1430a438c17c5e7f1e3cc3ff6fee208c976e273d8600d528540742ecb7197b09bc
 DIST wavbreaker-0.13.tar.gz 366998 BLAKE2B 4f863699d6e0c5573d4af615a0ae8cd1d4d1b2fc74cc060ab8d0fb298e57812a8675b641bc69a45ae1015b3e6c0731a228aee773caaeaed75cafedf065dbbff0 SHA512 3585bdc6eb937d02ff8287c370a2f480dbdedfc6304505ee45943ed34e4302af480bdea511f7d4fb6778b9f5b25a435b533392eedac9869c650202645a64c574
+DIST wavbreaker-0.14.tar.gz 368275 BLAKE2B 0e09f1c82f0a790042a35eb44cebde3b06655d9c2a9f46fe1b426e2ca14a87178cf5cae3b4011448d98c82a4998110cf34f6c4f0eb5e028ee791b12d75789a00 SHA512 131833d40db34e3dd98b71cc68662f7852cc7f184e033fbefac03e34f2a3ed8c838d95bea9afab55c6453f837ac97c9be54088db2ba7e3b918e1801fdfe1d912
 EBUILD wavbreaker-0.13.ebuild 645 BLAKE2B 72c73afc027d5465fbc67619e499694d53ba8b6d87d262519b614ca9b8f398ad576f2713200e3ba43d6236d00c663f3a87e2292cc0dcd826c891f8cfaa5f0dc6 SHA512 61939436c0305cdf02acbdcf2820a92a64a352c0fce22088d4d6558525485fafe072448bf2176e035a57b471dcf8f1ed534015429224090d963e59ed22e844d5
+EBUILD wavbreaker-0.14.ebuild 657 BLAKE2B f6f11e82d132746b20bfe2c22482ad7e32525dd6ae08b430a4f55c72c16401ed4c0d17bb4f1333784936a40419a85dcb71b848c3a30f7a493908f3ce00b812d5 SHA512 9c80ce6c1f45b716ae497eefa76a72a7aba86965d81238ff5e375d40af9ea69b9bda8fe110d143b89e3ad9da48296639b4f5bd2b91c10f7b983b478662d9ac53
 MISC metadata.xml 388 BLAKE2B 2b0d9ce6ec06d516b3ecb70ad7ba91860ba9b17dce5788873ed2fb00ed547a9443cba4d7b428b49c1da0dc1abfc687f29540ced700066b573ed4dae399a77fe8 SHA512 04f2b747b93768a48a1987b1c2453fda99fbd6dd2a8f6f88bd51e4019cea4030d866a3f287bb1202234f163e1cd6f9e56bcc6d25414520915e6659ad4728d652
diff --git a/media-sound/wavbreaker/wavbreaker-0.14.ebuild b/media-sound/wavbreaker/wavbreaker-0.14.ebuild
new file mode 100644
index 000000000000..3a540a0f0871
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
+HOMEPAGE="https://wavbreaker.sourceforge.io/ https://github.com/thp/wavbreaker"
+SRC_URI="https://github.com/thp/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mp3"
+
+RDEPEND="
+	dev-libs/glib
+	media-libs/libao
+	x11-libs/gtk+:3
+	mp3? ( media-sound/mpg123 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use mp3)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 2979c112d919..ed273f4713a7 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,3 +1,3 @@
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
-EBUILD wavpack-5.4.0.ebuild 856 BLAKE2B c5813611cbddf8acdac79331718ea838a3d463451bee28c0a975c54416deb6837ad70801991bb25e79418205e46ecd2398235ba7f9d3dd43aa90dd9535be9705 SHA512 37b06e040440e500037e178084c29d873a63254692939be0d8001d514c80f66960e699664f2be5707900c701d5b7c192779b36da714f8228c34c9923c62ac27b
+EBUILD wavpack-5.4.0.ebuild 846 BLAKE2B 94ced432ab59947059e929f939a2a2ff4d7d06221dbbeb5ba5c6c6c5c2d01864d43647f3bf716c30b179518f4fb01d2cee74283791a2dcf7475e558180ce13a6 SHA512 4b0bdeadd930ba09dcfb105a1fb74fddee021038c980fab742525af8d2e5b22260e88d06a1d69558611b51f46935a64c0171ce28483e6f8c9bf17965129eed82
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index c26059b952b0..7734a2145702 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Hybrid lossless audio compression tools"
 HOMEPAGE="https://www.wavpack.com/"
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index c410b2dc0480..ed2f527b0f37 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -2,8 +2,10 @@ AUX xmms2-0.8-rtvg.patch 1358 BLAKE2B 1544ae0719b02ad94c19239d7ad3b16d3df3a29e1a
 AUX xmms2-0.8_p20161122-cpp-client.patch 624 BLAKE2B fd08746e4ce3c83a1cfed7a6794e169f435da2a1fdf639ae2d948109a22526a5a68f03f1dfabeaabc022dda8b403d08b2cf3c6944429b1b748ee75ac69840caf SHA512 19af5f465c1e48a9ca780b6cad1348eb6fc315b05923f0d4ded7c6972e2cbb3213ad8adf994e13c80c1d69c47bee97660fccad85c9b98ab9752a0ff9f930ea7c
 AUX xmms2-0.8_p20161122-faad.patch 629 BLAKE2B e2dc8964d1002ff55be736e6b0370f946e9d8dbdeaab8f9f50bebce210b431894174e80fbba8bc77c79f048c69d8ece85585395840a09fce6b58fdaaf404494f SHA512 7a40d77cefcc483e6ee24a672b30ddd9f763e642bbac6baf88c315ea4a1aea9c87212627fd641f6107f76ab3185a762129ed02c2f090b2264f89016fe4ff2d5f
 AUX xmms2-0.8_p20161122-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e776080674da5781d122f988ddb719ccdfb1da95fb632242004096a79861c0a9f0a3a49734a86bd8ac4c0541d3b3742cd722c8d44 SHA512 14b46640163f1d651e310d1bf08ec190a7449615c574952c19fa2c7f86215d83d3ee6d6cbe0f665a5fdd44ec44e44bc339a480ce753f16f2b49a4206dde1c12b
+AUX xmms2-0.8_p20201016-ffmpeg5.patch 3705 BLAKE2B 9726bb58d45e71d72386bb76dabb9fc22a9a9dc10ed587406754ad1c524a2867215fcd0cc06884a7a8e2bdb39a79e3b2ebe465cbb54d49cacb5aa6a98760be63 SHA512 b9e02481914e8a29662358b71cd05145d942cdaed62ef357669f3d31d2579f1e7e5c5b9f21534e26beaa1dfc1b9396f3ab696bcb64a6bc706f5a300fc5ea0467
 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
 EBUILD xmms2-0.8_p20201016-r1.ebuild 5876 BLAKE2B c200ded0045be9be4ce10c1434f6f1bc104344f893e62187159bc77f23cc745c30b3f45ed828e7e2814b70ed7b6a482bcbdb00d22f963aa283c40970747c3954 SHA512 0ad122574b7fcb2ad60c5ee0a898612a0beef3d661c7267336d52a589dab269dccfcdeb00c2cfd153113f72455aa1d8f9dddd6d9f7e3ccff13b40768d60ea4cd
+EBUILD xmms2-0.8_p20201016-r2.ebuild 5913 BLAKE2B eff55cef1c431aa8ca7ae3ebd6f7638a8485cd05b2fef7ecc6fda38d6282908b8edec47d7269ff15ae1d85870480298713bde097eef5655c77f72c721d3d8232 SHA512 fb84b90330d0aac147b6c68d2a1fbd86e56128f503a28ed47c18e717f6f6b514d79e035568fd623751c64953157891f6c44f0cac771b8e450d50eb44e6547f0d
 MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
new file mode 100644
index 000000000000..14f999643241
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
@@ -0,0 +1,125 @@
+Lazy migration from audio4 that's missing in ffmpeg5, may not be
+entirely right but tested to play at least .tta/.wma properly.
+
+Bug: https://bugs.gentoo.org/834398
+Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -32,4 +32,5 @@
+ typedef struct {
+ 	AVCodecContext *codecctx;
++	AVPacket packet;
+ 
+ 	guchar *buffer;
+@@ -150,4 +151,5 @@
+ 	data->buffer_size = AVCODEC_BUFFER_SIZE;
+ 	data->codecctx = NULL;
++	data->packet.size = 0;
+ 
+ 	data->read_out_frame = av_frame_alloc ();
+@@ -155,6 +157,4 @@
+ 	xmms_xform_private_data_set (xform, data);
+ 
+-	avcodec_register_all ();
+-
+ 	mimetype = xmms_xform_indata_get_str (xform,
+ 	                                      XMMS_STREAM_TYPE_MIMETYPE);
+@@ -467,43 +467,35 @@
+ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
+ {
+-	int got_frame = 0;
+-	gint bytes_read = 0;
+-	AVPacket packet;
++	int rc = 0;
+ 
+-	av_init_packet (&packet);
+-	packet.data = data->buffer;
+-	packet.size = data->buffer_length;
+-
+-	/* clear buffers and reset fields to defaults */
+-	av_frame_unref (data->read_out_frame);
+-
+-	bytes_read = avcodec_decode_audio4 (
+-		data->codecctx, data->read_out_frame, &got_frame, &packet);
+-
+-	/* The DTS decoder of ffmpeg is buggy and always returns
+-	 * the input buffer length, get frame length from header */
+-	/* FIXME: Is ^^^^ still true? */
+-	if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
+-		bytes_read = ((int)data->buffer[5] << 12) |
+-		             ((int)data->buffer[6] << 4) |
+-		             ((int)data->buffer[7] >> 4);
+-		bytes_read = (bytes_read & 0x3fff) + 1;
++	if (data->packet.size == 0) {
++		av_init_packet (&data->packet);
++		data->packet.data = data->buffer;
++		data->packet.size = data->buffer_length;
++
++		rc = avcodec_send_packet(data->codecctx, &data->packet);
++		if (rc == AVERROR_EOF)
++			rc = 0;
++	}
++
++	if (rc == 0) {
++		rc = avcodec_receive_frame(data->codecctx, data->read_out_frame);
++		if (rc < 0) {
++			data->packet.size = 0;
++			data->buffer_length = 0;
++			if (rc == AVERROR(EAGAIN)) rc = 0;
++			else if (rc == AVERROR_EOF) rc = 1;
++		}
++		else
++			rc = 1;
+ 	}
+ 
+-	if (bytes_read < 0 || bytes_read > data->buffer_length) {
++	if (rc < 0) {
++		data->packet.size = 0;
+ 		XMMS_DBG ("Error decoding data!");
+ 		return -1;
+ 	}
+ 
+-	if (bytes_read < data->buffer_length) {
+-		data->buffer_length -= bytes_read;
+-		g_memmove (data->buffer,
+-		           data->buffer + bytes_read,
+-		           data->buffer_length);
+-	} else {
+-		data->buffer_length = 0;
+-	}
+-
+-	return got_frame ? 1 : 0;
++	return rc;
+ }
+ 
+--- a/src/plugins/avcodec/wscript
++++ b/src/plugins/avcodec/wscript
+@@ -2,5 +2,5 @@
+ 
+ ## Code fragments for configuration
+-avcodec_decode_audio4_fragment = """
++avcodec_send_packet_fragment = """
+ #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+ # include "libavcodec/avcodec.h"
+@@ -10,9 +10,7 @@
+ int main(void) {
+     AVCodecContext *ctx;
+-    AVFrame *frame;
+-    int got_frame;
+     AVPacket *pkt;
+ 
+-    avcodec_decode_audio4 (ctx, frame, &got_frame, pkt);
++    avcodec_send_packet (ctx, pkt);
+ 
+     return 0;
+@@ -44,7 +42,7 @@
+     # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
+     # * libav: commit 0eea212, lavc 53.25.0, release 0.8
+-    conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
+-                  uselib_store="avcodec_decode_audio4",
+-                  msg="Checking for function avcodec_decode_audio4", mandatory=True)
++    conf.check_cc(fragment=avcodec_send_packet_fragment, uselib="avcodec",
++                  uselib_store="avcodec_send_packet",
++                  msg="Checking for function avcodec_send_packet", mandatory=True)
+ 
+     # non-mandatory function avcodec_free_frame since
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
new file mode 100644
index 000000000000..7d7a6a230952
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
+
+XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb"
+S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59"
+WAF_VER="2.0.22"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
+HOMEPAGE="https://github.com/XMMS2"
+SRC_URI="
+	https://github.com/xmms2/xmms2-devel/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz
+	https://waf.io/waf-${WAF_VER}.tar.bz2"
+S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~riscv ~x86"
+
+# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
+# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
+XMMS2_OPTIONALS=(
+	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
+	:nycli perl :pixmaps python server:s4 test:tests
+	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore
+)
+XMMS2_PLUGINS=(
+	aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer
+	ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
+	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug
+	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls
+	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
+	:wave wavpack :xml xml:rss,xspf zeroconf:daap
+	# disabled: coreaudio,gvfs,nms,sc68,sun,waveout
+)
+
+IUSE="
+	${XMMS2_OPTIONALS[@]%:*}
+	${XMMS2_PLUGINS[@]%:*}
+	+server valgrind"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test ) !server? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	sys-libs/readline:=
+	server? (
+		aac? ( media-libs/faad2 )
+		airplay? ( dev-libs/openssl:= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? (
+			dev-libs/libcdio-paranoia:=
+			dev-libs/libcdio:=
+			media-libs/libdiscid
+		)
+		curl? ( net-misc/curl )
+		ffmpeg? ( media-video/ffmpeg:= )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth:= )
+		gme? ( media-libs/game-music-emu )
+		ices? (
+			media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis
+		)
+		jack? ( virtual/jack )
+		mac? ( media-sound/mac )
+		mad? ( media-libs/libmad )
+		mms? (
+			media-libs/libmms
+			media-video/ffmpeg:=
+		)
+		modplug? ( media-libs/libmodplug )
+		mp3? ( media-sound/mpg123 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? (
+			dev-libs/expat
+			media-libs/libofa
+			sci-libs/fftw:3.0=
+		)
+		opus? (
+			media-libs/libogg
+			media-libs/opus
+			media-libs/opusfile
+		)
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( net-fs/samba )
+		sid? ( media-libs/libsidplay:2 )
+		sndfile? ( media-libs/libsndfile )
+		speex? (
+			media-libs/libogg
+			media-libs/speex
+		)
+		tremor? ( media-libs/tremor )
+		vocoder? (
+			media-libs/libsamplerate
+			sci-libs/fftw:3.0=
+		)
+		vorbis? ( media-libs/libvorbis )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? (
+			net-dns/avahi[mdnsresponder-compat]
+			net-misc/curl
+		)
+	)
+	python? ( virtual/libcrypt:= )"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/glib-perl
+		virtual/perl-Carp
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	cxx? ( dev-libs/boost )
+	test? ( dev-util/cunit )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	perl? (	dev-perl/Pod-Parser )
+	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-rtvg.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-faad.patch
+	"${FILESDIR}"/${P}-ffmpeg5.patch
+)
+
+src_prepare() {
+	rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die
+	mv ../waf-${WAF_VER}/waf{,lib} . || die
+
+	default
+
+	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
+		-i src/plugins/fluidsynth/fluidsynth.c || die
+}
+
+src_configure() {
+	local waf=(
+		./waf configure
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--boost-includes="${ESYSROOT}"/usr/include # needed for prefix
+		--with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})"
+		--with-target-platform="${CHOST}"
+	)
+
+	xmms2_flag() {
+		local IFS=:
+		set -- ${1#+}
+
+		if [[ ${1} ]]; then
+			usev ${1} ,${2:-${1}}
+		else
+			echo ,${2}
+		fi
+	}
+
+	local flag optionals plugins
+
+	if use server; then
+		for flag in "${XMMS2_PLUGINS[@]}"; do
+			plugins+=$(xmms2_flag ${flag})
+		done
+	else
+		waf+=( --without-xmms2d )
+	fi
+
+	for flag in "${XMMS2_OPTIONALS[@]}"; do
+		optionals+=$(xmms2_flag ${flag})
+	done
+
+	waf+=(
+		# pass even if empty to avoid automagic
+		--with-optionals=${optionals:1}
+		--with-plugins=${plugins:1}
+	)
+
+	if use perl; then
+		perl_set_version
+		waf+=( --with-perl-archdir="${ARCH_LIB}" )
+	fi
+
+	if use valgrind; then
+		if valgrind true &>/dev/null; then
+			waf+=( --with-valgrind )
+		else
+			ewarn "valgrind was disabled due to failing a basic sanity check" #807271
+		fi
+	fi
+
+	tc-export AR CC CXX
+
+	echo "${waf[*]}"
+	"${waf[@]}" || die
+}
+
+src_compile() {
+	./waf build -j$(makeopts_jobs) --verbose --notests || die
+}
+
+src_test() {
+	./waf --alltests || die
+}
+
+src_install() {
+	./waf install --destdir="${D}" --without-ldconfig --notests || die
+
+	einstalldocs
+
+	use python && python_optimize
+
+	# to avoid editing waftools/man.py (use find given not always installed)
+	find "${ED}" -name '*.gz' -exec gzip -d {} + || die
+}
+
+pkg_postinst() {
+	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /media-sound
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)