gentoo resync : 15.12.2017

7 files changed, 18 insertions, 1304 deletions

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 172cc59e6cd7..e4fae5f518cc 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,19 +4,10 @@ AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca
 AUX mpd-0.9.15-systemd.patch 3056 BLAKE2B 3198677bb60c248277dc0b1505aa7ce07663cb29379022fd3dcab2cb16252d90335d009c02e4d2973ed70225a9b4cbaadfea2816f54ab0101c07fbe905687ba6 SHA512 c9f8b909121f6f3b08ca4bf37ae744aa1468a306e8671681babac228aa5d4b528d094214e2596a862d0b685d01a448b6fd6b8170d6990e10f387f1e498c9dd3b
 AUX mpd.logrotate 199 BLAKE2B 5aa7be688734ae41f3b209e0efade9d517c0e6470dc49d46aa29a0d1a0205bde0ffff4bbb4ba53b3d29212ad50fe1fc8271344e6dd626871bec7f6d7764a52db SHA512 c55ef8f0e691ef0b358e5dc81a206328de4ccef449959fd7e6f9e95e07cbbee7446639278ebe6f4517063c9a6169e07bca0109958dc722a2caea1503693410ae
 AUX mpd2.init 727 BLAKE2B e6608d468be6fff5178558e549e28995169f171467bfd57c1821c3b479856633c2ba5c259013ec8d94bee9f9c61579dbbc9218091002825becabde74dca2e6cf SHA512 be2b52b3b69dcfb34e7753dce908c4f3c5b2d2e768c9177dbf06d72be487ccb2f2b58c292c0e19c5c6faf83bcabd1acb8fc6f1214b2de030b005b7759566892a
