Remove old
authorChristoph Mende <angelos@gentoo.org>
Sun, 7 Aug 2011 15:26:40 +0000 (15:26 +0000)
committerChristoph Mende <angelos@gentoo.org>
Sun, 7 Aug 2011 15:26:40 +0000 (15:26 +0000)
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

media-sound/mpd/ChangeLog
media-sound/mpd/mpd-0.15.15.ebuild [deleted file]
media-sound/mpd/mpd-0.15.16.ebuild [deleted file]
media-sound/mpd/mpd-0.15.8.ebuild [deleted file]
media-sound/mpd/mpd-0.16.3.ebuild [deleted file]

index a59effea8f322a56e0d838164606eb0cf5a99686..39ffbd91405c3a94596c3c4acadd57dfe455361c 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.261 2011/08/07 14:24:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.262 2011/08/07 15:26:40 angelos Exp $
+
+  07 Aug 2011; Christoph Mende <angelos@gentoo.org> -mpd-0.15.8.ebuild,
+  -mpd-0.15.15.ebuild, -mpd-0.15.16.ebuild, -mpd-0.16.3.ebuild:
+  Remove old
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> mpd-0.16.2.ebuild:
   sh/sparc stable wrt #364469
diff --git a/media-sound/mpd/mpd-0.15.15.ebuild b/media-sound/mpd/mpd-0.15.15.ebuild
deleted file mode 100644 (file)
index 7bd35c3..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.15.ebuild,v 1.14 2011/07/17 16:08:37 angelos Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
-vorbis wavpack wildmidi zip"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-       >=dev-libs/glib-2.6:2
-       aac? ( >=media-libs/faad2-2 )
-       alsa? ( media-sound/alsa-utils )
-       ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] )
-       audiofile? ( media-libs/audiofile )
-       bzip2? ( app-arch/bzip2 )
-       cdio? ( dev-libs/libcdio )
-       cue? ( >=media-libs/libcue-0.13 )
-       curl? ( net-misc/curl )
-       ffmpeg? ( virtual/ffmpeg )
-       flac? ( media-libs/flac[ogg?] )
-       fluidsynth? ( media-sound/fluidsynth )
-       network? ( >=media-libs/libshout-2
-               !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-       id3tag? ( media-libs/libid3tag )
-       jack? ( media-sound/jack-audio-connection-kit )
-       lame? ( network? ( media-sound/lame ) )
-       mms? ( >=media-libs/libmms-0.4 )
-       libsamplerate? ( media-libs/libsamplerate )
-       mad? ( media-libs/libmad )
-       mikmod? ( media-libs/libmikmod )
-       modplug? ( media-libs/libmodplug )
-       musepack? ( >=media-sound/musepack-tools-444 )
-       ogg? ( media-libs/libogg )
-       pulseaudio? ( media-sound/pulseaudio )
-       sid? ( >=media-libs/libsidplay-2.1.1-r2:2 )
-       sqlite? ( dev-db/sqlite:3 )
-       vorbis? ( media-libs/libvorbis )
-       wavpack? ( media-sound/wavpack )
-       wildmidi? ( media-sound/wildmidi )
-       avahi? ( net-dns/avahi )
-       zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-pkg_setup() {
-       use network || ewarn "Icecast and Shoutcast streaming needs networking."
-       use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-       use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm"
-
-       enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_prepare() {
-       cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-       epatch "${FILESDIR}"/mpd.conf.patch
-}
-
-src_configure() {
-       local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un
-               --disable-wildmidi --disable-libOggFLACtest --disable-documentation
-               --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)"
-               if ! use lame && ! use vorbis; then
-                       ewarn "At least one encoder is required, enabling vorbis for you."
-                       mpdconf+=" --enable-vorbis-encoder"
-               fi
-       else
-               mpdconf+=" --disable-shout --disable-vorbis-encoder
-                       --disable-httpd-output --disable-lame-encoder"
-       fi
-
-       if use flac && use ogg; then
-               mpdconf+=" --enable-oggflac"
-       else
-               mpdconf+=" --disable-oggflac"
-       fi
-
-       if use lastfmradio && use curl; then
-               mpdconf+=" --enable-lastfm"
-       else
-               mpdconf+=" --disable-lastfm"
-       fi
-
-       append-lfs-flags
-       append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-       cd "${S}"
-
-       econf \
-               $(use_enable ipv6) $(use_enable cue) \
-               $(use_enable sqlite) $(use_enable curl) \
-               $(use_enable mms) $(use_enable wildmidi) \
-               $(use_enable bzip2) $(use_enable zip) \
-               $(use_enable cdio iso9660) $(use_enable id3tag id3) \
-               $(use_enable audiofile) $(use_enable ffmpeg) \
-               $(use_enable flac) $(use_enable mad) \
-               $(use_enable mikmod) $(use_enable modplug) \
-               $(use_enable musepack mpc) $(use_enable vorbis) \
-               $(use_enable sid sidplay) $(use_enable fluidsynth) \
-               $(use_enable wavpack) $(use_enable libsamplerate lsr) \
-               $(use_enable alsa) $(use_enable ao) \
-               $(use_enable fifo) $(use_enable pipe pipe-output) \
-               $(use_enable jack) $(use_enable oss) \
-               $(use_enable pulseaudio pulse) $(use_enable aac) \
-               $(use_enable debug) $(use_enable profile gprof) \
-               $(use_with avahi zeroconf avahi) ${mpdconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       insinto /etc
-       newins doc/mpdconf.example mpd.conf
-
-       newinitd "${FILESDIR}"/mpd.init mpd
-
-       if use unicode; then
-               dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-                       /etc/mpd.conf || die "dosed failed"
-       fi
-
-       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() {
-       elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-       elog "sure that MPD's pid_file is unset."
-
-       # also change the homedir if the user has existed before
-       usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.15.16.ebuild b/media-sound/mpd/mpd-0.15.16.ebuild
deleted file mode 100644 (file)
index 10df98c..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.16.ebuild,v 1.5 2011/07/17 16:08:37 angelos Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
-vorbis wavpack wildmidi zip"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-       >=dev-libs/glib-2.6:2
-       aac? ( >=media-libs/faad2-2 )
-       alsa? ( media-sound/alsa-utils )
-       ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] )
-       audiofile? ( media-libs/audiofile )
-       bzip2? ( app-arch/bzip2 )
-       cdio? ( dev-libs/libcdio )
-       cue? ( >=media-libs/libcue-0.13 )
-       curl? ( net-misc/curl )
-       ffmpeg? ( virtual/ffmpeg )
-       flac? ( media-libs/flac[ogg?] )
-       fluidsynth? ( media-sound/fluidsynth )
-       network? ( >=media-libs/libshout-2
-               !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-       id3tag? ( media-libs/libid3tag )
-       jack? ( media-sound/jack-audio-connection-kit )
-       lame? ( network? ( media-sound/lame ) )
-       mms? ( >=media-libs/libmms-0.4 )
-       libsamplerate? ( media-libs/libsamplerate )
-       mad? ( media-libs/libmad )
-       mikmod? ( media-libs/libmikmod )
-       modplug? ( media-libs/libmodplug )
-       musepack? ( >=media-sound/musepack-tools-444 )
-       ogg? ( media-libs/libogg )
-       pulseaudio? ( media-sound/pulseaudio )
-       sid? ( >=media-libs/libsidplay-2.1.1-r2:2 )
-       sqlite? ( dev-db/sqlite:3 )
-       vorbis? ( media-libs/libvorbis )
-       wavpack? ( media-sound/wavpack )
-       wildmidi? ( media-sound/wildmidi )
-       avahi? ( net-dns/avahi )
-       zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-pkg_setup() {
-       use network || ewarn "Icecast and Shoutcast streaming needs networking."
-       use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-       use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm"
-
-       enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_prepare() {
-       cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-       epatch "${FILESDIR}"/mpd.conf.patch
-}
-
-src_configure() {
-       local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un
-               --disable-wildmidi --disable-libOggFLACtest --disable-documentation
-               --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)"
-               if ! use lame && ! use vorbis; then
-                       ewarn "At least one encoder is required, enabling vorbis for you."
-                       mpdconf+=" --enable-vorbis-encoder"
-               fi
-       else
-               mpdconf+=" --disable-shout --disable-vorbis-encoder
-                       --disable-httpd-output --disable-lame-encoder"
-       fi
-
-       if use flac && use ogg; then
-               mpdconf+=" --enable-oggflac"
-       else
-               mpdconf+=" --disable-oggflac"
-       fi
-
-       if use lastfmradio && use curl; then
-               mpdconf+=" --enable-lastfm"
-       else
-               mpdconf+=" --disable-lastfm"
-       fi
-
-       append-lfs-flags
-       append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-       cd "${S}"
-
-       econf \
-               $(use_enable ipv6) $(use_enable cue) \
-               $(use_enable sqlite) $(use_enable curl) \
-               $(use_enable mms) $(use_enable wildmidi) \
-               $(use_enable bzip2) $(use_enable zip) \
-               $(use_enable cdio iso9660) $(use_enable id3tag id3) \
-               $(use_enable audiofile) $(use_enable ffmpeg) \
-               $(use_enable flac) $(use_enable mad) \
-               $(use_enable mikmod) $(use_enable modplug) \
-               $(use_enable musepack mpc) $(use_enable vorbis) \
-               $(use_enable sid sidplay) $(use_enable fluidsynth) \
-               $(use_enable wavpack) $(use_enable libsamplerate lsr) \
-               $(use_enable alsa) $(use_enable ao) \
-               $(use_enable fifo) $(use_enable pipe pipe-output) \
-               $(use_enable jack) $(use_enable oss) \
-               $(use_enable pulseaudio pulse) $(use_enable aac) \
-               $(use_enable debug) $(use_enable profile gprof) \
-               $(use_with avahi zeroconf avahi) ${mpdconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       insinto /etc
-       newins doc/mpdconf.example mpd.conf
-
-       newinitd "${FILESDIR}"/mpd.init mpd
-
-       if use unicode; then
-               dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-                       /etc/mpd.conf || die "dosed failed"
-       fi
-
-       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() {
-       elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-       elog "sure that MPD's pid_file is unset."
-
-       # also change the homedir if the user has existed before
-       usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.15.8.ebuild b/media-sound/mpd/mpd-0.15.8.ebuild
deleted file mode 100644 (file)
index 0c68b62..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.11 2011/07/17 16:08:37 angelos Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
-vorbis wavpack zip"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-       >=dev-libs/glib-2.4:2
-       aac? ( >=media-libs/faad2-2 )
-       alsa? ( media-sound/alsa-utils )
-       ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] )
-       audiofile? ( media-libs/audiofile )
-       bzip2? ( app-arch/bzip2 )
-       cdio? ( dev-libs/libcdio )
-       cue? ( >=media-libs/libcue-0.13 )
-       curl? ( net-misc/curl )
-       ffmpeg? ( virtual/ffmpeg )
-       flac? ( media-libs/flac[ogg?] )
-       fluidsynth? ( media-sound/fluidsynth )
-       network? ( >=media-libs/libshout-2
-               !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-       id3tag? ( media-libs/libid3tag )
-       jack? ( media-sound/jack-audio-connection-kit )
-       lame? ( network? ( media-sound/lame ) )
-       mms? ( >=media-libs/libmms-0.4 )
-       libsamplerate? ( media-libs/libsamplerate )
-       mad? ( media-libs/libmad )
-       mikmod? ( media-libs/libmikmod )
-       modplug? ( media-libs/libmodplug )
-       musepack? ( >=media-sound/musepack-tools-444 )
-       ogg? ( media-libs/libogg )
-       pulseaudio? ( media-sound/pulseaudio )
-       sid? ( >=media-libs/libsidplay-2.1.1-r2:2 )
-       sqlite? ( dev-db/sqlite:3 )
-       vorbis? ( media-libs/libvorbis )
-       wavpack? ( media-sound/wavpack )
-       avahi? ( net-dns/avahi )
-       zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-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
-}
-
-src_prepare() {
-       cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-       epatch "${FILESDIR}"/0.15.1-mpdconf.patch
-}
-
-src_configure() {
-       local mpdconf="--enable-tcp --enable-un --disable-wildmidi
-               --disable-libOggFLACtest --disable-documentation"
-
-       if use network; then
-               mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-                       --enable-httpd-output $(use_enable lame lame-encoder)"
-               if ! use lame && ! use vorbis; then
-                       ewarn "At least one encoder is required, enabling vorbis for you."
-                       mpdconf+=" --enable-vorbis-encoder"
-               fi
-       else
-               mpdconf+=" --disable-shout --disable-vorbis-encoder
-                       --disable-httpd-output --disable-lame-encoder"
-       fi
-
-       if use flac && use ogg; then
-               mpdconf+=" --enable-oggflac"
-       else
-               mpdconf+=" --disable-oggflac"
-       fi
-
-       append-lfs-flags
-       append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-       cd "${S}"
-
-       econf \
-               $(use_enable ipv6) $(use_enable cue) \
-               $(use_enable sqlite) $(use_enable curl) \
-               $(use_enable lastfmradio lastfm) $(use_enable mms) \
-               $(use_enable bzip2) $(use_enable zip) \
-               $(use_enable cdio iso9660) $(use_enable id3tag id3) \
-               $(use_enable audiofile) $(use_enable ffmpeg) \
-               $(use_enable flac) $(use_enable mad) \
-               $(use_enable mikmod) $(use_enable modplug) \
-               $(use_enable musepack mpc) $(use_enable vorbis) \
-               $(use_enable sid sidplay) $(use_enable fluidsynth) \
-               $(use_enable wavpack) $(use_enable libsamplerate lsr) \
-               $(use_enable alsa) $(use_enable ao) \
-               $(use_enable fifo) $(use_enable pipe pipe-output) \
-               $(use_enable jack) $(use_enable oss) \
-               $(use_enable pulseaudio pulse) $(use_enable aac) \
-               $(use_enable debug) $(use_enable profile gprof) \
-               $(use_with avahi zeroconf avahi) \
-               ${mpdconf}
-}
-
-src_install() {
-       dodir /var/run/mpd
-       fowners mpd:audio /var/run/mpd
-       fperms 750 /var/run/mpd
-       keepdir /var/run/mpd
-
-       emake DESTDIR="${D}" install || die "emake install failed"
-       rm -rf "${D}"/usr/share/doc/mpd
-
-       dodoc AUTHORS NEWS README UPGRADING doc/mpdconf.dist
-
-       insinto /etc
-       newins doc/mpdconf.example mpd.conf
-
-       newinitd "${FILESDIR}"/mpd.rc mpd
-
-       if use unicode; then
-               dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-                       /etc/mpd.conf || die "dosed failed"
-       fi
-
-       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
-       dodir /var/log/mpd
-       keepdir /var/log/mpd
-
-       if use alsa; then
-               dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
-       fi
-}
-
-pkg_postinst() {
-       elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-       elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-
-       # also change the homedir if the user has existed before
-       usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.16.3.ebuild b/media-sound/mpd/mpd-0.16.3.ebuild
deleted file mode 100644 (file)
index 2b4ae1c..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3.ebuild,v 1.3 2011/07/17 16:08:37 angelos Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
-       || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
-                       ogg flac sid vorbis wavpack wildmidi )
-       network? ( || ( audiofile flac lame twolame vorbis ) )
-       lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-       dev-libs/glib:2
-       aac? ( media-libs/faad2 )
-       alsa? ( media-sound/alsa-utils )
-       ao? ( media-libs/libao[alsa?,pulseaudio?] )
-       audiofile? ( media-libs/audiofile )
-       bzip2? ( app-arch/bzip2 )
-       cdio? ( dev-libs/libcdio )
-       cue? ( media-libs/libcue )
-       curl? ( net-misc/curl )
-       ffmpeg? ( virtual/ffmpeg )
-       flac? ( media-libs/flac[ogg?] )
-       fluidsynth? ( media-sound/fluidsynth )
-       network? ( >=media-libs/libshout-2
-               !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-       id3tag? ( media-libs/libid3tag )
-       jack? ( media-sound/jack-audio-connection-kit )
-       lame? ( network? ( media-sound/lame ) )
-       mms? ( media-libs/libmms )
-       libsamplerate? ( media-libs/libsamplerate )
-       mad? ( media-libs/libmad )
-       mikmod? ( media-libs/libmikmod )
-       modplug? ( media-libs/libmodplug )
-       mpg123? ( >=media-sound/mpg123-1.12.2 )
-       musepack? ( media-sound/musepack-tools )
-       ogg? ( media-libs/libogg )
-       openal? ( media-libs/openal )
-       pulseaudio? ( media-sound/pulseaudio )
-       sid? ( media-libs/libsidplay:2 )
-       sndfile? ( media-libs/libsndfile )
-       sqlite? ( dev-db/sqlite:3 )
-       tcpd? ( sys-apps/tcp-wrappers )
-       twolame? ( media-sound/twolame )
-       vorbis? ( media-libs/libvorbis )
-       wavpack? ( media-sound/wavpack )
-       wildmidi? ( media-sound/wildmidi )
-       zeroconf? ( net-dns/avahi[dbus] )
-       zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-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 inotify; then
-               CONFIG_CHECK="~INOTIFY_USER"
-               ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-               linux-info_pkg_setup
-       fi
-}
-
-src_prepare() {
-       cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-       epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-       local mpdconf="--enable-tcp --enable-un --disable-documentation
-               --disable-ffado --disable-gme --enable-largefile
-               --disable-mvp --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 flac && use ogg; then
-               mpdconf+=" --enable-oggflac"
-       else
-               mpdconf+=" --disable-oggflac"
-       fi
-
-       append-lfs-flags
-       append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-       econf \
-               $(use_enable aac) \
-               $(use_enable alsa) \
-               $(use_enable ao) \
-               $(use_enable audiofile) \
-               $(use_enable bzip2) \
-               $(use_enable cdio iso9660) \
-               $(use_enable cue) \
-               $(use_enable curl) \
-               $(use_enable debug) \
-               $(use_enable ffmpeg) \
-               $(use_enable fifo) \
-               $(use_enable flac) \
-               $(use_enable fluidsynth) \
-               $(use_enable id3tag id3) \
-               $(use_enable inotify) \
-               $(use_enable ipv6) \
-               $(use_enable jack) \
-               $(use_enable lastfmradio lastfm) \
-               $(use_enable mms mms) \
-               $(use_enable libsamplerate lsr) \
-               $(use_enable mad) \
-               $(use_enable mikmod) \
-               $(use_enable modplug) \
-               $(use_enable mpg123) \
-               $(use_enable musepack mpc) \
-               $(use_enable openal) \
-               $(use_enable oss) \
-               $(use_enable pipe pipe-output) \
-               $(use_enable profile gprof) \
-               $(use_enable pulseaudio pulse) \
-               $(use_enable sid sidplay) \
-               $(use_enable sndfile sndfile) \
-               $(use_enable sqlite) \
-               $(use_enable tcpd libwrap) \
-               $(use_enable vorbis) \
-               $(use_enable wavpack) \
-               $(use_enable wildmidi) \
-               $(use_enable zip zzip) \
-               $(use_with zeroconf zeroconf avahi) \
-               ${mpdconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       insinto /etc
-       newins doc/mpdconf.dist mpd.conf
-
-       newinitd "${FILESDIR}"/mpd.init mpd
-
-       if use unicode; then
-               sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-                       "${D}"/etc/mpd.conf || die "sed failed"
-       fi
-
-       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() {
-       elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-       elog "sure that MPD's pid_file is unset."
-
-       # also change the homedir if the user has existed before
-       usermod -d "/var/lib/mpd" mpd
-}