Remove use of fortran eclass

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

8 files changed, 65 insertions, 62 deletions

diff --git a/sci-libs/libbufr/ChangeLog b/sci-libs/libbufr/ChangeLog
index eeee420b7fbe..e8a32c4afef4 100644
--- a/sci-libs/libbufr/ChangeLog
+++ b/sci-libs/libbufr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/libbufr
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/ChangeLog,v 1.1 2008/12/07 02:48:14 nerdboy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/ChangeLog,v 1.2 2010/12/01 16:59:04 bicatali Exp $
+
+  01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> libbufr-000360.ebuild:
+  Remove use of fortran eclass
 
 *libbufr-000360 (07 Dec 2008)
 
diff --git a/sci-libs/libbufr/libbufr-000360.ebuild b/sci-libs/libbufr/libbufr-000360.ebuild
index c52a416efa4f..c45ebd66e0de 100644
--- a/sci-libs/libbufr/libbufr-000360.ebuild
+++ b/sci-libs/libbufr/libbufr-000360.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/libbufr-000360.ebuild,v 1.2 2008/12/31 03:41:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/libbufr-000360.ebuild,v 1.3 2010/12/01 16:59:04 bicatali Exp $
 
-inherit fortran eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 MY_P="${PN/lib/}_${PV}"
 
@@ -24,16 +24,14 @@ DEPEND="sys-apps/findutils"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	FORTRAN="gfortran g77 ifc ifort pgf77 pgf90"
-	fortran_pkg_setup
-	case "${FORTRANC}" in
-		gfortran)
+	case "$(tc-getFC)" in
+		*gfortran)
 			export CNAME="_gfortran"
 			;;
-		g77)
+		*g77)
 			export CNAME="_gnu"
 			;;
-		pgf90|pgf77)
+		*pgf90|*pgf77)
 			export CNAME="_linux"
 			;;
 		ifc|ifort)
diff --git a/sci-libs/libnc-dap/ChangeLog b/sci-libs/libnc-dap/ChangeLog
index 260fa5971eb0..6ab4c9faba99 100644
--- a/sci-libs/libnc-dap/ChangeLog
+++ b/sci-libs/libnc-dap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libnc-dap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.4 2009/05/11 03:50:00 nerdboy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.5 2010/12/01 17:02:07 bicatali Exp $
+
+  01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  libnc-dap-3.7.3-r1.ebuild:
+  Remove use of fortran eclass
 
   11 May 2009; Steve Arnold <nerdboy@gentoo.org> libnc-dap-3.7.3-r1.ebuild:
   Updated to fix exported symbols with gfortran (one less underscore).  Only
diff --git a/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild b/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
index 7c53bb6caf71..4a3f9691d4b7 100644
--- a/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
+++ b/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.2 2009/05/11 03:50:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.3 2010/12/01 17:02:07 bicatali Exp $
 
-inherit eutils flag-o-matic fortran
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="An OPeNDAP-enabled version of the NetCDF 3.6 API that replaces the standard NetCDF library."
 HOMEPAGE="http://opendap.org/index.html"
@@ -24,19 +24,18 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use fortran; then
-		fortran_pkg_setup
-		case "${FORTRANC}" in
+		case "$(tc-getFC)" in
 			# probably needs more compilers here, of which I have
 			# none, so feel free to provide flags for others...
-			g77)
+			*g77)
 				export FCLAGS+="-finit-local-zero -fno-automatic \
-				    -fno-second-underscore -std=legacy -ff2c \
-				    -fall-intrinsics -static-libgfortran"
+					-fno-second-underscore -std=legacy -ff2c \
+					-fall-intrinsics -static-libgfortran"
 				;;
 			*)
 				export FCLAGS+="-finit-local-zero -fno-automatic \
-				    -fno-second-underscore -std=gnu \
-				    -fall-intrinsics -static-libgfortran"
+					-fno-second-underscore -std=gnu \
+					-fall-intrinsics -static-libgfortran"
 				;;
 		esac
 	else
