Removal of fortran.eclass, #348851

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

6 files changed, 42 insertions, 43 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index f1325d2b518e..6e3523258cfb 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/acml
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.40 2009/07/07 23:27:59 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.41 2010/12/16 14:09:09 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> acml-3.6.0-r1.ebuild,
+  acml-3.6.1-r1.ebuild, acml-4.0.1.ebuild, acml-4.1.0-r1.ebuild:
+  Removal of fortran.eclass, #348851
 
   07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org> ChangeLog:
   Use elog for fetch error.
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index b0464bf513b1..38ab570640d6 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -19,16 +19,16 @@ DIST acml-4-1-0-gfortran-64bit.tgz 29995624 RMD160 53a50524235903569905ecc3cd3f6
 DIST acml-4-1-0-ifort-32bit.tgz 18797527 RMD160 bbc0ec7e367693d8201b032b310bf3b36edf1834 SHA1 d6c1bacc012718190d54d3b7fd5804bc85429c46 SHA256 5dfa768c12e96d2d25678e85cf2e0eea3bd427ddd94f417bcad09abe25369375
 DIST acml-4-1-0-ifort-64bit-int64.tgz 36135363 RMD160 0c412608381f95518a58f9d923d515f0d16ce8a1 SHA1 b3f4aadc67b41bd1a9930e00ff3c1ab81ce5a1e6 SHA256 3da0ded50ab25e44f531ac58b469344fed0f6af4ae70aa58b1286cf8de9731a4
 DIST acml-4-1-0-ifort-64bit.tgz 36577689 RMD160 35ef227d2bf24ae3ff2141a802570d6d2301d30a SHA1 ec2591f56233816ccfcd1ba1321e03cc21909206 SHA256 b5b60425fccb624e3baf48f5d51ae68ccdc3e9852a4a50661bb3e45a6f25be40
-EBUILD acml-3.6.0-r1.ebuild 4486 RMD160 d740d9f002c2a4d1a8bb0c094108983d23400c00 SHA1 648a4efa47b57f2827fcd37235f59f6256ce6997 SHA256 8c1b0d1e02ba64ffdd60cc020e10d9f6e167fb6cdfabe6408c2279bc791a62ca
-EBUILD acml-3.6.1-r1.ebuild 5223 RMD160 b1799bd496f14aa19043a3bf210cc59ba58107d2 SHA1 5934984c91f4bd27b28d98a6c5fb6184d453bf8f SHA256 4f6ec15274818e6e2df0dc68c5e033fb72443f6289e610c05733f2c5ef810ec1
-EBUILD acml-4.0.1.ebuild 4926 RMD160 03ea891a51366243be1a318cbfbd65b407c10800 SHA1 0762345d1dd1198060dcfe8244d083bb10ba9946 SHA256 bdea166ec84cd5e7eff4d7490cfab2f7c83d343f2a7d61f5e6470560f13f30d2
-EBUILD acml-4.1.0-r1.ebuild 5372 RMD160 10bb46782540e51240052300aba460c9afd070e9 SHA1 82adacd580ec93a4c5aa5ec66eaa518af8582da4 SHA256 a2e17098cd1f1d4238360bdf10f5d5ebb823dafb907789b6a7c344b0f19a203a
-MISC ChangeLog 7773 RMD160 f8d69220b6d8e72da7dcb8293ece006105f9fb8a SHA1 990736c42e630af2bc7267d39c49683559e25b58 SHA256 8534ddf3900a8ec086caafc3fad3a692fecfb0c4d3323edafd19fc75e5e7fd84
+EBUILD acml-3.6.0-r1.ebuild 4456 RMD160 7963a6cd1aa4d6b6c856c3f7c9d03e11aefb239e SHA1 81e8913cd14209d41f579a03f0c55bbacf5c8603 SHA256 e77b34955af544cb7d0c9b051784cda1fa0092e9b9d6b1e96d81e7997c618b09
+EBUILD acml-3.6.1-r1.ebuild 5193 RMD160 2e50f659029f6b457040f7bde4e3d2dc90ba32e8 SHA1 ec35564ebc37ccc6000fa8aa0c0196a9c8f9974a SHA256 145860409a9f3fea82b0928e5a9625814ca32b074936396a8d6ee1c12d3e9e02
+EBUILD acml-4.0.1.ebuild 4858 RMD160 f1a32877ffcff2b1be62cd3cd8c48948a0987702 SHA1 0faeef9e2de2156ee90d25ea56981457545f7a7d SHA256 6b70245e1138c976f1a0a456b87ecc8989469af67e8c41b9af8b911359d9b6b6
+EBUILD acml-4.1.0-r1.ebuild 5342 RMD160 96499dd57346c4cde7dc85084f960e9ee2427cf3 SHA1 8826c28eee429c507d21adbd483745205d62a091 SHA256 0fcad6d674029f5471477940a9d7e762ffb61f75cb15cc566325bc17f6144bc0
+MISC ChangeLog 7940 RMD160 0991fd96cb8c8f043ed47b9dd6c04b53802f0506 SHA1 da81d931f7ef4bae8ac7defd09211ccfbe98cc82 SHA256 c79ef9fa2649cb78f8f34cdc1c90ca4e57e3c5cc65c9c83ee64d4c0e92057064
 MISC metadata.xml 1073 RMD160 3fcd242b751cb99b5c4ab7048868bc67a9a37294 SHA1 a46e3cee12b71a6c01a750efe03b027cf8a53032 SHA256 ea9031855e2976cd99a36eba1193648f933fd820e69690eab83bd70703cc034e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkpT2gQACgkQAiZjviIA2Xia7wCgjMfNB7df/2updJala6RRgiFy
-u2AAnA6kYiQfNRB0KOoAHapSYB1CkRz2
-=m5Li
+iEYEARECAAYFAk0KHYsACgkQgAnW8HDreRYjPgCgrhey/SpaKoDxN6E+HN1UDXRh
+jyYAnjZEcnncrA/miG0XL4N2ldxLvsD7
+=TLF2
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index 48fdb665bf16..a59848c33736 100644
--- a/sci-libs/acml/acml-3.6.0-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.0-r1.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/acml/acml-3.6.0-r1.ebuild,v 1.9 2008/04/22 08:13:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.10 2010/12/16 14:09:09 jlec Exp $
 
-inherit eutils toolchain-funcs fortran
+inherit eutils toolchain-funcs
 
 DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
 HOMEPAGE="http://developer.amd.com/acml.jsp"
@@ -51,7 +51,6 @@ pkg_setup() {
 	FORTRAN=ifc
 	FORT=ifort
 	! use ifc && ! use openmp && FORTRAN=g77 && FORT=gnu
-	fortran_pkg_setup
 }
 
 src_unpack() {
@@ -69,7 +68,7 @@ src_test() {
 			cd "${S}"/${fort}/examples/${d}
 			emake \
 				ACMLDIR="${S}"/${fort} \
-				F77=${FORTRANC} \
+				F77=$(tc-getFC) \
 				CC="$(tc-getCC)" \
 				CPLUSPLUS="$(tc-getCXX)" \
 				|| die "emake test in ${fort}/examples/${d} failed"
@@ -89,7 +88,7 @@ src_install() {
 		cp -pPR "${S}/${fort}" "${D}"${instdir} || die "copy ${fort} failed"
 
 		# install profiles
-		ESELECT_PROF=acml-${FORTRANC}
+		ESELECT_PROF=acml-$(tc-getFC)
 		local acmldir=${instdir}/${fort}
 		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index 1f37ba11b54b..2d98972e9043 100644
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.1-r1.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/acml/acml-3.6.1-r1.ebuild,v 1.9 2008/04/22 08:13:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.10 2010/12/16 14:09:09 jlec Exp $
 
-inherit eutils toolchain-funcs fortran
+inherit eutils toolchain-funcs
 
 DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
 HOMEPAGE="http://developer.amd.com/acml.jsp"
@@ -40,8 +40,7 @@ pkg_setup() {
 	elog "For older 32-bit without SSE/SSE2, use other blas/lapack libraries,"
 	elog "or file a bug if you wish to have earlier ACML versions supported."
 	FORTRAN="gfortran"
-	fortran_pkg_setup
-	if [[ ${FORTRANC} == gfortran ]]; then
+	if [[ $(tc-getFC) == gfortran ]]; then
 		local gcc_version=$(gcc-major-version)$(gcc-minor-version)
 		if ! use openmp && (( ${gcc_version} != 41 )); then
 			eerror "You need gcc-4.1.x to test acml."
@@ -58,10 +57,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	case ${FORTRANC} in
+	case $(tc-getFC) in
 		gfortran) FORT=gfortran ;;
 		if*) FORT=ifort ;;
-		*) eerror "Unsupported fortran compiler: ${FORTRANC}"
+		*) eerror "Unsupported fortran compiler: $(tc-getFC)"
 			die ;;
 	esac
 	use openmp || rm -rf ${FORT}*_mp*
@@ -79,7 +78,7 @@ src_test() {
 			cd "${S}"/${fort}/examples/${d}
 			emake \
 				ACMLDIR="${S}"/${fort} \
-				F77=${FORTRANC} \
+				F77=$(tc-getFC) \
 				CC="$(tc-getCC)" \
 				CPLUSPLUS="$(tc-getCXX)" \
 				|| die "emake test in ${fort}/examples/${d} failed"
@@ -99,7 +98,7 @@ src_install() {
 		cp -pPR "${S}/${fort}" "${D}"${instdir} || die "copy ${fort} failed"
 
 		# install profiles
-		ESELECT_PROF=acml-${FORTRANC}
+		ESELECT_PROF=acml-$(tc-getFC)
 		local acmldir=${instdir}/${fort}
 		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
index a749f62737c4..567c6eda5bfb 100644
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ b/sci-libs/acml/acml-4.0.1.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/acml/acml-4.0.1.ebuild,v 1.5 2008/04/22 08:13:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.6 2010/12/16 14:09:09 jlec Exp $
 
-inherit eutils toolchain-funcs fortran
+inherit eutils toolchain-funcs
 
 MY_PV=${PV//\./\-}
 
@@ -40,15 +40,13 @@ pkg_nofetch() {
 
 pkg_setup() {
 	FORTRAN="gfortran"
-	use ifc && FORTRAN="ifc"
-	fortran_pkg_setup
-	if [[ ${FORTRANC} == gfortran ]]; then
+	if [[ $(tc-getFC) == gfortran ]]; then
 		local gcc_version=$(gcc-major-version)$(gcc-minor-version)
 		if ! use openmp && (( ${gcc_version} != 41 )); then
 			eerror "You need gcc-4.1.x to test acml."
 			eerror "Please use gcc-config to swicth gcc version 4.1.x"
 			die "setup gcc failed"
-		elif use openmp && (( ${gcc_version} != 42 )); then
+		elif use openmp && ! tc-has-openmp; then
 			eerror "You need gfortran >= 4.2 to use openmp features."
 			eerror "Please use gcc-config to switch gcc version >= 4.2"
 			die "setup gcc failed"
@@ -59,10 +57,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	case ${FORTRANC} in
+	case $(tc-getFC) in
 		gfortran) FORT=gfortran ;;
 		if*) FORT=ifort ;;
-		*) eerror "Unsupported fortran compiler: ${FORTRANC}"
+		*) eerror "Unsupported fortran compiler: $(tc-getFC)"
 		   die "failed configuring fortran";;
 	esac
 	use openmp || rm -rf ${FORT}*_mp*
@@ -80,7 +78,7 @@ src_test() {
 			cd "${S}"/${fort}/examples/${d}
 			emake \
 				ACMLDIR="${S}"/${fort} \
-				F77=${FORTRANC} \
+				F77=$(tc-getFC) \
 				CC="$(tc-getCC)" \
 				CPLUSPLUS="$(tc-getCXX)" \
 				|| die "emake test in ${fort}/examples/${d} failed"
@@ -100,7 +98,7 @@ src_install() {
 		cp -pPR "${S}"/${fort} "${D}"${instdir} || die "copy ${fort} failed"
 
 		# install profiles
-		ESELECT_PROF=acml-${FORTRANC}
+		ESELECT_PROF=acml-$(tc-getFC)
 		local acmldir=${instdir}/${fort}
 		local acmllibs="-lacml -lacml_mv"
 		local libname=${acmldir}/lib/libacml
diff --git a/sci-libs/acml/acml-4.1.0-r1.ebuild b/sci-libs/acml/acml-4.1.0-r1.ebuild
index 863c79958718..a31b0cc57915 100644
--- a/sci-libs/acml/acml-4.1.0-r1.ebuild
+++ b/sci-libs/acml/acml-4.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/acml/acml-4.1.0-r1.ebuild,v 1.4 2008/12/07 18:28:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.5 2010/12/16 14:09:09 jlec Exp $
 
 EAPI="1"
 
-inherit eutils toolchain-funcs fortran versionator
+inherit eutils toolchain-funcs versionator
 
 MY_P=${PN}-$(replace_all_version_separators -)
 
@@ -60,10 +60,9 @@ pkg_setup() {
 		use gfortran &&	FORTRAN="${FORTRAN} gfortran"
 		use ifc && FORTRAN="${FORTRAN} ifc"
 		use gfortran || use ifc || FORTRAN="gfortran"
-		fortran_pkg_setup
 		# work around incomplete fortran eclass
 		if  use gfortran &&
-			[[ ${FORTRANC} == gfortran ]] &&
+			[[ $(tc-getFC) == gfortran ]] &&
 			[[ $(gcc-version) != 4.2 ]]
 		then
 			eerror "You need gfortran-4.2 to test acml"
@@ -94,7 +93,7 @@ src_test() {
 			cd "${S}"/${fdir}/examples/${d}
 			emake \
 				ACMLDIR="${S}"/${fdir} \
-				F77=${FORTRANC} \
+				F77=$(tc-getFC) \
 				CC="$(tc-getCC)" \
 				CPLUSPLUS="$(tc-getCXX)" \
 				|| die "emake test in ${fdir}/examples/${d} failed"