Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 28 Jun 2022 12:45:36
Message-Id: 1656420287.8254f314140f3b14bf243898daba6b8d7070af6c.ulm@gentoo
1 commit: 8254f314140f3b14bf243898daba6b8d7070af6c
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 25 07:32:43 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 12:44:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8254f314
7
8 gnustep-base.eclass: Don't inherit eutils in EAPI 8
9
10 ... which is not supported by it. While at it, drop EAPI 5.
11
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 eclass/gnustep-base.eclass | 11 ++++++-----
15 1 file changed, 6 insertions(+), 5 deletions(-)
16
17 diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
18 index d37ecad102e0..9d72e6315fff 100644
19 --- a/eclass/gnustep-base.eclass
20 +++ b/eclass/gnustep-base.eclass
21 @@ -1,17 +1,18 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 # @ECLASS: gnustep-base.eclass
27 # @MAINTAINER:
28 # GNUstep Herd <gnustep@g.o>
29 -# @SUPPORTED_EAPIS: 5 6 7 8
30 +# @SUPPORTED_EAPIS: 6 7 8
31 # @BLURB: Internal handling of GNUstep pacakges
32 # @DESCRIPTION:
33 # Inner gnustep eclass, should only be inherited directly by gnustep-base
34 # packages
35
36 -case ${EAPI:-0} in
37 - [5678]) inherit eutils ;;
38 +case ${EAPI} in
39 + 6|7) inherit eutils ;;
40 + 8) ;;
41 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
42 esac
43
44 @@ -64,7 +65,7 @@ gnustep-base_src_prepare() {
45 eend $?
46 fi
47
48 - ! has ${EAPI} 5 && default
49 + default
50 }
51
52 gnustep-base_src_configure() {