From f3744b94e74614756d2a94e010dfe2321013924f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 16 Dec 2010 14:09:09 +0000 Subject: Removal of fortran.eclass, #348851 Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64 --- sci-libs/acml/acml-4.1.0-r1.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sci-libs/acml/acml-4.1.0-r1.ebuild') 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" -- cgit v1.2.3-65-gdbad