diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-03-16 08:55:30 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-03-16 08:55:30 +0000 |
| commit | f7d6af65e4327b06a75a113ebfae1182437f0273 (patch) | |
| tree | 43ef517250eafff5cdfe7bb103d4a01ad5492039 /eclass/elisp.eclass | |
| parent | Remove epunt_cxx, bug #461904 (diff) | |
| download | gentoo-2-f7d6af65e4327b06a75a113ebfae1182437f0273.tar.gz gentoo-2-f7d6af65e4327b06a75a113ebfae1182437f0273.tar.bz2 gentoo-2-f7d6af65e4327b06a75a113ebfae1182437f0273.zip | |
Sync eclasses from Emacs overlay.
elisp-common.eclass: Functions elisp-compile, elisp-make-autoload-file,
elisp-install, and elisp-site-file-install now die on failure.
elisp.eclass: Remove die commands that are no longer necessary because the
called functions die themselves. Call readme.gentoo_create_doc and
readme.gentoo_print_elog from readme.gentoo.eclass if these functions exist.
Diffstat (limited to 'eclass/elisp.eclass')
| -rw-r--r-- | eclass/elisp.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index be7176e27422..7037399e8324 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.56 2013/01/04 21:22:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.57 2013/03/16 08:55:30 ulm Exp $ # # @ECLASS: elisp.eclass # @MAINTAINER: @@ -151,7 +151,7 @@ elisp_src_configure() { :; } # GNU Info files from them. elisp_src_compile() { - elisp-compile *.el || die + elisp-compile *.el if [[ -n ${ELISP_TEXINFO} ]]; then makeinfo ${ELISP_TEXINFO} || die fi @@ -165,9 +165,9 @@ elisp_src_compile() { # ELISP_TEXINFO and documentation listed in the DOCS variable. elisp_src_install() { - elisp-install ${PN} *.el *.elc || die + elisp-install ${PN} *.el *.elc if [[ -n ${SITEFILE} ]]; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi if [[ -n ${ELISP_TEXINFO} ]]; then set -- ${ELISP_TEXINFO} @@ -177,6 +177,9 @@ elisp_src_install() { if [[ -n ${DOCS} ]]; then dodoc ${DOCS} || die fi + if declare -f readme.gentoo_create_doc >/dev/null; then + readme.gentoo_create_doc + fi } # @FUNCTION: elisp_pkg_postinst @@ -186,6 +189,9 @@ elisp_src_install() { elisp_pkg_postinst() { elisp-site-regen + if declare -f readme.gentoo_print_elog >/dev/null; then + readme.gentoo_print_elog + fi } # @FUNCTION: elisp_pkg_postrm |