commit: c7b17bd92e92f92ea58e1ae780de6f6d4c130ba4 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 13 07:38:34 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 20:08:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b17bd9
elisp.eclass: Drop support for EAPI 4 and 5 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/elisp.eclass | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index a092041009b..d763a4944d2 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -9,7 +9,7 @@ # Jeremy Maitin-Shepard <j...@attbi.com> # Christian Faulhammer <fa...@gentoo.org> # Ulrich Müller <u...@gentoo.org> -# @SUPPORTED_EAPIS: 4 5 6 7 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Eclass for Emacs Lisp packages # @DESCRIPTION: # @@ -40,7 +40,7 @@ # Space separated list of patches to apply after unpacking the sources. # Patch files are searched for in the current working dir, WORKDIR, and # FILESDIR. This variable is semi-deprecated, preferably use the -# PATCHES array instead if the EAPI supports it. +# PATCHES array instead. # @ECLASS-VARIABLE: ELISP_REMOVE # @DEFAULT_UNSET @@ -62,8 +62,8 @@ # will be generated in src_compile() and installed in src_install(). inherit elisp-common + case ${EAPI:-0} in - 4|5) inherit epatch ;; 6|7) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -73,8 +73,7 @@ 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}" ;; + 6) DEPEND="${RDEPEND}" ;; *) BDEPEND="${RDEPEND}" ;; esac @@ -118,17 +117,11 @@ elisp_src_prepare() { else die "Cannot find ${patch}" fi - case ${EAPI} in - 4|5) epatch "${file}" ;; - *) eapply "${file}" ;; - esac + eapply "${file}" done - # apply PATCHES (if supported in EAPI), and any user patches - case ${EAPI} in - 4|5) epatch_user ;; - *) default ;; - esac + # apply PATCHES and any user patches + default if [[ -n ${ELISP_REMOVE} ]]; then rm ${ELISP_REMOVE} || die @@ -172,10 +165,7 @@ elisp_src_install() { doinfo ${@/%.*/.info*} fi # install documentation only when explicitly requested - case ${EAPI} in - 4|5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; - *) [[ $(declare -p DOCS 2>/dev/null) == *=* ]] && einstalldocs ;; - esac + [[ $(declare -p DOCS 2>/dev/null) == *=* ]] && einstalldocs if declare -f readme.gentoo_create_doc >/dev/null; then readme.gentoo_create_doc fi