From 48f3e81fd35a18cd49f8b8d6a041f33ad88f9c89 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 29 Feb 2024 05:41:15 +0000
Subject: gentoo auto-resync : 29:02:2024 - 05:41:15

---
 media-sound/Manifest.gz                     | Bin 57728 -> 57719 bytes
 media-sound/ardour/Manifest                 |   4 +-
 media-sound/ardour/ardour-8.4.ebuild        |   5 +
 media-sound/ardour/ardour-9999.ebuild       |   5 +
 media-sound/gnump3d/Manifest                |   4 +-
 media-sound/gnump3d/files/gnump3d.init.d-r1 |   2 +-
 media-sound/gnump3d/gnump3d-3.0-r5.ebuild   |  76 -------
 media-sound/gnump3d/gnump3d-3.0-r6.ebuild   |  76 +++++++
 media-sound/mpd/Manifest                    |  10 +-
 media-sound/mpd/files/mpd-0.21.4.init       |   2 +-
 media-sound/mpd/files/mpd-0.23.15.init      |   2 +-
 media-sound/mpd/mpd-0.23.12-r2.ebuild       | 295 ----------------------------
 media-sound/mpd/mpd-0.23.12-r3.ebuild       | 295 ++++++++++++++++++++++++++++
 media-sound/mpd/mpd-0.23.13-r1.ebuild       | 294 +++++++++++++++++++++++++++
 media-sound/mpd/mpd-0.23.13.ebuild          | 294 ---------------------------
 media-sound/mpd/mpd-0.23.15-r1.ebuild       | 284 ++++++++++++++++++++++++++
 media-sound/mpd/mpd-0.23.15.ebuild          | 284 --------------------------
 17 files changed, 971 insertions(+), 961 deletions(-)
 delete mode 100644 media-sound/gnump3d/gnump3d-3.0-r5.ebuild
 create mode 100644 media-sound/gnump3d/gnump3d-3.0-r6.ebuild
 delete mode 100644 media-sound/mpd/mpd-0.23.12-r2.ebuild
 create mode 100644 media-sound/mpd/mpd-0.23.12-r3.ebuild
 create mode 100644 media-sound/mpd/mpd-0.23.13-r1.ebuild
 delete mode 100644 media-sound/mpd/mpd-0.23.13.ebuild
 create mode 100644 media-sound/mpd/mpd-0.23.15-r1.ebuild
 delete mode 100644 media-sound/mpd/mpd-0.23.15.ebuild

(limited to 'media-sound')

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 97711867051b..cab0e74b9ca7 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 23785e59cc71..6664b1c4913f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,6 +2,6 @@ AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d44
 DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1
 DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719
 EBUILD ardour-8.2.ebuild 5095 BLAKE2B b3c2511ef4ab82e8308e809ade42a18337846feea96a357afb8f33d7e882e6e9a86f07b5055fab4be5b90cdefbdafbd5d3cf82c11f85070d429f72c7bfce1cfc SHA512 382a48d88c92defcc3ccd1e4db73922597e9089d8097ff76604d2be2dbef134b36cd90a1e53571ef10dda81f5d6b30526544df1c18be3890a4addd621a89e49d
