Gentoo Archives: gentoo-dev

From: Adam Feldman <NP-Hardass@g.o>
To: gentoo-dev@l.g.o
Cc: Adam Feldman <NP-Hardass@g.o>
Subject: [gentoo-dev] [PATCH 1/2] eclass/mate-desktop.org.eclass: Add EAPI 7 support
Date: Tue, 23 Mar 2021 02:04:39
Message-Id: 20210323020407.25311-1-NP-Hardass@gentoo.org
1 ---
2 eclass/mate-desktop.org.eclass | 8 ++++----
3 1 file changed, 4 insertions(+), 4 deletions(-)
4
5 diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass
6 index 418f3f8ce076..740751066d0a 100644
7 --- a/eclass/mate-desktop.org.eclass
8 +++ b/eclass/mate-desktop.org.eclass
9 @@ -6,7 +6,7 @@
10 # mate@g.o
11 # @AUTHOR:
12 # Authors: NP-Hardass <NP-Hardass@g.o> based upon the gnome.org eclass.
13 -# @SUPPORTED_EAPIS: 6
14 +# @SUPPORTED_EAPIS: 6 7
15 # @BLURB: Helper eclass for mate-desktop.org hosted archives
16 # @DESCRIPTION:
17 # Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as
18 @@ -14,7 +14,7 @@
19
20 # EAPIs < 6 are banned.
21 case "${EAPI:-0}" in
22 - 6) ;;
23 + 6|7) ;;
24 *) die "EAPI=${EAPI:-0} is not supported" ;;
25 esac
26
27 @@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]]; then
28 inherit git-r3
29 fi
30
31 -inherit versionator
32 +[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
33
34 # @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX
35 # @INTERNAL
36 @@ -47,7 +47,7 @@ inherit versionator
37 # @DESCRIPTION:
38 # Major and minor numbers of the version number, unless live.
39 # If live ebuild, will be set to '9999'.
40 -: ${MATE_BRANCH:=$(get_version_component_range 1-2)}
41 +: ${MATE_BRANCH:=$(ver_cut 1-2)}
42
43 # Set SRC_URI or EGIT_REPO_URI based on whether live
44 if [[ ${PV} == 9999 ]]; then
45 --
46 2.26.2

Replies

Subject Author
[gentoo-dev] [PATCH 2/2] eclass/mate.eclass: Add EAPI 7 support Adam Feldman <NP-Hardass@g.o>