4 files changed, 7 insertions, 289 deletions
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? (