From: Jeremy Huddleston Date: Sat, 30 Oct 2004 10:56:36 +0000 (+0000) Subject: toolchain love for bug #69012. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48bd3d7c5a9cc2f6fecb7bd44536d4e26afe91e4;p=gentoo.git toolchain love for bug #69012. --- diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog index fadec139b1c5..1dd37f6d5b8b 100644 --- a/media-sound/mp3blaster/ChangeLog +++ b/media-sound/mp3blaster/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/mp3blaster # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.16 2004/07/13 20:37:51 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.17 2004/10/30 10:56:36 eradicator Exp $ + + 30 Oct 2004; Jeremy Huddleston + -mp3blaster-3.1.1.ebuild: + toolchain love for bug #69012. 13 Jul 2004; Bryan Østergaard mp3blaster-3.2.0.ebuild: Stable on alpha. diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.1.1 b/media-sound/mp3blaster/files/digest-mp3blaster-3.1.1 deleted file mode 100644 index 091e8292a26c..000000000000 --- a/media-sound/mp3blaster/files/digest-mp3blaster-3.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6713385086fdfdb91ba08e536f5db12e mp3blaster-3.1.1.tar.gz 286621 diff --git a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild deleted file mode 100644 index 88befde136a5..000000000000 --- a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild,v 1.13 2004/06/25 00:11:49 agriffis Exp $ - -DESCRIPTION="Command line MP3 player." -HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/" -SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${P}.tar.gz" - -SLOT="0" -KEYWORDS="x86 ppc alpha ~sparc" -IUSE="nas oggvorbis mysql" -LICENSE="GPL-2" - -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 - ### Looks like NAS support is broken, at least with NAS 1.5 and - ### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com) - #use nas && myconf="${myconf} --with-nas" - myconf="${myconf} --disable-nas" - use mysql && myconf="${myconf} --with-mysql" - use oggvorbis || myconf="${myconf} --without-oggvorbis" - - (cd src;patch -l <${FILESDIR}/mp3blaster-3.1.1-gcc3.1-fixes_cl.patch) - - econf ${myconf} || die - - ### See comment above - #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 ${S} - #) - - # 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.3.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild index 37145e74612e..4be28082e01a 100644 --- a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild +++ b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # 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.11 2004/06/25 00:11:49 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.12 2004/10/30 10:56:36 eradicator Exp $ + +inherit toolchain-funcs DESCRIPTION="Command line MP3 player." HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/" @@ -38,10 +40,10 @@ src_compile() { use oggvorbis || myconf="${myconf} --without-oggvorbis" econf ${myconf} || die - make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die + make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die } src_install() { - make DESTDIR=${D} install || die - dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO + make DESTDIR="${D}" install || die + dodoc ANNOUNCE AUTHORS 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 8e2f333f32c4..29e2b92ba847 100644 --- a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild +++ b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # 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.7 2004/07/13 20:37:51 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.8 2004/10/30 10:56:36 eradicator Exp $ + +inherit toolchain-funcs DESCRIPTION="Command line MP3 player." HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/" @@ -39,10 +41,10 @@ src_compile() { `use_with oggvorbis`" econf ${myconf} || die - make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die + make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die } src_install() { - make DESTDIR=${D} install || die - dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO + make DESTDIR="${D}" install || die + dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO }