| 1 |
commit: 2d849335502f87557049d486c1171a9e6e6bb045 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 20 18:13:40 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 20 18:13:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=2d849335 |
| 7 |
|
| 8 |
elisp*.eclass: Sync from Gentoo repository |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/elisp-common.eclass | 6 +++--- |
| 13 |
eclass/elisp.eclass | 2 +- |
| 14 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass |
| 17 |
index 4aff50e..30dad3b 100644 |
| 18 |
--- a/eclass/elisp-common.eclass |
| 19 |
+++ b/eclass/elisp-common.eclass |
| 20 |
@@ -386,7 +386,7 @@ elisp-site-file-install() { |
| 21 |
[[ ${sf%-gentoo*.el} != "${sf}" ]] && sf="${sf%-gentoo*.el}-gentoo.el" |
| 22 |
sf="${T}/${sf}" |
| 23 |
ebegin "Installing site initialisation file for GNU Emacs" |
| 24 |
- [[ $1 = "${sf}" ]] || cp "$1" "${sf}" |
| 25 |
+ [[ $1 == "${sf}" ]] || cp "$1" "${sf}" |
| 26 |
modules=${EMACSMODULES//@libdir@/$(get_libdir)} |
| 27 |
sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ |
| 28 |
-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \ |
| 29 |
@@ -412,7 +412,7 @@ elisp-site-regen() { |
| 30 |
local sf i ret=0 null="" page=$'\f' |
| 31 |
local -a sflist |
| 32 |
|
| 33 |
- if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then |
| 34 |
+ if [[ ${EBUILD_PHASE} == *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then |
| 35 |
ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase." |
| 36 |
return 0 |
| 37 |
fi |
| 38 |
@@ -467,7 +467,7 @@ elisp-site-regen() { |
| 39 |
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el |
| 40 |
eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die |
| 41 |
case ${#sflist[@]} in |
| 42 |
- 0) [[ ${PN} = emacs-common ]] \ |
| 43 |
+ 0) [[ ${PN} == emacs-common ]] \ |
| 44 |
|| ewarn "... Huh? No site initialisation files found." ;; |
| 45 |
1) einfo "... ${#sflist[@]} site initialisation file included." ;; |
| 46 |
*) einfo "... ${#sflist[@]} site initialisation files included." ;; |
| 47 |
|
| 48 |
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass |
| 49 |
index c4a1b52..d763a49 100644 |
| 50 |
--- a/eclass/elisp.eclass |
| 51 |
+++ b/eclass/elisp.eclass |
| 52 |
@@ -40,7 +40,7 @@ |
| 53 |
# Space separated list of patches to apply after unpacking the sources. |
| 54 |
# Patch files are searched for in the current working dir, WORKDIR, and |
| 55 |
# FILESDIR. This variable is semi-deprecated, preferably use the |
| 56 |
-# PATCHES array instead if the EAPI supports it. |
| 57 |
+# PATCHES array instead. |
| 58 |
|
| 59 |
# @ECLASS-VARIABLE: ELISP_REMOVE |
| 60 |
# @DEFAULT_UNSET |
Archives