diff options
| -rw-r--r-- | eclass/eapi7-ver.eclass | 8 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 14 | ||||
| -rw-r--r-- | eclass/elisp.eclass | 4 | ||||
| -rw-r--r-- | eclass/savedconfig.eclass | 20 |
4 files changed, 20 insertions, 26 deletions
diff --git a/eclass/eapi7-ver.eclass b/eclass/eapi7-ver.eclass index b7f9715bc421..8f13fc9af762 100644 --- a/eclass/eapi7-ver.eclass +++ b/eclass/eapi7-ver.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: eapi7-ver.eclass @@ -17,8 +17,7 @@ # # https://bugs.gentoo.org/482170 # -# @ROFF .SS -# Version strings +# @SUBSECTION Version strings # # The functions support arbitrary version strings consisting of version # components interspersed with (possibly empty) version separators. @@ -50,8 +49,7 @@ # 0 1 1 # @CODE # -# @ROFF .SS -# Ranges +# @SUBSECTION Ranges # # A range can be specified as 'm' for m-th version component, 'm-' # for all components starting with m-th or 'm-n' for components starting diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index b5ea21cb22bf..6fa2bbea614b 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 a411f602cf7c..7876928c7fb2 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 diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass index 8f64c5b8edd0..e90a9b618d6b 100644 --- a/eclass/savedconfig.eclass +++ b/eclass/savedconfig.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: savedconfig.eclass @@ -14,21 +14,21 @@ # so users can modify these config files and the ebuild will take it # into account as needed. # -# @ROFF .nr R 1 1 # Typically you can create your own configuration files quickly by # doing: -# @ROFF .IP \nR 3 -# Build the package with FEATURES=noclean USE=savedconfig. -# @ROFF .IP \n+R -# Go into the build dir and edit the relevant configuration system +# +# 1. Build the package with FEATURES=noclean USE=savedconfig. +# +# 2. Go into the build dir and edit the relevant configuration system # (e.g. `make menuconfig` or `nano config-header.h`). You can look # at the files in /etc/portage/savedconfig/ to see what files get # loaded/restored. -# @ROFF .IP \n+R -# Copy the modified configuration files out of the workdir and to +# +# 3. Copy the modified configuration files out of the workdir and to # the paths in /etc/portage/savedconfig/. -# @ROFF .IP \n+R -# Emerge the package with just USE=savedconfig to get the custom build. +# +# 4. Emerge the package with just USE=savedconfig to get the custom +# build. inherit portability |