summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-04-20 20:13:40 +0200
committerUlrich Müller <ulm@gentoo.org>2021-04-20 20:13:40 +0200
commit2d849335502f87557049d486c1171a9e6e6bb045 (patch)
tree064ebf48ac2f37487c8f5dd046fcee9aa6abe6da
parentelisp.eclass: Sync from Gentoo repository (diff)
downloademacs-master.tar.gz
emacs-master.tar.bz2
emacs-master.zip
elisp*.eclass: Sync from Gentoo repositoryHEADmaster
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--eclass/elisp-common.eclass6
-rw-r--r--eclass/elisp.eclass2
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 4aff50e..30dad3b 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -386,7 +386,7 @@ elisp-site-file-install() {
[[ ${sf%-gentoo*.el} != "${sf}" ]] && sf="${sf%-gentoo*.el}-gentoo.el"
sf="${T}/${sf}"
ebegin "Installing site initialisation file for GNU Emacs"
- [[ $1 = "${sf}" ]] || cp "$1" "${sf}"
+ [[ $1 == "${sf}" ]] || cp "$1" "${sf}"
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" \
@@ -412,7 +412,7 @@ elisp-site-regen() {
local sf i ret=0 null="" page=$'\f'
local -a sflist
- if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then
+ if [[ ${EBUILD_PHASE} == *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then
ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase."
return 0
fi
@@ -467,7 +467,7 @@ elisp-site-regen() {
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die
case ${#sflist[@]} in
- 0) [[ ${PN} = emacs-common ]] \
+ 0) [[ ${PN} == emacs-common ]] \
|| ewarn "... Huh? No site initialisation files found." ;;
1) einfo "... ${#sflist[@]} site initialisation file included." ;;
*) einfo "... ${#sflist[@]} site initialisation files included." ;;
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index c4a1b52..d763a49 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -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