New snapshot. Modify initscript to 'need alsasound' if alsa USE flag is set.

(Portage version: 2.0.51.19)

4 files changed, 132 insertions, 11 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index bea8c925e79f..ccc2896376fc 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2005/03/28 15:24:24 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.9 2005/04/07 23:56:06 ticho Exp $
+
+*mpd-svn-20050408 (07 Apr 2005)
+
+  07 Apr 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050408.ebuild:
+  New snapshot. Modify the initscript to 'need alsasound' if alsa USE flag is
+  enabled, so mpd doesn't start without alsa.
 
 *mpd-svn-20050328 (28 Mar 2005)
 
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 3ce8b700b47e..e6207a1902a6 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e490fa439364ebac45b72455f9b811d3 ChangeLog 2053
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
 MD5 d11cec98d13ab49a23ef8a4c99f41558 mpd-svn-20050328.ebuild 3738
 MD5 a949f2738fb9b8c36a256ac9531fda4d mpd-svn-20050312.ebuild 3738
 MD5 02fed60e83a2a4fa97ffb270283f346b mpd-svn-20050131.ebuild 3196
 MD5 e7f3e335924e2b9efad414e4f269076d mpd-svn-20041207.ebuild 3111
+MD5 0d9ee5d688c7ccb9b46cf3c0b5356f3b mpd-svn-20050408.ebuild 3701
 MD5 fd2c2dd25dc00071a4f48bc07eb8fca4 mpd-svn-20050308.ebuild 3497
 MD5 22e3fa9684ff58f754a41fb785c8b32a files/digest-mpd-svn-20050131 69
 MD5 02158d2f5c411a78b65c7f692fb81405 files/mpd.pidfile.rc6 717
 MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
 MD5 9d06583bf2f3ca00fa9a5ae6c01cab9b files/digest-mpd-svn-20050312 69
+MD5 c5dbcf547c18db7bc2f46dfcc877190b files/digest-mpd-svn-20050408 69
 MD5 51916f6bb6ff487021c4c26f76a1d8e7 files/digest-mpd-svn-20050308 69
 MD5 e236710f9d5c01c3f97b53f1c2013a19 files/digest-mpd-svn-20050328 69
 MD5 a7cc5b5be644089b25d206fe9b71ebd1 files/digest-mpd-svn-20041207 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSCNzQlM6RnzZP+IRAmEHAJ9dD19jAcdY7C1PDLJjXkZMtYQJGACgm/dt
-xTjszl40w70S0Rm6Ry0/8nE=
-=uu/2
------END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050408 b/media-sound/mpd-svn/files/digest-mpd-svn-20050408
new file mode 100644
index 000000000000..601908e9c6a4
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20050408
@@ -0,0 +1 @@
+MD5 04d7d73d16eec28b02ba81e3ec902693 mpd-svn-20050408.tar.bz2 864460
diff --git a/media-sound/mpd-svn/mpd-svn-20050408.ebuild b/media-sound/mpd-svn/mpd-svn-20050408.ebuild
new file mode 100644
index 000000000000..bd7143fc84bf
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20050408.ebuild
@@ -0,0 +1,122 @@
+# 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-20050408.ebuild,v 1.1 2005/04/07 23:56:06 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
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
+}
+
+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
+	einfo "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+	echo
+	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
+}