Update

Package-Manager: portage-2.0.51.22-r1

4 files changed, 143 insertions, 6 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index 8ede359cb689..cd2de3f44122 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2005/05/28 12:54:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.14 2005/06/02 00:37:17 ticho Exp $
+
+*mpd-svn-20050601 (01 Jun 2005)
+
+  01 Jun 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050601.ebuild:
+  Update.
 
   28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
   -mpd-svn-20041207.ebuild, -mpd-svn-20050131.ebuild,
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 58fb0c487259..95cdbe4bb96c 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 0a6ca3b2b58eb62ee45b265196bef90e mpd-svn-20050601.ebuild 3938
 MD5 a832e52d5789026d84611787edddf804 mpd-svn-20050408-r1.ebuild 3945
-MD5 eb61e53262e0de6d71ff1d7db8102244 ChangeLog 3208
+MD5 46c1f3d49efe9cf8edaa458de41f4c5d ChangeLog 3322
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
 MD5 c5dbcf547c18db7bc2f46dfcc877190b files/digest-mpd-svn-20050408-r1 69
 MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
+MD5 1e90c2bf70a37aa60def8f6570621667 files/digest-mpd-svn-20050601 69
 MD5 02158d2f5c411a78b65c7f692fb81405 files/mpd.pidfile.rc6 717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCmGoI06ebR+OMO78RAm/+AKCLg62rXMGpDucxs/F9A/oZXFg7nwCdHAxQ
-P/8dBZ7TIYr7sfEMGBHiQJ0=
-=Epbw
+iD8DBQFCnlTNQlM6RnzZP+IRAiA9AJ9SFV4e6wGude0W8rJPeivZwRvz8gCgp1Gb
+vg2z9DYmJbvxeVgQeQalUnk=
+=nk+q
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050601 b/media-sound/mpd-svn/files/digest-mpd-svn-20050601
new file mode 100644
index 000000000000..de2f3c316ee5
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20050601
@@ -0,0 +1 @@
+MD5 9b115d6e2f149dbd71ca0a5de4aea761 mpd-svn-20050601.tar.bz2 877843
diff --git a/media-sound/mpd-svn/mpd-svn-20050601.ebuild b/media-sound/mpd-svn/mpd-svn-20050601.ebuild
new file mode 100644
index 000000000000..9a4fd780c507
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20050601.ebuild
@@ -0,0 +1,129 @@
+# 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-20050601.ebuild,v 1.1 2005/06/02 00:37:17 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="A development version of Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
+
+DEPEND="dev-util/gperf
+	!media-sound/mpd
+	sys-libs/zlib
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.4 )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	icecast? ( media-libs/libshout )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	musepack? ( >=media-libs/libmusepack-1.1 )
+	ogg? ( media-libs/libogg
+		media-libs/libvorbis )"
+
+pkg_setup() {
+	enewuser mpd '' '' '' audio || die "problem adding user mpd"
+}
+
+src_compile() {
+	econf \
+		$(use_enable aac) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable icecast shout) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable musepack mpc) \
+		$(use_enable ogg) \
+		$(use_enable ogg oggtest) \
+		$(use_enable ogg 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.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,"
+	einfo "rather than 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"
+		einfo "having problems."
+		echo
+	else
+		draw_line
+		ewarn "As you're not using libao for audio output, you need to"
+		ewarn "adjust audio_output sections in /etc/mpd.conf to use"
+		ewarn "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
+}