Update.

Package-Manager: portage-2.0.51.19

7 files changed, 149 insertions, 17 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index 538a5c9eb89a..14a72051d5d5 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,21 @@
 # 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.4 2005/01/30 23:45:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.5 2005/03/11 19:06:09 ticho Exp $
+
+*mpd-svn-20050308 (11 Mar 2005)
+
+  11 Mar 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-svn-20041207.ebuild, mpd-svn-20050131.ebuild,
+  +mpd-svn-20050308.ebuild:
+  New snapshot. Made libao dependency optional.
+
+  20 Feb 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-svn-20050131.ebuild:
+  Added icecast USE flag.
+
+  14 Feb 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
+  Added --signal 1 to initscript's stop function, for proper state file
+  saving. Suggested by Avuton Olrich <avuton@gmail.com>.
 
 *mpd-svn-20050131 (31 Jan 2005)
 
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index b32c3a0ee144..1206e4546431 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0ad9494ef5f1ef1218cd5a40c46c504a ChangeLog 1045
+MD5 653fc329dc6a7a0edaf770d6f93b5c6a ChangeLog 1580
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
-MD5 44a3db17f10523e5a8ae094aceb6b076 mpd-svn-20050131.ebuild 3144
-MD5 3e121f88c1058e4430683b2c0d16caf5 mpd-svn-20041207.ebuild 3132
+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 9a261ba196424b0a0bb70293d0c9f164 files/mpd.rc6 870
+MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
+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)
 
-iD8DBQFB/XGaQlM6RnzZP+IRAuKaAKCVDI38UE4Xc/+rFTzQzvawAJVK2gCfTpNW
-GrESxxDwQwgpKZnnf6TLvFo=
-=YisY
+iD8DBQFCMew/QlM6RnzZP+IRAtDnAJ9W2fGNeO4cHpHW/HRVP4v5M7jRHACfZ32q
+/Ugewit4BKqWGL1wuSwTszg=
+=tz/r
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050308 b/media-sound/mpd-svn/files/digest-mpd-svn-20050308
new file mode 100644
index 000000000000..a668b387247a
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20050308
@@ -0,0 +1 @@
+MD5 6e622467911b35278ef2d5629aab6008 mpd-svn-20050308.tar.bz2 852649
diff --git a/media-sound/mpd-svn/files/mpd.rc6 b/media-sound/mpd-svn/files/mpd.rc6
index 074db91e1803..d53d80b4b298 100755
--- a/media-sound/mpd-svn/files/mpd.rc6
+++ b/media-sound/mpd-svn/files/mpd.rc6
@@ -1,7 +1,7 @@
 #!/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.rc6,v 1.1 2004/11/29 21:55:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.rc6,v 1.2 2005/03/11 19:06:10 ticho Exp $
 
 depend() {
 	need localmount
@@ -31,6 +31,6 @@ start() {
 
 stop() {
 	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/bin/mpd 
+	start-stop-daemon --stop --quiet --signal 1 --exec /usr/bin/mpd 
 	eend $? 
 }
diff --git a/media-sound/mpd-svn/mpd-svn-20041207.ebuild b/media-sound/mpd-svn/mpd-svn-20041207.ebuild
index 588f1a7d8c3f..fd2917c7b54c 100644
--- a/media-sound/mpd-svn/mpd-svn-20041207.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20041207.ebuild
@@ -1,6 +1,6 @@
 # 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-20041207.ebuild,v 1.2 2005/01/30 23:45:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20041207.ebuild,v 1.3 2005/03/11 19:06:09 ticho Exp $
 
 IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode"
 
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="A development version of Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://dev.gentoo.org/~ticho/portage/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/media-sound/mpd-svn/mpd-svn-20050131.ebuild b/media-sound/mpd-svn/mpd-svn-20050131.ebuild
index 5aaee7017f6d..af5b42eb69a4 100644
--- a/media-sound/mpd-svn/mpd-svn-20050131.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20050131.ebuild
@@ -1,14 +1,14 @@
 # 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-20050131.ebuild,v 1.1 2005/01/30 23:45:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050131.ebuild,v 1.2 2005/03/11 19:06:09 ticho Exp $
 
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode"
+IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast"
 
 inherit eutils
 
 DESCRIPTION="A development version of Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://dev.gentoo.org/~ticho/portage/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -25,7 +25,8 @@ DEPEND="!media-sound/mpd
 	alsa? ( media-libs/alsa-lib )
 	>=media-libs/libao-0.8.4
 	sys-libs/zlib
-	dev-util/gperf"
+	dev-util/gperf
+	icecast? ( media-libs/libshout )"
 
 pkg_setup() {
 	enewuser mpd '' '' '' audio || die "problem adding user mpd"
@@ -44,7 +45,8 @@ src_compile() {
 		`use_enable !mad mpd-mad` \
 		`use_enable !mad id3tag` \
 		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
+		`use_enable mikmod mod` \
+		`use_enable icecast shout` || die "could not configure"
 
 	emake || die "emake failed"
 }
diff --git a/media-sound/mpd-svn/mpd-svn-20050308.ebuild b/media-sound/mpd-svn/mpd-svn-20050308.ebuild
new file mode 100644
index 000000000000..ad752f797ab0
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20050308.ebuild
@@ -0,0 +1,112 @@
+# 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-20050308.ebuild,v 1.1 2005/03/11 19:06:10 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() {
+	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.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
+	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
+}