Removal of fortran.eclass, #348851

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

5 files changed, 62 insertions, 54 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index 4af9980225ef..e6f9f38119b3 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.23 2010/06/15 14:42:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.24 2010/12/16 12:55:16 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> ccp4-6.0.1-r1.ebuild,
+  ccp4-6.0.2.ebuild, ccp4-6.0.2-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
   15 Jun 2010; Justin Lecher <jlec@gentoo.org> ccp4-6.1.3-r1.ebuild:
   Fixed DEP VERSIONS
diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index 42a25edb676a..8af21c881e15 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -40,17 +40,17 @@ DIST scala.f-r1.101.2.3-r1.101.2.4.diff 932 RMD160 a0f03c0cdd3591001d1b87041a804
 DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
 DIST topp.f-r1.16.2.5-r1.16.2.6.diff 2083 RMD160 4f7522c52afc525bdf345feaec37958eb0557cbf SHA1 bdd1e5a81e65c6d3ed7ab89ba21bd68055cc72ca SHA256 6d28b8fae0c3640aaf7ffb9878db4d03d9e53a9398f6b7887c06094d0c680cec
 DIST util_windows.tcl-r1.27-r1.27.2.1.diff 1486 RMD160 06b5598bcff7da11e19ec62c73babd15c6adb1f3 SHA1 fec29ceec77944ecc37f77449147a26d1dc3f149 SHA256 092e2d281a9366c375711616c1e07d2e1f886c9709ed81da78ef7e9a039ff530
-EBUILD ccp4-6.0.1-r1.ebuild 13681 RMD160 881038127962bb7aea4f9f77b4cc5b8c170dd688 SHA1 34d43786b53b4adfeec8740036cd2a9081823452 SHA256 bfda422f6d798d29c22faf86b789e4ac5db9799508d027e3428a8f264d286fc7
-EBUILD ccp4-6.0.2-r1.ebuild 14094 RMD160 e273884aea608217207b0c8751fce978c67a53e7 SHA1 7d9569120787984943be86b9e0e838a43cbb5b29 SHA256 dbd1c61f294ce3ed091809dc9952f6d027dd01c6b7fd9cb71f3046264ebcb02a
-EBUILD ccp4-6.0.2.ebuild 13248 RMD160 747c3e19277ef49aeda2d42cd8a93597a545775f SHA1 ef54e5d59b6a29ac6d0b06f23e47e274f2c6925b SHA256 f46b1fc972615e04d4f643f33b8b3f5a1df4c19217e221afa621cce6918cb17f
+EBUILD ccp4-6.0.1-r1.ebuild 13650 RMD160 433aa803a23f1671ce974bd8fa1da75884a42335 SHA1 3643fb9cc3f8aa06a51b9df869d393efb840447d SHA256 422c33d5a102b64654ca30512f492244a23e1ba9f5d5357768e4b08242ca01ed
+EBUILD ccp4-6.0.2-r1.ebuild 14055 RMD160 b1e7fc9bd0d091f4c1e2d93309ca33fe3b466c49 SHA1 b95882f445fb08f163ee94df68484440f0b1740a SHA256 31506554d5fb975699e9236fa302ac6a15492ed91577d64eef283739370d1bcd
+EBUILD ccp4-6.0.2.ebuild 13209 RMD160 6f2a0feac61692fdf12cd3a7f886e22ca17227d0 SHA1 74c68221e77f066bc142823063d223576f04bf79 SHA256 0608ef2915621720c410ed677cc42feea7b135043b549814091be6252abe68c0
 EBUILD ccp4-6.1.3-r1.ebuild 981 RMD160 593d79cbbb3c22bd81ba0222738e0e2d65bd1f51 SHA1 512c3dcd0435eae2b0c81a3df4dc61383afb7ac2 SHA256 21744e8535254c9c49fe07cda40ee6dba185d92675698f8447c59dde35fcd088
 EBUILD ccp4-6.1.3.ebuild 858 RMD160 2d7b43dce48ae070e7f297f4dd93e063e69fbaa3 SHA1 069271a426ae6a755a075c46f295cab938eded0c SHA256 8a50241824d62ee37ec3aa3938b8a984289e3c795cd55b9fac13d3ee4bb7ff26
