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 75EF6138350 for ; Sat, 22 Feb 2020 11:42:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F9DEE084E; Sat, 22 Feb 2020 11:42:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 2EC08E084E for ; Sat, 22 Feb 2020 11:42:42 +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 12B1E34EF24 for ; Sat, 22 Feb 2020 11:42:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A78A116 for ; Sat, 22 Feb 2020 11:42:39 +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: <1582371731.398c5eae70a6cede9316f8d4fcdb49b28392602f.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: 398c5eae70a6cede9316f8d4fcdb49b28392602f X-VCS-Branch: master Date: Sat, 22 Feb 2020 11:42:39 +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: 0e236317-2179-43bf-a5d0-e918a51c510a X-Archives-Hash: ee1c5c8eeb22e0782fa96375531c6300 commit: 398c5eae70a6cede9316f8d4fcdb49b28392602f Author: Ulrich Müller gentoo org> AuthorDate: Sat Feb 22 11:42:11 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 22 11:42:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=398c5eae elisp*.eclass: Sync from gentoo repo. Signed-off-by: Ulrich Müller gentoo.org> eclass/elisp-common.eclass | 14 +++++--------- eclass/elisp.eclass | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index b5ea21c..6fa2bbe 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp-common.eclass @@ -43,8 +43,7 @@ # Please note that this should be done only for packages that are known # to fail with lower Emacs versions. # -# @ROFF .SS -# src_compile() usage: +# @SUBSECTION src_compile() usage: # # An elisp file is compiled by the elisp-compile() function defined # here and simply takes the source files as arguments. The case of @@ -64,8 +63,7 @@ # comments. See the Emacs Lisp Reference Manual (node "Autoload") for # a detailed explanation. # -# @ROFF .SS -# src_install() usage: +# @SUBSECTION src_install() usage: # # The resulting compiled files (.elc) should be put in a subdirectory of # /usr/share/emacs/site-lisp/ which is named after the first argument @@ -132,8 +130,7 @@ # "50${PN}-gentoo.el". If your subdirectory is not named ${PN}, give # the differing name as second argument. # -# @ROFF .SS -# pkg_setup() usage: +# @SUBSECTION pkg_setup() usage: # # If your ebuild uses the elisp-compile eclass function to compile # its elisp files (see above), then you don't need a pkg_setup phase, @@ -149,8 +146,7 @@ # When having optional Emacs support, you should prepend "use emacs &&" # to above call of elisp-check-emacs-version(). # -# @ROFF .SS -# pkg_postinst() / pkg_postrm() usage: +# @SUBSECTION pkg_postinst() / pkg_postrm() usage: # # After that you need to recreate the start-up file of Emacs after # emerging and unmerging by using diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index a411f60..7876928 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 2002-2019 Gentoo Authors +# Copyright 2002-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp.eclass @@ -173,7 +173,7 @@ elisp_src_install() { # install documentation only when explicitly requested case ${EAPI} in 4|5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; - *) declare -p DOCS &>/dev/null && einstalldocs ;; + *) [[ $(declare -p DOCS 2>/dev/null) == *=* ]] && einstalldocs ;; esac if declare -f readme.gentoo_create_doc >/dev/null; then readme.gentoo_create_doc