Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 54 insertions, 60 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index ca3aeb9c0552..422f352b935f 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.164 2009/05/15 03:47:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.165 2009/05/15 04:25:24 ssuominen Exp $
+
+*mpd-0.15_beta2 (15 May 2009)
+
+  15 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/0.15_beta1-mpdconf.patch, -mpd-0.15_beta1.ebuild,
+  +files/0.15_beta2-mpdconf.patch, +mpd-0.15_beta2.ebuild:
+  Version bump.
 
 *mpd-0.15_beta1 (15 May 2009)
 
diff --git a/media-sound/mpd/files/0.15_beta1-mpdconf.patch b/media-sound/mpd/files/0.15_beta2-mpdconf.patch
index b0fface1ba16..5f332ed15faa 100644
--- a/media-sound/mpd/files/0.15_beta1-mpdconf.patch
+++ b/media-sound/mpd/files/0.15_beta2-mpdconf.patch
@@ -1,6 +1,6 @@
-diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.example
---- mpd-0.15~beta1.orig/doc/mpdconf.example	2009-04-30 17:35:31.000000000 +0300
-+++ mpd-0.15~beta1/doc/mpdconf.example	2009-05-15 05:39:38.000000000 +0300
+diff -ur mpd-0.15~beta2.orig/doc/mpdconf.example mpd-0.15~beta2/doc/mpdconf.example
+--- mpd-0.15~beta2.orig/doc/mpdconf.example	2009-05-08 13:30:24.000000000 +0300
++++ mpd-0.15~beta2/doc/mpdconf.example	2009-05-15 07:05:30.000000000 +0300
 @@ -1,4 +1,4 @@
 -# An example configuration file for MPD
 +# A default Gentoo configuration file for MPD
@@ -12,7 +12,7 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # file:// protocol) or streaming files over an accepted protocol.
  #
 -#music_directory		"~/music"
-+music_directory "/var/lib/mpd/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 
@@ -20,7 +20,7 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # format. This setting defaults to playlist saving being disabled.
  #
 -#playlist_directory		"~/.mpd/playlists"
-+playlist_directory "/var/lib/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 
@@ -29,7 +29,7 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # files over an accepted protocol.
  #
 -#db_file			"~/.mpd/database"
-+db_file "/var/lib/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
@@ -38,14 +38,14 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # setting defaults to logging to syslog, otherwise logging is disabled.
  #
 -#log_file			"~/.mpd/log"
-+log_file "/var/log/mpd/mpd.log"
++log_file			"/var/log/mpd/mpd.log"
  #
  # This setting sets the location of the file which stores the process ID
  # for use of mpd --kill and some init scripts. This setting is disabled by
  # default and the pid file will not be stored.
  #
 -#pid_file			"~/.mpd/pid"
-+pid_file "/var/run/mpd/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
@@ -53,7 +53,7 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # state will be reset on server start up.
  #
 -#state_file			"~/.mpd/state"
-+state_file "/var/lib/mpd/state"
++state_file			"/var/lib/mpd/state"
  #
  ###############################################################################
  
@@ -62,7 +62,7 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  # current user.
  #
 -#user				"nobody"
-+user "mpd"
++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.
@@ -70,11 +70,11 @@ diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.exam
  #
  # For network
 -#bind_to_address		"any"
-+bind_to_address	"localhost"
++bind_to_address			"localhost"
  #
  # And for Unix Socket
 -#bind_to_address		"~/.mpd/socket"
-+bind_to_address	"/var/lib/mpd/socket"
++bind_to_address			"/var/lib/mpd/socket"
  #
  # This setting is the TCP port that is desired for the daemon to get assigned
  # to.
diff --git a/media-sound/mpd/mpd-0.15_beta1.ebuild b/media-sound/mpd/mpd-0.15_beta2.ebuild
index cae1a0e8cb35..bfced2fba984 100644
--- a/media-sound/mpd/mpd-0.15_beta1.ebuild
+++ b/media-sound/mpd/mpd-0.15_beta2.ebuild
@@ -1,9 +1,9 @@
 # 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_beta1.ebuild,v 1.1 2009/05/15 03:47:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_beta2.ebuild,v 1.1 2009/05/15 04:25:24 ssuominen Exp $
 
 EAPI=2
-inherit flag-o-matic eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
@@ -13,7 +13,9 @@ 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 doc +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 zeroconf zip"
+fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
+mikmod modplug musepack network ogg oss pipe pulseaudio sid sqlite unicode
+vorbis wavpack zeroconf zip"
 
 RDEPEND="!sys-cluster/mpich2
 	>=dev-libs/glib-2.4:2
@@ -51,7 +53,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen
 		app-text/xmlto )"
 
-S=${WORKDIR}/${P/_/~}
+S=${WORKDIR}/${P/_/\~}
 
 pkg_setup() {
 	if ! use network; then
@@ -63,20 +65,18 @@ pkg_setup() {
 	fi
 
 	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
+	cp -f "${S}"/doc/mpdconf.example "${S}"/doc/mpdconf.dist
 	epatch "${FILESDIR}"/${PV}-mpdconf.patch
 }
 
 src_configure() {
-	append-lfs-flags
-	# OggFLACtest is for <=flac-1.2.2
-	local mpdconf="--disable-dependency-tracking --enable-tcp
-		--enable-un --disable-wildmidi --disable-mvp
-		--disable-libOggFLACtest --disable-werror"
+	local mpdconf="--enable-tcp --enable-un --disable-wildmidi
+		--disable-libOggFLACtest"
 
 	if use network; then
 		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
@@ -87,46 +87,33 @@ src_configure() {
 	fi
 
 	if use flac && use ogg; then
-		myconf+=" --enable-oggflac"
+		mpdconf+=" --enable-oggflac"
 	else
-		myconf+=" --disable-oggflag"
+		mpdconf+=" --disable-oggflag"
 	fi
 
+	append-lfs-flags
+
+	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 doc documentation) \
-		$(use_enable debug) \
-		$(use_enable profile gprof) \
-		$(use_with zeroconf zeroconf avahi) \
+		$(use_enable ipv6) $(use_enable cue) \
+		$(use_enable sqlite 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 doc documentation) $(use_enable debug) \
+		$(use_enable profile gprof) $(use_with zeroconf zeroconf avahi) \
 		${mpdconf}
 }
 
@@ -139,7 +126,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	rm -rf "${D}"/usr/share/doc/mpd
 
-	dodoc AUTHORS NEWS README TODO UPGRADING
+	dodoc AUTHORS NEWS README UPGRADING
 	dodoc doc/mpdconf.dist
 	use doc && dohtml doc/protocol.html