Version bump. Some minor upstream fixes and tweaks. See bug #38880.

6 files changed, 71 insertions, 8 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 9b79aa5abd44..64deadbbc7e3 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.9 2003/11/19 17:06:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.10 2004/01/21 05:47:55 raker Exp $
+
+*mpd-0.9.4 (20 Jan 2004)
+
+  20 Jan 2004; Nick Hadaway <raker@gentoo.org> mpd-0.9.4.ebuild:
+  Version bump.  Please comment on bug #38880 so we can get this marked
+  stable. :)
 
   19 Nov 2003; Martin Holzer <mholzer@gentoo.org> mpd-0.9.3.ebuild,
   files/mpd.conf, files/mpd.rc6:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index ae84b0bd1a78..96ded3e80a5b 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,8 +1,10 @@
-MD5 5fb626bb31fce06423c51e3c2be6dd28 ChangeLog 1580
 MD5 ab5e6f092e72a5e37250d833a4b574f1 mpd-0.9.2.ebuild 1189
+MD5 2ae884d6edd43834f52b79665324ca43 mpd-0.9.4.ebuild 1401
 MD5 3e8c8af9f8afd2bef1f0aca2873185b5 mpd-0.9.3.ebuild 1414
+MD5 5fb626bb31fce06423c51e3c2be6dd28 ChangeLog 1580
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 cf61965ae8a57bd5520da8228bfd6e3b files/mpd.rc6 819
-MD5 621f975dad77dfc05c74fd1310e0daa2 files/mpd.conf 161
 MD5 92faee86ed7d721d2df12ac46f428e3f files/digest-mpd-0.9.2 62
 MD5 5ec1ddd9cb2bfcd72144ade921e92e6f files/digest-mpd-0.9.3 62
+MD5 b26df5fab168ac4c9bca171911b4dc8c files/digest-mpd-0.9.4 62
+MD5 621f975dad77dfc05c74fd1310e0daa2 files/mpd.conf 161
+MD5 cf61965ae8a57bd5520da8228bfd6e3b files/mpd.rc6 819
diff --git a/media-sound/mpd/files/digest-mpd-0.9.4 b/media-sound/mpd/files/digest-mpd-0.9.4
new file mode 100644
index 000000000000..565283b79cd9
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.9.4
@@ -0,0 +1 @@
+MD5 64e1e011b9d0f69db25cc6a104c59c90 mpd-0.9.4.tar.gz 1021683
diff --git a/media-sound/mpd/mpd-0.9.2.ebuild b/media-sound/mpd/mpd-0.9.2.ebuild
index 3cdaed124419..48f32467e379 100644
--- a/media-sound/mpd/mpd-0.9.2.ebuild
+++ b/media-sound/mpd/mpd-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.2.ebuild,v 1.2 2003/10/31 14:17:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.2.ebuild,v 1.3 2004/01/21 05:47:55 raker Exp $
 
 IUSE="oggvorbis mad"
 
diff --git a/media-sound/mpd/mpd-0.9.3.ebuild b/media-sound/mpd/mpd-0.9.3.ebuild
index a306a9e7e952..07686f7b42b4 100644
--- a/media-sound/mpd/mpd-0.9.3.ebuild
+++ b/media-sound/mpd/mpd-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.3.ebuild,v 1.4 2003/11/19 17:09:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.3.ebuild,v 1.5 2004/01/21 05:47:55 raker Exp $
 
 IUSE="oggvorbis mad"
 
diff --git a/media-sound/mpd/mpd-0.9.4.ebuild b/media-sound/mpd/mpd-0.9.4.ebuild
new file mode 100644
index 000000000000..159b4777cef7
--- /dev/null
+++ b/media-sound/mpd/mpd-0.9.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4.ebuild,v 1.1 2004/01/21 05:47:55 raker Exp $
+
+IUSE="oggvorbis mad"
+
+DESCRIPTION="Music Player Daemon (mpd)"
+SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.musicpd.org"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="oggvorbis? ( media-libs/libvorbis )
+	mad? ( media-sound/mad )
+	>=media-libs/flac-1.1.0
+	media-libs/libao
+	sys-libs/zlib"
+
+src_compile() {
+	local myconf
+	myconf=""
+
+	use oggvorbis \
+		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
+			--disable-vorbistest"
+	use mad || myconf="${myconf} --enable-mpd-mad --enable-mpd-id3tag"
+
+	econf ${myconf} || 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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mpd.rc6 mpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/mpd.conf mpd
+}
+
+pkg_postinst() {
+	einfo "libao has issues with the ALSA drivers, please refer to the FAQ"
+	einfo "http://musicpd.sourceforge.net/faq.php"
+	einfo
+	einfo " You need to set PORT, MUSIC_DIR, PLAYLIST_DIR,"
+	einfo " LOG_FILE and ERROR_FILE in /etc/conf.d/mpd"
+}