gentoo auto-resync : 25:11:2024 - 03:02:44

14 files changed, 85 insertions, 330 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c13c810ac3a9..1b307ca23eb5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 40c6517df634..4d1616da8367 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -5,7 +5,7 @@ AUX ardour-9.0.0-fix-unlikely-buffer-overflow.patch 877 BLAKE2B 0bfe3d663bbf9d70
 AUX ardour-9.0.0-properly-check-for-syscall.patch 709 BLAKE2B 628af149268643b0f46628367296bc28bdd80b59ffabcfe6584dfb811ab931a01d2b0207821ab0277a04170a2eb3728ef21e830a822ec02ce45a157b497b2906 SHA512 15afc522495ef7ce3678de4955091500dd7bc7ef87ffda02afc58235083e55cef058a54847fd7aac89d1217e2216c951dc31a1e50b829ee4e8f6ecc6cf4793fe
 DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
 DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
-EBUILD ardour-8.10-r3.ebuild 5319 BLAKE2B d6a6789d1c1deea0a862f2dccaabbf7d4363b82450c6650a04897a2e87e9a951453dd58ff152ab8382a3dccd649f1d7128316b58e23256741558dbb31cc0badb SHA512 f4ea813eca03e947f355695708499bd7458d3009888ea4f533fae13eddbb58a0a13edc7c4827fc8fcfd3649b685a776dd077c09bd4ed4a5a1b721650c1db5ff2
+EBUILD ardour-8.10-r3.ebuild 5318 BLAKE2B 633e55ab7f87025f64af52c97ae2bc098053c6aa921fecd39d1fdc69bc8a934a262032e1ab03f8c47649cc78a820bbdadcbd3ac649a20c9f68da51f7d39b529b SHA512 6a1973bb83fed5537fb7d4ce0620fe266fc24ec7154a04c2eb5f9f086f568984492b3739b710605766e411d89ea28e93c35c24cba8e80486ca29039e3b3d34d3
 EBUILD ardour-8.7.ebuild 5257 BLAKE2B 48899bdee879dd24d9530e2eadb4c89a03241a1c793e87bd8ff5df3cdd25e598bc73ae2cb4dae131bfd6607957e77b42ddf0d33e996949e10887a0b8cbd6047d SHA512 d37fb303db968c36017d1e6a4a296e534bfd6280bd25ef841f5fb556ebda5b87e6bbf3d8e4b47517c28d0f99573d6d6852a5c6801960a5309a2107be2e8b4552
 EBUILD ardour-9999.ebuild 5150 BLAKE2B dc3d456ef39ed244244ceeafea10a6e6c841638f3c1b8a8608990f69d6e96fe10d822a3e59edb00d743090471d4c78461250189bac4838ac8144862a977090a9 SHA512 aed242f55912801b1ded17e06fd1c2666d11d2254c1d142bb8d8fd861742176922e391b095d063701fc26e0a76315d42913656832fa4a3e91d844625f786a1e5
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.10-r3.ebuild b/media-sound/ardour/ardour-8.10-r3.ebuild
index cba0bc79c8e1..40c4702cd588 100644
--- a/media-sound/ardour/ardour-8.10-r3.ebuild
+++ b/media-sound/ardour/ardour-8.10-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/aseqview/Manifest b/media-sound/aseqview/Manifest
index a6dd5400934c..4598ea215d0f 100644
--- a/media-sound/aseqview/Manifest
+++ b/media-sound/aseqview/Manifest
@@ -7,5 +7,5 @@ AUX aseqview-0.2.8-mv-configure.ac.patch 1744 BLAKE2B 4f27f542ff2c20667de47f97d1
 AUX aseqview-0.2.8-piano-segfault.patch 1112 BLAKE2B fadbb1808a8c6e59f737e09467e7c204881142e57b0b94b1de996a47b0c3c5e66faf31f2ab6cc276811ea2719008d09957ee689b197f8f5df0bcb0b3b4559557 SHA512 316b6483a6073b63cf24b5183f75018521ef6e1047fd5ee8789346f8ab801a97e51cf6cb39f218a31b31c30f93b2387dea35aad9a91ed6542dcc3e0af544122f
 DIST aseqview-0.2.8.tar.gz 120287 BLAKE2B 331d4e93ba635b59dc1c07fcf470b94a47ee3e03b348b57ae7d7bff2da461d70f092284a461691e76f24cb9d0745c721f283b8b5656192814960761495f94219 SHA512 853dc2b1c54152c39a29cbbf17698c4f397f479b5a57397c778b22ecab803be0a69dce3b4a10d50a3c1ace08256f05bbc481ed695ab81c89c40af2034a97c203
 EBUILD aseqview-0.2.8-r2.ebuild 573 BLAKE2B d117650106a743dc18ba5b20809e58a62189b8f98e5b8872140bd8afcde910b50bf171759b6febb60c27b1916abce12db312e0bd183a9c4d4fd50ed8153f25a8 SHA512 16e31a7cbf7fcf25a5bc9925b0d5e54998e56a5f580eded55ed438c4f6aabc507c7b66ba852a7a299e4931e159db84a2618aba2dba44279b603533e921bf94cc
