gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-sound
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
232 files changed, 4945 insertions, 2480 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bfd439d716eb..1dc13b51d18a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/SmarTagger/Manifest b/media-sound/SmarTagger/Manifest
index e7a6d30974a8..f8d7ef5e529e 100644
--- a/media-sound/SmarTagger/Manifest
+++ b/media-sound/SmarTagger/Manifest
@@ -1,4 +1,4 @@
 AUX SmarTagger-0.1-gentoo.patch 343 BLAKE2B 7b7881713fd0cebb49779ab5c40a69f63b420ae5ae2b9686050e75c52a37ea931cd169aed1765208adc1e05b7edfc21fcd635e90317843fbc3e21b363dae3011 SHA512 0ff0e4bfbb0d834d767ad0c2c5ab45d65994bcea4bb31f601a23f2aa6659749a813e29c8fab0d3ccabf76a3bc38beb38018dbe4598a6ec88bbb3eb57bdbc5c87
 DIST SmarTagger-0.1.tar.gz 3980 BLAKE2B 7c19153c23419c4c2de914802f5f382e0bebec88dd78828a854d96e1fbcc433bb69bcfe2dbbda9d2048cf7e9af4e601af4199c86748accdb8900d49e09963ed7 SHA512 d2278e3cfe32c37200e6b58c0827b40b9e3163bbe7fd7e5f929acb9c7d5e43ea9de24999b52c43cb7906c7f381606028219e40c8e02613b22b67970d47e3b22e
 EBUILD SmarTagger-0.1-r3.ebuild 578 BLAKE2B e9c37444e377f932049cbae25eceb11237dd94016539067744c7ac38e675d6fd8a75002e55a43ae985abc38c96c0bbd78714e9a551589c4f4342e19ab3c30993 SHA512 bdd3d13c3c510c805182b64fa1e0486f2427a31cb91d863b7dc56bd6c909301ff6aa6a2fe6680c666dc1f9823282f792ce2353b9c497eddde6a54ee0bca06802
-MISC metadata.xml 332 BLAKE2B 2bdb6962be30fbbcdc5ca14e7b815c374eb93db453f32a9f4f0a6ca1cb57c55ae85600efdc89d8124b1f65be3cc5cd8d149a813166f5f4b9f3c20d476e4597d9 SHA512 43ba730573c1647aaf6e52e7e6f5b632d14c9a473911d09449285d56baeb1c00b4be0904400ca0c467d3856f6778dd6b3ebb163dbb4b4cc8a4f2646b74048f25
+MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
index 2bfbd694bd58..93423219a5bc 100644
--- a/media-sound/SmarTagger/metadata.xml
+++ b/media-sound/SmarTagger/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">smartagger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 2cd96cc9daeb..65a3da84955c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,7 @@
-DIST abcMIDI-2022.04.06.zip 609956 BLAKE2B c140bcacc94d8e6193ba6220c1747861a11d79e5b394ff5826edfdb3029e57b3a6d9443a557baf6279d4a7c9e6488dcb2c8d0e6a05858046be53fc52be2640bd SHA512 06d4ddfc4f7bbc1906604629e3b2ca7ebf8d2f89edb478d2068b2ba4efab6ff1d96aeebd6344ea2ebc7a92c23cf49d08b40bc97c47458e526d505313fb52a527
-DIST abcMIDI-2022.04.28.zip 610114 BLAKE2B 73ef4569bf58cf45c5b8972150d7e81d84c88b4ca05d616a06df9585c5fca1ca73d635699db323583402113c1b783979d1d34719ae107700843cfc42ee209268 SHA512 1e17d493597bb2d22b491587c0bbb86e04aed8ea2af2f426e48c68871ec0fcd1180e78f0ccc44d9bd63c5d98cbb22db5a9aa8b66a15bfcc35aa7e9770c813350
-DIST abcMIDI-2022.05.05.zip 610217 BLAKE2B 241d9ae42defef6345b143c59140f1cee844c19608b6a897b020f0a54c915d45edaf09ef75e1e01b1a932a6e82934aaa82d1e82c74c61d23e1c372418726bff8 SHA512 7f8141792e67e5ed22e84d35f0f9894c5ecba74817ac9c23323d5e7777bad0a3fc477daf43bf515e243aad46476c3a9597d8e9b4e0e865210b5baad0a1ebc6d3
-EBUILD abcmidi-2022.04.06.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.04.28.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
-EBUILD abcmidi-2022.05.05.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+DIST abcMIDI-2022.05.20.zip 611325 BLAKE2B 1fd9c786ec0a7b3558f71502ceda261419b6883dffe524de6f5203188f5ee618d52ad1cba0662d28a3ba4c252702abf4d5a2e4271b951916e9164c9d573b28ff SHA512 f6e8212c4bc96fc62f95c868f65bfd40208f2aeb5d4913fe1b4d85331dae69a763cfc3db9f446018dd0b43afaec496b6572ea0c46ebeac563902899b71f24645
+DIST abcMIDI-2022.06.07.zip 611323 BLAKE2B 3b0a9a1bbf0265c8c2848aff267acf3fa0b98a6fe24b5878e70db5da3e892c8658ff236511a5524cf5dcf5217bf09ccb762102539cdd12a7d23c6573bd0ed14d SHA512 1e4daf647238e28b3c4c644dfcfbffdacd0e5b9e007a3a9cb8393ba879690c74d5ea2970254d5d3f19a68c5742de80bf5aa387a7f9aa241abec2e952f1bdc0c8
+DIST abcMIDI-2022.06.14.zip 612729 BLAKE2B f9644ea59bb43d50a39f60f31f440e9d4e425701c71877fb812adeaa0757da37d2aabab5c2b3593f38a5a135adc0925545337860452317e558cbfb037c95d4af SHA512 4e8a9a770925e166dabdbf459227b26373c33ed0ec356d093d8f4de457cc9034cd9237d445f31883e7c3974c3fd4b69a6f6fb156b26e03483bcd70793e7457ec
+EBUILD abcmidi-2022.05.20.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
+EBUILD abcmidi-2022.06.07.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.06.14.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.04.06.ebuild b/media-sound/abcmidi/abcmidi-2022.05.20.ebuild
index 3b11050a4f44..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.04.06.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.05.20.ebuild
diff --git a/media-sound/abcmidi/abcmidi-2022.04.28.ebuild b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
index 11f547f4cb8e..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2022.04.28.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
diff --git a/media-sound/abcmidi/abcmidi-2022.05.05.ebuild b/media-sound/abcmidi/abcmidi-2022.06.14.ebuild
index 11f547f4cb8e..11f547f4cb8e 100644
--- a/media-sound/abcmidi/abcmidi-2022.05.05.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.06.14.ebuild
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index c6b2e9a12818..1d1e11d54017 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,6 +1,4 @@
 AUX aeolus-0.9.9-fix-Makefile.patch 612 BLAKE2B d036968f8cefc735d993f4d4a5cb8f177cd026b72cac830c505880e9b09351100705668084b937603a6ef4dd85a39137284fc7f01cfdd7db948c33a733a134ce SHA512 1847ab48321d1d478ec4842fc96f09dcea57799c630f7b49edac0297d7a5c7c21fcd699d3a001801d319e9a4520ad1c6f79494a2dbc91f7ba9a34a38cdcfe01f
 DIST aeolus-0.10.4.tar.bz2 66492 BLAKE2B 7a0861cacb1c8cb4c02f081883c0f61de3cfbea1da8716dba394b63cac325795d51cdf935c3f6cc242ed68d0ccc474d7c424eaf93d7084fe8e8af20fe4b16355 SHA512 4ef84ce7ca28c109ebc1327d3ecd18b1757617eca87313f4ed03a63a65c874de76bebf8dca780587a64e92dc881706c7fe888147475a30134648f02b570bad5a
-DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2
-EBUILD aeolus-0.10.4.ebuild 1264 BLAKE2B cd5449fd02f5ff19f067b6a2dd6accd92e22125f05302e48177f8981fd3a270d552e2af90049a61ff4e23f3c9bed21e345091cb5ef427367244a36b76b8cba09 SHA512 e9074f3ce1372d1d2e43d046e790b65e137b8bde0e726213dc400c425024b33f3ec6a50239462ba36179e2acfdecc40c4cd25e31aab137ccfd32fcd279a99dbd
-EBUILD aeolus-0.9.9.ebuild 1255 BLAKE2B edd31e3eb988212c7fe3dc5bf127135d875752f408a72ca97e5ec2ea84925d038f254cd9a7156c9728cde0c3aabbae4ee5e75d3315e32e07745b807bf6078db8 SHA512 49c7b8a8588f7f85b6fd28c6c394d1847bb9e27662b27158d113683f449e789898a2745bfd04f05a809f210963fff691af20017eb5c9f4825e7e2011a6674531
+EBUILD aeolus-0.10.4.ebuild 1262 BLAKE2B e5bb9c0e1d56d1937ee051cab3d28f15c291099daf065f581cc33ba2067ad677420e57182c42210c4e3a010396a85b77819cbe80dd65c97a56e419ab08a86f3c SHA512 b13b3f7e8cb852e66a77fa2eed68f57cb5712c653a90fde95d46a429536067e80a8e0e52476a5b7042c513802fbe816964df4d8e3b8f877a44bae75a14d6ae65
 MISC metadata.xml 827 BLAKE2B 2f0a0beb1172d7e417a83bba3bc9f33240585bc4f05f0aa5651889d32a17ca5b8eb519d3fb4753704269cad902a51501c7b776aabf9ebbb3a8a3c2940d777d1a SHA512 6271eb77c2c463f2767651ef23b07db9d8df54f0908aaf1a04e76878fea28453d992a7b7119c7679e64858f30e8d32b498dd4294a670bb5890f8014efb5cb82e
diff --git a/media-sound/aeolus/aeolus-0.10.4.ebuild b/media-sound/aeolus/aeolus-0.10.4.ebuild
index 7df6c099cec0..81f44ef16f3c 100644
--- a/media-sound/aeolus/aeolus-0.10.4.ebuild
+++ b/media-sound/aeolus/aeolus-0.10.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/aeolus/aeolus-0.9.9.ebuild b/media-sound/aeolus/aeolus-0.9.9.ebuild
deleted file mode 100644
index 9d6558e3be4e..000000000000
--- a/media-sound/aeolus/aeolus-0.9.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic desktop xdg
-
-DESCRIPTION="A synthesised pipe organ emulator"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	dev-libs/libclthreads
-	media-libs/alsa-lib
-	>=media-libs/zita-alsa-pcmi-0.3
-	sys-libs/readline:0
-	virtual/jack
-	x11-libs/libclxclient
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	media-libs/stops
-"
-
-DOCS=( README COPYING AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-Makefile.patch
-)
-
-src_compile() {
-	cd "${S}"/source || die "Failed to cd to source dir"
-	tc-export CXX
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EXPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-
-	cd "${S}"/source || die "Failed to cd to source dir"
-	emake PREFIX="${D}/usr" install
-	echo "-S ${EPREFIX}/usr/share/stops" > "${T}/aeolus.conf"
-	insinto /etc
-	doins "${T}/aeolus.conf"
-
-	make_desktop_entry aeolus Aeolus "" "AudioVideo"
-}
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 10df64d1ee16..ffef89283fc3 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,6 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
-DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
 DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
-EBUILD alsa-tools-1.2.2-r1.ebuild 3427 BLAKE2B d82cac5f95da90ab930cbf1ba96ba3bc3c00f5453cb80dd1672210628fdbcf0a3a1f14b578e56ab89a058edf0e33305ccceec21d3163b4ef628355f0adc34dec SHA512 c77460f347017900b62532b4a65bae9c5a858a7ebe9c329dd6c75333dd1d1f66455d6401c2f558df8cd4d8e9e90b3b06ec4e7645657810b4bda8b15f85428b7f
 EBUILD alsa-tools-1.2.5.ebuild 3434 BLAKE2B a87004f9e64483af2ff4f5ce67d923f5e566d026d4bdb89a889eba0d31ecce97c51dd4f043aec4d24742a8c9565f98c22a95f7c00a74417400baaa210f8ec0e7 SHA512 68c2eeefaf39675582f76cc11f0d562481fa867235cc6a2917cf986a523b104495343ba26b2ff0563b5cdc86fd6b9b775eb6ae979ead469a2232105886be471b
 MISC metadata.xml 226 BLAKE2B 1a7e19c50b84c83c3a50c17d631dfeb22f3af188e8a7e486f9744643ce2a0cbb96dec53eec5a5c829ff0f9857ca083b37304b82e10b79b5e073ae4ee5e3610f1 SHA512 488542cae99d746c5d1833f85c19472b9d2f6c6d90dea894438c5bc9935a041f2ecba4d6a26693747852d82523a27a086a7cf196cf3dbfe3eba8071fbb136f7c
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
deleted file mode 100644
index 90f3ebe67707..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic xdg
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-DEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.26
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )
-	gtk? (
-		dev-libs/gobject-introspection
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-	)" #468294
-RDEPEND="${DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS=(
-		seq/sbiload
-		us428control
-		hwmixvolume
-		hda-verb
-		$(usex alsa_cards_mixart mixartloader '')
-		$(usex alsa_cards_vx222 vxloader '')
-		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhrloader '')
-		$(usex alsa_cards_sscape sscape_ctl '')
-	)
-
-	if use gtk; then
-		ALSA_TOOLS+=(
-			echomixer
-			hdajackretask
-			$(usex alsa_cards_ice1712 envy24control '')
-		)
-		# Perhaps a typo the following && logic?
-		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
-			ALSA_TOOLS+=( rmedigicontrol )
-		fi
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
-		ALSA_TOOLS+=(
-			hdsploader
-			$(usex fltk 'hdspconf hdspmixer' '')
-		)
-	fi
-
-	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
-		ALSA_TOOLS+=( sb16_csp )
-	fi
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS+=( as10k1 ld10k1 )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		cd "${S}/${f}" || die
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-			;;
-			* )
-				econf
-			;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		cd "${S}/${f}" || die
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		# Install the main stuff
-		cd "${S}/${f}" || die
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 8a68e1391f76..f960854dfe7b 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -2,10 +2,9 @@ AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
-DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
 DIST alsa-utils-1.2.6.tar.bz2 1334063 BLAKE2B 3b81cccc836e0de9f6d98f311dc3a316a02179ec1fc7520da9658192f27e7701c6dc41b04a82639d6269d6943afd8a89cb6477406cbc36ac450e57919cff46f2 SHA512 6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e
-EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
-EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
-EBUILD alsa-utils-1.2.6.ebuild 2354 BLAKE2B 154cf180c96a2a23eb3108dae883f9bafa2ee8690d7af31e38efecc16bc52565579be1fd08f513848c99667ac515d430d7335fe89563bd20e026509be39e42ed SHA512 acce8bb4192730615a114678f695aef5513e4b12cf5f0b6f5a18dae894190bb0e22f7c04770bbc57ee0e89456ee41e3fc3e03f2e742303cae01b68772661d2c2
+DIST alsa-utils-1.2.7.tar.bz2 1562595 BLAKE2B dd8821c510a98d76e2986d59c01516013f01c632fb6311e6ffd2b10eabbdd68312537d977b1bf2ab48e0f181751ecf58ec1c1da3f8d4f7ee84d8f2623893a091 SHA512 1be8f617315193e6033653ac96a14bd1c3272cd9d8f3776cdb1357f35f5353652acd5975cfc5bd16278cd496f5bf409bb60432818a526282edad9a4c718a97c9
+EBUILD alsa-utils-1.2.6.ebuild 2361 BLAKE2B 7821ae6094ff65b012107eb2171a3578aaa628f630b262387d439059702619ab661ace244022aee818131b8bbd7c75c9a658a125bb9d331c710c21aa46626a3b SHA512 417c27c7cdc46c90fe5cab1a3abd2964c6629ba45ac436637633aff1152932fb4121abce9b38a377906a76aa597add829ff5e2cd72a67f55d09a49a907f252e8
+EBUILD alsa-utils-1.2.7-r1.ebuild 2521 BLAKE2B 12aa83e174fafb6fe351e0da9caff68e8d0887a18c220d662221cc061d3c70642b501fafab4b6e88f6ee18c31eba60356ee71b3083df209cb40c5b998e4a3ec3 SHA512 3990d66e2b66eb10d25ff6d261347dc91c0c71794225ca62605be07e28ff8c57c224507f9841c9736e59c673dfece63d0ddfe60b82d0e79b0a53738eece61917
+EBUILD alsa-utils-1.2.7.ebuild 2414 BLAKE2B 0e1ccdcbbdc5175746fef2839728c458bd08e861f2d13ee0debfd7275be95a96978204435661d10b90754664f634e596f1c28169fb198aa3c0b46b2618b2dd3b SHA512 084ef618509140bf972b20a2d2746439cd2e96edd97248f1caddcb5e431929846c494d41a71276262b48af88eb3d8b8cf83bdc3203ece2cd537ae5a45ce3974f
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
index 974e93c86c4d..d94c750feb4e 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.7-r1.ebuild
index 19b3f1451fbe..2280d24d6eff 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.7-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 udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
@@ -10,11 +10,12 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
 	libsamplerate? ( media-libs/libsamplerate )
+	ieee1394? ( media-libs/libffado )
 	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
 	bat? ( sci-libs/fftw:= )"
 DEPEND="${CDEPEND}