-EBUILD ardour-8.4.ebuild 5096 BLAKE2B 66fe45f3b1596ff658d0c524819b8f9d05fdf034ba480b302e72af1dab386c7c4e1a19b547d5c7200f5d05645423cf5c7b47f5760de575a37366d2048643ad1e SHA512 63913a84412cf0d986cd5f2d74ab4a5fe4a7471a25c9fcbf19ef32984fceda4db51403f8b59f195b0ad666904d159c82adddf0e405f225442e653f33267b6210
-EBUILD ardour-9999.ebuild 5096 BLAKE2B 66fe45f3b1596ff658d0c524819b8f9d05fdf034ba480b302e72af1dab386c7c4e1a19b547d5c7200f5d05645423cf5c7b47f5760de575a37366d2048643ad1e SHA512 63913a84412cf0d986cd5f2d74ab4a5fe4a7471a25c9fcbf19ef32984fceda4db51403f8b59f195b0ad666904d159c82adddf0e405f225442e653f33267b6210
+EBUILD ardour-8.4.ebuild 5205 BLAKE2B 190e7e14668d84494daaf11352a9c57b45c0e5c31ec32ba378bfa07fd251417a9465afce95aa1a19e637cf9914e7c2bcb92678816090bd3eae40602918f80323 SHA512 6fbd533981465023be86c6c6b5668638c8f5a058c2c1f603b6353f969c2728cddac4ca1a71f011c5f1d1a060fbe5c423e41efffc6493292ac285dae708031f42
+EBUILD ardour-9999.ebuild 5205 BLAKE2B 190e7e14668d84494daaf11352a9c57b45c0e5c31ec32ba378bfa07fd251417a9465afce95aa1a19e637cf9914e7c2bcb92678816090bd3eae40602918f80323 SHA512 6fbd533981465023be86c6c6b5668638c8f5a058c2c1f603b6353f969c2728cddac4ca1a71f011c5f1d1a060fbe5c423e41efffc6493292ac285dae708031f42
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild
index 4f99e58488e4..cee5f390d988 100644
--- a/media-sound/ardour/ardour-8.4.ebuild
+++ b/media-sound/ardour/ardour-8.4.ebuild
@@ -130,6 +130,11 @@ src_configure() {
 	# avoid bug https://bugs.gentoo.org/800067
 	local -x AS="$(tc-getCC) -c"
 
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4f99e58488e4..cee5f390d988 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -130,6 +130,11 @@ src_configure() {
 	# avoid bug https://bugs.gentoo.org/800067
 	local -x AS="$(tc-getCC) -c"
 
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 8b0ca6975905..d898c8396641 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,5 +1,5 @@
 AUX gnump3d.conf.d 159 BLAKE2B d03de16b977c8c892be3dcd6ec7b45414dac9694a777fde5775f30ad94552349263563316c7e48517c60947e5751ef1f7d9eff4648c7a0cc720b845df32ee8cf SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33
-AUX gnump3d.init.d-r1 826 BLAKE2B 37e9ea5403584881c2a4d87460fa058464eac1a1342af0decec37149f682b4946bb9cf34dc8eff21e6cd83c03aa2a334a8fbe2d9f7c9afd77194897b914dec20 SHA512 c54609e031615cf84328e52ed44d2744391abc580c19df512a62ff8e9091f52eea3741748559fe22f995cedc7d47bb12ea5bd0f5851bf4706327a8fd24d17309
+AUX gnump3d.init.d-r1 817 BLAKE2B 1cfbd324a87c1100e6ca3b0215807a1fcc92084c7738b3534733e58d8c5fa936271633b33027c3af5dcfd58f78631d836d6f5842c3a1b54b970dc4aedc89cdf0 SHA512 a736a98365ba52456cbaea1e370375f4c2542c14e51b6dad8acc1b2e6f6e839868172a9f823a89ca972d400e1aa970d780d7300085d7f4644441e526d32230d7
 DIST gnump3d-3.0.tar.bz2 633215 BLAKE2B aec3e2e95ebcbf2b9465f8f7e5cf579fe64e9e48d3b1757f78d3102f3a02f92970cbccc5986741013505e1b2f0e54e0d7a7c3871837c6169898e763f23e7fcca SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b
-EBUILD gnump3d-3.0-r5.ebuild 1911 BLAKE2B cbbf280b74cbf875ee23f35db27696c774f0962f88000fd314d785e4ebbcb36313ce070ef6cd1320e37643874d26c4794ca27b0d45ad63cc2c350574d7dda7f2 SHA512 bb9b6571cfce9f3d34225c21c4b36144a09fb363f22b03b7098600edac37bd63e47826f50039366a54e195cba748d6b50cfb3b08873b6e437c000e4b32901bbc
+EBUILD gnump3d-3.0-r6.ebuild 1911 BLAKE2B 013799fb31d4e585f8285f5ba26156df15915d8f14f53f425e928cf52f6d56447cc1bd4f238ca0b5404b5b483778db73d3449c87811376d1a788223094083933 SHA512 a448df42d3a85a55f67de1328818f01258e98250d0b4bb64bbabcdb57886c82575776db963859654ea5a95b605b22866605380333194d8726171cbfe14c2f3f6
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/gnump3d/files/gnump3d.init.d-r1 b/media-sound/gnump3d/files/gnump3d.init.d-r1
index 2ead467d7882..6a644d6c5346 100644
--- a/media-sound/gnump3d/files/gnump3d.init.d-r1
+++ b/media-sound/gnump3d/files/gnump3d.init.d-r1
@@ -6,7 +6,7 @@ extra_commands="index"
 
 depend() {
 	need net
-	after netmount nfsmount
+	after netmount
 }
 
 start() {
diff --git a/media-sound/gnump3d/gnump3d-3.0-r5.ebuild b/media-sound/gnump3d/gnump3d-3.0-r5.ebuild
deleted file mode 100644
index eb01124fbbc2..000000000000
--- a/media-sound/gnump3d/gnump3d-3.0-r5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit perl-module
-
-DESCRIPTION="Streaming server for MP3, OGG vorbis and other streamable files"
-HOMEPAGE="https://www.gnu.org/software/gnump3d/"
-SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="sox"
-
-DEPEND="
-	acct-group/gnump3d
-	acct-user/gnump3d
-"
-
-RDEPEND="
-	${DEPEND}
-	sox? ( media-sound/sox )
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	LIBDIR=/usr/$(get_libdir)
-}
-
-src_compile() { :; }
-
-src_install() {
-	perl_set_version
-
-	insinto "${VENDOR_LIB}"/gnump3d
-	doins lib/gnump3d/*.pm
-	insinto "${VENDOR_LIB}"/gnump3d/plugins
-	doins lib/gnump3d/plugins/*.pm
-	insinto "${VENDOR_LIB}"/gnump3d/lang
-	doins lib/gnump3d/lang/*.pm
-
-	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
-	dosym gnump3d2 /usr/bin/gnump3d
-	doman man/*.1
-
-	insinto /usr/share/gnump3d
-	doins -r templates/*
-
-	insinto /etc/gnump3d
-	doins etc/gnump3d.conf etc/mime.types etc/file.types
-	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
-	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
-
-	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
-
-	newinitd "${FILESDIR}"/${PN}.init.d-r1 gnump3d
-	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
-
-	keepdir /var/log/gnump3d
-	fowners gnump3d:gnump3d /var/log/gnump3d
-}
-
-pkg_postinst() {
-	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
-	elog "/etc/init.d/gnump3d start"
-	elog ""
-	elog "At the very least, you will need to change the root directory"
-	elog "where music is found.  By default, gnump3d will also listen"
-	elog "to any address on port 8888"
-	elog ""
-	elog "You can optionally use sox to downmix the quality of streamed"
-	elog "music in realtime for slow connections."
-}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r6.ebuild b/media-sound/gnump3d/gnump3d-3.0-r6.ebuild
new file mode 100644
index 000000000000..4b8beef479f8
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="https://www.gnu.org/software/gnump3d/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
+IUSE="sox"
+
+DEPEND="
+	acct-group/gnump3d
+	acct-user/gnump3d
+"
+
+RDEPEND="
+	${DEPEND}
+	sox? ( media-sound/sox )
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	LIBDIR=/usr/$(get_libdir)
+}
+
+src_compile() { :; }
+
+src_install() {
+	perl_set_version
+
+	insinto "${VENDOR_LIB}"/gnump3d
+	doins lib/gnump3d/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/plugins
+	doins lib/gnump3d/plugins/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/lang
+	doins lib/gnump3d/lang/*.pm
+
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+
+	insinto /usr/share/gnump3d
+	doins -r templates/*
+
+	insinto /etc/gnump3d
+	doins etc/gnump3d.conf etc/mime.types etc/file.types
+	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+
+	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
+
+	newinitd "${FILESDIR}"/${PN}.init.d-r1 gnump3d
+	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
+
+	keepdir /var/log/gnump3d
+	fowners gnump3d:gnump3d /var/log/gnump3d
+}
+
+pkg_postinst() {
+	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
+	elog "/etc/init.d/gnump3d start"
+	elog ""
+	elog "At the very least, you will need to change the root directory"
+	elog "where music is found.  By default, gnump3d will also listen"
+	elog "to any address on port 8888"
+	elog ""
+	elog "You can optionally use sox to downmix the quality of streamed"
+	elog "music in realtime for slow connections."
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 74af8a77c728..6f5137e72328 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,14 +1,14 @@
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
-AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
+AUX mpd-0.21.4.init 758 BLAKE2B 9d0c7f463e0b42481648c0bf559a05066685bd937068bdcbf1571b62c0113eb17b89f477df5d53b1e7d0f0d87e6ff6f02678cbdc340785b1339267fe2db026f9 SHA512 b13a41cc70f512723e57294c13651daa5a13dcf376d6355e7704795633de347a24961a61f43f28e0cf32c1d2ce4346236323153594086f0b57ec0ccee9cc0179
 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
 AUX mpd-0.23.13-ffmpeg-6.1.patch 350 BLAKE2B f973daa18bda1ac806d97352a7ad8627847464436e1778bd0a20e28c70a77969a5c96d78d06db3060f065912fdeafe0eba3a6c9df3d1d2fcc7b6f562d886cc72 SHA512 e0919bbd7da694a57da37e67e5bb8e735d5d9e9e8cd67d5af8e938dd26033ab998a0281087889b7cfc1b5a173105b143179969ef90cd7deb9f4ffa987459e83b
-AUX mpd-0.23.15.init 1409 BLAKE2B 205e43622b1ab25e38ca2b13faa901bfc6ecbc55152de412f4db622b5bd3447f10cbb36e17597f16a5739da3b40f2c8e7db71a6d1e8fda612bd525a6fd99457e SHA512 fa10080e327295fe59f0c1628298a1efdca92bdeca3830677d5a575d8d1b56d6218b268ea25411bc82c8946183b42d8efc9ee364a25b092738d9a000b61dd7c0
+AUX mpd-0.23.15.init 1400 BLAKE2B 6b9defd7f8a8cbfeaf6196d1ad4e928a9c0edf9b6d109a375a711aa81ab06128be8eace7bd278af8077cc841bb6ece5240a315902f55d42bb874ddddb0f73f09 SHA512 a19df8d17bc2b53200318bb2b1b4fb2a8e2f3a2968bf0769694b55e0cc5dc2db52bd261f933de2180c19f9c6125f01e62f67d4e09d5e3796abf0bdb71034fcce
 AUX mpd-0.23.15.logrotate 124 BLAKE2B 4c2200d4a2fba4735037757f74a27cfbc71dcd9ec1d18e3f3d94efbeccbe99164adc7582fc1c153e50b019280b9d51bb92d08c5498d048cd7e6c2313e762b29a SHA512 2990b6facd1f8f99e85c67e16c248cb36444d933ff47a479612b0305296bb15d8eb570bea2e43a6752a687186d53728ba272869e84942b4d36f108b35fe475ac
 DIST mpd-0.23.12.tar.xz 774708 BLAKE2B b218d9f477e92842638e3fba44c84957a3f656adaaf1ece998847db8d64883b8c997703206f74b37043888757f5f628799a3a35b25ea991f9ad00df1c4ad5e71 SHA512 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
 DIST mpd-0.23.13.tar.xz 776668 BLAKE2B 02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26 SHA512 1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d
 DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
-EBUILD mpd-0.23.12-r2.ebuild 7987 BLAKE2B 9c9d232508166834d1807c5312f897a435b5a5392077a9aa349b98323b3e0cc19fe6334cad254b1d18dc578c138510f6db672ac714324424db80baa4fd7a0e90 SHA512 01570cd6f965889fc9c8b872cab7a86013c51efb5d84009720bc09c564db56f37b540e9e7148f5a461a7a339ecd27e131ac74c3b3868e09f6da0ce50c2e7508f
-EBUILD mpd-0.23.13.ebuild 7904 BLAKE2B c7c2f67fe6339b83a70bf765d494f875450aea608dade28716d7d86f1be56e32181a09facfe904fff807b08897bce682904503d31324442f8466572248aa8255 SHA512 4123c4b9b9cf645b8293c392565508bca5d0467f39b6b9eade7c164fbcbb8a39b92ab6be789e6c8ee4528558ac44bb61304765f49ccc9786f94d152f44d28c65
-EBUILD mpd-0.23.15.ebuild 7437 BLAKE2B 0a8b883df2dda0651b34685b87a1c6b05f04ea248b9955a3582a3431a8b9dda4f894526698d03495e5e2384892cd72e2f69fa28e9c213f96ca36c75b057de13f SHA512 43815ea1752db29b4df39cd824c711e68940c3589c2401e5f3c2fee4754f0272ca9deaa2b107b40ba77d2c92b6b179f09badc93432df6a42fd74f698b733d9cf
+EBUILD mpd-0.23.12-r3.ebuild 7987 BLAKE2B e4e3c47e10f1cbb7642c307ad9e0435e5ccab9d879eb71a899cbebab8d4d059cd557f439fdcf5dcb8d48da5db9cf7e5536e0ee5d4b5d23ce8a72fdd41e9d6c51 SHA512 561078f5a6c9246353bda05562d93b63da90cce5241b582592efbbe6fd94c33c77d6308a3f7cbb5e0b5919c0f2b4d4dc00c47ebd54cdde703b39c96f076f6e2e
+EBUILD mpd-0.23.13-r1.ebuild 7904 BLAKE2B c7c2f67fe6339b83a70bf765d494f875450aea608dade28716d7d86f1be56e32181a09facfe904fff807b08897bce682904503d31324442f8466572248aa8255 SHA512 4123c4b9b9cf645b8293c392565508bca5d0467f39b6b9eade7c164fbcbb8a39b92ab6be789e6c8ee4528558ac44bb61304765f49ccc9786f94d152f44d28c65
+EBUILD mpd-0.23.15-r1.ebuild 7437 BLAKE2B 0a8b883df2dda0651b34685b87a1c6b05f04ea248b9955a3582a3431a8b9dda4f894526698d03495e5e2384892cd72e2f69fa28e9c213f96ca36c75b057de13f SHA512 43815ea1752db29b4df39cd824c711e68940c3589c2401e5f3c2fee4754f0272ca9deaa2b107b40ba77d2c92b6b179f09badc93432df6a42fd74f698b733d9cf
 MISC metadata.xml 2733 BLAKE2B 7464a3dba24567363af1a92afed4a5a43e8b598adf10be65542d6844b474a6bbbc7a0fa4e33291d1cf84e35d29b317e43f1e52271d96ec74ce81577eb4bd7f8b SHA512 7f7d4e382575df62cabef13b5a8f9eff35bcecd55f04baf125fa7341f25403e6b3386635b5da3a1dacb5a351ff1b29362e5a83a86e670e54bfe0d5a6ef464f76
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
index 72fede85765a..31336a5b1254 100644
--- a/media-sound/mpd/files/mpd-0.21.4.init
+++ b/media-sound/mpd/files/mpd-0.21.4.init
@@ -6,7 +6,7 @@
 
 depend() {
 	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
+	use net netmount alsasound esound pulseaudio
 	config ${CFGFILE}
 }
 
diff --git a/media-sound/mpd/files/mpd-0.23.15.init b/media-sound/mpd/files/mpd-0.23.15.init
index 2cd176302e1f..8a0a18af9b21 100644
--- a/media-sound/mpd/files/mpd-0.23.15.init
+++ b/media-sound/mpd/files/mpd-0.23.15.init
@@ -6,7 +6,7 @@
 
 depend() {
 	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
+	use net netmount alsasound esound pulseaudio
 	config ${CFGFILE}
 }
 
diff --git a/media-sound/mpd/mpd-0.23.12-r2.ebuild b/media-sound/mpd/mpd-0.23.12-r2.ebuild
deleted file mode 100644
index e7f354cf3140..000000000000
--- a/media-sound/mpd/mpd-0.23.12-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2023 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"
-
-PATCHES=(
-	# Backported fixes for dev-libs/libfmt-10. Remove after 0.23.12.
-	"${FILESDIR}/${P}-stringview.patch"
-	"${FILESDIR}/${P}-libfmt10-906074.patch"
-)
-
-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 ${EROOT}/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)
-		-Dipv6=enabled
-		$(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}
-
-	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
-
-	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/mpd/mpd-0.23.12-r3.ebuild b/media-sound/mpd/mpd-0.23.12-r3.ebuild
new file mode 100644
index 000000000000..abec625c27fa
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.12-r3.ebuild
@@ -0,0 +1,295 @@
+# 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"
+
+PATCHES=(
+	# Backported fixes for dev-libs/libfmt-10. Remove after 0.23.12.
+	"${FILESDIR}/${P}-stringview.patch"
+	"${FILESDIR}/${P}-libfmt10-906074.patch"
+)
+
+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 ${EROOT}/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)
+		-Dipv6=enabled
+		$(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}
+
+	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+	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/mpd/mpd-0.23.13-r1.ebuild b/media-sound/mpd/mpd-0.23.13-r1.ebuild
new file mode 100644
index 000000000000..3dcf11ed6998
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.13-r1.ebuild
@@ -0,0 +1,294 @@
+# 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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23.13-ffmpeg-6.1.patch
+)
+
+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 ${EROOT}/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)
+		-Dipv6=enabled
+		$(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
+		-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)
+	)
+
+	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}
+
+	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+	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/mpd/mpd-0.23.13.ebuild b/media-sound/mpd/mpd-0.23.13.ebuild
deleted file mode 100644
index 3dcf11ed6998..000000000000
--- a/media-sound/mpd/mpd-0.23.13.ebuild
+++ /dev/null
@@ -1,294 +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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23.13-ffmpeg-6.1.patch
-)
-
-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 ${EROOT}/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)
-		-Dipv6=enabled
-		$(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
-		-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)
-	)
-
-	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}
-
-	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
-
-	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/mpd/mpd-0.23.15-r1.ebuild b/media-sound/mpd/mpd-0.23.15-r1.ebuild
new file mode 100644
index 000000000000..70c1356216a0
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.15-r1.ebuild
@@ -0,0 +1,284 @@
+# 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.ebuild b/media-sound/mpd/mpd-0.23.15.ebuild
deleted file mode 100644
index 70c1356216a0..000000000000
--- a/media-sound/mpd/mpd-0.23.15.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
-}
-- 
cgit v1.2.3