-EBUILD aseqview-0.2.8-r3.ebuild 876 BLAKE2B 4aa130939d8f85902f09f0fb99b34df0ec5e07c0e2a931617a7e145d9a883ac8b86bf3ff748ae951ab01ec6b1d07423777dabfa063b66cb3df110450e3086df8 SHA512 ea7be071203961de3f60f6c7e87fe4913b548ac2694e2878bd2b357a73ff67e4a7070e7b6399a66fbf5ccb381238c43b23397c58219a5919161cc1ae23ab930d
+EBUILD aseqview-0.2.8-r3.ebuild 873 BLAKE2B 774ad5a5d2099ecd2c14c0b65c30d17204d081ac32fc879d4381b24432e5963f291e069f317ba2aabaaf883be67c11694535b9b140cf4074bac5c87dd2abf1be SHA512 dba72a0e7154eeb407bd20e00927e7459491442f112f8b4f076de3e20f6c0323ebed0567b4d7cc9d2034207234fb51c81fe226f872f2d032f2f9fc308c7c96d7
 MISC metadata.xml 326 BLAKE2B 2455b8999956699d4733f417cfe847df480287da3143d218a654fc0c8d6aefcab57c016a07016b71c24df5609c629de7ca41fceb81e81f982d2ecafbd8b72236 SHA512 a37b379e0c29b0660e362165c5a22b275d754e305c5f7a36b9395cc5683b29d08a7dc5187a8c40aee941343f389d877148b7dcd9978d26925e8ed18a987a93cc
diff --git a/media-sound/aseqview/aseqview-0.2.8-r3.ebuild b/media-sound/aseqview/aseqview-0.2.8-r3.ebuild
index 1459f244f0f1..041cea083710 100644
--- a/media-sound/aseqview/aseqview-0.2.8-r3.ebuild
+++ b/media-sound/aseqview/aseqview-0.2.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index be887970348f..5f0f2debf7be 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -3,6 +3,8 @@ AUX chuck-1.4.1.1-makefile.patch 1185 BLAKE2B 25ab9eadab5e3ddf5369cc0b44f66d3a37
 AUX chuck-1.5.3.2-makefile.patch 567 BLAKE2B e860079107526b090d592fadf0652dd26b29139cb081eaf43071544ac6f23cde2ddc50db59b57370b09aad19fc595b12b75341908716a0faf13ebedf0c437da0 SHA512 363dce64af8dded1115473d5268f69a0a4a391a0825a1f0811d8f490ec6181118b6f34af5934ffcd02a5ac9459faee1aef3ff4a2e06b0291bae473173dba99cf
 DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
 DIST chuck-1.5.4.1.tgz 22311510 BLAKE2B adfc00bf7b5e828d5b5668b703919d4a4b9e7890a9a59c6d5d1caf2600c9638e14366d4d1fbd417d4fbffbc31003386212d30e1e22f47349c62c36a3b6c8dea4 SHA512 8d372a20c7c98273ac0941a0a59f8e91dbafc9ac290d2454aa23411b4eb515bc7ac12f9635d2f25e2cbf8faca52c67a6ea874bbae52ad24fd44544bd977693aa