-MISC ChangeLog 4647 RMD160 a1504efa0fc506a6c7fe2fb1b3c964905de8e7c7 SHA1 71f2d4ac55a6e889767c6cc7596ee302fbcea2c2 SHA256 69696dcca60ae2b1e3ecaaa43bf60132a329ae5afd969780ab83b5571cd022e2
+MISC ChangeLog 4797 RMD160 862803d13bc0a4816e54b79854aa3fc42512344a SHA1 94ab7d2005af01a0be1ffe5e7a4a76f874896e69 SHA256 e669e438ae7e2698fc659f0407858b714c0daf1dbfdae044ef5ef665abab29e4
 MISC metadata.xml 311 RMD160 7773ed578c7688537f2cf40b5417f9712fe84d8c SHA1 cd3e212d34f7c968d06bab6a2bc64e223b232b3e SHA256 1c5a8d16813aba13725a331bb6d0ed0d2a3bc4d0942775ceced4dc0a7fe4b653
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwXlDEACgkQgAnW8HDreRaK0gCbBxDddwOnBajf3LE6WjpxW86R
-eQUAn3JaQS334BEAjXh0JfhcxEapSK+9
-=He1l
+iEYEARECAAYFAk0KDDkACgkQgAnW8HDreRbAOACfY9G4eay3UZn8dz7f9xj73gJF
+OJUAniidAZ0rC93eFFMuTi3tNK8g6zST
+=CFn5
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
index 164e63b4f64f..f954f3d487d9 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
@@ -1,10 +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-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.9 2009/03/04 13:41:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.10 2010/12/16 12:55:16 jlec Exp $
 
-inherit fortran eutils gnuconfig toolchain-funcs
-
-FORTRAN="g77 gfortran ifc"
+inherit eutils gnuconfig toolchain-funcs
 
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 
@@ -38,24 +36,23 @@ DESCRIPTION="Protein X-ray crystallography toolkit"
 HOMEPAGE="http://www.ccp4.ac.uk/"
 RESTRICT="mirror"
 SRC_URI="${SRC}/${PV}/packed/${P}-core-src.tar.gz"
+
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
 	SRC_URI="${SRC_URI}
 		${SRC}/${PV}/patches/${!NAME}"
 done
+
 LICENSE="ccp4"
 SLOT="0"
 KEYWORDS="ppc x86"
 IUSE="X"
+
 # app-office/sc overlaps sc binary and man page
 # We can't rename ours since the automated ccp4i interface expects it there,
 # as do many scripts. app-office/sc can't rename its because that's the name
 # of the package.
-RDEPEND="X? (
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXaw
-		)
+RDEPEND="
 		>=dev-lang/tcl-8.3
 		>=dev-lang/tk-8.3
 		>=dev-tcltk/blt-2.4
@@ -66,7 +63,12 @@ RDEPEND="X? (
 		sci-chemistry/rasmol
 		sci-libs/mccp4
 		app-shells/tcsh
-		!app-office/sc"
+		!app-office/sc
+		X? (
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXaw
+		)"
 DEPEND="${RDEPEND}
 		X? (
 			x11-misc/imake
@@ -154,7 +156,7 @@ src_compile() {
 	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
 	# linux_compaq_compilers linux_intel_compilers generic Darwin
 	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "${FORTRANC}" = "ifc" ]]; then
+	if [[ "$(tc-getFC)" = "ifort" ]]; then
 		if use ia64; then
 			GENTOO_OSNAME="ia64_linux_intel"
 		else
@@ -190,7 +192,7 @@ src_compile() {
 	export COPTIM=${CFLAGS}
 	export CXXOPTIM=${CXXFLAGS}
 	# Default to -O2 if FFLAGS is unset
-	export FC=${FORTRANC}
+	export FC=$(tc-getFC)
 	export FOPTIM=${FFLAGS:- -O2}
 
 	# Can't use econf, configure rejects unknown options like --prefix
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
index 06effb0695ab..0de8e672b7e6 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
@@ -1,10 +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-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v 1.7 2009/03/04 13:41:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v 1.8 2010/12/16 12:55:16 jlec Exp $
 
-inherit fortran eutils gnuconfig toolchain-funcs
-
-FORTRAN="g77 gfortran ifc"
+inherit eutils gnuconfig toolchain-funcs
 
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 
@@ -45,19 +43,17 @@ for i in $(seq $PATCH_TOT); do
 	SRC_URI="${SRC_URI}
 		${SRC}/${PV}/patches/${!NAME}"
 done
+
 LICENSE="ccp4"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
+
 # app-office/sc overlaps sc binary and man page
 # We can't rename ours since the automated ccp4i interface expects it there,
 # as do many scripts. app-office/sc can't rename its because that's the name
 # of the package.
-RDEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXt
-				x11-libs/libXaw
-		)
+RDEPEND="
 		>=dev-lang/tcl-8.3
 		>=dev-lang/tk-8.3
 		>=dev-tcltk/blt-2.4
