Changed to use eclasses "toolchain-funcs" and "fortran" instead of "gcc".

Package-Manager: portage-2.0.51-r14

3 files changed, 38 insertions, 23 deletions

diff --git a/sci-misc/xfoil/ChangeLog b/sci-misc/xfoil/ChangeLog
index 8a20841dae25..e23ee4c6fab7 100644
--- a/sci-misc/xfoil/ChangeLog
+++ b/sci-misc/xfoil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/xfoil
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/ChangeLog,v 1.2 2004/12/28 03:45:54 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/ChangeLog,v 1.3 2005/02/02 17:47:40 kugelfang Exp $
+
+  02 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> xfoil-6.94-r1.ebuild,
+  xfoil-6.94.ebuild:
+  Changed to use eclasses "toolchain-funcs" and "fortran" instead of "gcc".
 
 *xfoil-6.94-r1 (27 Dec 2004)
 
diff --git a/sci-misc/xfoil/xfoil-6.94-r1.ebuild b/sci-misc/xfoil/xfoil-6.94-r1.ebuild
index 3a09c5658e42..d08398b16c76 100644
--- a/sci-misc/xfoil/xfoil-6.94-r1.ebuild
+++ b/sci-misc/xfoil/xfoil-6.94-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/xfoil-6.94-r1.ebuild,v 1.2 2004/12/29 18:46:34 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/xfoil-6.94-r1.ebuild,v 1.3 2005/02/02 17:47:40 kugelfang Exp $
 
-inherit gcc
+inherit toolchain-funcs fortran
 
 MY_PN="${PN}"
 MY_PV="${PV/./}"
@@ -16,28 +16,33 @@ SRC_URI="http://raphael.mit.edu/xfoil/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="doc"
 
 DEPEND="virtual/blas
 	sci-libs/blas-config
 	virtual/x11"
-RDEPEND="virtual/x11"
 
 S=${WORKDIR}/XFOIL${MY_PV}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	[ -z "$FC" ] && FC=g77 # because gcc-config doesn't do it yet
-	[ -z "${FFLAGS}" ] && FFLAGS="${CFLAGS}" # because gcc-config doesn't do it yet
-	echo "CC = $(gcc-getCC)" >>plotlib/config.make
-	echo "FC = ${FC}" >>plotlib/config.make
+
+	[ -z "${FFLAGS}" ] && FFLAGS="${CFLAGS}"
+
+	# As defined in toolchain-funcs.eclass
+	echo "CC = $(tc-getCC)" >>plotlib/config.make
+
+	# As defined in fortran.eclass
+	echo "FC = ${FORTRANC}" >>plotlib/config.make
+
 	echo "CFLAGS += ${CFLAGS}" >>plotlib/config.make
 	echo "FFLAGS += ${FFLAGS}" >>plotlib/config.make
+
 	sed -i bin/Makefile \
-	-e "s/^\(FC.*\)/FC = ${FC}/g" \
-	-e "s/^\(CC.*\)/CC = $(gcc-getCC)/g" \
+	-e "s/^\(FC.*\)/FC = ${FORTRANC}/g" \
+	-e "s/^\(CC.*\)/CC = $(tc-getCC)/g" \
 	-e "s/^\(FFLAGS .*\)/FFLAGS = ${FFLAGS}/g" \
 	-e "s/^\(FFLOPT .*\)/FFLOPT = \$(FFLAGS)/g" \
 	-e "s/^\(FFLAGS2 .*\)/FFLAGS2 = \$(FFLAGS)/g"
diff --git a/sci-misc/xfoil/xfoil-6.94.ebuild b/sci-misc/xfoil/xfoil-6.94.ebuild
index cb122e6dccd3..5f2d01ab41e1 100644
--- a/sci-misc/xfoil/xfoil-6.94.ebuild
+++ b/sci-misc/xfoil/xfoil-6.94.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/xfoil-6.94.ebuild,v 1.2 2004/12/29 16:35:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/xfoil/xfoil-6.94.ebuild,v 1.3 2005/02/02 17:47:40 kugelfang Exp $
 
-inherit gcc
+inherit toolchain-funcs fortran
 
 MY_PN="${PN}"
 MY_PV="${PV/./}"
@@ -16,10 +16,11 @@ SRC_URI="http://raphael.mit.edu/xfoil/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="doc"
 
-DEPEND="sci-libs/blas
+DEPEND="virtual/blas
+	sci-libs/blas-config
 	virtual/x11"
 
 S=${WORKDIR}/XFOIL${MY_PV}
@@ -27,15 +28,20 @@ S=${WORKDIR}/XFOIL${MY_PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	[ -z "$FC" ] && FC=g77 # because gcc-config doesn't do it yet
 	[ -z "${FFLAGS}" ] && FFLAGS="${CFLAGS}" # because gcc-config doesn't do it yet
-	echo "CC = $(gcc-getCC)" >>plotlib/config.make
-	echo "FC = ${FC}" >>plotlib/config.make
+
+	# As defined in toolchain-funcs.eclass
+	echo "CC = $(tc-getCC)" >>plotlib/config.make
+
+	# As defined in fortran.eclass
+	echo "FC = ${FORTRANC}" >>plotlib/config.make
+
 	echo "CFLAGS += ${CFLAGS}" >>plotlib/config.make
 	echo "FFLAGS += ${FFLAGS}" >>plotlib/config.make
+
 	sed -i bin/Makefile \
-	-e "s/^\(FC.*\)/FC = ${FC}/g" \
-	-e "s/^\(CC.*\)/CC = $(gcc-getCC)/g" \
+	-e "s/^\(FC.*\)/FC = ${FORTRANC}/g" \
+	-e "s/^\(CC.*\)/CC = $(tc-getCC)/g" \
 	-e "s/^\(FFLAGS .*\)/FFLAGS = ${FFLAGS}/g" \
 	-e "s/^\(FFLOPT .*\)/FFLOPT = \$(FFLAGS)/g" \
 	-e "s/^\(FFLAGS2 .*\)/FFLAGS2 = \$(FFLAGS)/g"