Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH 11/22] golang-vcs.eclass: remove EAPI 5
Date: Tue, 14 Mar 2023 20:01:57
Message-Id: 20230314195826.35239-11-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/22] apache-module.eclass: remove EAPI 5 by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/golang-vcs.eclass | 24 ++++++++++--------------
4 1 file changed, 10 insertions(+), 14 deletions(-)
5
6 diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
7 index 595412ea0c88..7eb60e5f2453 100644
8 --- a/eclass/golang-vcs.eclass
9 +++ b/eclass/golang-vcs.eclass
10 @@ -1,10 +1,10 @@
11 -# Copyright 1999-2021 Gentoo Authors
12 +# Copyright 1999-2023 Gentoo Authors
13 # Distributed under the terms of the GNU General Public License v2
14
15 # @ECLASS: golang-vcs.eclass
16 # @MAINTAINER:
17 # William Hubbs <williamh@g.o>
18 -# @SUPPORTED_EAPIS: 5 6 7
19 +# @SUPPORTED_EAPIS: 6 7
20 # @PROVIDES: golang-base
21 # @BLURB: Eclass for fetching and unpacking go repositories.
22 # @DEPRECATED: go-module.eclass
23 @@ -12,21 +12,15 @@
24 # This eclass is written to ease the maintenance of live ebuilds
25 # of software written in the Go programming language.
26
27 -inherit estack eutils golang-base
28 -
29 -case "${EAPI:-0}" in
30 - 5|6|7)
31 - ;;
32 - *)
33 - die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
34 - ;;
35 +case ${EAPI} in
36 + 6|7) ;;
37 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
38 esac
39
40 -EXPORT_FUNCTIONS src_unpack
41 -
42 -if [[ -z ${_GOLANG_VCS} ]]; then
43 +if [[ -z ${_GOLANG_VCS_ECLASS} ]]; then
44 +_GOLANG_VCS_ECLASS=1
45
46 -_GOLANG_VCS=1
47 +inherit estack eutils golang-base
48
49 PROPERTIES+=" live"
50
51 @@ -139,3 +133,5 @@ golang-vcs_src_unpack() {
52 }
53
54 fi
55 +
56 +EXPORT_FUNCTIONS src_unpack
57 --
58 2.40.0