gentoo auto-resync : 29:05:2023 - 15:17:30

28 files changed, 214 insertions, 64 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cbc18b614fd5..5197ed7b6dd7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index daf59ca8641f..17f4f0ceefc4 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -4,6 +4,6 @@ DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf82756
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
 EBUILD ardour-6.9-r2.ebuild 4834 BLAKE2B 3b0568b144269aa0f87eb90bb424f8443a908aca53315be34d269eade4622d1146b3ffec15e73bf64f8a1c3d8a6ed0e0e64162c827d11bda373885a80ef9a634 SHA512 4c97ce34e52e1730a013f4f420f17c4a1b07f26fa9e2c057e78703de944e3cd7abde808cd4ea089f3aaae3bc8d91b2da7d37a4a42e2fd44e37d3c822954080ed
 EBUILD ardour-7.3-r1.ebuild 4997 BLAKE2B fc11c3dc63c5d5a1416d19728f0a2ddfc296ec58679a5370c3f44f6390f14796cc9c0e79d100508b7673defa631dba3f9d3f53c769365ea1809886d3582f1d24 SHA512 7e214c6268d23d06b4e98f9f007c018c12ecf0a69cdf61c9a22b531593deba8cf719aaaabd8c2d1fb29fd8fa2cf2195e494fe4a219689f46ab029caf730ec1f3
-EBUILD ardour-7.4-r1.ebuild 4997 BLAKE2B fc11c3dc63c5d5a1416d19728f0a2ddfc296ec58679a5370c3f44f6390f14796cc9c0e79d100508b7673defa631dba3f9d3f53c769365ea1809886d3582f1d24 SHA512 7e214c6268d23d06b4e98f9f007c018c12ecf0a69cdf61c9a22b531593deba8cf719aaaabd8c2d1fb29fd8fa2cf2195e494fe4a219689f46ab029caf730ec1f3
-EBUILD ardour-9999.ebuild 4997 BLAKE2B fc11c3dc63c5d5a1416d19728f0a2ddfc296ec58679a5370c3f44f6390f14796cc9c0e79d100508b7673defa631dba3f9d3f53c769365ea1809886d3582f1d24 SHA512 7e214c6268d23d06b4e98f9f007c018c12ecf0a69cdf61c9a22b531593deba8cf719aaaabd8c2d1fb29fd8fa2cf2195e494fe4a219689f46ab029caf730ec1f3
+EBUILD ardour-7.4-r2.ebuild 4995 BLAKE2B 7185e40173864410eb0b913ac1f8dac790b16c4bf5a85d79c9c49c0c273bafab156c41db648f118afa19b87c41e065a70ec13056341bb258254496c654025000 SHA512 be40fe998b330347b5c0bbdc34cec6fbb652e60ee1edc00dab467a52b5ed60f28b2d511a7fead485a8949796937ab568fc55751fa4c564df37e693d53bf367aa
+EBUILD ardour-9999.ebuild 4995 BLAKE2B 7185e40173864410eb0b913ac1f8dac790b16c4bf5a85d79c9c49c0c273bafab156c41db648f118afa19b87c41e065a70ec13056341bb258254496c654025000 SHA512 be40fe998b330347b5c0bbdc34cec6fbb652e60ee1edc00dab467a52b5ed60f28b2d511a7fead485a8949796937ab568fc55751fa4c564df37e693d53bf367aa
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-7.4-r1.ebuild b/media-sound/ardour/ardour-7.4-r2.ebuild
index b956ddf4cfa5..0d0ba16716f4 100644
--- a/media-sound/ardour/ardour-7.4-r1.ebuild
+++ b/media-sound/ardour/ardour-7.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
@@ -54,7 +55,7 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b956ddf4cfa5..0d0ba16716f4 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
@@ -54,7 +55,7 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index ea143222f6b5..76192fb4d438 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
 EBUILD cadence-0.9.2-r1.ebuild 2478 BLAKE2B 3f2eafa17632486c2599d9aac6cd4e259b6a65ee43ac64d372a018492185b789553c3c2416ffebd04c1aae621247f9069c9f6ecaab0dc9b475d85e05a0936a4b SHA512 93ab1573b69080dcc30c63e8fee4b69db8c9c6a92a5800d8cc09ba3507605d47c790bc590030461a7ef6d2f67419980491768a7408bd4099bcb8e19f553cc197