@@ -68,12 +64,17 @@ RDEPEND="X? (
 		sci-chemistry/rasmol
 		sci-libs/mccp4
 		app-shells/tcsh
-		!app-office/sc"
+		!app-office/sc
+		X? (
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXaw
+		)"
 DEPEND="${RDEPEND}
 		X? (
-				x11-misc/imake
-				x11-proto/inputproto
-				x11-proto/xextproto
+			x11-misc/imake
+			x11-proto/inputproto
+			x11-proto/xextproto
 		)"
 
 S="${WORKDIR}/${PN}-${PV}"
@@ -159,7 +160,7 @@ src_compile() {
 	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
 	# linux_compaq_compilers linux_intel_compilers generic Darwin
 	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "${FORTRANC}" = "ifc" ]]; then
+	if [[ "$(tc-getFC)" = "ifort" ]]; then
 		if use ia64; then
 			GENTOO_OSNAME="ia64_linux_intel"
 		else
@@ -195,7 +196,7 @@ src_compile() {
 	export COPTIM=${CFLAGS}
 	export CXXOPTIM=${CXXFLAGS}
 	# Default to -O2 if FFLAGS is unset
-	export FC=${FORTRANC}
+	export FC=$(tc-getFC)
 	export FOPTIM=${FFLAGS:- -O2}
 
 	# Can't use econf, configure rejects unknown options like --prefix
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
index 80e887d4fd4a..0d6c204cad22 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
@@ -1,10 +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-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.7 2009/03/04 13:41:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.8 2010/12/16 12:55:16 jlec Exp $
 
-inherit fortran eutils gnuconfig toolchain-funcs
-
-FORTRAN="g77 gfortran ifc"
+inherit eutils gnuconfig toolchain-funcs
 
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 
@@ -23,19 +21,17 @@ for i in $(seq $PATCH_TOT); do
 	SRC_URI="${SRC_URI}
 		${SRC}/${PV}/patches/${!NAME}"
 done
+
 LICENSE="ccp4"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="X"
+
 # app-office/sc overlaps sc binary and man page
 # We can't rename ours since the automated ccp4i interface expects it there,
 # as do many scripts. app-office/sc can't rename its because that's the name
 # of the package.
-RDEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXt
-				x11-libs/libXaw
-		)
+RDEPEND="
 		>=dev-lang/tcl-8.3
 		>=dev-lang/tk-8.3
 		>=dev-tcltk/blt-2.4
@@ -46,12 +42,17 @@ RDEPEND="X? (
 		sci-chemistry/rasmol
 		sci-libs/mccp4
 		app-shells/tcsh
-		!app-office/sc"
+		!app-office/sc
+		X? (
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXaw
+		)"
 DEPEND="${RDEPEND}
 		X? (
-				x11-misc/imake
-				x11-proto/inputproto
-				x11-proto/xextproto
+			x11-misc/imake
+			x11-proto/inputproto
+			x11-proto/xextproto
 		)"
 
 S="${WORKDIR}/${PN}-${PV}"
@@ -134,7 +135,7 @@ src_compile() {
 	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
 	# linux_compaq_compilers linux_intel_compilers generic Darwin
 	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "${FORTRANC}" = "ifc" ]]; then
+	if [[ "$(tc-getFC)" = "ifort" ]]; then
 		if use ia64; then
 			GENTOO_OSNAME="ia64_linux_intel"
 		else
@@ -170,7 +171,7 @@ src_compile() {
 	export COPTIM=${CFLAGS}
 	export CXXOPTIM=${CXXFLAGS}
 	# Default to -O2 if FFLAGS is unset
-	export FC=${FORTRANC}
+	export FC=$(tc-getFC)
 	export FOPTIM=${FFLAGS:- -O2}
 
 	# Can't use econf, configure rejects unknown options like --prefix