Version bump

(Portage version: 2.2_rc17/cvs/Linux 2.6.28 x86_64)

3 files changed, 78 insertions, 46 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index e34e1f705193..878176c46706 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.144 2008/12/25 10:21:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.145 2008/12/26 19:20:18 angelos Exp $
+
+*mpd-0.14 (26 Dec 2008)
+
+  26 Dec 2008; Christoph Mende <angelos@gentoo.org> files/mpdconf1.patch,
+  -mpd-0.14_beta3.ebuild, +mpd-0.14.ebuild:
+  Version bump
 
   25 Dec 2008; Christoph Mende <angelos@gentoo.org> mpd-0.14_beta3.ebuild:
   Fixed alsa/unicode sed in src_install, bug 252342
diff --git a/media-sound/mpd/files/mpdconf1.patch b/media-sound/mpd/files/mpdconf1.patch
index f48208106a26..6b0b4639327f 100644
--- a/media-sound/mpd/files/mpdconf1.patch
+++ b/media-sound/mpd/files/mpdconf1.patch
@@ -1,51 +1,79 @@
---- doc/mpdconf.example	2008-12-03 05:01:07.000000000 +0100
-+++ doc/mpdconf.example.gentoo	2008-12-05 23:25:32.000000000 +0100
-@@ -1,12 +1,12 @@
+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 PATHS ########################
--music_directory                 "~/music"
--playlist_directory              "~/.mpd/playlists"
--db_file                         "~/.mpd/mpd.db"
--log_file                        "~/.mpd/mpd.log"
--error_file                      "~/.mpd/mpd.error"
-+music_directory                 "/var/lib/mpd/music"
-+playlist_directory              "/var/lib/mpd/playlists"
-+db_file                         "/var/lib/mpd/database"
-+log_file                        "/var/log/mpd/mpd.log"
-+error_file                      "/var/log/mpd/mpd.error.log"
- #follow_outside_symlinks         "yes"
- #follow_inside_symlinks          "yes"
- ################################################################
-@@ -17,13 +17,13 @@
- # If you wish to use mpd --kill to stop MPD, then you must
- # specify a file here in which to store MPD's process ID.
- #
--#pid_file                        "~/.mpd/mpd.pid"
-+pid_file                        "/var/run/mpd/mpd.pid"
- #
- # If specified, MPD will save its current state (playlist,
- # current song, playing/paused, etc.) at exit.  This will be
- # used to restore the session the next time it is run.
- #
--#state_file                      "~/.mpd/mpdstate"
-+state_file                      "/var/lib/mpd/state"
- #
- ################################################################
+ # 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"
+ ###############################################################################
+ 
  
-@@ -35,11 +35,11 @@
- # started by.  If left unspecified, MPD will not drop root
- # privileges at all (not recommended).
+@@ -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.
  #
--#user                            "nobody"
-+user                            "mpd"
+ # For network
+-#bind_to_address		"any"
++bind_to_address			"localhost"
  #
- # The address and port to listen on.
+ # And for Unix Socket
+-#bind_to_address		"~/.mpd/socket"
++bind_to_address			"/var/lib/mpd/socket"
  #
--#bind_to_address                 "any"
-+bind_to_address                 "localhost"
- #port                            "6600"
+ # This setting is the port that is desired for the daemon to get assigned to.
  #
- # Controls the amount of information that is logged.  Can be
diff --git a/media-sound/mpd/mpd-0.14_beta3.ebuild b/media-sound/mpd/mpd-0.14.ebuild
index 4511d96e9908..3c6bd6ba2cdc 100644
--- a/media-sound/mpd/mpd-0.14_beta3.ebuild
+++ b/media-sound/mpd/mpd-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_beta3.ebuild,v 1.5 2008/12/25 10:21:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.ebuild,v 1.1 2008/12/26 19:20:18 angelos Exp $
 
 EAPI=2
 
@@ -43,8 +43,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-text/xmlto )"
 
-S="${WORKDIR}/${PN}-${PV/_/~}"
-
 pkg_setup() {
 	if use icecast && ! use lame && ! use vorbis; then
 		ewarn "USE=icecast enabled but lame and vorbis disabled,"