-EBUILD cadence-9999.ebuild 2479 BLAKE2B d4d2540c5c88bab4b41575effb66a9339d706b235bcd65157e732f2c19a06bdb53bb0a41bdeb27de4b3fb8567762b114200dd3eac19bb4da5589ba8dafbebede SHA512 dbf3a23d66bd53a65ff60b492ee696ab0d9066e880b03cdb3fff5b480718a73d1e20dba3ed1213110aed59d27a8b87f060699be1ee24bff58ef55246ebd84f4b
+EBUILD cadence-9999.ebuild 2385 BLAKE2B 94a6800b1faf541909c3a43f05638045bfdf2b3e505a8f4d52190e6ee55c7cb8ecc777c7f25d5b0920a424ee5cc59d1170ce9016b39d0c703436c4d9f14ec734 SHA512 22a60e284f02a65ebe05e3538a3b8c3aa2312a7acaa60956ef813fd7a245abb25b250531b59941b28215f3a336ae94d26a2295814fb446f648f1b44d81767ee3
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 85a9ac05bace..84dc5764486e 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+HOMEPAGE="https://kx.studio//Applications:Cadence"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
 else
@@ -20,13 +20,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="
-	${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
@@ -34,19 +32,14 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[jack]
-			media-video/pipewire[jack-sdk]
-			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
-		)
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
-)
+	pulseaudio? ( || (
+		media-video/pipewire[jack-sdk]
+		media-sound/pulseaudio-daemon[jack]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.1-fix-clang.patch )
 
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index c9cd687a5a9d..60fe16abedef 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
 EBUILD cmus-2.10.0-r1.ebuild 3691 BLAKE2B b3ad6106762fb7b7c3f5baf2227851d154f0c71227f9030c355c1286b19bb52822a1c4005079bca5e35d594741cb484a272d62497f0e83514ed43b3ebecbe62e SHA512 93f54eefae2f8ef67a5d1cd690dbd90b10a567cf0bafb639b5f9e02777fd4fa6225a700df96866504569899920227794523dbfd699026f0281bee4432148d50c
-EBUILD cmus-9999.ebuild 3696 BLAKE2B c84b8a919a163fb086d29591fa0115c8daec98fe25c3d9ed3d013f81901ef53e549bb0f4f57a85ae1ab46fec79c2bc9b4ec437a454984250a292216cdd92d87e SHA512 9a5774197f2b1a111dfe654f41f70cbc7fd101d9f89c215b3f5fa48e5d6e0e451d98274fc42f1d1a0152bf58a81a58d2446f093ece1ea73f77610279da2bbf64
+EBUILD cmus-9999.ebuild 3693 BLAKE2B f409beb3825d9559596058f788e85eb3d7d65f85c8bd4c183ad7914226a4d2774ef1dbc305540265fc183d7745542d92fdddf8dd2b46da5b23d216b4a922788e SHA512 f5987d362fe4fbc30a5c2f989e2e91723edfbce5c022ae98c30f264b0fc504dff1f30af7d35b618df46ff83cd408453e2f98af83e024ff10acf2f4e69d28aca8
 MISC metadata.xml 885 BLAKE2B 567dfdb0b27aa4de21f2f0e1c26450d335365328623280881c04b8ebf43a4e56582bf9bc121375b11d1d80a8054f5606dd81e1afd7a71f429148ecbeb97ad168 SHA512 5731cffcef8ce3c0b9a04c71426b18909a8d0f1872ac97a3746f1c25eccb02263eb9cff9037a253d5db7dda7599a18b10f1c6d1f819ed1d769cf470e94aeed9b
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index d52b6492131e..b0dfa1095e31 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ DEPEND="
 	mp4? ( media-libs/libmp4v2:0 )
 	musepack? ( media-sound/musepack-tools )
 	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
 	!tremor? ( vorbis? ( media-libs/libvorbis ) )
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index aeee07b2a3e3..0e2fe4944f38 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,5 +4,5 @@ DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 3148a60a398d49d6932864d84b2ee
 DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9 SHA512 bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
 DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
 EBUILD csound-6.17.0.ebuild 5441 BLAKE2B 96c1aa4f27afa4969114ac3a3ae49cb377b8f0ee1b397c181553a8f02a6dc6b591a44e883fe1941a2d92e8c762b3509b2de71fee2a8e2ab19212123e38456cfd SHA512 3b731407da33708c14c46a78037ae6ec86a3f8480e61c51aba54150b7e3fb4673eb278f8a19ad8ef6eb7497cc6a2992cecbb0e6b2b27354e446021e89fe2fa63
-EBUILD csound-9999.ebuild 5200 BLAKE2B f4e3613a27054946fd61a68de621edd948f573a842b119d6a606914c32a9e2b2bc38ca9f1b5dd1b7fb1afaf0626a111d5c5834fff78c4eb4e8d80a627000983c SHA512 3c44b357d4c40718b9af162dc6ca0e8257dbbd8bb92fccab161d978b487391f8f52777d9fa6f121fc3c4975979e6844c2556b2408c63f3f8db27d226a8fade8d
+EBUILD csound-9999.ebuild 5197 BLAKE2B bc833fc7c2fde8e750c93e534fddd5e427729f51999388531487d018096cfe7707347fae254f15ef6a6dc0853a44034d9b0845130bc72075d4597e646edd572d SHA512 9f40d5e9f23cd33076ec602b19dbb274aa2ce53546ae4c57eb4aacf36aa3d08539326b91720e52366d614a8f53aaacd8cb73c543aec3ea379f4954f7ea4ccfdd
 MISC metadata.xml 904 BLAKE2B 695a6de1783aa6d04860c04fed7c1dee77e89002ea7192c7991e0eb417046d53cf3cdfe29bbc1aea58bf5c3bf43ffc17e996f00ac802f45e2c9c8ddafdc3ba6e SHA512 b36c761a3e5b246e720c88dc1d4ae6be4fa0703ec562c7caa8aee81d511967549c084c58d4b2c3d332413aee425bbab57b55b7fcf0e54c0e39ed69a4c458a602
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index ff9f36b931a6..def764bd8d28 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -69,7 +69,7 @@ CDEPEND="
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	utils? ( !media-sound/snd )
 "
 RDEPEND="
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index c187e098878f..cc120e6db3b9 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -2,6 +2,6 @@ AUX 2.3.2-musl-implicit-declaration-fix.patch 991 BLAKE2B 519b679a16f547b590ba64
 DIST fluidsynth-2.3.1.tar.gz 1758632 BLAKE2B a1501303e02b3ea64d87be5cff08d5f2f2be170b38faedc8e6bc4fd18c0dafe268fa6110708664ef0659df9f0e9680551ac483d30364977e768af60dfdff7e83 SHA512 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22
 DIST fluidsynth-2.3.2.tar.gz 1773755 BLAKE2B 2d88e52223ff9c6bc5bcbcd8b15f30abb12632202b9a5c5eecc5eb95620aeaa2d7d9b80b76e6b26eef95ca92521bdc9e6d539f8235d90ca0429b12bb72db1a6f SHA512 21798b5a80a7edd8ef02b983d9b230af45cc66b98b32d593228e12dbec15b12c6cf6c0f3692c12af66de1ba2049fa9d6ad2b68c7d1579347eec14d24870b0025
 EBUILD fluidsynth-2.3.1.ebuild 3452 BLAKE2B ad87e841d41bace7720904372f33ec26da9685a68e8ac6849db841e3c73606c9335d885ac8ceb629b98ef83c806f032dc284441bc8caa7b83bc30924193f4dd5 SHA512 ac76893a9282bea3dbbaa5299dfc3e3a3f1fbb2660f69b298f09a504317a303c4ea9b6416d13493339a04b9c2a650b82a644cd0bf01144133f0913d4c3b13ad1
-EBUILD fluidsynth-2.3.2-r1.ebuild 3528 BLAKE2B 5aaf7c44af39337a47732ba0216131ee045d531465ca77adcf43f1a5b6fc67fe4cf9c0652d93afa1b5a08421f91773e076b493b7b962d7a680e909c742cd36a5 SHA512 604e4e76e1068b3a3dbc6807d6c4df469df06240077687ae6afcda5e2f5fcd073b4cbb3e94674b5114d059f5a4827b6715279a1480b591b2505d5e30e797fa2c
+EBUILD fluidsynth-2.3.2-r2.ebuild 3525 BLAKE2B 39a95056663f5a85fcbd8fd7aed01af403581a1533cf16073cd85ccd1d299de50e4a3ec97e49a49f8ef7998d64f71c0d544bed7fd913c91cdfe46bc52a1cff53 SHA512 9272fd471dcaed68e44468994564e1c6a3269af94f7810b130e36cb086763bf29630ef6fe059cb0ce5c354b235a9b6206ccd825ed3d989ab794b5082a06355f7
 EBUILD fluidsynth-2.3.2.ebuild 3454 BLAKE2B 629018f4cb334ad7963932f848e6eca273d9294321b732aa5c7a581d506c4ba83d201bcc9b30a1921c32751ccb67b2162b2dfe19830e8885cc7590bae76d00cd SHA512 ffe40ef484ed6f0fc578c29926f624e9c6e973dcb064be8295b2a6dbb329ecf57f2a9cf17d20696d9976114b8a7fed4ad4205c61d2b52c4e1ed364ca675dcb22
 MISC metadata.xml 509 BLAKE2B f94b91d9486a14757aa47e69269d6321fb330556f24ac0d2d47d7734bc28164d9cff5d7ff7728aa6d59606006bc4bfa090662b9dd087a6bf36ae23660604938a SHA512 7bf5aeb69570ef736dc6a1a3d652449b0142978ee5e6ed9902d4f851deea87c8fb94bee821ee9ae93bc529411f336288021718490e86c2815de5d30111bd3b28
diff --git a/media-sound/fluidsynth/fluidsynth-2.3.2-r1.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.2-r2.ebuild
index de5c7306eba0..384ea1665651 100644
--- a/media-sound/fluidsynth/fluidsynth-2.3.2-r1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.3.2-r2.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 		media-video/pipewire:0=[${MULTILIB_USEDEP}]
 	)
 	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f5cb295c24b2..c040cd9b6810 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,5 @@
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776 SHA512 610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df
 EBUILD hydrogen-1.2.0.ebuild 2089 BLAKE2B 4aa22d37a9fb4d93681aa06c9b25ca2021f1955b1733dd50e747b5dd18a3b95ed8c92a76bdb4ea0b60b1297db82d9a82a264eaec10922de4940dcac91bf9b0a7 SHA512 882d1973341eb6029406467a69cbae0fc55f037ada16a7a8fc1e4a7a5c745db570e5a5ee0a1e7cec1cf586626ec7e4c1c73856a8bb0e0d47c1136d47c84acd15
