Version bump, remove old

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

5 files changed, 46 insertions, 213 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 51e8ba6ce16a..cc673fcd3269 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.320 2013/09/12 12:29:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.321 2013/10/31 12:50:49 angelos Exp $
+
+*mpd-0.18 (31 Oct 2013)
+*mpd-0.17.6 (31 Oct 2013)
+
+  31 Oct 2013; Christoph Mende <angelos@gentoo.org> +mpd-0.17.6.ebuild,
+  +mpd-0.18.ebuild, -mpd-0.16.8.ebuild, -mpd-0.17.3.ebuild, -mpd-0.17.4.ebuild,
+  metadata.xml:
+  Version bump, remove old
 
 *mpd-0.17.5 (12 Sep 2013)
 
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 0fef650b62e0..bfc820b3b964 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -11,8 +11,8 @@
 	<name>Markos Chandras</name>
   </maintainer>
   <use>
+	<flag name="adplug">Enable the AdPlug decoder plugin</flag>
 	<flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
-	<flag name="cue">Support CUE Sheet Parser Library</flag>
 	<flag name="curl">Support for web stream listening</flag>
 	<flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="fifo">Support writing audio to a FIFO</flag>
@@ -22,7 +22,9 @@
 	<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
 	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
 	<flag name="lastfmradio">Support listening to last.fm radio stations</flag>
+	<flag name="libmpdclient">Enable support for remote mpd databases</flag>
 	<flag name="network">Enables network streaming support</flag>
+	<flag name="opus">Enable Opus codec support</flag>
 	<flag name="pipe">Support writing audio to a pipe</flag>
 	<flag name="recorder">Enables output plugin for recording radio streams</flag>
 	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
diff --git a/media-sound/mpd/mpd-0.16.8.ebuild b/media-sound/mpd/mpd-0.16.8.ebuild
deleted file mode 100644
index a219be1619e6..000000000000
--- a/media-sound/mpd/mpd-0.16.8.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.8.ebuild,v 1.12 2012/10/05 17:56:12 ranger Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib systemd user
-
-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 ~x64-macos"
-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
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	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:0 )
-	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}
-	virtual/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) \
-		$(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) \
-		"$(systemd_with_unitdir)" \
-		${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":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	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() {
-	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.17.4.ebuild b/media-sound/mpd/mpd-0.17.6.ebuild
index 269945b8bbfa..a724d0fd3fd4 100644
--- a/media-sound/mpd/mpd-0.17.4.ebuild
+++ b/media-sound/mpd/mpd-0.17.6.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2013/04/09 08:20:28 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild,v 1.1 2013/10/31 12:50:49 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -12,14 +12,14 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
-IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac
+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"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123
+INPUT_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123
 	musepack ogg flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -31,7 +31,6 @@ REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
 
 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
 	alsa? ( media-sound/alsa-utils
 		media-libs/alsa-lib )
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
@@ -39,6 +38,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	curl? ( net-misc/curl )
+	faad? ( media-libs/faad2 )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
@@ -92,7 +92,8 @@ 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
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
+		"${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \
@@ -121,7 +122,6 @@ src_configure() {
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
 
 	econf \
-		$(use_enable aac) \
 		$(use_enable alsa) \
 		$(use_enable ao) \
 		$(use_enable audiofile) \
@@ -130,6 +130,7 @@ src_configure() {
 		$(use_enable cdio iso9660) \
 		$(use_enable curl) \
 		$(use_enable debug) \
+		$(use_enable faad aac) \
 		$(use_enable ffmpeg) \
 		$(use_enable fifo) \
 		$(use_enable flac) \
@@ -181,6 +182,9 @@ src_install() {
 			"${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
diff --git a/media-sound/mpd/mpd-0.17.3.ebuild b/media-sound/mpd/mpd-0.18.ebuild
index 614646c987d7..51688dbbc7c6 100644
--- a/media-sound/mpd/mpd-0.17.3.ebuild
+++ b/media-sound/mpd/mpd-0.18.ebuild
@@ -1,37 +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.3.ebuild,v 1.3 2013/02/16 08:00:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.ebuild,v 1.1 2013/10/31 12:50:49 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="mirror://sourceforge/musicpd/${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="aac +alsa ao audiofile bzip2 cdio +curl debug +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 ~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="aac audiofile 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
-	aac? ( media-libs/faad2 )
+	adplug? ( media-libs/adplug )
 	alsa? ( media-sound/alsa-utils
 		media-libs/alsa-lib )
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
@@ -39,6 +38,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	curl? ( net-misc/curl )
+	faad? ( media-libs/faad2 )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
@@ -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 )
@@ -97,14 +97,14 @@ src_prepare() {
 	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)
@@ -121,7 +121,6 @@ src_configure() {
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
 
 	econf \
-		$(use_enable aac) \
 		$(use_enable alsa) \
 		$(use_enable ao) \
 		$(use_enable audiofile) \
@@ -130,6 +129,7 @@ src_configure() {
 		$(use_enable cdio iso9660) \
 		$(use_enable curl) \
 		$(use_enable debug) \
+		$(use_enable faad aac) \
 		$(use_enable ffmpeg) \
 		$(use_enable fifo) \
 		$(use_enable flac) \
@@ -139,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) \
@@ -155,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) \
@@ -181,6 +180,9 @@ src_install() {
 			"${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