commit: dca1e1e2c89751e3ce6031daa8f925fc1de6cbe9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 07:10:40 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 07:10:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=dca1e1e2
elisp*.eclass: Drop support for EAPI 5
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
eclass/elisp-common.eclass | 15 +++------------
eclass/elisp.eclass | 22 ++++++----------------
2 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 90621cb..4aff50e 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -10,7 +10,7 @@
# Mamoru Komachi <us...@gentoo.org>
# Christian Faulhammer <fa...@gentoo.org>
# Ulrich Müller <u...@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Emacs-related installation utilities
# @DESCRIPTION:
#
@@ -166,7 +166,7 @@
# to above calls of elisp-site-regen().
case ${EAPI:-0} in
- 5|6) inherit eapi7-ver ;;
+ 6) inherit eapi7-ver ;;
7) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -360,10 +360,6 @@ elisp-install() {
elisp-modules-install() {
local subdir="$1"
shift
- # Don't bother inheriting multilib.eclass for get_libdir(), but
- # error out in old EAPIs that don't support it natively.
- [[ ${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
exeinto "${EMACSMODULES//@libdir@/$(get_libdir)}/${subdir}"
@@ -391,12 +387,7 @@ elisp-site-file-install() {
sf="${T}/${sf}"
ebegin "Installing site initialisation file for GNU Emacs"
[[ $1 = "${sf}" ]] || cp "$1" "${sf}"
- if [[ ${EAPI} == 5 ]]; then
- grep -q "@EMACSMODULES@" "${sf}" \
- && die "${ECLASS}: Dynamic modules not supported in
EAPI ${EAPI}"
- else
- modules=${EMACSMODULES//@libdir@/$(get_libdir)}
- fi
+ modules=${EMACSMODULES//@libdir@/$(get_libdir)}
sed -i -e
"1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index a568a05..054d5d8 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: 5 6 7
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Eclass for Emacs Lisp packages
# @DESCRIPTION:
#
@@ -62,7 +62,6 @@
inherit elisp-common
case ${EAPI:-0} in
- 5) inherit epatch ;;
6|7) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -72,7 +71,7 @@ EXPORT_FUNCTIONS
src_{unpack,prepare,configure,compile,install} \
RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*"
case ${EAPI} in
- 5|6) DEPEND="${RDEPEND}" ;;
+ 6) DEPEND="${RDEPEND}" ;;
*) BDEPEND="${RDEPEND}" ;;
esac
@@ -116,17 +115,11 @@ elisp_src_prepare() {
else
die "Cannot find ${patch}"
fi
- case ${EAPI} in
- 5) epatch "${file}" ;;
- *) eapply "${file}" ;;
- esac
+ eapply "${file}"
done
- # apply PATCHES (if supported in EAPI), and any user patches
- case ${EAPI} in
- 5) epatch_user ;;
- *) default ;;
- esac
+ # apply PATCHES and any user patches
+ default
if [[ -n ${ELISP_REMOVE} ]]; then
rm ${ELISP_REMOVE} || die
@@ -170,10 +163,7 @@ elisp_src_install() {
doinfo ${@/%.*/.info*}
fi
# install documentation only when explicitly requested
- case ${EAPI} in
- 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