-DIST mpd-0.19.19.tar.xz 707356 SHA256 bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64 WHIRLPOOL 1b2c68d998a26de41bca25cbeab0c6478406c831ac4322162d2c258622224137a1a2dcd88b690ee1869c7f2652201fd534ee773a6e51f6e61bdb5926783f4d75
-DIST mpd-0.19.21.tar.xz 708512 SHA256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 SHA512 a65690012a74def273ffb4e87465d8f3f7f2ce6f6e9117e35aa0891cd638f904df0ef4c4923c39e9a0c3e1d93d09aab713979adf5c191b54fa7e8b5b81abd232 WHIRLPOOL 397bc2158591137ab8a30e3377458dcef0ea600e218723831977ea7ec9f5b14ae1221b2b7456daa9e249b3aa95c61f7a1f0742656ace42c837e28892dd3d7604
-DIST mpd-0.20.10.tar.xz 778828 SHA256 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c WHIRLPOOL f0e2ab6b76848c88f57e13b16258c9d4810e9642f54c3f8d3378fedf484b97ed62c4afad6f217235de4e282d0b2ff99ffc40eac19774b72c1a2291f4f7e54e21
-DIST mpd-0.20.4.tar.xz 770132 SHA256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 SHA512 d0c01ae6a3fd59e5ccdc24225bd9bb9e63620f1a395d317573499cc045de81f2abd803ca87eb1b2ca1d26d25167aaa6f5523e96f9512619272b857190efa0a72 WHIRLPOOL 9446b7096c6d2eb41a9421ad8e58e7a70a66e7abb381e75edabf0718c0098646e82ca16d7157e6c453836825eb03a2eca09ff7f80e95918718e42da85ae30c9e
-DIST mpd-0.20.6.tar.xz 772140 SHA256 f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 SHA512 3377e095eaf8cd3ae14e4218fd85d1bcd79d29899ad4c61f5cd2a0b714c5e8aa22aa3b8bd54477195b93ddd44b8e82f8c6428c8f36174c98cba631554224dcfe WHIRLPOOL e3509fb61bed5e766d17ed66178d049bd13b3b088046e7c4d2400d5aebc2d82936ef60297e99db6b386bd474c40caecc3c6d5fd6f703810f3438dce8febfe41f
-DIST mpd-0.20.8.tar.xz 773128 SHA256 7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 SHA512 063feafae7137ea5b61498132b4fcc2e04e23bb9d6fa849a0c6d90c40ecc0a841617dec0f53021bfc5add559b59388d20ef211e1bc88fcaca46b5ecbf1bb8960 WHIRLPOOL 2dcc30e9eebdb466486cf6aff93796b2837ede92c5a01f20643ba64af86b9583b1702ac578653d897be3a9cfee2bb5b817584804a2d5192b31920dcdd7a47d62
-DIST mpd-0.20.9.tar.xz 773404 SHA256 cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 SHA512 3b29fed4146ca09e3b5866aeea280ca3fb412d182a940da6c1418525e251385fdb18bb58ea99754ad5ba3704a3e2033ff2ef54c392117af7c0be30b78708a2e7 WHIRLPOOL 31fb2302c1165f53848145f6725020ed41aa446653f7132730fbe755d7e19e30266bcbcd61c9cdf6c603db4d34afe64814a887f539e9116ccc2c89054825e1e7
+DIST mpd-0.19.19.tar.xz 707356 BLAKE2B bb9cade62cfbb64fd5f2db28e8c3ca1847efaf6b4ec818ceb935d5dff292afdbc0a59520f23e20c270bccd79e52e8e4bc9083535c438c1967dd14b0d56b995cf SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64
+DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
+DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 EBUILD mpd-0.19.19.ebuild 7647 BLAKE2B 2de50fb5264ba419b33613cf38f653ccbf842f6c17c64d2d84ef6124fc998da10e36f79b414126f1a93c903707e70d49e5ad18983502c4ba73bddc80f7017abf SHA512 8c69f7db31ae45d0531dfd4f98984bbd88c70118ffa9188ae6be2152105accadedacf7219883700ed1f40e9c32a02f37dcb1d2c809ff452223241606f7d86169
-EBUILD mpd-0.19.21-r1.ebuild 7541 BLAKE2B 4a27cdd6a5484619a04bac445de90999d8955e02fd55b6aff8e766032a5483abc399a8270f85db8961316bfe103fe84469c0cf3d8f671bcfbee1dd0932fedcd6 SHA512 0df1083f07267d02a593bc696ee594a839cfac5513c21ed3ad5a36d927e80d11fe4c8192630ccd413afe9f818dac2a3b3278ca070c53a4cbb85905932818f0b6
-EBUILD mpd-0.19.21.ebuild 7661 BLAKE2B 9f1915eaf601f0a50a75542ee32aa0e55da9bf3af270cc1cdda0697dd15c44cd2a2279a619fd30f438a40c4a25a4fe946aeeb504c027f0ba439e527eb2e424ef SHA512 41fb613f3f8b2cf1926ce6682103e389c126e4fa05845a0a7a0bd723a8fa188da6230fa84ab19851b02a8bbc469616016228509b6f50c508364cdfe9e55409eb
 EBUILD mpd-0.20.10.ebuild 7248 BLAKE2B f70bdff7954b8881eabc937b636363011fc7431053a79fabcadf71ed4e46e3b07053c43aebf92525e5176b243228c6eb1b409baa37ac70e116068434d74cd4cd SHA512 97d69bc1331e6642b8f1c644dced54a0d3d1e45b5888161359e9d556281632b917138f8d0044422dd0219a817e83341103a8fa35d2b332af670a6b6f8ab5e829
