| 1 |
ulm 10/09/25 11:32:26 |
| 2 |
|
| 3 |
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog |
| 4 |
emacs-vcs-24.0.9999.ebuild |
| 5 |
Log: |
| 6 |
Move regeneration of Info dir to pkg_preinst. |
| 7 |
|
| 8 |
(Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: emacs-vcs-23.2.9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- emacs-vcs-23.2.9999.ebuild 25 Jun 2010 17:46:48 -0000 1.2 |
| 24 |
+++ emacs-vcs-23.2.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=2 |
| 32 |
|
| 33 |
@@ -260,20 +260,21 @@ |
| 34 |
dodoc README BUGS || die "dodoc failed" |
| 35 |
} |
| 36 |
|
| 37 |
-emacs-infodir-rebuild() { |
| 38 |
- # Depending on the Portage version, the Info dir file is compressed |
| 39 |
- # or removed. It is only rebuilt by Portage if our directory is in |
| 40 |
- # INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 41 |
- |
| 42 |
+pkg_preinst() { |
| 43 |
+ # Depending on Portage version and user's settings, the Info dir file |
| 44 |
+ # may have been compressed or removed. We rebuild it in both cases. |
| 45 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 46 |
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
| 47 |
- einfo "Regenerating Info directory index in ${infodir} ..." |
| 48 |
- rm -f "${ROOT}"${infodir}/dir{,.*} |
| 49 |
- for f in "${ROOT}"${infodir}/*.info*; do |
| 50 |
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 51 |
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 52 |
- done |
| 53 |
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 54 |
+ if [ -f "${D}"${infodir}/dir.info ]; then |
| 55 |
+ # prefer existing file if it has survived to here |
| 56 |
+ mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed" |
| 57 |
+ else |
| 58 |
+ einfo "Regenerating Info directory index in ${infodir} ..." |
| 59 |
+ rm -f "${D}"${infodir}/dir{,.*} |
| 60 |
+ for f in "${D}"${infodir}/*.info*; do |
| 61 |
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 62 |
+ && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null |
| 63 |
+ done |
| 64 |
+ fi |
| 65 |
} |
| 66 |
|
| 67 |
pkg_postinst() { |
| 68 |
@@ -284,7 +285,6 @@ |
| 69 |
chown games:games "${ROOT}"/var/lib/games/emacs |
| 70 |
|
| 71 |
elisp-site-regen |
| 72 |
- emacs-infodir-rebuild |
| 73 |
eselect emacs update ifunset |
| 74 |
|
| 75 |
if use X; then |
| 76 |
@@ -309,6 +309,5 @@ |
| 77 |
|
| 78 |
pkg_postrm() { |
| 79 |
elisp-site-regen |
| 80 |
- emacs-infodir-rebuild |
| 81 |
eselect emacs update ifunset |
| 82 |
} |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.26 app-editors/emacs-vcs/ChangeLog |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.26&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.26&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.25&r2=1.26 |
| 91 |
|
| 92 |
Index: ChangeLog |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
| 95 |
retrieving revision 1.25 |
| 96 |
retrieving revision 1.26 |
| 97 |
diff -u -r1.25 -r1.26 |
| 98 |
--- ChangeLog 22 Sep 2010 20:35:57 -0000 1.25 |
| 99 |
+++ ChangeLog 25 Sep 2010 11:32:26 -0000 1.26 |
| 100 |
@@ -1,6 +1,10 @@ |
| 101 |
# ChangeLog for app-editors/emacs-vcs |
| 102 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.25 2010/09/22 20:35:57 ulm Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.26 2010/09/25 11:32:26 ulm Exp $ |
| 105 |
+ |
| 106 |
+ 25 Sep 2010; Ulrich Mueller <ulm@g.o> emacs-vcs-23.2.9999.ebuild, |
| 107 |
+ emacs-vcs-24.0.9999.ebuild: |
| 108 |
+ Move regeneration of Info dir to pkg_preinst. |
| 109 |
|
| 110 |
22 Sep 2010; Ulrich Mueller <ulm@g.o> emacs-vcs-24.0.9999.ebuild: |
| 111 |
Add messages to "die" commands. |
| 112 |
|
| 113 |
|
| 114 |
|
| 115 |
1.12 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild |
| 116 |
|
| 117 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.12&view=markup |
| 118 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.12&content-type=text/plain |
| 119 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.11&r2=1.12 |
| 120 |
|
| 121 |
Index: emacs-vcs-24.0.9999.ebuild |
| 122 |
=================================================================== |
| 123 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v |
| 124 |
retrieving revision 1.11 |
| 125 |
retrieving revision 1.12 |
| 126 |
diff -u -r1.11 -r1.12 |
| 127 |
--- emacs-vcs-24.0.9999.ebuild 22 Sep 2010 20:35:57 -0000 1.11 |
| 128 |
+++ emacs-vcs-24.0.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.12 |
| 129 |
@@ -1,6 +1,6 @@ |
| 130 |
# Copyright 1999-2010 Gentoo Foundation |
| 131 |
# Distributed under the terms of the GNU General Public License v2 |
| 132 |
-# $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 $ |
| 133 |
+# $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 $ |
| 134 |
|
| 135 |
EAPI=2 |
| 136 |
|
| 137 |
@@ -273,20 +273,21 @@ |
| 138 |
dodoc README BUGS || die "dodoc failed" |
| 139 |
} |
| 140 |
|
| 141 |
-emacs-infodir-rebuild() { |
| 142 |
- # Depending on the Portage version, the Info dir file is compressed |
| 143 |
- # or removed. It is only rebuilt by Portage if our directory is in |
| 144 |
- # INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 145 |
- |
| 146 |
+pkg_preinst() { |
| 147 |
+ # Depending on Portage version and user's settings, the Info dir file |
| 148 |
+ # may have been compressed or removed. We rebuild it in both cases. |
| 149 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 150 |
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
| 151 |
- einfo "Regenerating Info directory index in ${infodir} ..." |
| 152 |
- rm -f "${ROOT}"${infodir}/dir{,.*} |
| 153 |
- for f in "${ROOT}"${infodir}/*.info*; do |
| 154 |
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 155 |
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
| 156 |
- done |
| 157 |
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
| 158 |
+ if [ -f "${D}"${infodir}/dir.info ]; then |
| 159 |
+ # prefer existing file if it has survived to here |
| 160 |
+ mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed" |
| 161 |
+ else |
| 162 |
+ einfo "Regenerating Info directory index in ${infodir} ..." |
| 163 |
+ rm -f "${D}"${infodir}/dir{,.*} |
| 164 |
+ for f in "${D}"${infodir}/*.info*; do |
| 165 |
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
| 166 |
+ && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null |
| 167 |
+ done |
| 168 |
+ fi |
| 169 |
} |
| 170 |
|
| 171 |
pkg_postinst() { |
| 172 |
@@ -297,7 +298,6 @@ |
| 173 |
chown games:games "${ROOT}"/var/lib/games/emacs |
| 174 |
|
| 175 |
elisp-site-regen |
| 176 |
- emacs-infodir-rebuild |
| 177 |
eselect emacs update ifunset |
| 178 |
|
| 179 |
if use X; then |
| 180 |
@@ -322,6 +322,5 @@ |
| 181 |
|
| 182 |
pkg_postrm() { |
| 183 |
elisp-site-regen |
| 184 |
- emacs-infodir-rebuild |
| 185 |
eselect emacs update ifunset |
| 186 |
} |
Archives