gentoo resync : 13.06.2020

5 files changed, 4 insertions, 594 deletions

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 42273913fb9d..ef27082b4e65 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.21.20.tar.xz 676396 BLAKE2B e87d844ac0b20f10df7d2306d1c76f76ead84f5e61acb51f60d62847b1fb4f2ada66b20e0a36d87eaf70289027139e4beb80ea8ef7637b1cdb656c9635adb720 SHA512 9dd49190ba4c85014d24e88cdb02a4649e8fb687a49fc9ea019f23725eda483980008e9abebf0ad3960bd310b693c56999699d7c7ddee3ca18e9b2aa6d5a2176
-DIST mpd-0.21.21.tar.xz 676668 BLAKE2B 83964784db4a7372344853ebf2e9c966e23ac293c06304a8aa6f927ec8ea38d2749d88670f1c5e380953bb8b777b4b0f2c5e8a98d7eb3cf1bae50b5e11549150 SHA512 1780a24f341dec1cbc3d9170cc2fc8249081cac8f677ff17df15fc959787cf43d30696eefba9b8a44824da14eee3d58e2ee78b34db1335c0a182b4c2a89e6b3a
 DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04
-DIST mpd-0.21.23.tar.xz 680060 BLAKE2B 5c7b4a69ff5960b171d715560aa7a6b0712a7fd3758e1561e5aea957c5d13164d92bee0ed262b70ea7e91d73c16412840078603c95d50959cc06d9aa4a981022 SHA512 155f606cd6ddce3e74d745a0f1479776d9f73b4cd250604072a863e28ea72d1ff1a7eafeae44cada7b16042251065634376eaa1a211b503e2f874c72dbcdecf0
-EBUILD mpd-0.21.20.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20
-EBUILD mpd-0.21.21.ebuild 8001 BLAKE2B 81c39c4402fc11fa7b967431d3c9b6852fbb2e89326da2b266bc0b1213d0d7dfcdca961b82faba100f35ea6bd5556b9fed132a75aaacd3aebd0e55847607c396 SHA512 431ff3b81d538d8215f541947f6c78903849c047c869ada9596f25dde83004097ec9146cabc909f3d154ae9b3239ad39b304033bcbf10d4da162f56a94bed8b9
-EBUILD mpd-0.21.22.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
-EBUILD mpd-0.21.23.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
+DIST mpd-0.21.24.tar.xz 681576 BLAKE2B 4fc46841077a4fd20c9e0f21bc3de09be0bc7d6b4964db33c51f8d79672c2911ab747d08e27d3f9ab65586594f8fd560d044048a826fcae5909e34067bbff592 SHA512 dd0f97cdb405a0995ceafb965d2e872c54b27b384a721efa8d13ae7e28544b22da9e94433bc544f475d8da52d06c020842b11104cbfbc41406a10599db2d005c
+EBUILD mpd-0.21.22.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20
+EBUILD mpd-0.21.24.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.21.20.ebuild b/media-sound/mpd/mpd-0.21.20.ebuild
deleted file mode 100644
index 2506310f4d80..000000000000
--- a/media-sound/mpd/mpd-0.21.20.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2020 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="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+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 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 recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack 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
-	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 )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	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 )
-	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-1.58:=
-	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)
-		-Ddebug=$(usex debug true false)
-		-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)
-	)
-
-	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=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-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
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.21.ebuild b/media-sound/mpd/mpd-0.21.21.ebuild
deleted file mode 100644
index 3be6a9778270..000000000000
--- a/media-sound/mpd/mpd-0.21.21.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2020 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="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+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 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 recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack 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
-	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 )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg?	( media-video/ffmpeg:0= )
-	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 )
-	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-1.58:=
-	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)
-		-Ddebug=$(usex debug true false)
-		-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)
-	)
-
-	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=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-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
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild
index e1d6b01c903b..2506310f4d80 100644
--- a/media-sound/mpd/mpd-0.21.22.ebuild
+++ b/media-sound/mpd/mpd-0.21.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.23.ebuild b/media-sound/mpd/mpd-0.21.24.ebuild
index e1d6b01c903b..e1d6b01c903b 100644
--- a/media-sound/mpd/mpd-0.21.23.ebuild
+++ b/media-sound/mpd/mpd-0.21.24.ebuild