| 1 |
From Emacs overlay. |
| 2 |
|
| 3 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
| 4 |
--- |
| 5 |
eclass/elisp-common.eclass | 15 +++------------ |
| 6 |
1 file changed, 3 insertions(+), 12 deletions(-) |
| 7 |
|
| 8 |
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass |
| 9 |
index 775bcbdb889c..a821e4a2dc6f 100644 |
| 10 |
--- a/eclass/elisp-common.eclass |
| 11 |
+++ b/eclass/elisp-common.eclass |
| 12 |
@@ -10,7 +10,7 @@ |
| 13 |
# Mamoru Komachi <usata@g.o> |
| 14 |
# Christian Faulhammer <fauli@g.o> |
| 15 |
# Ulrich Müller <ulm@g.o> |
| 16 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
| 17 |
+# @SUPPORTED_EAPIS: 6 7 8 |
| 18 |
# @BLURB: Emacs-related installation utilities |
| 19 |
# @DESCRIPTION: |
| 20 |
# |
| 21 |
@@ -166,7 +166,7 @@ |
| 22 |
# to above calls of elisp-site-regen(). |
| 23 |
|
| 24 |
case ${EAPI:-0} in |
| 25 |
- 5|6) inherit eapi7-ver ;; |
| 26 |
+ 6) inherit eapi7-ver ;; |
| 27 |
7|8) ;; |
| 28 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 29 |
esac |
| 30 |
@@ -360,10 +360,6 @@ elisp-install() { |
| 31 |
elisp-modules-install() { |
| 32 |
local subdir="$1" |
| 33 |
shift |
| 34 |
- # Don't bother inheriting multilib.eclass for get_libdir(), but |
| 35 |
- # error out in old EAPIs that don't support it natively. |
| 36 |
- [[ ${EAPI} == 5 ]] \ |
| 37 |
- && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" |
| 38 |
ebegin "Installing dynamic modules for GNU Emacs support" |
| 39 |
( # subshell to avoid pollution of calling environment |
| 40 |
exeinto "${EMACSMODULES//@libdir@/$(get_libdir)}/${subdir}" |
| 41 |
@@ -391,12 +387,7 @@ elisp-site-file-install() { |
| 42 |
sf="${T}/${sf}" |
| 43 |
ebegin "Installing site initialisation file for GNU Emacs" |
| 44 |
[[ $1 == "${sf}" ]] || cp "$1" "${sf}" |
| 45 |
- if [[ ${EAPI} == 5 ]]; then |
| 46 |
- grep -q "@EMACSMODULES@" "${sf}" \ |
| 47 |
- && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" |
| 48 |
- else |
| 49 |
- modules=${EMACSMODULES//@libdir@/$(get_libdir)} |
| 50 |
- fi |
| 51 |
+ modules=${EMACSMODULES//@libdir@/$(get_libdir)} |
| 52 |
sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ |
| 53 |
-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \ |
| 54 |
-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \ |
| 55 |
-- |
| 56 |
2.35.1 |
Archives