-EBUILD mpd-0.20.4.ebuild 7572 BLAKE2B 66396cdb825bb6dcbc77bb0a6ef6b9141a214d433ecbdb8e6262ccb646f3aa840649750deb3ba583465f043cf559a78b188362a8ab79b6def87fe834f5f65650 SHA512 9b641695c28ecd914491275b4e837ad0c681b16f79c3cb898c323c4aa9d944e55576ff91339e759dfc59545452efd6d5dc283a60a81600158f57f3fdeefebc8a
-EBUILD mpd-0.20.6.ebuild 7212 BLAKE2B 991b200a04a68cecfd53cce7526c7bf13bb9b9aad6c2e9ba89a5a02fc88b22b3c4fbe9e89894d80505e900d206b97c1f1080e6f549eae81d5c24527651b50b6d SHA512 5616b50c1bd4c3e279ba20ca8fbe8c9bdb6556c796f1940047bb21fdd635cd0fa1e9ef62abbd83ae75499fccc9fcdb34cb6300c3f901a135505480d677982640
-EBUILD mpd-0.20.8.ebuild 7214 BLAKE2B 5c15b4ab4ffb7e919e817930dc746abe0a9d9a080a3befdd18cba19bb780317686013e298650963a1d62baf3266dbada8ca254197aec7c2533bc52bb122bc401 SHA512 2a73288afaa5fceeacb38efe9584e1e5c7ac30c5d230b751d333b8d9e22ea88c77e5996f51180863613087ae043e874ba544490418c7e7bda0b79230df01ef23
-EBUILD mpd-0.20.9.ebuild 7214 BLAKE2B 5c15b4ab4ffb7e919e817930dc746abe0a9d9a080a3befdd18cba19bb780317686013e298650963a1d62baf3266dbada8ca254197aec7c2533bc52bb122bc401 SHA512 2a73288afaa5fceeacb38efe9584e1e5c7ac30c5d230b751d333b8d9e22ea88c77e5996f51180863613087ae043e874ba544490418c7e7bda0b79230df01ef23
+EBUILD mpd-0.20.12.ebuild 7290 BLAKE2B 19f3015e2b6e208ab12b08b97c893379310457af069981eb816f8977fad3a620f9691a736ae3b4d1f561326807799643003dd3cef3bb46f33f6f3cf8a65d9670 SHA512 c0ad23ccb2b63bee9934c7a7d60b1900ed8cbccb487d28f382c0e3a42dce37458ac920fc1800b05fcae39559907669fcc56c43bd489921c11795e737ef22dbb4
 MISC metadata.xml 2496 BLAKE2B d4e284d95b673e3e2ace7d681bcb577c1d3ef2d43f708de060ed6a595a478e82fccf3487587d1f71c7f1cbbd510c0bc698e0a78806968a1332f7174aceef6319 SHA512 712f6b0c5fc58250521ccebd68b5af708868a1f1b9c398eec3d24434206bd56da70c26dcab52793826fd82d456c0c608ff21558ab514faf329face07e0aae1cc
