Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH 7/8] git-r3.eclass: Support EAPI 8, drop support for EAPI 4
Date: Mon, 21 Jun 2021 16:52:06
Message-Id: 20210621164934.18023-7-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/8] gnuconfig.eclass: Support EAPI 8 by "Ulrich Müller"
1 Signed-off-by: Ulrich Müller <ulm@g.o>
2 ---
3 eclass/git-r3.eclass | 18 ++++++------------
4 1 file changed, 6 insertions(+), 12 deletions(-)
5
6 diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
7 index 9c4f2c9d778e..365f21a4ed4c 100644
8 --- a/eclass/git-r3.eclass
9 +++ b/eclass/git-r3.eclass
10 @@ -4,21 +4,15 @@
11 # @ECLASS: git-r3.eclass
12 # @MAINTAINER:
13 # Michał Górny <mgorny@g.o>
14 -# @SUPPORTED_EAPIS: 4 5 6 7
15 +# @SUPPORTED_EAPIS: 5 6 7 8
16 # @BLURB: Eclass for fetching and unpacking git repositories.
17 # @DESCRIPTION:
18 # Third generation eclass for easing maintenance of live ebuilds using
19 # git as remote repository.
20
21 -case "${EAPI:-0}" in
22 - 0|1|2|3)
23 - die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
24 - ;;
25 - 4|5|6|7)
26 - ;;
27 - *)
28 - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
29 - ;;
30 +case ${EAPI:-0} in
31 + 5|6|7|8) ;;
32 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
33 esac
34
35 EXPORT_FUNCTIONS src_unpack
36 @@ -28,7 +22,7 @@ if [[ ! ${_GIT_R3} ]]; then
37 PROPERTIES+=" live"
38
39 if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
40 - if [[ ${EAPI:-0} != [0123456] ]]; then
41 + if [[ ${EAPI} != [56] ]]; then
42 BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
43 else
44 DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
45 @@ -612,7 +606,7 @@ git-r3_fetch() {
46 local commit_date=${4:-${EGIT_COMMIT_DATE}}
47
48 # support new override API for EAPI 6+
49 - if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
50 + if [[ ${EAPI} != 5 ]]; then
51 # get the name and do some more processing:
52 # 1) kill .git suffix,
53 # 2) underscore (remaining) non-variable characters,
54 --
55 2.32.0

Replies