From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QYWun-0000PG-7Z for garchives@archives.gentoo.org; Mon, 20 Jun 2011 05:20:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D19D1C05F; Mon, 20 Jun 2011 05:20:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4DDF91C05F for ; Mon, 20 Jun 2011 05:20:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D944E1B4038 for ; Mon, 20 Jun 2011 05:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0C1D780048 for ; Mon, 20 Jun 2011 05:20:31 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/fortran-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ca2f2707f362d858813bc5b84ed95c80f683365f Date: Mon, 20 Jun 2011 05:20:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 635d65ca24659bee4aff02563a1171b3 commit: ca2f2707f362d858813bc5b84ed95c80f683365f Author: Justin Lecher gentoo org> AuthorDate: Mon Jun 20 05:20:21 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jun 20 05:20:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dca2f2707 Final changes before move to the main tree. Signed-off-by: Justin Lecher gentoo.org> --- eclass/fortran-2.eclass | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 600d107..050e45e 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -16,7 +16,7 @@ # and exports the variables FC and F77. # Optionally, it checks for extended capabilities based on # the variable options selected in the ebuild -# The only phase functions exported are pkg_pretend and pkg_setup. +# The only phase function exported is fortran-2_pkg_setup. =20 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP # @DESCRIPTION: @@ -122,10 +122,10 @@ _die_msg() { die "Currently no working fortran compiler is available" } =20 -# @FUNCTION: fortran-2_pkg_pretend +# @FUNCTION: fortran-2_pkg_setup # @DESCRIPTION: # Setup functionallity, checks for a valid fortran compiler and optional= ly for its openmp support. -fortran-2_pkg_pretend() { +fortran-2_pkg_setup() { local dialect =20 : ${F77:=3D$(tc-getFC)} @@ -145,27 +145,10 @@ fortran-2_pkg_pretend() { _fortran-has-openmp || \ die "Please install current gcc with USE=3Dopenmp or set the FC varia= ble to a compiler that supports OpenMP" fi -} - -# @FUNCTION: fortran-2_pkg_setup -# @DESCRIPTION: -# In EAPI < 4 it calls the compiler check. This behavior is deprecated -# and will be removed at 01-Okt-2011. Please migrate to EAPI=3D4. -# -# Exports the FC and F77 variable according to the compiler checks. -fortran-2_pkg_setup() { - if has ${EAPI:-0} 0 1 2 3; then - ewarn "The support for EAPI=3D${EAPI} by the fortran-2.eclass" - ewarn "will be end at 01-Okt-2011" - ewarn "Please migrate your package to EAPI=3D4" - fortran-2_pkg_pretend - fi - [[ -n ${F77} ]] || export F77=3D$(tc-getFC) - [[ -n ${FC} ]] || export FC=3D$(tc-getFC) + tc-export F77 FC } =20 case ${EAPI:-0} in - 1|2|3) EXPORT_FUNCTIONS pkg_setup ;; - 4) EXPORT_FUNCTIONS pkg_pretend pkg_setup ;; + 1|2|3|4) EXPORT_FUNCTIONS pkg_setup ;; *) die "EAPI=3D${EAPI} is not supported" ;; esac