diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2020-02-22 12:42:11 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2020-02-22 12:42:11 +0100 |
| commit | 398c5eae70a6cede9316f8d4fcdb49b28392602f (patch) | |
| tree | 32ae5a69788cb95f6f059116ab32f5a2224f15b5 | |
| parent | app-emacs/ebuild-mode: Autoload devbook-mode in site-init file. (diff) | |
| download | emacs-398c5eae70a6cede9316f8d4fcdb49b28392602f.tar.gz emacs-398c5eae70a6cede9316f8d4fcdb49b28392602f.tar.bz2 emacs-398c5eae70a6cede9316f8d4fcdb49b28392602f.zip | |
elisp*.eclass: Sync from gentoo repo.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | eclass/elisp-common.eclass | 14 | ||||
| -rw-r--r-- | 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 |