fortran.eclass fixes

(Portage version: 2.2.0_alpha9/git/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 24 insertions, 20 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 6e1f3968e..11c31ebf4 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
+  mpich2-1.3.ebuild:
+  Removal of fortran.eclass, #348851
+
 *mpich2-1.3 (12 Nov 2010)
 
   12 Nov 2010; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.3_rc1.ebuild,
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 894d5740d..2c02cffc7 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa
 AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
@@ -14,14 +17,21 @@ AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c633
 AUX mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch 1053 RMD160 e38a0c503bde8b66cd1d7efbeb674f14e0008a8d SHA1 f5691827c39a9bbf01c4c7e13d5fdf4aa1774558 SHA256 a0e79be986c29cc5aa1b0abb1bba27dc368a530d632a332e8701e9c02967224e
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
 DIST mpich2-1.3.tar.gz 19394388 RMD160 e48e9116ad42cc9922497c12f9e926d6d3490976 SHA1 a6c5518ddf94c60397e0508898f770c693948619 SHA256 c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63
-EBUILD mpich2-1.2.1_p1-r2.ebuild 5074 RMD160 c11e2f01153805312f382f8d46112920df59575b SHA1 fb45a52e123bd6a5970c9cd1df1c5a52f99539b1 SHA256 6380fbee9e21e241a7736a0b75374036bb5295a7392b052354de4f28ccd440c1
-EBUILD mpich2-1.3.ebuild 3698 RMD160 0d5febf170f409701c82e83d880dc98cba198359 SHA1 19841e5c605284b3bd78975e317050fce7b33713 SHA256 0a5a0b53dbc2ab57558520e968c8a514f137e52c153de37b4fef016c138ca0f9
-MISC ChangeLog 4041 RMD160 d489e9369e87716748a43e4c37f900f92de7f904 SHA1 31f3ccba3de55a6652de5fc4e39bcd02320e4e76 SHA256 23bfe4ec0b805de22e402ba4e3d68d3416ad6029643823e2ebf297b390e38076
+EBUILD mpich2-1.2.1_p1-r2.ebuild 4999 RMD160 de0cea3ae051b847b3b609b81d1d35431e6c4844 SHA1 15fef9e079915d6c6b48f905d672d5c81fe4b7bd SHA256 b14ca883831f28d813d6c90e995109b899d39ad7428de1ba1957360b21aeb51c
+EBUILD mpich2-1.3.ebuild 3623 RMD160 b76f842287d68188ba8c8b020edbebead1214fae SHA1 44ff4d1fc90dbc05d1c985fec3b430dd6113d5fe SHA256 49f7bff34d653b6010f1dfc5543ea1503fd84a1abc6bbe63e197a89519821321
+MISC ChangeLog 4174 RMD160 677459faaec00fa607f4b9d2b3fa7aefee6363a7 SHA1 f7ee8c7c2f3f729b8bdcc8ae7bd5bc2523307eb5 SHA256 f71c7924c63a9e05139362e7f9bd58a5ffd4b5b26a222a928112fc10cc70be67
 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0KOWQACgkQgAnW8HDreRYJngCfdLFaExQ2/e7qmIf1VKZVGmVJ
+mNUAoI9JUGBildUN1AflM+B+YUG/7yRw
+=kjnm
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzdla8ACgkQ4MrvBE1wQ8mUMgCePOof2yEywgvQM5SCGh8OkePp
-/UQAn3BvcQSek7DH9P63zYivT+L1WNY/
-=Fk/G
+iEYEARECAAYFAk0LrOUACgkQgAnW8HDreRaOdQCfVYDlDUeCtXHjzhwE+LvE1roa
+aN4AoL0OQ7UfxMz2LWjTnU83tTRfhY7Z
+=1QDI
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index f1f325ad1..94ba4c0dd 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -5,7 +5,7 @@
 EAPI=2
 PYTHON_DEPEND="2"
 
-inherit eutils fortran python mpi
+inherit eutils python mpi toolchain-funcs
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -37,11 +37,6 @@ pkg_setup() {
 
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
-	if use fortran ; then
-		FORTRAN="g77 gfortran ifort ifc"
-		fortran_pkg_setup
-	fi
-
 	if use mpi-threads && ! use threads; then
 		ewarn "mpi-threads requires threads, assuming that's what you want"
 	fi
@@ -109,7 +104,7 @@ src_configure() {
 	fi
 
 	# enable f90 support for appropriate compilers
-	case "${FORTRANC}" in
+	case "$(tc-getFC)" in
 	    gfortran|if*)
 			c="${c} --enable-f77 --enable-f90";;
 	    g77)
diff --git a/sys-cluster/mpich2/mpich2-1.3.ebuild b/sys-cluster/mpich2/mpich2-1.3.ebuild
index 887ef3100..591d51107 100644
--- a/sys-cluster/mpich2/mpich2-1.3.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.3.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=2
-inherit eutils fortran mpi
+inherit eutils mpi toolchain-funcs
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -31,11 +31,6 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 pkg_setup() {
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
-	if use fortran ; then
-		FORTRAN="g77 gfortran ifort ifc"
-		fortran_pkg_setup
-	fi
-
 	if use mpi-threads && ! use threads; then
 		ewarn "mpi-threads requires threads, assuming that's what you want"
 	fi
@@ -94,7 +89,7 @@ src_configure() {
 	fi
 
 	# enable f90 support for appropriate compilers
-	case "${FORTRANC}" in
+	case "$(tc-getFC)" in
 	    gfortran|if*)
 			c="${c} --enable-f77 --enable-fc";;
 	    g77)