diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-09-22 21:32:29 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-09-22 21:32:29 +0000 |
| commit | 3fcca45359c24039bc653ff354277b75b4ad35ee (patch) | |
| tree | b8d3ff51ee41fd32792cd7a71afd018187ffcb85 | |
| parent | Copy from portage tree. (diff) | |
| download | emacs-3fcca45359c24039bc653ff354277b75b4ad35ee.tar.gz emacs-3fcca45359c24039bc653ff354277b75b4ad35ee.tar.bz2 emacs-3fcca45359c24039bc653ff354277b75b4ad35ee.zip | |
Move regeneration of Info dir to pkg_preinst.
svn path=/emacs-overlay/; revision=1520
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 3 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 4 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild | 29 |
3 files changed, 19 insertions, 17 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index d5ae0da..e742973 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild: + Move regeneration of Info dir to pkg_preinst. + *emacs-vcs-24.0.9999 (22 Sep 2010) 22 Sep 2010; Ulrich Mueller <ulm@gentoo.org> +emacs-vcs-24.0.9999.ebuild, diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 1e40505..a4c50a5 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,3 +1,3 @@ -EBUILD emacs-vcs-24.0.9999.ebuild 10333 RMD160 0af6154b33c83677a742874d93775bb6add5efe6 SHA1 4df454e09197dbcc92f77c040b489cf817132c5a SHA256 9ead146d8e2df7bb9730a782270f750861a8a33163bb47c3c2fe1af25c64001d -MISC ChangeLog 278 RMD160 f9eaa05024e94eb3e264d65643239f295a825eb2 SHA1 8f9a4f3bee7dea8adc2f7d45f027685d573d261d SHA256 159cda6121048db5fbf220fda4b340d5bb1b8c1893a61cc9322ed5360856bf7b +EBUILD emacs-vcs-24.0.9999.ebuild 10239 RMD160 290a9271d4f574eeb8f931648d62316993e54125 SHA1 2ed11b2712c0cd8ea6d9dcb6678c7e38ba6027a0 SHA256 e9b91fc804d80cc8e141e8d5f226471ce42792cf5051ed1488ad32497e5ff425 +MISC ChangeLog 402 RMD160 71695d11f7a993d7acecbe5fe6cb86908a4ded75 SHA1 ea3d1b08a690fdb74d2c6efdc86cbdf31822919b SHA256 42a176473f64e867955ff3fc80fb1b9bbf97f7ffbca93ab030f6edd9f0e8ed72 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild index 4db8325..93d4719 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild @@ -273,20 +273,21 @@ src_install () { dodoc README BUGS || die "dodoc failed" } -emacs-infodir-rebuild() { - # Depending on the Portage version, the Info dir file is compressed - # or removed. It is only rebuilt by Portage if our directory is in - # INFOPATH, which is not guaranteed. So we rebuild it ourselves. - +pkg_preinst() { + # Depending on Portage version and user's settings, the Info dir file + # may have been compressed or removed. We rebuild it in both cases. local infodir=/usr/share/info/${EMACS_SUFFIX} f - [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo - einfo "Regenerating Info directory index in ${infodir} ..." - rm -f "${ROOT}"${infodir}/dir{,.*} - for f in "${ROOT}"${infodir}/*.info*; do - [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ - && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null - done - rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty + if [ -f "${D}"${infodir}/dir.info ]; then + # prefer existing file if it has survived to here + mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed" + else + einfo "Regenerating Info directory index in ${infodir} ..." + rm -f "${D}"${infodir}/dir{,.*} + for f in "${D}"${infodir}/*.info*; do + [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ + && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null + done + fi } pkg_postinst() { @@ -297,7 +298,6 @@ pkg_postinst() { chown games:games "${ROOT}"/var/lib/games/emacs elisp-site-regen - emacs-infodir-rebuild eselect emacs update ifunset if use X; then @@ -322,6 +322,5 @@ pkg_postinst() { pkg_postrm() { elisp-site-regen - emacs-infodir-rebuild eselect emacs update ifunset } |