@@ -28,6 +29,8 @@ PATCHES=(
 )
 
 src_configure() {
+	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
+
 	local myeconfargs=(
 		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
 		--disable-alsaconf
@@ -63,6 +66,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog
 		elog "To take advantage of the init script, and automate the process of"
@@ -75,3 +80,7 @@ pkg_postinst() {
 		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.7.ebuild
index 777934934c41..46afae5d3434 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.7.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 udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
@@ -63,6 +63,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog
 		elog "To take advantage of the init script, and automate the process of"
@@ -75,3 +77,7 @@ pkg_postinst() {
 		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index 4beecd73fb15..bb6785596aae 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,4 +1,4 @@
 AUX apetag-1.12-py3.patch 3784 BLAKE2B 039a42333dd48c0b2f3562411a53be1c793b5c19b9c9afc711e16a4b8a959fdc7a2fa8564c71eb99be403d596700a98e28529a39a45bffbd3315f42571085255 SHA512 325defd7e7114406185af0547d2d53cbf7a92a365016d9e7a08d12dec14fb5b364ac1051c86db67ce2e37066db83b9a7c9995cd7a6e1fd3b1b04a39d22651f8e
 DIST apetag.1.12.tar.gz 29942 BLAKE2B 866f0ed90b9bcdbed3c0a35729327058806478d1c17a7f88528809b1480a2a55f4665ce809737010cc3b642b6ed99ec22db84b7b6ec4b14f73974274f3e31bc5 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887
-EBUILD apetag-1.12-r3.ebuild 1047 BLAKE2B f6282d6be56fc642cac71f6e33554c7d4c5d698737b25485b5b37ab4ab8ccebe3c300e6e981bbbcabfe20ed32fb87b5638403ab14bb5bc559c7504b0d09347df SHA512 3e4e6438dd7ece831711e9516c1f8f173d486bf8e59efd0ccad1c356121fdb366c7c59a65c576e62a52fbdec577f8e1ddbfdfd935cc97d82ee17b1de128fca1c
+EBUILD apetag-1.12-r3.ebuild 1049 BLAKE2B 37a8acbbfd839fca5e27cfc84c29d0808fe69e1a0b3bd965fcc39dbe71031c7c2eeb5a531232e4d4e03dca292a8aa992a1792558c7afdb2cce1c392e23cacb18 SHA512 20f455958b5d74f7576d9a8383e9635371f095e3f10d48cb798bb24bedc7709c6c29be7f8fec03c149db1b00345bcece0105d0cbc4d531d4145d3075c85a0594
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/apetag/apetag-1.12-r3.ebuild b/media-sound/apetag/apetag-1.12-r3.ebuild
index d34b04e2b1aa..3b2b3d33e1d3 100644
--- a/media-sound/apetag/apetag-1.12-r3.ebuild
+++ b/media-sound/apetag/apetag-1.12-r3.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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 toolchain-funcs
 
diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index 802eb3eb80ba..3ab4b54a955c 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,4 +1,5 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
+EBUILD audiotools-3.1.1-r1.ebuild 1895 BLAKE2B 8ae3a8f94e4b4fdee94d8a27a90f7377cbe7a1b1f2a26cd7dacbdfa19585a01058d0251b737a392e0f724d4accc50a90172122d95d78fbcf1628824495cda135 SHA512 c534e3be945d237272f6113ad24fb2ffd05670a1f415f75b569f5381347779f584276697a621a3358a2f6f3170535815abc5e7c45862a88ef107d7bc1e098c1c
 EBUILD audiotools-3.1.1.ebuild 1895 BLAKE2B 424ac509d1e5bf0140ecd828930e78776b69da181b2ac0806194178b5cc83f0768820584d49e6e27c5b206e1d7678ed643240828e2e0a8859912991bc33ebd40 SHA512 a3a8b877c4cb9383bf340d7fe361c072c457a1459d0f215a180e12c8e8f7ce5b28a564a2eda50ba38898c5e511b534fa5cdc7deb804e266634423cc604279970
 MISC metadata.xml 534 BLAKE2B b6b669f321a1091210f4abb7935bae1c2101f9ec2dfbf45150b61d3b9b98c966c45da7230f7a2cdf5b634ecdbfc6c5c1c3ae2dcf7eca755face9d47d2301d9e8 SHA512 5b21b6527a7a134fbce106ff8948e834cadd0286e4ef2b3d56921799fa2cfac69666b74498d9ad64564c20d3ba2e90b610e1ede30f85b0362155bfb582657d5b
diff --git a/media-sound/audiotools/audiotools-3.1.1-r1.ebuild b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..e564fa51638b
--- /dev/null
+++ b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
@@ -0,0 +1,92 @@
+# 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="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of command line audio tools"
+HOMEPAGE="http://audiotools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia:0= )
+	dvda? ( media-libs/libdvd-audio )
+	twolame? ( media-sound/twolame )
+	mp3? ( || ( media-sound/mpg123 media-sound/lame ) )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+RDEPEND="${DEPEND}
+	aac? (
+		media-libs/faad2
+		media-libs/faac
+	)
+	cdr? ( app-cdr/cdrtools )
+	cue? ( app-cdr/cdrdao )
+	flac? ( media-libs/flac )
+	gui? (
+		$(python_gen_impl_dep 'tk(+)')
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/urwid[${PYTHON_USEDEP}]
+	)
+"
+
+# lots of random failures
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-libcdio-paranoia.patch )
+
+src_prepare() {
+	default
+
+	local USEFLAG_LIBS=(
+		cdda:libcdio_paranoia
+		dvda:libdvd-audio
+		pulseaudio:libpulse
+		alsa:alsa
+		mp3:libmpg123
+		mp3:mp3lame
+		vorbis:vorbisfile
+		vorbis:vorbisenc
+		opus:opusfile
+		opus:opus
+		twolame:twolame
+	)
+
+	# enable/disable deps based on USE flags
+	local flag_lib flag lib
+	for flag_lib in "${USEFLAG_LIBS[@]}"; do
+		flag=${flag_lib/:*}
+		lib=${flag_lib/*:}
+		use ${flag} || { sed -i "/^${lib}:/s/probe/no/" setup.cfg || die; }
+	done
+}
+
+python_compile_all() {
+	emake -C docs
+}
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test.py || die
+}
+
+python_install_all() {
+	doman docs/*.{1,5}
+	distutils-r1_python_install_all
+}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 4f00dcb2abdd..5048155d283a 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 3756 BLAKE2B 0faed5c481e7d401431dded7149bdb74ec42e922fdb1311087b4dfa6c5f1c6234d4c845ab291149a6876bef430be1e91161c7c302713ad7ac6eeb1229ea79ef6 SHA512 37e39cad1c07d7537bd7ca49c107c862547b9b35ac4c0826f389ab12930f8d8d3aadb105ce681c835cf44a40a4082a1f6a91fd8d2eb34008900297f50a8cf979
-EBUILD beets-9999.ebuild 3724 BLAKE2B 712cfa973f438b1fe1f2600886d3ab0ad5237eb85df8b8b3cfee77f290327b93dee15f2d6e68013143fde3828f1b4418cc4ae928ee2a08f8841f01f32a85d84c SHA512 e63c0218deb1fee665161dae656978fb21aa3d2abd9ebee0bcb8dff436049faf56a222d8f94bc9625c3023e5a948981c1a3bf54a149aec7cb0f7080ebe9c85a4
+EBUILD beets-1.6.0.ebuild 3796 BLAKE2B 37aca00d7ca9a1d6398a0ae0afcc25c2d9d58df17f8bf2dd547e0b814dfe821d04b9fd3c388e968a670195918ff26d33508267b06d2b74292242fc1539bdc36e SHA512 4a685c47ed65ac4105b8f633c48e8fb96a6e4cac5c59d54b529e3db5c0258896e18285e5e45c7ba79ce52c9f829b2ab5ef1ddd25bccf52f8f07cfd65c230aa04
+EBUILD beets-9999.ebuild 3729 BLAKE2B 879a440fdb509328b53bdacc43d5e9754a55f165bbf8582a0356111834f8fd974b9252cbd9993bb1f23cf99ef5fcc9f8f78ae96449c5f12c8ad84b2ab601562a SHA512 9bfda12cbc18d861815aacf1d99c206ccf3f07f65de235192fd9d5f74ad2ef6c20627566a56bb28091d3dbfb6c644e3c8dbc3da7378e3c964a6914782a22dd56
 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 37b074a88990..4550e6da0e11 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1 optfeature
@@ -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 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -62,6 +62,7 @@ BDEPEND="
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			dev-python/python-mpd[${PYTHON_USEDEP}]
 			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
 			|| (
 				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index d7df175f13f4..870844e4cb0a 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,10 +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
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1 optfeature
@@ -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
 
@@ -37,7 +37,6 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
 		dev-python/reflink[${PYTHON_USEDEP}]
 		dev-python/confuse[${PYTHON_USEDEP}]
@@ -63,6 +62,7 @@ BDEPEND="
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			dev-python/python-mpd[${PYTHON_USEDEP}]
 			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
 			|| (
 				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 30241b7c809c..ffaf618d0f3b 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,9 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
-DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
 DIST bluez-alsa-3.1.0.tar.gz 179984 BLAKE2B b0bd5008d1bcc972577d8626970834934cc9424b4dff5c9ede1b1bfb0ac6c62c50dd8a7b94bdaa8884354379fb4fe06d758f620b2f42207d85f68da5064b3499 SHA512 8b2644cb2114569cc896869f22352386a9362eeacae823423a63d9b21198f561d4af796700fcd3267556bb69ff2575569474a1da8e3a645b5a2e779882c27cbf
-EBUILD bluez-alsa-3.0.0.ebuild 2413 BLAKE2B 1b79b12eaafb4edbc0ce2a1f90099f1f7ebf30e062d7d12b2a351d24a9681b56e8b17ef6e774d7121501f99374d678d1f0d33e971bf038a9a0f5ebecbb3f843d SHA512 76ce2586414a1fc995993600522fdc0183252e3f234bad6bf876ca94a772a622e3b8d32dde205322cb97aa063180c90d54344e3bbd2dcc6e8127468345470283
+DIST bluez-alsa-4.0.0.tar.gz 230879 BLAKE2B 998127cb4e03afc019679b80fc1ac7d56351aeb8274efe76a74d6c5600c4b8527d5463e864cc8f68c1fa82c1729ef38d8168e90e7092dfe5eaf5a7cf25ba4bfa SHA512 8a79e5a1189db2d39b2d772cb8f8cd51ebb96b9bd91489556195e83dfd16f40a581dce68c5ad9e886b66cec8a03ae7f959e8288bb4c5c87ea5a2bbd6aee9c5f0
 EBUILD bluez-alsa-3.1.0.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
-EBUILD bluez-alsa-9999.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
-MISC metadata.xml 779 BLAKE2B 3c2a49262beb77e21765228bc74be5b9372113afd4901ecee57d6bbf556fa661c02a015f72bea98a31510fee663a5b82629bfa5dbb3286f199441d1ba2bbf2a8 SHA512 17bb471278f9056174750d9256fb8e692f0dd373aab21d5b97698e54da6c6d6f7e930e9ed919ed348edd18e98c26eb77b821753cf7cb32c7e7ac034e4f78b620
+EBUILD bluez-alsa-4.0.0.ebuild 2801 BLAKE2B 555a60393f17848589385e45bde02f116eb907d86780502cfb8f89cd23cb4b9571418857e82c78f01dab35a4ec94000dbd62d2c435b1441ac384f8d03f1c9248 SHA512 c3e4a002751c05d2914578b0f939d53a169fd6315c09ce4501926ce8811536d4b44248c53c14d3cf05c1aad07062aed5acd9b42ab8c09155cf653f974f696065
+EBUILD bluez-alsa-9999.ebuild 2801 BLAKE2B 555a60393f17848589385e45bde02f116eb907d86780502cfb8f89cd23cb4b9571418857e82c78f01dab35a4ec94000dbd62d2c435b1441ac384f8d03f1c9248 SHA512 c3e4a002751c05d2914578b0f939d53a169fd6315c09ce4501926ce8811536d4b44248c53c14d3cf05c1aad07062aed5acd9b42ab8c09155cf653f974f696065
+MISC metadata.xml 690 BLAKE2B e0d390bd64b6250bc9df327a59938c60e6e19bfc019e395277443e60dfcff948ae6582154825cbad55d6ffdf39bcd7af2b115eda1bdb9c041aa529889761f9ef SHA512 1a088f9c50127bb606a109acd990bbee0a368a03e39b2f9954b2e0526a212f04b0a705d98f08576173c79b48fbccb20f975712e3a511ea00fd98aa33971ca268
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
index e7b9c1c647a3..1343401528ab 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-4.0.0.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
-inherit autotools multilib-minimal systemd
+EAPI=8
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,19 +17,20 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
 	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
 	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
 	hcitop? (
@@ -38,11 +39,15 @@ RDEPEND="
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
 BDEPEND="
 	virtual/pkgconfig
 	man? ( app-text/pandoc )
@@ -55,18 +60,25 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
+		--enable-faststream
 		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
 		$(use_enable debug)
 		$(use_enable lame mp3lame)
 		$(use_enable man manpages)
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
+		$(use_enable systemd)
 		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
+		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
 		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
 		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -78,7 +90,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
+	#systemd_dounit "${FILESDIR}"/bluealsa.service
 
 	# Add config file to alsa datadir as well to preserve changes in /etc
 	insinto "/usr/share/alsa/alsa.conf.d/"
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 80ea97b69dbe..1343401528ab 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.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 autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
@@ -17,13 +17,13 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
@@ -39,11 +39,15 @@ RDEPEND="
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
 BDEPEND="
 	virtual/pkgconfig
 	man? ( app-text/pandoc )
@@ -57,6 +61,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-cli
+		--enable-faststream
 		--enable-rfcomm
 		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
@@ -65,7 +70,9 @@ multilib_src_configure() {
 		$(use_enable man manpages)
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
+		$(use_enable systemd)
 		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
 		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
@@ -83,7 +90,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
+	#systemd_dounit "${FILESDIR}"/bluealsa.service
 
 	# Add config file to alsa datadir as well to preserve changes in /etc
 	insinto "/usr/share/alsa/alsa.conf.d/"
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 8da3eff66042..5533720929d0 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Arkq/bluez-alsa</remote-id>
   </upstream>
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 1b66a6b2cbad..934854ee86c2 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-r2.ebuild 2462 BLAKE2B 65b72e898f71865095e2080665a2a96db5df31173659e154ac62e4a097f02e15699aec981c1747ecc15d34fcd727cccac9a11b32d42642b89dcf0a7d476d48ed SHA512 5a92d5643031174c91d1344bfd52eee0574ca85ac8dafd8e7516ec98138845c36c771497d7463a9c3154751820fba4c2b0cd9258352ff275ea3cf634c043e232
-EBUILD cadence-9999.ebuild 2433 BLAKE2B bdd8ae3994bdebc171b28a904f0b1390af6b2fd29d18828baf0e55e99d1843cb00680607bd22b69e371d8220330ffcf8adebdb3477b649a7a2a47e28bda1649f SHA512 b742319b37c5013cbd437db10e18f45c1475e7cbbc292190dbee3209dc0b88e9d2c9f2e930adc6367326ebd3f8ea3de631976a1de7b8dca406a712250a5c68f1
+DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
+EBUILD cadence-0.9.2.ebuild 2434 BLAKE2B 0ae7d58942830a368ec7102708adad2bf729b24b0b737a298528d878de91af3323aba5a604d9c6be68d7fc71cd2b9609cd75f945f91bb8146335fd2941292606 SHA512 2c11f655b1c4a36058446490f1fdb72f4e6e651f59adf0b5dc5085ee1115cf9d47fbcb530a8c9eec50c1cd896955ddbc4234d7c4ea773c38c6894e3cc3fe7237
+EBUILD cadence-9999.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-0.9.1-r2.ebuild b/media-sound/cadence/cadence-0.9.2.ebuild
index a6a6a44e2de5..9d733c2e63b2 100644
--- a/media-sound/cadence/cadence-0.9.1-r2.ebuild
+++ b/media-sound/cadence/cadence-0.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-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..11} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -40,8 +40,7 @@ RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-clang.patch
-	"${FILESDIR}"/${P}-fix-qt5.15.patch
+	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
 )
 
 src_prepare() {
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 0100e16f1a3f..826035d06617 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-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..11} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index f48c11f01aea..6ed01eaf00ce 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,8 +1,4 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-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 2966 BLAKE2B 41b9349b5955f2bcd0b523cfb52e230d489082a765aa221699d629965892ee5be7fd7de362b713cd98c280b1834dced1f33c9e709ce745b009c20f4dd0c09bd7 SHA512 cf700170c18964caf712ebc13fd458b0021c076860d1ae3509606048acdb7b614bb0276ce4601b57f2739fe200ecac5b4bf0bce25d040f2fadb7578d39b9be3c
 MISC metadata.xml 740 BLAKE2B 20184d3cb15c328f809d6d182cd2a9c93df568e0cdcdd74aec83e0a2d66424da412d7b1432212e70857af62c49da2ca390070b452d34e50ecf7f91d2ab782582 SHA512 f9d6d49ab1977f21a8014acc34cab6334c9e3e7d9524d021f821ee20ad38d55dc47274986759f458d1f495b91b4dce0a95e6ff4b23ddf8375514e8b7e8e0165c
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
deleted file mode 100644
index 0b6da7338566..000000000000
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-	"${FILESDIR}/${P}-solid-musl.patch" # bug 792555
-	"${FILESDIR}/${P}-main-musl.patch" # bug 807763
-)
-
-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)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		-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/cantata/files/cantata-2.4.2-main-musl.patch b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
deleted file mode 100644
index 492dc815854a..000000000000
--- a/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d837de8669a2c0eee835d81d9105e21172c8efc0 Mon Sep 17 00:00:00 2001
-From: Helmut Pozimski <helmut@pozimski.eu>
-Date: Sat, 16 Jun 2018 10:01:19 +0200
-Subject: [PATCH] Fix gui/main.cpp build with musl
-
-Picked from VoidLinux:
-
-https://github.com/void-linux/void-packages/commit/188bc4852af59e20f60b186e7acaaaa4b8ce51ab#diff-413d61b1a38989fbf79759fb57901b99d629706587f21aa4b1b19fb8ef23fd4b
----
- gui/main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gui/main.cpp b/gui/main.cpp
-index 3424e94f7..f3851a0ef 100644
---- a/gui/main.cpp
-+++ b/gui/main.cpp
-@@ -266,7 +266,7 @@ static void installDebugMessageHandler(const QString &cmdLine)
-     qInstallMessageHandler(cantataQtMsgHandler);
- }
- 
--#if defined Q_OS_LINUX && defined __GNUC__
-+#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
- #include <execinfo.h>
- #include <unistd.h>
- #include <signal.h>
-@@ -346,7 +346,7 @@ static void sigHandler(int i)
- 
- int main(int argc, char *argv[])
- {
--    #if defined Q_OS_LINUX && defined __GNUC__
-+    #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
-     signal(SIGSEGV, sigHandler);
-     #endif
-     QThread::currentThread()->setObjectName("GUI");
diff --git a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
deleted file mode 100644
index 6b541536c62e..000000000000
--- a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 835e48074834fb5b888d53b00f84967701d6d78a Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne@kde.org>
-Date: Sun, 23 Jul 2017 11:37:10 -0400
-Subject: [PATCH] Require sys/types.h for dev_t unconditionally.
-
-Fixes a build error with musl libc.  Turns out this is the required
-header for dev_t, and not just for FreeBSD.  That it works without on
-glibc is just an accident.
-
-Differential Revision: https://phabricator.kde.org/D6596
-
-(cherry picked from commit 2382c3f8d3669c473130f4baefb68d244dcb5cbc)
----
- 3rdparty/solid-lite/backends/udisks2/udisksblock.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/3rdparty/solid-lite/backends/udisks2/udisksblock.h b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-index 87c358099a..7b7305d73e 100644
---- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-+++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-@@ -24,6 +24,8 @@
- #include <solid-lite/ifaces/block.h>
- #include "udisksdeviceinterface.h"
- 
-+#include <sys/types.h> // dev_t
-+
- namespace Solid
- {
- namespace Backends
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index e61b0544d563..d33e65a86788 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,6 +1,4 @@
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
-DIST cava-0.8.1.tar.gz 99310 BLAKE2B e7d85a6241fee0a4e45f5c50d068b2300ee2d41a019738dc87317986525571eca5f56831e937580fecf949cc85e11512340678b5842ee6f2f3a99f9d06812c3a SHA512 fad4e4fefe98300cc2774a168322056e4181cd2a0cc77a8622471d86512bab9eea6c09559a75518785fbcafee5a958e6d95c8fe5ce1816253e4dec99a23fae1c
 DIST cava-0.8.2.tar.gz 103930 BLAKE2B feeb8313bd9b74029d101acaecfeed02e449cc29dceb2c119d7deef65befae418526274e6bad14dc0df7eaed90850ecae4a4064a414d94950ab3c24943281017 SHA512 8ab146987324fad97dea5e9fd893de6c12b00cbb074d835c1e334d75c0d32cb4cbbc13cf72f7899191ebd5d346505b2639dcad5312e5ab00975b29a006ba41b3
-EBUILD cava-0.8.1.ebuild 1994 BLAKE2B 9470c59054db1833c7cb1260e2dd9f9bcddb85d70900301c5e39118c64e74e971b9bcf64bd6c62c5b5a91bbe7e51e760b13a67dc4c84660149749e112c2dc4d6 SHA512 243a64243ee7ac6d10ce73f0cefc24bd5a4d18b043fc1ebe6a97eaf85d9149181811d4d8eeeca7721e452cd518b9d8fcb8491e34af3529c1f0849a81f20620b2
 EBUILD cava-0.8.2.ebuild 1521 BLAKE2B 988bec79e23ed06e159db642f9f288b5b93bca580458ed26cf11f50f9ac4c14fc665895bde48deb0d1e1551e01d0e11c33d206f5c70c5fd650abdcbbaf0a1ce8 SHA512 84235386f14e088f668200aa59aec2172c9fe57fd6c505433f63eac3089268b8514a2d1c2afdccfe9142fc63703595752a632fa23d12a2eddebbeb2423e7faf1
 MISC metadata.xml 427 BLAKE2B 94797ecc93cc139cde50a9c04e5d413d9356083740a2a3130894f7bd2fe30e8caf007712566a53cf2a28ad81be79d46aba6c57355491b75f9f3501dd0523ee10 SHA512 21289938ed3ecdfc6d15e3df7577c0a560b403b27d6b6b944cf007af9abaab6a96045d2cc35cb44a869e321a678bc85e9f02d285729ebaffb09797d8726001c6
diff --git a/media-sound/cava/cava-0.8.1.ebuild b/media-sound/cava/cava-0.8.1.ebuild
deleted file mode 100644
index b96197a19e07..000000000000
--- a/media-sound/cava/cava-0.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Console-based Audio Visualizer for Alsa"
-HOMEPAGE="https://github.com/karlstav/cava/"
-SRC_URI="https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +ncurses portaudio pulseaudio sdl sndio"
-
-RDEPEND="
-	dev-libs/iniparser:4
-	sci-libs/fftw:=
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2[opengl,video] )
-	sndio? ( media-sound/sndio:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-editors/vim-core"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
-)
-
-src_prepare() {
-	default
-
-	# see autogen.sh
-	echo ${PV} > version || die
-	xxd -i example_files/config config_file.h || die
-
-	# https://github.com/karlstav/cava/issues/450
-	sed -i 's/-Werror //' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable alsa input-alsa)
-		$(use_enable portaudio input-portaudio)
-		$(use_enable pulseaudio input-pulse)
-		$(use_enable sndio input-sndio)
-
-		$(use_enable ncurses output-ncurses)
-		$(use_enable sdl output-sdl)
-
-		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
-	)
-
-	econf "${econfargs[@]}"
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "A default ~/.config/cava/config will be created after initial"
-		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
-		elog "for configuring audio input and more."
-	fi
-
-	if use !alsa && use !portaudio && use !pulseaudio && use !sndio; then
-		# give a warning given greets with a segfault without proper configuration
-		ewarn "All audio backends are disabled, ${PN} will only function if first"
-		ewarn "configured to use 'method = fifo' or 'shmem'."
-		ewarn "Tip: fifo is versatile, e.g. mkfifo fifo && jack_capture --daemon -ws > fifo"
-	fi
-}
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 8aa4900a2bb1..963d3793e137 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,8 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
+AUX chuck-1.4.1.1-makefile.patch 1482 BLAKE2B 42e88771eebc224b217ce51dc0d127609b157874f81b23cbc641e0437a37a1ebc17d8977e068deb21db5660a1bb5b4ab349370c69a5ba253ac2260885b6561a9 SHA512 b11d263a26cea372ab93212805592e260ef4626b8513758b1b78f678623eb0da1826236d36c15af75129962e8735ead2aa31836f87dd3ee6c4388e99e7ddd7a1
 DIST chuck-1.4.1.0.tgz 14902696 BLAKE2B df324c793236fccc26f6604d1120dc1777cb2ffd8c95a8eff42e8963b9e7011aa88fb094145b4845821c39be781d77ac163cb02025db4fd6db7972f3c390fe65 SHA512 8967c1279959b6a41759519eace468fa4384cd0511c365cef91f8c03e8d720407637c2f9f33df6abd246b7c2155005e82d206113c90a4f23fb22b02f6f426704
+DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
 EBUILD chuck-1.4.1.0.ebuild 1835 BLAKE2B 477d5eae651ec50425a7d4e07e769e0b5b613c791909c4462c9fffbf9c7b934c514020b1983b1707b6d8974a09f0733cf4a65d747ad5e780c5518b1dc90d2095 SHA512 21d67c25fa5644c320098406f6d32efadf7ca02154a6f8dc2256cb8fe46ad70e77f34f9e2206c61a4f7e996afc658c8d25691d0acf0224871e8b3ae427ed0808
+EBUILD chuck-1.4.1.1.ebuild 1846 BLAKE2B 4f287c623f9d523db7066418632572aa5ebb3b207f052cb9ba0aed2c770ead4161f66908896c4bf4a638ceac393a64feef5d516a4bbb0d27c9bd6f2c7d53f22f SHA512 f28d8ab80d46bd6a772c59e99f1efd1922a1de08a8bb1c17c31bda59ecddb9fe22b20f73dc28e6afe3c7722d438826996f0ab6a699c97cbe2e5115f1d4b23cca
 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f
diff --git a/media-sound/chuck/chuck-1.4.1.1.ebuild b/media-sound/chuck/chuck-1.4.1.1.ebuild
new file mode 100644
index 000000000000..7f3e4f502a22
--- /dev/null
+++ b/media-sound/chuck/chuck-1.4.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
new file mode 100644
index 000000000000..98147cf9a81f
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
@@ -0,0 +1,50 @@
+diff --git a/src/core/makefile.x/makefile.alsa b/src/core/makefile.x/makefile.alsa
+index 5694257..577dd91 100644
+--- a/src/core/makefile.x/makefile.alsa
++++ b/src/core/makefile.x/makefile.alsa
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
+ LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff --git a/src/core/makefile.x/makefile.jack b/src/core/makefile.x/makefile.jack
+index 86b2511..442708b 100644
+--- a/src/core/makefile.x/makefile.jack
++++ b/src/core/makefile.x/makefile.jack
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
+ LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff --git a/src/makefile b/src/makefile
+index f52f0c2..310991a 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1
+ 
+ 
+ ########################### COMPILATION TOOLS ##################################
+-LEX=flex
+-YACC=bison
+-CC=gcc
+-CXX=g++
+-LD=g++
++LEX?=flex
++YACC?=bison
++CC?=gcc
++CXX?=g++
++LD?=g++
+ 
+ 
+ ############################# COMPILER FLAGS ###################################
+@@ -92,8 +92,6 @@ endif
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 78a65d4859e9..bd8d013f602a 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,5 +1,7 @@
 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
+DIST deadbeef-1.9.1.tar.bz2 5136384 BLAKE2B 6e8314728b824b182ecb356d9a9cb09364650f6ca6b5e5d2f7077fc048fe62284e4959910a4cf982fd79893c503044d02417633713d0dcf34e93128aff22692e SHA512 2f959fb139078bbde3c1183019545ed3979b3c5dfc051794ea7a5ccf166156acc8d5dface3169ec705059f487d47c9b314c5400770a7572c22fbd0b903eefc5a
 EBUILD deadbeef-1.8.8-r1.ebuild 4013 BLAKE2B bd62bccf7d2c3fb49f8b80648dee1d8752b4af837dc8a40b7fa95458668cb335505d6b23c3c395702ac100e21ee8ce61befca5677a1f323762c0c89101008410 SHA512 53791b05f7f5985939961670aa3364c98a555d5ca6e0ff3deea22031d4f499a4374ab3c78802eb065c1c64aa6a63066a9c714d4f1b31cd133bd64b9a903ff5f2
 EBUILD deadbeef-1.8.8-r2.ebuild 4042 BLAKE2B 8b16cf485fb6a42d536e71e48ff0d714c98cca2e6392807d0fdff6e506133f22c8457d332c9a2a04c37ca26b072a841ae0a07e2a3100383ea239fb4d10cb0911 SHA512 2098f4021afaf871926b73bbd57d210d00a46954b2dbcd61e7210d3c7c3b816215cf714805ccd05b17045cb345c796de7017abb7a7de25d1588074b12fbe4dcf
+EBUILD deadbeef-1.9.1-r1.ebuild 3972 BLAKE2B 0edfbdb726acf0c6642c32416eab3aa77477848c984af0e93a9c6da97db1aa01fc7793b9854a18cc45a71f5c33fd2476bd57fd8f62f67740f8704eec0f0821bd SHA512 12938ec14b2ba651bcaf95e39da348c5737301acbb157edea10d9cc640e7dd19df3fdb8cc18116e03867c4879c98fab6ab179d7af94e32ea817e84c32aaae4aa
 MISC metadata.xml 892 BLAKE2B f13f0c59c3f1085f2b14a480d1c0fceca3cae3aa72523fe8ea7c92ec44f392e2f005df3bd46442d9d7bd1b9cfbf087319b679bcded7a53549789c2e481b8f5cc SHA512 a1fb3ea4e169b3b02345977dd6032bdf790b993be96778348b7eefc3900b2d2faa285d6a5e4cfdc9c48148397f5e58e9b6d48986e6f8245758bd06e4dfda51c0
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r1.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..d749eff41a5d
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.9.1-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg flag-o-matic toolchain-funcs plocale
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? (
+		media-libs/imlib2[jpeg,png]
+	)
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+	)
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	dev-libs/libdispatch
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable sc68)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 04d94a239d69..d2d8d5f63e29 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,5 @@
 DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
 DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
 EBUILD denemo-2.5.0-r1.ebuild 3013 BLAKE2B 4b9ebe4683231ea9413273cd90b0d5d2e6bd83c0a64d1424105e5040a73edc0438222989e6efcebe2b5b91d876f24513129cadcb2e3885851ad82cba05b9a45f SHA512 83802cb91d236f0a2d032adff6dbd43f5602a3c0421f5284e5d3322cd0bb5c9daeae710bdaec8b20779aa490e433432d50c2981981d696a19d139cb65940dd13
-EBUILD denemo-2.6.0.ebuild 3164 BLAKE2B a79254a51b17dbabe95a94fab8bd61f15c16a550ac38e52f24a7840521c78fe6c1d242a07c270f3d7b09cbeed2b06fb4c3b327ac9bbc0a63eef30ed0e13a7606 SHA512 6954d4c5bd47a30c23c2d8544c5db8b9f4fefef2b2a853f0921a598be36d331c80c7e6b019b6d7cb5f05d8b4e5d34dc6fab086dcc556eeb373cfd1f1241bf6ed
+EBUILD denemo-2.6.0.ebuild 3162 BLAKE2B a2cedbf7c464bfa5fbb9f722f951100da86b25dd34742d52d999167e67e5a0ab89e3bc34ce0881d3c3d815c971411a2877b614e1e54f3206289c0c661a19dcd2 SHA512 766805257ffb5882fc40f03fd4a554226c87931ff1824d553f21b5f95207ca0073e2085bbc143e859288af86b2632c7dc612efe50b52642af69984a95489a63a
 MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
diff --git a/media-sound/denemo/denemo-2.6.0.ebuild b/media-sound/denemo/denemo-2.6.0.ebuild
index aebe91410942..dbeb5f19d947 100644
--- a/media-sound/denemo/denemo-2.6.0.ebuild
+++ b/media-sound/denemo/denemo-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
diff --git a/media-sound/denonavr-cli/Manifest b/media-sound/denonavr-cli/Manifest
new file mode 100644
index 000000000000..4b75a48d6a94
--- /dev/null
+++ b/media-sound/denonavr-cli/Manifest
@@ -0,0 +1,5 @@
+DIST denonavr-cli-2.gh.tar.gz 4102 BLAKE2B 1f17a642cd546d3a9fb77ee9d24a6c7c1622e8c0d6fd6f4d04ac1daa4b491908e3bc18efce4e827fbf6936b91929e68d32efe0c91aec260069817d6c0708eb9f SHA512 04354f5fdf46e179a82df3d539329fd6f00312c3d87fc78ecc40c85223c468c6bfc93092e835351857a1ca4fa149c5f209aa6a2d96caf518332dd7dc4aba334d
+DIST denonavr-cli-3.gh.tar.gz 7508 BLAKE2B 4084cbc87363858cb0132847b88c486795332ae28d1c24efb46c22a8985711aa18dfe6b2634f6457ea3108789bb4812ffba17a50edb429fb64a29ca90bbeedaa SHA512 f2bdf442fd3bec788d9ac684d93314da6c7750d946fc563ceb71a52ef1663e1fe06c62653d4e5ff69625749f1eefacc41c92ebcfdf0f6ff7fdf7c7b703d7408d
+EBUILD denonavr-cli-2.ebuild 523 BLAKE2B 2a0aff7b38146e4d5eeae2a3d43d2266735a8c1e7b6978f39600d977c619203d3afabaecdefa4869eb382fb8c620630bf064afc85632e02922d9c4fe847f0748 SHA512 662fcd9822e3cab792ed6e81b193957b2c56578d4b8922e3ecfb4c18bd6fe8a4a1c7526e644978d4814bbd25503ab923aaf53ae2c41d40dba17c8387c59fedc1
+EBUILD denonavr-cli-3.ebuild 624 BLAKE2B 97d5cd4e13452613b3a6dc7f9fb72ad1e6fcdc6e8569411b959fba41a963ecc598ee1912f10ce7ea8add1ee9bbbb0253b2b9160ca4b8031fc5cf88024b4d8fad SHA512 bde28b27dad579c690f45cbd478d90d30058b274e719e35c67829a054e61d85f7c95b45c2b00a89af100921f05cfa16f11130cc19116b389e0a1cffe756a8cec
+MISC metadata.xml 382 BLAKE2B 11113efd49c8648c73018cc7e3ad8633c8a975c12e360d5299685e91ecb09384e76ca2d9af21b6773437872f0346f3c9481bd3d42921d0c3a0d729596d9c7d2d SHA512 42dbf2c0a482d005c93d221e2b7b265e5c0cfec9a92b809f8cbe503162589f36eda48a3dfd3f55fb8fb8360217c1b1a60bb316c76d191117a74e086f23c81137
diff --git a/media-sound/denonavr-cli/denonavr-cli-2.ebuild b/media-sound/denonavr-cli/denonavr-cli-2.ebuild
new file mode 100644
index 000000000000..32f23f00f481
--- /dev/null
+++ b/media-sound/denonavr-cli/denonavr-cli-2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple CLI for Denon AV receivers"
+HOMEPAGE="
+	https://github.com/mgorny/denonavr-cli/
+	https://pypi.org/project/denonavr-cli/
+"
+SRC_URI="
+	https://github.com/mgorny/denonavr-cli/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/denonavr[${PYTHON_USEDEP}]
+"
diff --git a/media-sound/denonavr-cli/denonavr-cli-3.ebuild b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
new file mode 100644
index 000000000000..a5e29f2af9bc
--- /dev/null
+++ b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple CLI for Denon AV receivers"
+HOMEPAGE="
+	https://github.com/mgorny/denonavr-cli/
+	https://pypi.org/project/denonavr-cli/
+"
+SRC_URI="
+	https://github.com/mgorny/denonavr-cli/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/denonavr[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/media-sound/denonavr-cli/metadata.xml b/media-sound/denonavr-cli/metadata.xml
new file mode 100644
index 000000000000..b3ab18a624fe
--- /dev/null
+++ b/media-sound/denonavr-cli/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mgorny/denonavr-cli</remote-id>
+		<remote-id type="pypi">denonavr-cli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 851842f45c45..0197f6c4e9ca 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
-DIST din-53.1.tar.gz 3708022 BLAKE2B 882d4ae6cbe24c3d7fc326df3f3630d7ea7cd65b5d53c4751844dc3edcf9d533cd7cfe58fed4c46766fab6b4983e75f75145206b5362bceb27382d02705b9a36 SHA512 42058b00402e726869af8a5cb8eb9b34e7b1709185c972d3f3b633a980ad7de57a143ca0ce854ce681ec67b81cd6dd2b2b06023a15d3f1b1bd54c4ac643b6096
 DIST din-54.tar.gz 3710611 BLAKE2B 2a7540d9a413c0f83b2cfc7373b1c0fdd40012ae725f162810e4d3165e3bc669661860fd653eaed8c7f2eeed7f015ff50ce6082ce8de04bd035bf395ca018d6a SHA512 8831e6d838ba06373b13574701929f96a508f2899618509b3e79f23cb0aa11c34b347fa00b4fa765a7668c7db54733be2c9146b8e783d3fe07e3ea4ce2707bd8
-EBUILD din-53.1.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
-EBUILD din-54.ebuild 1089 BLAKE2B f13e0c8b3c0e02ffb6817e2da3b32e4c4d3de3c3e59db322659c32f3db94bce061f8f3b9aa8fa9c2eea234e321ef6bb7c3dafc74b3449f2c11ac5250813b1f78 SHA512 1f12458f2a2801c61a00069e32071c27e1b1331ce5e9ac1fad9fb46fa6eaf36a9cc89ed5f2d25489c06eab896e7f6ba7b24bb4c2e65b57c261bd2d1b2e951315
+EBUILD din-54.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
deleted file mode 100644
index a12ad9ed2cc6..000000000000
--- a/media-sound/din/din-53.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-54.ebuild b/media-sound/din/din-54.ebuild
index 1ff40dd5f7de..a12ad9ed2cc6 100644
--- a/media-sound/din/din-54.ebuild
+++ b/media-sound/din/din-54.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 2f4f1b1cd96f..1f99286f8b65 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,3 @@
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
-EBUILD dir2ogg-0.13-r1.ebuild 1202 BLAKE2B a6b4511265be4fa7c01c85d85834f54fe9f14e1b6c5bfe0dc04b82164bb614fab4db1ed324d0938068dec02e38f32b26007a20f69d44788aaa356bdc4475e595 SHA512 1fd9148ff3a6c58497271524d3a65bc443cbdf50de7c7771f06ac06ca68c6be11acd31184885cfebfef36842931cbae7e563c66a4132261d8c562766286cc213
+EBUILD dir2ogg-0.13-r1.ebuild 1204 BLAKE2B f2ec26413bf2cf5b0b73cf1f26447260dee1697d392db0f4ce7be495c8949c713ed904e81eda87f0233952fbeb9b64b1062d6a242d729b7ed04a3349240b0e7f SHA512 2880c0f3fb2ce2a1638cdff78aa543eadffdb3bc5e273f709614a7a3ce8571fa7de7f1f31d340a866055bbb0de310e9e4dbc10fd81aaf43732cb866bb2778354
 MISC metadata.xml 446 BLAKE2B c41324185b347080d23121f9d47f2db7bed1e786c96daf39e3a41505270c864853c1c1626f52c45832aa6c8b8cb567a9745b530dd09b5dbf99ad8cafe4775314 SHA512 f997508acff421632f070b56c4e5abbdccd070ca8e91795139219484edb0c8331d6934446c654279ca099bfd487183c92632f8502ca77699b8bdea8add7c26cb
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index 0b4c50e8cdbd..d6dc033a19fb 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -1,8 +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
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-single-r1
 
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 40c2d4fae741..d9505951909f 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,3 @@
-DIST drumstick-2.6.0.tar.gz 1920439 BLAKE2B 755f252030626ec47359e48a4f8fdd007448dbd61ee41b9d09d3f5b83816bcb15f7555fe0855828c21623094a6845c974d62483bbaf2071dd8f21ed15a506d0b SHA512 68bf1875ce6622a6655c6bc3f768d3ea5b6754eff64b668235a24ab71a502204f34b0b5cf201d911929189a4dbcf1253c21e4388b5a71fdfd4fa5d83ad505326
-EBUILD drumstick-2.6.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
+DIST drumstick-2.6.1.tar.gz 1922869 BLAKE2B 5f1b9413c60d80ecb87f28f9a9eccd5cc418444664bdbd0fe9d47f698effc12956a3ddd2f45ae9e734486e94006883ed7264f8421a5989ce0b025ad85239e10b SHA512 ab858ee17aa957fe1c68935e2419798c50d4253b14dd0f31cafb46e087869986702c8a0d3ac1333d67b17618e7d5d75894aeb0e0f5bffb77762d0a56c242a811
+EBUILD drumstick-2.6.1.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.6.0.ebuild b/media-sound/drumstick/drumstick-2.6.1.ebuild
index 29329502f5d2..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.6.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.6.1.ebuild
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 3cdc1801218d..fcfe8b2f9cec 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,5 +1,7 @@
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
+DIST easyeffects-6.2.5.tar.gz 2673461 BLAKE2B b254dbee930d4ed3c87f27e41321f5b2151bcda258cece4a6fbb7f1465b839851bf82b3fb5517bee44c23bef34f53fe7dce8f54295d93473e7e19622131c3274 SHA512 260b864e5928191dd5574e23a5f51f4df0dcc552c44ecf2d0c1166d589fc1b4320b9da786de88c8837dcb28527163051dc80b5a5a33a9cdde2466405c73248f2
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
-EBUILD easyeffects-6.2.4.ebuild 2009 BLAKE2B c8f52c14419c2dc8ce34bdc69c7adfc259bd63042ab8677925800fe25d68f7fb5ecb6fea41c4576716eb3e367044a251412bac3435b35d1bf6fac1494e36ebbd SHA512 6d4d9b07d2e08cc971a9ea543fa38830a9901444453ec80a0e65f8c0bfd28281477cab48944a559effb650744361c0229402c10cc0569372390b3d9d3f3e02e4
+EBUILD easyeffects-6.2.4.ebuild 2008 BLAKE2B 5cf9a3ddf54274a37e560ba7cc69aebe2b76b5ce8138737c02ed40c679babba900e4fa024bd65ed9113282eb2e5c8959b1c552ae95debf26cf3b85778cd379a6 SHA512 7e95820c05679a86f92715b725a33ee61b7b5381fb1e3f2cd73fba0185de18bb2b24e3a25bafdbb0c25380c837ba5ddfa17a98de98b6ade47f3825e68ea27795
+EBUILD easyeffects-6.2.5.ebuild 2173 BLAKE2B e006c6bb1c6d5d4acd1daefb33750288fa7dd7bbff9d566d8f9d05f2772f55c94ba76ba0319d1e55d492357b54e6f7a3e686fb6a82a71873aa592880f7e4aa8c SHA512 f3e3b8aad7c09a060452ce5292f264749c02d13e9fed7638ef166caec3398095251802c210e3b6fc257266d2645c12e4428dd84079c174a61e9940e112dd37e3
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.4.ebuild b/media-sound/easyeffects/easyeffects-6.2.4.ebuild
index fe870ff42fa7..cfdaafbd3930 100644
--- a/media-sound/easyeffects/easyeffects-6.2.4.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 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/easyeffects/easyeffects-6.2.5.ebuild b/media-sound/easyeffects/easyeffects-6.2.5.ebuild
new file mode 100644
index 000000000000..098fd480a549
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.2.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils flag-o-matic meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	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 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
+# TODO: check this every release.
+RESTRICT="test"
+
+DEPEND="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.2.1:4
+	gui-libs/libadwaita:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++20 ; then
+			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 09ded93d4398..cc3fef8b4639 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,5 +1,6 @@
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
+EBUILD ecasound-2.9.3-r1.ebuild 2387 BLAKE2B 013484b2b2196f308859ee89ce0c2c39a30c1d3f698182d611a6df28b195049e89d365fe3b58fce169f9eae6db82be6e6384a71fad6451e47a658a8052ea4171 SHA512 3c028ffef5bd421e0ecccbc80ffaa38abdec4fbab02022a857aac1862eb472cb51596f64d0067e63f46984b5d3b5a1b0e355943a59cae95d090e613c86de1e6e
 EBUILD ecasound-2.9.3.ebuild 2393 BLAKE2B 36a63ab78fc859c09dbadf479ec45a871c86ce8c77cd252421c773bef03deaec08c37d3c7efa4ecf4aa481734771b2e1029649e05efb707fa2b126c867245d15 SHA512 693a5d74279f69704ab9cbcd157c760f3d2707e0b43b95fdeaecd946c499fca5209d44db2db551ae86aaa4e85ce9e706b21f1c64daa0aaa1116c76a82ece7998
 MISC metadata.xml 1074 BLAKE2B 9301046a8443aa5ee5db4a2c09f65b1cf24991fafa6920061ab1bd668bf31eb74b6659e5346fe3493dbf154eed47e60a8ae9c936bcdd7f7c5fcdaa0e2a9e0b6f SHA512 81f59c71f4869241fce6ba622a2139502e9a21340aa21057dbd01b3d8dd16e100b55bfa804a2eea712ab9c010112101705349697297a3ea8f2aef37358c20d7e
diff --git a/media-sound/ecasound/ecasound-2.9.3-r1.ebuild b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
new file mode 100644
index 000000000000..69f8abd3682c
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="a package for multitrack audio processing"
+HOMEPAGE="https://ecasound.seul.org/ecasound/"
+SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
+python ruby sndfile static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lv2 )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib:= )
+	audiofile? ( media-libs/audiofile:= )
+	jack? ( virtual/jack:= )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lv2? ( media-libs/lilv:= )
+	media-libs/ladspa-sdk
+	mikmod? ( media-libs/libmikmod:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	oil? ( dev-libs/liboil:= )
+	osc? ( media-libs/liblo:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* )
+	sndfile? ( media-libs/libsndfile:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+BDEPEND="sys-apps/ed"
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/787620
+	printf '%s\n' H '/^EXTRACXXFLAGS="-std=c++98"$/s/98/11/' w q |
+		ed -s configure.ac || die "Couldn't patch EXTRACXXFLAGS in configure.ac"
+
+	eautoreconf
+}
+
+src_configure() {
+	local pyconf=()
+
+	if use python ; then
+		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
+	fi
+
+	econf \
+		--disable-arts \
+		--enable-shared \
+		--enable-sys-readline \
+		--with-largefile \
+		$(use_enable alsa) \
+		$(use_enable audiofile) \
+		$(use_enable debug) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate) \
+		$(use_enable lv2 liblilv) \
+		$(use_enable ncurses) \
+		$(use_enable oil liboil) \
+		$(use_enable osc liblo) \
+		$(use_enable oss) \
+		$(use_enable python pyecasound) \
+		$(use_enable ruby rubyecasound) \
+		$(use_enable sndfile) \
+		$(use_enable static-libs static) \
+		"${pyconf[@]}"
+}
+
+src_install() {
+	default
+	use python && python_optimize
+
+	if use doc ; then
+		dodoc Documentation/*.html
+		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
+	fi
+
+	find "${ED}" -name "*.la" -delete
+}
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 5a3a17f336dc..3fd8d5f4aa1a 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.12.3.tar.xz 1748236 BLAKE2B 5e3ea6a5cd1f7bb9aa7a99e33ddfe97f7f239f3594d8e7684639861966b16e812ba9f46cbc5a6c9ceb5c19acd75c3bb56567875dacb01ebade88a59ec81cb865 SHA512 f2ef0c2669d171e42e55460d464f019751a4fdea174cf8224c90bf6002d7d181e101cac46c8fb3e8e13bfac0b0f79bd16fae3b55f02808a4172ba994f8ac667b
-DIST elisa-22.04.0.tar.xz 1747176 BLAKE2B f39ec87cb3976bba6e32b5eb994fd299715b5247bc98ede00f3bb140e7bee5e805213804a02592a2ebfcf03a55becd92062007b8ebf8af74a9551abec6db6093 SHA512 0cda1419bcff9db392d87c081007e199632a9f18df9472c7c63ad8e98723c41cfd8b5aeff99b9c76f32969665ad52eb598f06f02ad227c5e1fc1dc9b07d08650
+DIST elisa-22.04.2.tar.xz 1747560 BLAKE2B f573d52b57c135ba8c620934100c4ca15e554c2a198185dafc750b101cf56d652ddb10cf65f1c7138176f3684ff862cc3f130758739482d621cfa41d13011177 SHA512 3a4ece498fb2a0f290b5678c6ec4140b42080f4962f416762789b118b152d4e89ecc454b877a2c4118416ab14230da2feba3ab44b127ed518295d10518c626bc
 EBUILD elisa-21.12.3.ebuild 1645 BLAKE2B ec831acd144a025a100cb7d0f49a613b816bbf146525ee421b15f993f6a557822ff8613fdfe9fb986f8ef72b93e690c409c661642f24d15c41dee7131ae646c0 SHA512 2285070d1b030af7458be231dc0689c2b2d9ade3a7b6f526f43bc1e9cc34fb1728d56b2c3a1aa24d32b480bd181d00c57c0ca74adfe5638a9255d84757836689
-EBUILD elisa-22.04.0.ebuild 1648 BLAKE2B 5f1a4dff559cddff338b3b7b0a1d36a51534da257a5d9782bcfef76ccb3179d7b2bea21648bf171c8676c727594136450c2ae537106adddda38a2d19d9d64c80 SHA512 7d99651422e58edfeca995e4f80ce2e33d78650dcce956db8ceb4cbb6d8e196398033052f97a8a62cac7d9e1f2401774a9116b0d454178afaf7394e627e0a39f
+EBUILD elisa-22.04.2.ebuild 1648 BLAKE2B 05bfd7c2ecb6fd3fc649c9dc93f5cf511e1ea7fbce402b6e2940597927d13cb68fe761f7fbb17398bbdb16a7e045cc50839eed0bdbe380565fd7bf6ad509be7a SHA512 e985d23d2760ed584bf5e69bf7f86752424180e1c45141ef771e3f79a0de9fcb1892c8064093be69eac255192bb373076cfcaafa2038351228e279f67679dd0b
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-22.04.0.ebuild b/media-sound/elisa/elisa-22.04.2.ebuild
index 418ca8f7c23c..ad63da6072e3 100644
--- a/media-sound/elisa/elisa-22.04.0.ebuild
+++ b/media-sound/elisa/elisa-22.04.2.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 68fb6124caf2..6eb13d03ed19 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,6 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
+EBUILD exaile-4.1.1-r1.ebuild 1663 BLAKE2B 490eb0d3572540c2dcd8a0e2b1228eb1722fe46b26ab29213d415664ccfb98e3e3b7ab771c869084b7802af1a48a1a17373bf38840fdcbbdfab4c0a4210d83df SHA512 ae634ce670b814355358a61a2031f22571c7906e85d577bb73d624fcb2df6203041f3d5d84ee433e7f159c566284b1cbb9279159282f020b08f64a9444ccf3d6
 EBUILD exaile-4.1.1.ebuild 1703 BLAKE2B b2dab1ea5dbb7188d1276c95d50cfe5b702f46c6854109f44e4320f27fe8d522e396abbc974e5cf3521c48d14821bc483ba25a71be80efdd63dda181efd7992c SHA512 3e6a8eebee581fb2d5bd25dd09e98fc1a412f4e14d39803e099db275501a5930f59abb3a5460d7588e86e2bc15cd3f382fc8f57c59e518066f734e05b8f04e56
-EBUILD exaile-9999.ebuild 1710 BLAKE2B 58b646c3cbbdaa1bd036dc003feec9489ed67d7f35235127334dc38cef5c23af100c7f0c6d864c05b4c6d64a4f8cd635d5475aa6fb46580d9039546147099c3e SHA512 5977d8d627fdc9c20b0d4219f2e19f9d3d8de6823f42fec0b1f04b41503aa17f4e719b7c83227be51b666479ea36bcab464a5ae93002e89d95fd1a8b8c2d78ae
+EBUILD exaile-9999.ebuild 1670 BLAKE2B b1c52f10c2111f15a124d2a5eaee505b3a7c9faf45b1b41da1667707908a02f47255fa5b6fcf5175493fa192b9a6ae2e4b19f055220befe46b653f53ee55aed3 SHA512 c71a9e2afc4c6da2a7f054b69157dd42ccc9273f3c27fcd79672f6d5dd742583e00b442e7381a305ac917200e43193a0a55c22a8d2cd31a77bffbe6c296dfdb1
 MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.1-r1.ebuild b/media-sound/exaile/exaile-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..a8ee142fac0e
--- /dev/null
+++ b/media-sound/exaile/exaile-4.1.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 xdg
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
+HOMEPAGE="https://www.exaile.org/"
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+# IUSE+=cddb if have dev-python/cddb-py
+IUSE="libnotify nls scrobbler"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3[introspection]
+	libnotify? ( x11-libs/libnotify[introspection] )
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	')
+"
+
+RESTRICT="test" #315589
+
+PATCHES=(
+	"${FILESDIR}/${P}-metainfo.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	use nls && emake locale
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	python_optimize "${D}/usr/$(get_libdir)/${PN}"
+	python_optimize "${D}/usr/share/${PN}"
+}
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index 93bda21f7a3e..36c7f3272d08 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
@@ -30,18 +30,18 @@ BDEPEND="
 	)
 "
 RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
+	x11-libs/gtk+:3[introspection]
+	libnotify? ( x11-libs/libnotify[introspection] )
 	$(python_gen_cond_dep '
 		dev-python/bsddb3[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	')
 "
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index e65a3e8133bd..cc4534a35a45 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.6.tar.gz 1749202 BLAKE2B 5296d48809a457770a968fb9ae20ae4091bbae11d6fbf8a11f75e44de1ca9fa1c121e925e61f25ab1016907ced73364ff632ffa3e7edfa9d15019bf3f3e0bb3c SHA512 e4958c409e057fe6e09a0aa86cc0d7c939aa883de479aa90c43f19faa4d0c3a0f6aca7242fad11ec7a7776cb7e2e602c953c6249fc94b9f04425101584ae3e6c
 DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881 SHA512 62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf61eeee44686bf45fef1ed83a7
-EBUILD fluidsynth-2.2.6.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
-EBUILD fluidsynth-2.2.7.ebuild 3418 BLAKE2B d06ccfb0efd1626bf3ad273d7b743fc549a1a4d7d8f1bfb24dfbb303e2141370510d9326b34912995bd5604c4824fb7293919e98faeae7a57af69caf29e731c1 SHA512 c401e9ab73e94457be436e4adf6a0c438000743da19a57e299e5e6844ec1bea8ef294f9a4428186601b5c1b33be9b245d0a851055d4d41f1699d3a1214026ee2
+EBUILD fluidsynth-2.2.7.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
deleted file mode 100644
index 387ff481a6d0..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd toolchain-funcs
-
-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=(
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-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.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
index 51908c546139..387ff481a6d0 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
@@ -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="
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index a8103d6fac12..f7e79e6eedc7 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,5 +1,4 @@
-DIST frescobaldi-3.1.3.tar.gz 6691789 BLAKE2B 88a08240997aad11d9bf31c57a844a42e341e7641649f5cfb52571beb63fa4c29382136eae7758e5fff1cc6a4f8eb2942ca9b09b8217d7243c699041c951081d SHA512 595c4628df1923dffa44987ba858827a50d5415e9a01b45c87def2a6625d22c8b9b2e988c49dec20bba750cfc1ff4512e6f67875c3a2b23e440ef7231856c159
 DIST frescobaldi-3.2.tar.gz 6696111 BLAKE2B e74a8c3a59c6dc5187538785bc5971dd996cf897c6428ff510775bad58aa4c04dd69b91f3821b9c868a3e7f13b6cae6f76814188de2620542959039e768c9be0 SHA512 403ae6cfe145595fef0ffe06ce4fd595a0417201b19e5f2315944b45cdcec50592296424f2bf2c7e3eccbe3dbeb9ff5bfc4aa7813241d8168bc057e7bf5539b3
-EBUILD frescobaldi-3.1.3.ebuild 821 BLAKE2B f1b1abcd1c40034d0bed504b4f0a95059e215b35e72ecbae6c381be5a7a21b0e0a70aca123112b1b4f216691002091f68f38385c49fa32a21817881127102836 SHA512 bbd92b7bc34b3569545ff5a24067ed9b74af99c8cbfb26cdcc826317283c8f708812e5cf5a1bf0d133f156d678000fcc25733ffe26aa40db7a78fbc9e4307c85
-EBUILD frescobaldi-3.2.ebuild 823 BLAKE2B a0b475c5d2a49a58436b46286d950b5169a1af93a158c742970602893a8b4abedbe306e26ed002a14f299372c1a68b27969c6471c7ab4cf3a88239688a65fb5a SHA512 a251e108bbee52124c66eb61740a39b3290c37aa0b4941e95c0720c9af738be606e69489cac2b2ae15bed94cf478800e5547f35e90ddb4817bca4bb4f81eb1a6
+EBUILD frescobaldi-3.2-r1.ebuild 864 BLAKE2B f1aa67235b90fbaf5f17a48918c06aff61febe44b24488ad31121a2a84d197aa587ac9dc4f8a2a25d6d61a397e08be8821c32a75a136f651fa3823dcbff0b9fe SHA512 5a5b5702cecd0a91e96d71b43d0a3895f553b9125fcad14f7bb6535676cd2e61f3c942200adbbaba35506f1ead4c0e5970225fbe2b67200c5ee01c93dd077563
+EBUILD frescobaldi-3.2.ebuild 822 BLAKE2B 22c7e2441e63e59912ac3ef5d248ae016f616b4792f19243b4f0e82c40d23f426c729cbb984056bcadfbb3c89adcaa565e252ba945c492bb6cb7531fa425f82c SHA512 f79bdfc9511a1b3ad11dbf876b19a47d8193b0138bf245fafbe3ddafca0d10068d0c3db48be520f36004114ec620d47d8c8072339a7e03765664ee481239f0a6
 MISC metadata.xml 438 BLAKE2B d6f42ae0b227211e9000c25a1eb3e371881df6c663891549abd7d878d7cfbf7a9a0e514d2f6b01530667667d4a4c55e7801c3ce5fddc7a13f3ad4448813ff898 SHA512 e94573420812bfbca28fe96cc047eb270ddae4f526fd0d1932893bb06ed3c22de1a76d81ca210cca6cbf7b76ab2ddb74b887a122ea54a92f9b05d1b581165ed9
diff --git a/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild b/media-sound/frescobaldi/frescobaldi-3.2-r1.ebuild
index bde7dad74da6..c0e548571f49 100644
--- a/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.2-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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 xdg
 
 DESCRIPTION="A LilyPond sheet music text editor"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -20,6 +20,7 @@ DEPEND="
 	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	dev-python/python-ly[${PYTHON_USEDEP}]
 	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	dev-python/qpageview[${PYTHON_USEDEP}]
 	media-sound/lilypond"
 RDEPEND="${DEPEND}
 	x11-themes/tango-icon-theme
diff --git a/media-sound/frescobaldi/frescobaldi-3.2.ebuild b/media-sound/frescobaldi/frescobaldi-3.2.ebuild
index 1b7def16a0ee..a71a77966f4c 100644
--- a/media-sound/frescobaldi/frescobaldi-3.2.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 xdg
 
 DESCRIPTION="A LilyPond sheet music text editor"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 64c70d4e579c..865f471b96a2 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,8 +1,3 @@
-AUX 40.1.1-fix-build-with-meson-0.61.1.patch 941 BLAKE2B b55eeaf227b092e11855fbd00ffadb3bc63c8cecb4689ea23351b525f4c8d1452b772edb344c07b6533b2831451e3c522f76290b85314e8db8760559f8c2aaab SHA512 a0e2940c11f8513b501e9f3561e68cbee93932a8b4ef967513399267b21f307b8b7a27eb1ffe89f6edfedf9e36f15a517dbef3fd3c0c4fc8d169356a80e7bbbe
-DIST gnome-music-41.0.tar.xz 898652 BLAKE2B cc72eb7be553ccefe10620a85aa3ee75aa30c1809e810a8ebb30a2ffbccebb9dc173cc79859e098be97fea9c964f0f6969f55c7c84ea9540a93a920376746ac1 SHA512 883f8862d5216ab30c3208a316378c2ef016ba52861c9261b8fa9ceb44f935e4dc35608ea66b333c3bf61c9dcc950fa338adfadc2d5e7f67a7a84467228d28a2
-DIST gnome-music-42.0.tar.xz 1651960 BLAKE2B 43ecee648441dab0b562e5a307554e62b3aac5f55f798bbcdbf99c50fd034b5fe52f9fafcac95a0e12e910499618337e37042ca7482e313b3854ed708f4f4cde SHA512 2e104188681337d200fabdfb2a332e4c01c8c0357580fc6f8c53fa0e44ebc4785c33acf0b32f201cad0acdfc0cb4a6dcf21b15842d0aa0b480add5f91d2a46e7
 DIST gnome-music-42.1.tar.xz 1652976 BLAKE2B 6a6f6249a0ae61895feeaf658e6d4b0b217ed198e2137edf2f8acdf03f8b9f0b35adf19c74d34d360f3a5d8f1e4b0c3a4004f4b14444c7ebe7b7327d94d86284 SHA512 4feb02459a010c83c66bde12d73be648e9e482117bda88ae2e44e93b59ac7c0b80522e8e4d7ccb38954465d7c012975521b0764f0a42dbecef737fe64d3c3bf1
-EBUILD gnome-music-41.0.ebuild 2038 BLAKE2B 320ae70e53fbf0fd10d422c9474e8ad51e9fec306d44286fbf00cb204b4b7bdfdbf1b3353e34d233e7dde1f99dda502874c3fcb4afa6c7ed59c43797b5d68275 SHA512 c39ca3701a2d60bb50c410159307ef08eda5af203e13fc1d023bc003578d15d3cfd04081d3aba6b429bc03305dd7db3a20c079c04db1623d3b69837d995a1e82
-EBUILD gnome-music-42.0.ebuild 1849 BLAKE2B 3d05926c2893b92f9364e5e1117edb7bc344119488e89c6c43fcb0c84c07eb114f5f279f19083841dfc8ae091592543590402f49aee1679bd5416c9abeffa450 SHA512 c8b1f5e332642b3c3ad34893f80da7620b458707303509bc00b6df1ef1f03ea054307cfe1dd9f082d95f931a5ce97fc20e588c446c00e670578026b25a0f4cfe
-EBUILD gnome-music-42.1.ebuild 1849 BLAKE2B 3d05926c2893b92f9364e5e1117edb7bc344119488e89c6c43fcb0c84c07eb114f5f279f19083841dfc8ae091592543590402f49aee1679bd5416c9abeffa450 SHA512 c8b1f5e332642b3c3ad34893f80da7620b458707303509bc00b6df1ef1f03ea054307cfe1dd9f082d95f931a5ce97fc20e588c446c00e670578026b25a0f4cfe
+EBUILD gnome-music-42.1.ebuild 1846 BLAKE2B c258788808729d4c9ba66191a916bedbd77640df404e4a48ba0660ca32f08539f2240e1dd8cf031206689fbad6ddd11282a2ec871d166172b65d0fde8570f2ae SHA512 0f2fe38e786f5898e458b529b7d650c72c4f568bd048358b897bebb512058c45df7f66b400a916e9ce61e0cf79653a9b8d71b8694cb1c0f4ac5a434f5815b0e1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index 4ae460ac99d7..000000000000
--- a/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-music/-/commit/d9f35b542adbf6b0e1114c7c077df04212a98fc7
-https://bugs.gentoo.org/831936
-
-From: Jean Felder <jfelder@src.gnome.org>
-Date: Thu, 18 Nov 2021 12:09:26 +0100
-Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0
-where it returns a deprecation message:
-"DEPRECATION: i18n.merge_file does not take any positional
-arguments. This will become a hard error in the next Meson release."
-
-See: https://github.com/mesonbuild/meson/issues/9441
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
- appdata_conf.set('package_url', PACKAGE_URL)
- appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
- i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
-     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
-GitLab
diff --git a/media-sound/gnome-music/gnome-music-41.0.ebuild b/media-sound/gnome-music/gnome-music-41.0.ebuild
deleted file mode 100644
index a60fd556fd2b..000000000000
--- a/media-sound/gnome-music/gnome-music-41.0.ebuild
+++ /dev/null
@@ -1,81 +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.67.1:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.14:3[introspection]
-	>=gui-libs/libhandy-1.2.0:1=[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}"/40.1.1-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-42.0.ebuild b/media-sound/gnome-music/gnome-music-42.0.ebuild
deleted file mode 100644
index 1ca03facd942..000000000000
--- a/media-sound/gnome-music/gnome-music-42.0.ebuild
+++ /dev/null
@@ -1,74 +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} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-music/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.67.1:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=gui-libs/gtk-4.5.0:4[introspection]
-	>=gui-libs/libadwaita-1.0:1=[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
-"
-
-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-42.1.ebuild b/media-sound/gnome-music/gnome-music-42.1.ebuild
index 1ca03facd942..61bf800171da 100644
--- a/media-sound/gnome-music/gnome-music-42.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-42.1.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/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 48ad2baebfc3..0d1b4cbecdc3 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,6 +1,3 @@
-AUX 40.0-fix-build-with-meson-0.61.1.patch 1456 BLAKE2B 3326dd305dbb9ba2fb24de56d0d6d96507ac6d995f3b01ce2cbbe8fabda6a697e8a4f76043c75ea8415a751b547ef7a58a8d1bdfd8799855d5d1d846567b5bf6 SHA512 d409749979f8f2f07830ca36d902b886cd92daa47fa4fc23b837c988ed2fa272bfce63242bbc08b48e6e6df686139a220c3fb960008b0b7dcf929c0b9d3d9393
-DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
 DIST gnome-sound-recorder-42.0.tar.xz 162208 BLAKE2B 6f4f17ad5cb2cd893626defb3b91e62c0dfbfdae4c815df934a2d35a7b0e315f689f3ea222d9adef960935828095c337e00076aba60b4c1b3d243c274063aed3 SHA512 53fe2fe0646c5055cedc1c62cf87176dca52bf3d9452d83bcc849d9946179afbef826f08ff65a97ede7a0d14ade4da0755b2ef3780460d5a80f8f9e6c85fcfbd
-EBUILD gnome-sound-recorder-40.0.ebuild 1116 BLAKE2B 8598f16aa62a75219e15dc6c9249b14d80463c1814d89de996c6a58f2a4553ffd8a3e8544f7e1b21915455701c4c09a319e10e44bfa1039de55ad0ef03285ab9 SHA512 8499a041cf2d6cc1efc2a99d2eafac12f080f7176169579df21521b0eefb94909d074e09d1340f162de3d5673b97aeeae544700569b3cc14b89b7fa3a19784f4
-EBUILD gnome-sound-recorder-42.0.ebuild 1104 BLAKE2B face159f8593dc5fc1eb734f38486abae2eecda3c66a2bac545f832ff2a8ef38307224179baf6ca7d05f0fd8241cc8cafe555c6d9673cbe0b6dce30d2e3ffb36 SHA512 4b368c148c36ca8158c88a7bc78056ccd8fbacdee90db6f4e2c5de881ab5f47083c0e5ae006208117d779e48c6a7e2578d082c560f04058c204ef14688418269
+EBUILD gnome-sound-recorder-42.0.ebuild 1102 BLAKE2B 78f8bb877f3030f0e6efd8394457279c14671cd20b9dba6cbb748480487e477628e8f2a30ead85b43ab97f57099dfa1146708a41342fd46a6166ae9171cd34b5 SHA512 6cb7e3b92cb0e8cd9c4aa96544e6d217305e0ef3aeb239287efa680f1ddacd4f262ec0419c3e7cc0d9e57ca64c4dec3230ee044016324381d0e98990d86614b7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index 0eea5fe096e9..000000000000
--- a/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/commit/1335b1b1aff61167f8648f7cb3c569764031960d.patch
-https://bugs.gentoo.org/831924
-
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:37:06 +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/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:16:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build         | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 1f5744e..d2c2c3a 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
- metainfo_conf.set('gettext-package', gettext_package)
- 
- metainfo_file = i18n.merge_file(
--  'metainfo-file',
-   input: configure_file(
-   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
-   	output: '@BASENAME@',
-diff --git a/data/meson.build b/data/meson.build
-index 44117ad..0ff8fa5 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -14,7 +14,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('app-id', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-   	input: 'org.gnome.SoundRecorder.desktop.in.in',
-   	output: '@BASENAME@',
--- 
-GitLab
-
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
deleted file mode 100644
index 06371a510876..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	>=dev-libs/gjs-1.54.0
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	media-libs/gst-plugins-bad:1.0
-	>=gui-libs/libhandy-1.1.90:1=
-	>=dev-libs/gobject-introspection-1.31.6
-	x11-libs/gdk-pixbuf:2[introspection]
-"
-RDEPEND="${DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-flac:1.0
-	media-plugins/gst-plugins-pulse:1.0
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
index e125245f0098..417b22aa2866 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/gjs-1.54.0
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 58a703969ffa..e7df8d93c94b 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,7 +1,3 @@
-DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
-DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2 SHA512 93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
 DIST gpodder-3.10.21.tar.gz 1105520 BLAKE2B c17905951c14a718e48d1bbded3abc41d62088bb517cda053e9fa71e3a952bb97ac57077d428cd58c3a048ae0cc18ef9385af97dcf8b460f3860674ecdb85c1c SHA512 5311a92469f605e489553e91586b788a8d07812e41c20d1ad0717c09ab6db6da22c356d5c1942293d1e27e25afe24caf3c14c15720250d8f230f2d7738206fec
-EBUILD gpodder-3.10.16-r1.ebuild 1610 BLAKE2B 596228e4048248000415a7012adf99d7df36997b224ac8fb8556888ad4548f29ae8525e889f3d099e67955b597cdb0a25158e38dfc6657b9f4bbd0c14bc2b8f7 SHA512 96674ef9cb7dec7147355c84e4e76f7f02b957aba27d550c4c32c7cd86cbff5d7e24e96ff8dcf70a58383b9ed0d3e10533dd5bd6014e0726027e1ff01a6c73a1
-EBUILD gpodder-3.10.20.ebuild 1815 BLAKE2B 9c4ce11ed36928b5c8f25dfac5c86be8efc27acb4d20d7dba094e4ef32af3b0409b8fd80f12c9de483d7a0fb5268b5ab7e9bc6fc2a5308310f254a9a00c10f6b SHA512 ffcdcf37455a3d4310da4042eb14826379f4bcd4c1d64e795c78655ffe5a394c2b898fd61fe2c5af532daa5916bf73af0b1b8c25e1f32f487726fd98fdeca4d8
-EBUILD gpodder-3.10.21.ebuild 1815 BLAKE2B 9c4ce11ed36928b5c8f25dfac5c86be8efc27acb4d20d7dba094e4ef32af3b0409b8fd80f12c9de483d7a0fb5268b5ab7e9bc6fc2a5308310f254a9a00c10f6b SHA512 ffcdcf37455a3d4310da4042eb14826379f4bcd4c1d64e795c78655ffe5a394c2b898fd61fe2c5af532daa5916bf73af0b1b8c25e1f32f487726fd98fdeca4d8
+EBUILD gpodder-3.10.21-r1.ebuild 2133 BLAKE2B 3e434d2681a559a1a13f471b0c889b83d4343f607e7164377e6df96418f45bdc50408ecb73d5569d5d8035eb056970273912c7e0729d23cde0403ff1c7b9733f SHA512 2530fd53802d9f32e51c92750f0b58ac9b3eaad5ef8e9ee39418941421b663be4da5586078451c249abe78c486dd139fb31081f4c59d15726acd20541f59eae9
 MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
deleted file mode 100644
index 9e32490864de..000000000000
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth mtp test"
-RESTRICT="!test? ( test )"
-
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
-# support python3
-COMMON_DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	')
-	bluetooth? ( net-wireless/bluez )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/iproute2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		dev-python/minimock
-		dev-python/coverage
-	)
-"
-
-src_install() {
-	emake PYTHON=python3 DESTDIR="${D}" install
-	distutils-r1_src_install
-}
-
-src_test() {
-	emake releasetest
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If you want to use Youtube-dl extension, you need"
-	elog "to emerge net-misc/youtube-dl."
-	elog
-}
diff --git a/media-sound/gpodder/gpodder-3.10.20.ebuild b/media-sound/gpodder/gpodder-3.10.20.ebuild
deleted file mode 100644
index 5ac6cbc3daf0..000000000000
--- a/media-sound/gpodder/gpodder-3.10.20.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 optfeature xdg
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth mtp test"
-RESTRICT="!test? ( test )"
-
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
-# support python3
-COMMON_DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	')
-	bluetooth? ( net-wireless/bluez )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/iproute2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/minimock[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:--cov=gpodder::' makefile || die
-}
-
-src_test() {
-	emake releasetest
-}
-
-src_install() {
-	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "for the youtube-dl extension" net-misc/youtube-dl
-}
diff --git a/media-sound/gpodder/gpodder-3.10.21.ebuild b/media-sound/gpodder/gpodder-3.10.21-r1.ebuild
index 5ac6cbc3daf0..c1e0a35b24db 100644
--- a/media-sound/gpodder/gpodder-3.10.21.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.21-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -16,9 +16,8 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth mtp test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 x86"
+IUSE="+dbus bluetooth mtp"
 
 # As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
 # ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
@@ -46,24 +45,31 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/minimock[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
 		')
 	)
 "
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	default
 
 	sed -i -e 's:--cov=gpodder::' makefile || die
 }
 
-src_test() {
-	emake releasetest
+python_test() {
+	# These are pulled out from the Makefile to give us more control
+	# See bug #795165
+	# Previously, we used 'emake releasetest' in src_test
+	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
+		-p no:localserver
+	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
+		-p no:localserver
 }
 
 src_install() {
-	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
 	distutils-r1_src_install
 }
 
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 46946d5c1deb..7ce0f5dfde56 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1611 BLAKE2B 4ea5c5cb6ce5f527c4b893fe2acff055b566a828c53ead56c06b80018b54363a7ef8d4d5485a91a7f65550618f69c4e5c9de2ee59834ff6046d196903c82380e SHA512 d8b5cad2f488cb326e9c62d3541e6110c226176c26a5f3decb94aa73b62b8d4a4bae7aa4ead9f19a20e250c5d30b146f13df0555880316c1192c5f1c5dc5bce3
+EBUILD gsm-1.0.13-r1.ebuild 1618 BLAKE2B 5bed41ca314d68c3c56186d3cd27110ef64dab5ce30788122d60b6f2ccdd861bf9a67c6aebc904b123f27910145e39db8d355b6d408781e17d5726e21f37ef39 SHA512 0afe85dd7395efdd3b7d2572e011810dc085a060de4b7545f9a8c5a15f64b0b5df2635d268066c906529bbf55a2fc980ee8a385179929f4994aa4843688f4d28
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 694195884bbc..6a0a5898782e 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
 
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index cc9101afb8ea..d0c431edcf95 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -2,6 +2,6 @@ AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30
 DIST guitarix2-0.43.1.tar.xz 71742288 BLAKE2B bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101 SHA512 30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def
 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
 EBUILD guitarix-0.43.1.ebuild 1798 BLAKE2B 5af82156be27df513cffd2e6e999deb201960c1fc7b5f44523e37151c5150a70ac5ca273365d29338f76044d51f49def5d104204ee5cfc5a6f77adcdf0baabaa SHA512 0d99a6cfb0e7aa3e1bb8e9307d208b3e06ac39ed62cc85beb198d90806e1e28dd015dabe076fcda25106270f31f2cb37498aac4765c7c2eee85af4ca9067185a
-EBUILD guitarix-0.44.1.ebuild 1799 BLAKE2B d5562035feea9bf75b841c476970466757d1b6c298392aa2c64df88909ed7a711b1ffeac5afdbb34254a17dc5701aebc47bf8e552b5e124ceaa00ef16c13cefd SHA512 3e83087bbe6c2e2023e31c294b4a5f71a76479c2ef5d8f53912d9b32352faa9d36434d37a8e959ceec1e95e5d0d50a0d632a2aa1db729c122ad9bc24c9dfb9be
+EBUILD guitarix-0.44.1.ebuild 1798 BLAKE2B 5af82156be27df513cffd2e6e999deb201960c1fc7b5f44523e37151c5150a70ac5ca273365d29338f76044d51f49def5d104204ee5cfc5a6f77adcdf0baabaa SHA512 0d99a6cfb0e7aa3e1bb8e9307d208b3e06ac39ed62cc85beb198d90806e1e28dd015dabe076fcda25106270f31f2cb37498aac4765c7c2eee85af4ca9067185a
 EBUILD guitarix-9999.ebuild 1888 BLAKE2B a22ef008df2a04ee6c422802443dbb51529c10d038dbb9debd7c5003f7ca27e30dc4698a321975eae371f8f039cf5f6637ef78d251af4a2a01742d218a102b9d SHA512 2cba01b8b5718186923ace248dbf68d5a8ca3a0e160d916c16d3ad1a87ca20ee8f3155915d2674bcafbd1a42f91193e55d5b42802ce75aabd28b8e554e155864
 MISC metadata.xml 692 BLAKE2B d71528f5f53831df41070160d9abee21667fc98c2000f28f87abd1669497cd7dbdf5f16ce8401d54e1886eda75ba7f991387586b9c758a35c5b5a9dde6a29a2a SHA512 0444744e99fd322718d0cd5b42406b549e72db08ca053a8ff06fe405646946291038719e6b6873dd1695b6661e2864c03f225476108b2424a5c9019e9983a0c4
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index d85e289e2d53..cd2c72ecf68d 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index e9221c5f9920..16d6c10dbf01 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
-EBUILD jack2-1.9.19.ebuild 2399 BLAKE2B 86e5f0ab5115cee946ce94003aaf90171b6867f91c4ee051fd57c8246e90e952450c20182ea871bea170fa01fbdc4cdcb5f2cf390adfdd2c01562092d3c1bae8 SHA512 ba5bb433a77a7fb0059b348cdb0a4519e98de0d88b7709ec8a8323f85f46f44796be264571f5c1f47800cf3747d44754cb396c4942ec7a6126b6c78803b43023
-EBUILD jack2-9999.ebuild 2395 BLAKE2B f663eee6c44cb65f76a12d5b599a887cb0d56be0644dedbfb8e06368510a7ae18522c80bd9c0ef290ceb1af3e1f06eb60b3e4fb18b0c229df83929b155647cec SHA512 bfcfa9479713d773706964daacb266168d7c019da1af2528ee6aa2d1c327443718086536cd28b2fb71cee9da1a66dcb768f798164c0cb551f4e1cd9d829f6aed
+EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd
+EBUILD jack2-9999.ebuild 2412 BLAKE2B 65194019b04dc690d6010c8ac55c5988cea668126a8dc70ee9f263bd4836ab24d2a5b415dba4c29b184a85bff6291a8ddef288c0241613775104abe8171125a5 SHA512 62abc0b9716462d37c5625bfd6ec2b9d1fe1e2598400a0c33b9bd5d0d365378339d1a907084e1803baacf85768255c3f064b0a865d25a2d0292dbea33753f24d
 MISC metadata.xml 558 BLAKE2B ed8d67f5415217b100f387357fc1aab1cbe86e85b13c3b62a0a2f9635a69393cae4448cbee23f98cf82c1b4fe8ead065bd454ba2e1bbc3ec792b04fdd4f41801 SHA512 fe988bb462c83872e12031977f135454b331e41ec293cdb7a3247a52b170321d5c438fe5fdc54be93d7dc81a72ecd6e963a901e31d1bd40e9aa9644871b85bf9
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
index 502d34d9af2b..8b2b7719b6e4 100644
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ b/media-sound/jack2/jack2-1.9.19.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
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 06fe3cac36bf..eb214ebbb404 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index e752df8abea0..516b0d533ac9 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,4 +1,4 @@
 AUX jalv-1.6.6-suil-always.patch 410 BLAKE2B 7aee87986df386383990e2fc1c012592c95793a3ed7d80faa98c1946130d591eca283db62954bd6c8419cb0b57ef600ece58886dc5c33be7eb0d0addc8b09d81 SHA512 534cc589ddf8f40f32c9c5febc71a6707bc546a6277f5fa556f65f2fff20f053851063449723708460279d22efb45b505f8bbc5e5316781164ed33993847bfb8
 DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
-EBUILD jalv-1.6.6.ebuild 1220 BLAKE2B fd07f3e2a675afc446532077147f4324025eae70720396c132e209def4d5c1f183105b4affda28a06cd62ff9a70ff0b0aec37445b1a7569ca8c8ce5c8212786d SHA512 0ac8b2e49cdbb4814462f02c989bd3fc6e87f4b6970ecec113a3c2e40d5308d82e5e812ce0322acb4746006443111aad91734f8b3b3b955b8bafb7df1e255c86
+EBUILD jalv-1.6.6.ebuild 1225 BLAKE2B 41279164b25dc1780af6293e57dfd64623faf3bcfac22a408520a4bf01c40c10a0be1ffe8e885ff1d04aa12aadc8114939dc39f6f67784e48342c4ae4601e8a8 SHA512 e7a983d04024155d965aed445c469dd84232ddca921be0809928205e68ee5496d9fe0ca8150ea206cd25fca0ecc7e9f577ccf7fdea217e1cbfed425f46f66e40
 MISC metadata.xml 1052 BLAKE2B 31fa13d83562029a188556d91133d432f899d515f28f9f3254d17412b74ba2f123ba3cbdce0602a2cc8d16f887d74622928d462729fcdb7082380e78bf39cb37 SHA512 353e23ebb530a497d1fb70f3906326d02f10a0c5127c99133397ce575977f4e029fdad7933d3414edfdb585357061f4be6d218c1c9a1cac3ced2bf69f1fb35b3
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 42870c71a5f1..4e6f6c0e6aa8 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -1,14 +1,14 @@
-# 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,8,9} )
+PYTHON_COMPAT=( python3_{7..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 qmake-utils waf-utils
 
 DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
+HOMEPAGE="https://drobilla.net/software/jalv.html"
 SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 89db821c5050..3bb6c8939df0 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -2,4 +2,5 @@ AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
 EBUILD klick-0.12.2-r2.ebuild 1083 BLAKE2B 56b91729dedc79d6f5718d2d38801483f9530b49a44be395b54b3709f1615e8b9501babea8c3dc79a7d4f9dc649c9a7290270b8590541fcca0a2a64e22eb6b45 SHA512 8268dcfb3c7adf45469d367a9c5c7d92ffaa558d4e473bc93099fe76638a083fb5f7c8cf582f58cdda768f80d5c6c6129fc5d71bcf51c8c766a406cceb1e193a
+EBUILD klick-0.12.2-r3.ebuild 1082 BLAKE2B 2440555f5de20232a37c526cc80e79c90f9389e433ad532f956a21d86ff16e3ffdcce1a3e4b747dc822dbbabc6e5bb86ae50e0af21bfdffad5bbbdabc466d151 SHA512 1ab6f94402a193b12a01bfe3bcba844fe4fefb2ae251983af36542fe00a08f8e883092fb0ab7be78a1df9dc13591642cf18fc7681238d3f1a7f1ef26e2e9cb8b
 MISC metadata.xml 546 BLAKE2B 6f3499cca20243d15ae34193598bd09d8d88a40759744b440834fcab459d71e383d1584c575e346ea376552a1f0a40c098d9892b9963af1a75846dfaa4542420 SHA512 af8a15367d57e8592ee6271ac2ee6844170fd953542b9bd7d83ead0c5461b948a63513045d936f27766f8caa0b68e270bc6f500072db453eaca767cde98d239f
diff --git a/media-sound/klick/klick-0.12.2-r3.ebuild b/media-sound/klick/klick-0.12.2-r3.ebuild
new file mode 100644
index 000000000000..dc5e78d639f9
--- /dev/null
+++ b/media-sound/klick/klick-0.12.2-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="An advanced command-line based metronome for JACK"
+HOMEPAGE="http://das.nasophon.de/klick"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug osc rubberband"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	virtual/jack
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sconstruct.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+HTML_DOCS=( doc/manual.html )
+
+src_configure() {
+	MYSCONS=(
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+		PREFIX="${EPREFIX}/usr"
+		DEBUG=$(usex debug)
+		OSC=$(usex osc)
+		RUBBERBAND=$(usex rubberband)
+	)
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 926b4e738669..2e9bdc9d8263 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,6 +1,4 @@
 AUX kmidimon-1.2.0-fix-cmake-pathvar.patch 579 BLAKE2B c3a169a4d947aed747fcf63a01ae550759d78b26315fccaf5e7a4666f3b7807ce655add3028800144fa075b78bbddb86afd443a357a00e0b5f6db8840219529c SHA512 dda87e16ae63a6bacf40faa3dd02ef26eb2a90040a4e27bfc7f6dd9c26b8415493dcf63df4b15488d80deb23655e5c6a7045822ee765961800d95afb81ed975b
-DIST kmidimon-1.2.0.tar.bz2 696057 BLAKE2B a0a3cc8ccd7d9f065c5b1b5594a6baeafd36e4a124207bd8b8f55a3d3c22f7bc7eb84771b51f71f07f3251da3d796a79980a8e22a545576220dce17b354a1403 SHA512 ea62240438111428b1b10e4df2179497495038a376b848cd3fc910ca5eb6126a63f1ebafe9eb1408a0037a9626ffab5bf43e7e3cc31608d878b329450ec17463
 DIST kmidimon-1.3.0.tar.bz2 698412 BLAKE2B 185125fda809042a064b225f14ef5c04c69f07bda77d2291d2719256ccbee122bc181d9ea602cb43335f764ae9576daf79966a681637d080f5e3533bd856715d SHA512 02085e6d6768fe5d35649446ec5db2eadcf34b4c727fb250bdbc33d79c86a16d6dc3993ddd9fe08e93e08e1400fb3f56bb71913020ffa410f56ad7168bf08b97
-EBUILD kmidimon-1.2.0.ebuild 740 BLAKE2B 6a273d79f052ad37fd8cc32693d275b09f82fb34e51eefdb0288ddc4ea2d710809465b52cf9682c5336b0974d05f068d9397fd0c4ee2d77bd52e41fe119b57b5 SHA512 164d7c8d782b96ddd382e2e12de098b1ad6faecb3816d8c835dbe89c9e693cf44efda6fe9eef97d4ba97144a1845584b07035e657334c806f6a0bc5a9a0629fd
-EBUILD kmidimon-1.3.0.ebuild 749 BLAKE2B 2b328bcc8f515975f2b6668e4fd8e2d597e697aadbc05f79512e32276e191d39f94ed072d3c308e48f49d3ed9955b41cf660d44c50ffdb9b629c6a9c7fabf07b SHA512 38d53438018478ffbfca437fd17f16c95f5a07f17df86f5cb33892802eb536140d423f65fbd22d56321a700e6bfb847014b62af4a4079ca4ff850ba09ff1858b
+EBUILD kmidimon-1.3.0.ebuild 747 BLAKE2B 3fd99444aa6485220a108f0f5bd62089823e84fbd41dab48a12d04cc81fca453f03306bcb417d32b319cea28d7500ec9b9b4998480bad33ee5e4a0260c2d12f7 SHA512 eab108f943148e3cb198772f7cfb6824e2c355811e324b37890f4e179ec7f07a1ffc324b06a1f5fcde17a3e8ce48baf0784aabba44dcc5497413b11f1105f25e
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/kmidimon-1.2.0.ebuild b/media-sound/kmidimon/kmidimon-1.2.0.ebuild
deleted file mode 100644
index 203ceb048fe8..000000000000
--- a/media-sound/kmidimon/kmidimon-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="MIDI monitor for ALSA sequencer"
-HOMEPAGE="https://kmidimon.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	>=media-sound/drumstick-2.4.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cmake-pathvar.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DUSE_QT=5
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/kmidimon/kmidimon-1.3.0.ebuild b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
index 846c67c3cf42..a8a7c43aa1ff 100644
--- a/media-sound/kmidimon/kmidimon-1.3.0.ebuild
+++ b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index fc9d1836175a..e46579585faf 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,5 +5,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r3.ebuild 2254 BLAKE2B 576ff5aeadb26c51210b377a134b56aa366ef073d90d62f616501953d762da95d5c2c8a038e4ef3ecdf80805cf8bcf4776f0c124bb7bdfbeb4683e3d449ec796 SHA512 5e6b6ec2030988261a0d811c5778947139bde631d664a6e85e82f43d7b7ca71304cdea879f202ac6b073a19b2a3bd02e30e9659ea9be3ac195638b7ae7316187
+EBUILD lame-3.100-r3.ebuild 2261 BLAKE2B 8a304712643dccb859f5348ebebfc62e8aabb06150386dfb8b9562846373db51dd24e1b2472518c49406fc22c6040be455c6d60fb9b8058ae15f979ade86baf1 SHA512 1ec85aefdc478cabe50548b364e190f628f685ed19c72338b8d8fb36b83b2d33f89f667ce1e44f8a7973e077fd6e0a4fce58a52567a99b6049a056f88c01c795
 MISC metadata.xml 543 BLAKE2B b37a7034391c1b0c32c05cf79529beced7071326354c74be6db19f7acdd5be9f28e316afef01d32b57599b858a18eb8420d7c2827da132623d471c95ddd157a5 SHA512 aea8cc6b756083083fca9a10017c1d61da0737cdb14c0071e071537a7d728c980a2cbecf307bf3b2e35f0795ac1b29b6ec96ee5b942719b52eff91145846719a
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index d6ddffec4f7f..81614f5d7e48 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 28048b4ab6d5..0f4d25e6dd49 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -5,4 +5,5 @@ AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
 EBUILD lash-0.5.4-r4.ebuild 2587 BLAKE2B c88135133e9c6401c309e936611b909c901e912485d1af5b946ff2af54f1e8c2911936dc927a0a96889f213a79033bc502e1d1c016961490672e21aa6f37b738 SHA512 74f9459771d9275fccc8f883d141e9c72bc5a652db3713ca89651748ab59cd8410d13eaafe59d8e7ddc67b855383c7f92adc8e0bb012ed3fd8986e5347f46c3f
+EBUILD lash-0.5.4-r5.ebuild 2587 BLAKE2B e339534113e547c462a196e756be87ee4ddab21fbab94795cf792958d5453cff1671854c24785f475d0551ba3b6c66e42f25cfaecc7d26faf1d737fda43c26c3 SHA512 9dfbbb4eceeb95289bd756755399fed1bc93a08388256f2321dc301dd2787064e85bddf1f48758d7d43ef32ab6a5275f5d2da9aa2e5fa7ccc23d34d4397a7fdf
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/lash/lash-0.5.4-r5.ebuild b/media-sound/lash/lash-0.5.4-r5.ebuild
new file mode 100644
index 000000000000..8a2d81ff5459
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..11} )
+
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/libxml2
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc2.8.patch
+	"${FILESDIR}"/${P}-swig_version_comparison.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-strcmp.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	default
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+	export ac_cv_prog_lash_texi2html=no #422045
+
+	# --enable-pylash would disable it
+	local myconf=()
+	if ! multilib_is_native_abi || ! use python; then
+		myconf+=( --disable-pylash )
+	fi
+
+	if ! multilib_is_native_abi; then
+		# disable remaining configure checks
+		myconf+=(
+			JACK_CFLAGS=' '
+			JACK_LIBS=' '
+			XML2_CFLAGS=' '
+			XML2_LIBS=' '
+
+			vl_cv_lib_readline=no
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable alsa alsa-midi) \
+		$(multilib_native_use_enable gtk gtk2) \
+		$(multilib_native_use_enable debug) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C liblash
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		# headers
+		emake -C lash DESTDIR="${D}" install
+		# library
+		emake -C liblash DESTDIR="${D}" install
+		# pkg-config
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 55556c7fe586..217696ef6fda 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -11,5 +11,5 @@ EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B f3bc95cf64354299ad77cb0da56c462582
 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
+EBUILD lilypond-9999.ebuild 3176 BLAKE2B 60af582a48928bc117ced6bcd05afd27148e79ff1e3f234d8dd2555f92a960840047487f40b053511da7545c2933536a1495638439b2e2f476d737e0a504ff80 SHA512 fbde53e8d8ddfeb09bbd6f0586c404fc18545e97b60042083879bfadc48f3bdb6e9934874b6aa74be5112c2b3eb215952d1d0ec27a8cf65aecbfbe0cd8f4900d
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 267d1a8af4de..4690f0a0f45f 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -62,7 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
-DOCS=( DEDICATION HACKING README.md ROADMAP )
+DOCS=( DEDICATION README.md ROADMAP )
 
 src_prepare() {
 	default
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 122583f4cca5..ed35b43d754d 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -2,4 +2,4 @@ AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e0
 DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
 EBUILD lmms-1.2.2.ebuild 2389 BLAKE2B ff3dddfb8a47dc565f7c82514f954a124c72b3a6dccd3e8d0f276bdc33bc0b5164e79631de8c55096653d5b9b56004d3516f1543f4e35179964f0e429b94f2b2 SHA512 532fef9e5ee73d37ec81bbabb81782885c03f45c6c01c94c66e5c6e01f901c3f7cf138219898de50c7a9a3ad35514247c1c9b5a9f9aa9269f49635114c3e6cec
 EBUILD lmms-9999.ebuild 2246 BLAKE2B 88f22a3d435705010d70888a8799a0f00a1cb16d352b64509b2893485be1ad7cda4d9876c4840d198a376b3ebc7c4e3b6adf2675e03605037bba3f86bf6a1456 SHA512 2c0ec0790a17939aedd079c9ddada1e08407c5ea0b52748445690f8554e1c80dd1daa3c2598dfdbe07d2f050e55e391b1308a1a3d7ce1b44253d794da1b1f8b6
-MISC metadata.xml 957 BLAKE2B 3e6b9df6b632a269ff79274cb7a4d090bd7065fcc8fe2bec09502b87e40c699cbe1992da63b49f3a8473346fe909d058c8a66be6478572f6c7c775f68e5d80bb SHA512 4318f0c494ca5baf9bdc1c083f5a893915009610208c5b8ace83803b3b837da646890910bcbe3aca7781a055e0b7d70e981196364a0d3331c8095a91f987e54d
+MISC metadata.xml 845 BLAKE2B 4b6d93d9fe8a7d26b145e949955cde9e7c09abc08737f69417e94fdd5bf36b35ab4ed5f4339203106af18b7b2b7f874fc8a6cc8873c50bdc89ce4e764211b5ba SHA512 6a84127fb0cd31d11bd8c82a4e92c94eccec4bab30726a16e4740663a520a0ac0e5778adfd29dc5012fbc0ac58fba532d9c6e7abaf71568682650c553ba8e4ae
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 631d11db0a87..32965e9b9b51 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -5,10 +5,6 @@
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index f1ac3b6ec9b2..3fe9c11bc4d0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -3,6 +3,7 @@ AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1
 AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4 SHA512 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
+DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80 SHA512 6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 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
@@ -26,7 +27,8 @@ DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b5300176316
 DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
 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.3.2.ebuild 3759 BLAKE2B 57f0e43cccb9b766b1705570119cd16b3bbb67bcba1119daef74df6d0499f2c3cc02403216e3c468fede0328d8fb6fdd0ab796913f0249678ef0e0432b37ed03 SHA512 f4b75ba9a27acf3e30209c59d42b6edcf37ab8abdd00f76cf6bd491607a95b3be090486771dd71cd91ea7cea508419538f788df4b3d6b7255ffd11ecfd8adb0a
-EBUILD mixxx-2.3.9999.ebuild 3667 BLAKE2B a110809c0f831aaa12707c87a3befe96898a4ede480b141684af14ee651c7af97ab36e827ae35a729388b8487d08d387a2d94de6589202dc0f911ec775569dda SHA512 0ef19fd437b1c957d31470ecbefd1fa38a4596479f73f96a4da903c4457c0892dc833f34b5d4ecf1fce7e580ed7d1a39c4d7e5ffe8042d3bfd3b3ec1ce10c582
-EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
+EBUILD mixxx-2.3.2.ebuild 3859 BLAKE2B f16bb13d68f53b6d5bfb32a6d70a554e1cdf8319ba1b119bb6cefc9f21af6e0c6e6557d334231eaf76161fab76e125121f6c4ad6425479a7df4b319944dfa990 SHA512 3636ffdb17755ddfd2da4fae0165dfa2c975bec20dbe91b8881b5cee6866ac682bd60be1bbbb1aec3b11a09bac6ff2b50a51a83c764529a3668a8728165c731f
+EBUILD mixxx-2.3.3.ebuild 3861 BLAKE2B b49f181045c3948cd797fda52bcc34bb1d33775fe43734a1a5fbb0974f9835647647933631deb54be6be2b94dde7e0ea631dba985ddd192578cc4b2273fe8aef SHA512 812c286953d568315ee25467fd7a20495867fa953e32d0d44f81a2d343da0fbe05f52fd8a906a5d5f0900a4dbfff3b7b17d4b34f8d4eb0a6b0d0ee74e46fcaeb
+EBUILD mixxx-2.3.9999.ebuild 3767 BLAKE2B 9d4019cfb3ed76d1aa389d36f3280094a6cd6096b6a68bf7403a63821c1ae2a5372060861dd73089ea8e8956d82b63ff0ffd3cf7b81cbde491bfa3252a934111 SHA512 0d6b5a23a461b397039ae539aa85f28354c1489b5bde9b0d47a489644f2a40610044c45da264144567855f4276c96afe2f2daed2bfe9959f7bcef7f2d543e881
+EBUILD mixxx-9999.ebuild 2838 BLAKE2B 7b3371f5562b4c546547eb7aa0ad038045d19239d6e39bb9ac57498badc53ae6eb94f3dd1e48727412d27ba4b699e6b704c871761169aa609d75ecabb7430354 SHA512 46fb3746bbe94aa837654304c86651b8b27f9bee806ad292ba7957ca4c07efffe3d6aab40ce513b2b25e2bcf31a3afd18ec7550875c0e5fab2ba5794c2d24467
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild b/media-sound/mixxx/mixxx-2.3.2.ebuild
index eda1855950ba..8261053464b3 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -151,7 +151,17 @@ src_install() {
 	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
+			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
 		fi
 	done
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild b/media-sound/mixxx/mixxx-2.3.3.ebuild
new file mode 100644
index 000000000000..527500bba678
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 73bd3177b918..ef33c268c4fe 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 
@@ -149,7 +149,17 @@ src_install() {
 	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
+			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
 		fi
 	done
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 8b5963df7ac6..3b37660dc9e1 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.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 cmake xdg udev
 
@@ -129,3 +129,13 @@ src_install() {
 		dodoc README Mixxx-Manual.pdf
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
index fca116a48da4..b1e7f2a73f42 100644
--- a/media-sound/mp3val/Manifest
+++ b/media-sound/mp3val/Manifest
@@ -1,4 +1,4 @@
 AUX mp3val-0.1.8-open.patch 477 BLAKE2B 8478e14f62b66b104de26e002a6f04271d96ee45c587ccb62ba808597531d8aa9878477443efeb62e2dcda534a9f213c11084634c9f0006301f330a0a420d29d SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22
 DIST mp3val-0.1.8-src.tar.gz 21406 BLAKE2B 5b2a3697db40fb9c450c6f3c23834e137b01b5a0e5787079e8b50a2b0c4e98e988077680e54541a3022601a81aee86950eded02e526c41ea0f11804613852de6 SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604
-EBUILD mp3val-0.1.8.ebuild 658 BLAKE2B cbe7c0b29423dc6b68d36a8ea9591701e252db3f8bbcfcc1575924d6744d29fded4d31eab462fbd35855a7937e4e55b2de671dc58c614abe40be4f7cda34d305 SHA512 635bc246f03a21354a28f260203b94a721b0c18d92aade3707567e283e83a135ee29b90a82346ddad8c30f2e57d893227bab151cb376e06110a53f43ff230da0
+EBUILD mp3val-0.1.8.ebuild 657 BLAKE2B 84279894c8a9164ab2c0685ce781175f2874e79d5c37adc947e3316e18a56e44cf41694bbb8365fc8901440e9b074a95a837a28c6195d83c8f3ee75408e5c41a SHA512 d22ab39517ba066e49d08ff30ec95e32150667756cda900a294926a58395880fbdf5dd726f2b3ccacd1e3186b29e1de7f539682a76a7e459c313ddb74f5222b9
 MISC metadata.xml 357 BLAKE2B d34e74d1f942d164d1ab4a5006994a7bba614d7769b90bc7f7d2b809dde6bb735a113709e7ee906dd3cdcd113ae53ec09880ce532cf7e8c0aef91fac49cc00c6 SHA512 9f8eee82387053eb90b05c02833c4567e9190ecc9c26e4ca5a4083aebbd46c3a389a2773e659cad6780b03b5ef1509116874e3ffa12dd50bfb5e7e59ad20c84b
diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8.ebuild
index f4b74ed3c030..3294d430344a 100644
--- a/media-sound/mp3val/mp3val-0.1.8.ebuild
+++ b/media-sound/mp3val/mp3val-0.1.8.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=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 8cbb21b4ce91..0c1cd5ab4fbb 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,8 +5,10 @@ DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a14
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
 DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
 DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb SHA512 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
+DIST mpd-0.23.7.tar.xz 771992 BLAKE2B 2c75196c37eb8d075cca2881bb7ed10e434a071d3c64bb7cdb3bb96dfea74c30de2dce5bfdbc51da945df325d9f278cdf8dd03b7ba07c0ad51cea50971f4a143 SHA512 2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6
 EBUILD mpd-0.22.11.ebuild 8432 BLAKE2B 8f392818d046de9043ab4687b974e04bef7bd862250eeb9f54781b4379f399685a1c5e494e45737df426de23865b4b7ceda01cef76c3b9a2bf4938ed426b04f6 SHA512 9804fbcd13f02f6476f926502c926b008cbe9d765dabb17a15516cc7ec7d0cb1412274227c8c19564dfe47e6a2f2f397ea3a94b0bab3d812bb19ffd1ef421d11
 EBUILD mpd-0.22.3-r1.ebuild 8126 BLAKE2B 818d798cd6bc84639490e60456023bad57ba0b5e08533b903744e03fff1627811dde55f3b67f7600af10e00b17c6b490acf7fa3a616e3574001ffc5494f95aae SHA512 30f4ce07449598a93429ca88307fd5e9ee9471ce742f350ee0521ea68a6a9b4c7144c2c6ee8c93116a797dd36170189ef907d9cae77cc46b77a58df6be79ad1c
 EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b2d44e7c7e176a5f8a17126b1dea267b34ada121e39286fd8b90875750e7e75f9129d20a10562a84d331fb0 SHA512 76f547fee10a657ece1d41cbe9b0f4479525973ef616f6b1a5848096322326bd99d47d7f70c55bf48cbc83608c84f18ec60ab296c535a3ea870a2ad04625cb83
 EBUILD mpd-0.23.6-r1.ebuild 7845 BLAKE2B 3d90c4be809d911408d5a2733748d13718518816a9e163997a8b9b70bae4ae43c9f08bf1a4848813250f3c17d6e46b39bb86f61fc367491d7d1aeefe67ebffd4 SHA512 f2fdc13933b6d61b900bd107e81bdeaab17f415b80743684dbb38c912600d04b599665d391f67dcfb890d2b30a7031606a48b54d1dfcab170649eba175f4aefc
+EBUILD mpd-0.23.7.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.23.7.ebuild b/media-sound/mpd/mpd-0.23.7.ebuild
new file mode 100644
index 000000000000..a0d2135688ff
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.7.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.68:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+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
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		$(meson_feature ipv6)
+		$(meson_feature cdio iso9660)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mms)
+		$(meson_feature nfs)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+	)
+
+	emesonargs+=(
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_use fifo)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_use recorder)
+		$(meson_use snapcast)
+		$(meson_feature sndio)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature audiofile)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature qobuz)
+		$(meson_feature soundcloud)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+
+}
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 46ab2c6aef9b..9e3f5f909ef4 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,10 +1,11 @@
 AUX mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch 682 BLAKE2B 2f5944640d764dc77e601f74b22ce8487c80ec69827b3c3d551e732c33e38b126048e9c877e37e1732ffd18ae57808ee3fb1dc529653da1fa523be8499fdc0bd SHA512 65c153616b9b7d471cf793cec3294aa983247fc5b9c218a4fdb9ff9825c38499f5bfb7b81c1a98506e9102d1bc347e94d21f2296d50871787cdfada03a69aaaf
 AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAKE2B 9c70170c57f1eb1c43e22e824f1c208bc4c72ad751e10f68195e42fd331342bca4bc3066af671382258102bc63dd75386ead151e0ca8218e8df945373293db7a SHA512 d6c5582a7f4fc2059679ac8bba7dadd63133166522d63efce0c4adb77162fcedc8bee9d03cf4d192d9c6f97e827225b1993d0831e752f5c54f4badbab278a269
+AUX mpdscribble-0.23-gcc12-time.patch 1184 BLAKE2B efe572750084d7c625007280fbb3a7e5703aecc37e81a0a0f4b6d81bfa9d2b855e684c8da0d64d5c825306a1cd9ed7d23d2a62ba7c7eb9f9bd9f0f33c1491f7f SHA512 cafc2aaa95f4e9a184ae1724c1343991ee9f2b4937ae09ca41abdbf2e3d09263229c3d9070bf8b8ac37b0d2a583d8c6bb20dcb49ef55e5aaa9323851584302d8
 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
+EBUILD mpdscribble-0.24.ebuild 1049 BLAKE2B 1db73a25ab89729df94c009fb55be4d11de546e3d52f96204d852c070d9c6c6868d6bf6a258d51b3acc666946af07e2e28412a998351077e3655b0046e035c70 SHA512 3e7ba1db5e0fdbe1957d84fef30c5137ee21136940f6ebf4cf650aa28294e46e9a9d9e3e116b8e4fe377a26b0422b5dc86b0dc77bb4c3d49b5358956b662bb51
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-gcc12-time.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-gcc12-time.patch
new file mode 100644
index 000000000000..7a6a247d73d0
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-gcc12-time.patch
@@ -0,0 +1,37 @@
+https://github.com/MusicPlayerDaemon/mpdscribble/pull/42
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 12 Jun 2022 11:11:08 +0100
+Subject: [PATCH] Fix build with GCC 12 (missing <time.h> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following build failure with GCC 12:
+```
+FAILED: mpdscribble.p/src_Log.cxx.o
+[...]
+../mpdscribble-0.24/src/Log.cxx: In function ‘const char* log_date()’:
+../mpdscribble-0.24/src/Log.cxx:48:13: error: ‘time’ was not declared in this scope
+   48 |         t = time(nullptr);
+      |             ^~~~
+../mpdscribble-0.24/src/Log.cxx:49:15: error: ‘localtime’ was not declared in this scope
+   49 |         tmp = localtime(&t);
+      |               ^~~~~~~~~
+../mpdscribble-0.24/src/Log.cxx:55:14: error: ‘strftime’ was not declared in this scope
+   55 |         if (!strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S%z", tmp)) {
+      |              ^~~~~~~~
+```
+
+Bug: https://bugs.gentoo.org/851513
+--- a/src/Log.cxx
++++ b/src/Log.cxx
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #ifdef HAVE_SYSLOG
+ #include <syslog.h>
+
diff --git a/media-sound/mpdscribble/mpdscribble-0.24.ebuild b/media-sound/mpdscribble/mpdscribble-0.24.ebuild
index 9265bd6c5a2d..cecfbd65aaba 100644
--- a/media-sound/mpdscribble/mpdscribble-0.24.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.24.ebuild
@@ -30,6 +30,7 @@ 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
+	"${FILESDIR}"/${PN}-0.23-gcc12-time.patch
 )
 
 src_install() {
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index b2c1cce6362d..9892e4b79a78 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb2e063446e88370e0aa508705a843b987f1a400351b5ed87d211251057b7b31a2e653401b800fe9871ac2a5756fc SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
-EBUILD mpg123-1.29.3.ebuild 2992 BLAKE2B 19ce0484093dcf499d8dc9380ed02fd66e3669a4aa690b2f585446afafdc301cb785f208c49a1c560c9edb1ee00d33ab04a4b3828035446dce3ece64b828b161 SHA512 d2bcc2a3b7818a93c23c57e53c9c439226b261e9c8baefb2bbdbdb59a3d0df222a42cc5a4c1049c4aa80ce08bc91a200969c3cdb0c2e00e08281c995849f6663
+DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698ef385368b417e1716eadde6b74fc0618c3aa03a495e4415b5f14aef26d85f98832b3ba5f5bd17083651808a7f53b SHA512 cf508bdff1f75320c7c4d77653ba8170cc0dd8c565390cfb6ba745ce3853816071c86becff3ce304b80481d220cac2113ad244930832ccc78d3d8da74112562f
+EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
+EBUILD mpg123-1.30.0.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.29.3.ebuild b/media-sound/mpg123/mpg123-1.29.3.ebuild
index a57001dd1aeb..e82d3a628fb4 100644
--- a/media-sound/mpg123/mpg123-1.29.3.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.30.0.ebuild b/media-sound/mpg123/mpg123-1.30.0.ebuild
new file mode 100644
index 000000000000..ccb28a07fd63
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.30.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 019dcef7af44..809e0019e63d 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,4 +1,5 @@
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
 EBUILD mps-youtube-0.2.8-r2.ebuild 689 BLAKE2B 915acbe40e2e1bed1800c2c38856a0e9aa32bad2d9a8bf6caf0033c85f1271b720664c85529273c6d2532f160477def99f717659da4063d06aa2aabc6f748358 SHA512 24da8b4dc07aeab88c82ad253d32d4ab0d8596b59031f9178ef4787b3b7ca910ba72da791c8054ae3e076f8773a8344068e18f8d2a6f25a848222b811a24876d
-EBUILD mps-youtube-9999.ebuild 689 BLAKE2B 915acbe40e2e1bed1800c2c38856a0e9aa32bad2d9a8bf6caf0033c85f1271b720664c85529273c6d2532f160477def99f717659da4063d06aa2aabc6f748358 SHA512 24da8b4dc07aeab88c82ad253d32d4ab0d8596b59031f9178ef4787b3b7ca910ba72da791c8054ae3e076f8773a8344068e18f8d2a6f25a848222b811a24876d
+EBUILD mps-youtube-0.2.8-r3.ebuild 689 BLAKE2B 18ec30d46b4713e75f56e5fdd153d189ef82f9b7e1a681f00c2139eb3a84c462c4d1fd9aae36ea554c14ffbad6c7b31a5fb3bcb27ff6a607f23089641e746bd3 SHA512 105b015a98768357a71008c95dadbec41629e601e8ddbdeeae4476bcfb7037901615ef78267f45f6a57084be3dae488f6bc3b3374af5971d7c4f09ad99e268ec
+EBUILD mps-youtube-9999.ebuild 689 BLAKE2B 18ec30d46b4713e75f56e5fdd153d189ef82f9b7e1a681f00c2139eb3a84c462c4d1fd9aae36ea554c14ffbad6c7b31a5fb3bcb27ff6a607f23089641e746bd3 SHA512 105b015a98768357a71008c95dadbec41629e601e8ddbdeeae4476bcfb7037901615ef78267f45f6a57084be3dae488f6bc3b3374af5971d7c4f09ad99e268ec
 MISC metadata.xml 391 BLAKE2B 93a5e43c99faced434fcdbd25da8490e2cfa7792fc25543904ad8f6f1fca0a3c93a500f982ac8ce0033809ad5c046ea4bebe0e34385ac2d92bd376cca3b6a004 SHA512 066650abbdab944faa9e21bd8fc9a4773a7a02c52477b1608cce35b28e7bbf50f7bca295abbcf633be32be3340bc8fb7b291df7a8836dcb560d28051470c4c33
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild
new file mode 100644
index 000000000000..4c3f4d17ba0c
--- /dev/null
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mps-youtube/mps-youtube.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Terminal-based YouTube player and downloader"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pafy[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+	|| ( media-video/mpv media-video/mplayer )
+"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 82b44f71fd65..4c3f4d17ba0c 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 15260b8e6715..6c3612cd8026 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -4,6 +4,6 @@ DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b840
 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 3521 BLAKE2B 2c3ce0093f988068a693b9d53d98b9fbfe9e434a68dc108ecc7a943b1c6ea7aa1a5bbe85feb26763fde61f1e89f8682a25957d06baf11d37c5108ddae899969b SHA512 0eb6855ecbe176a4a9c5e2f4e7c729ff3ff5c4ab044fc63c2fb4344e01b320935df1a7651973355525e35c1199a1686240b2b33c656976d4aa8982bcee910dc2
-EBUILD mumble-9999.ebuild 3422 BLAKE2B 5bb3bdaa4256022d59b722be3de2965a38d42b342f34c30d44ab034ab5b830fa7ab76579f8c78fe72de389a46b7268243ef6e3eb070f89e92936fa07461e5981 SHA512 13ee387089835564e2a28042273093d0803f0a5a577149da108fd12ad8551101f42f10b7c59e342d1271cb516afc0ebdbf7ae22c960e174339b1030d0e877061
-MISC metadata.xml 670 BLAKE2B fe98e9c1906942bac7fb7c5f66dd14ca201b7be96580c627a21f768507d2700e7c3bb6d63ac29a3402daf2ccbfc64096c61b73414b70489f43fd99ad78abbf6a SHA512 4902e6f6900e479f4c55fce2833b87149cd0175cb261fa08d2835431995472db794c1b47e7b6ade3812b007afe0e0ec8fa252bab7ae3c7bb02378f26a9287fc4
+EBUILD mumble-1.4.230-r1.ebuild 3523 BLAKE2B f4a0eb1518e363e51f9d180b3877c2e53b514351e77e1ec73a4362606dd2585183e563e20e7465cb63cfcd1167f0e250800acd87dc69575dd439f4c5daf088b0 SHA512 5e434b8400e2ace89ee8e5552ff52e8b31fdfb77889f64ce3d90b70ecf0a7e4ee587f559775b0509403ed9b80f9f31572dbf716848084947c380bd7827c57e37
+EBUILD mumble-9999.ebuild 3431 BLAKE2B fc4dc79647b3e5be32154f22ebf18c42d7b8027482e6e6279c47f041ef28a8b4360a153f60feca40b6864a453c81db7b926038aa4f2d6882c13b83b97039d0e1 SHA512 5c4960c560b69beb10f10dbc054da32da571c0af1eb5fc1eaef125260b3ebfc9533cbd31bc98193473b0e09a4d4553f8bfc8b3f32dfd35d3c282ff2e3df42510
+MISC metadata.xml 586 BLAKE2B 00bc1ee6485b27fcd11b763c79542826ebab1e89cb4e428e14469ef5eeed04ce87f924de973e8b29b23a7e6c9da93188ca513441cfd378512602c361cf06efea SHA512 f4018f4099d281e370641f3c7e9267c358404051372620db33dcdfe48d4e226372d53f7215fc5c7b0c270bf3d96120827ba7b113ad0025b0dc43feaf5b934b03
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 8c16fbd1e7e9..5f267356bf46 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
 		<flag name="pipewire">Enable pipewire support for audio output.</flag>
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230-r1.ebuild
index c6c38d8a9fd2..690186d97251 100644
--- a/media-sound/mumble/mumble-1.4.230.ebuild
+++ b/media-sound/mumble/mumble-1.4.230-r1.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
+	g15? ( app-misc/g15daemon:= )
 	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 65568a3e5235..009f89b12418 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -20,7 +20,7 @@ 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 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD MIT"
@@ -48,7 +48,7 @@ RDEPEND="
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
+	g15? ( app-misc/g15daemon:= )
 	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index b3ff6886c4c0..2edd932f1344 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -11,4 +11,4 @@ EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bc
 EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27
 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
+MISC metadata.xml 447 BLAKE2B 8dc5c1361b69c9c18d1b2db580eb4b1dca40a61eb17a8d873dc386246cea40e765ce68a081c881b68c4195fa751e0683e8ccba2e3b59fcf6c292ab9c243677a9 SHA512 18e8952a6077781c00115915ea10a9e15ff38d4c296aaa5b85d1caf5b61637a600f0b7b0cf58e226aebf46be5f61483f1fb964666a722ec3bb38c0cd5209ffcd
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index a45616b4db17..f10ed85aa0ea 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
 		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a8738d33f38a..bcb4d7a5de65 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,6 +2,7 @@ AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8
 AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb07d1b962b487dfa1c88cbb1c79616e92d36fc8e0d46635b9bda851550145086bfef2bba56a53ed033325b6bd98378a9f6928bb3 SHA512 55cb0187dfe4e590ec47c772d3c820f64324d748a2b95d0529b516cd048f2862477117dd711c335fd7abf8e3693e9e0b8b60cc270aab5a5960a173fa8bd7ad85
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-EBUILD musescore-3.6.2.ebuild 2988 BLAKE2B 066bc22bc16788b7f54d6e54547f8f633442ed2ea591f188a8bd7994ed1f40376e0ba1365e7d41f0c5764924af449254a7ec55712ee967ad6d3e3ed9b9dbc39c SHA512 667cf575170edbe8e105ba3863df978fa05e0d1216fe18b5572c8fc6bce060c2764b1ff59d6cf632076f7e5bd2d966026aeb2d7c1f163f2b40c1823ed495a65f
-EBUILD musescore-9999.ebuild 2908 BLAKE2B 5674b3905860a9ca1e988e8f14e40fc5c5c63a441d633e5bdb6360444251f6ce733dd8d9ae85070a946db14e885279afb51a43ae33db5256d5e539decc98373c SHA512 c9bfcc66875135141745e8ff3ab27c4b7f647748310dd65e6af5245bb6fdf2ad7a85b5792b47ce6a06903ec282d4f12c13f07b5982716abb7f84f12299e53ea6
+EBUILD musescore-3.6.2-r1.ebuild 3060 BLAKE2B 661f3962a5ab3260c5580eb2dc91836015c62744c69d05e51edffa0891c7a2f49c8b959958cbd96da380d9419642f4f01b06bfec6ffa23cee08ceee2f681cb24 SHA512 4560550c5a7d7ab386a01241f1f33cc55a51d731a40f0dc271b77e0e9ea196c6c2c219894687c37f25a4459562b967113382b301e0df44216a7e1941cc24540f
+EBUILD musescore-3.6.2.ebuild 3057 BLAKE2B 9dfb828479b96449388e0738ca1072857ca6ab068c00624b01b0a9d9be374ed84a777596791bdd9c11c7889b67aadaa50b5c10b92c19dc915cae21f603d40db4 SHA512 aaa7030ae4d9d297f689201f8b2472d5e6af47df1cf1036f605f1f0aff9c76ad20ce21827e47215a2e92b03e272eac3e58e707e47c8d404324ac438dc330f54d
+EBUILD musescore-9999.ebuild 3001 BLAKE2B c5de983af93a21e83218b7dcf1a11c046fe6c2b6b8118ee098104531c325944bb0e94b836d380b789da75e7e546d5df5d4aa05f967a4aa213020bd0d5a2ce12f SHA512 f2162b78542524277a33f064a098d56b04859acd8d9e8acd1e39309dc3ff2693913bd1af11c63f5a5ddd7e6149afc5a25c97cead4f3be4ae93fbbfcf8a77a1fc
 MISC metadata.xml 882 BLAKE2B a8ead5437d77a6c39262770afc3409f3a68072fbc796af0b029641126521299e45e921a666b97b168de79b92d3359ecd4032e26fca798188fa9bd503f394db5a SHA512 4146e03299dd9a646e713dc9baacdba9578c5fb204eeeb81397e25fe5d7b19ae07aa1bb0c550ffff5cb53194f9ee53d0b35fbc26b04658d0e50f08e1a0e441f7
diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..d9fdbd5e6e56
--- /dev/null
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake qmake-utils xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	sf3? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DAEOLUS=OFF # does not compile
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=OFF
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index 96f936a41a63..5cc3b579f8cd 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -83,6 +83,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local mycmakeargs=(
 		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 01dcab44b226..d2e8794771d9 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -79,13 +79,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local mycmakeargs=(
 		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_CRASH_REPORTER=OFF
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
+		-DBUILD_PCH=OFF
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
@@ -98,6 +101,7 @@ src_configure() {
 		-DOCR=OFF
 		-DOMR="$(usex omr)"
 		-DSOUNDFONT3=ON
+		-DTRY_USE_CCACHE=OFF
 		-DZERBERUS="$(usex sfz)"
 		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
 		-DUSE_SYSTEM_FREETYPE=ON
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index d782fddbb7ff..69d09479567f 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.6.3+release.autotools.tar.gz 1514410 BLAKE2B e61473b3dcb1c88450b72fdd29b7e22f794134ffdf23222a79bf715c6e1c1810e19a5fb48cd6e1536d1f892349cf90cfa34b90e0a67e1c208e993f2db51af082 SHA512 b9f9cce9ef7d87ad8f18d17603b613fd153d5effdf04de566daabe26afa08b84eb0aa089b94fcbf7cb724befd0a3d93ffdaf5b578f2a3afa31f7aa517f39c62f
-EBUILD openmpt123-0.6.3.ebuild 1719 BLAKE2B 88ee5e279c0edf0757bb1f7c33bb59aa5500e562b2f1181112e233e203081f4b01a4ae8631d3654e44b763d0fecee7c0056c7b640ee3bc297487f75e37ecf32b SHA512 2cf02a52f6932e39818e3727cbc38dd6ccf6dca9aa5924c03d7f17c488eef0e25f15788a2546422d69a40d094a9e4805af78e625e89dae1dd8cea67673ea6d8c
+DIST libopenmpt-0.6.4+release.autotools.tar.gz 1547663 BLAKE2B f1c7254146437ce3ca646049c05fe4ae0575012724584a7b2cfce7dfdacf7987eb5403b0634d1961e1b7b176adfbbcbb23a9966d874e489ebcf01524a020750d SHA512 7306ddbe030b8e82ad24fc85083d13d7ca680870f4dbe7215399719cd63ee9ed9e5c4c6229e9f17fb5a2005e86b21ceed0dab158d3f0b73c606579654434421f
+EBUILD openmpt123-0.6.4.ebuild 1719 BLAKE2B 88ee5e279c0edf0757bb1f7c33bb59aa5500e562b2f1181112e233e203081f4b01a4ae8631d3654e44b763d0fecee7c0056c7b640ee3bc297487f75e37ecf32b SHA512 2cf02a52f6932e39818e3727cbc38dd6ccf6dca9aa5924c03d7f17c488eef0e25f15788a2546422d69a40d094a9e4805af78e625e89dae1dd8cea67673ea6d8c
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.6.3.ebuild b/media-sound/openmpt123/openmpt123-0.6.4.ebuild
index f9f538ff0464..f9f538ff0464 100644
--- a/media-sound/openmpt123/openmpt123-0.6.3.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.6.4.ebuild
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 39734c9096cb..b08882bafddd 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -5,4 +5,4 @@ AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d5
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
 EBUILD pamix-1.6-r2.ebuild 1117 BLAKE2B 9652a02b76a0ca664220efd8f237f6a66d9f42d42d3eb62f65058f2e7d508ae4d2e3b2f632f3a9eba97040c26d6dcceec0f1234ee493b7e9e070a5a190446433 SHA512 c512eaab37042e5372316feb118e5b316f356d91c8bf59c0bebba350c9dfb7c7d7e66153e8b14a41eb5519e35c6c28535e29d1b15188d8d1c119d631b7fa72ab
 EBUILD pamix-9999.ebuild 929 BLAKE2B a9e978ab8768699329eebe4c312051251c66874d405f9abd171c4b2cc0f7496c5ebce85d1bee0e1e7f14c057d6e24510dcb73c9e805afd7a231ffa94119c9d9f SHA512 d5fa8e724910a62c18fec7f8901dec1254ac88ea2da31ad3d32d19c0665646919f566ad94a26d8db3eadeaa4e997505c14cd212f9f58470db3b15f90e412f7c6
-MISC metadata.xml 342 BLAKE2B 797032c001f61fe1dc52c17cc775690ad080fdf6308b0e7a482c6a1ca4866e1bb732f0c387afe8ddd058a1a253a0887c58aaa7cd344bd7e72bff6e9536e2db8c SHA512 d89411c5d20b9d99969bd70ec02a7762935f72afa2fda41278e70374b6b4c43e57f274931a8bcdf52bc686917d070397b89de56dfbd9616b0518f3ad8f91ecd4
+MISC metadata.xml 253 BLAKE2B 17d036b996a954ce2655aa2fafc8b341fcbf232524ff603ce46e810150811f65ccb29df99d18adbf98d9d3f3f5fd65b1df64cb4e7a6c06df9c2649fe9f5e7351 SHA512 0e3b9c8be6d31746e284d905df2e864eb673ea15d791609a27737bad246bb641b226b8551e68e2e433a47be09bf8f09de4af77808b234e170dc4a39c56397acb
diff --git a/media-sound/pamix/metadata.xml b/media-sound/pamix/metadata.xml
index 010dd5c1f9f9..b62d7c2c323f 100644
--- a/media-sound/pamix/metadata.xml
+++ b/media-sound/pamix/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">patroclos/PAmix</remote-id>
   </upstream>
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index eff771b8e9dc..d1b6fb518070 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,4 +1,3 @@
-AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
-DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
-EBUILD patchage-1.0.4.ebuild 951 BLAKE2B a224d38a2bad4119fb798bb823537d82410a8ecbe76a047d26d4d24ee6f10555db9be4359426a58cea963e9a54791aafd3d78c7ff7a3f033932d5f490159c746 SHA512 1770a22ccb29e87f00c9b2f6ffc1b08d76ea5067a27793bf56bc8bf0ad8dc30526295754a426e184a2d53ef5f53a45f2c6d1cb1a1cd4365dc4134f763ab22363
-MISC metadata.xml 355 BLAKE2B 07b7a3c571166e24a93417478bb27d1d94e9e201b2e9137af50cfe04b477e9b99c38edc72fd36abcc4dbc77f65f593f25299deb733df0d9c87625285eb8ef419 SHA512 234ae6322d86d20ce4116991068ef65458f686adfb7b956d5a7c24af672d62a7552ce5023978e65d061e7f9f19b0e9a76e7730f345312a6555fccfc73826df32
+DIST patchage-1.0.6.tar.bz2 664841 BLAKE2B 72d0de6d12e07ec160f4c59c51f138e1220a1b8994bdab90f56dd715bf16b6f561836d184ec5d5077de3bc7bb5c6778ea2b7bcbf0b33230be662f2b729eac568 SHA512 b7aedcb07da0c81842929833ab93a0b20c08e465bf05ebb4e47670d295c0d4d0d50f0f74001d9264c2c23ef08d3881232e7622ecf101d1d53ffcae2f8c0f31d3
+EBUILD patchage-1.0.6.ebuild 918 BLAKE2B 4455184ad29ce50c102d6f13705bfbec72424db030301ed5f4d8d87fb97596ee5dd926b76848bfc2dc36524243f99cd603db43667c9f8318515f4688bc149830 SHA512 8127a176c9a09d8697297cfa46d9fab895b0cdf5f72af3d1c9d18824cb3e062c4bf7ef222483e4a964cdc42656c6303c68b68ca8183ccbe1ce4427402582828c
+MISC metadata.xml 427 BLAKE2B a77d10e847d1ceb32b0ba9ba22a723df471d751c6ecd7ddc849f13fea71c451b9a0c7959687ba09efd23ca7dd6ffd7a77e00abd69021f5ecfeacde0680fa0814 SHA512 3ed9c62eb59dad36bd4477bcdbb95eeff21fcf8ac8c989814d24e288e58b7032452acbce472a191c8151551071b86274fdb935ae6ef5cb916a4b22510ec96789
diff --git a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch b/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
deleted file mode 100644
index aace519e630d..000000000000
--- a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
-index 23c12f2..f49a522 100644
---- a/src/JackDbusDriver.cpp
-+++ b/src/JackDbusDriver.cpp
-@@ -24,6 +24,7 @@
- #include "SignalDirection.hpp"
- #include "make_jack_driver.hpp"
- #include "warnings.hpp"
-+#include "AudioDriver.hpp"
- 
- PATCHAGE_DISABLE_FMT_WARNINGS
- #include <fmt/core.h>
-@@ -61,7 +62,7 @@ namespace {
- class JackDriver : public AudioDriver
- {
- public:
--  explicit JackDriver(ILog& log, EventSink emit_event);
-+  explicit JackDriver(ILog& log, Driver::EventSink emit_event);
- 
-   JackDriver(const JackDriver&) = delete;
-   JackDriver& operator=(const JackDriver&) = delete;
-@@ -75,7 +76,7 @@ public:
-   void attach(bool launch_daemon) override;
-   void detach() override;
-   bool is_attached() const override;
--  void refresh(const EventSink& sink) override;
-+  void refresh(const Driver::EventSink& sink) override;
-   bool connect(const PortID& tail_id, const PortID& head_id) override;
-   bool disconnect(const PortID& tail_id, const PortID& head_id) override;
- 
-@@ -129,7 +130,7 @@ private:
-   dbus_uint64_t _graph_version;
- };
- 
--JackDriver::JackDriver(ILog& log, EventSink emit_event)
-+JackDriver::JackDriver(ILog& log, Driver::EventSink emit_event)
-   : AudioDriver{std::move(emit_event)}
-   , _log(log)
-   , _dbus_error()
-@@ -584,7 +585,7 @@ JackDriver::is_attached() const
- }
- 
- void
--JackDriver::refresh(const EventSink& sink)
-+JackDriver::refresh(const Driver::EventSink& sink)
- {
-   DBusMessage*    reply_ptr              = nullptr;
-   DBusMessageIter iter                   = {};
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 31c35cf5131f..4bae645001ae 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">drobilla/patchage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.6.ebuild
index b9a415d93c20..3427226b5b01 100644
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ b/media-sound/patchage/patchage-1.0.6.ebuild
@@ -1,14 +1,15 @@
-# 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,8,9} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit waf-utils python-any-r1 xdg
 
 DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+HOMEPAGE="https://drobilla.net/software/patchage"
+SRC_URI="https://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +18,6 @@ IUSE="alsa debug jack-dbus"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost
 	virtual/pkgconfig
 "
 RDEPEND="dev-cpp/glibmm:2
@@ -29,14 +29,12 @@ RDEPEND="dev-cpp/glibmm:2
 		dev-libs/dbus-glib
 		sys-apps/dbus
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt:="
 
 DOCS=( AUTHORS NEWS README.md )
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compilation.patch"
-)
-
 src_configure() {
 	waf-utils_src_configure \
 		$(use debug && echo "--debug") \
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 7d22898754ba..79098347d48f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,6 @@
-DIST picard-2.7.3.tar.gz 4887533 BLAKE2B 65a10be3dafcdd99e20d6c193d1238b0edfa66425a28c705bd6df0f57f75ddcf874f3bf09cef3c331e583a35f49ec780a63d2960081188081c8f0687f6a0b4d1 SHA512 33cd37ce19e261d14882b4400054c289bf921d3c74313db634f3876bc7f51ecca184aa29a9cb1d673fe799c53eda81de45d23c83caaf2f71b74fe341c258d2f7
-EBUILD picard-2.7.3.ebuild 1411 BLAKE2B 1eca988cde74b9b7ca3de813b8d5262e432b2c9f055fa8f528b0551842e0192d7f28ba8f3eae283309ed3265d3bb4fda5b0f134e36bfd55e9b3924a50789c07b SHA512 b73760154b1d29344a91fbfc8e5406de9ac4d561e01384ba84a4f631d1cfad54bb743fc6020da26fa69d4bb9fbb4e43f8e2c8971ddcd99edb32355dd8989023d
+DIST picard-2.8.1.tar.gz 5060681 BLAKE2B e649407e12fe0a5f627feaa4e1ac347b27bcb22960f6b1adac67444ebb1f0ad4bcc5732cb218cb3ba67147fdd3bc9f4a5fe3eb3836c6bd1a43ea29bb2add1d9a SHA512 0f15dccacb1d95232235b7c8251b59f02d9cd7836fc10e624951a04f889d12206301aea77d9503fd0f4fed2ae400a150ac159ce6cefd9e8a914a62f8257c7ffb
+DIST picard-2.8.tar.gz 5060056 BLAKE2B b5ba78c910a615e7e2bab148e83514d4fc929d8dc910dcd07dff3af75b502bc9036eb7843bdd3d95b2e5d07902ffcefb529ad1aa19d101565f9c4e66eba693e2 SHA512 bd5b4e7b457603eb8c1895452a7b00cb5de48e28e72c8f377ad73e49aa272a2d09338ea4585f40f1a8401e860a9be3d210db3f44a39956b200d85aa24a89562c
+EBUILD picard-2.8.1.ebuild 1413 BLAKE2B ef1c81a19e42fedffb65c47278e340c0b7ca27b0f2da934c3f4d232db314f05efd7499c1a818c842a0a94f18afdf18b01e16ab8f8a75ee3d1a03026a2002e8c4 SHA512 d464908123fc47a3770b920ac36d649913a08322d1dfedf4f748fc91bffe2e4eb0ef0a411326411d561aaf312faaf1de890619dacf8c7e5cacd0f51d62ac0786
+EBUILD picard-2.8.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.8.1.ebuild b/media-sound/picard/picard-2.8.1.ebuild
new file mode 100644
index 000000000000..accbc2910dfb
--- /dev/null
+++ b/media-sound/picard/picard-2.8.1.ebuild
@@ -0,0 +1,63 @@
+# 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.8.ebuild
index c57f433dd767..c57f433dd767 100644
--- a/media-sound/picard/picard-2.7.3.ebuild
+++ b/media-sound/picard/picard-2.8.ebuild
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index f41f0369ba6c..e4f1a5fb167b 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,4 +1,4 @@
 AUX pithos-1.5.0-tests.patch 730 BLAKE2B fbd1613c2c3e38a6acefd215e35babd9a6f41aac6fdb492b51e0d1285eac3b2441f3323206282acd8c72bb33dcd9b80c5a8d0fd53e478df9445f6d42ae4392ae SHA512 a50e0929f9a19cca0e2d7e888d5ac228ba820ff58c7d71e08b57f92394e7913bf9bf02e5ae2de736df4b69621c913b07bf6baf14ecc9aaee3e5df921965d70ea
 DIST pithos-1.5.1.tar.gz 123504 BLAKE2B fc7cd51fd773989b5734d7bfcea674c622b3c9e5072d8ae65ed724476a025802f08916c533ea6c338e748aaf5fcce595ff352b0bae6c72dc074de2afaddbb737 SHA512 43841194d0a3c3df9dd98b819c8a1e30862ebd49aad8ba4f92e91cc7e680fba97159b70748f4042737d5e399bda64cd16d6e9f6d0e29136350c78be57474442e
-EBUILD pithos-1.5.1.ebuild 1745 BLAKE2B 25a5c2f9aa14ac3124f8aac4b98ee97bf73da7c04d8edf973276ec36cc54f4a2d3302ca746f11a4bb9ea8434b2a779b1157086b64a39b94d3d3438708a796ba0 SHA512 6be0adeb1034fa8c5ff952397344319e417cb3e9106361dcd84d9cefb6b0b0140da1c827debd06d0f3039beda6fb1b8d9aebd5801720e9293c03e3f60e1992ed
+EBUILD pithos-1.5.1-r1.ebuild 1639 BLAKE2B b31ebab4c074875167eb43ed2771f74f204fa69e00a479e76ff2a6b190368913ee4cbeff0d27770a26a10c2ef7be56e8d7b4f028501976e44dff2faa5c56f0f1 SHA512 f20159db150367249594bd2a1c13b338d0d8e69ced7d794d2bd13a503b471d0286df26ceb7d77ad690ccbab7173390c577a74851425f5f4a6ce3c661191d2a8f
 MISC metadata.xml 419 BLAKE2B 9e01f2ec478f85435261e38e84ee433d9712c7d595979c916af2d2c01a5954ec0f721b0170fb32109d6a98dbef358d8f63e00a1908c6c5f38b183eb6a0e0882a SHA512 3bf8a538a46181b7ba52f20832237a119a87aaa588a7a75a0a1d881a64110805427f27a25d4f8277ec249b40218b21d291cdb21c98616a57396d0ae20b6345c9
diff --git a/media-sound/pithos/pithos-1.5.1.ebuild b/media-sound/pithos/pithos-1.5.1-r1.ebuild
index 3ac4ffed7e64..3f062c66de6c 100644
--- a/media-sound/pithos/pithos-1.5.1.ebuild
+++ b/media-sound/pithos/pithos-1.5.1-r1.ebuild
@@ -1,16 +1,11 @@
-# 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..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 inherit xdg meson gnome2-utils virtualx python-r1
 
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Pandora.com client for the GNOME desktop"
 HOMEPAGE="https://pithos.github.io/"
@@ -21,7 +16,8 @@ KEYWORDS="~amd64"
 IUSE="appindicator +keybinder libnotify test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	app-crypt/libsecret[introspection]
 	dev-libs/appstream-glib[introspection]
diff --git a/media-sound/pms/Manifest b/media-sound/pms/Manifest
index 5b62a8d38035..438b43eed4ab 100644
--- a/media-sound/pms/Manifest
+++ b/media-sound/pms/Manifest
@@ -1,4 +1,4 @@
+AUX pms-0.42_p20170508-gcc12-time.patch 179 BLAKE2B b37b450c435e19ca7ec37276a6503be0bd23139fc2d899baa0e9bf95196df5e498adfd26f75212eed4d3e788dbd123868bef8b4ce1f73e8134634fbeb70473f9 SHA512 eac4c7c2677b1a344ca9b79db14e18e8d1f990f5b690c3d7b80fd9a6eb05eb881375ee5e72a2e410fa62e00a26cfb22178929b7f5a9be6648afa9fdf45934dc4
 DIST pms-0.42_p20170508.tar.gz 140157 BLAKE2B c4c3ff916a9aa36522f48636cca97f22069219ebfc25e219d4aff3d0ca5bf20d80d343d224996db82fb6e8fb13cd9f38f7fc860683bc574124aaf0315d3f2dcb SHA512 686a5e265ebad418a153b9888cc213bbf8cca5aa2d398206848823105edac16e298431c288dc0a74adb23d327c75845cdec1680a6a2a2ae40bc7b41c55ca163c
-EBUILD pms-0.42_p20170508-r1.ebuild 751 BLAKE2B e14ec3a1e8b554617f67e9420a2dcfeadb5f307f6ab4bde827ac5da35005d4c4a39af0a25a64466f734dd06e3cbe33d6a4e62ecb05a6dfb5cf4ce7259ae40370 SHA512 ef2a2c3938d541f4d4128235df7c9888fc38629854e17702e85c217a42ce59f5ed3abac918f8e51cb9a09d4757c2353ceb0f248c3659e62651e305f15714cfdd
-EBUILD pms-9999.ebuild 715 BLAKE2B 15cf04f0719ace386e49cd6e3849640739da21f6f3b004d590988e191f2348bd7f8b7684e9fbfc7b69bd7026cad04b2b3ed7e768f8a1aac76c12aa9a1f82edc4 SHA512 916e8be3e74d785c3b814edd8477b1cf90a0c6fd3bfae523e3d6b0027a549a85dd405f3d093c0093b14d6e2f69d9da45337719f13f831670fa06fa0e63856586
+EBUILD pms-0.42_p20170508-r1.ebuild 817 BLAKE2B b34aa9ec19fb91b5db66cdcb3efc1dc9a8e267c0ca77cae909b7c81f7671fb42fd56890c93e96ce78392bcaecac50568988d04832b3455bb09d1b41b11c3235f SHA512 1d84b721c49ec9b0c4067dd618c42c11fdaf71df0da1c1c177bb588db1503a3e5fd584c6ad574b015032c651e91f7b947a6303d4c03c077d9ef7693339939447
 MISC metadata.xml 327 BLAKE2B 4852360b889e0c7548921f8ebbd4929d117c515b39bc76ebbe21d23cedbbaee4c65143c97a84fd743785f612dddb00788babc7539c1130c02d06b1aadebc598c SHA512 149d693b87ce7beb38f87f784b1035895dbce3a4f1061f3eca1888a9b355b1c72cb2789e39506e06ed9fa8f5966c36f566b2dcf35069a38558b523c71b6b5494
diff --git a/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
new file mode 100644
index 000000000000..b0d586eff2c3
--- /dev/null
+++ b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851621
+--- a/src/message.cpp
++++ b/src/message.cpp
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <cstdarg>
++#include <ctime>
+ #include <stdio.h>
+ #include "message.h"
+ 
diff --git a/media-sound/pms/pms-0.42_p20170508-r1.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
index 9f0546f7b158..750e97d2c674 100644
--- a/media-sound/pms/pms-0.42_p20170508-r1.ebuild
+++ b/media-sound/pms/pms-0.42_p20170508-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
@@ -25,6 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.42_p20170508-gcc12-time.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOC=$(usex doc)
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
deleted file mode 100644
index c1e5c9adb459..000000000000
--- a/media-sound/pms/pms-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
-HOMEPAGE="https://ambientsound.github.io/pms"
-
-EGIT_REPO_URI="https://github.com/ambientsound/pms.git"
-EGIT_BRANCH="0.42.x" # todo: package the golang version
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="+regex doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)]
-	media-libs/libmpdclient
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_REGEX=$(usex regex)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 4fa3b852b47e..0703aa356d9d 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -1,8 +1,17 @@
 AUX enable-autospawn.conf 65 BLAKE2B 47e57076b19000ca3c57f0368e453198131c41a5a9c2d0cc8632f0a7ed4e5c992cf93e3c7651c4f3b59ceaf177d4d811bd6774676a2b005ec12259e56d99b4d2 SHA512 61f90b0d19e807a672bd39d190c1102db0b8c46284cf09d4a19b4b96d566633e56a60d21a3a1374e447e8e06496a3aef56bf5ae574337c081e7cf18842458e59
+AUX pulseaudio-16.0-fix-combine-sink-underrun-crash.patch 3707 BLAKE2B 798774fd8c290aaea996e3caee0faca591ae7ec691d485ee365b908e45e6ad596277d34d10090be9366b7bf077a51e7e9f7dbeab362853d419a96fd0ab65af07 SHA512 b604cd1e04832c617e1575bddf237abf6896b340f80c0616736d055892b42aa9665ad5bd2796869bc1eedcfc0d632aa4956fcaed4b4e89bee7eeb5ce60ad1cf1
+AUX pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch 1448 BLAKE2B 63ddbc36e3ac2ee553f6f30975886c2488e7d9889c3969b7110a75c24edc92eedf5c8c7be01130546fd67e7d71aaf7cf6b8b3842d2003b968d062fbe12b61f7b SHA512 7ff462e32e3218df28733af1abfab1f38173d48b458c0cab8b1f6aba0b7c5cd8479aaca52f0e25a1e4c71340e378c5a4b8bbd1c6613b979057d3dab035b5708f
+AUX pulseaudio-16.0-fix-pacmd-play-file-crash.patch 1625 BLAKE2B 5dbe6d24e0faf0152d6088244571c63d51392ab488e0b2ac47ad9a0a2fdb8f0c342824315b7be0916bde69af0911a6be02ad43e6369b5fcf1ad5cb3cb2fe88f6 SHA512 3cdbf444245229be7cb643c03d555cf7d7d5f8ba3bb608a72f27b660dc90413478681258d6226063c946cc783f48863994cc77709cb0f82b61a27dd01cb15305
+AUX pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch 1025 BLAKE2B 33b8aa51c966a0716fd9c15c51903e74b760bc72eaf511e9a86182155c6e9e5e6e1b8eb9af40cf7da023de25e1f74a2428d74954c230c53bc61c42e53033a9c2 SHA512 9e573806494b0e8d3aa51db205457e5c63326cb81fe5a2801b0e66b2b49c3133b30c85feafd0b58a64b5949cbc9e29e599459b76cbf5f479281ad8aa5c5bbb5e
+AUX pulseaudio-16.0-optional-module-console-kit.patch 3077 BLAKE2B 3b8abc67478f6c8848a24788bdceeb5bce868bf5214a092c3abbd39a3102679e4b390e56231de0559c8389730a2a75ba21bf4d9f9d942792589c6db66d6eb04d SHA512 bec1a747593d9130bb8cfb05b0894e467c953264879f2a856a420b07ee688640ec2279c136daa825b21e0e7e3bfc3aa1e333487a776d1c7ffb9a6d0293a0502b
 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.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
-EBUILD pulseaudio-daemon-15.99.1-r2.ebuild 10309 BLAKE2B a0c724825e6a88bbcd459b82ecc1d85eb3375648bd7b1e69be30a892c6c8c28cc6a309a11d44b9df20d62380ede6b79b15a1444236a58469610936b5b7454bfd SHA512 f09b09b8db9109fe9a2ab9ad33accc1598ed84b2336ce44eb10650a1e0ed2c46a114dbbae34e3887254bfbd6581db35c9a86c45b13a965acb569e7252d561345
-MISC metadata.xml 3219 BLAKE2B fd8c28b21c9fc9d2185d2f92481b5cdf1b344dbd95a7d668f5fa14320f90698654ae68cca14789fd9f83fe9fe9b46f906988acdbce36c5e0102846baaf10e7e0 SHA512 9b1c4d4a5077d6e7dae69c4f54d82586d77d32dca078ae39f63995b2b2320ec9804be24688657ed47823ee034ce8b54a8f9e0229e9b35849778b0204ef97352c
+DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
+DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
+EBUILD pulseaudio-daemon-16.0-r1.ebuild 11998 BLAKE2B eae74c6cef4adc800de9d0f444c93ab95ad0c6943b5be4f18b46e530c8df0c33353442df9101a4ba51cc139262e03a0783d26b13cb6b94b8385f92dfd5e0d939 SHA512 a5d155ccaeb75414954dcabc4e539035dd188144c46d1e0818bd8014d505aeaaf4d4798a243eaf722372c305f4c1933420f43e138049e8175885ae304fa7d8f1
+EBUILD pulseaudio-daemon-16.0-r4.ebuild 11991 BLAKE2B a0cad25d3b04a7b7059c1c27b3b10e0917548643ca5fa3ef74e59b9c5cd75c48f66a5213b3ea608184ac35e2fa6deefb5de51bf6568ccbb257b43572975103d5 SHA512 1c1df7772101c0ec87496292f143239523400b2bf84cbdbdb464ca2c9fc340656dfed124725510274c87fa742d5d862001746bf666fa519782dd1d3f04f9996b
+EBUILD pulseaudio-daemon-16.0-r5.ebuild 12412 BLAKE2B e5f67f67e9c58a8c67f967f03ea842c244c7346edc056e57cec4ab603330741f7f824118127fa19aa5b911a2edb4eff138809e41829c4b468ba368f5b1a60807 SHA512 02d3977e39b6d66e68d42d9129c21434c98aea0ce8ef337dc886d900e494d77e0a70f855ea2832f42188163eabb6975b9a7469cb44a860a08eb08f5ffe0a7a15
+EBUILD pulseaudio-daemon-16.1.ebuild 12144 BLAKE2B 1a857785cb70eabd9409fddcb64540bfd1ae686b5a076095afb875d614f36a2c96c9a010766e4c85837739f4f84b5c9628699a65d09a9e709bb9f4791ef856c5 SHA512 e9a5bc1d12ca955f935c672898f5a7be40b92e896e8bbbe1d3582e39789573caf4a9432eb9c2740c4996cf42408e12e94915bf5992b9179da3d5ef5efec7840b
+MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
new file mode 100644
index 000000000000..d66d75afdfda
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
@@ -0,0 +1,72 @@
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ee8bfb49adddd271d8a8cafa796c6f9fa84de48a
+
+From ee8bfb49adddd271d8a8cafa796c6f9fa84de48a Mon Sep 17 00:00:00 2001
+From: Georg Chini <georg@chini.tk>
+Date: Fri, 17 Jun 2022 13:11:11 +0200
+Subject: [PATCH] combine-sink: Fix threading issue during underrun
+
+A recent commit added i->origin sink for the sink inputs of the combine sinks.
+Therefore pa_sink_process_input_underruns() treated the combine sink like
+filter sinks. pa_sink_process_input_underruns() calls itself with the
+origin sink, which is only correct for filter sinks because they run in the
+thread context of the origin sink. The combine sink however has its own
+thread context, so pa_sink_process_input_underruns() was executed in the
+wrong context.
+This patch fixes the issue by skipping the section for module-combine-sink.
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/722>
+---
+ src/pulsecore/sink.c | 37 +++++++++++++++++++++++--------------
+ 1 file changed, 23 insertions(+), 14 deletions(-)
+
+diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
+index 3108ae765..0f0dc56fc 100644
+--- a/src/pulsecore/sink.c
++++ b/src/pulsecore/sink.c
+@@ -1016,20 +1016,29 @@ size_t pa_sink_process_input_underruns(pa_sink *s, size_t left_to_play) {
+         if (i->origin_sink) {
+             size_t filter_result, left_to_play_origin;
+ 
+-            /* The recursive call works in the origin sink domain ... */
+-            left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec);
+-
+-            /* .. and returns the time to sleep before waking up. We need the
+-             * underrun duration for comparisons, so we undo the subtraction on
+-             * the return value... */
+-            filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin);
+-
+-            /* ... and convert it back to the master sink domain */
+-            filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec);
+-
+-            /* Remember the longest underrun so far */
+-            if (filter_result > result)
+-                result = filter_result;
++            /* The combine sink sets i->origin sink but has a different threading model
++             * than the filter sinks. Therefore the recursion below may not be executed
++             * because pa_sink_process_input_underruns() was not called in the thread
++             * context of the origin sink.
++             * FIXME: It is unclear if some other kind of recursion would be necessary
++             * for the combine sink. */
++            if (!i->module || !pa_safe_streq(i->module->name, "module-combine-sink")) {
++
++                /* The recursive call works in the origin sink domain ... */
++                left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec);
++
++                /* .. and returns the time to sleep before waking up. We need the
++                 * underrun duration for comparisons, so we undo the subtraction on
++                 * the return value... */
++                filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin);
++
++                /* ... and convert it back to the master sink domain */
++                filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec);
++
++                /* Remember the longest underrun so far */
++                if (filter_result > result)
++                    result = filter_result;
++            }
+         }
+ 
+         if (uf == 0) {
+-- 
+GitLab
+
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
new file mode 100644
index 000000000000..a2efaf37b381
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/dd4dc5e8bce2c03631c3613dbddee1a691bdd17d
+
+From dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Fri, 17 Jun 2022 14:36:36 +0200
+Subject: [PATCH] bluetooth/gst: Correct var type for GST_TYPE_BITMASK
+
+GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in
+pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead
+to match internal representation in gstreamer.
+
+Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with
+gstreamer and either LDAC or aptX support is available.
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/723>
+---
+ src/modules/bluetooth/a2dp-codec-gst.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c
+index 8ef74be9c..11839c580 100644
+--- a/src/modules/bluetooth/a2dp-codec-gst.c
++++ b/src/modules/bluetooth/a2dp-codec-gst.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <arpa/inet.h>
++#include <stdint.h>
+ 
+ #include <pulsecore/log.h>
+ #include <pulsecore/macro.h>
+@@ -82,7 +83,7 @@ fail:
+ static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
+     gchar *sample_format;
+     GstCaps *caps;
+-    int channel_mask;
++    uint64_t channel_mask;
+ 
+     switch (ss->format) {
+         case PA_SAMPLE_S16LE:
+-- 
+GitLab
+
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
new file mode 100644
index 000000000000..f9c044dbb2be
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
@@ -0,0 +1,42 @@
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/a8a2a31408c4acf54530d65922d235d3e590ce05
+
+From a8a2a31408c4acf54530d65922d235d3e590ce05 Mon Sep 17 00:00:00 2001
+From: Jaechul Lee <jcsing.lee@samsung.com>
+Date: Thu, 2 Jun 2022 15:07:09 +0900
+Subject: [PATCH] sound-file-stream: Fix crash when playing a file which is not
+ aligned
+
+pulseaudio crash occurred when I play a file using pacmd play-file command.
+The file is not aligned with its frame size and the last rendering size
+is also not aligned. Thus, an assertion was generated at the end of the
+file as the following.
+
+memblockq.c: Assertion 'uchunk->length % bq->base == 0' failed at
+../src/pulsecore/memblockq.c:288, function pa_memblockq_push(). Aborting.
+
+When I play the file using paplay, it works good. So, I changed to
+pa_memblockq_push_align instead of pa_memblockq_push to prevent the
+assertion.
+
+Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/717>
+---
+ src/pulsecore/sound-file-stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
+index 147aa2288..255f4b61a 100644
+--- a/src/pulsecore/sound-file-stream.c
++++ b/src/pulsecore/sound-file-stream.c
+@@ -185,7 +185,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t length, pa_memchunk *chunk
+ 
+         tchunk.length = (size_t) n * fs;
+ 
+-        pa_memblockq_push(u->memblockq, &tchunk);
++        pa_memblockq_push_align(u->memblockq, &tchunk);
+         pa_memblock_unref(tchunk.memblock);
+     }
+ 
+-- 
+GitLab
+
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
new file mode 100644
index 000000000000..3d72b9a009c4
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
@@ -0,0 +1,26 @@
+commit d7a633df899dda8738a30df318269e28c902e815
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Mon Jun 13 21:38:08 2022 +0300
+
+    rtp: Initialize SDP info struct field added for OPUS
+    
+    Turned out that pa_sdp_info::enable_opus is never initialized, which seldom
+    makes module-rtp-recv believe it will be playing OPUS-encoded stream even though
+    discovered SDP record does not indicate OPUS codec in metadata.
+    
+    Fix this by adding missing initializer.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/720>
+
+diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
+index 4e6a442f8..bf131a27e 100644
+--- a/src/modules/rtp/sdp.c
++++ b/src/modules/rtp/sdp.c
+@@ -129,6 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
+     i->origin = i->session_name = NULL;
+     i->salen = 0;
+     i->payload = 255;
++    i->enable_opus = false;
+ 
+     if (pa_startswith(t, PA_SDP_HEADER)) {
+         t += sizeof(PA_SDP_HEADER) - 1;
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
new file mode 100644
index 000000000000..4ffdb82f4901
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
@@ -0,0 +1,76 @@
+commit 823e46fba0742605f557b68cd591f61624b93966
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sun Jun 12 21:49:32 2022 +0300
+
+    build-sys: meson: Make module-console-kit optional
+    
+    Default build configuration would fail to run on a system without systemd-logind
+    (or elogind) and without ConsoleKit daemon responding on dbus interface. Here,
+    module-console-kit would fail to initialize, preventing daemon from starting.
+    
+    Make module-console-kit an optional build feature to allow opt-out.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/719>
+
+diff --git a/meson.build b/meson.build
+index d4cdbd6a5..c6db7e670 100644
+--- a/meson.build
++++ b/meson.build
+@@ -732,6 +732,10 @@ if get_option('daemon')
+     cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+   endif
+ 
++  if get_option('consolekit').enabled()
++    assert(dbus_dep.found(), 'ConsoleKit requires D-Bus support')
++  endif
++
+   tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap'))
+   if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep)
+     cdata.set('HAVE_LIBWRAP', 1)
+@@ -1001,6 +1005,7 @@ summary += [
+   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
+   'Enable systemd units:          @0@'.format(systemd_dep.found()),
+   'Enable elogind:                @0@'.format(libelogind_dep.found()),
++  'Enable ConsoleKit:             @0@'.format(not get_option('consolekit').disabled() and dbus_dep.found()),
+   'Enable TCP Wrappers:           @0@'.format(tcpwrap_dep.found()),
+   'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()),
+   'Database:                      @0@'.format(get_option('database')),
+diff --git a/meson_options.txt b/meson_options.txt
+index b23210072..e7160a3a7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -99,6 +99,9 @@ option('bluez5-native-headset',
+ option('bluez5-ofono-headset',
+        type : 'boolean',
+        description : 'Optional oFono headset backend support (BlueZ 5)')
++option('consolekit',
++       type : 'feature', value : 'auto',
++       description : 'Optional ConsoleKit support')
+ option('dbus',
+        type : 'feature', value : 'auto',
+        description : 'Optional D-Bus support')
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index cdf372c8e..1d8004300 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -130,7 +130,6 @@ endif
+ 
+ if dbus_dep.found()
+   all_modules += [
+-    [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
+     [ 'module-dbus-protocol',
+       [ 'dbus/iface-card.c', 'dbus/iface-card.h',
+ 	'dbus/iface-card-profile.c', 'dbus/iface-card-profile.h',
+@@ -147,6 +146,12 @@ if dbus_dep.found()
+       [], [], [dbus_dep] ],
+     [ 'module-rygel-media-server', 'module-rygel-media-server.c', [], [], [dbus_dep], libprotocol_http ],
+   ]
++
++  if not get_option('consolekit').disabled()
++    all_modules += [
++      [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
++    ]
++  endif
+ endif
+ 
+ if fftw_dep.found()
diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml
index 0a4437e23510..5d81f9170193 100644
--- a/media-sound/pulseaudio-daemon/metadata.xml
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+  <maintainer type="person" proxied="yes">
+    <email>igor.v.kovalenko@gmail.com</email>
+    <name>Igor V. Kovalenko</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+    <name>Mart Raudsepp</name>
   </maintainer>
   <use>
     <flag name="X">
@@ -36,7 +44,10 @@
     </flag>
     <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
     <flag name="equalizer">
-      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
+      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg> and <pkg>sys-apps/dbus</pkg>).
+    </flag>
+    <flag name="fftw">
+      Enable the virtual surround sink module (requires <pkg>sci-libs/fftw</pkg>).
     </flag>
     <flag name="ssl">
       Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
@@ -56,15 +67,12 @@
       Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
       ConsoleKit.
     </flag>
-    <flag name="native-headset">
-      Build with native HSP backend for bluez 5.
-    </flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
     <flag name="ofono-headset">
-      Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
+      Build with optional 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.
+      Build GStreamer-based RTP protocol module which supports more advanced RTP features like OPUS payload encoding.
     </flag>
     <flag name="aptx">
       aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
index 61a9f133cb5f..b6489354786a 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -32,8 +32,8 @@ 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 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"
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -41,11 +41,12 @@ RESTRICT="!test? ( test )"
 # 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="
+	?? ( elogind systemd )
 	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
 	bluetooth? ( dbus )
-	?? ( elogind systemd )
 	equalizer? ( dbus )
-	native-headset? ( bluetooth )
+	ldac? ( bluetooth )
 	ofono-headset? ( bluetooth )
 	udev? ( || ( alsa oss ) )
 	zeroconf? ( dbus )
@@ -55,8 +56,12 @@ REQUIRED_USE="
 # - libpcre needed in some cases, bug #472228
 # - media-libs/speexdsp is providing echo canceller implementation and used in resampler
 # TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd?,X?]
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
@@ -65,6 +70,7 @@ COMMON_DEPEND="
 		dev-libs/libpcre:3
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
 	asyncns? ( >=net-libs/libasyncns-0.1 )
 	bluetooth? (
 		>=net-wireless/bluez-5
@@ -76,16 +82,17 @@ COMMON_DEPEND="
 	dbus? ( >=sys-apps/dbus-1.4.12 )
 	elogind? ( sys-auth/elogind )
 	equalizer? (
-		sci-libs/fftw:3.0
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
 	)
 	gdbm? ( sys-libs/gdbm:= )
 	glib? ( >=dev-libs/glib-2.28.0:2 )
-	gstreamer? (
-		media-libs/gst-plugins-base
-		>=media-libs/gstreamer-1.14
-	)
+	gstreamer? ( ${gstreamer_deps} )
 	gtk? ( x11-libs/gtk+:3 )
 	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
 	lirc? ( app-misc/lirc )
 	ofono-headset? ( >=net-misc/ofono-1.13 )
 	orc? ( >=dev-lang/orc-0.4.15 )
@@ -95,6 +102,7 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-util/valgrind )
 	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	X? (
 		>=x11-libs/libxcb-1.6
@@ -125,12 +133,11 @@ RDEPEND="
 		acct-group/pulse-access
 	)
 	bluetooth? (
-		gstreamer? (
-			ldac? ( media-plugins/gst-plugins-ldac )
-			aptx? ( media-plugins/gst-plugins-openaptx )
-		)
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
 	)
 "
+unset gstreamer_deps
 
 # This is a PDEPEND to avoid a circular dep
 PDEPEND="
@@ -163,6 +170,16 @@ src_prepare() {
 }
 
 src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
 	local emesonargs=(
 		--localstatedir="${EPREFIX}"/var
 
@@ -188,12 +205,12 @@ src_configure() {
 		$(meson_feature asyncns)
 		$(meson_feature zeroconf avahi)
 		$(meson_feature bluetooth bluez5)
-		$(meson_feature gstreamer bluez5-gstreamer)
-		$(meson_use native-headset bluez5-native-headset)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
 		$(meson_use ofono-headset bluez5-ofono-headset)
 		$(meson_feature dbus)
 		$(meson_feature elogind)
-		$(meson_feature equalizer fftw)
+		-Dfftw=${enable_fftw}
 		$(meson_feature glib) # WARNING: toggling this likely changes ABI
 		$(meson_feature glib gsettings) # Supposedly correct?
 		$(meson_feature gstreamer)
@@ -211,7 +228,7 @@ src_configure() {
 		$(meson_feature systemd)
 		$(meson_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
 		$(meson_feature udev)
-		-Dvalgrind=auto
+		$(meson_feature valgrind)
 		$(meson_feature X x11)
 
 		# Echo cancellation
@@ -311,17 +328,46 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if use native-headset && use ofono-headset; then
+	if use bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if 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 gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
 	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
 		elog "It's recommended to start pulseaudio via its systemd user units:"
 		elog ""
 		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
 		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		elog ""
 		elog "The change from autospawn to user units will take effect after restarting."
 		elog ""
 	fi
@@ -333,4 +379,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+	use udev && udev_reload
 }
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
new file mode 100644
index 000000000000..3ec78e0ac672
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# 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 elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +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="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	|| (
+		elibc_glibc? ( virtual/libc )
+		dev-libs/libpcre:3
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	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(+)] )
+	valgrind? ( dev-util/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		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] )
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	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
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+# patches merged upstream, to be removed with 16.1 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
+	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(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)/pulseaudio/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_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# 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
+
+		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}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; 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
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.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 bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if 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 gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		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
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
new file mode 100644
index 000000000000..f9980628eb08
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
+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/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# 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 elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +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="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	|| (
+		elibc_glibc? ( virtual/libc )
+		dev-libs/libpcre:3
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	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(+)] )
+	valgrind? ( dev-util/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		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] )
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	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
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+# patches merged upstream, to be removed with 16.1 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
+	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
+	"${FILESDIR}"/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
+	"${FILESDIR}"/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
+	"${FILESDIR}"/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(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)/pulseaudio/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_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# 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
+
+	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
+	# Install these dirs to silence a warning if they are missing.
+	keepdir /etc/pulse/default.pa.d
+	keepdir /etc/pulse/system.pa.d
+
+	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}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; 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
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.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 bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if 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 gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		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
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
new file mode 100644
index 000000000000..eddb6f54e7b5
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
+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/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# 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 elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +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="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	|| (
+		elibc_glibc? ( virtual/libc )
+		dev-libs/libpcre:3
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	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(+)] )
+	valgrind? ( dev-util/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		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] )
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	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
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+# patches merged upstream, to be removed with 16.2 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(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)/pulseaudio/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_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# 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
+
+	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
+	# Install these dirs to silence a warning if they are missing.
+	keepdir /etc/pulse/default.pa.d
+	keepdir /etc/pulse/system.pa.d
+
+	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}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; 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
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.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 bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if 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 gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		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
+	use udev && udev_reload
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 5b480c94644b..ce78f287b380 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -11,6 +11,6 @@ DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34
 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-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
