Fixed $S and mpdconf.patch

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

8 files changed, 116 insertions, 20 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/Manifest b/media-sound/mpd/Manifest
index 590958684f35..79342581573f 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.13.2-mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
+AUX 0.14.2-mpdconf.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SHA1 70a087a8de4b6abd185cb223d738db1f5544b9d8 SHA256 b31d7f3d426b9183b354cedeb1757f05c0ad7724a97c8c1bc7cc75cbfcac80cc
+AUX 0.15_alpha1-mpdconf.patch 3023 RMD160 e00f9d2cd3d4e2d6c3032367300698a71e69d922 SHA1 a407db238b56e804b24f89268450aa75fdfcc649 SHA256 c6a46c0535331e60a57d94dd347ac60d33303a5f88a5e0b89219cfdb6312be5a
 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664
-AUX mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
-AUX mpdconf1.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SHA1 70a087a8de4b6abd185cb223d738db1f5544b9d8 SHA256 b31d7f3d426b9183b354cedeb1757f05c0ad7724a97c8c1bc7cc75cbfcac80cc
 DIST mpd-0.13.2.tar.bz2 413347 RMD160 39825142d8f19ca04d7a2e025b59043a8adb53fa SHA1 3b826bc75c314e6db6715a978c9b405775d3478c SHA256 d98db80ec0bba7d4a82a8aecff965f6887f7b055ad064d8d5ccb55cc614cdfb5
 DIST mpd-0.14.2.tar.bz2 287115 RMD160 4580907acdf361713bf3fe881a47871e84dfa864 SHA1 1ac9f6eff72c9e061af670e195da824310f3d922 SHA256 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
 DIST mpd-0.15_alpha1.tar.bz2 352935 RMD160 ef3a3a94f2e886c72d96c29d0d3ae556ef401e3b SHA1 7265733fc67f48b6bbb6ab2b035189721a90966d SHA256 5c415e5160f04471c95d160c7f65ecd51ac17c12ff26322687a3eba859e55138
-EBUILD mpd-0.13.2.ebuild 3553 RMD160 5c47c39953147d7e19decc156a126a63e68abc26 SHA1 6a11d9ce1b52107fe5dc29600137a702e168ce78 SHA256 8da5aa4a463f6a32a88fa4fde6798333906a77d674f0e7e2acb97b96e2b03d6d
-EBUILD mpd-0.14.2.ebuild 4515 RMD160 a33f04389f8619c94f9f0f2c1cf7df1359af8351 SHA1 ac17c062b4977d1d5c5fac2fd4a9cc0dffe74919 SHA256 a4d3b90b611169e68cab7af34f28ce419bb834d6e39b7bb7bb9a8758453038a0
-EBUILD mpd-0.15_alpha1.ebuild 4917 RMD160 ffb8321dbe629ed451f0b0f413c58e14b8305051 SHA1 04cc94f18b5a5aa43c8b08e874f6e27d9aa1b9f8 SHA256 27e122dd652c09546dbb58d2ab572c7bcaf75311f8b9e3ef4af43432f65c5238
-MISC ChangeLog 24370 RMD160 3310320a11376c4343d21546ccd45b8fb977972e SHA1 90d6c7a9fdd105a729804667489ecc682998a72d SHA256 50da1f800563eb15e17f75bd0625f6212b9a18420c25cd9a877100078aac05b7
+EBUILD mpd-0.13.2.ebuild 3559 RMD160 c542b8f6d55a4b88488311bc75ddfb2cfb801a0e SHA1 6af71885a074559f9b157bf2f167778005106836 SHA256 2ab611e49d6352339cfe9d9312a1e7c6254944a4d2ded991ebd2d65dee3d972e
+EBUILD mpd-0.14.2.ebuild 4521 RMD160 12491bc2194369754500e15038bc7c54cce757ce SHA1 7347a5b12fa1a349e56c1b7b86c2e186c02ccc13 SHA256 1ea68888f92f673b022bb233c9f2d75830f10d8e1e9a06b5b074b0905ecf9647
+EBUILD mpd-0.15_alpha1.ebuild 5126 RMD160 0e572b29ffa34f0824ba11beb2279a83706cfb0d SHA1 6ee1f37822df99935bccbbb33bea38c85b88360e SHA256 b2fd9088f4a8a95c5ad2483a93fde8b0752fd672f9923994a553627b8058ee74
+MISC ChangeLog 24657 RMD160 b50c71623fb6e8f494ecfe7503337ecf8bf75e87 SHA1 26416a58c8c407607bb769b83f2d21b66e0ef6c0 SHA256 cd361245b84247f2ae7a22909b0360161abf3d2a89224c4e1d680e42a7e089b4
 MISC metadata.xml 1160 RMD160 cc2892e87f913ab202bc3194e647e6bddde64a76 SHA1 5d8631a40c4ba426370df094eef1a71d8eb486d0 SHA256 151307b7e3164cee6edd336adc42992ed8ac75d1046830aaa84304d50c0f67e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknkjCoACgkQKhnDs22gwa9x1ACgnvGmnYSi/LFqCzRKSzfNhsXJ
-oFoAoMOR1WZU2/dHdZGg7bU6WygDrp8n
-=iz7w
+iEYEARECAAYFAknk0JEACgkQKhnDs22gwa8gBQCg9KZHJ+Nk7+ABXm2oU52+Iwak
+qHsAoL+KwFj5DF0BY07UvCN8W+Q3ofmz
+=h8Ge
 -----END PGP SIGNATURE-----
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) \