diff options
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 12 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild | 31 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild | 31 |
4 files changed, 41 insertions, 39 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 93bd8b12d51d..e2ec7ccde08b 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.25 2010/09/22 20:35:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.26 2010/09/25 11:32:26 ulm Exp $ + + 25 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild, + emacs-vcs-24.0.9999.ebuild: + Move regeneration of Info dir to pkg_preinst. 22 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild: Add messages to "die" commands. diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index d95e8214df55..24e32659f9c5 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD emacs-vcs-23.2.9999.ebuild 9850 RMD160 16e5a2f9cc4d308faf915a13bbced4ce00b3ae60 SHA1 d0b07d6315741151d7dde3e1e5b18c796ea30b03 SHA256 6ac70fba801be0ae346201e7a7f57e5770a2827bdb65681c086cd2ab4fdcb5c0 -EBUILD emacs-vcs-24.0.9999.ebuild 10333 RMD160 0af6154b33c83677a742874d93775bb6add5efe6 SHA1 4df454e09197dbcc92f77c040b489cf817132c5a SHA256 9ead146d8e2df7bb9730a782270f750861a8a33163bb47c3c2fe1af25c64001d -MISC ChangeLog 53611 RMD160 92beff8e4cdbc745c4481fbf15f26d0b1de0792b SHA1 b3852853c1606533147541922336664431153df6 SHA256 3e72ca26152f665a0d93f336b08ec80118a6209733a6c52cd742268871bebdf9 +EBUILD emacs-vcs-23.2.9999.ebuild 9756 RMD160 c4d27e131d71cd8d5ee5d67ba201b59c62c8e1e3 SHA1 e2222f0c194d03c91e17100c9d64a9cb7e4b54ef SHA256 00ff786f21aa34d7a7d174af803abe6fe19215767e8986f8483f993804294a6e +EBUILD emacs-vcs-24.0.9999.ebuild 10239 RMD160 06ae625f394dc5f87f289eaf70d63cd47e9b7d0b SHA1 8190a7f8dc3f05054e6f2a23d502aa0f01de7873 SHA256 8da3c5722d676ee852160d475d07e6901215bf8bce46f8655333064d57aa4621 +MISC ChangeLog 53765 RMD160 9ba1287ce6ab346e30502d69c32a1dc9f19a4069 SHA1 c0ed613edc59e35fc1bc6f22336e4d5340a211b5 SHA256 2c5207578de7752556b4504790db75d0a135af4e01e8f2554eb1c57977626700 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyaaP4ACgkQOeoy/oIi7uw6CgCgqPOj75i2P+JXmKxkfHYhMzBF -GuMAoMErpqk8kv0QLsoFxW7uvgM0vInV -=Wu1H +iEYEARECAAYFAkyd3j0ACgkQOeoy/oIi7uzHMwCeLkkmOEiIXZnr9sddw6drjU3H +y/EAnjzPwFdOIkDRFWp57X1tQHM2DHeJ +=/GqM -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild index eced3ccf9235..b255e544e26f 100644 --- a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.2 2010/06/25 17:46:48 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.3 2010/09/25 11:32:26 ulm Exp $ EAPI=2 @@ -260,20 +260,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() { @@ -284,7 +285,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 @@ -309,6 +309,5 @@ pkg_postinst() { pkg_postrm() { elisp-site-regen - emacs-infodir-rebuild eselect emacs update ifunset } 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 4db8325805d5..982f2bf66525 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.11 2010/09/22 20:35:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.12 2010/09/25 11:32:26 ulm Exp $ EAPI=2 @@ -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 } |