Version bump.

(Portage version: 2.1_pre6-r3)

4 files changed, 158 insertions, 11 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index 9e11be42de0c..b9a0b74f5530 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.25 2006/03/16 15:56:45 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.26 2006/03/21 23:50:39 ticho Exp $
+
+*mpd-svn-20060321 (21 Mar 2006)
+
+  21 Mar 2006; <ticho@gentoo.org> +mpd-svn-20060321.ebuild:
+  Version bump.
 
   16 Mar 2006; <ticho@gentoo.org> mpd-svn-20051220.ebuild:
   Depend on alsa-utils instead of alsa-libs, because alsa-utils provides
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 23183a0f279e..7e49c4ee5b88 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3da345e43f5f5814233e4614a7f93215 ChangeLog 5612
 RMD160 de8db2982749be72ca14d6012b78881f1d28867a ChangeLog 5612
 SHA256 f7b572efc8894690a407ef75b50f048f500e10a7b994c8f4c2be2b08d392fb5d ChangeLog 5612
 MD5 776e4433393d2faa4e792d07260fe18b files/digest-mpd-svn-20051220 253
 RMD160 8c9b035bd95ebd6c1782c8fc15fdb957c087a747 files/digest-mpd-svn-20051220 253
 SHA256 b2d009cccdaffb88ecff6e77fb4faab8b6d350adda5a6fee860962b274564064 files/digest-mpd-svn-20051220 253
+MD5 cbe74b6ae9225f9b3739f9d348854a5d files/digest-mpd-svn-20060321 253
+RMD160 4355d315b8f53751928be75034d131fa138106d1 files/digest-mpd-svn-20060321 253
+SHA256 6a48a017b80bab0ab76d208da76852496aad834cd64539fe9959373a9ad7bf7b files/digest-mpd-svn-20060321 253
 MD5 36e14440a7c1815b23099ef9947b6b7f files/mpd.rc6 732
 RMD160 b8870b785d4264393203c6fa503edb8877dffcaa files/mpd.rc6 732
 SHA256 b309a7a92870232b6e539ca641b07a494bb40d14bf9892956e39daf784b2167f files/mpd.rc6 732
@@ -16,10 +16,6 @@ SHA256 1fe5ebb6f06da5621d18a47b74e004d5f62f3257f82222c66386446f262b6cf5 metadata
 MD5 cc5bf9166333f1c12aadce67a64c6b42 mpd-svn-20051220.ebuild 4519
 RMD160 de4ce1d5de9d6cb4432b059d641f5b8685a52fe2 mpd-svn-20051220.ebuild 4519
 SHA256 32cd3a00061aa88cfbff9462899fe885ebf5abd932dbf256ba1e316b6553f037 mpd-svn-20051220.ebuild 4519
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEGYrL10xuJSrg3/sRAsflAJ91rPISDDB/XaXSq5GoVKQCHx9x8gCbB1DF
-/jaT6DznBMvt2PPCQG9ZbHQ=
-=/Nwv
------END PGP SIGNATURE-----
+MD5 8bf89f45c6b4182514047e0ba7dc286f mpd-svn-20060321.ebuild 4415
+RMD160 44d6aa10f2231fe12907d69723bafad4133a723e mpd-svn-20060321.ebuild 4415
+SHA256 414c6385bcd17373c97538edc4e1d145ef1f6819af975c99c1a332c73263c886 mpd-svn-20060321.ebuild 4415
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20060321 b/media-sound/mpd-svn/files/digest-mpd-svn-20060321
new file mode 100644
index 000000000000..4a58d1a628db
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20060321
@@ -0,0 +1,3 @@
+MD5 3299d46f0a9eb0e20e129866db07508d mpd-svn-20060321.tar.bz2 897352
+RMD160 3ff513faf56816144351008b7b6b98ac2172b11b mpd-svn-20060321.tar.bz2 897352
+SHA256 d7a0dc86e8054f12b9346709389740473b3b339b103771ea8412368010577474 mpd-svn-20060321.tar.bz2 897352
diff --git a/media-sound/mpd-svn/mpd-svn-20060321.ebuild b/media-sound/mpd-svn/mpd-svn-20060321.ebuild
new file mode 100644
index 000000000000..1e1efe5e00eb
--- /dev/null
+++ b/media-sound/mpd-svn/mpd-svn-20060321.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20060321.ebuild,v 1.1 2006/03/21 23:50:40 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
+	>=dev-libs/glib-2.0.0
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-sound/alsa-utils )
+	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
+}