Removal of fortran.eclass, #348851

Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64

30 files changed, 115 insertions, 97 deletions

diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index 2736267613ec..afd905d0199e 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/mosflm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.5 2010/11/08 17:17:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.6 2010/12/16 13:38:18 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> mosflm-7.0.6-r2.ebuild:
+  Removal of fortran.eclass, #348851
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
   mosflm-7.0.6-r2.ebuild:
diff --git a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
index 2b16e2ac4a57..68457976545f 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.2 2010/11/08 17:17:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.3 2010/12/16 13:38:18 jlec Exp $
 
 EAPI="3"
 
-inherit fortran toolchain-funcs versionator eutils
+inherit eutils toolchain-funcs versionator
 
 MY_PV="$(delete_all_version_separators)"
 MY_P="${PN}${MY_PV}"
 
-FORTRAN="g77 gfortran ifc"
-
 DESCRIPTION="A program for integrating single crystal diffraction data from area detectors"
 HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/"
 SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
@@ -49,8 +47,8 @@ src_compile() {
 	emake \
 		MOSHOME="${S}" \
 		DPS="${S}" \
-		FC=${FORTRANC} \
-		FLINK=${FORTRANC} \
+		FC=$(tc-getFC) \
+		FLINK=$(tc-getFC) \
 		CC=$(tc-getCC) \
 		AR_FLAGS=vru \
 		MOSLIBS='-lccp4f -lccp4c -lxdl_view -lcurses -lXt -lmmdb -lccif -lstdc++' \
diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog
index 715b9aa1b49e..6178d8086305 100644
--- a/sci-chemistry/oasis/ChangeLog
+++ b/sci-chemistry/oasis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/oasis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.8 2010/07/06 18:35:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.9 2010/12/16 13:39:50 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> oasis-4.0-r2.ebuild:
+  Removal of fortran.eclass, #348851
 
   06 Jul 2010; Justin Lecher <jlec@gentoo.org> oasis-4.0-r2.ebuild:
   Fix installation problems
diff --git a/sci-chemistry/oasis/oasis-4.0-r2.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
index ac113a83b84f..d9b9d50c3977 100644
--- a/sci-chemistry/oasis/oasis-4.0-r2.ebuild
+++ b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.2 2010/07/06 18:35:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.3 2010/12/16 13:39:50 jlec Exp $
 
 EAPI="3"
 
-inherit eutils fortran multilib
+inherit eutils multilib toolchain-funcs
 
-FORTRANC="ifc gfortran"
 MY_P="${PN}${PV}_Linux"
 
 DESCRIPTION="A direct-method program for SAD/SIR phasing"
@@ -40,7 +39,7 @@ src_prepare() {
 src_compile() {
 	emake \
 		-C src \
-		F77="${FORTRANC}" \
+		F77="$(tc-getFC)" \
 		CFLAGS="${FFLAGS}" \
 		CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \
 		Linux || die
diff --git a/sci-chemistry/pdb-tools/ChangeLog b/sci-chemistry/pdb-tools/ChangeLog
index 455851ac3ab9..755ecf21bc65 100644
--- a/sci-chemistry/pdb-tools/ChangeLog
+++ b/sci-chemistry/pdb-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/pdb-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.3 2010/10/28 20:01:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.4 2010/12/16 13:41:37 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> pdb-tools-0.1.4-r2.ebuild:
+  Removal of fortran.eclass, #348851
 
 *pdb-tools-0.1.4-r2 (28 Oct 2010)
 
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild
index 40de5820edb0..7e8fc6040a5b 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild,v 1.1 2010/10/28 20:01:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild,v 1.2 2010/12/16 13:41:37 jlec Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit python fortran
+inherit python toolchain-funcs
 
 DESCRIPTION="A set of tools for manipulating and doing calculations on wwPDB macromolecule structure files"
 HOMEPAGE="http://code.google.com/p/pdb-tools"
@@ -22,8 +22,6 @@ IUSE=""
 RDEPEND="sci-chemistry/dssp"
 DEPEND=""
 
-FORTRANC="ifc gfortran"
-
 S="${WORKDIR}"/${PN}_${PV}
 
 src_prepare() {
@@ -35,9 +33,9 @@ src_compile() {
 	mkdir bin
 	cd satk
 	for i in *.f; do
-		einfo "${FORTRANC} ${FFLAGS} ${LDFLAGS} ${i} -o ${i/.f}"
-		${FORTRANC} ${FFLAGS} -c ${i} -o ${i/.f/.o} || die
-		${FORTRANC} ${LDFLAGS} -o ../bin/${i/.f} ${i/.f/.o} || die
+		einfo "$(tc-getFC) ${FFLAGS} ${LDFLAGS} ${i} -o ${i/.f}"
+		$(tc-getFC) ${FFLAGS} -c ${i} -o ${i/.f/.o} || die
+		$(tc-getFC) ${LDFLAGS} -o ../bin/${i/.f} ${i/.f/.o} || die
 		sed "s:${i/.f}.out:${i/.f}:g" -i ../pdb_satk.py || die
 	done
 }
diff --git a/sci-chemistry/pdb2pqr/ChangeLog b/sci-chemistry/pdb2pqr/ChangeLog
index 41728a45d3ae..6b449d12cceb 100644
--- a/sci-chemistry/pdb2pqr/ChangeLog
+++ b/sci-chemistry/pdb2pqr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pdb2pqr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.29 2010/11/04 09:35:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.30 2010/12/16 13:45:43 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> pdb2pqr-1.5.0-r2.ebuild,
+  pdb2pqr-1.7.0.ebuild, pdb2pqr-1.7.0-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
 *pdb2pqr-1.7.0-r1 (04 Nov 2010)
 
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild
index 7c0ac202a463..8bd20911af13 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild,v 1.4 2010/10/15 18:56:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0-r2.ebuild,v 1.5 2010/12/16 13:45:43 jlec Exp $
 
 EAPI="3"
 
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-inherit eutils fortran multilib flag-o-matic distutils python versionator
+inherit distutils eutils flag-o-matic multilib toolchain-funcs versionator
 
 MY_PV=$(get_version_component_range 1-2)
 MY_P="${PN}-${MY_PV}"
@@ -26,9 +27,6 @@ DEPEND="
 	sci-chemistry/openbabel
 	opal? ( dev-python/zsi )"
 RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-FORTRAN="g77 gfortran"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -53,7 +51,7 @@ src_configure() {
 	configuration() {
 		# Avoid automagic to numeric
 		NUMPY="${EPREFIX}/$(python_get_sitedir)" \
-			F77="${FORTRANC}" \
+			F77="$(tc-getFC)" \
 			econf \
 			$(use_with opal) || \
 			die "econf failed"
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
index 26010325ccd9..259f9929e8bc 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild,v 1.1 2010/11/04 09:35:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild,v 1.2 2010/12/16 13:45:43 jlec Exp $
 
 EAPI="3"
 
@@ -8,9 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-inherit eutils fortran multilib flag-o-matic distutils python versionator toolchain-funcs
-
-FORTRAN="g77 gfortran"
+inherit distutils eutils flag-o-matic multilib toolchain-funcs versionator
 
 MY_PV=$(get_version_component_range 1-2)
 MY_P="${PN}-${MY_PV}"
@@ -65,7 +63,7 @@ src_configure() {
 	configuration() {
 		# Avoid automagic to numeric
 		NUMPY="${EPREFIX}/$(python_get_sitedir)" \
-			F77="${FORTRANC}" \
+			F77="$(tc-getFC)" \
 			econf \
 			--enable-propka \
 			--with-max-atoms=${MAXATOMS:-10000} \
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild
index ec9873a2834e..f5b810fc7e1e 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild,v 1.1 2010/10/14 17:53:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0.ebuild,v 1.2 2010/12/16 13:45:43 jlec Exp $
 
 EAPI="3"
 
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-inherit eutils fortran multilib flag-o-matic distutils python versionator
+inherit distutils eutils flag-o-matic multilib toolchain-funcs versionator
 
 MY_PV=$(get_version_component_range 1-2)
 MY_P="${PN}-${MY_PV}"
@@ -26,9 +27,7 @@ DEPEND="
 	sci-chemistry/openbabel
 	opal? ( dev-python/zsi )"
 RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-FORTRAN="g77 gfortran"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -53,7 +52,7 @@ src_configure() {
 	configuration() {
 		# Avoid automagic to numeric
 		NUMPY="${EPREFIX}/$(python_get_sitedir)" \
-			F77="${FORTRANC}" \
+			F77="$(tc-getFC)" \
 			econf \
 			$(use_with opal) || \
 			die "econf failed"
diff --git a/sci-chemistry/platon/ChangeLog b/sci-chemistry/platon/ChangeLog
index 3882aa500849..639640fa0ef0 100644
--- a/sci-chemistry/platon/ChangeLog
+++ b/sci-chemistry/platon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/platon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.22 2010/11/25 19:10:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.23 2010/12/16 13:50:12 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> platon-20101125.ebuild:
+  Removal of fortran.eclass, #348851
 
 *platon-20101125 (25 Nov 2010)
 
diff --git a/sci-chemistry/platon/platon-20101125.ebuild b/sci-chemistry/platon/platon-20101125.ebuild
index 8fa4bf31ab4a..27108270f0e9 100644
--- a/sci-chemistry/platon/platon-20101125.ebuild
+++ b/sci-chemistry/platon/platon-20101125.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20101125.ebuild,v 1.1 2010/11/25 19:10:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20101125.ebuild,v 1.2 2010/12/16 13:50:12 jlec Exp $
 
 EAPI="3"
 
-inherit eutils flag-o-matic fortran multilib toolchain-funcs
-
-FORTRAN="g77 gfortran"
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Versatile, SHELX-97 compatible, multipurpose crystallographic tool"
 HOMEPAGE="http://www.cryst.chem.uu.nl/platon/"
@@ -52,10 +50,10 @@ src_compile() {
 	COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
 	echo ${COMMAND}
 	${COMMAND} || die "Compilation of xdrvr.c failed"
-	COMMAND="${FORTRANC} -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
+	COMMAND="$(tc-getFC) -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
 	echo ${COMMAND}
 	${COMMAND} || die "Compilation of platon.f failed"
-	COMMAND="${FORTRANC} -o platon ${LDFLAGS} platon.o xdrvr.o -lX11 ${F2C}"
+	COMMAND="$(tc-getFC) -o platon ${LDFLAGS} platon.o xdrvr.o -lX11 ${F2C}"
 	echo ${COMMAND}
 	${COMMAND} || die "Linking failed"
 }
diff --git a/sci-chemistry/procheck/ChangeLog b/sci-chemistry/procheck/ChangeLog
index 8a782f56a29e..d75c7f7b8d17 100644
--- a/sci-chemistry/procheck/ChangeLog
+++ b/sci-chemistry/procheck/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/procheck
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/ChangeLog,v 1.3 2010/07/19 17:16:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/ChangeLog,v 1.4 2010/12/16 13:51:46 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> procheck-3.5.4-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
 *procheck-3.5.4-r1 (19 Jul 2010)
 
diff --git a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild b/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
index e2e5e740ed4b..4cabcbb493ae 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-r1.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-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.1 2010/07/19 17:16:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.2 2010/12/16 13:51:46 jlec Exp $
 
 EAPI="3"
 
-inherit eutils fortran toolchain-funcs versionator
+inherit eutils toolchain-funcs versionator
 
 DESCRIPTION="Checks the stereochemical quality of a protein structure"
 HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html"
@@ -24,8 +24,6 @@ RESTRICT="fetch"
 
 S="${WORKDIR}/${PN}"
 
-FORTRAN="gfortran g77"
-
 pkg_nofetch() {
 	elog "Please visit http://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html"
 	elog "And follow the instruction for downloading."
@@ -43,7 +41,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		F77=${FORTRANC} \
+		F77=$(tc-getFC) \
 		CC=$(tc-getCC) \
 		COPTS="${CFLAGS}" \
 		FOPTS="${FFLAGS}" \
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 3aa1ef3d742b..237d0967fec1 100644
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/raster3d
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.20 2010/11/08 17:21:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.21 2010/12/16 13:54:59 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> raster3d-2.7c.ebuild,
+  raster3d-2.9.2.ebuild:
+  Removal of fortran.eclass, #348851
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> raster3d-2.7c.ebuild,
   -raster3d-2.7d.ebuild, -files/raster3d-2.7d-gcc4-gentoo.patch,
diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
index e4de11f9207b..98a0ef03aa90 100644
--- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.9 2010/11/08 17:21:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.10 2010/12/16 13:54:59 jlec Exp $
 
-inherit toolchain-funcs fortran
+inherit toolchain-funcs
 
 NAME="Raster3D"
 
@@ -34,7 +34,7 @@ src_compile() {
 
 	# fix Makefile to honor user's CFLAGS/FFLAGS
 	sed -e "s:gcc:$(tc-getCC):" \
-		-e "s:g77:${FORTRANC}:" \
+		-e "s:g77:$(tc-getFC):" \
 		-e "s:-g -m486 -w:${CFLAGS}:" \
 		-e "s:-g -O -w -malign-double:${FFLAGS} -w:" \
 		-i Makefile || die "Failed to patch makefile"
diff --git a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild b/sci-chemistry/raster3d/raster3d-2.9.2.ebuild
index 21b9e4bee7f0..a14f6f8c8876 100644
--- a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.9.2.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-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.2 2010/11/08 17:21:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.3 2010/12/16 13:54:59 jlec Exp $
 
 EAPI="3"
 
-inherit fortran flag-o-matic multilib toolchain-funcs versionator
+inherit flag-o-matic multilib toolchain-funcs versionator
 
 MY_PN="Raster3D"
 MY_PV=$(replace_version_separator 2 -)
@@ -36,7 +36,7 @@ src_compile() {
 		-i Makefile.template || \
 		die "Failed to patch makefile.template"
 
-	if [[ ${FORTRANC} == gfortran ]]; then
+	if [[ $(tc-getFC) == gfortran ]]; then
 		append-cflags -Dgfortran
 	fi
 
@@ -48,7 +48,7 @@ src_compile() {
 			LDFLAGS="${LDFLAGS}" \
 			FFLAGS="${FFLAGS}" \
 			CC="$(tc-getCC)"\
-			FC="${FORTRANC}" \
+			FC="$(tc-getFC)" \
 			INCDIRS="-I${EPREFIX}"/usr/include \
 			LIBDIRS="-L${EPREFIX}"/usr/$(get_libdir) \
 			${target} || die
diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index 7e44f966a576..62be8703563f 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/refmac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.26 2010/12/07 16:57:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.27 2010/12/16 13:56:18 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> refmac-5.5.0109.ebuild,
+  refmac-5.5.0110.ebuild, refmac-5.5.0110-r1.ebuild, refmac-5.6.0093.ebuild,
+  refmac-5.6.0094.ebuild:
+  Removal of fortran.eclass, #348851
 
 *refmac-5.6.0094 (07 Dec 2010)
 
diff --git a/sci-chemistry/refmac/refmac-5.5.0109.ebuild b/sci-chemistry/refmac/refmac-5.5.0109.ebuild
index 7749062ddd28..7332f0d9dd88 100644
--- a/sci-chemistry/refmac/refmac-5.5.0109.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0109.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-chemistry/refmac/refmac-5.5.0109.ebuild,v 1.4 2010/06/16 14:27:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0109.ebuild,v 1.5 2010/12/16 13:56:18 jlec Exp $
 
 EAPI="2"
 
-inherit fortran base toolchain-funcs versionator
+inherit base toolchain-funcs versionator
 
 DESCRIPTION="Macromolecular crystallographic refinement program"
 HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
index 63d7c6c37e69..bf3ddef06621 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r1.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-chemistry/refmac/refmac-5.5.0110-r1.ebuild,v 1.2 2010/06/16 14:27:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild,v 1.3 2010/12/16 13:56:18 jlec Exp $
 
 EAPI="2"
 
-inherit fortran base toolchain-funcs versionator
+inherit base toolchain-funcs versionator
 
 DESCRIPTION="Macromolecular crystallographic refinement program"
 HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
diff --git a/sci-chemistry/refmac/refmac-5.5.0110.ebuild b/sci-chemistry/refmac/refmac-5.5.0110.ebuild
index 6f41b630568c..267b8f492ac5 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110.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-chemistry/refmac/refmac-5.5.0110.ebuild,v 1.3 2010/06/16 14:27:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110.ebuild,v 1.4 2010/12/16 13:56:18 jlec Exp $
 
 EAPI="2"
 
-inherit fortran base toolchain-funcs versionator
+inherit base toolchain-funcs versionator
 
 DESCRIPTION="Macromolecular crystallographic refinement program"
 HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
diff --git a/sci-chemistry/refmac/refmac-5.6.0093.ebuild b/sci-chemistry/refmac/refmac-5.6.0093.ebuild
index 07de5d9ac3e7..523ded34e934 100644
--- a/sci-chemistry/refmac/refmac-5.6.0093.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0093.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-chemistry/refmac/refmac-5.6.0093.ebuild,v 1.1 2010/11/17 07:49:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0093.ebuild,v 1.2 2010/12/16 13:56:18 jlec Exp $
 
 EAPI="2"
 
-inherit fortran base toolchain-funcs versionator
+inherit base toolchain-funcs versionator
 
 MY_PV="$(get_version_component_range 1-2)_source_v${PV}"
 
diff --git a/sci-chemistry/refmac/refmac-5.6.0094.ebuild b/sci-chemistry/refmac/refmac-5.6.0094.ebuild
index 591cb50a2897..ce851c416824 100644
--- a/sci-chemistry/refmac/refmac-5.6.0094.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0094.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-chemistry/refmac/refmac-5.6.0094.ebuild,v 1.1 2010/12/07 16:57:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0094.ebuild,v 1.2 2010/12/16 13:56:18 jlec Exp $
 
 EAPI="2"
 
-inherit fortran base toolchain-funcs versionator
+inherit base toolchain-funcs versionator
 
 MY_PV="$(get_version_component_range 1-2)_source_v${PV}"
 
diff --git a/sci-chemistry/scala/ChangeLog b/sci-chemistry/scala/ChangeLog
index 7e4857af2ffe..4fca8ea2c57b 100644
--- a/sci-chemistry/scala/ChangeLog
+++ b/sci-chemistry/scala/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/scala
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.3 2010/06/15 14:49:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.4 2010/12/16 13:57:04 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> scala-3.3.18-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
   15 Jun 2010; Justin Lecher <jlec@gentoo.org> scala-3.3.18-r1.ebuild:
   keyworded for linux prefix
diff --git a/sci-chemistry/scala/scala-3.3.18-r1.ebuild b/sci-chemistry/scala/scala-3.3.18-r1.ebuild
index 005d6e7dc970..25073ed021ef 100644
--- a/sci-chemistry/scala/scala-3.3.18-r1.ebuild
+++ b/sci-chemistry/scala/scala-3.3.18-r1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.18-r1.ebuild,v 1.2 2010/06/15 14:49:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.18-r1.ebuild,v 1.3 2010/12/16 13:57:04 jlec Exp $
 
 EAPI="2"
 
-inherit autotools fortran
+inherit autotools
 
-FORTRAN="gfortran ifc"
-
-DESCRIPTION="scale together multiple observations of reflections"
+DESCRIPTION="Scale together multiple observations of reflections"
 HOMEPAGE="http://www.ccp4.ac.uk/dist/html/scala.html"
 SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
 
diff --git a/sci-chemistry/shelx/ChangeLog b/sci-chemistry/shelx/ChangeLog
index 48db7439911a..ea8cbbd24f04 100644
--- a/sci-chemistry/shelx/ChangeLog
+++ b/sci-chemistry/shelx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/shelx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.17 2010/08/20 15:11:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.18 2010/12/16 13:58:31 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> shelx-20060317-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
   20 Aug 2010; Donnie Berkholz <dberkholz@gentoo.org>;
   shelx-20060317-r1.ebuild:
diff --git a/sci-chemistry/shelx/shelx-20060317-r1.ebuild b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
index 19efced4e67d..b1eb8af6403d 100644
--- a/sci-chemistry/shelx/shelx-20060317-r1.ebuild
+++ b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317-r1.ebuild,v 1.6 2010/08/20 15:11:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317-r1.ebuild,v 1.7 2010/12/16 13:58:31 jlec Exp $
 
-inherit autotools eutils flag-o-matic fortran
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Programs for crystal structure determination from single-crystal diffraction data"
 HOMEPAGE="http://shelx.uni-ac.gwdg.de/SHELX/"
 SRC_URI="${P}.tgz
 	openmp? ( ${P}-mp.tgz )"
-RESTRICT="fetch"
+
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dosformat openmp"
-RDEPEND=""
-DEPEND="${RDEPEND}"
+
 S="${WORKDIR}/unix"
 
-FORTRAN="ifc gfortran"
+RESTRICT="fetch"
 
 pkg_nofetch() {
 	elog "Go to ${HOMEPAGE}"
@@ -60,8 +59,7 @@ src_compile() {
 	esac
 
 	econf \
-		FC="${FORTRANC}" \
-		|| die "configure failed"
+		FC="$(tc-getFC)"
 	emake || die "make failed"
 }
 
diff --git a/sci-chemistry/tinker/ChangeLog b/sci-chemistry/tinker/ChangeLog
index cb98628bbdbf..ae4095747dd6 100644
--- a/sci-chemistry/tinker/ChangeLog
+++ b/sci-chemistry/tinker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/tinker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.28 2010/12/02 22:15:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.29 2010/12/16 13:59:36 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> tinker-5.1.09.ebuild,
+  tinker-6.ebuild:
+  Removal of fortran.eclass, #348851
 
 *tinker-6 (02 Dec 2010)
 
diff --git a/sci-chemistry/tinker/tinker-5.1.09.ebuild b/sci-chemistry/tinker/tinker-5.1.09.ebuild
index 4e70913715ab..5652258fc40d 100644
--- a/sci-chemistry/tinker/tinker-5.1.09.ebuild
+++ b/sci-chemistry/tinker/tinker-5.1.09.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.3 2010/12/02 10:51:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.4 2010/12/16 13:59:36 jlec Exp $
 
 EAPI="2"
-FORTRAN="gfortran ifc"
 
-inherit eutils fortran java-pkg-opt-2 toolchain-funcs
+inherit eutils java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
 HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -21,12 +20,12 @@ RDEPEND="
 	dev-libs/maloc
 	!dev-util/diffuse
 	>=virtual/jre-1.6"
+
 RESTRICT="mirror"
 
 S="${WORKDIR}"/tinker/source
 
 pkg_setup() {
-	fortran_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -42,7 +41,7 @@ src_compile() {
 	done
 	emake -e \
 		-f ../make/Makefile \
-		F77="${FORTRANC}" \
+		F77="$(tc-getFC)" \
 		CC="$(tc-getCC) -c" \
 		F77FLAGS=-c \
 		OPTFLAGS="${FFLAGS}" \
diff --git a/sci-chemistry/tinker/tinker-6.ebuild b/sci-chemistry/tinker/tinker-6.ebuild
index 687335483ebc..2a90d59d3261 100644
--- a/sci-chemistry/tinker/tinker-6.ebuild
+++ b/sci-chemistry/tinker/tinker-6.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.1 2010/12/02 22:15:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.2 2010/12/16 13:59:36 jlec Exp $
 
 EAPI="2"
-FORTRAN="gfortran ifc"
 
-inherit fortran flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
 HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -22,19 +21,19 @@ RDEPEND="
 	dev-libs/maloc
 	!dev-util/diffuse
 	>=virtual/jre-1.6"
+
 RESTRICT="mirror"
 
 S="${WORKDIR}"/${PN}${PV}/source
 
 pkg_setup() {
-	fortran_pkg_setup
 	java-pkg-opt-2_pkg_setup
 	tc-has-openmp || die "Please use an openmp capable compiler like gcc[openmp]"
 }
 
 src_prepare() {
 	sed 's:strip:true:g' -i ../make/Makefile
-	[[ ${FORTRANC} == "ifc" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
+	[[ $(tc-getFC) == "ifort" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
 }
 
 src_compile() {
@@ -46,7 +45,7 @@ src_compile() {
 	# use dummy routines in pmpb.f instead of apbs calls
 	rm pmpb.c || die
 
-	if [[ ${FORTRANC} == "gfortran" ]]; then
+	if [[ $(tc-getFC) == "gfortran" ]]; then
 		append-flags -fopenmp
 		_omplib="-lgomp"
 	else
@@ -58,7 +57,7 @@ src_compile() {
 
 	emake \
 		-f ../make/Makefile \
-		F77="${FORTRANC}" \
+		F77="$(tc-getFC)" \
 		CC="$(tc-getCC) -c" \
 		F77FLAGS=-c \
 		OPTFLAGS="${FFLAGS}" \