-EBUILD pulseaudio-15.0-r3.ebuild 11223 BLAKE2B 5e53bf307583e8cdc465d9c724397f7c6b89fe9070e8209568666200c9de4535fca1589a34ce26c47dc63537e43e582fae3b220a7546f4bd8ab477040c24ce42 SHA512 f20cd43da0a287aed5aada8d37610ec0c5ad063c525f549f575bdef646bada604d9a3736cb2d7be08a6477c7bff400cbf61a1f15089a2a73dc62ee7ec41eaf56
-EBUILD pulseaudio-15.99.1-r1.ebuild 927 BLAKE2B 88797ff7961be78ed9803c91b4a6c84698375013da41f45ffdb65c2704ce9e05caa2513d83ae8a98d1efffa91eb1d08ed7460959ed438d1946bc2521a4092996 SHA512 cae78b9ebcc65803ffde0b09300c5ff43fb7c085a6785f220a549f2e32cd5f8ac2db148487e452bc535d9b85055bc71cd00150aa36418f7128fbdeef4a646d7e
-MISC metadata.xml 3874 BLAKE2B 0aa44014b4b731a193e4bbf4f0eca2e3df5946d8e210f90679d7625b61f18ff29c5b3dd18999b489997471885fd1f3f8fcf722eae2cf1e4210e236f8b025540a SHA512 01c4d22c01cc92570dbfeaa749c82b434ae25520ace0258bc61f74fc51beba1235affb39b4eb1609c9e39d6215b46b721524f606bc391dbc6955084186cb1efd
+EBUILD pulseaudio-15.0-r3.ebuild 11216 BLAKE2B b6b81a19e36106b2faff1607539af5c11a612c1a9f686f2d76b1d3a22873fddec171821ffedb3224dab2e1737fe87019460869f9059f800627a0b842ac1792ed SHA512 eadd4841cda27faa7c86b31e3cb2d658e01096ce2c4bfe1e818387294d11de3f1199c54512166df0f3dda5470f2cf7b9e37e4fcdcfe69bc29c9fe5cceaab3817
+EBUILD pulseaudio-16.0.ebuild 879 BLAKE2B bf99843aea835578905b86529c2bc11d93b28b6457d5ed6b52157e90a98ad5d9be17208c52f9e9d7dfa290e4676fcc79279aa38afa59c51d694579d4f15ec8ee SHA512 644aa3f63973836971e5793451f2e1ea4d81ce46b82c36ec61fcbe3807c5920a3c6ee8684c87f9164a9806bfc1d719b091bf1674b6955c2b3d3d2ca7367203d6
+MISC metadata.xml 4111 BLAKE2B c2f5d0e123d9fee8d8d5e6a3f15cc4edb94c2ab8f6e0f4e0b8e0de778c67dc5482b4cfba550fec8653412b8dd026b66e0c2334d78144028d84d7ccd8a9e77cd1 SHA512 d3c949697b0be0cf3d0447b9691a77e97f2d77e099e0662a345e5c22f965a0d0a2dfd073dd601f28f39f4fb5676c0561c816335fa8ac8a019b55699637dac78c
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index fff0ae344a5d..b2a077b71249 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+  <maintainer type="person" proxied="yes">
+    <email>igor.v.kovalenko@gmail.com</email>
+    <name>Igor V. Kovalenko</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+    <name>Mart Raudsepp</name>
   </maintainer>
   <use>
     <flag name="X">
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
index df8a1deea80e..85f1d2a7a9a7 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	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"
+	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
diff --git a/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
index cb446d289297..0e728819bd6b 100644
--- a/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
@@ -5,24 +5,24 @@ EAPI="7"
 
 inherit multilib-minimal
 
-DESCRIPTION="A networked sound server with an advanced plugin system"
+DESCRIPTION="A meta package for PulseAudio (networked sound server)"
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="metapackage"
 
 SLOT="0"
 
-# NOTE: bluetooth, native-headset and ofono-headset are passed through to
+# NOTE: bluetooth 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"
+IUSE="bluetooth +daemon +glib jack ofono-headset"
 
 RDEPEND="
 	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
-	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,ofono-headset?] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 2859c8012588..2adfe9523292 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,4 @@
-AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
-AUX pulseeffects-4.8.6-meson_no_automagic.patch 1529 BLAKE2B 63ff162b0d0dbf7d091d6d1ce4b57bd4e0f43c72d795457ede6709d26ceea661fb7208ea762b8061458a456c1ebdeff24c2e4e1c5b1796b0fa7f11d268e85e7e SHA512 d086cbe38a6aa0149bea52e4b6fde74edfc0d769fe56225754ce13ee0316f3c149333527ca0512dc0f3f703ff84f3f5da19b4504cd2d6100c79d14fa54967bbd
-DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-4.8.6.tar.gz 2028485 BLAKE2B bf50c72773670ec9b8fd1f21b927b23f6656a2de6c86fc0b68a8fb199a2c949146d1c550f6ce291ca713edb5d0f2a034cf5cae6f3d266c4ef0f541c5f247e422 SHA512 37ad97e7234e9dae0f3be910b35b2dfed94f593c39e59b9977e31c95108e7edede4104cc5fe32292e617f119898c4bad4e9fd5afdfb9aaaa134f5cb78fc5fa0f
-EBUILD pulseeffects-4.8.5-r1.ebuild 2236 BLAKE2B 1dc26ed814192ccc3af475a41b5bce38b5659b895983071cd6a4a3be9f3ba5d864c7f9b7e9721e6f42b8776a4697af024ddc3d394fd0995fff284a457f0ab2be SHA512 484d0995b1f56ea5df785612a2ddbce2e6d6473995228838ff1fa54126dd14453cfcff3621e8dde3cba59cd9d5cf8bbb3a3596c4b2e7b4859e6af7a2e72bc219
-EBUILD pulseeffects-4.8.6.ebuild 2272 BLAKE2B e82fa92a378e770a656314dbdff9e1dd14342ce134ea6f5239d0dcdd79824bfd245497a4844cc2b3060428c0195f335e7bb8f294ac193305eedff92411bb944a SHA512 93351d197ab25d12ea43cc47848377269b1bf1a43bf8e6f23aba78c0d5406bd4627abdf708849d5ce8e699874178e9141a1c4486169d28d2652922b0ac1d293a
+AUX pulseeffects-4.8.7-meson_no_automagic.patch 1529 BLAKE2B 1a40bf0382e378129b784a1d65138e89934757b2e3580616e163a9f2be1675b6a181b3909b3d7dd25b5e1bc5243d316534e2eaae4d7f82e4764645be33ac6c15 SHA512 249fb9a3c4254c21a49c46b1eab4d0c9dd6081a1367d192be7f9446b97235aa2c5ef909465fe130c0d01024f6152a7208c5a2205781d8f84bf5b6bf1e10204cf
+DIST pulseeffects-4.8.7.tar.gz 2028489 BLAKE2B 705783104c7ce3f4ff1246cf05c1a31c09ef0507a720365b9a8914e6e076a209dcc56e240ae2de1981f3ab377f10947d08260fe8ae8b3cae5724db1235a0c01c SHA512 0fa679723ba76ab0a0cf3136dfa66fec09b16643f3f4f7bd1bb2826794d907c5c29a2fc7633e30d3542ddf755c842fdaa167528942fe459e3e697ac3524c0cb9
+EBUILD pulseeffects-4.8.7.ebuild 2270 BLAKE2B 1b230037c4c7a24a57ba08eeb6b665902263b077e18da372037b139e56275e737b2885eb4663a0b39710467780b243f13613e9b60c54b1d25a68e3ac04384769 SHA512 a0493b880ebfbf061104258dfaf89a6383a5f2cce08a4b9436e3b0ee4ee73570e6336bb08bdaae528e1f887ff9ed76396c3b0a80a78be6dacb6b94d337bd1bf7
 MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
