Version bump.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

5 files changed, 7 insertions, 418 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 5b9bbd68ca69..6fda268544d6 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.184 2009/09/08 11:54:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.185 2009/09/08 12:23:03 ssuominen Exp $
+
+*mpd-0.15.3 (08 Sep 2009)
+
+  08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> +mpd-0.15.3.ebuild:
+  Version bump.
 
   08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Update USE cdio description wrt #283412.
diff --git a/media-sound/mpd/files/0.14.2-mpdconf.patch b/media-sound/mpd/files/0.14.2-mpdconf.patch
deleted file mode 100644
index 6b0b4639327f..000000000000
--- a/media-sound/mpd/files/0.14.2-mpdconf.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -u -r a/doc/mpdconf.example b/doc/mpdconf.example
---- a/doc/mpdconf.example	2008-12-26 20:07:33.000000000 +0100
-+++ b/doc/mpdconf.example	2008-12-26 20:09:37.000000000 +0100
-@@ -1,4 +1,4 @@
--# An example configuration file for MPD
-+# A default Gentoo configuration file for MPD
- # See the mpd.conf man page for a more detailed description of each parameter.
- 
- # Required files and directories ##############################################
-@@ -6,27 +6,27 @@
- # This setting controls the top directory which MPD will search to discover the
- # available audio files and add them to the daemon's online database.
- #
--music_directory			"~/music"
-+music_directory			"/var/lib/mpd/music"
- #
- # This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use 
- # playlist files not created by the server but only if they are in the MPD
- # format.
- #
--playlist_directory		"~/.mpd/playlists"
-+playlist_directory		"/var/lib/mpd/playlists"
- #
- # This setting sets the location of the MPD database. This file is used to
- # load the database at server start up and store the database while the 
- # server is not up.
- #
--db_file				"~/.mpd/database"
-+db_file				"/var/lib/mpd/database"
- # 
- # These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
- # settings.
- #
--log_file			"~/.mpd/log"
--error_file			"~/.mpd/error-log"
-+log_file			"/var/log/mpd/mpd.log"
-+error_file			"/var/log/mpd/mpd.error.log"
- ###############################################################################
- 
- 
-@@ -36,13 +36,13 @@
- # for use of mpd --kill and some init scripts. This setting is disabled by
- # default.
- #
--#pid_file			"~/.mpd/pid"
-+pid_file			"/var/run/mpd/mpd.pid"
- #
- # This setting sets the location of the file which contains information about
- # most variables to get MPD back into the same general shape it was in before
- # it was brought down. This setting is disabled by default.
- #
--#state_file			"~/.mpd/state"
-+state_file			"/var/lib/mpd/state"
- #
- ###############################################################################
- 
-@@ -55,17 +55,17 @@
- # unprivileged user. This setting is disabled by default, and the server will
- # run as root.
- #
--#user				"nobody"
-+user				"mpd"
- #
- # This setting sets the address for the daemon to listen on. Careful attention
- # should be paid if this is assigned to anything other then the default, any.
- # This setting can deny access to control of the daemon.
- #
- # For network
--#bind_to_address		"any"
-+bind_to_address			"localhost"
- #
- # And for Unix Socket
--#bind_to_address		"~/.mpd/socket"
-+bind_to_address			"/var/lib/mpd/socket"
- #
- # This setting is the port that is desired for the daemon to get assigned to.
- #
diff --git a/media-sound/mpd/mpd-0.14.2.ebuild b/media-sound/mpd/mpd-0.14.2.ebuild
deleted file mode 100644
index 37c4f871ef04..000000000000
--- a/media-sound/mpd/mpd-0.14.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.2.ebuild,v 1.12 2009/05/20 16:23:45 ssuominen Exp $
-
-EAPI=2
-
-inherit flag-o-matic eutils
-
-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 +curl debug doc +ffmpeg flac icecast +id3 ipv6 jack
-lame libsamplerate +mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
-
-RDEPEND="!sys-cluster/mpich2
-	>=dev-libs/glib-2.4:2
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac
-		ogg? ( media-libs/flac[ogg] ) )
-	icecast? ( lame? ( media-libs/libshout )
-		vorbis? ( media-libs/libshout ) )
-	id3? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( icecast? ( media-sound/lame ) )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( media-libs/libmpcdec )
-	ogg? ( media-libs/libogg )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-text/xmlto )"
-
-pkg_setup() {
-	if use icecast && ! use lame && ! use vorbis; then
-		ewarn "USE=icecast enabled but lame and vorbis disabled,"
-		ewarn "disabling icecast"
-	fi
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_prepare() {
-	cp doc/mpdconf.example doc/mpdconf.dist
-	epatch "${FILESDIR}"/${PV}-mpdconf.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	if ! use alsa && ! use ao && ! use icecast && ! use jack && ! use oss && \
-		! use pulseaudio; then
-		eerror "You did not enable any output backend."
-		einfo "Please enable one of the following USE flags:"
-		einfo "USE=alsa - output via ALSA"
-		einfo "USE=ao - output via media-libs/libao"
-		einfo "USE=icecast - output via net-misc/icecast"
-		einfo "USE=jack - output via media-sound/jack-audio-connection-kit"
-		einfo "USE=oss - output via OSS"
-		einfo "USE=pulseaudio - output via media-sound/pulseaudio"
-		die "No audio output enabled"
-	fi
-
-	if use icecast; then
-		myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)
-			$(use_enable lame lametest) $(use_enable lame)"
-	else
-		myconf+=" --disable-shout_ogg --disable-shout_mp3 --disable-lametest
-			--disable-lame"
-	fi
-
-	if use ogg && use flac; then
-		myconf+=" --enable-oggflac --enable-libOggFLACtest"
-	else
-		myconf+=" --disable-oggflac --disable-libOggFLACtest"
-	fi
-
-	append-lfs-flags
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable flac) \
-		$(use_enable id3) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad mp3) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable wavpack) \
-		$(use_with zeroconf zeroconf avahi) \
-		--enable-un \
-		${myconf}
-}
-
-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 TODO UPGRADING
-	dodoc doc/mpdconf.dist
-	use doc && dohtml doc/protocol.html
-
-	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."
-	elog
-	elog "MPD now uses a new format for its internal database."
-	elog "To make use of this new database, stop mpd:"
-	elog "# /etc/init.d/mpd stop"
-	elog "Delete the old database, as specified in your /etc/mpd.conf's db_file
-variable"
-	elog "# rm -i /var/lib/mpd/database"
-	elog "optinally also delete the state file in the same directory"
-	elog "# rm -i /var/lib/mpd/state"
-	elog "and force mpd to re-create a new database. Using 'update' from within"
-	elog "a client is not enough, as it doesn't update the database format."
-	elog "# mpd --create-db"
-	elog "Remember to re-create a playlist and your config options, such as"
-	elog "crossfade, repeat, random etc if you deleted the state file."
-	elog "# /etc/init.d/mpd start"
-
-	# 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.1.ebuild b/media-sound/mpd/mpd-0.15.1.ebuild
deleted file mode 100644
index a76d08df4052..000000000000
--- a/media-sound/mpd/mpd-0.15.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.1.ebuild,v 1.3 2009/07/26 13:13:04 ssuominen 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 +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
-mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
-vorbis wavpack zip"
-
-RDEPEND="!sys-cluster/mpich2
-	>=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? ( media-video/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	id3? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libmms? ( >=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
-		media-libs/libmpcdec ) )
-	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}"/${PV}-mpdconf.patch
-}
-
-src_configure() {
-	use profile && filter-flags -fomit-frame-pointer
-
-	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 libmms mms) \
-		$(use_enable bzip2) $(use_enable zip) \
-		$(use_enable cdio iso9660) $(use_enable 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.15.2.ebuild b/media-sound/mpd/mpd-0.15.3.ebuild
index 668ddc24f759..147901c760a0 100644
--- a/media-sound/mpd/mpd-0.15.2.ebuild
+++ b/media-sound/mpd/mpd-0.15.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.2.ebuild,v 1.1 2009/08/19 22:49:15 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.3.ebuild,v 1.1 2009/09/08 12:23:03 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib