toolchain love for bug #69013.

diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index b4336f03ce732eaa3a88311588c8469d6526c5b5..3efd1f8adb077fb61a0b6681d305020ad9facc23 100644 (file)
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/orpheus
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.15 2004/10/20 05:49:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.16 2004/10/30 10:58:27 eradicator Exp $
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -orpheus-1.3.ebuild:
+  toolchain love for bug #69013.
 
   19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -orpheus-1.2.ebuild, -orpheus-1.4.ebuild:

diff --git a/media-sound/orpheus/files/digest-orpheus-1.3 b/media-sound/orpheus/files/digest-orpheus-1.3
deleted file mode 100644 (file)
index 3d14fc2..0000000
--- a/media-sound/orpheus/files/digest-orpheus-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 522a637cae9f47b917740a407cf9d481 orpheus-1.3.tar.gz 276986

diff --git a/media-sound/orpheus/orpheus-1.3.ebuild b/media-sound/orpheus/orpheus-1.3.ebuild
deleted file mode 100644 (file)
index eed7248..0000000
--- a/media-sound/orpheus/orpheus-1.3.ebuild
+++ /dev/null
@@ -1,47 +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/orpheus/orpheus-1.3.ebuild,v 1.5 2004/09/04 01:10:35 swegener Exp $
-
-DESCRIPTION="Command line MP3 player."
-HOMEPAGE="http://konst.org.ua/en/orpheus"
-SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
-LICENSE="GPL-2"
-IUSE="oggvorbis"
-
-DEPEND=">=sys-libs/ncurses-5.2
-       oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
-       virtual/mpg123
-       media-sound/vorbis-tools
-       gnome-base/libghttp"
-#      nas? ( >=media-libs/nas-1.4.1 )
-
-src_unpack() {
-       unpack ${A}
-
-       #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
-       #fi
-}
-
-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"
-       #use nas || myconf="${myconf} --disable-nas"
-       myconf="${myconf}"
-
-       econf ${myconf} || die
-       make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
-}
-
-src_install() {
-       make DESTDIR=${D} install || die
-       dodoc AUTHORS ChangeLog NEWS README TODO
-}

diff --git a/media-sound/orpheus/orpheus-1.5.ebuild b/media-sound/orpheus/orpheus-1.5.ebuild
index ee25c18945465509c7178d7b1b9f7441e14fc174..9fee65fc15ed53e946bb26280f9c9467ad5a8a8f 100644 (file)
--- a/media-sound/orpheus/orpheus-1.5.ebuild
+++ b/media-sound/orpheus/orpheus-1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.9 2004/10/20 05:49:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.10 2004/10/30 10:58:27 eradicator Exp $
 
 IUSE="oggvorbis"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
@@ -44,7 +44,7 @@ src_compile() {
        myconf="${myconf}"
 
        econf ${myconf} || die
-       make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
+       make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
 }
 
 src_install() {