deleted file mode 100644
index 0288fab2987d..000000000000
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -4,7 +4,7 @@
- 	'cpp',
- 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '4.8.6',
--	meson_version: '>= 0.40.0'
-+	meson_version: '>= 0.47.0'
- )
- 
- add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -0,0 +1,12 @@
-+option(
-+        'bs2b',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
-+)
-+option(
-+        'rnnoise',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable rnnoise-based Noise Reduction plug-in'
-+)
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -108,7 +108,7 @@
- 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
- 	dependency('gstreamer-fft-1.0'),
- 	dependency('lilv-0', version: '>=0.22', required: false),
--	dependency('libbs2b', required: false),
-+	dependency('libbs2b', required: get_option('bs2b')),
- 	dependency('boost', version: '>=1.72', modules:['system','filesystem']),
- 	dependency('sndfile'),
- 	dependency('threads')
---- a/src/rnnoise/meson.build
-+++ b/src/rnnoise/meson.build
-@@ -1,4 +1,5 @@
--dep_rnnoise = dependency('rnnoise', required: false)
-+opt_rnnoise = get_option('rnnoise')
-+dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
- 
- if dep_rnnoise.found()
- 
-@@ -28,7 +29,7 @@
-   	cpp_args: plugins_cxx_args
- )
- 
--else
-+elif opt_rnnoise.auto()
- 
- message('could not find the RNNoise library')
- 
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
index 2ad89e629771..7d29270ce54e 100644
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
@@ -3,7 +3,7 @@
 @@ -4,7 +4,7 @@
  	'cpp',
  	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '4.8.5',
