Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 17 Nov 2018 11:30:27
Message-Id: 1542453927.a03929258eb1a92edaa87e6dd32ec07473571707.bircoph@gentoo
1 commit: a03929258eb1a92edaa87e6dd32ec07473571707
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 17 11:25:27 2018 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 17 11:25:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0392925
7
8 fortran-2.eclass: bump to EAPI 7
9
10 Add EAPI 7 support.
11
12 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
13
14 eclass/fortran-2.eclass | 11 +++++++----
15 1 file changed, 7 insertions(+), 4 deletions(-)
16
17 diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
18 index 820cbbcb49b..4b405ee5c18 100644
19 --- a/eclass/fortran-2.eclass
20 +++ b/eclass/fortran-2.eclass
21 @@ -8,7 +8,7 @@
22 # @AUTHOR:
23 # Author Justin Lecher <jlec@g.o>
24 # Test functions provided by Sebastien Fabbro and Kacper Kowalik
25 -# @SUPPORTED_EAPIS: 4 5 6
26 +# @SUPPORTED_EAPIS: 4 5 6 7
27 # @BLURB: Simplify fortran compiler management
28 # @DESCRIPTION:
29 # If you need a fortran compiler, then you should be inheriting this eclass.
30 @@ -27,13 +27,16 @@
31 #
32 # FORTRAN_NEED_OPENMP=1
33
34 -inherit eutils toolchain-funcs
35 -
36 +inherit toolchain-funcs
37 case ${EAPI:-0} in
38 - 4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
39 + # not used in the eclass, but left for backward compatibility with legacy users
40 + 4|5|6) inherit eutils ;;
41 + 7) ;;
42 *) die "EAPI=${EAPI} is not supported" ;;
43 esac
44
45 +EXPORT_FUNCTIONS pkg_setup
46 +
47 if [[ ! ${_FORTRAN_2_CLASS} ]]; then
48
49 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP