diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-11-26 21:47:54 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-11-26 21:47:54 +0000 |
| commit | b3f75219989baab2618d414da68958bedcb918bc (patch) | |
| tree | b4422df204c1459d5a584b7ca7f1f69b79d5183f | |
| parent | Remove pre-made Info files. (diff) | |
| download | emacs-b3f75219989baab2618d414da68958bedcb918bc.tar.gz emacs-b3f75219989baab2618d414da68958bedcb918bc.tar.bz2 emacs-b3f75219989baab2618d414da68958bedcb918bc.zip | |
Merge change from Portage tree.
svn path=/emacs-overlay/; revision=1226
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 4 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/Manifest | 4 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 90b9959..528e1bb 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -3,7 +3,9 @@ # $Header: $ 26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: - Correct name for split Info files. + Correct name for split Info files. Handle the FEATURES=noinfo case in + emacs-infodir-rebuild; don't create a spurious Info dir file when called + with no files in postrm phase. 19 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: Upstream relicenced the documentation under FDL-1.3. diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 841c920..7113f50 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -1,4 +1,4 @@ AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8 -EBUILD emacs-cvs-23.0.9999.ebuild 8564 RMD160 8002bfe8e94859f9f0de070653c773549d3f174a SHA1 0e39e9c378508e50b0155b79831e0f3b119defdb SHA256 cedf882b11818fd3958c988627d99c98687b52abd62b2a97866ab26d087f1656 -MISC ChangeLog 1024 RMD160 ec00126c44ebc8a40de1c942e1f47b46fb9fda35 SHA1 6a49651b548d34259aa87f80e180e09b7effcf18 SHA256 64a8fde87751df07fa386b155f365622e1b65863e1e4000e749870728afd106e +EBUILD emacs-cvs-23.0.9999.ebuild 8646 RMD160 a65947145aa5dbcd039c70a5bbfd1f1524c43a77 SHA1 8a1a5b60c1ff6d66b6b1ada554c69c4831a20d6d SHA256 f9cb1b5b48bc4d54201bf19b6655ffc37547ce9b1813a6410bc2e90e5b32d741 +MISC ChangeLog 1167 RMD160 7c046f50e40fc349ff983ebdaa702789fe9be42d SHA1 c778dd1ab14c35b892525592925cd510c6c5a8aa SHA256 be245d20990133a51b85bb62ff9aa07c1a8cb4dcdedca912c491a6e1cce57887 MISC metadata.xml 1606 RMD160 f898da13dfc3bdb1636e9ff7bc241997d235498b SHA1 2dea9901bc80a1d91f38628707395d9b4ef0df70 SHA256 f4df95b7db6f7b3375bdd658024520a03a763e75f4ca846ab494609f6094c9bd diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index 2eaa3b7..d2cbccf 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -243,13 +243,14 @@ emacs-infodir-rebuild() { # INFOPATH, which is not guaranteed. So we rebuild it ourselves. 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##*/} == *.info-[0-9]* ]] \ - || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null + [[ ${f##*/} != *.info-[0-9]* && -e ${f} ]] \ + && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null done - rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty + rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty echo } |