| 1 |
commit: f7e317c1cee1b75e81d154abc277bb0ba9b9ec3b |
| 2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 23 01:53:06 2021 +0000 |
| 4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 30 14:36:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e317c1 |
| 7 |
|
| 8 |
eclass/mate-desktop.org.eclass: Add EAPI 7 support |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/770277 |
| 11 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/mate-desktop.org.eclass | 8 ++++---- |
| 14 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass |
| 17 |
index 849479d048f..92f1d1d33d0 100644 |
| 18 |
--- a/eclass/mate-desktop.org.eclass |
| 19 |
+++ b/eclass/mate-desktop.org.eclass |
| 20 |
@@ -6,7 +6,7 @@ |
| 21 |
# mate@g.o |
| 22 |
# @AUTHOR: |
| 23 |
# Authors: NP-Hardass <NP-Hardass@g.o> based upon the gnome.org eclass. |
| 24 |
-# @SUPPORTED_EAPIS: 6 |
| 25 |
+# @SUPPORTED_EAPIS: 6 7 |
| 26 |
# @BLURB: Helper eclass for mate-desktop.org hosted archives |
| 27 |
# @DESCRIPTION: |
| 28 |
# Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as |
| 29 |
@@ -14,7 +14,7 @@ |
| 30 |
|
| 31 |
# EAPIs < 6 are banned. |
| 32 |
case "${EAPI:-0}" in |
| 33 |
- 6) ;; |
| 34 |
+ 6|7) ;; |
| 35 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
| 36 |
esac |
| 37 |
|
| 38 |
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]]; then |
| 39 |
inherit git-r3 |
| 40 |
fi |
| 41 |
|
| 42 |
-inherit versionator |
| 43 |
+[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver |
| 44 |
|
| 45 |
# @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX |
| 46 |
# @INTERNAL |
| 47 |
@@ -47,7 +47,7 @@ inherit versionator |
| 48 |
# @DESCRIPTION: |
| 49 |
# Major and minor numbers of the version number, unless live. |
| 50 |
# If live ebuild, will be set to '9999'. |
| 51 |
-: ${MATE_BRANCH:=$(get_version_component_range 1-2)} |
| 52 |
+: ${MATE_BRANCH:=$(ver_cut 1-2)} |
| 53 |
|
| 54 |
# Set SRC_URI or EGIT_REPO_URI based on whether live |
| 55 |
if [[ ${PV} == 9999 ]]; then |
Archives