diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-01-08 21:20:57 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-01-08 21:20:57 +0000 |
| commit | 7265dc52049d2322c1148801b4bdfac90c59d8f1 (patch) | |
| tree | 26658aefb50be0c8bbfd9337d3c8daa8d9d82b60 /app-editors | |
| parent | Fix building with net-libs/libpcap[-static-libs] (bug #397647). Patch by Arfr... (diff) | |
| download | gentoo-2-7265dc52049d2322c1148801b4bdfac90c59d8f1.tar.gz gentoo-2-7265dc52049d2322c1148801b4bdfac90c59d8f1.tar.bz2 gentoo-2-7265dc52049d2322c1148801b4bdfac90c59d8f1.zip | |
Restore fallback code in pkg_preinst because of failures with paludis.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.3-r3.ebuild | 18 |
2 files changed, 19 insertions, 4 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index e1e5c3d1440b..b1f721cdaf3e 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.459 2012/01/06 21:15:28 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.460 2012/01/08 21:20:57 ulm Exp $ + + 08 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-23.3-r3.ebuild: + Restore fallback code in pkg_preinst because of failures with paludis. 06 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -emacs-23.3-r1.ebuild: Remove old. diff --git a/app-editors/emacs/emacs-23.3-r3.ebuild b/app-editors/emacs/emacs-23.3-r3.ebuild index ff38533ef703..f57262bd4f57 100644 --- a/app-editors/emacs/emacs-23.3-r3.ebuild +++ b/app-editors/emacs/emacs-23.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.4 2012/01/05 23:51:53 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.5 2012/01/08 21:20:57 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -278,8 +278,20 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \ - || die "moving info dir failed" + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [[ -f ${ED}${infodir}/dir.orig ]]; then + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" + else + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${ED}"${infodir}/dir{,.*} + for f in "${ED}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${ED}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi } pkg_postinst() { |