+ 	version: '4.8.7',
 -	meson_version: '>= 0.40.0'
 +	meson_version: '>= 0.47.0'
  )
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
deleted file mode 100644
index 9ca5a1a00987..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pulseaudio-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
-
-DEPEND=">=dev-libs/boost-1.72:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=media-libs/gstreamer-1.12.5:1.0
-	media-libs/gst-plugins-base
-	>=media-libs/gst-plugins-bad-1.12.5:1.0
-	media-libs/libebur128
-	media-libs/libsndfile
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/zita-convolver-3.0.0
-	media-sound/pulseaudio
-	>=x11-libs/gtk+-3.20:3
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	rnnoise? ( media-libs/rnnoise )"
-RDEPEND="!media-sound/easyeffects
-	${DEPEND}
-	>=media-libs/gst-plugins-good-1.12.5:1.0
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	rubberband? ( media-libs/rubberband[ladspa] )
-	webrtc? ( media-plugins/gst-plugins-webrtc )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.5-meson_no_automagic.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bs2b)
-		$(meson_feature rnnoise)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
index bf1d9aac8112..6ecf39ee6215 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="pulseaudio-legacy"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -60,7 +60,7 @@ BDEPEND="dev-libs/appstream-glib
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.6-meson_no_automagic.patch
+	"${FILESDIR}"/${PN}-4.8.7-meson_no_automagic.patch
 )
 
 S="${WORKDIR}"/easyeffects-${PV}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 2e45aa655d39..b4f2a655ec2c 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,9 @@
+AUX qmmp-1.6.0-udisks_plugin.patch 321 BLAKE2B a3a0e6ca792a9399eef189e319113b63094cbc32a2d8912c7d7174589f34729be4ce0638323f449320cd34df0b1e3780ff43ae3c211cc6c96ba823cb0fed53bd SHA512 d88eadf6e725617cc50ef809532a5eaa0272745c74697953850c52dca3586809bd83f3804925e65607379e7156210686fe906da729371ba251ebfa1168e59b97
 DIST qmmp-1.5.4.tar.bz2 1388941 BLAKE2B e1a205b6315cd841c7d7a94ed85dca7fcbc74416dcc09458637ccadab96c3a2614039007cdbab404098d2818f4b5cdb7a0bc5cf27e1bfdd0f146d73e2834f230 SHA512 5dcc543f75f3baa6115c7c692acaca00b1ad6b62c773ac18ad97447fc17978f067d85b132d1fdb65467474417b7d7e8d8b43e0284196978ca63dd5d431a23bf5
+DIST qmmp-1.6.0.tar.bz2 1364512 BLAKE2B 3af905fa8af1a23f04d3df30856f881184a5150de571ffb82efc98179c2fe67a232207ad1233c57fde9000facc1df07317b10658e5f462f79083e99deeb7bb9f SHA512 a96242b4eb46fce84f7eefb1dd90cf4c51809c7f8471a405462d95cb3ba5c373e217c50ed48b4ad6b94e1a7e0948839433d4085c41a35991bffd08699a4826f1
+DIST qmmp-1.6.1.tar.bz2 1353769 BLAKE2B d12f91166cec051caf604ec27dc563d4cf2a52511eabfc0dee0b0679373e7c5fa0f0faac2b4d25420f33485caf90545c7f0098f1e3814f92d46d82b253410afd SHA512 efaf44002c21544514301b5ec1210507fe3cdeb4c6b8d14fb8a573d32db5bb73a9d6d36d00d9d61592261b69fa4260417e3c65183f13299234bd82dda43536c5
 EBUILD qmmp-1.5.4.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
-EBUILD qmmp-9999.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
-MISC metadata.xml 1883 BLAKE2B 8f252d3c02181fe5c7897a6f23b689dc75b507af80e765248ba856c8cd6564d162cfa60190fdd57350e1cf00229391f5057c1a51853dd2e291b3bc7311049d8f SHA512 affecdc44bc4b87cae10aba228f52b6eee63f759fa70e609206c9a4e627dab7d89741cdf51a22fe4b502f8c8d62077512494c893c7963afeb7d0cc0c23f945c0
+EBUILD qmmp-1.6.0.ebuild 4143 BLAKE2B df7217bd71bb94f256b23cd2f07cf2bb35f6c1b6d75d8ab032e6c5aadf9a5ca51a97edf84e512e0b2e66c20b6dafcf86617ec92e34d26c0a44578a2bd3aec47f SHA512 2fc2ec9fe2c4ed6221e3efd3083f5b0efff67f64bdf1f7a579bb991a9eb6414437da5b36e9e902f1689ae1373978ed23b60bce109989b139a0af39bfb8770547
+EBUILD qmmp-1.6.1-r1.ebuild 4067 BLAKE2B 959e52da112582e230aa36d57954b5b101f366b2f500444c76e8f24a41a760b003449d91caf032a2804af1141e4ff1d4dd2b174cb6b45f5f63d5f8f94eb586ca SHA512 c0ce3b9e7f247472790e6016c54329fc7deb1a2f21a373adfa3791ec43363a22b47ad9633b7f290527245ba0f6467097ec12de8801229b56fef3618ceca34df9
+EBUILD qmmp-9999.ebuild 4127 BLAKE2B 43dea953fb1b740053fd4a20a5fc145a5c117a36a6f6b49284ea5f8e0cb5d041fc4585877ce37f749c7511be405ef83306b985b62189d38e35e22a5e56a6a959 SHA512 862f30e26cfc586f473e5d8068f8cf96d35ca70b39d25df0ba1dcf2b68b6e92ed1cf203cf6707a8f3b63c989f92dd46ca304f8a2d4389e25332d1b38c7fe6edd
+MISC metadata.xml 1960 BLAKE2B e0e190870cdb4c77e5ea4fb604af1afd571406488baa04daa760db1316cba922533f7e37b184e4e7df7c91e82dc716ea33deeb21102596ad512a9aef70a523a8 SHA512 5e8da850cdce11da134a03e9dda51d52ced62dee1fc80873695fe69f0fa53ba9ff7b9ad38931753819e4522103f3fe2ec49ae3b8d973d914e41d0e942557898d
diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
new file mode 100644
index 000000000000..45512099ffeb
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
@@ -0,0 +1,11 @@
+--- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
++++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt
+@@ -51,7 +51,7 @@
+ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ 
+ IF(USE_UDISKS2 AND Qt5DBus_FOUND)
+-add_subdirectory(udisks2)
++add_subdirectory(udisks)
+ ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
+ 
+ IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index b8eb53ed4c4a..13b31504cacc 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -30,5 +30,6 @@
 		<flag name="sndfile">Enable wav playback support via <pkg>media-libs/libsndfile</pkg></flag>
 		<flag name="stereo">Enable stereo effect</flag>
 		<flag name="tray">Build tray icon</flag>
+		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-1.6.0.ebuild b/media-sound/qmmp/qmmp-1.6.0.ebuild
new file mode 100644
index 000000000000..52888ecc3204
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+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
+	inherit subversion
+	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 mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+
+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 )
+	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 )
+	xmp? ( media-libs/libxmp )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
+)
+
+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_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)"
+		-DUSE_XMP="$(usex xmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.6.1-r1.ebuild b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..74de5e84ffe0
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+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
+	inherit subversion
+	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 mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+
+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 )
+	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 )
+	xmp? ( media-libs/libxmp )
+"
+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_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-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_UDISKS="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index ee881e5be18c..4a8758eff61c 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -21,9 +21,9 @@ 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
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
 notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack"
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -65,7 +65,6 @@ RDEPEND="
 	)
 	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 )
@@ -88,6 +87,7 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
@@ -95,6 +95,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
+)
+
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
@@ -125,14 +129,12 @@ src_configure() {
 		-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)"
@@ -150,9 +152,10 @@ src_configure() {
 		-DUSE_SOXR="$(usex soxr)"
 		-DUSE_STEREO="$(usex stereo)"
 		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
 	)
 
 	cmake_src_configure
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index d55703d5e963..708d1bddd751 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,5 +1,9 @@
+AUX 3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch 5817 BLAKE2B 2530b6064799c647955d5f1b08174933137de7e4a4d76afc61091693386a84d70e5a453c3d68d648bed12017574d05f794779418e0ce995a1f5f17dd447156ce SHA512 2219b5f40717970953ce20cd92703c67a8c54461fd544275a3efaca141c2e070706ada82ea966de8a641ce67eca354193368215ea45f2c5a64e381b2347e2d4f
+AUX 3.4.5-relax-meson-version-check.patch 1058 BLAKE2B cd8e34536be5bd95ccf040fcac294da2a28d433a0b4f7ceade4723e1993613c1b165b3bd2490adb8cfa59514cefff88ca415ca1dc531eb7afca47db0a2b39471 SHA512 c60a488df140bc587efd57aaa14768ab804d096f154f27c3838b86aabf6c92817cb7e485ad0fec07ec1f8b2b7c2465ff458e77ee16ca7dcb126d9de87de8f8d5
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
 DIST rhythmbox-3.4.5.tar.xz 3537764 BLAKE2B fe710816d0c48f5eac6925d5d160f0db060a3369a98afb8b57bd746998e40d413e51e3f5d2631d28eccb5af9a5b71b511f2c42812fbfa88e2cfd46f16338cc78 SHA512 aa9451a5046a99ed4318a45de6e3df069e7646d83e27895608a1e66f664312d0c2b72c8bb9da902eeb1255ab3d2f15956f4891ff51c1ad28f572c9c020dcefb7
+DIST rhythmbox-3.4.6.tar.xz 3535224 BLAKE2B 5e24facd810e72296ea541f8131b2ac364de0b38b0fd08a1fe6223a333e619cd08a3959fbbc6fbbd36a39990c7cc871decaefc316ce4910460aa6b446b3cb4c0 SHA512 d48818a6f299b3da8ae78bf13e41d702244d83a473586008b53f9c4cc504495ac2570c520c65efaf9e75408363b0256121d12680940c673d2977c7d177ef1fb3
 EBUILD rhythmbox-3.4.4.ebuild 3337 BLAKE2B 75495811cd8c559c630d14d33340c7d67b8d7c9acf0d50ad699fc6b4657fa389c9b39ae131a461f74e7eddce69c2b15117e7aa1bbcc077e653386a33bc312ae6 SHA512 2a489d4f822bed89869886dd41cc0852d5e7aefc017e03a7a31c67ca55663a4eb518d83b3ff4785fdf768cffd4c083b849b923defd9f9a5a37f18881c70cd318
-EBUILD rhythmbox-3.4.5.ebuild 3269 BLAKE2B f691715781694e657dc1623c93c8190e17486e870355dbe0646ec08ce23b9971a2879810ee5d90f5a0a896d120246c7b53719d50abdfc110648cf5f55eb1d4e1 SHA512 0c8fcb1e73a48fea8c278ecd139a2b6ce4efab677ef646b29f9d7a73271c8e689e02619a0a1aa3e038d878dcf7bf54c87f07667df5dc792bffd443bc5002e34e
+EBUILD rhythmbox-3.4.5.ebuild 3415 BLAKE2B 319a62ee706e0777afa2848d250514345212da2a2305dd6db68455766f4db92e091c227a009870ec55ea7919691aa12a57bfb620af7b2e73f4f56c5a8010509e SHA512 37cd266bbd929b95e4dc5539c0bddef75934214df0f1af51db273156cbb12d565332357349f365167dc294b6ce7f59fac3d128473111746a1347ee08e968f975
+EBUILD rhythmbox-3.4.6.ebuild 3276 BLAKE2B 45dcab9d34dcae836758bbb0078300f5ed942536b3de9ac807f0cbed1225e03668f74c8342317e763c5d88c44efa3f9240cf3b43fdfaaa246c62cd5520df38f3 SHA512 13e22d517bbe635ffeed2b55a3adcd2105244ba1e426df94b119a65b2be49d8ca55a35c14f5359ad8ab2e7119ee82533acd0a9f5767eb9c18b1b8317557f611e
 MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d
diff --git a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
new file mode 100644
index 000000000000..294d2d2ef66f
--- /dev/null
+++ b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
@@ -0,0 +1,169 @@
+From c9dfc5a5899d2628ba1dd6f93f46cf589669bd45 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 17 May 2022 08:18:21 +1000
+Subject: [PATCH] build: don't use feature.allowed() around dependency checks
+
+When the feature specified as the 'required' parameter to dependency()
+is disabled, it returns an empty dependency object, which is much easier
+to deal with than a dependency variable that's only conditionally
+defined.
+
+Fixes: #1972
+---
+ meson.build | 94 +++++++++++++++++++++--------------------------------
+ 1 file changed, 37 insertions(+), 57 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5792b0e49..de265901b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,71 +70,52 @@ tdb = dependency('tdb', version: '>= 1.2.6', required: true)
+ totem_plparser = dependency('totem-plparser', version: '>= 3.2.0', required: true)
+ 
+ use_gudev = false
+-if get_option('gudev').allowed()
+-  gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
+-  if gudev.found()
+-    use_gudev = true
+-    cdata.set('HAVE_GUDEV', 1)
+-  endif
++gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
++if gudev.found()
++  use_gudev = true
++  cdata.set('HAVE_GUDEV', 1)
+ endif
+ 
+ use_ipod = false
+-if get_option('ipod').allowed()
+-  libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
+-  if libgpod.found()
+-    use_ipod = true
+-  endif
++libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
++if libgpod.found()
++  use_ipod = true
+ endif
+ 
+ use_mtp = false
+-if get_option('mtp').allowed()
+-  libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
+-
+-  if libmtp.found()
+-    if use_gudev
+-      use_mtp = true
+-    elif get_option('mtp').enabled()
+-      error('MTP explicitly requested but GUdev is not available')
+-    endif
++libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
++if libmtp.found()
++  if use_gudev
++    use_mtp = true
++  elif get_option('mtp').enabled()
++    error('MTP explicitly requested but GUdev is not available')
+   endif
+ endif
+ 
+ use_notify = false
+-if get_option('libnotify').allowed()
+-  libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
+-
+-  if libnotify.found()
+-    use_notify = true
+-  endif
++libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
++if libnotify.found()
++  use_notify = true
+ endif
+ 
+ use_libsecret = false
+-if get_option('libsecret').allowed()
+-  libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
+-
+-  if libsecret.found()
+-    use_libsecret = true
+-  endif
++libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
++if libsecret.found()
++  use_libsecret = true
+ endif
+ cdata.set('PY_LIBSECRET_ENABLED', use_libsecret)
+ cdata.set('WITH_LIBSECRET', use_libsecret)
+ 
+ use_lirc = false
+-if get_option('lirc').allowed()
+-  lirc = dependency('lirc', required: get_option('lirc'))
+-
+-  if lirc.found()
+-    use_lirc = true
+-  endif
++lirc = dependency('lirc', required: get_option('lirc'))
++if lirc.found()
++  use_lirc = true
+ endif
+ 
+ have_libbrasero_media = false
+-if get_option('brasero').allowed()
+-  brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
+-
+-  if brasero_media.found()
+-    have_libbrasero_media = true
+-  endif
++brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
++if brasero_media.found()
++  have_libbrasero_media = true
+ endif
+ 
+ have_gnu_fwrite_unlocked = false
+@@ -189,16 +170,16 @@ cdata.set('PLUGINDATADIR',  plugindatadir)
+ cdata.set('SAMPLEPLUGINDIR', libdir / 'rhythmbox' / 'sample-plugins')
+ 
+ enable_python = false
+-if get_option('plugins_python').allowed()
+-  python = find_program('python3', required: get_option('plugins_python'))
+-  pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
+-  pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++python = find_program('python3', required: get_option('plugins_python'))
++pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
++pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++if python.found() and pygobject.found()
+   enable_python = true
+ endif
+ 
+ enable_vala = false
+-if get_option('plugins_vala').allowed()
+-  vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++if vala_found
+   enable_vala = true
+   vapi_dir = meson.current_source_dir() / 'bindings' / 'vala'
+   add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
+@@ -231,12 +212,9 @@ if get_option('daap').allowed()
+ endif
+ 
+ enable_grilo = false
+-if get_option('grilo').allowed()
+-  grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
+-
+-  if grilo.found()
+-    enable_grilo = true
+-  endif
++grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
++if grilo.found()
++  enable_grilo = true
+ endif
+ 
+ enable_check = false
+@@ -279,7 +257,9 @@ summary({'iPod integration': use_ipod,
+          'Python plugin support': enable_python,
+          'Vala plugin support': enable_vala,
+          'Libsecret keyring support': use_libsecret,
+-         'FM radio support': enable_fm_radio,},
++         'FM radio support': enable_fm_radio,
++         'Grilo support': enable_grilo,
++        },
+         section: 'Plugins')
+ 
+ configinc = include_directories('.')
+-- 
+2.35.1
+
diff --git a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
new file mode 100644
index 000000000000..2843a4c0cabc
--- /dev/null
+++ b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
@@ -0,0 +1,42 @@
+https://github.com/GNOME/rhythmbox/commit/29a1627f1683aac358103710ffc1a51791951edd
+https://bugs.gentoo.org/845006
+--- a/meson.build
++++ b/meson.build
+@@ -3,10 +3,6 @@ project('rhythmbox', 'c',
+   meson_version: '>= 0.59.0',
+   default_options: ['c_std=gnu89'])
+ 
+-if meson.version().version_compare('> 0.62.0')
+-      error('unsupported version of meson, please use 0.62')
+-endif
+-
+ gnome = import('gnome')
+ i18n = import('i18n')
+ pkg = import('pkgconfig')
+GitLab
+From 0fe3a388fac73a5d4217aed510d65976850734c4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 4 May 2022 10:23:16 +0200
+Subject: [PATCH 2/2] ci: Install latest meson
+
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -4,8 +4,6 @@ stages:
+   - test
+ 
+ variables:
+-  MESON_VER: 0.62.0
+-
+   UBUNTU_DEPS:
+     build-essential
+     desktop-file-utils
+@@ -64,7 +62,7 @@ before_script:
+   - export DEBIAN_FRONTEND=noninteractive
+   - apt-get update
+   - apt-get install -y $UBUNTU_DEPS
+-  - pip3 install meson==$MESON_VER
++  - pip3 install meson
+ 
+ test:
+   stage: test
+GitLab
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
index 2e7dc2b30fd4..d9e9ffb13091 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
@@ -93,6 +93,11 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-relax-meson-version-check.patch
+	"${FILESDIR}/${PV}"-build-don-t-use-feature.allowed-around-dependency-ch.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.6.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.6.ebuild
new file mode 100644
index 000000000000..8be1fe3203c7
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.6.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=media-libs/gstreamer-1.4.0:1.0[introspection]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+	dev-libs/json-glib
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=net-libs/libsoup-2.42.0:2.4
+	>=dev-libs/libxml2-2.7.8:2
+	x11-libs/pango
+	>=sys-libs/tdb-1.2.6
+	>=dev-libs/totem-pl-parser-3.2
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		')
+	)
+	udev? (
+		dev-libs/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 )
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] )
+	)
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av]
+	)
+"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cdr brasero)
+		$(meson_feature daap)
+		-Dfm_radio=enabled
+		$(meson_feature upnp-av grilo)
+		$(meson_feature udev gudev)
+		$(meson_feature ipod)
+		$(meson_feature libnotify)
+		$(meson_feature gnome-keyring libsecret)
+		$(meson_feature lirc)
+		$(meson_feature mtp)
+		$(meson_feature python plugins_python)
+		-Dplugins_vala=disabled
+		-Dsample-plugins=false
+
+		-Dhelp=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 9985be1bb01f..4ebbcd032466 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
 DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
+DIST rosegarden-22.06.tar.bz2 6514502 BLAKE2B d4ba13ac6b4cba6d0b5bc555933737d696d380737e56a3e4e1dd782aff641dcbd49af50aade75550b8a0e22a45f491585ffb4166b21cb9889eca1a2e546c585a SHA512 42ce03a65f9c9401cb3f641c0ae80a827e18d6f47420add382f63273f4644eac5997befe70cac972380441a43d74153a4e37a276fc3dc8d9889eb8671759ab5a
 EBUILD rosegarden-21.12.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
+EBUILD rosegarden-22.06.ebuild 1135 BLAKE2B cdae8ff15f7bb2f7f8ffac044ae7a06c05f2d7084bd46e1d91055fd3c934e6a958cac6caa4ea43ed77a989a7b87a98830ff269c70969e3310b0a52f8259b8a94 SHA512 15c4e90ea5510374252f2583f5e4ca76147ecb655ccda904fa7ac2a8151a0fead5972e36eedca02d627a0553f220302e0639d6c2500ac17114ee3716964378da
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-22.06.ebuild b/media-sound/rosegarden/rosegarden-22.06.ebuild
new file mode 100644
index 000000000000..2a8fc820cf59
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-22.06.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 5f0d50f5a568..efd24b5066da 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20220125.tar.gz 1309919 BLAKE2B 54fedd4936e51db248b8b237d53b2338488c8332866a221bdd03bc1598aabca80f644052bdc48d8be2f95ad3b10bc6cfc9065a37b62f09df7c0ef4d304a8adde SHA512 c34979cf6cda75a4e5533631b8134b2994a5491f1182b69bfa6e1c97fd2f2e0dc90d883c6184fb24e68e60351e91ca1a2bcccb3708fc0099d0051452b5a44851
 DIST schismtracker-20220506.tar.gz 1310121 BLAKE2B a9740c2a8909a533523de18c8cd4c4457bdaa8f6198598fb0e73089fdb2c7bac3211024d5d9cb695aa5758710d0fa16a407ce0e150d0a3ef0071522f2937eec1 SHA512 8dacd1fd719c20fdc8ef157d1487202a39d4f36a37560ad62680655addde0ceb78bbce51e4f640d3979c91f6a4dfe4bc006785aa35d45a00206773d41adf9f42
-EBUILD schismtracker-20220125.ebuild 1430 BLAKE2B 8c7de70c82a69d2ec57425df0197f13e2a16f01959e86d458f4af586a676975bd9bd81be50b8a190c4be5dd7936790b1221e838ff587ae47354aadd536e24bd7 SHA512 192951e2e5d28c930d7e08fe0056316f0936af63b76f6c41bb095dc353c09869ddebca868db1f07ea2fb46a69d456b244bc5a3285f2143b232884fc21f0ed0a0
-EBUILD schismtracker-20220506.ebuild 1432 BLAKE2B 6deb4efd60e063e0cc0dcad049e14d712cbd4919ed5e54eaec283c3c41fdbd8f54adc3c44e78805b3d2491b970b9074bd4017bd05f6664653a70f9e7d94b454e SHA512 d0f4d36af940ab82414fcdce3c6aac8422e3a0a1697c096a86aa2b8e24e6434a20cfa5ac59d39c1ca2099a29b2d6eb8e779a42b7d9b1cbe92ae1a5ba1ce6eec3
+EBUILD schismtracker-20220506.ebuild 1430 BLAKE2B 8c7de70c82a69d2ec57425df0197f13e2a16f01959e86d458f4af586a676975bd9bd81be50b8a190c4be5dd7936790b1221e838ff587ae47354aadd536e24bd7 SHA512 192951e2e5d28c930d7e08fe0056316f0936af63b76f6c41bb095dc353c09869ddebca868db1f07ea2fb46a69d456b244bc5a3285f2143b232884fc21f0ed0a0
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20220125.ebuild b/media-sound/schismtracker/schismtracker-20220125.ebuild
deleted file mode 100644
index 3701e3cf3a68..000000000000
--- a/media-sound/schismtracker/schismtracker-20220125.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 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-20220506.ebuild b/media-sound/schismtracker/schismtracker-20220506.ebuild
index c5e2f717127a..3701e3cf3a68 100644
--- a/media-sound/schismtracker/schismtracker-20220506.ebuild
+++ b/media-sound/schismtracker/schismtracker-20220506.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 045efe670222..7cb233e1cd87 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -3,5 +3,5 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.26.0.tar.gz 1537036 BLAKE2B f6ef4393f3601c749140a9505f57515582147aacf25072d9114491aafb108c202c3631142171858d2b8f914be8105bbd9c66054c6d36d0b4a443e5b9a642cf51 SHA512 fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
-EBUILD snapcast-0.26.0.ebuild 1575 BLAKE2B 851c27c16b992b4053dce61514f4c9ae0f649d69d9be3e160d22f8afec4f3cbfccb60bd8455786b6e412da0a0af125069738543e42093969163a43a71043f889 SHA512 447c0549b093e9ef8355390e1afd8e2d2c817bb70cc89cb212a0d047a4073069c4885fe4564f7bd6792d157ba4a36e6624ca443bcebc63358eddd94ea4ee1437
+EBUILD snapcast-0.26.0.ebuild 1582 BLAKE2B eedbe8e54c84718371de5a2100a9e45bfabed78b8d030bc05d3c41e7c7b45d94b88fb3bc92f57782e15a4cbcd5aeb0b5f3a881937180bfd31d52d4358952cdde SHA512 92b5eabef7744113b0caa682bd5f9fcf9bbf08ca8377616e1be2980e0fc10737dba19178901ba9ad8045e58cc4bc4192b9e17e2575ed721f43caf5ce5674e05b
 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 24c46c3d7534..eb636b7a42e5 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 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
 REQUIRED_USE="|| ( server client )"
 
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index 77049d0f4903..ceddccd9e195 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,5 +1,7 @@
+AUX sndio-1.8.0-fix-hardcoded-pkgconfdir.patch 421 BLAKE2B 0e9fb5f30d53c18596584e23cccf34909ea0c86c289ff3e8790f29d7d0ec221f26371afa9df7e6f4d0268aa4f0561ea5ccf73e2eaf02a375f15d75a41ddf5640 SHA512 aaf789a6182c6a8e9f2ac2f8894ed52cf0a895f89192a3e326af7db781fd9721fc2768b9f00ca7e834a1ee4a1e748f1bda439f01a32e8ffdaa85273ec0fc57c4
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
+EBUILD sndio-1.8.0-r1.ebuild 1139 BLAKE2B a55224164c45558e4179485fbb00068bffce1c90fb718bbf5adb355042f2d6c7a7f43c3cfb9e5a8fda32871014a36085ceb662c42480b6f7955fa9e59061a278 SHA512 601d7b5c7eabb7e590553b9c552e391c53c273d3515a432e90877a9680f5ae8a06b1b7f7db5cf6a5e9e673d893365a44115d0fc5dca96fb55acb5e5e9e42cc5b
 EBUILD sndio-1.8.0.ebuild 1062 BLAKE2B b2ad8c433260bc1c81afa7c384dc2d4c25bfcec944b8d31ae7b84d83705540a0f6ec8bd4caf4830adf31cd1d4a9f0b3a0e684ecdb07dac13110fd2d47b4afe51 SHA512 3d290983c6e3a69e862ae503db7dc00c8eaa77a0bd050a16add83ca8399b63a74bf8622ce1841421cd118b29ea4ff3488f9d571a6ef6f214e029b65da3becffa
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch
new file mode 100644
index 000000000000..70c66157fab8
--- /dev/null
+++ b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure	2021-05-07 10:49:58.000000000 +0300
++++ b/configure	2022-06-07 14:49:07.623069325 +0300
+@@ -205,7 +205,7 @@
+ datadir="${datadir:-$prefix/share}"
+ includedir="${includedir:-$prefix/include}"
+ libdir="${libdir:-$exec_prefix/lib}"
+-pkgconfdir="${pkgconfdir:-$prefix/lib/pkgconfig}"
++pkgconfdir="${pkgconfdir:-$libdir/pkgconfig}"
+ mandir="${mandir:-$prefix/share/man}"
+ 
+ #
diff --git a/media-sound/sndio/sndio-1.8.0-r1.ebuild b/media-sound/sndio/sndio-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..3a22a2e82ac8
--- /dev/null
+++ b/media-sound/sndio/sndio-1.8.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
+HOMEPAGE="http://www.sndio.org/"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://caoua.org/git/sndio"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="http://www.sndio.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0/7.1"
+IUSE="alsa"
+
+DEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/sndiod
+"
+
+PATCHES=( "${FILESDIR}"/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--privsep-user=sndiod \
+		--with-libbsd \
+		$(use_enable alsa) \
+	|| die "Configure failed"
+}
+
+src_install() {
+	multilib-minimal_src_install
+
+	doinitd "${FILESDIR}/sndiod"
+}
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 6cef3bcd35b9..51919861cb1a 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,3 +1,3 @@
 DIST sonata-1.7.0.tar.gz 2258617 BLAKE2B 704f673737095351f88f64bc858db465b26d8e0fdb34cbb4d3917abe65ec276ec3e6419edd41d9e8b193a886c8dfd178b5fc94daa4a178aae817c2d3024c266b SHA512 c60c16b6cca439c2063069ceea62afdb9f09c9735d36ba42e2b5b1caf07506f15d722d75c68e355db4615b937a728679aeae1619527ac8267feec111635c27f5
-EBUILD sonata-1.7.0.ebuild 939 BLAKE2B 897bba35fe7242a4ae7566d310233394b3f4503bbaea3fe82f55851d9ae91257d2b562731659d33e7f9f12767d3d33d1fe8a6728708bc244b2f92254c410bc7d SHA512 7667dbb253e1f3db4e7a7f6ccaeed3b4f41ea06f521745aa632df0d4955ed598915b2060cd5af80a759209345e38f4bec0ce3d7acbd5ae30780637a1922cc777
+EBUILD sonata-1.7.0-r1.ebuild 930 BLAKE2B 4ce774e746d7af085d759dbe649c053f333c2006b485ae9442c15f09368a248c31676dd3bf200407551dd9e825d2635a410429ca62ccc158cb7b83d5b6b769bf SHA512 60fab6e91bb4d092b3dbc27a54b94eeac5bca9b1cd599cae8383380a298979529c6ed6442b6db9e5c29fdcf199e445c4340edb244e15c6ce849802e723d51efc
 MISC metadata.xml 479 BLAKE2B a6af1d8ece4f12a3acf9c8f05bace4fb6cca33024f7c7c7fb522d03984cbef587bd62f46478df77ac14dac26b4956fe16b7e52d2b1f534daa36bc3152e2bec3b SHA512 ffd3a9e6f601890b84a6ebb27e24c500dd4bf8c49e872dfe599dc692a2b4c703235aa1b21e75710b601e1524951ec8121546970a75e5a7e970aaeaddc957fe92
diff --git a/media-sound/sonata/sonata-1.7.0.ebuild b/media-sound/sonata/sonata-1.7.0-r1.ebuild
index c413149a5e0c..a1207894398a 100644
--- a/media-sound/sonata/sonata-1.7.0.ebuild
+++ b/media-sound/sonata/sonata-1.7.0-r1.ebuild
@@ -1,11 +1,11 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 inherit desktop distutils-r1 xdg
 
 DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
@@ -17,8 +17,6 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus taglib"
 
-BDEPEND="
-	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -27,6 +25,7 @@ RDEPEND="
 		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
 	')
 "
+BDEPEND="virtual/pkgconfig"
 
 distutils_enable_tests unittest
 
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index c7ad0315daed..7e3482d14a37 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,4 +1,4 @@
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d
 DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2
 EBUILD sooperlooper-1.7.4.ebuild 1330 BLAKE2B cbf211a937dbc3d4e11a276c61c18438a2c1dc61ebaf366bc4ce53d88827454d8494f459c220c5d33496fa2a5d9047ef8a9c2982e4141c23f881217cc4e34064 SHA512 c366b1f0ff061b4460d18ea4a7f386f909bb358073fad346ebd6c1f8e6d2afc2ff472066a7b84d456cd9c3895293454dc6873f8ea52d3e77027e93a8bc3a33df
-MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
+MISC metadata.xml 337 BLAKE2B b93bb5a5de4848fa69ba5ccade6c4464edd6f15c45e0490735f8dbd0aa227da70f47f7c335a2b4a1592db387c93a8e7f677c399ab37055404635016a6cf3bb5d SHA512 610383ba6ffd7b37a2ef859640e0a0096c85aa9f9c68eb376b22a865998ea364ef28c61fe4b47a9d9d6c3cdbeb575be727b399059be81b27e58a5d2053259b73
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
index b69a849fd57e..180951d3dba1 100644
--- a/media-sound/sooperlooper/metadata.xml
+++ b/media-sound/sooperlooper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">essej/sooperlooper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 4083571975b7..1ff122d85e36 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,5 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
+DIST soundconverter-4.0.3.gh.tar.gz 632495 BLAKE2B 9a2847b5ebb998b9122ff4020e47dc5b84635a6e1ae0de9061bab18e813ab3918278e940df80bc370b071de77a82a3637c376d9ebdd84d2f7b00865dda94935a SHA512 0674eb430bb3cf267ceabee8e7dbdeb2ee81e537ca093fcf6e1adab21112690ed9e3eb349a994805ddfc51b3a4f875b87a5819a1f2cf020752eb8e742665a998
 EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
-MISC metadata.xml 349 BLAKE2B 48933367cf9c097cd0f081328bb264294c3ff3c81cf8c782dca6a1528dd9e8aef406b3ee7ac561c7e6b8a69335266fc63654103b505ea9730e1262b14cc3bef8 SHA512 d9224edbd42d76ac53151c8deeb7cf5f428c020970554fb4757a4380d5e173c5a2938dd87703afd1bc9b634ffdd8b227d8eda1c6b933e341cb7cd894e82fe151
+EBUILD soundconverter-4.0.3.ebuild 2727 BLAKE2B 07d192af018bcabb475effbc8690f6f73fbb927e07b722283aee59b24bd9caf3c8e6395b7f6c8f938abe911c9af375f8653264ed0b10ca8837f2122e0656ac5b SHA512 5b9d6e578e82912b3f3d0d2778ebe191a79ffcf8087a6bfb27d1d77e90a743ad15f69d3ef0244ca06a70f10f6ef8490bdee38c2442edd3b4ed8a275c58c6f176
+MISC metadata.xml 413 BLAKE2B b72915536e7a83e087d9fbe87756b3a8ffa38265360d17bfacaadf75694a032bf55b024574813692ff91e0664ab0849584ab3027e277443260ff9a3afc31ffa4 SHA512 772a3ec6f12308dea14140a65e35c66066e7f9869e1518f92313f23f46f2a6f7b3f18f3b2650c7197c934d07219bca656c446aae7ef7532b57323f924222939e
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 1fd31681d373..e16be19bd1bc 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">soundconverter</remote-id>
+		<remote-id type="github">kassoulet/soundconverter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/soundconverter/soundconverter-4.0.3.ebuild b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
new file mode 100644
index 000000000000..5bec269e915b
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome2-utils distutils-r1 virtualx xdg
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="https://soundconverter.org/"
+SRC_URI="https://github.com/kassoulet/${PN}/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aac flac mp3 ogg opus vorbis"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	')
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	')
+	test? (
+		media-plugins/gst-plugins-flac:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+		media-plugins/gst-plugins-faac:1.0
+		media-plugins/gst-plugins-opus:1.0
+	)
+"
+
+# Before PEP517: tests seem to hang and also fail to find fdkaacenc from gst?
+# After: need to trick it into finding the data (inc. glade files)
+RESTRICT="test"
+
+python_prepare_all() {
+	gnome2_environment_reset
+	distutils-r1_python_prepare_all
+
+	rm -v "${S}/CHANGELOG.old" || die
+
+	# workaround incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}"/data || die
+
+	"${EPYTHON}" tests/test.py || die
+}
+
+python_install_all() {
+	rm -v "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	mv -v "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+	distutils-r1_python_install_all
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 7cbaeb073e03..711d44d41a17 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,3 +1,3 @@
 DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
-EBUILD sox-14.4.2_p20210509.ebuild 2874 BLAKE2B 445724cd1a56678852890786adf28c31cca4ee01181fb83ef063f7cfa2f890564ce434853a6fddad86a1448235ec3535230206b5396602a5c14f75331ee2be8f SHA512 e20a9b184ea185a86c0e548de1d7465205d3e4ca0db464a7514189ebf4c3ce624d6747e10d50e8a3532730e5ff0251d28e5216c64a34554b7cbb2174e5613c77
+EBUILD sox-14.4.2_p20210509.ebuild 2881 BLAKE2B 226178471ab00c28535cb0843308246b061a3abfe139251d916f046a0f719a0aef27a4846bcecb664eb3849c8c250c189c3bf25a1c44f12d5d6ebc93f6e5efc9 SHA512 b724dff428ae811fd644b609cbc4afca55f3f7da2ee95c578fc261c16fe249e8ade307326e4d5c09e7e6418aaabb5e87a7405520115c433b151609306eba8c77
 MISC metadata.xml 709 BLAKE2B 29d863a59fa534ccdaf3ccfe73ec03ff931055b7537ce3ef1111a596c8178f944910cd3c917e25f778a1e297d5fd0023833d0a8556adb6cd187fbd59e2ff5703 SHA512 a40c70b421b78a8bf2b7044b1b512600120c0352bf61755ba7d48af621fcc33c82ef3c7eff3df10c913add4b7250f7fb7461ea7171b21a07f306794d7c1cbdbf
diff --git a/media-sound/sox/sox-14.4.2_p20210509.ebuild b/media-sound/sox/sox-14.4.2_p20210509.ebuild
index bf31ee4ef9a9..e122a0f1f080 100644
--- a/media-sound/sox/sox-14.4.2_p20210509.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index acb67a1f2324..cc22380e9360 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,8 +1,6 @@
 AUX spotify-wrapper 647 BLAKE2B 6bb43ce4667ff954d301a99fbbd862a5c814c140a3ab56b16dd7adf520e9ebb51f6527ce07796bac058afc3a7c4cc97a85f9e996c6e3ffee8b2b29b731b4d718 SHA512 1202e39f6d3a47cac353ec9519695a424aaf51afe24d8ca6f3ec0ec79ec19020bbc7c6e43352121684b2b7789e2c7be32d4942ad4883d3076b19ad9eee4ab1c1
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.72.439.gc253025e_amd64.deb 117803268 BLAKE2B 4ca2ca2df9ef5626483d4eca9c5a6f32fba63efdcd9e930379e83a2f8d40c112ab95ac4ade79fec365ae18b3e4aff089b5f07b6af02a5d080f64f14995099ea7 SHA512 65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385
+DIST spotify-client_1.1.84.716.gc5f8b819_amd64.deb 119770140 BLAKE2B 071ee877e9c6c9a64cc3e06cdd72530e5da60087c56c29ad9511ed427df987d76258142120442ad78370f2d78c282016025ed43f7f7e94b4efb44e4a201bc839 SHA512 3cc25f28ae791ac26607117a5df668f803ed8e58f0ace085010a6242fdde97766bdc1c752560850795c9b4324f3e019937fe9af2788a1946ebb70ee781f50d99
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
-EBUILD spotify-1.1.72-r1.ebuild 4187 BLAKE2B ea2a85532926be54d20a1974dd726a8f34da51935cb2a64dc0a49a0daebe480d169b462a06c24370a4186c6bef33dfd7c05aa0a15bb05a0f2d71c06fafc9f705 SHA512 cdc5d3dcb5e1f0998b8d61a6076e99db9c5aaa58e5a8a62b6118e2df963c030cca9d0bce0132be7e89b98ad3dcfbde7aed00871d33db006083d3a58bce632991
-EBUILD spotify-1.1.72-r2.ebuild 3471 BLAKE2B e811845414f94846031d111a983755f4fc0eb340a8593def1ba9323bfe627c13de0c69381015e9bcc0586bd6c126e039240de5a099b43802bf772e22ac56b5c5 SHA512 6aa4511ed47f4a17646ff831edb217acafab6fad30cebe25cf605f36b2578c109b1c02c51ac1a8c30bc5ffc0e4a5b4ec3306a6ab749656b450c849f3d6dd2767
-EBUILD spotify-1.1.72.ebuild 3441 BLAKE2B 90000daf87d9578758f37ed1bca2da1a185ff6887cca06525e72c2e3c5e2d4fb2a8e6a68d79b015d0bad45468eeda20b0a5597158ec00f76671f1497b1693932 SHA512 f63014c8d4852c1c76d2f9d6dc0d55fedc333f6d3c0969bf280ae6bba21f672cca564c8cff66297caa31d3bff61dff9089441aac63bab94ade5d8068fb9289f1
+EBUILD spotify-1.1.84.ebuild 3484 BLAKE2B 96204b642b4b655fcc1c498f99552257b4c29b72a28d052ad62170665f1d81528969fa4af986cf03140a6a1aee6fef23648c909f52ea0c62e95f124745a0db14 SHA512 656e149989a990f2215c477be7e892c629193d08df6b94f83f0f24ee51e9cc75b2eb4bfc320406ba1f15aade79e3ce1b0a592651abfd3dcf6bb2715f31f2a636
 MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
diff --git a/media-sound/spotify/spotify-1.1.72-r1.ebuild b/media-sound/spotify/spotify-1.1.72-r1.ebuild
deleted file mode 100644
index b36208e04b8c..000000000000
--- a/media-sound/spotify/spotify-1.1.72-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="439.gc253025e"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax-kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/openssl:0=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	local-playback? ( media-video/ffmpeg:0/56.58.58 )
-	x11-libs/gtk+:3
-	app-accessibility/at-spi2-atk
-	x11-libs/libxkbcommon
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
-	x11-libs/libICE
-"
-	#sys-libs/glibc
-
-S="${WORKDIR}/"
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/libvk_swiftshader.so
-	opt/spotify/spotify-client/libvulkan.so.1
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	default
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<EOF >"${D}"/usr/bin/spotify || die
-#! /bin/sh
-if command -v spotify-dbus.py &> /dev/null; then
-	echo "Launching spotify with Gnome systray integration"
-	LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-	spotify-dbus.py "\$@"
-elif command -v spotify-tray &> /dev/null; then
-	echo "Launching spotify with generic systray integration"
-	TRAY_ARGS=" --client-path=${SPOTIFY_HOME}/spotify --toggle "
-	# seperate out the --minimized argument, parse it to spotify-tray
-	# propagate the rest to the spotify client itself
-	if [[ "\$@" == *"--minimized"* ]]; then
-		TRAY_ARGS+=" --minimized "
-	fi
-	LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-	spotify-tray \${TRAY_ARGS} -- "\$@"
-else
-	echo "Neither gnome-integration-spotify or spotify-tray installed"
-	echo "Launching spotify without systray integration"
-	LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-	exec ${SPOTIFY_HOME}/spotify "\$@"
-fi
-EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-
-	optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify
-	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
-}
diff --git a/media-sound/spotify/spotify-1.1.72.ebuild b/media-sound/spotify/spotify-1.1.72.ebuild
deleted file mode 100644
index f19bf8d614a9..000000000000
--- a/media-sound/spotify/spotify-1.1.72.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="439.gc253025e"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libnotify local-playback pax-kernel pulseaudio systray"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/openssl:0=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	local-playback? ( media-video/ffmpeg:0/56.58.58 )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:3
-	app-accessibility/at-spi2-atk
-	x11-libs/libxkbcommon
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
-	x11-libs/libICE
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.72-r2.ebuild b/media-sound/spotify/spotify-1.1.84.ebuild
index d3f98c51dd26..c5c1d8074702 100644
--- a/media-sound/spotify/spotify-1.1.72-r2.ebuild
+++ b/media-sound/spotify/spotify-1.1.84.ebuild
@@ -8,12 +8,12 @@ inherit desktop optfeature pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="439.gc253025e"
+BUILD_ID_AMD64="716.gc5f8b819"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libnotify local-playback pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
@@ -42,7 +42,9 @@ RDEPEND="
 	x11-libs/libXtst
 	x11-libs/libSM
 	x11-libs/libICE
