diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2021-04-12 21:08:34 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2021-04-12 21:08:34 +0200 |
| commit | feff6487fa132ae9384647f34c90f1ce81a902cd (patch) | |
| tree | 7c7484fd15ab2f8327de7ad2bd6055b3c6e04893 | |
| parent | elisp-common.eclass: Add timeout to version detection (diff) | |
| download | emacs-feff6487fa132ae9384647f34c90f1ce81a902cd.tar.gz emacs-feff6487fa132ae9384647f34c90f1ce81a902cd.tar.bz2 emacs-feff6487fa132ae9384647f34c90f1ce81a902cd.zip | |
elisp*.eclass: Drop support for EAPI 4
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | eclass/elisp-common.eclass | 7 | ||||
| -rw-r--r-- | eclass/elisp.eclass | 13 |
2 files changed, 10 insertions, 10 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index bdf97f4..9de2581 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -10,6 +10,7 @@ # Mamoru Komachi <usata@gentoo.org> # Christian Faulhammer <fauli@gentoo.org> # Ulrich Müller <ulm@gentoo.org> +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Emacs-related installation utilities # @DESCRIPTION: # @@ -165,7 +166,7 @@ # to above calls of elisp-site-regen(). case ${EAPI:-0} in - 4|5|6) inherit eapi7-ver ;; + 5|6) inherit eapi7-ver ;; 7) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -382,7 +383,7 @@ elisp-modules-install() { shift # Don't bother inheriting multilib.eclass for get_libdir(), but # error out in old EAPIs that don't support it natively. - [[ ${EAPI} == [45] ]] \ + [[ ${EAPI} == 5 ]] \ && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" ebegin "Installing dynamic modules for GNU Emacs support" ( # subshell to avoid pollution of calling environment @@ -411,7 +412,7 @@ elisp-site-file-install() { sf="${T}/${sf}" ebegin "Installing site initialisation file for GNU Emacs" [[ $1 = "${sf}" ]] || cp "$1" "${sf}" - if [[ ${EAPI} == [45] ]]; then + if [[ ${EAPI} == 5 ]]; then grep -q "@EMACSMODULES@" "${sf}" \ && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" else diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 7876928..a568a05 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 2002-2020 Gentoo Authors +# Copyright 2002-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp.eclass @@ -9,7 +9,7 @@ # Jeremy Maitin-Shepard <jbms@attbi.com> # Christian Faulhammer <fauli@gentoo.org> # Ulrich Müller <ulm@gentoo.org> -# @SUPPORTED_EAPIS: 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Eclass for Emacs Lisp packages # @DESCRIPTION: # @@ -62,7 +62,7 @@ inherit elisp-common case ${EAPI:-0} in - 4|5) inherit epatch ;; + 5) inherit epatch ;; 6|7) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -72,7 +72,6 @@ EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*" case ${EAPI} in - 4) RDEPEND="${RDEPEND%:*}"; DEPEND="${RDEPEND}" ;; 5|6) DEPEND="${RDEPEND}" ;; *) BDEPEND="${RDEPEND}" ;; esac @@ -118,14 +117,14 @@ elisp_src_prepare() { die "Cannot find ${patch}" fi case ${EAPI} in - 4|5) epatch "${file}" ;; + 5) epatch "${file}" ;; *) eapply "${file}" ;; esac done # apply PATCHES (if supported in EAPI), and any user patches case ${EAPI} in - 4|5) epatch_user ;; + 5) epatch_user ;; *) default ;; esac @@ -172,7 +171,7 @@ elisp_src_install() { fi # install documentation only when explicitly requested case ${EAPI} in - 4|5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; + 5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; *) [[ $(declare -p DOCS 2>/dev/null) == *=* ]] && einstalldocs ;; esac if declare -f readme.gentoo_create_doc >/dev/null; then |