From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB5601382C5 for ; Tue, 20 Apr 2021 18:13:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DA7BE07A5; Tue, 20 Apr 2021 18:13:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E717BE07A5 for ; Tue, 20 Apr 2021 18:13:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B343B33BE5A for ; Tue, 20 Apr 2021 18:13:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC1CA6BD for ; Tue, 20 Apr 2021 18:13:54 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1618942420.2d849335502f87557049d486c1171a9e6e6bb045.ulm@gentoo> Subject: [gentoo-commits] repo/proj/emacs:master commit in: eclass/ X-VCS-Repository: repo/proj/emacs X-VCS-Files: eclass/elisp-common.eclass eclass/elisp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 2d849335502f87557049d486c1171a9e6e6bb045 X-VCS-Branch: master Date: Tue, 20 Apr 2021 18:13:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ab6330f-3160-4ab4-a360-dc876a51f93b X-Archives-Hash: 4fc4fe8503613dd792f269cf35d056db commit: 2d849335502f87557049d486c1171a9e6e6bb045 Author: Ulrich Müller gentoo org> AuthorDate: Tue Apr 20 18:13:40 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Apr 20 18:13:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=2d849335 elisp*.eclass: Sync from Gentoo repository Signed-off-by: Ulrich Müller gentoo.org> eclass/elisp-common.eclass | 6 +++--- eclass/elisp.eclass | 2 +- 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