+	!gnome-extra/gnome-integration-spotify
 "
+	#gnome-integration-spotify causes spotify to fail to launch
 	#sys-libs/glibc
 
 S="${WORKDIR}/"
@@ -111,6 +113,5 @@ pkg_postinst() {
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
 
-	optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify
 	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
 }
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index b672cd1376e8..7a38ba8ec19d 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-1.0.4.tar.xz 11208992 BLAKE2B f7a8b000672b55fb667fa4e0f32052adb138b4dbdf2149beec308555ed00417aac0734fe7ede1767bf648d5a10ab527b69f004ffe0b1f8834e65d6dbaf2c52a9 SHA512 e2a90911acd47735715266cb3745910a6e04a2ef4e98b0c9734230a5e2b382cf7d3681fc2e368a361e7a7c53bc0627a88a36e6df6c4f6941d54f65e2424d29ee
+DIST strawberry-1.0.5.tar.xz 11212028 BLAKE2B 2bb668bc9a4f66a9cdeaa28f47f21bf90f999d5524fa443bc7beaa1d0d7c6dc6727bf4df010fc06989e00fc34d62902add11186908fcf3f1b490c3bf745a9971 SHA512 4c625c75855f87952b274c85b4c5b021b27e75a74d46202ab3ea0aa3c86f510bccdece583483c4ba73e4733f151feb5eac5f5ef5d9a956995979fa307fd8d911
 EBUILD strawberry-1.0.4.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
+EBUILD strawberry-1.0.5.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
-MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
+MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 1d06f286e255..aab0f751f907 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/strawberry/strawberry-1.0.5.ebuild b/media-sound/strawberry/strawberry-1.0.5.ebuild
new file mode 100644
index 000000000000..af868219fe69
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+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/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	>=media-libs/taglib-1.11.1_p20181028
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		>=media-libs/chromaprint-1.4:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qttest:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 0b531782a354..29a52adcade8 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -4,4 +4,4 @@ AUX supercollider-3.11.2-fewer-qt-deps.patch 4450 BLAKE2B 4f5c4515f674925724cf07
 AUX supercollider-3.11.2-fix-libscsynth-linker-issue.patch 10461 BLAKE2B 1037589e0210d4ca86986a44c657539d2ffb6ca1684777b5bd38dfe3fdadfcd3d14df4d16a4af29643ca15647e96915e99866bb04626e8947ab38ae4d303225f SHA512 9cf9f96c91f267a9f1a4ab423731d87c808acee84c06a81f58821caffab433d099d198df85f1e3829e772d59028907eb65fec155c6e31fee010e2573084b5c7c
 DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
 EBUILD supercollider-3.11.2.ebuild 3301 BLAKE2B 43877f8cd9f24c2ca329ba98184d28f1669f2510bfcfb49b3793235892ca9400740ea6315c57337e88708e98c5ef305b3a855634b33088929d0e11afdf785b52 SHA512 0f65d31ac50f47065eecb63023cdf86f6444773748abb978c2ae3705745b0e5ed02e4ac49166d0c62f1057981c320d12615d86a49ce034e6ff1efddc5322ae94
-MISC metadata.xml 1149 BLAKE2B af08afc28c50760ec615e0d26ea1d1465f0eddfa10c4ba50e82cc03a50e060fb4bab7f6f04dd27ff40ef191668bc02991038ee047f80c91ba9c2d947533d7f53 SHA512 7f5a9af7d7c415ba34d65172a4a98a52c77f31befedf4cc807b1b1f36b95a0896a2dfc5e2628e091758c2378e234a81625d4d5e9d8695807a39aaf94a1d7afbc
+MISC metadata.xml 924 BLAKE2B 0fd13e16e14c16215d4130e53b33ada10c9d5bedb5366e513e97568749e73436d3a0309518401dd795c155e3e4d106aba705797d99c04d2eae908f27ea7c8486 SHA512 7a9aa75aed8f5ccc63e8b50061ae0a9c9c251967c914eb5315fbf3e21d4f9b8287727e623057c38f336a7ef14d5c5e53bb022b9a34781d903ba9a0741fe3a476
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 07b9f8bfd91b..b99ce5560571 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/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>marcan@marcan.st</email>
-		<name>Hector Martin</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		SuperCollider is a platform for audio synthesis and algorithmic
 		composition, used by musicians, artists, and researchers
diff --git a/media-sound/taginfo/Manifest b/media-sound/taginfo/Manifest
index 429760132397..599f6585ea28 100644
--- a/media-sound/taginfo/Manifest
+++ b/media-sound/taginfo/Manifest
@@ -1,3 +1,3 @@
 DIST taginfo-1.2.tar.bz2 8272 BLAKE2B 07ea6bbdbd7db614be4cb989d4ae1968dab2c5f7dcb44288875dc8874015609b02c8d17dc0e946bb7fff013e2fd20f95aab02ec73441e40dfac2bb5a0ea09f16 SHA512 5e12d63ff3f7db2ed5bb877a3ab6e1a1a63793df30d0433ddb30e2630cab82bff4644331915e3cf80054a55435672b6b534c2550765ee4f88e1e0bf1859fd6e3
 EBUILD taginfo-1.2-r2.ebuild 564 BLAKE2B f61243e15491cb65a6f931e2aaa8cf0c9b5dbdf7605fafbd4a05bf213b06572dd9013e74405889177db44f71bf62f5f4426190985e9f1f31436b85c06b247662 SHA512 6f46700da4399266585e28fc6c6aea17d5271542e9eeddabfb0496868ae17ecc52c52038baac7f8de1091f55cb1b7b05195982ac869ee5dffe933bafd9f1b3a0
-MISC metadata.xml 329 BLAKE2B d68d6acf53ad3a4b3ff63c4e98fb84ba725f4dc602c034e2897948db2ea250410e4590fef9e06e82701df503a68f450e98d17cb8cb6a876a63a1d5bd4cc346e7 SHA512 3e99f74e5666b3c409910d5fff6da66e32365b3573788369187fcb163475b3bca59aab3fbb2225e94f9d008e83190053d2a0246689f0e0d3856135dc43fa02b9
+MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
index 6f3b074c937a..93423219a5bc 100644
--- a/media-sound/taginfo/metadata.xml
+++ b/media-sound/taginfo/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">taginfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 784a2ecba5a1..1d281b95dda2 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -6,6 +6,9 @@ AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 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_amd64-3.13.7.tar.bz2 9968877 BLAKE2B 7c2f200b1e3a3184005aab213acc681326e16a776f529dbdac900f5b9a6ee9d91883d1aabfe4526e52e9a706a4856366291f061efc6eff581216d7450746322d SHA512 cd026e0c51d8269bd6965f9f274ff6478d4e179d23ee1b00f93a887997985b97afcb7eda05e34150d6fe0610f2715a61989a7f3ca05994067e71b9d3171e2962
 DIST teamspeak3-server_linux_x86-3.13.6.tar.bz2 9785491 BLAKE2B f0d196a72e9a4283006c4dfd9a1d86e96a3b435d8bf14dfca178ea0240e94b88bcf3b9e20b6c99638e04019065fa79d28ac2d9ad452e306c4c27966e32464c69 SHA512 ef124964590c106bacd3bc98847a5e8f64fbbf69ccb2a216f9af6548f5f2d200c0bd307d283f48cb08c254fddb92fe03f6cff2c3c87e7ca593edf3023b053bee
+DIST teamspeak3-server_linux_x86-3.13.7.tar.bz2 9820644 BLAKE2B 37789bfe4c544b8eeb28a34d1fae933e2d2a11b23e85a6de66ac4c9772a061860803a3a767227d787efd90f7aa031b3ca77b229acca554aebd69f1f78b28128c SHA512 04278359a03cb9f8bc6db48b54976020da6a44629f17b503378bf0ffe554da838193ba590ab895e97c96e026aa87d96a3e167a009710adc4b9b03193d496201d
 EBUILD teamspeak-server-3.13.6-r1.ebuild 3510 BLAKE2B 1cc38840e47143772fe861213a2600cc1c2d0cf49573f33dd17709a0cac406d495b2ee3b20b21d726d12b16fd1c8e90d43a50f7bf7d716b0a286a15531bc23bd SHA512 923e0a4e1f22b74d4a9f0f7d5abd430b046086c8cb129c7ff1e754781d7b20ace30836a7913b95ffc6890ff5317d4021f0d182edf7494bff8d3ea37a790188b2
+EBUILD teamspeak-server-3.13.7.ebuild 3512 BLAKE2B 3d6f944642de423c000c62f1e6881b35d4d1df2512c0588a78f25d177301bceece967f32dc63ef9a4b0a31bccdcb53d8227b40f5ad4c38f3da12453130faa075 SHA512 2e83ca71bee8e8959f877fac3fc13adba2c8e72524e53946a913e8638b0bbe0fc17c8ed817d301240d5c2015efb9f8471a5968029206729557cfc67fd7ccdd09
 MISC metadata.xml 704 BLAKE2B 68e04b7596542e2549233e228e8db2bf5943c2b859133b55a41800ef7048730e5298ee5cc5d034e8ec2f4187230f1bf470c2195d2c88b451faaf4ae0b6f53128 SHA512 f517abc5ee9903df810da51cd0fa86fd8c4b9bfcae05816d6d2596e645a59a1596007da5634ce33d3cb7efcf252b238dc197da0dc992b06654b17f12a1f5b239
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
new file mode 100644
index 000000000000..9ecdd00b61b5
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql postgres tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+	postgres? ( dev-db/postgresql )
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_postgresql.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.{md,txt}
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use postgres; then
+		insinto /etc/teamspeak3-server
+		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
+		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_postgresql.so
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_postgresql
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index d760fcfdfa27..67af13f64dfc 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -10,4 +10,4 @@ EBUILD umurmur-0.2.17-r4.ebuild 2458 BLAKE2B f1d911fc058436e206787a66db17628553a
 EBUILD umurmur-0.2.19.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
+MISC metadata.xml 1008 BLAKE2B feba592603f9cb71e517192271e9379ae130c38fd5c8979571197ced233160e38a8fa2fb927989289a2be5ba3f2609b29c278195e392998c45aba3ad576d1363 SHA512 5ecfd76cf6be609fb5f41ddc48ddf1a5eaa3b6af0355c51be0457e87c79e66cc87666ca8f0b2eb8ca52a18047bedc25b25d978f6b69b1bb44cfcf7f8d8924943
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index e08ea71f643a..f3ecd2642bfb 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		uMurmur is a minimalistic Mumble server primarily targeted to
 		run on routers with an open OS like OpenWRT. The server part
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 373758eae7fa..7f1c8c2f415d 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,5 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.5.13.tar.gz 579569 BLAKE2B 30af7f455c0564e46c627217853a230bdabd0209baaa62b247388814af8005ecd0125de242c98cc20bef28adc548b5e83fa61d797535daa00cf180cad0fe0217 SHA512 bf61f7befe5fd64cdeed94f7d82965991d95abf8f8f96b044934d64aa55c887b7f4cdbc48f72a4843a5b6a145d9ccae6166e38710ce2015ccba18ac13c365ac6
+DIST upmpdcli-1.5.17.tar.gz 585821 BLAKE2B dfd47d710751540743f5df38975e2775ac99355781c7d7bf8b50543148bc22aa85f4f851a5628291f11474342caec99ecfa664cd701fbe13c46be1d56cc6b042 SHA512 caaba9d6ee8564e9464f19c9462e2fe4ed917270a9a66a9608895ddc8e060cefa339749ffc284d83a05be78571241e1c0ee74c4b0058bda8c5b1d8ebbaf248a1
 EBUILD upmpdcli-1.5.13.ebuild 1032 BLAKE2B 77a9478420316c2c6a821a41f53c7736d048f641cc1d5e01c1e897afe3b37f1b9fdaa3f50353ba307013826ad00d0071fa3753b7fda37b5fda7b533f2864b555 SHA512 3d6fad7e7496e23114743ee897644284631565ed30d1f42227f44a1bd1b7f88db63a51482141d413597185fb4f78c303e0b676d9f767338c138fa21cb967eafd
+EBUILD upmpdcli-1.5.17.ebuild 1034 BLAKE2B 82488d168231ba9183534916f584a2b3677b55e6eac632ddcf49de5aafc0b1d67c0258ab18a3c827d531fda9444f1cfc20f2dcd8f6b9618428b76233c9167da2 SHA512 d417db2bc657f7f5bdfe32ec08c02d2c17c6e0823746382d92dc4fb9b1aa4bc71e0166fcf269b41d549e1957d6fe73e36d51f43a6f152e4b604335b1145327e5
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild
new file mode 100644
index 000000000000..61ec5aab1fe0
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.17.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	net-libs/libupnpp
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+}
diff --git a/media-sound/vorbisgain/Manifest b/media-sound/vorbisgain/Manifest
index 8e974440b02f..3785ed41198c 100644
--- a/media-sound/vorbisgain/Manifest
+++ b/media-sound/vorbisgain/Manifest
@@ -1,4 +1,6 @@
 AUX vorbisgain-0.37-fix-errno-and-warnings.patch 2111 BLAKE2B 3f24e408b6931d5e59ca04f47e17366f42579beb8119fb8208cbc86513644df25277c6cad9f0885916adcdf724ccb6b915c1064da27a720a864a7fcbaa222543 SHA512 f42aecb99865f60c91814daaa615dd55e84f391d622d41310c12c5f570bbe7628e903802590a6866ae10a02c7f6982bdac208b5a1b191bb49efcd3ea66a86062
+AUX vorbisgain-0.37-wformat-security.patch 268 BLAKE2B 2f9f65c07730230276234da7778784583e0eb2c02740cfdfcf665ae7cc1985b241aea5bacd71e293b6ace3c8ca23971e0921e026209c5189ac164565cd3d7dbe SHA512 d894ba5c7055d00aa3a15cbde7f3daa82ce27c0e8c61a566434cbfce049c49311319fd20b516eca56c8141bdbf6bf39dbcb24c1827da2943ff1c817ab63a0594
 DIST vorbisgain-0.37.tar.gz 208977 BLAKE2B d29185dc2ddccb97df94b164747d9fcf3c06ac5e2f602f7ca24d9d38b20792525188b697c74728a5992626fd7ef4748fd8a9adee165802f51f88b54be6be3f67 SHA512 67181834e1a0d7c6e1ccd984e2d30ebf1dcdff84caa77f75e5e771de8414904810e966a43852b7184e075d2428fd8b431124835efc370ce6504b8b2756746e04
 EBUILD vorbisgain-0.37-r3.ebuild 599 BLAKE2B a1baa5f2d05ea71629b5ac12b50e33e428dc40a41659aaa77e810b5b213f4c98e348b50a608a510004ca77b6fa6453da20b593d09e156457817114f09d4d3447 SHA512 3e3e2fb75ce0e3d13c7751f5b418769a258fbf1130d1c628f23123675f1542cec4739f9e9a0c20e982fe65bf1e79adb2213ea267e3d4cb1d7b1be2aeca511810
+EBUILD vorbisgain-0.37-r4.ebuild 661 BLAKE2B 06fdbf5a28d25ce010fca968c4ec064a241a39414d2cc1202eaf413f7dce5cd35084d612507230fc9f6021484f29e4f9fb754d28a718625a6fd044cc2fd62790 SHA512 a32a4b7294216bb7ebbf85d9735466d579e87a445f8e8e516fddccc07195037d37ead08fa89bc88dc6af390932d7811f06d43060a879461b9930ff5a11e71190
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch b/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch
new file mode 100644
index 000000000000..eecf45675fac
--- /dev/null
+++ b/media-sound/vorbisgain/files/vorbisgain-0.37-wformat-security.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/634994
+--- a/misc.c
++++ b/misc.c
+@@ -57,8 +57,7 @@
+     vfprintf(stderr, message, args);
+     va_end(args);
+ 
+-    fprintf(stderr, strerror(err_num));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", strerror(err_num));
+ }
+ 
+ 
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r4.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r4.ebuild
new file mode 100644
index 000000000000..30c144f471c9
--- /dev/null
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Calculator of perceived sound level for Ogg Vorbis files"
+HOMEPAGE="https://sjeng.org/vorbisgain.html"
+SRC_URI="https://sjeng.org/ftp/vorbis/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# bug 200931
+	"${FILESDIR}"/${P}-fix-errno-and-warnings.patch
+	# bug 634994
+	"${FILESDIR}"/${P}-wformat-security.patch
+)
+
+src_configure() {
+	econf --enable-recursive
+}
+
+src_install() {
+	default
+	dodoc vorbisgain.txt
+}
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index bf77b387d2ec..387f65f68f7c 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,6 +1,6 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 DIST whipper-0.10.0.tar.gz 256546 BLAKE2B c673aaefa8fe621e11a1140c2927bb2f62d5b07e94f6cec5b95ba290e5eab215c98b9a59c144b26c71bde211a45d603ba08c477d12b12ed1c73f9f8c2ebdb9a7 SHA512 728ad98185aa2d29f4fb215a597136691bb2c3590b3cac4f659238f90a3b4328c377fafe830a725b655f050538739f404b3eca853db4c39001d1b9d721dc7fd8
 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
-EBUILD whipper-0.10.0.ebuild 1287 BLAKE2B 6ee3af3ab650628aa0f7da9ab0a61dd5743c7cfbadbf3b2cd05b3b10d558df8f6d05b2e116388f25b5b8e25e65083f3fa0dd4893c533b4fc5f83bbb63c448cda SHA512 3bfe7cc51d1031949fa3a53e308e6c8db92a389626442bb73ec6a4ce2fb1716faccf66894370cf2f3f4d8a5264ab43a037055f331e7b257af1751716b7addf1c
+EBUILD whipper-0.10.0.ebuild 1288 BLAKE2B d88e850d563bc45536be9a79b5487f4d8a2555b281c7987e6c9b6d4e05ad5de1779c9d9d5fedfc3c625cc8c40699088e64b6db6d05c2ff4af535046b624e346b SHA512 62f5cf1e32e40c66da7c82d07c6ab1b1e7ca899d58a839098574df380ab5873294eb7ffad2b48a1dd6e939a041f66a6c0e0e75a73965861937ccde353c3a4d4d
 EBUILD whipper-0.9.0.ebuild 1240 BLAKE2B 788aed1b4ceacc39bf44131c13ab1fac5fa8edc5f2b6d581c09bcf045d95e4ff675fdb0b898e78d3d66930c55fa2177f613b54b03b00458bd3f5fb4653681e2c SHA512 985b6b90c37e0ce27c78739bbba4850d4d44d57b296f5ce775293176b8372b2d23a1fb976b646b6c00602bf027c989579065a4ff4a6bd6e6fdf0f26be5933384
 MISC metadata.xml 575 BLAKE2B 84df8129a8242797283145b17fdfefd1fa3bbbddc73c5ed1154c1c38876058858a6b80b6f5a1bf25961b7026a1bc161eb80cd99cf4fdf3747dc8b78d9a21ba51 SHA512 4c59f351a464f71ecefc43a029f9c49291b3032091d8bf946efcac4511fd7144d3f476f612a1c30a0082078eee33a3a22c7a5521f80168ac3ef7489b6de6f563
diff --git a/media-sound/whipper/whipper-0.10.0.ebuild b/media-sound/whipper/whipper-0.10.0.ebuild
index 4ec1758f78e4..1049adc8eaa2 100644
--- a/media-sound/whipper/whipper-0.10.0.ebuild
+++ b/media-sound/whipper/whipper-0.10.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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0c6689b107bc..2440a0dbb38d 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,15 +1,6 @@
-AUX xmms2-0.8-rtvg.patch 1358 BLAKE2B 1544ae0719b02ad94c19239d7ad3b16d3df3a29e1a5580b7541f2c8966f88c9fefafe2e151524e8e0397ac147c65898a841629acaf7f6d96fb76f0f57e4e2e33 SHA512 cc4d0d6cb459040fa55478b55780f34556f78627a2313b598eb276509248f3b6df4c252722ca2f996847e2f3a01392e9435fefd1ad5342c3a87a54bf0673cb0f
-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 3751 BLAKE2B 4ef9c4a1a9bf74491a9a099266b8b727ef9f0b6d6a5d05e2370932281e14a3f76a004fd1f24fe9457a9a1b6d6740ca14f7749385567ec148823b4d428c4ee677 SHA512 c18ed39ffe7d9bab5a4fa5cac25d90dbfad9d127baf8bc84adc9c25481a3ebf5267ec2848919ca340153ed384941c48121b2c6f820c7bfad2455bd17c8f68d4a
 AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f5cbe0999167f8eadd803df75ecaaaf3b4246d691be1b6106dbede0b3293747fa6d1cfc5f151968dd26065aa9e3b15 SHA512 3b5703614a3afe49cadaf74b2d5e9d436232af62dc60248f929961806ab058ed8b06df0fd9ec0f958e2b454e3be75028117fc9c7a071bef1f9d2aa5496c448c5
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
 AUX xmms2-0.9.1-rtvg.patch 1076 BLAKE2B cb0eee29a4245850f2455fd7b12845017ddd2453d48d903386fcc083e4429389fb50b2fd296ebac41e101e68d7f030b646e65b2e493f351c91ec81a9672f6f77 SHA512 113b90339f4afc99f54eeb6776354c471ffa0d4e60d3525150ed2020af3d95dcca89aeaa849cd216c54f0d6eaf712f157c08145901a89b4cb0460c752c526e40
-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-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
-DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20201016-r2.ebuild 5910 BLAKE2B 857f8877eed08b63640483f312fa99d9a626f2f32988f525c156d5416d1b3812740c63086a59cb0aadef6aaf51f4685706ff4ad1fadb30aadb063f8c0b3bd09e SHA512 4837be50ebf0560e263aa54bd98d462140e63a86456942f42efeb4869897274b5f5b5a643a80df67482ee755ed8230406d102db15cfa7d16b18526b52bd3b24d
-EBUILD xmms2-0.9.1.ebuild 5505 BLAKE2B bb5d03e6b8dc67a3d5329d28d64553ef4aa60b2e11d9cd334054b8ca887af77e38cae215751ee136a57b058a0b0a3af7d5bf5cc322c4629918ac204e9da19395 SHA512 8eee7a7d1831a0b75eafec174b42cc197b76735eac11f7af1213db695d9d07e4bf36fafeaa6ffc6f4c63b244130f9b8b00ce07808203a53e57ebb4b7242cc837
+EBUILD xmms2-0.9.1.ebuild 5502 BLAKE2B 2a1dd2d05e55d8deb20d74083eccf5876b9e8b60c85f8eeb5de0f064cff3cbce9598daae9d0d2793826584f8a6a383d20e5afbbefd24f4eeec655315851f2503 SHA512 3550565ea698b8ceefd0034bb058a58332bd8a88b69959d589ec9f16eea5c3e1a5bddbc2cb4749fee322cc90e527c042a600210d416a9331918bfcf865c3d534
 MISC metadata.xml 1437 BLAKE2B 7f3c3cd1d134ee5c24a9dc1990108012640b366a587832eda270bcef2bca91777f9358a067d351f9ac83c118680b60af2955a3f195a6adc20eb84dc334553fb8 SHA512 0533f6c30210a6c2f06cefd833df6fbd8ebfcc510e6bf05133210a57d7d05e45875d829555011b6827b8fc440cb0779f85d4ca17dd3e862cf0519e874e0d8c9f
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
deleted file mode 100644
index e0a970c91869..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Add knob to disable valgrind at test runtime.
-
-When valgrind is installed in system but is not
-working we should still be able to run tests.
-
-Bug: https://bugs.gentoo.org/424377
---- a/waftools/unittest.py
-+++ b/waftools/unittest.py
-@@ -64,7 +64,8 @@ def generate_coverage(bld):
- 
- def configure(conf):
-     conf.load("waf_unit_test")
--    conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-+    if conf.options.enable_valgrind is True:
-+        conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-     conf.find_program("lcov", var="LCOV", mandatory=False)
-     conf.find_program("genhtml", var="GENHTML", mandatory=False)
- 
---- a/wscript
-+++ b/wscript
-@@ -501,6 +501,10 @@ def options(opt):
-                    dest='ldconfig', help="Run ldconfig after install even if not root")
-     opt.add_option('--without-ldconfig', action='store_false',
-                    dest='ldconfig', help="Don't run ldconfig after install")
-+    opt.add_option('--with-valgrind', action='store_true', default=None,
-+                   dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
-+    opt.add_option('--without-valgrind', action='store_false', default=None,
-+                   dest='enable_valgrind', help="Don't run testsuite under valgrind.")
- 
-     opt.sub_options("src/xmms")
-     for o in optional_subdirs + subdirs:
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
deleted file mode 100644
index df1d1c616576..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/5
-
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 6 Dec 2018 07:19:08 +0000
-Subject: [PATCH] OTHER: fix c++ client dangling reference
---- a/src/include/xmmsclient/xmmsclient++/mainloop.h
-+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
-@@ -41,7 +41,7 @@ namespace Xmms
- 			 *  @note The constructor should only initialize the
- 			 *        mainloop, not start it!
- 			 */
--			MainloopInterface( xmmsc_connection_t* conn ) :
-+			MainloopInterface( xmmsc_connection_t*& conn ) :
- 				running_( false ), conn_( conn ) { }
- 
- 			/** Destructor.  Should also stop the loop.
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
deleted file mode 100644
index 2a206b913fe4..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This line has stopped working since security fixes in the faad 2.9.0
-release. XMMS2 upstream were informed via IRC but have yet to act on
-it. I've run XMMS2 with this patch for months without issue.
-
--- Chewi
-
---- a/src/plugins/faad/faad.c
-+++ b/src/plugins/faad/faad.c
-@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
- 	 * and durations calculations... So we cheat and tell libfaad2 we're feeding
- 	 * it frame 1.
- 	 */
--	NeAACDecPostSeekReset (data->decoder, 1);
- 
- 	/* FIXME: Because for HE AAC files some versions of libfaad return the wrong
- 	 * samplerate in init, we have to do one read and let it decide the real
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
deleted file mode 100644
index 9785b4198d51..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/2
-
-From: Jérôme Carretero <cJ@zougloub.eu>
-Date: Tue, 24 Oct 2017 18:43:26 -0400
-Subject: [PATCH] plugins: mac: support newer mac API version
---- a/src/plugins/mac/mac.cpp
-+++ b/src/plugins/mac/mac.cpp
-@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
- 				gchar *name;
- 
- 				field_name = pTagField->GetFieldName ();
--				name = (gchar *)GetUTF8FromUTF16 (field_name);
- 
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+				name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
-+#else
-+				name = (gchar *)GetUTF8FromUTF16 (field_name);
-+#endif
- 				memset (field_value, 0, 255);
- 				int size = 255;
- 				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
---- a/src/plugins/mac/source_adapter.h
-+++ b/src/plugins/mac/source_adapter.h
-@@ -38,7 +38,13 @@ public:
- 	~CSourceAdapter () {};
- 
- 	// open / close
--	int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+	int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
-+#else
-+	int Open (const wchar_t * pName)
-+#endif
-+	{ return ERROR_SUCCESS; }
-+
- 	int Close () { return ERROR_SUCCESS; }
- 
- 	// read / write
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
deleted file mode 100644
index b338e57cdfca..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Lazy migration from audio4 that's missing in ffmpeg5, may not be
-entirely right but tested to play at least .tta/.wma properly.
-
-https://github.com/xmms2/xmms2-devel/pull/11
-
-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
deleted file mode 100644
index 0edb6f31cd7f..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
+++ /dev/null
@@ -1,237 +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} )
-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
-}
diff --git a/media-sound/xmms2/xmms2-0.9.1.ebuild b/media-sound/xmms2/xmms2-0.9.1.ebuild
index 3352a282436e..64355359cdbe 100644
--- a/media-sound/xmms2/xmms2-0.9.1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
 
 DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.b
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~riscv ~x86"
+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`
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 0199b9a02ba1..32d7493c3084 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,3 @@
-DIST yoshimi-2.1.2.2.tar.gz 7641720 BLAKE2B 45da49df7bea0919d08f66fa37ddf21483ac3074aa7fcb57f1a55137ab9f29545dc2121041b7c0fb33d86cffa0608a5fda5a963a79ce54c33cc4fc90ab5e38ba SHA512 14e9dc19e9654d4178004adfc930ca74522ab9db6711aaf2780e57930d6426cb28fd51f3d8d9b7478864e6a3e17d737512dd42cb9cdceeefe168ba803e71edaf
-EBUILD yoshimi-2.1.2.2.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
+DIST yoshimi-2.2.0.tar.gz 8021191 BLAKE2B 9ed0976f70c1eea6a17be12e55bc3e01bb304614d0cf91d26f90ad676306baf46967406f7adf576e9758ae7ff103fee4d02584141d3afe99e4b67ff71ef01b18 SHA512 b2d21732d1dd476b0217c10012d654f038250a822517fd4cd4abd85d931c62f3a416cc39438c119bbd1b11b5f40a55735ff8316cc513204abb380b33fbc37231
+EBUILD yoshimi-2.2.0.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.2.2.ebuild b/media-sound/yoshimi/yoshimi-2.2.0.ebuild
index d37c7559c8db..d37c7559c8db 100644
--- a/media-sound/yoshimi/yoshimi-2.1.2.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.2.0.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-sound
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)