Snapshot update.

Package-Manager: portage-2.1_pre1

4 files changed, 155 insertions, 5 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index b14b3159e4e0..64829b51c002 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.21 2005/10/24 13:42:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.22 2005/12/20 19:11:35 ticho Exp $
+
+*mpd-svn-20051220 (20 Dec 2005)
+
+  20 Dec 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20051220.ebuild:
+  Snapshot update.
 
   24 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
   Use nfsmount in initscript depend(). Closes bug #110065, reported by Daniel
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 46a0ce1ebc77..15d96a1d323a 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5aaee4580a08242489e872abe32b56e8 ChangeLog 5013
+MD5 e0194c46d10d6321b121946874410ee9 ChangeLog 5140
 MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009 69
 MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009-r1 69
+MD5 921d2be8d2df9c25d2eed2b2f1cac387 files/digest-mpd-svn-20051220 69
 MD5 36e14440a7c1815b23099ef9947b6b7f files/mpd.rc6 732
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
 MD5 4e1010fedc8f20c6380e75590d058437 mpd-svn-20051009-r1.ebuild 4518
 MD5 39c2a66ba6d81e6b63a3aaa9ed58223c mpd-svn-20051009.ebuild 3965
+MD5 8d14139d8e67a6e4881e7e40791410e4 mpd-svn-20051220.ebuild 4493
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXOTdQlM6RnzZP+IRAr/nAKCUvggIL4JgA6FLK8tIxrwOj0LleQCeIkgn
-OXbsKtzW81UJLsux6v1YpOs=
-=Vnek
+iD8DBQFDqFd1QlM6RnzZP+IRAvxKAJwMjRQclIc92JLf9OIyACuplbICSQCdFy7d
+x5OWwAfatyPXrDJXxQ6DHuM=
+=k95r
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20051220 b/media-sound/mpd-svn/files/digest-mpd-svn-20051220
new file mode 100644
index 000000000000..8e5566e28409
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20051220
@@ -0,0 +1 @@
+MD5 d73c94fd3ef5830f7bc4ac86b32b73fe mpd-svn-20051220.tar.bz2 891971
diff --git a/media-sound/mpd-svn/mpd-svn-20051220.ebuild b/media-sound/mpd-svn/mpd-svn-20051220.ebuild
new file mode 100644
index 000000000000..2314d67deb37
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20051220.ebuild
@@ -0,0 +1,142 @@
+# 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-20051220.ebuild,v 1.1 2005/12/20 19:11:35 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="~amd64 ~ppc ~x86"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod mp3 musepack vorbis oss 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/libmpcdec )
+	vorbis? ( media-libs/libvorbis )"
+
+upgrade_warning() {
+	echo
+	ewarn "This package now correctly uses 'vorbis' USE flag, instead of 'ogg'."
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=101877 for details."
+	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 7
+}
+
+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 icecast shout) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad mpd-id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable musepack mpc) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis oggtest) \
+		$(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.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() {
+	echo
+	einfo "The default config now binds the daemon strictly to localhost,"
+	einfo "rather than to all available IPs."
+	echo
+	if ! use ao ; then
+		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."
+		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 to MPD developers, please state this fact in"
+	ewarn "your bug report, as well as the fact that you used a ${P} Gentoo ebuild."
+	upgrade_warning
+}