4 files changed, 28 insertions, 112 deletions

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index bfaa1596c986..110f71c5a1ae 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,80 +1,6 @@
 # ChangeLog for media-sound/mp3blaster
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.20 2005/04/08 17:27:25 hansmi Exp $
-
-  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
-  mp3blaster-3.2.0.ebuild:
-  Stable on ppc.
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  22 Nov 2004; Markus Rothe <corsair@gentoo.org> mp3blaster-3.2.0.ebuild:
-  Added ~ppc64 to KEYWORDS; bug #72100
-
-  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  -mp3blaster-3.1.1.ebuild:
-  toolchain love for bug #69012.
-
-  13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mp3blaster-3.2.0.ebuild:
-  Stable on alpha.
-
-  23 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  mp3blaster-3.2.0.ebuild:
-  Stable amd64 and sparc.  Added USE=lirc support.
-
-  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mp3blaster-3.1.3.ebuild,
-  mp3blaster-3.2.0.ebuild:
-  Fix use invocation
-
-  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  mp3blaster-3.2.0.ebuild:
-  Stable on x86.
-
-*mp3blaster-3.2.0 (28 Nov 2003)
-
-  28 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> mp3blaster-3.2.0.ebuild:
-  Version bump.
-
-  16 Nov 2003; Brad House <brad_mssw@gentoo.org> mp3blaster-3.1.3.ebuild:
-  mark stable on amd64
-
-  12 May 2003; Jason Wever <weeve@gentoo.org> mp3blaster-3.1.1.ebuild,
-  mp3blaster-3.1.3.ebuild:
-  Added ~sparc to keywords.
-
-*mp3blaster-3.1.3 (05 Nov 2002)
-
-  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mp3blaster-3.1.3.ebuild :
-  Add ~alpha to KEYWORDS
-
-  08 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> mp3blaster-3.1.3.ebuild :
-  Updated SRC_URI.
-
-  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-*mp3blaster-3.1.1 (13 Aug 2002)
-
-  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mp3blaster-3.1.1.ebuild :
-  Add alpha to KEYWORDS
-
-  13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> mp3blaster-3.1.1.ebuild :
-
-  Updated the ebuild for 3.1.1 to exclude support for NAS, as it appears
-  to be broken (see bug 5183).
-	
-*mp3blaster-3.1 (10 Jun 2002)
-
-  10 Jun 2002; Ryan Phillips <rphillips@gentoo.org> mp3blaster-3.1.ebuild :
-
-  New versionn
-
-*mp3blaster-3.0_p8 (28 Mar 2002)
-
-  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mp3blaster-3.0_p8.ebuild :
-
-  the vorbis USE flag is now called oggvorbis
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
 
 *mp3blaster-3.0_p8 (1 Feb 2002)
 
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 0ba6caa335f1..e69de29bb2d1 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,7 +0,0 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9f35ba49409f7058554fc672d1a1b4b7 mp3blaster-3.1.3.ebuild 1452
-MD5 8c17b59e8a80193be3bd17789fc567eb ChangeLog 2820
-MD5 ee0b87c7e07476e37465ab15d0c5e0eb mp3blaster-3.2.0.ebuild 1445
-MD5 7a841800d584eafa732f19ccceab4eba files/mp3blaster-3.1.1-gcc3.1-fixes_cl.patch 591
-MD5 441643269ce24bf3d921465d51b702c4 files/digest-mp3blaster-3.2.0 68
-MD5 5b6f9d99b3e96b63be78c5d7a7b951ee files/digest-mp3blaster-3.1.3 68
diff --git a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
index 4be28082e01a..9b5e2610fcd1 100644
--- a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.12 2004/10/30 10:56:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.1 2002/11/05 19:29:05 aliz Exp $
 
-inherit toolchain-funcs
+IUSE="oggvorbis mysql"
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/"
-SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="x86 ppc ~alpha ~sparc amd64"
 LICENSE="GPL-2"
-IUSE="oggvorbis mysql"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
+SLOT="0"
+KEYWORDS="~x86"
+SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${P}.tar.gz"
+S=${WORKDIR}/${P}
+
 src_unpack() {
 	unpack ${A}
 
-	#if use nas; then
+	#if [ "`use nas`" ]; then
 	#	cd src
 	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
 	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
@@ -40,10 +40,10 @@ src_compile() {
 	use oggvorbis || myconf="${myconf} --without-oggvorbis"
 
 	econf ${myconf} || die
-	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
+	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
+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.2.0.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
index 163cb90b3744..a07918b5e133 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.10 2005/04/08 17:27:25 hansmi Exp $
-
-inherit toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.1 2003/11/28 21:49:04 gregf Exp $
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/"
 SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 LICENSE="GPL-2"
-IUSE="oggvorbis mysql lirc"
+IUSE="oggvorbis mysql"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
-	lirc? ( app-misc/lirc )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
 src_unpack() {
 	unpack ${A}
 
-	#if use nas; then
+	#if [ "`use nas`" ]; then
 	#	cd src
 	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
 	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
@@ -34,17 +31,17 @@ src_compile() {
 	local myconf
 	### Looks like NAS support is broken, at least with NAS 1.5 and
 	### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com)
-	### Ditto nas-1.6c-r1, mp3blaster-3.2.0 (2004.06.23 - eradicator)
-	myconf="${myconf} --without-nas \
-	        `use_with lirc` \
-	        `use_with mysql` \
-	        `use_with oggvorbis`"
+	#use nas && myconf="${myconf} --with-nas"
+	#use nas || myconf="${myconf} --disable-nas"
+	myconf="${myconf} --disable-nas"
+	use mysql && myconf="${myconf} --with-mysql"
+	use oggvorbis || myconf="${myconf} --without-oggvorbis"
 
 	econf ${myconf} || die
-	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
+	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
+	make DESTDIR=${D} install || die
+	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
 }