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 4/4] elisp-common.eclass: Drop support for EAPI 4
Date: Thu, 15 Apr 2021 06:37:10
Message-Id: 20210415063543.28602-4-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] elisp-common.eclass: Add timeout to version detection by "Ulrich Müller"
1 Signed-off-by: Ulrich Müller <ulm@g.o>
2 ---
3 eclass/elisp-common.eclass | 7 ++++---
4 1 file changed, 4 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
7 index f7e3631a965c..90621cbe7b92 100644
8 --- a/eclass/elisp-common.eclass
9 +++ b/eclass/elisp-common.eclass
10 @@ -10,6 +10,7 @@
11 # Mamoru Komachi <usata@g.o>
12 # Christian Faulhammer <fauli@g.o>
13 # Ulrich Müller <ulm@g.o>
14 +# @SUPPORTED_EAPIS: 5 6 7
15 # @BLURB: Emacs-related installation utilities
16 # @DESCRIPTION:
17 #
18 @@ -165,7 +166,7 @@
19 # to above calls of elisp-site-regen().
20
21 case ${EAPI:-0} in
22 - 4|5|6) inherit eapi7-ver ;;
23 + 5|6) inherit eapi7-ver ;;
24 7) ;;
25 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
26 esac
27 @@ -361,7 +362,7 @@ elisp-modules-install() {
28 shift
29 # Don't bother inheriting multilib.eclass for get_libdir(), but
30 # error out in old EAPIs that don't support it natively.
31 - [[ ${EAPI} == [45] ]] \
32 + [[ ${EAPI} == 5 ]] \
33 && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
34 ebegin "Installing dynamic modules for GNU Emacs support"
35 ( # subshell to avoid pollution of calling environment
36 @@ -390,7 +391,7 @@ elisp-site-file-install() {
37 sf="${T}/${sf}"
38 ebegin "Installing site initialisation file for GNU Emacs"
39 [[ $1 = "${sf}" ]] || cp "$1" "${sf}"
40 - if [[ ${EAPI} == [45] ]]; then
41 + if [[ ${EAPI} == 5 ]]; then
42 grep -q "@EMACSMODULES@" "${sf}" \
43 && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
44 else
45 --
46 2.31.1