summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Feldman <NP-Hardass@gentoo.org>2021-03-22 22:04:00 -0400
committerAdam Feldman <NP-Hardass@gentoo.org>2021-06-30 10:19:03 -0400
commit8068ee5cbb854480484a6df9a78d63883eb45c54 (patch)
tree0e804e6d648313df919078aa5f953c3d9aab4d7d
parentmate-extra/mate-polkit: Fix manifest (diff)
downloadgentoo-mate-8068ee5cbb854480484a6df9a78d63883eb45c54.tar.gz
gentoo-mate-8068ee5cbb854480484a6df9a78d63883eb45c54.tar.bz2
gentoo-mate-8068ee5cbb854480484a6df9a78d63883eb45c54.zip
eclass/mate-desktop.org.eclass: Add EAPI 7 support
Bug: https://bugs.gentoo.org/770277 Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
-rw-r--r--eclass/mate-desktop.org.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass
index 849479d..92f1d1d 100644
--- a/eclass/mate-desktop.org.eclass
+++ b/eclass/mate-desktop.org.eclass
@@ -6,7 +6,7 @@
# mate@gentoo.org
# @AUTHOR:
# Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome.org eclass.
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Helper eclass for mate-desktop.org hosted archives
# @DESCRIPTION:
# Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as
@@ -14,7 +14,7 @@
# EAPIs < 6 are banned.
case "${EAPI:-0}" in
- 6) ;;
+ 6|7) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
fi
-inherit versionator
+[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
# @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX
# @INTERNAL
@@ -47,7 +47,7 @@ inherit versionator
# @DESCRIPTION:
# Major and minor numbers of the version number, unless live.
# If live ebuild, will be set to '9999'.
-: ${MATE_BRANCH:=$(get_version_component_range 1-2)}
+: ${MATE_BRANCH:=$(ver_cut 1-2)}
# Set SRC_URI or EGIT_REPO_URI based on whether live
if [[ ${PV} == 9999 ]]; then