gentoo auto-resync : 28:09:2022 - 03:11:19

12 files changed, 7 insertions, 1499 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 97219fc2113e..0c00b827fa13 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index d33e65a86788..c3ccc21c8ea7 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,4 +1,4 @@
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
 DIST cava-0.8.2.tar.gz 103930 BLAKE2B feeb8313bd9b74029d101acaecfeed02e449cc29dceb2c119d7deef65befae418526274e6bad14dc0df7eaed90850ecae4a4064a414d94950ab3c24943281017 SHA512 8ab146987324fad97dea5e9fd893de6c12b00cbb074d835c1e334d75c0d32cb4cbbc13cf72f7899191ebd5d346505b2639dcad5312e5ab00975b29a006ba41b3
-EBUILD cava-0.8.2.ebuild 1521 BLAKE2B 988bec79e23ed06e159db642f9f288b5b93bca580458ed26cf11f50f9ac4c14fc665895bde48deb0d1e1551e01d0e11c33d206f5c70c5fd650abdcbbaf0a1ce8 SHA512 84235386f14e088f668200aa59aec2172c9fe57fd6c505433f63eac3089268b8514a2d1c2afdccfe9142fc63703595752a632fa23d12a2eddebbeb2423e7faf1
+EBUILD cava-0.8.2-r1.ebuild 1519 BLAKE2B 9397e6cf0e4a52e09ad740c8c3865c3740ce6222dcaccbf798e525ecfb8aeff62c3b8280949901a6b15961d1bda03bf1110857c43795beb55a47da9db11aee64 SHA512 767224bf295a4df9e40ba3c0f88651693b73560a1ef0cfc16cf85264cb16ed2dc2fae3d0039944f3ab2f6b10eb88663bb08aed8276a9173045333b70223b8212
 MISC metadata.xml 427 BLAKE2B 94797ecc93cc139cde50a9c04e5d413d9356083740a2a3130894f7bd2fe30e8caf007712566a53cf2a28ad81be79d46aba6c57355491b75f9f3501dd0523ee10 SHA512 21289938ed3ecdfc6d15e3df7577c0a560b403b27d6b6b944cf007af9abaab6a96045d2cc35cb44a869e321a678bc85e9f02d285729ebaffb09797d8726001c6
diff --git a/media-sound/cava/cava-0.8.2.ebuild b/media-sound/cava/cava-0.8.2-r1.ebuild
index 7afa4ce04e09..e24cc76b4c0b 100644
--- a/media-sound/cava/cava-0.8.2.ebuild
+++ b/media-sound/cava/cava-0.8.2-r1.ebuild
@@ -11,16 +11,16 @@ SRC_URI="https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa +ncurses portaudio pulseaudio sdl sndio"
 
 RDEPEND="
 	dev-libs/iniparser:4
-	sci-libs/fftw:=
+	sci-libs/fftw:3.0=
 	alsa? ( media-libs/alsa-lib )
 	ncurses? ( sys-libs/ncurses:= )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sdl? ( media-libs/libsdl2[opengl,video] )
 	sndio? ( media-sound/sndio:= )"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a8ba33e8974a..7a5610e4c333 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,17 +2,7 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
-DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
-DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
-DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb SHA512 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
-DIST mpd-0.23.7.tar.xz 771992 BLAKE2B 2c75196c37eb8d075cca2881bb7ed10e434a071d3c64bb7cdb3bb96dfea74c30de2dce5bfdbc51da945df325d9f278cdf8dd03b7ba07c0ad51cea50971f4a143 SHA512 2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6
-DIST mpd-0.23.8.tar.xz 773280 BLAKE2B fd2dd32bc935cb78d9204bccea6ed52f5131ae4645efca91323db930373a5fa14115a767daa11d670aaf46e218c52578d155b9a463ed5aae007e1f55d0208d3a SHA512 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 DIST mpd-0.23.9.tar.xz 774156 BLAKE2B 2c045c86ecbe2267d032ebfd4a18835e9b1323860eb348b047d0900a284f5457ca4f18fdd50ea2f678e07a63817b4e4e3245cf0d3948e1f14cf3539d47b314d2 SHA512 67db093e35693f79267f955463ecaa284773b5e47a38f1548a0d16c9ba82aecc3434fd805e224b78782c5978c07e16d26f7632823e536f5304f557985f028d6e
 EBUILD mpd-0.22.11-r1.ebuild 8426 BLAKE2B 74a9c64d3dcc4a4b97e338e8ba21415e56650e8bf10ba0ee23f555d34483af17094b96fbf6e68c770d6c46ba58962f4c063077f97d51f0ddb1840463d63f1bf0 SHA512 cc680e2be4a3819c0ce980f1335805cd8c8f67b25ec38d11d6e29feb323e1f1305243506c65da839e954ebed61dca3d52b77a17181c37e887666db125a664d2d
-EBUILD mpd-0.22.3-r2.ebuild 8120 BLAKE2B 66c717ae883d37feb4274eb5a118eefea0f5a23fa933001cc0638dd21a9fdbbb60409041c92bd6bbb82a095b34dfebf479d637162655c535c9e58aa75bb5a2be SHA512 07c73d6b9835c8d760d81b4ecd661be81891c8da05df8855aea0eb497e0a7f732d8070ff987af945d726a896887bc5ea65f41bcb377b6ccdb24b7b0d22607e2b
-EBUILD mpd-0.23.5-r1.ebuild 8882 BLAKE2B 6019e393f1df9245e49be669f61aa955bac3f7484742f026014b8ac0d1acdd5406126126374b88f5f4aa8c10f05a7485dd97469078c3f37b36d05e8aa0f0a4bd SHA512 de7432ddb3c0dc7cebd214b149e6afeed620d9fc54494ba277b25c660addafd8146a12d0af490a7eaa8c4d27a68102c2aff91cc7b3c82d40dceb7e021f0f6e99
-EBUILD mpd-0.23.6-r2.ebuild 7839 BLAKE2B 2f5dfb5e70ac12a0ea1893f6c46e56946c74611ed66ebc029ad47b802b450678ed8ae02f4a7688b6a492c192d0d7cc1b8ba5d9373c4957b1fa24bc64c410bafc SHA512 f4c9a33360992cb40bf81b94eaae0fcf7ddf097b12621061af6f38d83e651ba6c81cc817373b34b5a3afc02c7538a3cbe1c4b7044edea3908fb106e68fadc9a4
-EBUILD mpd-0.23.7-r1.ebuild 7875 BLAKE2B e4923588db04e6b5d77f5e9936b08ce542c451918d9bd826a7c91cf0c5c4026dcd01acf10c93961d6a83d05003d3b3c5e7a45a856fb487033a071111f3d30eea SHA512 55c668954d993ddc08d38b21d50c5b00deb24bd85ff0ab5eeb4fd3810eebf10d14826b7ed48ebcafdefbd633fb647cc88493677de2a3b0facd6355d9b5ebadf4
-EBUILD mpd-0.23.8-r1.ebuild 7875 BLAKE2B e4923588db04e6b5d77f5e9936b08ce542c451918d9bd826a7c91cf0c5c4026dcd01acf10c93961d6a83d05003d3b3c5e7a45a856fb487033a071111f3d30eea SHA512 55c668954d993ddc08d38b21d50c5b00deb24bd85ff0ab5eeb4fd3810eebf10d14826b7ed48ebcafdefbd633fb647cc88493677de2a3b0facd6355d9b5ebadf4
 EBUILD mpd-0.23.9-r1.ebuild 7820 BLAKE2B 8c9e72d21be779f4211d221c9b7ea544ceaf42d12691720280c65cb68c7cd046aefb025354645ed542eff692eca9572d63aa9ed2747c97c7258cf1758e2d5eba SHA512 857256bec39dc1b0e1fad59bf24ba292c6a1786f5ab50c5833b964d5d8af80f3defa0c25eb529b43c3a4ac32d8eb8cca489c5f949080aeaf14e2cbd3d42cdc1d