-EBUILD hydrogen-9999.ebuild 2093 BLAKE2B 446244d0aa4e297a0ae0991a6fbbb98e69975b6cae4a4d7d2bd0489117aa49a2c179decefaea34403a4b9768baff03bee32d950063fbbbc168bcd1495bfefd7a SHA512 cd4da8a14ed3730975769b8efe11a494591968537e45f378926da443b90ac37fc4f7a14b4092bd44a548f84133a5a543ec1d105ae0d885aa4343767c2881dfa1
+EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 01d79a47d316ea22f7669b372a748d26744a57eb99e8b6f7ddca7e04847cd03efdad02ea88795ae03131d6de2ffb5628cbd60fa12238b5cea5e9c11d590cd1f1 SHA512 fa3a633365e4d615b0a24be37657155c33962798c2f64c773041c02e629ef68ea17892433e73b991ad8721967ec60ba02f2e4946d527aa6142698ebd9ca0c8da
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index f04da20e1552..56e80eb44109 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index ed35b43d754d..fefd17ad84eb 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,5 +1,5 @@
 AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd
 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
+EBUILD lmms-9999.ebuild 2243 BLAKE2B 7ad655e9f2541e7c5cc3d1ddd0c85c0108d9c35404731d2c4fe04829a129dee2c6f3ad34cf65270790700650d9e1a15e9ca97ccb4ff9e76c69f2d34ddeb349ca SHA512 b64c9ef64dc194aa47e297fb9934e167a8a255b8921ef96f86a6cd77ac25226266b9ef61342a393e044dd647e75cf8d8a98891d326f1cb71c658122931b0cdc6
 MISC metadata.xml 845 BLAKE2B 4b6d93d9fe8a7d26b145e949955cde9e7c09abc08737f69417e94fdd5bf36b35ab4ed5f4339203106af18b7b2b7f874fc8a6cc8873c50bdc89ce4e764211b5ba SHA512 6a84127fb0cd31d11bd8c82a4e92c94eccec4bab30726a16e4740663a520a0ac0e5778adfd29dc5012fbc0ac58fba532d9c6e7abaf71568682650c553ba8e4ae
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 2650aa8061a8..329eb0410291 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 		media-libs/libvorbis
 	)
 	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? (
 		media-libs/libsdl
 		>=media-libs/sdl-sound-1.0.1
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f9d89206bee3..125a5816938d 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,6 @@ AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b
 AUX mpd-0.23.12-libfmt10-906074.patch 2967 BLAKE2B 367bf72202236b16a07111cb523d21ee2742331fbe4b6608b34d9f55358127a5c8ec0167fb64bf4c455215f6b4c291d6dbafcca7bb769853179a56b6bf99618f SHA512 6c3d6217f10fc38284f9555ccfb54fb7a088b8a163607b663a32133b72ec56e5c2e2466bca91dda27ddcf1dabb1524718b690a71982eb3dc05416567aaf49f51
 AUX mpd-0.23.12-stringview.patch 7379 BLAKE2B 5b23239d6e2343b00cf230eed405c020912f33db443ab02fb4cb656813622a1dd7a2292536ad85b9a99e657b270725452f11122fd1d2ada35da64097bf4d5abe SHA512 faf5fc16605f535efc53ee56782bf291578cfbeed95e09c8b92b6480451386ec651d8d99c4aa928fe238047ce29773b081979580e10721609c8122772b012328
 DIST mpd-0.23.12.tar.xz 774708 BLAKE2B b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71 SHA512 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
-EBUILD mpd-0.23.12-r1.ebuild 7994 BLAKE2B ef80d910231bec04d9c9763ef7c3d0cac24b7b9b4e59bdab9d1e6bf1c110c7b6270c7fb2f34cb4f4924255c0512d05b00db374b3d0f9845b17f5843f44a4de38 SHA512 589b77f1b3574ede2180e3a4fe3e65f745e80fb6334af04ce2a480773e3b9a49069957d5635aecb81cb5ff148aeb12910e63333336b5aecd238029d879eaf6bc
+EBUILD mpd-0.23.12-r2.ebuild 7991 BLAKE2B d47152331a9bf6e8a3792f551dff0fdaa83be49edd7cb19f4826f635befecf611e38e440b5b85ed72ef064d6257003f88d1d79719fed4e75b82d6c200273dabb SHA512 fb6d1116600a121d2f05c5bace22b3cfbac255087f75de89327163e7f95668e62e9c8964ec0990087fff0747aedf6344e094612513f14f8faf1f233053c5a029
 EBUILD mpd-0.23.12.ebuild 7952 BLAKE2B 713e700803cb123f4e1c3c5cadae1b1ca0e5beb0506f202c65d7a2a21a0e72e46468258bbc1110d65bcd5fa9352447b92f2708a5be9ac8b7f8f9dc4866bdc35e SHA512 435fea8f5b42864f41161e48bd890582b704a99c1377da6e662dc9ff820812cba875d7579689726ebe246cc79565839b84b42e0c3fa2002dd9636bd687d6eee6
 MISC metadata.xml 2805 BLAKE2B afe65d7428c79de96b99855e74d8a474df33dbd71fe9f9f65f64270126dea5ca9138a533c9f4f8d422722352574ccbfec2ec64f5e492869e9c97fbc84dd2c1a1 SHA512 74c249f71a819f5747739c6c720d48edf52b62012f9d1fd30bb6027bd3c5794161f7a70b7c87d78a60fa46e37fc94aa449e0b8825bb8d3eea32143bf240e1d92
diff --git a/media-sound/mpd/mpd-0.23.12-r1.ebuild b/media-sound/mpd/mpd-0.23.12-r2.ebuild
index 3b9aeb9c020a..1b33e5b70dfc 100644
--- a/media-sound/mpd/mpd-0.23.12-r1.ebuild
+++ b/media-sound/mpd/mpd-0.23.12-r2.ebuild
@@ -87,7 +87,7 @@ RDEPEND="
 	openal? ( media-libs/openal )
 	openmpt? ( media-libs/libopenmpt )
 	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	pipewire? ( media-video/pipewire:= )
 	qobuz? ( dev-libs/libgcrypt:0 )
 	samba? ( net-fs/samba )
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a13355a67815..d788fdaa7df0 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,5 +3,5 @@ AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb
 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-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
-EBUILD musescore-9999.ebuild 3223 BLAKE2B 89a6c6bc42275270f18e343796623466e75e20b9e2fd1bc7ac6efbf169c135c6baa3c9daf41d46eebd25ce655b1186c516d74aa94bc26c41c0b1c9ed42b15914 SHA512 01958e0672106c38741229d2c1f391adc378a88b3546009ce0f2b9ccdbc09a89d65ac07e76d4a607f6ff9eba68189c6ef136895abc99f92ba7d0a84776da0e38
+EBUILD musescore-9999.ebuild 3220 BLAKE2B 663c302b8a28c087c525a3e79c930fe5af401cdfeddec7197c691ba28681d6d457d2231e338cc2db5a2327bfd797f7666332a7ee608143be6997f812baed38f5 SHA512 5f3bc962d9cf91cbc8029d270d1fb1abad34edffc62ea2bbd35ec2e9ff38ff9c71f1bdd028b65aafb6408312cc21b557eebf2728d51ae2a33ad24facafbb5d78
 MISC metadata.xml 882 BLAKE2B a8ead5437d77a6c39262770afc3409f3a68072fbc796af0b029641126521299e45e921a666b97b168de79b92d3359ecd4032e26fca798188fa9bd503f394db5a SHA512 4146e03299dd9a646e713dc9baacdba9578c5fb204eeeb81397e25fe5d7b19ae07aa1bb0c550ffff5cb53194f9ee53d0b35fbc26b04658d0e50f08e1a0e441f7
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 5690f140a41f..42ab0eae69b0 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -58,7 +58,7 @@ DEPEND="
 	omr? ( app-text/poppler )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sf3? ( media-libs/libvorbis )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index b08882bafddd..4aec3ece3e6e 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -3,6 +3,6 @@ AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f4391
 AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
 AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
 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
+EBUILD pamix-1.6-r3.ebuild 1109 BLAKE2B cde2f93f3720ea6d01be2ec17f5593c3e96cac29f1cc9287261d83898826e5fe1d2363bf004431faf407352c6df8ec0223fedc45def74ad26a373523fde17ef4 SHA512 50ffe7a3f587a945beb637a21e6a5b54af35b7b546c85901b364459cdd10a51567ef45eb6a111b9299e748d7ae53b4cd1977164d2ee7d6b3d75ef459c5f2ad52
+EBUILD pamix-9999.ebuild 921 BLAKE2B 558cea89e2db45a7e26f3e67fe8e69c7f8652bf007edbfd732b1958b867b9b39dec127839ddfbfb50f52a5e53bcf33d63cfa6bb04ad4e7f3c14b654c06734283 SHA512 675f77ee9ec0ed1dea65a60d7ab71e688646d7fa5268f397e9c977674531e4dd0110c72a0d4382be8beb9f788457e8a3ea6d71506604f7bd1b791d8fde790b8e
 MISC metadata.xml 253 BLAKE2B 17d036b996a954ce2655aa2fafc8b341fcbf232524ff603ce46e810150811f65ccb29df99d18adbf98d9d3f3f5fd65b1df64cb4e7a6c06df9c2649fe9f5e7351 SHA512 0e3b9c8be6d31746e284d905df2e864eb673ea15d791609a27737bad246bb641b226b8551e68e2e433a47be09bf8f09de4af77808b234e170dc4a39c56397acb
diff --git a/media-sound/pamix/pamix-1.6-r2.ebuild b/media-sound/pamix/pamix-1.6-r3.ebuild
index d0c727991818..72606c883207 100644
--- a/media-sound/pamix/pamix-1.6-r2.ebuild
+++ b/media-sound/pamix/pamix-1.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -14,7 +14,7 @@ else
 	S="${WORKDIR}/PAmix-${PV}"
 fi
 
-DESCRIPTION="A PulseAudio NCurses mixer"
+DESCRIPTION="PulseAudio NCurses mixer"
 HOMEPAGE="https://github.com/patroclos/PAmix"
 
 LICENSE="MIT"
@@ -22,13 +22,11 @@ SLOT="0"
 IUSE="+unicode"
 
 RDEPEND="
-	media-sound/pulseaudio
+	media-libs/libpulse
 	sys-libs/ncurses:=[unicode(+)?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index a8baa4c57b38..e1631975ab6e 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -14,7 +14,7 @@ else
 	S="${WORKDIR}/PAmix-${PV}"
 fi
 
-DESCRIPTION="A PulseAudio NCurses mixer"
+DESCRIPTION="PulseAudio NCurses mixer"
 HOMEPAGE="https://github.com/patroclos/PAmix"
 
 LICENSE="MIT"
@@ -22,13 +22,11 @@ SLOT="0"
 IUSE="+unicode"
 
 RDEPEND="
-	media-sound/pulseaudio
+	media-libs/libpulse
 	sys-libs/ncurses:=[unicode(+)?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c393be97fafe..a306762d2b42 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,7 @@
 AUX qmmp-1.6.0-udisks_plugin.patch 321 BLAKE2B a3a0e6ca792a9399eef189e319113b63094cbc32a2d8912c7d7174589f34729be4ce0638323f449320cd34df0b1e3780ff43ae3c211cc6c96ba823cb0fed53bd SHA512 d88eadf6e725617cc50ef809532a5eaa0272745c74697953850c52dca3586809bd83f3804925e65607379e7156210686fe906da729371ba251ebfa1168e59b97
 DIST qmmp-1.6.1.tar.bz2 1353769 BLAKE2B d12f91166cec051caf604ec27dc563d4cf2a52511eabfc0dee0b0679373e7c5fa0f0faac2b4d25420f33485caf90545c7f0098f1e3814f92d46d82b253410afd SHA512 efaf44002c21544514301b5ec1210507fe3cdeb4c6b8d14fb8a573d32db5bb73a9d6d36d00d9d61592261b69fa4260417e3c65183f13299234bd82dda43536c5
+DIST qmmp-1.6.4.tar.bz2 1379335 BLAKE2B e17ec8f84f94cfbc6a0a1d30d6d954f3e6b3448909c0e3344614340b41974d69aa5bd3dbb149fcc88c6ede289ec7900050eb0de81307dfeb8ebfc360255d1ea6 SHA512 da8eae4ca4e10cca8a177064a422fdc196e76bb5e3e06c3029040e1120da0d2e5666824a8effd51f82c94b999e1243ae3bc6c71c8c05e334276bf40a5767c17f
 EBUILD qmmp-1.6.1-r2.ebuild 4075 BLAKE2B 84d973140fdea4debbf325b81883d802ea9fdfc819c560aaebe7c46d582f0e8b3c2280c50a1a4a1f4fb3ed9623cb6beddabd7e06676e114ea78d708ba10bbba0 SHA512 13d2d49d0280dd6767e556eb35bd1c411288fdcc834c1f79d2fc27996aaa6e31ddb6417e4a2a9443c9c16cfb99716360941385368f57a680823c984bbe9f2f1d
-EBUILD qmmp-9999.ebuild 4137 BLAKE2B 7517f04c4388a9662c92e799203f49cf26c15113239780f550a815093227121db2a834abb61a9eb141ca1facfe0cb794247a88ae558a3343a6ed8fd36f77370a SHA512 c0befc99134c543d591c6a36e0710e08d261e775617e820f99339fee22515f1c32506d7ee45bfc1e593b8e2735e70d320e34713296a5f4220f64446bbec6cca2
+EBUILD qmmp-1.6.4.ebuild 4070 BLAKE2B 3d69ea2f1de3d826dbd279e3c408bcc1f32bc6909c8ba34369ad045981d84077301295680f820416aa7cbf82eedd14c3b48bca19f89e0ae962f6842da348ae3b SHA512 5ebfdbc68b6933c5354da07a1a72b5c9fafb1163c3e604dfa8e61aed10a1dad8aa6bde21da83104dadf3f399e1a803cb64b0e3e4b5add4c46ab730038e75be8e
+EBUILD qmmp-9999.ebuild 4130 BLAKE2B dd79d1cdc1226f0cf992cf005e9ff2d24b630de4cc3124da214ec5e279d165bac36e4de6ab738372333bf41e1a2f5015e139d92df00d29ae58c2164409a61d83 SHA512 226dc7fef2c4ba77e97a41f98f981643346b28a98ada4366ed6cfce860f227a31ff141cb3c8a684cfb717550ffbc988d7edc56cbf0bb9413744b264387c78e15
 MISC metadata.xml 1960 BLAKE2B e0e190870cdb4c77e5ea4fb604af1afd571406488baa04daa760db1316cba922533f7e37b184e4e7df7c91e82dc716ea33deeb21102596ad512a9aef70a523a8 SHA512 5e8da850cdce11da134a03e9dda51d52ced62dee1fc80873695fe69f0fa53ba9ff7b9ad38931753819e4522103f3fe2ec49ae3b8d973d914e41d0e942557898d
diff --git a/media-sound/qmmp/qmmp-1.6.4.ebuild b/media-sound/qmmp/qmmp-1.6.4.ebuild
new file mode 100644
index 000000000000..cad98f6a9903
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://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-libs/libpulse )
+	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}"
+BDEPEND="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 19f9dc5369fe..9a67e9ecb2a7 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
@@ -74,7 +74,7 @@ RDEPEND="
 		dev-qt/qtopengl:5
 		media-libs/libprojectm:=
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	pulseaudio? ( media-libs/libpulse )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 4c71e3e736a1..73356c78ac27 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,4 @@
 DIST strawberry-1.0.17.tar.xz 11244908 BLAKE2B ad838be23bbf441e1617ccc45e48e54baa829f327fccfc8f3070fd211eaaaa00d690cecef36858f91b59a1114c4df84c9b72b98ec3affb56f9516167d6fb8484 SHA512 7629997f1734b537057b8e49ed443c48733ce5787ebf79939c77aa07f193d36e5ced15df62c03b784644fc058b3067d46e192a0de0cc9fb0a2338dc76d738973
 EBUILD strawberry-1.0.17.ebuild 3074 BLAKE2B f3bccdddfdd29215a378741edd6c561d931e4809f5e5525feed4bfc0ce8a7d074f909f72bb13aa6bae99e99a107042a5007da4839597a01b5b37ed11c4c29123 SHA512 899d59a6e80e7a54f20bd0058cba48d11eeb41f6383e52c9cfffb313253300c842d21018a3198c74fa0b6f5a1074f9a2d00e5d8fa612a72e7c586e30b78d90db
-EBUILD strawberry-9999.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
+EBUILD strawberry-9999.ebuild 3073 BLAKE2B 9b06f96fe01e164fda396fdb6a1f18aa71d2ac18a420e09d233541c56f29da0236e0660c5d40165366625aad2f339f4a858dfd0f161b3b6c3d70e3d1c28cd251 SHA512 ee63854ba9c986d7f619d7a7452e09ce7102efe288f6b175ef3628b34397fb39105ad7f56a0b01fced069c07b9cad11b8b77a576098d483b9d60a7a26e32d9aa
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 640a70a1fe25..bb7e0e2f1956 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	ipod? ( media-libs/libgpod )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	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;