Version bump, remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)

2 files changed, 27 insertions, 23 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index a9db37981d13..e91b8bef55b2 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.323 2013/11/08 20:16:25 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.324 2013/11/13 19:40:33 angelos Exp $
+
+*mpd-0.18.4 (13 Nov 2013)
+
+  13 Nov 2013; Christoph Mende <angelos@gentoo.org> +mpd-0.18.4.ebuild,
+  -mpd-0.17.5.ebuild:
+  Version bump, remove old
 
 *mpd-0.18.3 (08 Nov 2013)
 
diff --git a/media-sound/mpd/mpd-0.17.5.ebuild b/media-sound/mpd/mpd-0.18.4.ebuild
index 01c81c95603d..2418e1bd24ae 100644
--- a/media-sound/mpd/mpd-0.17.5.ebuild
+++ b/media-sound/mpd/mpd-0.18.4.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.5.ebuild,v 1.1 2013/09/12 12:29:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.4.ebuild,v 1.1 2013/11/13 19:40:33 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
-IUSE="+alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
-fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
-sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
-wildmidi zeroconf zip"
+KEYWORDS="~amd64 ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-INPUT_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123
-	musepack ogg flac sid vorbis wavpack wildmidi"
+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} )
-	|| ( ${INPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
 	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	lastfmradio? ( curl )"
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )"
 
 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	dev-libs/glib:2
+	adplug? ( media-libs/adplug )
 	alsa? ( media-sound/alsa-utils
 		media-libs/alsa-lib )
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
@@ -57,11 +57,11 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
 	ogg? ( media-libs/libogg )
 	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplay:2 )
 	sndfile? ( media-libs/libsndfile )
 	soundcloud? ( >=dev-libs/yajl-2 )
-	soup? ( net-libs/libsoup:2.4 )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
 	tcpd? ( sys-apps/tcp-wrappers )
@@ -92,20 +92,19 @@ src_prepare() {
 		sure that MPD's pid_file is unset."
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
-		"${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \
 			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
-			src/input/cdio_paranoia_input_plugin.c || die
+			src/input/CdioParanoiaInputPlugin.cxx || die
 	fi
 }
 
 src_configure() {
-	local mpdconf="--disable-despotify --disable-documentation --disable-ffado
-		--disable-mvp --disable-roar --enable-largefile
-		--enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
+	local mpdconf="--disable-despotify --disable-documentation --disable-roar
+		--enable-largefile --enable-tcp --enable-un
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 	if use network; then
 		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
@@ -140,7 +139,7 @@ src_configure() {
 		$(use_enable inotify) \
 		$(use_enable ipv6) \
 		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
+		$(use_enable libmpdclient) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad) \
 		$(use_enable mikmod) \
@@ -156,7 +155,6 @@ src_configure() {
 		$(use_enable sid sidplay) \
 		$(use_enable sndfile sndfile) \
 		$(use_enable soundcloud) \
-		$(use_enable soup) \
 		$(use_enable sqlite) \
 		$(use_enable systemd systemd-daemon) \
 		$(use_enable tcpd libwrap) \