diff --git a/media-sound/mpd/mpd-0.19.21-r1.ebuild b/media-sound/mpd/mpd-0.19.21-r1.ebuild
deleted file mode 100644
index 95bd8d46b86a..000000000000
--- a/media-sound/mpd/mpd-0.19.21-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	ao? ( glib )
-	gme? ( glib )
-	jack? ( glib )
-	network? ( || ( ${ENCODER_PLUGINS} )
-		glib )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	sid? ( glib )
-	soundcloud? ( glib )
-	sqlite? ( glib )
-	opus? ( ogg )
-	upnp? ( expat )
-	vorbis? ( glib )
-	wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? ( media-sound/alsa-utils
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	glib? ( dev-libs/glib:2 )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2 )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local mpdconf="--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use samba || use upnp; then
-		mpdconf+=" --enable-neighbor-plugins"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable eventfd)		\
-		$(use_enable signalfd)		\
-		$(use_enable libmpdclient)	\
-		$(use_enable expat)			\
-		$(use_enable upnp)			\
-		$(use_enable adplug)		\
-		$(use_enable alsa)			\
-		$(use_enable ao)			\
-		$(use_enable audiofile)		\
-		$(use_enable zlib)			\
-		$(use_enable bzip2)			\
-		$(use_enable cdio cdio-paranoia) \
-		$(use_enable curl)			\
-		$(use_enable samba smbclient) \
-		$(use_enable nfs)			\
-		$(use_enable debug)			\
-		$(use_enable ffmpeg)		\
-		$(use_enable fifo)			\
-		$(use_enable flac)			\
-		$(use_enable fluidsynth)	\
-		$(use_enable gme)			\
-		$(use_enable id3tag id3)	\
-		$(use_enable inotify)		\
-		$(use_enable ipv6)			\
-		$(use_enable cdio iso9660)	\
-		$(use_enable jack)			\
-		$(use_enable soundcloud)	\
-		$(use_enable tcpd libwrap)	\
-		$(use_enable libsamplerate lsr) \
-		$(use_enable libsoxr soxr)	\
-		$(use_enable mad)			\
-		$(use_enable mikmod)		\
-		$(use_enable mms)			\
-		$(use_enable modplug)		\
-		$(use_enable musepack mpc)	\
-		$(use_enable mpg123)		\
-		$(use_enable openal)		\
-		$(use_enable opus)			\
-		$(use_enable oss)			\
-		$(use_enable pipe pipe-output) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable recorder recorder-output) \
-		$(use_enable sid sidplay)	\
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite)		\
-		$(use_enable systemd) \
-		$(use_enable vorbis)		\
-		$(use_enable wavpack)		\
-		$(use_enable wildmidi)		\
-		$(use_enable zip zzip)		\
-		$(use_enable icu)			\
-		$(use_enable glib)			\
-		$(use_enable faad aac)		\
-		$(use_with zeroconf zeroconf avahi) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.19.21.ebuild b/media-sound/mpd/mpd-0.19.21.ebuild
deleted file mode 100644
index 0d1a80bd0ea4..000000000000
--- a/media-sound/mpd/mpd-0.19.21.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	ao? ( glib )
-	gme? ( glib )
-	jack? ( glib )
-	network? ( || ( ${ENCODER_PLUGINS} )
-		glib )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	sid? ( glib )
-	soundcloud? ( glib )
-	sqlite? ( glib )
-	opus? ( ogg )
-	upnp? ( expat )
-	vorbis? ( glib )
-	wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? ( media-sound/alsa-utils
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	glib? ( dev-libs/glib:2 )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2 )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local mpdconf="--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use samba || use upnp; then
-		mpdconf+=" --enable-neighbor-plugins"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable eventfd)		\
-		$(use_enable signalfd)		\
-		$(use_enable libmpdclient)	\
-		$(use_enable expat)			\
-		$(use_enable upnp)			\
-		$(use_enable adplug)		\
-		$(use_enable alsa)			\
-		$(use_enable ao)			\
-		$(use_enable audiofile)		\
-		$(use_enable zlib)			\
-		$(use_enable bzip2)			\
-		$(use_enable cdio cdio-paranoia) \
-		$(use_enable curl)			\
-		$(use_enable samba smbclient) \
-		$(use_enable nfs)			\
-		$(use_enable debug)			\
-		$(use_enable ffmpeg)		\
-		$(use_enable fifo)			\
-		$(use_enable flac)			\
-		$(use_enable fluidsynth)	\
-		$(use_enable gme)			\
-		$(use_enable id3tag id3)	\
-		$(use_enable inotify)		\
-		$(use_enable ipv6)			\
-		$(use_enable cdio iso9660)	\
-		$(use_enable jack)			\
-		$(use_enable soundcloud)	\
-		$(use_enable tcpd libwrap)	\
-		$(use_enable libsamplerate lsr) \
-		$(use_enable libsoxr soxr)	\
-		$(use_enable mad)			\
-		$(use_enable mikmod)		\
-		$(use_enable mms)			\
-		$(use_enable modplug)		\
-		$(use_enable musepack mpc)	\
-		$(use_enable mpg123)		\
-		$(use_enable openal)		\
-		$(use_enable opus)			\
-		$(use_enable oss)			\
-		$(use_enable pipe pipe-output) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable recorder recorder-output) \
-		$(use_enable sid sidplay)	\
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite)		\
-		$(use_enable systemd) \
-		$(use_enable vorbis)		\
-		$(use_enable wavpack)		\
-		$(use_enable wildmidi)		\
-		$(use_enable zip zzip)		\
-		$(use_enable icu)			\
-		$(use_enable glib)			\
-		$(use_enable faad aac)		\
-		$(use_with zeroconf zeroconf avahi) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
-	systemd_newuserunit systemd/system/${PN}.service ${PN}.service
-	sed -i '/WantedBy=/c WantedBy=default.target' \
-		"${ED}"/usr/lib/systemd/user/mpd.service || die "sed failed"
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.9.ebuild b/media-sound/mpd/mpd-0.20.12.ebuild
index 0b190a1feb8b..695a4b188efa 100644
--- a/media-sound/mpd/mpd-0.20.9.ebuild
+++ b/media-sound/mpd/mpd-0.20.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
+inherit autotools flag-o-matic linux-info systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -17,7 +17,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
 	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
 	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
 DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
@@ -31,13 +31,14 @@ REQUIRED_USE="
 	recorder? ( || ( ${ENCODER_PLUGINS} ) )
 	opus? ( ogg )
 	upnp? ( expat )
+	webdav? ( curl expat )
 "
 
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+CDEPEND="
 	adplug? ( media-libs/adplug )
 	alsa? (
-		media-sound/alsa-utils
 		media-libs/alsa-lib
+		media-sound/alsa-utils
 	)
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile )
@@ -59,6 +60,7 @@ CDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	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:0 )
 	mms? ( media-libs/libmms )
@@ -75,10 +77,12 @@ CDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
 	sndfile? ( media-libs/libsndfile )
 	soundcloud? ( >=dev-libs/yajl-2:= )