-MISC metadata.xml 2735 BLAKE2B 22624d573d9f0040d98cc8ad84ab9dbe710eab9f65454ccd7b111bd63ae4c9ce91c794869c6f566ca7182494622644c6c5933422e610a8d4ef9c590bb51fe295 SHA512 96996b5900b5366aa63b131240156dbc7393f54f7710b0474e2b0f0bc71e721b60278bd0b258d111d267004d9e1e6ed557081668afb448c291fc62829c2abd1b
+MISC metadata.xml 2676 BLAKE2B 8ed7eaefb3d937019a36dd816d5472caf7d4c4209eb943dfdf1caef2f24cd7b530919cdd46999aac5402c929a8f4f437129edbfa78b301e6951e0b04338b7f30 SHA512 44110bae4781092d6fbdd972e8369efe45067e7ce5c505294f677a55b3f4bafb0746b17ef552f01b0b23d5453c10b5a4710d65f4cf9578184d3388b4b873ed0e
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index c7c348e25ec7..2552455e7876 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -33,7 +33,6 @@
     <flag name="snapcast">Snapcast audio plugin</flag>
     <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
     <flag name="soundcloud">Build plugin to access soundcloud</flag>
-    <flag name="tidal">Build plugin to access tidal</flag>
     <flag name="systemd">Enable support for systemd socket activation</flag>
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
diff --git a/media-sound/mpd/mpd-0.22.3-r2.ebuild b/media-sound/mpd/mpd-0.22.3-r2.ebuild
deleted file mode 100644
index 9f19efc05592..000000000000
--- a/media-sound/mpd/mpd-0.22.3-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack opus flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	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:= )
-	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 )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	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=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.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 /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-		-Dsndio=$(usex sndio enabled disabled)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-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)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.23.5-r1.ebuild b/media-sound/mpd/mpd-0.23.5-r1.ebuild
deleted file mode 100644
index ce91c3763a59..000000000000
--- a/media-sound/mpd/mpd-0.23.5-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-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 ~riscv ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
-	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
-	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	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:= )
-	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 )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire:= )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	snapcast? ( media-sound/snapcast )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	 sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpipewire=$(usex pipewire enabled disabled)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-		-Dsnapcast=$(usex snapcast true false)
-		-Dsndio=$(usex sndio enabled disabled)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopenmpt=$(usex openmpt enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=$(usex doc enabled disabled)
-		-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)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.23.6-r2.ebuild b/media-sound/mpd/mpd-0.23.6-r2.ebuild
deleted file mode 100644
index c7e2e4826d7f..000000000000
--- a/media-sound/mpd/mpd-0.23.6-r2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
-	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
-	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	qobuz? ( curl soundcloud )
-	soundcloud? ( curl qobuz )
-	udisks? ( dbus )
-	upnp? ( curl expat )
-	webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	dev-libs/libfmt:=
-	dev-libs/libpcre2
-	media-libs/libogg
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac:= )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	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 )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire:= )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	snapcast? ( media-sound/snapcast )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd:= )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	 sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bzip2)
-		$(meson_feature cdio cdio_paranoia)
-		$(meson_feature chromaprint)
-		$(meson_use cue)
-		$(meson_feature curl)
-		$(meson_feature dbus)
-		$(meson_use eventfd)
-		$(meson_feature expat)
-		$(meson_feature icu)
-		$(meson_feature id3tag)
-		$(meson_use inotify)
-		$(meson_feature ipv6)
-		$(meson_feature cdio iso9660)
-		$(meson_feature libmpdclient)
-		$(meson_feature libsamplerate)
-		$(meson_feature mms)
-		$(meson_feature nfs)
-		$(meson_use signalfd)
-		$(meson_feature samba smbclient)
-		$(meson_feature libsoxr soxr)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test)
-		$(meson_feature udisks)
-		-Dupnp=$(usex upnp pupnp disabled)
-		$(meson_feature webdav)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		$(meson_feature zlib)
-		$(meson_feature zip zzip)
-	)
-
-	emesonargs+=(
-		$(meson_feature alsa)
-		$(meson_feature ao)
-		$(meson_use fifo)
-		$(meson_feature jack)
-		$(meson_feature openal)
-		$(meson_feature oss)
-		$(meson_use pipe)
-		$(meson_feature pipewire)
-		$(meson_feature pulseaudio pulse)
-		$(meson_use recorder)
-		$(meson_use snapcast)
-		$(meson_feature sndio)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-		emesonargs+=(
-			-Dshine=disabled
-			-Dshout=enabled
-			$(meson_feature vorbis vorbisenc)
-			-Dhttpd=true
-			$(meson_feature lame)
-			$(meson_feature twolame)
-			$(meson_use audiofile wave_encoder)
-		)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		$(meson_feature audiofile)
-		$(meson_feature faad)
-		$(meson_feature ffmpeg)
-		$(meson_feature flac)
-		$(meson_feature fluidsynth)
-		$(meson_feature gme)
-		$(meson_feature mad)
-		$(meson_feature mikmod)
-		$(meson_feature modplug)
-		$(meson_feature musepack mpcdec)
-		$(meson_feature mpg123)
-		$(meson_feature openmpt)
-		$(meson_feature opus)
-		$(meson_feature sid sidplay)
-		$(meson_feature sndfile)
-		$(meson_feature vorbis)
-		$(meson_feature wavpack)
-		$(meson_feature wildmidi)
-		$(meson_feature qobuz)
-		$(meson_feature soundcloud)
-
-		--libdir="/usr/$(get_libdir)"
-		$(meson_feature doc documentation)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
-		$(meson_feature icu iconv)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
diff --git a/media-sound/mpd/mpd-0.23.7-r1.ebuild b/media-sound/mpd/mpd-0.23.7-r1.ebuild
deleted file mode 100644
index 7986029a1636..000000000000
--- a/media-sound/mpd/mpd-0.23.7-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
-	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
-	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	qobuz? ( curl soundcloud )
-	soundcloud? ( curl qobuz )
-	udisks? ( dbus )
-	upnp? ( curl expat )
-	webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	dev-libs/libfmt:=
-	dev-libs/libpcre2
-	media-libs/libogg
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac:= )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (
-		dev-libs/icu:=
-		virtual/libiconv
-	)
-	id3tag? ( media-libs/libid3tag:= )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2.4.0 )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire:= )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	snapcast? ( media-sound/snapcast )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd:= )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	 sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bzip2)
-		$(meson_feature cdio cdio_paranoia)
-		$(meson_feature chromaprint)
-		$(meson_use cue)
-		$(meson_feature curl)
-		$(meson_feature dbus)
-		$(meson_use eventfd)
-		$(meson_feature expat)
-		$(meson_feature icu)
-		$(meson_feature id3tag)
-		$(meson_use inotify)
-		$(meson_feature ipv6)
-		$(meson_feature cdio iso9660)
-		$(meson_feature libmpdclient)
-		$(meson_feature libsamplerate)
-		$(meson_feature mms)
-		$(meson_feature nfs)
-		$(meson_use signalfd)
-		$(meson_feature samba smbclient)
-		$(meson_feature libsoxr soxr)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test)
-		$(meson_feature udisks)
-		-Dupnp=$(usex upnp pupnp disabled)
-		$(meson_feature webdav)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		$(meson_feature zlib)
-		$(meson_feature zip zzip)
-	)
-
-	emesonargs+=(
-		$(meson_feature alsa)
-		$(meson_feature ao)
-		$(meson_use fifo)
-		$(meson_feature jack)
-		$(meson_feature openal)
-		$(meson_feature oss)
-		$(meson_use pipe)
-		$(meson_feature pipewire)
-		$(meson_feature pulseaudio pulse)
-		$(meson_use recorder)
-		$(meson_use snapcast)
-		$(meson_feature sndio)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-		emesonargs+=(
-			-Dshine=disabled
-			-Dshout=enabled
-			$(meson_feature vorbis vorbisenc)
-			-Dhttpd=true
-			$(meson_feature lame)
-			$(meson_feature twolame)
-			$(meson_use audiofile wave_encoder)
-		)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		$(meson_feature audiofile)
-		$(meson_feature faad)
-		$(meson_feature ffmpeg)
-		$(meson_feature flac)
-		$(meson_feature fluidsynth)
-		$(meson_feature gme)
-		$(meson_feature mad)
-		$(meson_feature mikmod)
-		$(meson_feature modplug)
-		$(meson_feature musepack mpcdec)
-		$(meson_feature mpg123)
-		$(meson_feature openmpt)
-		$(meson_feature opus)
-		$(meson_feature sid sidplay)
-		$(meson_feature sndfile)
-		$(meson_feature vorbis)
-		$(meson_feature wavpack)
-		$(meson_feature wildmidi)
-		$(meson_feature qobuz)
-		$(meson_feature soundcloud)
-
-		--libdir="/usr/$(get_libdir)"
-		$(meson_feature doc documentation)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
-		$(meson_feature icu iconv)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
diff --git a/media-sound/mpd/mpd-0.23.8-r1.ebuild b/media-sound/mpd/mpd-0.23.8-r1.ebuild
deleted file mode 100644
index 7986029a1636..000000000000
--- a/media-sound/mpd/mpd-0.23.8-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd xdg
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
-	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
-	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	qobuz? ( curl soundcloud )
-	soundcloud? ( curl qobuz )
-	udisks? ( dbus )
-	upnp? ( curl expat )
-	webdav? ( curl expat )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	dev-libs/libfmt:=
-	dev-libs/libpcre2
-	media-libs/libogg
-	sys-libs/liburing:=
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	doc? ( dev-python/sphinx )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac:= )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (
-		dev-libs/icu:=
-		virtual/libiconv
-	)
-	id3tag? ( media-libs/libid3tag:= )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2.4.0 )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire:= )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	snapcast? ( media-sound/snapcast )
-	sndfile? ( media-libs/libsndfile )
-	sndio? ( media-sound/sndio )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd:= )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	 sed -i \
-		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-		-e 's:^#user.*$:user "mpd":' \
-		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
-		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
-		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
-		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
-		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
-		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
-		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
-		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
-		doc/mpdconf.example || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bzip2)
-		$(meson_feature cdio cdio_paranoia)
-		$(meson_feature chromaprint)
-		$(meson_use cue)
-		$(meson_feature curl)
-		$(meson_feature dbus)
-		$(meson_use eventfd)
-		$(meson_feature expat)
-		$(meson_feature icu)
-		$(meson_feature id3tag)
-		$(meson_use inotify)
-		$(meson_feature ipv6)
-		$(meson_feature cdio iso9660)
-		$(meson_feature libmpdclient)
-		$(meson_feature libsamplerate)
-		$(meson_feature mms)
-		$(meson_feature nfs)
-		$(meson_use signalfd)
-		$(meson_feature samba smbclient)
-		$(meson_feature libsoxr soxr)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test)
-		$(meson_feature udisks)
-		-Dupnp=$(usex upnp pupnp disabled)
-		$(meson_feature webdav)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		$(meson_feature zlib)
-		$(meson_feature zip zzip)
-	)
-
-	emesonargs+=(
-		$(meson_feature alsa)
-		$(meson_feature ao)
-		$(meson_use fifo)
-		$(meson_feature jack)
-		$(meson_feature openal)
-		$(meson_feature oss)
-		$(meson_use pipe)
-		$(meson_feature pipewire)
-		$(meson_feature pulseaudio pulse)
-		$(meson_use recorder)
-		$(meson_use snapcast)
-		$(meson_feature sndio)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-		emesonargs+=(
-			-Dshine=disabled
-			-Dshout=enabled
-			$(meson_feature vorbis vorbisenc)
-			-Dhttpd=true
-			$(meson_feature lame)
-			$(meson_feature twolame)
-			$(meson_use audiofile wave_encoder)
-		)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		$(meson_feature audiofile)
-		$(meson_feature faad)
-		$(meson_feature ffmpeg)
-		$(meson_feature flac)
-		$(meson_feature fluidsynth)
-		$(meson_feature gme)
-		$(meson_feature mad)
-		$(meson_feature mikmod)
-		$(meson_feature modplug)
-		$(meson_feature musepack mpcdec)
-		$(meson_feature mpg123)
-		$(meson_feature openmpt)
-		$(meson_feature opus)
-		$(meson_feature sid sidplay)
-		$(meson_feature sndfile)
-		$(meson_feature vorbis)
-		$(meson_feature wavpack)
-		$(meson_feature wildmidi)
-		$(meson_feature qobuz)
-		$(meson_feature soundcloud)
-
-		--libdir="/usr/$(get_libdir)"
-		$(meson_feature doc documentation)
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dio_uring=enabled
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-
-		$(meson_feature icu iconv)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-	rm -r "${ED}"/usr/share/doc/mpd || die
-
-	fowners mpd:audio -R /var/lib/mpd
-
-}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index fcc12b06a786..ab93e62a9489 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -2,5 +2,5 @@ AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
 AUX xmms2-0.9.1-rtvg.patch 1076 BLAKE2B cb0eee29a4245850f2455fd7b12845017ddd2453d48d903386fcc083e4429389fb50b2fd296ebac41e101e68d7f030b646e65b2e493f351c91ec81a9672f6f77 SHA512 113b90339f4afc99f54eeb6776354c471ffa0d4e60d3525150ed2020af3d95dcca89aeaa849cd216c54f0d6eaf712f157c08145901a89b4cb0460c752c526e40
 DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
