New RC. Create a separate patch for config file, instead of using sed tweaks.

(Portage version: 2.1.1)

4 files changed, 190 insertions, 1 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index e55742895d86..bb301567268a 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.79 2006/09/10 17:12:17 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.80 2006/09/16 18:19:25 ticho Exp $
+
+*mpd-0.12.0_rc4 (16 Sep 2006)
+
+  16 Sep 2006; <ticho@gentoo.org> +files/mpd-0.12-conf.patch,
+  +mpd-0.12.0_rc4.ebuild:
+  New RC. Create a separate patch for config file, instead of using sed tweaks.
 
   10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   mpd-0.12.0_rc3.ebuild:
diff --git a/media-sound/mpd/files/digest-mpd-0.12.0_rc4 b/media-sound/mpd/files/digest-mpd-0.12.0_rc4
new file mode 100644
index 000000000000..5be7d05ebdcd
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.12.0_rc4
@@ -0,0 +1,3 @@
+MD5 34e69829b8902af7021fe4448f36619c mpd-0.12.0rc4.tar.bz2 397210
+RMD160 a4f7b0b9304005979cbf415dba2c7c4850e0c5c9 mpd-0.12.0rc4.tar.bz2 397210
+SHA256 a6c8492e1ba3bb271f6e33ecbd2a3efc0511ece2f7c277aadb2aa4d43effce65 mpd-0.12.0rc4.tar.bz2 397210
diff --git a/media-sound/mpd/files/mpd-0.12-conf.patch b/media-sound/mpd/files/mpd-0.12-conf.patch
new file mode 100644
index 000000000000..d37f629d5cac
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.12-conf.patch
@@ -0,0 +1,51 @@
+--- doc/mpdconf.example	2006-09-15 03:39:30.000000000 +0200
++++ doc/mpdconf.example.gentoo	2006-09-16 19:57:42.000000000 +0200
+@@ -1,12 +1,12 @@
+-# 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"
+ ################################################################
+ 
+ 
+@@ -15,13 +15,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"
+ #
+ ################################################################
+ 
+@@ -33,11 +33,11 @@
+ # started by.  If left unspecified, MPD will not drop root
+ # privileges at all (not recommended).
+ #
+-#user                            "nobody"
++user                            "mpd"
+ #
+ # The address and port to listen on.
+ #
+-#bind_to_address                 "any"
++bind_to_address                 "localhost"
+ #port                            "6600"
+ #
+ # Controls the amount of information that is logged.  Can be
diff --git a/media-sound/mpd/mpd-0.12.0_rc4.ebuild b/media-sound/mpd/mpd-0.12.0_rc4.ebuild
new file mode 100644
index 000000000000..b2352766b8aa
--- /dev/null
+++ b/media-sound/mpd/mpd-0.12.0_rc4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc4.ebuild,v 1.1 2006/09/16 18:19:25 ticho Exp $
+
+inherit eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A development version of Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://musicpd.org/uploads/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mp3 mikmod mp3 musepack oss
+pulseaudio unicode vorbis"
+
+DEPEND="dev-util/gperf
+	!media-sound/mpd-svn
+	!sys-cluster/mpich2
+	sys-libs/zlib
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( >=media-libs/libao-0.8.4 )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	icecast? ( media-libs/libshout )
+	mp3? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	musepack? ( media-libs/libmpcdec )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )"
+
+S="${WORKDIR}/${MY_P}"
+
+upgrade_warning() {
+	echo
+	ewarn "Home directory of user mpd, as well as default locations in mpd.conf have"
+	ewarn "been changed to /var/lib/mpd, please bear that in mind while updating"
+	ewarn "your mpd.conf file."
+	echo
+	epause 5
+}
+
+pkg_setup() {
+	upgrade_warning
+	enewuser mpd '' '' "/var/lib/mpd" audio || die "problem adding user mpd"
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/mpd-${PV%.*}-conf.patch || die "epatch for config file
+	failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable alsa alsatest) \
+		$(use_enable oss) \
+		$(use_enable mp3) \
+		$(use_enable aac) \
+		$(use_enable ao) \
+		$(use_enable ao aotest) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable flac oggflac) \
+		$(use_enable icecast shout) \
+		$(use_enable ipv6) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable musepack mpc) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable vorbis vorbistest) \
+		|| die "could not configure"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /var/run/mpd
+	fowners mpd:audio /var/run/mpd
+	fperms 750 /var/run/mpd
+	keepdir /var/run/mpd
+
+	emake install DESTDIR=${D} || die
+	rm -rf ${D}/usr/share/doc/mpd/
+	dodoc ChangeLog INSTALL README TODO UPGRADING
+	dodoc doc/COMMANDS doc/mpdconf.example
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mpd-0.12.rc6 mpd
+
+	if use unicode; then
+		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
+	fi
+	diropts -m0755 -o mpd -g audio
+	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
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
+}
+
+pkg_postinst() {
+	upgrade_warning
+	elog "If you are upgrading from 0.11.x, check the configuration file carefully,"
+	elog "the format has changed. See the example config file installed as"
+	elog "/usr/share/doc/${PF}/mpdconf.example.gz, and mpd.conf manual page."
+	elog ""
+	elog "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+}