| 1 |
ulm 12/01/08 21:20:57 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-23.3-r3.ebuild |
| 4 |
Log: |
| 5 |
Restore fallback code in pkg_preinst because of failures with paludis. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.460 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.460&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.460&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.459&r2=1.460 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.459 |
| 20 |
retrieving revision 1.460 |
| 21 |
diff -u -r1.459 -r1.460 |
| 22 |
--- ChangeLog 6 Jan 2012 21:15:28 -0000 1.459 |
| 23 |
+++ ChangeLog 8 Jan 2012 21:20:57 -0000 1.460 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-editors/emacs |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.459 2012/01/06 21:15:28 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.460 2012/01/08 21:20:57 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 08 Jan 2012; Ulrich Müller <ulm@g.o> emacs-23.3-r3.ebuild: |
| 31 |
+ Restore fallback code in pkg_preinst because of failures with paludis. |
| 32 |
|
| 33 |
06 Jan 2012; Ulrich Mueller <ulm@g.o> -emacs-23.3-r1.ebuild: |
| 34 |
Remove old. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 app-editors/emacs/emacs-23.3-r3.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: emacs-23.3-r3.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -u -r1.4 -r1.5 |
| 50 |
--- emacs-23.3-r3.ebuild 5 Jan 2012 23:51:53 -0000 1.4 |
| 51 |
+++ emacs-23.3-r3.ebuild 8 Jan 2012 21:20:57 -0000 1.5 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.4 2012/01/05 23:51:53 ulm Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.5 2012/01/08 21:20:57 ulm Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
WANT_AUTOMAKE="none" |
| 60 |
@@ -278,8 +278,20 @@ |
| 61 |
|
| 62 |
pkg_preinst() { |
| 63 |
# move Info dir file to correct name |
| 64 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \ |
| 65 |
- || die "moving info dir failed" |
| 66 |
+ local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 67 |
+ if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 68 |
+ mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
| 69 |
+ else |
| 70 |
+ # this should not happen in EAPI 4 |
| 71 |
+ ewarn "Regenerating Info directory index in ${infodir} ..." |
| 72 |
+ rm -f "${ED}"${infodir}/dir{,.*} |
| 73 |
+ for f in "${ED}"${infodir}/*; do |
| 74 |
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 75 |
+ install-info --info-dir="${ED}"${infodir} "${f}" \ |
| 76 |
+ || die "install-info failed" |
| 77 |
+ fi |
| 78 |
+ done |
| 79 |
+ fi |
| 80 |
} |
| 81 |
|
| 82 |
pkg_postinst() { |
Archives