commit:     fd0326dfc8ec2ce6252329d95d10e6bb607959a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 16:56:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 17:30:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0326df

media-sound/mpd: Drop old

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 media-sound/mpd/Manifest              |   5 -
 media-sound/mpd/mpd-0.19.21-r1.ebuild | 253 ---------------------------------
 media-sound/mpd/mpd-0.19.21.ebuild    | 256 ---------------------------------
 media-sound/mpd/mpd-0.20.4.ebuild     | 253 ---------------------------------
 media-sound/mpd/mpd-0.20.6.ebuild     | 260 ----------------------------------
 media-sound/mpd/mpd-0.20.8.ebuild     | 260 ----------------------------------
 media-sound/mpd/mpd-0.20.9.ebuild     | 260 ----------------------------------
 7 files changed, 1547 deletions(-)

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c0dab950cae..0b0244c3a54 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,7 +1,2 @@
 DIST mpd-0.19.19.tar.xz 707356 BLAKE2B 
bb9cade62cfbb64fd5f2db28e8c3ca1847efaf6b4ec818ceb935d5dff292afdbc0a59520f23e20c270bccd79e52e8e4bc9083535c438c1967dd14b0d56b995cf
 SHA512 
949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64
-DIST mpd-0.19.21.tar.xz 708512 BLAKE2B 
dafeecc5380d99006c5e367f6e35048f7c21c0c200539cbf13e99196e5921f6c076c3a3f21af1faf8887c4133bc87cae7e604b6a3025397e49c66753c85a6583
 SHA512 
a65690012a74def273ffb4e87465d8f3f7f2ce6f6e9117e35aa0891cd638f904df0ef4c4923c39e9a0c3e1d93d09aab713979adf5c191b54fa7e8b5b81abd232
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B 
c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236
 SHA512 
bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
-DIST mpd-0.20.4.tar.xz 770132 BLAKE2B 
bb0793d11e5f353b95e3652a78d6645d25c0d3c136b2f47c4334a36bf94935743ca8808a8eb555515b7c67696dcb35ae35e79283e95fe5dd72fd6ccd3651939b
 SHA512 
d0c01ae6a3fd59e5ccdc24225bd9bb9e63620f1a395d317573499cc045de81f2abd803ca87eb1b2ca1d26d25167aaa6f5523e96f9512619272b857190efa0a72
-DIST mpd-0.20.6.tar.xz 772140 BLAKE2B 
93512d927165701e85fb366d75c71f89b4eed7583adffca634a74f312a21bfcba9a13efe47c0b84bef3f815180faab4ef78238d457fc063bf27f71a36c473bc3
 SHA512 
3377e095eaf8cd3ae14e4218fd85d1bcd79d29899ad4c61f5cd2a0b714c5e8aa22aa3b8bd54477195b93ddd44b8e82f8c6428c8f36174c98cba631554224dcfe
-DIST mpd-0.20.8.tar.xz 773128 BLAKE2B 
0d0cdb360e9957b930716451b87b791677ddc62a85532e389a14b6b6f7eef2ac74e09743081ebfef8477579fe6137575d6da17b6ae6753d27b8ef52b1fac5644
 SHA512 
063feafae7137ea5b61498132b4fcc2e04e23bb9d6fa849a0c6d90c40ecc0a841617dec0f53021bfc5add559b59388d20ef211e1bc88fcaca46b5ecbf1bb8960
-DIST mpd-0.20.9.tar.xz 773404 BLAKE2B 
679945b7fb42c55a129d5c94442bc613a5d697153a8fe0ada730d42b33477ef30bfef457cd4dbdae14d1262e449d0e39e800f8da8c843af6f028a65dda5d4d59
 SHA512 
3b29fed4146ca09e3b5866aeea280ca3fb412d182a940da6c1418525e251385fdb18bb58ea99754ad5ba3704a3e2033ff2ef54c392117af7c0be30b78708a2e7

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 95bd8d46b86..00000000000
--- 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 0d1a80bd0ea..00000000000
--- 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.4.ebuild 
b/media-sound/mpd/mpd-0.20.4.ebuild
deleted file mode 100644
index 3cb6b50f5ac..00000000000
--- 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 a608f71a691..00000000000
--- 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 0b190a1feb8..00000000000
--- 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
-}

diff --git a/media-sound/mpd/mpd-0.20.9.ebuild 
b/media-sound/mpd/mpd-0.20.9.ebuild
deleted file mode 100644
index 0b190a1feb8..00000000000
--- a/media-sound/mpd/mpd-0.20.9.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
-}

Reply via email to