5 files changed, 16 insertions, 94 deletions
diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7 b/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7
deleted file mode 100644
index 3dc0f91867bd..000000000000
--- a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3c9f44f7ac9a02ced53bd6c6dfb8c74 mp3blaster-3.0p7.tar.gz 236248
diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8 b/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8
deleted file mode 100644
index 485ae26e7bbf..000000000000
--- a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac8d30b18cfd7b67efe1a3847c62fe17 mp3blaster-3.0p8.tar.gz 242285
diff --git a/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild b/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild
deleted file mode 100644
index 3f4f6ce4b075..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
-
-
-A=${PN}-3.0p7.tar.gz
-S=${WORKDIR}/mp3blaster-3.0p7/
-DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
-HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	nas? ( >=media-libs/nas-1.4.1 )
-	mysql? ( >=dev-db/mysql-3.23.36 )"
-
-
-src_compile() {
-    local myconf
-    if [ "`use nas`" ] ; then
-	myconf="--with-nas"
-    fi
-    if [ "`use mysql`" ] ; then
-	myconf="$myconf --with-mysql"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf}
-    if [ "`use nas`" ] ; then
-	cd src
-	cp Makefile Makefile.orig
-	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-	    -e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile.orig > Makefile
-	cd ..
-    fi
-    try make 
-
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-
-    dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
-
-}
-
diff --git a/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild b/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild
deleted file mode 100644
index 9f2b87c0dbf4..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild,v 1.5 2002/07/11 06:30:41 drobbins Exp $
-
-A=${PN}-3.0p8.tar.gz
-S=${WORKDIR}/${PN}-3.0p8
-DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
-HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
-
-DEPEND=">=sys-libs/ncurses-5.2
-        nas? ( >=media-libs/nas-1.4.1 )
-        mysql? ( >=dev-db/mysql-3.23.36 )
-        oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
-
-src_compile() {
-	local myconf
-	use nas && myconf="${myconf} --with-nas"
-	use mysql && myconf="${myconf} --with-mysql"
-	use oggvorbis || myconf="${myconf} --without-oggvorbis"
-
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} || die
-
-	if [ "`use nas`" ] ; then
-		cd src
-		sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile | cat > Makefile
-		cd ..
-	fi
-
-	# parallel make does not work
-	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
index 06fb111afe38..1fff8306fdf5 100644
--- a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild,v 1.2 2002/07/10 18:25:52 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
-A=${PN}-3.1.1.tar.gz
-S=${WORKDIR}/${PN}-3.1.1
+S=${WORKDIR}/${P}
 DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
+SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${P}.tar.gz"
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
 
 DEPEND=">=sys-libs/ncurses-5.2
-        nas? ( >=media-libs/nas-1.4.1 )
-        mysql? ( >=dev-db/mysql-3.23.36 )
-        oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+	nas? ( >=media-libs/nas-1.4.1 )
+	mysql? ( >=dev-db/mysql-3.23.36 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	local myconf
@@ -21,13 +24,15 @@ src_compile() {
 
 	(cd src;patch -l <${FILESDIR}/mp3blaster-3.1.1-gcc3.1-fixes_cl.patch)
 
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} || die
+	econf ${myconf} || die
 
-	if [ "`use nas`" ] ; then
+	use nas && ( \
 		cd src
 		sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile | cat > Makefile
-		cd ..
+			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
+			Makefile | cat > Makefile
+
+		cd ${S}
 	fi
 
 	# parallel make does not work