10 files changed, 12 insertions, 164 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 4c9851633bc5..dd062b23bc68 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.18 2004/03/28 21:50:58 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.19 2004/03/30 18:19:57 eradicator Exp $
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.0.ebuild,
+  mpd-0.10.1.ebuild, mpd-0.10.2.ebuild, mpd-0.9.2.ebuild, mpd-0.9.3.ebuild,
+  mpd-0.9.4.ebuild:
+  Removing old ebuilds... updating libao DEPEND for bug #46067.
 
   28 Mar 2004; Jon Portnoy <avenj@gentoo.org> mpd-0.10.2.ebuild :
   AMD64 keywords.
diff --git a/media-sound/mpd/files/digest-mpd-0.10.0 b/media-sound/mpd/files/digest-mpd-0.10.0
deleted file mode 100644
index b1ed1c841826..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bfb1b185fe603e81d7099422267d0ea6 mpd-0.10.0.tar.gz 783063
diff --git a/media-sound/mpd/files/digest-mpd-0.9.2 b/media-sound/mpd/files/digest-mpd-0.9.2
deleted file mode 100644
index 45f6f0a3fea8..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32bedb3d393aed27f3c6b51f1042c459 mpd-0.9.2.tar.gz 1000232
diff --git a/media-sound/mpd/files/digest-mpd-0.9.3 b/media-sound/mpd/files/digest-mpd-0.9.3
deleted file mode 100644
index 7b098e1e496b..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c27310fad56548fab37b24eec1ec6ce8 mpd-0.9.3.tar.gz 1012796
diff --git a/media-sound/mpd/mpd-0.10.0.ebuild b/media-sound/mpd/mpd-0.10.0.ebuild
deleted file mode 100644
index 59da3800512e..000000000000
--- a/media-sound/mpd/mpd-0.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.10.0.ebuild,v 1.1 2004/03/03 15:16:21 mholzer 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"
-}
diff --git a/media-sound/mpd/mpd-0.10.1.ebuild b/media-sound/mpd/mpd-0.10.1.ebuild
index b622b6af9ce8..d4ff8ecf6cd7 100644
--- a/media-sound/mpd/mpd-0.10.1.ebuild
+++ b/media-sound/mpd/mpd-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.1.ebuild,v 1.1 2004/03/10 18:46:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.1.ebuild,v 1.2 2004/03/30 18:19:57 eradicator Exp $
 
 IUSE="oggvorbis mad"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 DEPEND="oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/mad )
 	>=media-libs/flac-1.1.0
-	media-libs/libao
+	>=media-libs/libao-0.8.4
 	sys-libs/zlib"
 
 src_compile() {
diff --git a/media-sound/mpd/mpd-0.10.2.ebuild b/media-sound/mpd/mpd-0.10.2.ebuild
index b4120241818a..06597968a97e 100644
--- a/media-sound/mpd/mpd-0.10.2.ebuild
+++ b/media-sound/mpd/mpd-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # 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.10.2.ebuild,v 1.3 2004/03/28 21:50:58 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.2.ebuild,v 1.4 2004/03/30 18:19:57 eradicator Exp $
 
 IUSE="oggvorbis mad aac audiofile ipv6"
 
@@ -19,7 +19,7 @@ DEPEND="oggvorbis? ( media-libs/libvorbis )
 	audiofile? ( media-libs/audiofile )
 	flac? ( >=media-libs/flac-1.1.0 )
 	media-libs/libid3tag
-	media-libs/libao
+	>=media-libs/libao-0.8.4
 	sys-libs/zlib"
 
 src_compile() {
diff --git a/media-sound/mpd/mpd-0.9.2.ebuild b/media-sound/mpd/mpd-0.9.2.ebuild
deleted file mode 100644
index 48f32467e379..000000000000
--- a/media-sound/mpd/mpd-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.3 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="--with-gnu-ld"
-
-	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
-}
-
-pkg_postinst() {
-	einfo "libao has issues with the ALSA drivers, please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php"
-}
diff --git a/media-sound/mpd/mpd-0.9.3.ebuild b/media-sound/mpd/mpd-0.9.3.ebuild
deleted file mode 100644
index 07686f7b42b4..000000000000
--- a/media-sound/mpd/mpd-0.9.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.5 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="--with-gnu-ld"
-
-	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"
-}
diff --git a/media-sound/mpd/mpd-0.9.4.ebuild b/media-sound/mpd/mpd-0.9.4.ebuild
index 4c92319eddea..e0f5d0d7bbcc 100644
--- a/media-sound/mpd/mpd-0.9.4.ebuild
+++ b/media-sound/mpd/mpd-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2004/03/04 06:23:43 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4.ebuild,v 1.3 2004/03/30 18:19:57 eradicator Exp $
 
 IUSE="oggvorbis mad"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 DEPEND="oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/mad )
 	>=media-libs/flac-1.1.0
-	media-libs/libao
+	>=media-libs/libao-0.8.4
 	sys-libs/zlib"
 
 src_compile() {