| 1 |
ulm 08/11/26 21:11:49 |
| 2 |
|
| 3 |
Modified: emacs-22.3.ebuild ChangeLog emacs-21.4-r17.ebuild |
| 4 |
Log: |
| 5 |
Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a |
| 6 |
spurious Info dir file when called with no files in postrm phase. |
| 7 |
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r4 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.13 app-editors/emacs/emacs-22.3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild?rev=1.13&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild?rev=1.13&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild?r1=1.12&r2=1.13 |
| 15 |
|
| 16 |
Index: emacs-22.3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v |
| 19 |
retrieving revision 1.12 |
| 20 |
retrieving revision 1.13 |
| 21 |
diff -u -r1.12 -r1.13 |
| 22 |
--- emacs-22.3.ebuild 7 Nov 2008 08:43:11 -0000 1.12 |
| 23 |
+++ emacs-22.3.ebuild 26 Nov 2008 21:11:49 -0000 1.13 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.12 2008/11/07 08:43:11 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.13 2008/11/26 21:11:49 ulm Exp $ |
| 29 |
|
| 30 |
inherit autotools elisp-common eutils flag-o-matic |
| 31 |
|
| 32 |
@@ -205,13 +205,14 @@ |
| 33 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 34 |
|
| 35 |
local infodir=/usr/share/info/emacs-${SLOT} f |
| 36 |
+ [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
| 37 |
einfo "Regenerating Info directory index in ${infodir} ..." |
| 38 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
| 39 |
for f in "${ROOT}"${infodir}/*.info*; do |
| 40 |
- [[ ${f##*/} == *[0-9].info* ]] \ |
| 41 |
- || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 42 |
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 43 |
+ && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 44 |
done |
| 45 |
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 46 |
+ rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 47 |
echo |
| 48 |
} |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.287 app-editors/emacs/ChangeLog |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.287&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.287&content-type=text/plain |
| 57 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.286&r2=1.287 |
| 58 |
|
| 59 |
Index: ChangeLog |
| 60 |
=================================================================== |
| 61 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 62 |
retrieving revision 1.286 |
| 63 |
retrieving revision 1.287 |
| 64 |
diff -u -r1.286 -r1.287 |
| 65 |
--- ChangeLog 14 Nov 2008 09:11:43 -0000 1.286 |
| 66 |
+++ ChangeLog 26 Nov 2008 21:11:49 -0000 1.287 |
| 67 |
@@ -1,6 +1,11 @@ |
| 68 |
# ChangeLog for app-editors/emacs |
| 69 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 70 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.286 2008/11/14 09:11:43 ulm Exp $ |
| 71 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.287 2008/11/26 21:11:49 ulm Exp $ |
| 72 |
+ |
| 73 |
+ 26 Nov 2008; Ulrich Mueller <ulm@g.o> emacs-21.4-r17.ebuild, |
| 74 |
+ emacs-22.3.ebuild: |
| 75 |
+ Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a |
| 76 |
+ spurious Info dir file when called with no files in postrm phase. |
| 77 |
|
| 78 |
14 Nov 2008; Ulrich Mueller <ulm@g.o> emacs-18.59-r5.ebuild: |
| 79 |
Require libX11 built with USE=-xcb. |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.14 app-editors/emacs/emacs-21.4-r17.ebuild |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild?rev=1.14&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild?rev=1.14&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild?r1=1.13&r2=1.14 |
| 88 |
|
| 89 |
Index: emacs-21.4-r17.ebuild |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v |
| 92 |
retrieving revision 1.13 |
| 93 |
retrieving revision 1.14 |
| 94 |
diff -u -r1.13 -r1.14 |
| 95 |
--- emacs-21.4-r17.ebuild 7 Nov 2008 08:43:11 -0000 1.13 |
| 96 |
+++ emacs-21.4-r17.ebuild 26 Nov 2008 21:11:49 -0000 1.14 |
| 97 |
@@ -1,6 +1,6 @@ |
| 98 |
# Copyright 1999-2008 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.13 2008/11/07 08:43:11 ulm Exp $ |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.14 2008/11/26 21:11:49 ulm Exp $ |
| 102 |
|
| 103 |
WANT_AUTOCONF="2.1" |
| 104 |
|
| 105 |
@@ -154,13 +154,14 @@ |
| 106 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 107 |
|
| 108 |
local infodir=/usr/share/info/emacs-${SLOT} f |
| 109 |
+ [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
| 110 |
einfo "Regenerating Info directory index in ${infodir} ..." |
| 111 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
| 112 |
for f in "${ROOT}"${infodir}/*.info*; do |
| 113 |
- [[ ${f##*/} == *[0-9].info* ]] \ |
| 114 |
- || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 115 |
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 116 |
+ && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 117 |
done |
| 118 |
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 119 |
+ rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 120 |
echo |
| 121 |
} |
Archives