Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 02 Jul 2021 15:35:43
Message-Id: 1625239954.0697b888a0eddc07eb668e38abafe499c7d11c13.floppym@gentoo
1 commit: 0697b888a0eddc07eb668e38abafe499c7d11c13
2 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
3 AuthorDate: Sat Jun 26 20:43:49 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 2 15:32:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0697b888
7
8 multilib-minimal.eclass: EAPI 8 support
9
10 Also drop EAPI 4 to match multilib-build.eclass.
11
12 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 eclass/multilib-minimal.eclass | 11 +++++------
16 1 file changed, 5 insertions(+), 6 deletions(-)
17
18 diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
19 index 8f7c7ba6fb3..6c5c754381b 100644
20 --- a/eclass/multilib-minimal.eclass
21 +++ b/eclass/multilib-minimal.eclass
22 @@ -4,7 +4,7 @@
23 # @ECLASS: multilib-minimal.eclass
24 # @MAINTAINER:
25 # Michał Górny <mgorny@g.o>
26 -# @SUPPORTED_EAPIS: 4 5 6 7
27 +# @SUPPORTED_EAPIS: 5 6 7 8
28 # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
29 # @DESCRIPTION:
30 #
31 @@ -23,14 +23,13 @@
32 # If you need generic install rules, use multilib_src_install_all function.
33
34
35 -# EAPI=4 is required for meaningful MULTILIB_USEDEP.
36 -case ${EAPI:-0} in
37 - 4|5|6|7) ;;
38 - *) die "EAPI=${EAPI} is not supported" ;;
39 +case ${EAPI} in
40 + 5|6|7|8) ;;
41 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
42 esac
43
44
45 -[[ ${EAPI} == [45] ]] && inherit eutils
46 +[[ ${EAPI} == 5 ]] && inherit eutils
47 inherit multilib-build
48
49 EXPORT_FUNCTIONS src_configure src_compile src_test src_install