Snapshot update. Use new initscript.

Package-Manager: portage-2.0.51.19

5 files changed, 170 insertions, 5 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index 14a72051d5d5..5f5fbfaf97b3 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd-svn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.5 2005/03/11 19:06:09 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.6 2005/03/13 12:03:11 ticho Exp $
+
+*mpd-svn-20050312 (13 Mar 2005)
+
+  13 Mar 2005; Andrej Kacian <ticho@gentoo.org> +files/mpd.pidfile.rc6,
+  +mpd-svn-20050312.ebuild:
+  Snapshot update. Use new initfile, based on pidfile, provided by Avuton
+  Olrich <avuton@gmail.com>.
 
 *mpd-svn-20050308 (11 Mar 2005)
 
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 1206e4546431..454eb734cf1b 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 653fc329dc6a7a0edaf770d6f93b5c6a ChangeLog 1580
+MD5 4c003907e4e0b2a947a1c7adf9429976 ChangeLog 1817
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
+MD5 5a4765c742d30faf156bab729fbf06e7 mpd-svn-20050312.ebuild 3654
 MD5 02fed60e83a2a4fa97ffb270283f346b mpd-svn-20050131.ebuild 3196
 MD5 e7f3e335924e2b9efad414e4f269076d mpd-svn-20041207.ebuild 3111
 MD5 fd2c2dd25dc00071a4f48bc07eb8fca4 mpd-svn-20050308.ebuild 3497
 MD5 22e3fa9684ff58f754a41fb785c8b32a files/digest-mpd-svn-20050131 69
+MD5 e3327bcec95f3e72efa0fb37e77e5812 files/mpd.pidfile.rc6 815
 MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
+MD5 9d06583bf2f3ca00fa9a5ae6c01cab9b files/digest-mpd-svn-20050312 69
 MD5 51916f6bb6ff487021c4c26f76a1d8e7 files/digest-mpd-svn-20050308 69
 MD5 a7cc5b5be644089b25d206fe9b71ebd1 files/digest-mpd-svn-20041207 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCMew/QlM6RnzZP+IRAtDnAJ9W2fGNeO4cHpHW/HRVP4v5M7jRHACfZ32q
-/Ugewit4BKqWGL1wuSwTszg=
-=tz/r
+iD8DBQFCNCwIQlM6RnzZP+IRAkYYAJ43H6TQpr8Qkxo6DxB/QaNXYoIwGACgvVaV
+8iNhFf8IO9hNFESEOOgBX8k=
+=zWyl
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050312 b/media-sound/mpd-svn/files/digest-mpd-svn-20050312
new file mode 100644
index 000000000000..571949cfd7f8
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20050312
@@ -0,0 +1 @@
+MD5 fba4bd46c2e2cfb71fe468a8c50dbab2 mpd-svn-20050312.tar.bz2 854281
diff --git a/media-sound/mpd-svn/files/mpd.pidfile.rc6 b/media-sound/mpd-svn/files/mpd.pidfile.rc6
new file mode 100755
index 000000000000..ee011c65d6c8
--- /dev/null
+++ b/media-sound/mpd-svn/files/mpd.pidfile.rc6
@@ -0,0 +1,37 @@
+#!/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-svn/files/mpd.pidfile.rc6,v 1.1 2005/03/13 12:03:11 ticho Exp $
+
+depend() {
+	need localmount
+} 
+
+checkconfig() {
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	if ! [ -f /var/run/mpd.pid ]; then
+		touch /var/run/mpd.pid
+		chmod 750 /var/run/mpd.pid
+		chown mpd /var/run/mpd.pid
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon" 
+	start-stop-daemon --start --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	start-stop-daemon --stop --pidfile /var/run/mpd.pid
+	eend $? 
+}
diff --git a/media-sound/mpd-svn/mpd-svn-20050312.ebuild b/media-sound/mpd-svn/mpd-svn-20050312.ebuild
new file mode 100644
index 000000000000..b667dd58c66e
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20050312.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050312.ebuild,v 1.1 2005/03/13 12:03:11 ticho Exp $
+
+IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao"
+
+inherit eutils
+
+DESCRIPTION="A development version of Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="!media-sound/mpd
+	oggvorbis? ( media-libs/libvorbis )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	mikmod? ( media-libs/libmikmod )
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.4 )
+	sys-libs/zlib
+	dev-util/gperf
+	icecast? ( media-libs/libshout )"
+
+pkg_setup() {
+	enewuser mpd '' '' '' audio || die "problem adding user mpd"
+}
+
+src_compile() {
+	econf `use_enable aac` \
+		`use_enable oggvorbis ogg` \
+		`use_enable oggvorbis oggtest` \
+		`use_enable oggvorbis vorbistest` \
+		`use_enable audiofile` \
+		`use_enable audiofile audiofiletest` \
+		`use_enable ipv6` \
+		`use_enable flac libFLACtest` \
+		`use_enable flac` \
+		`use_enable !mad mpd-mad` \
+		`use_enable !mad id3tag` \
+		`use_enable mikmod libmikmodtest` \
+		`use_enable mikmod mod` \
+		`use_enable ao` \
+		`use_enable icecast shout` || 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
+
+	emake install DESTDIR=${D} || die
+	rm -rf ${D}/usr/share/doc/mpd/
+	dodoc COPYING 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.pidfile.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 "/usr/share/mpd/music":' /etc/mpd.conf
+	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/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
+	diropts -m0755 -o mpd -g audio
+	dodir /usr/share/mpd/music
+	keepdir /usr/share/mpd/music
+	dodir /usr/share/mpd/playlists
+	keepdir /usr/share/mpd/playlists
+	dodir /usr/share/mpd/
+	insinto /var/log
+	touch ${T}/blah
+	insopts -m0640 -o mpd -g audio
+	newins ${T}/blah mpd.log
+	newins ${T}/blah mpd.error.log
+}
+
+pkg_postinst() {
+	echo
+	einfo "The default config now binds the daemon strictly to localhost, rather than"
+	einfo "to all available IPs."
+	echo
+	if use ao; then
+		einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
+		einfo "please refer to the FAQ"
+		einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are having problems."
+		echo
+	else
+		draw_line
+		ewarn "As you're not using libao for audio output, you need to adjust audio_output"
+		ewarn "sections in /etc/mpd.conf to use ALSA or OSS. See"
+		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
+		draw_line
+		echo
+	fi
+	ewarn "Note that this is just a development version of Music Player Daemon,"
+	ewarn "so if you want to report any bug, please state this fact in your"
+	ewarn "report, as well as the fact that you used a ${P} Gentoo ebuild."
+	echo
+}