Fixed $S and mpdconf.patch

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

7 files changed, 106 insertions, 11 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index b11d96373733..991c23e9498a 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.161 2009/04/14 13:14:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.162 2009/04/14 18:06:00 angelos Exp $
+
+  14 Apr 2009; Christoph Mende <angelos@gentoo.org>
+  +files/0.14.2-mpdconf.patch, +files/0.15_alpha1-mpdconf.patch,
+  +files/0.13.2-mpdconf.patch, -files/mpdconf.patch, -files/mpdconf1.patch,
+  mpd-0.13.2.ebuild, mpd-0.14.2.ebuild, mpd-0.15_alpha1.ebuild:
+  Fixed $S and mpdconf.patch
 
 *mpd-0.15_alpha1 (14 Apr 2009)
 
diff --git a/media-sound/mpd/files/mpdconf.patch b/media-sound/mpd/files/0.13.2-mpdconf.patch
index d37f629d5cac..d37f629d5cac 100644
--- a/media-sound/mpd/files/mpdconf.patch
+++ b/media-sound/mpd/files/0.13.2-mpdconf.patch
diff --git a/media-sound/mpd/files/mpdconf1.patch b/media-sound/mpd/files/0.14.2-mpdconf.patch
index 6b0b4639327f..6b0b4639327f 100644
--- a/media-sound/mpd/files/mpdconf1.patch
+++ b/media-sound/mpd/files/0.14.2-mpdconf.patch
diff --git a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch b/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
new file mode 100644
index 000000000000..8407f79135bd
--- /dev/null
+++ b/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
@@ -0,0 +1,81 @@
+diff --git a/doc/mpdconf.example b/doc/mpdconf.example
+index e231296..77f6d11 100644
+--- a/doc/mpdconf.example
++++ b/doc/mpdconf.example
+@@ -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.
+ 
+ 
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#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. This setting defaults to playlist saving being disabled.
+ #
+-#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 
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#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
+@@ -34,20 +34,20 @@
+ # The special value "syslog" makes MPD use the local syslog daemon. This
+ # setting defaults to logging to syslog, otherwise logging is disabled.
+ #
+-#log_file			"~/.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"
+ #
+ # 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 and the server 
+ # state will be reset on server start up.
+ #
+-#state_file			"~/.mpd/state"
++state_file			"/var/lib/mpd/state"
+ #
+ ###############################################################################
+ 
+@@ -59,17 +59,17 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#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 TCP port that is desired for the daemon to get assigned
+ # to.
diff --git a/media-sound/mpd/mpd-0.13.2.ebuild b/media-sound/mpd/mpd-0.13.2.ebuild
index f3a392cc8481..0b0679f57267 100644
--- a/media-sound/mpd/mpd-0.13.2.ebuild
+++ b/media-sound/mpd/mpd-0.13.2.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.13.2.ebuild,v 1.10 2009/03/10 21:00:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.11 2009/04/14 18:06:00 angelos Exp $
 
 EAPI="2"
 
@@ -42,7 +42,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
+	epatch "${FILESDIR}"/${PV}-mpdconf.patch || die "epatch for config file failed"
 }
 
 src_compile() {
diff --git a/media-sound/mpd/mpd-0.14.2.ebuild b/media-sound/mpd/mpd-0.14.2.ebuild
index b2536c8a5d40..2e2c668b9a0f 100644
--- a/media-sound/mpd/mpd-0.14.2.ebuild
+++ b/media-sound/mpd/mpd-0.14.2.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.14.2.ebuild,v 1.9 2009/04/14 13:14:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.2.ebuild,v 1.10 2009/04/14 18:06:00 angelos Exp $
 
 EAPI=2
 
@@ -55,7 +55,7 @@ pkg_setup() {
 
 src_prepare() {
 	cp doc/mpdconf.example doc/mpdconf.dist
-	epatch "${FILESDIR}"/mpdconf1.patch
+	epatch "${FILESDIR}"/${PV}-mpdconf.patch
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.15_alpha1.ebuild b/media-sound/mpd/mpd-0.15_alpha1.ebuild
index abc2a4e15413..7c221bef7614 100644
--- a/media-sound/mpd/mpd-0.15_alpha1.ebuild
+++ b/media-sound/mpd/mpd-0.15_alpha1.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_alpha1.ebuild,v 1.1 2009/04/14 13:14:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_alpha1.ebuild,v 1.2 2009/04/14 18:06:00 angelos Exp $
 
 EAPI=2
 
@@ -53,10 +53,12 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen
 		app-text/xmlto )"
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_setup() {
-	if use icecast || use http; then
+	if use icecast || use http-stream; then
 		if ! use lame && ! use vorbis; then
-			eerror "Icecast or http output streaming is enabled,"
+			eerror "Icecast or http-stream output streaming is enabled,"
 			eerror "but there is no encoding enabled (lame and"
 			eerror "vorbis are both disabled)."
 		fi
@@ -76,16 +78,22 @@ pkg_setup() {
 
 src_prepare() {
 	cp doc/mpdconf.example doc/mpdconf.dist
-	epatch "${FILESDIR}"/mpdconf1.patch
+	epatch "${FILESDIR}"/${PV}-mpdconf.patch
 }
 
 src_configure() {
-	if use icecast || use http; then
+	if use icecast || use http-stream; then
 		myconf="$(use_enable lame lame-encoder) $(use_enable vorbis vorbis-encoder)"
 	else
 		myconf="--disable-lame-encoder --disable-vorbis-encoder"
 	fi
 
+	if use ogg && use flac; then
+		myconf+=" --enable-oggflac --enable-libOggFLACtest"
+	else
+		myconf+=" --disable-oggflac --disable-libOggFLACtest"
+	fi
+
 	append-lfs-flags
 
 	econf \
@@ -103,7 +111,7 @@ src_configure() {
 		$(use_enable ffmpeg) \
 		$(use_enable flac) \
 		$(use_enable gprof) \
-		$(use_enable http httpd-output) \
+		$(use_enable http-stream httpd-output) \
 		$(use_enable id3) \
 		$(use_enable ipv6) \
 		$(use_enable jack) \