diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-07-29 09:53:36 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-07-29 09:53:36 +0000 |
| commit | ed6fee7fe36c095bb740e226e53999b122712f56 (patch) | |
| tree | 6e7daa167ab437615fef2f2e2adf4b7b0a137601 /eclass | |
| parent | Intel-sdp.eclass: Allow single package downloads, custom suffix, full specifi... (diff) | |
| download | gentoo-2-ed6fee7fe36c095bb740e226e53999b122712f56.tar.gz gentoo-2-ed6fee7fe36c095bb740e226e53999b122712f56.tar.bz2 gentoo-2-ed6fee7fe36c095bb740e226e53999b122712f56.zip | |
Fortran-2.eclass: enhance support for binary packages, #477070
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/fortran-2.eclass | 34 |
2 files changed, 32 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d02dbf5ea281..918e63c3ab20 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.901 2013/07/29 09:50:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.902 2013/07/29 09:53:36 jlec Exp $ + + 29 Jul 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass: + Fortran-2.eclass: enhance support for binary packages, #477070 29 Jul 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass: Intel-sdp.eclass: Allow single package downloads, custom suffix, full diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 939fe7d00670..9372d12ceb9c 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.18 2013/07/18 07:03:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.19 2013/07/29 09:53:36 jlec Exp $ # @ECLASS: fortran-2.eclass # @MAINTAINER: @@ -168,7 +168,7 @@ _fortran_die_msg() { # @INTERNAL # @DESCRIPTION: # Internal testfunction for working fortran compiler. -# It is called in fortran-2_pkg_setup +# It is called in fortran-2_pkg_setup. _fortran_test_function() { local dialect @@ -203,11 +203,11 @@ _fortran_test_function() { fi } -# @FUNCTION: fortran-2_pkg_setup +# @FUNCTION: _fortran-2_pkg_setup +# @INTERNAL # @DESCRIPTION: -# Setup functionallity, -# checks for a valid fortran compiler and optionally for its openmp support. -fortran-2_pkg_setup() { +# _The_ fortran-2_pkg_setup() code +_fortran-2_pkg_setup() { for _f_use in ${FORTRAN_NEEDED}; do case ${_f_use} in always) @@ -229,7 +229,29 @@ fortran-2_pkg_setup() { done } + +# @FUNCTION: fortran-2_pkg_setup +# @DESCRIPTION: +# Setup functionallity, +# checks for a valid fortran compiler and optionally for its openmp support. +fortran-2_pkg_setup() { + case ${EAPI:-0} in + 0|1|2|3) + eqawarn "Support for EAPI < 4 will be removed from the" + eqawarn "fortran-2.eclass in until Sep 31. 2013." + eqawarn "Please migrate your package to a higher EAPI" + eqawarn "or file a bug at https://bugs.gentoo.org" + _fortran-2_pkg_setup ;; + 4|5) + if [[ ${MERGE_TYPE} != binary ]]; then + _fortran-2_pkg_setup + fi + ;; + esac +} + case ${EAPI:-0} in 0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;; *) die "EAPI=${EAPI} is not supported" ;; esac + |