+DIST chuck-1.5.4.2.tgz 22311827 BLAKE2B 1215211c837fa55c132742a9a4edef97446304fffb6a6e9f4de0d1da66c634c81398870fbd30ba864939f7e3a54bd0f2125bd6c4c9634edb51da43fa25fd05a9 SHA512 c4ce1e3e04d33fbd516f41eebfbc3b71399c587c0ea7b5d16b4d8a8fe5efb3e244ea0e8860f7331aa740f68f96f6b8f92d37104e6b71f0b6e0cb704acc14715b
 EBUILD chuck-1.4.1.1.ebuild 1856 BLAKE2B 3ac1450b0a819d7d2c4a7e3daf0f3eec0b24bf5671813ccaac0b31792c8091898a60c39354037f0840c0d988b4cfd1eb5ee172074a66ab354d030db576523f1e SHA512 3c7edb4e92c43fb7ebe9d2ff8fa105423e5b7e62839cedecd8ab8e20408726628b8611627ce97e211387f44a5eda7e0519842c53592f09825108567f34b61c12
 EBUILD chuck-1.5.4.1.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
+EBUILD chuck-1.5.4.2.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f
diff --git a/media-sound/chuck/chuck-1.5.4.2.ebuild b/media-sound/chuck/chuck-1.5.4.2.ebuild
new file mode 100644
index 000000000000..70115f4d5785
--- /dev/null
+++ b/media-sound/chuck/chuck-1.5.4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 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}
+	app-alternatives/yacc
+	app-alternatives/lex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.5.3.2-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 DEVELOPERS QUICKSTART README.md THANKS 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/mpd/Manifest b/media-sound/mpd/Manifest
index 3978cd14a7d2..7c1f5c69209c 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,6 +2,5 @@ AUX mpd-0.23.15.init 1400 BLAKE2B 6b9defd7f8a8cbfeaf6196d1ad4e928a9c0edf9b6d109a
 AUX mpd-0.23.15.init-r1 1433 BLAKE2B 30de4d260374d01bca9c24419207320d2253f974134da10ca946af88b8c3804555459e9f4e86575f2421810d1c894d6215ba1404b3c70467c23586208ff6859d SHA512 266b7a53e76cfb987794eb1741b46bcb10a33708cf6704fd92899a4315c78d3ea03d3ab2880197bad23d79c8c60c67c19c122d634f1d5caf78da27abe1285295
 AUX mpd-0.23.15.logrotate 124 BLAKE2B 4c2200d4a2fba4735037757f74a27cfbc71dcd9ec1d18e3f3d94efbeccbe99164adc7582fc1c153e50b019280b9d51bb92d08c5498d048cd7e6c2313e762b29a SHA512 2990b6facd1f8f99e85c67e16c248cb36444d933ff47a479612b0305296bb15d8eb570bea2e43a6752a687186d53728ba272869e84942b4d36f108b35fe475ac
 DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
