4 files changed, 177 insertions, 1 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 2c516be3096f..d8f34801979e 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.70 2006/05/08 04:32:51 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.71 2006/08/10 22:54:15 ticho Exp $
+
+*mpd-0.12.0_rc1 (10 Aug 2006)
+
+  10 Aug 2006; Andrej Kacian <ticho@gentoo.org> +files/mpd-0.12.rc6,
+  -mpd-0.11.5.ebuild, +mpd-0.12.0_rc1.ebuild:
+  A release candidate is out - version bump. Use ebuild from latest mpd-svn
+  for this. Remove ebuild for 0.11.5.
 
   08 May 2006; <tcort@gentoo.org> mpd-0.11.5-r2.ebuild:
   Removed INSTALL from dodoc.
diff --git a/media-sound/mpd/files/digest-mpd-0.12.0_rc1 b/media-sound/mpd/files/digest-mpd-0.12.0_rc1
new file mode 100644
index 000000000000..2eddb7597ecf
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.12.0_rc1
@@ -0,0 +1,3 @@
+MD5 dfe66ad3e718d2a54940f42fc3b40699 mpd-0.12.0rc1.tar.bz2 396642
+RMD160 7bbd7d35d3c0c7c35e12c304a9ae5ec78ddb8fb3 mpd-0.12.0rc1.tar.bz2 396642
+SHA256 7ba411c305283feba94ced39e89819690836337493c7336eaea63df3e27a5e4c mpd-0.12.0rc1.tar.bz2 396642
diff --git a/media-sound/mpd/files/mpd-0.12.rc6 b/media-sound/mpd/files/mpd-0.12.rc6
new file mode 100755
index 000000000000..933d79185d04
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.12.rc6
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd-0.12.rc6,v 1.1 2006/08/10 22:54:15 ticho Exp $
+
+depend() {
+	need localmount
+	use netmount nfsmount
+} 
+
+checkconfig() {
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon" 
+	/usr/bin/mpd --no-create-db /etc/mpd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	/usr/bin/mpd --kill
+	eend $? 
+}
diff --git a/media-sound/mpd/mpd-0.12.0_rc1.ebuild b/media-sound/mpd/mpd-0.12.0_rc1.ebuild
new file mode 100644
index 000000000000..2e752ce977b5
--- /dev/null
+++ b/media-sound/mpd/mpd-0.12.0_rc1.ebuild
@@ -0,0 +1,134 @@
+# 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_rc1.ebuild,v 1.1 2006/08/10 22:54:15 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 ~ppc ~x86"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mp3 mikmod mp3 musepack oss
+pulseaudio unicode vorbis"
+
+DEPEND="dev-util/gperf
+	!media-sound/mpd
+	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_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
+	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
+	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
+	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
+	dosed 's:^music_directory.*$:music_directory "/var/lib/mpd/music":' /etc/mpd.conf
+	dosed 's:^playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' /etc/mpd.conf
+	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
+	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
+	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
+	dosed 's:^db_file.*:db_file "/var/lib/mpd/database":' /etc/mpd.conf
+	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state":' /etc/mpd.conf
+	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
+	insinto /var/log
+	touch ${T}/blah
+	insopts -m0640 -o mpd -g audio
+	newins ${T}/blah mpd.log
+	newins ${T}/blah mpd.error.log
+
+	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/mpd-0.12.0_rc1/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."
+}