@@ -44,12 +43,12 @@ pkg_setup() {
 	fi
 
 	if use full-test; then
-	    if [ -n "${DAP_TEST_OPTS}" ]; then
+		if [ -n "${DAP_TEST_OPTS}" ]; then
 		elog "User-specified test URL is ${DAP_TEST_OPTS}."
-	    else
+		else
 		elog "User-specified test URL is not set; if needed, set"
 		elog "DAP_TEST_OPTS to a URL of your choice and rebuild."
-	    fi
+		fi
 	elog
 	elog "The full regression test does two passes, the second one with"
 	elog "remote data queries.  The latter part can take several hours,"
@@ -63,16 +62,16 @@ src_unpack() {
 	cd "${S}"
 	# increase the number of open netcdf files
 	sed -i -e "s:MAX_NC_OPEN 32:MAX_NC_OPEN 128:g" \
-	    lnetcdf/{lnetcdf.h,netcdf.h} \
-	    || die "sed headers failed"
+		lnetcdf/{lnetcdf.h,netcdf.h} \
+		|| die "sed headers failed"
 
 	# missing definition causes unknown symbol errors
 	epatch "${FILESDIR}"/${P}_template-fix.patch
 
 	# this is specific to GNU Fortran
-	if [[ ${FORTRANC} = gfortran ]] ; then
-	    elog "updating for gfortran..."
-	    sed -i -e "s/= -Df2cFortran/= -DgFortran/" Makefile.in \
+	if [[ $(tc-getFC) = *gfortran ]] ; then
+		elog "updating for gfortran..."
+		sed -i -e "s/= -Df2cFortran/= -DgFortran/" Makefile.in \
 		|| die "sed makefile.in failed"
 	fi
 }
@@ -80,7 +79,7 @@ src_unpack() {
 src_compile() {
 	local test_conf="${DAP_TEST_OPTS}"
 	local myconf="--disable-dependency-tracking --enable-largefile \
-	     --enable-64bit"
+		 --enable-64bit"
 	use fortran || myconf="${myconf} --disable-f77"
 	# debug can be set to 2 for extra verbosity
 	use debug && myconf="${myconf} --enable-debug=1"
@@ -92,19 +91,19 @@ src_compile() {
 
 src_test() {
 	if use full-test; then
-	    cd "${S}"/nc_test
-	    # These tests should all pass, but the non-local tests can take
-	    # several hours to complete.
-	    make check || die "Regression tests failed!"
-	    cd "${S}"
-	    # This test has unexpected failures
-	    make check
+		cd "${S}"/nc_test
+		# These tests should all pass, but the non-local tests can take
+		# several hours to complete.
+		make check || die "Regression tests failed!"
+		cd "${S}"
+		# This test has unexpected failures
+		make check
 	else
-	    # unit tests only
-	    cd "${S}"/unit-tests
-	    ln -sf ../ncdump/testsuite testsuite
-	    # These tests should also pass
-	    make check || die "Unit tests failed!"
+		# unit tests only
+		cd "${S}"/unit-tests
+		ln -sf ../ncdump/testsuite testsuite
+		# These tests should also pass
+		make check || die "Unit tests failed!"
 	fi
 }
 
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 21c0271c77c9..de6dd5117a47 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.74 2010/10/22 10:31:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.75 2010/12/01 16:55:59 bicatali Exp $
+
+  01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> netcdf-3.6.3.ebuild:
+  Remove use of fortran eclass
 
   22 Oct 2010; Fabian Groffen <grobian@gentoo.org> netcdf-4.1.1.ebuild:
   Marked ~ppc-macos
diff --git a/sci-libs/netcdf/netcdf-3.6.3.ebuild b/sci-libs/netcdf/netcdf-3.6.3.ebuild
index ddc67df3683a..a91e8dc5ba4e 100644
--- a/sci-libs/netcdf/netcdf-3.6.3.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.14 2010/06/22 14:30:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.15 2010/12/01 16:55:59 bicatali Exp $
 
 EAPI=2
 
-inherit fortran eutils toolchain-funcs flag-o-matic autotools
+inherit eutils toolchain-funcs flag-o-matic autotools
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
@@ -20,13 +20,6 @@ DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
 	doc? ( virtual/latex-base )"
 
-pkg_setup() {
-	if use fortran ; then
-		FORTRAN="gfortran ifc g77 pgf77 pgf90"
-		fortran_pkg_setup
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	epatch "${FILESDIR}"/${P}-parallel.patch
@@ -37,8 +30,8 @@ src_configure() {
 	use debug || append-cppflags -DNDEBUG
 	local myconf
 	if use fortran; then
-		case "${FORTRANC}" in
-			g77)
+		case "$(tc-getFC)" in
+			*g77)
 				myconf="${myconf} --enable-f77 --disable-f90"
 				myconf="${myconf} F77=g77"
 				;;
diff --git a/sci-libs/xgks-pmel/ChangeLog b/sci-libs/xgks-pmel/ChangeLog
index fa08a657b628..3b9ab0b2e3be 100644
--- a/sci-libs/xgks-pmel/ChangeLog
+++ b/sci-libs/xgks-pmel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/xgks-pmel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.4 2009/12/04 21:01:44 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.5 2010/12/01 16:51:21 bicatali Exp $
+
+  01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> xgks-pmel-2.5.5.ebuild:
+  Remove use of fortran eclass
 
   04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   xgks-pmel-2.5.5.ebuild:
diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
index df74926de9b3..bf88e728eeb7 100644
--- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
+++ b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.4 2009/12/04 21:01:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.5 2010/12/01 16:51:21 bicatali Exp $
 
-inherit eutils fortran toolchain-funcs multilib
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System."
 HOMEPAGE="http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/"
@@ -29,7 +29,7 @@ src_compile() {
 		fontdb/Makefile.in || die "sed 1 failed"
 
 	CFLAGS=${CFLAGS} LD_X11='-L/usr/$(get_libdir) -lX11' \
-		FC=${FORTRANC} CC=$(tc-getCC) OS=linux \
+		FC=$(tc-getFC) CC=$(tc-getCC) OS=linux \
 		./configure --prefix=/usr --exec_prefix=/usr/bin \
 		|| die "configure failed"