-EBUILD mpd-0.23.15-r1.ebuild 7433 BLAKE2B ba186f2a91f763bd5deaf1976fe806ea1a2473408ba7f72834b07a854b5d457d8c2cf5f0e1fbeea4ac9bc794a6e976b41cbe876b6cd0000836f3f5a733781afa SHA512 58fd272f2b257e62c3a1fa8aabfad54a2a1e956435dc54d34d44e1c2533fad2b54716e4eb6e8a21f0b8f94187969ef2aacc3b4ae73e1c4d2440e3562cb307c49
-EBUILD mpd-0.23.15-r2.ebuild 7658 BLAKE2B 6eba643dc994135e0bac2fe8d37db181ba013d995483502c717f7aba43ab99e8d1ace7fa1655418e80ff5001f1271c07f85d754d629e7818b306612aa2b67988 SHA512 09bff941789f104ee948278b5b8bcf92e37ae68db3d1b002d8f2a0c2abc52086195690a19acc895f11d613b57d61f925c0d7f27737d9f7e64bf3c2b937c432de
-MISC metadata.xml 2872 BLAKE2B ed17ec716b96258c61606839340da197d7276fb2ba77665368c1526d7b2c1e40e0459e30a07ef7f7a1a218c070635df664aaae9c69d3926faa111ee926b84c9d SHA512 f383565a0cd2eed69586291872c47fe2a89ff4015762e79248537306b9bb8729278e81a5d463df6cf31e007acfab15d00665e46b1f1949378cd9b8a8826680c5
+EBUILD mpd-0.23.15-r3.ebuild 7728 BLAKE2B 7ad0855d094a35c935f7d39a9477c9c2fa5169771363e6605ae1120c504f9ef06d075a02bbf61133b38a1179d63b3508c9a249889264505470cc9ebdcff786f5 SHA512 ffc34b9832ca38df5bf27aa8900b24007d6f218091896dd8c6eb70cfbd9892894d5398e47020391eb8d821bb0d6b8b79bc117b8ac35470b1727ab5866f740fa6
+MISC metadata.xml 3041 BLAKE2B ecc779a158ef0106eee64f7f52ca4b27e325f3ab3e7a56508048da81d3869c7709a147ac6916a3d760bbd7a4e91813bb6edb3cad311edab3e2f73df310319fd5 SHA512 f5060ca0fc07430861c7feece1c08cb7d59ae5d5d4f06c30c3e9a206edce283ac77052fe614e850093255b42b2eda4294a17960f5f43db9578d7178d8763ef00
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 2ce73a20850c..7cf09c18a6d8 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -44,7 +44,9 @@
     <flag name="yajl">Enable JSON parsing via <pkg>dev-libs/yajl</pkg></flag>
   </use>
   <upstream>
-    <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
     <bugs-to>https://github.com/MusicPlayerDaemon/MPD/issues</bugs-to>
+    <changelog>https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/refs/heads/master/NEWS</changelog>
+    <doc>https://mpd.readthedocs.io/en/latest/index.html</doc>
+    <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.23.15-r1.ebuild b/media-sound/mpd/mpd-0.23.15-r1.ebuild
deleted file mode 100644
index 478d719f307e..000000000000
--- a/media-sound/mpd/mpd-0.23.15-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 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 ~arm64 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
-	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 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:= )
-	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-libs/libpulse )
-	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:=
-	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
-}
-
-src_configure() {
-	local emesonargs=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		$(meson_feature alsa)
-		$(meson_feature ao)
-		$(meson_feature audiofile)
-		$(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 faad)
-		$(meson_feature ffmpeg)
-		$(meson_use fifo)
-		$(meson_feature flac)
-		$(meson_feature fluidsynth)
-		$(meson_feature gme)
-		$(meson_feature icu)
-		$(meson_feature id3tag)
-		$(meson_use inotify)
-		-Dipv6=enabled
-		$(meson_feature cdio iso9660)
-		$(meson_feature jack)
-		$(meson_feature libmpdclient)
-		$(meson_feature libsamplerate)
-		$(meson_feature mad)
-		$(meson_feature mikmod)
-		$(meson_feature mms)
-		$(meson_feature modplug)
-		$(meson_feature musepack mpcdec)
-		$(meson_feature mpg123)
-		$(meson_feature nfs)
-		$(meson_feature openal)
-		$(meson_feature openmpt)
-		$(meson_feature opus)
-		$(meson_feature oss)
-		$(meson_use pipe)
-		$(meson_feature pipewire)
-		$(meson_feature pulseaudio pulse)
-		$(meson_feature qobuz)
-		$(meson_use recorder)
-		$(meson_use signalfd)
-		$(meson_feature samba smbclient)
-		$(meson_use snapcast)
-		$(meson_feature sid sidplay)
-		$(meson_feature sndfile)
-		$(meson_feature sndio)
-		$(meson_feature soundcloud)
-		$(meson_feature libsoxr soxr)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test)
-		$(meson_feature udisks)
-		-Dupnp=$(usex upnp pupnp disabled)
-		$(meson_feature vorbis)
-		$(meson_feature wavpack)
-		$(meson_feature wildmidi)
-		$(meson_feature webdav)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		$(meson_feature zlib)
-		$(meson_feature zip zzip)
-
-		--libdir="/usr/$(get_libdir)"
-		$(meson_feature doc documentation)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddaemon=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)
-	)
-
-	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
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	# When running MPD as system service, better switch to the user we provide
-	sed -i \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#group.*$:group "audio":' \
-		"${ED}/etc/mpd.conf" || die
-
-	if ! use systemd; then
-		# Extra options for running MPD under OpenRC
-		# (options that should not be set when using systemd)
-		sed -i \
-			-e 's:^#log_file.*$:log_file "/var/log/mpd/mpd.log":' \
-			-e 's:^#pid_file.*$:pid_file "/run/mpd/mpd.pid":' \
-			"${ED}/etc/mpd.conf" || die
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${P}.logrotate" "${PN}"
-
-	newinitd "${FILESDIR}/${P}.init" "${PN}"
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-	keepdir /var/log/mpd
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-	fowners mpd:audio -R /var/log/mpd
-}
diff --git a/media-sound/mpd/mpd-0.23.15-r2.ebuild b/media-sound/mpd/mpd-0.23.15-r3.ebuild
index efea90f9c156..dfdda2f69b68 100644
--- a/media-sound/mpd/mpd-0.23.15-r2.ebuild
+++ b/media-sound/mpd/mpd-0.23.15-r3.ebuild
@@ -40,9 +40,10 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
+# <libfmt-11 https://github.com/MusicPlayerDaemon/MPD/issues/2141
 RDEPEND="
 	acct-user/mpd
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-11:=
 	dev-libs/libpcre2
 	media-libs/libogg
 	alsa? (
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 7d138e0e5c1a..4fd902a0f6e0 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,6 +1,5 @@
 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.4-c23.patch 1267 BLAKE2B 031ddfa66d7c2d4c7b40778a9135650e9f952ae9a77df0eb323b13aabce4960a05199f448c82dc66e8e23d75451f9e5b09054ac66c61eae95184e492f3e27a06 SHA512 e37e6c6cbc6c26c29bbe034e9455b487d345bd2c41841ba359830935ba91cafc42c23cc4b2228d65e799692c00e96d1073d97f9027ecdb03d913916730143f26
-DIST xmms2-0.9.4.tar.xz 1741996 BLAKE2B edb8dfb78d9a4cba19a209f9f5740fcf43c2b295ff3907ad8fa36689f19142e3b86e57ea9bd3ce97a04bd2284c4dd7be45c94510f3004f5ee655f6c5b88a898f SHA512 71075d41a49983624b87d5c80b0d58283fe53146ecad9b8d37d96545881bfec4e6de30eb1463fad37a8f8a3f3ebb58c12e10eecd998d9aaff7f3c1bdaef83bc9
-EBUILD xmms2-0.9.4.ebuild 5323 BLAKE2B c2cb0d2dd438776f1b94c47bccdbdc6a8b10155603d4a32d1fa9ca128816ae81eb77c0489c743cc9627d8e3180221fd2fff4f64f300e51ea516e02edb41b685f SHA512 bff8ec080e89cd99b6c8bfa1fe57fb8a728044ba114b2dacd68aed8548440490335bdde8bb92b904468c1fedb6a9fc3e9e61558f71f13648c22b6c618f4ecb15
+DIST xmms2-0.9.5.tar.xz 1741972 BLAKE2B f9737b8f98e34145cfff8f06eb4d3b0cb080b5bbb5e807a544516e8827f83f5e15447aa0d2aba4aeaf79af3483703309570d7358543f3607099985bdc0b34df2 SHA512 284c3c29e8231a540ccfaf608e147b058c1dc683bec86a96c8383508cc8f49f76b734fd4da69f25ecf628f91c39157801b37db342b1bc5644ed2f7175841a882
+EBUILD xmms2-0.9.5.ebuild 5293 BLAKE2B 1a49199f211f7aff30fe238cc80c3350fc64ab5147d66e975ab815f5cb80d8081aea0fbc3e9c07cd0d82a16072fca6828e08a24a4d7de35aa0c7e51d25b4036c SHA512 da8e62490641e700678ff2824c297219626c6f74d09cd24d4c19761a0cc927a8c2e483a6ff5a1d92a5ccae2f5ab5b413b043131ed252e1b7a37b34fdfc028f2a
 MISC metadata.xml 1313 BLAKE2B ccb64de086998cdc0e8e71a44d0e84107ac7effae08b8628aa872b9ce85a11f465f2501bf4ef1bb13a1e10e92a6caa281c885bfb46673c16d4ab1117871908b2 SHA512 0882de8a7c5bdc4e9289bc03c582d8a8a627090dfaa9658d9ab174ceae000faad92044466ca7517b3214ddd475509131c432f5008778de41a8bec5b7250c737b
diff --git a/media-sound/xmms2/files/xmms2-0.9.4-c23.patch b/media-sound/xmms2/files/xmms2-0.9.4-c23.patch
deleted file mode 100644
index 1f74cb4c4a0b..000000000000
--- a/media-sound/xmms2/files/xmms2-0.9.4-c23.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/943862
-https://github.com/xmms2/xmms2-devel/commit/b6a6e8c20b
-https://github.com/xmms2/xmms2-devel/commit/fdf542b408
-https://github.com/xmms2/xmms2-devel/commit/5bd52ac2e5
---- a/src/clients/lib/xmmsclient/service/client.c
-+++ b/src/clients/lib/xmmsclient/service/client.c
-@@ -348,6 +348,6 @@
- 	xmmsc_sc_interface_entity_t *ifent;
- 
--	x_api_error_if (!name, "with NULL name.", false);
--	x_api_error_if (!validate_entity_name (name), "with invalid name", false);
-+	x_api_error_if (!name, "with NULL name.", NULL);
-+	x_api_error_if (!validate_entity_name (name), "with invalid name", NULL);
- 
- 	x_return_null_if_fail (parent);
---- a/src/clients/lib/xmmsclient/visualization/unixshm.c
-+++ b/src/clients/lib/xmmsclient/visualization/unixshm.c
-@@ -29,5 +29,5 @@
- 	if (t->shmid == -1) {
- 		c->error = strdup ("Couldn't create the shared memory!");
--		return false;
-+		return NULL;
- 	}
- 	/* attach early, so that the server doesn't think we aren't there */
---- a/src/clients/lib/xmmsclient/xmmsclient.c
-+++ b/src/clients/lib/xmmsclient/xmmsclient.c
-@@ -223,5 +223,5 @@
- xmmsc_get_last_error (xmmsc_connection_t *c)
- {
--	x_api_error_if (!c, "with a NULL connection", false);
-+	x_api_error_if (!c, "with a NULL connection", NULL);
- 	return c->error;
- }
diff --git a/media-sound/xmms2/xmms2-0.9.4.ebuild b/media-sound/xmms2/xmms2-0.9.5.ebuild
index a4011e18d871..870046b6842d 100644
--- a/media-sound/xmms2/xmms2-0.9.4.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.5.ebuild
@@ -133,7 +133,6 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
 	"${FILESDIR}"/${PN}-0.9.1-faad.patch
-	"${FILESDIR}"/${P}-c23.patch
 )
 
 src_prepare() {