-	libsoxr? ( media-libs/soxr )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
 	tcpd? ( sys-apps/tcp-wrappers )
@@ -94,12 +98,11 @@ DEPEND="${CDEPEND}
 	dev-libs/boost
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	!<sys-cluster/mpich2-1.4_rc2
 	selinux? ( sec-policy/selinux-mpd )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.18.conf.patch )
 
 pkg_setup() {
 	use network || ewarn "Icecast and Shoutcast streaming needs networking."
@@ -220,8 +223,10 @@ src_configure() {
 		$(use_enable wildmidi)
 		$(use_enable zip zzip)
 		$(use_enable icu)
+		$(use_enable webdav)
 		$(use_enable faad aac)
 		$(use_with zeroconf zeroconf avahi)
+		--with-boost="${EPREFIX}"/usr
 		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
 		--with-systemduserunitdir=$(systemd_get_userunitdir)
 	)
diff --git a/media-sound/mpd/mpd-0.20.4.ebuild b/media-sound/mpd/mpd-0.20.4.ebuild
deleted file mode 100644
index 3cb6b50f5acb..000000000000
--- a/media-sound/mpd/mpd-0.20.4.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	ao? ( glib )
-	gme? ( glib )
-	jack? ( glib )
-	network? ( || ( ${ENCODER_PLUGINS} )
-		glib )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	sid? ( glib )
-	soundcloud? ( glib )
-	sqlite? ( glib )
-	opus? ( ogg )
-	upnp? ( expat )
-	vorbis? ( glib )
-	wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? ( media-sound/alsa-utils
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	glib? ( dev-libs/glib:2 )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2 )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	#"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742, merged upstream
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local mpdconf="--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use samba || use upnp; then
-		mpdconf+=" --enable-neighbor-plugins"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable eventfd)		\
-		$(use_enable signalfd)		\
-		$(use_enable libmpdclient)	\
-		$(use_enable expat)			\
-		$(use_enable upnp)			\
-		$(use_enable adplug)		\
-		$(use_enable alsa)			\
-		$(use_enable ao)			\
-		$(use_enable audiofile)		\
-		$(use_enable zlib)			\
-		$(use_enable bzip2)			\
-		$(use_enable cdio cdio-paranoia) \
-		$(use_enable curl)			\
-		$(use_enable samba smbclient) \
-		$(use_enable nfs)			\
-		$(use_enable debug)			\
-		$(use_enable ffmpeg)		\
-		$(use_enable fifo)			\
-		$(use_enable flac)			\
-		$(use_enable fluidsynth)	\
-		$(use_enable gme)			\
-		$(use_enable id3tag id3)	\
-		$(use_enable inotify)		\
-		$(use_enable ipv6)			\
-		$(use_enable cdio iso9660)	\
-		$(use_enable jack)			\
-		$(use_enable soundcloud)	\
-		$(use_enable tcpd libwrap)	\
-		$(use_enable libsamplerate lsr) \
-		$(use_enable libsoxr soxr)	\
-		$(use_enable mad)			\
-		$(use_enable mikmod)		\
-		$(use_enable mms)			\
-		$(use_enable modplug)		\
-		$(use_enable musepack mpc)	\
-		$(use_enable mpg123)		\
-		$(use_enable openal)		\
-		$(use_enable opus)			\
-		$(use_enable oss)			\
-		$(use_enable pipe pipe-output) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable recorder recorder-output) \
-		$(use_enable sid sidplay)	\
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite)		\
-		$(use_enable systemd) \
-		$(use_enable vorbis)		\
-		$(use_enable wavpack)		\
-		$(use_enable wildmidi)		\
-		$(use_enable zip zzip)		\
-		$(use_enable icu)			\
-		$(use_enable glib)			\
-		$(use_enable faad aac)		\
-		$(use_with zeroconf zeroconf avahi) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.6.ebuild b/media-sound/mpd/mpd-0.20.6.ebuild
deleted file mode 100644
index a608f71a691c..000000000000
--- a/media-sound/mpd/mpd-0.20.6.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-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 ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-sound/alsa-utils
-		media-libs/alsa-lib
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	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 )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.8.ebuild b/media-sound/mpd/mpd-0.20.8.ebuild
deleted file mode 100644
index 0b190a1feb8b..000000000000
--- a/media-sound/mpd/mpd-0.20.8.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-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 ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-sound/alsa-utils
-		media-libs/alsa-lib
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	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 )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp:= )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}