-EBUILD xmms2-0.9.1-r1.ebuild 5504 BLAKE2B dfe6d59ab196aa9e710276ba163286ca015b50978b87425c3a9c2010426d1dc440a632d97a2861770880b31dfecd1a63d943a646dba2dc02786bfa45659d4cca SHA512 0fa92d613101575221ec8880e23854112978c51bc8b60c9ea831e88c5a494324cea1f475f14fcdb08b2d4f1501a5b8dbee9796c22763301b1a14040d00bb637f
+EBUILD xmms2-0.9.1-r1.ebuild 5474 BLAKE2B 50287222483a91ab096c0a61aaaa20ca9b065b3023fbc82efd160420e4be31ccd34491271cbc145693ca172a3caef4b3003afc755c8aa411f3b2e14762b9f56c SHA512 4c60cc0ed51f7931042477a0ec8bbd77664db3f826525cd285491aa690518c7d068c8f34599904910423dc7907aa2132f1b42dc96842aeef9c7c56631f54c2fc
 MISC metadata.xml 1437 BLAKE2B 7f3c3cd1d134ee5c24a9dc1990108012640b366a587832eda270bcef2bca91777f9358a067d351f9ac83c118680b60af2955a3f195a6adc20eb84dc334553fb8 SHA512 0533f6c30210a6c2f06cefd833df6fbd8ebfcc510e6bf05133210a57d7d05e45875d829555011b6827b8fc440cb0779f85d4ca17dd3e862cf0519e874e0d8c9f
diff --git a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild b/media-sound/xmms2/xmms2-0.9.1-r1.ebuild
index 12a636b5e63c..cf96eb8a448c 100644
--- a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.1-r1.ebuild
@@ -82,7 +82,7 @@ COMMON_DEPEND="
 			media-libs/opus
 			media-libs/opusfile
 		)
-		pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
+		pulseaudio? ( media-libs/libpulse )
 		samba? ( net-fs/samba )
 		sid? ( media-libs/libsidplay:2 )
 		sndfile? ( media-libs/libsndfile )