Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.0.9999-r2.ebuild ChangeLog emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild emacs-vcs-24.0.91.ebuild
Date: Sun, 08 Jan 2012 21:29:43
Message-Id: 20120108212932.6CA262004B@flycatcher.gentoo.org
1 ulm 12/01/08 21:29:32
2
3 Modified: emacs-vcs-24.0.9999-r2.ebuild ChangeLog
4 emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild
5 emacs-vcs-24.0.91.ebuild
6 Log:
7 Restore fallback code in pkg_preinst because of failures with paludis.
8
9 (Portage version: 2.1.10.44/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.4 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?r1=1.3&r2=1.4
17
18 Index: emacs-vcs-24.0.9999-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- emacs-vcs-24.0.9999-r2.ebuild 5 Jan 2012 23:43:15 -0000 1.3
25 +++ emacs-vcs-24.0.9999-r2.ebuild 8 Jan 2012 21:29:32 -0000 1.4
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.3 2012/01/05 23:43:15 ulm Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.4 2012/01/08 21:29:32 ulm Exp $
31
32 EAPI=4
33
34 @@ -300,8 +300,20 @@
35
36 pkg_preinst() {
37 # move Info dir file to correct name
38 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
39 - || die "moving info dir failed"
40 + local infodir=/usr/share/info/${EMACS_SUFFIX} f
41 + if [[ -f ${ED}${infodir}/dir.orig ]]; then
42 + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
43 + else
44 + # this should not happen in EAPI 4
45 + ewarn "Regenerating Info directory index in ${infodir} ..."
46 + rm -f "${ED}"${infodir}/dir{,.*}
47 + for f in "${ED}"${infodir}/*; do
48 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
49 + install-info --info-dir="${ED}"${infodir} "${f}" \
50 + || die "install-info failed"
51 + fi
52 + done
53 + fi
54 }
55
56 pkg_postinst() {
57
58
59
60 1.74 app-editors/emacs-vcs/ChangeLog
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.74&view=markup
63 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.74&content-type=text/plain
64 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.73&r2=1.74
65
66 Index: ChangeLog
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
69 retrieving revision 1.73
70 retrieving revision 1.74
71 diff -u -r1.73 -r1.74
72 --- ChangeLog 5 Jan 2012 23:43:15 -0000 1.73
73 +++ ChangeLog 8 Jan 2012 21:29:32 -0000 1.74
74 @@ -1,6 +1,11 @@
75 # ChangeLog for app-editors/emacs-vcs
76 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
77 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.73 2012/01/05 23:43:15 ulm Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.74 2012/01/08 21:29:32 ulm Exp $
79 +
80 + 08 Jan 2012; Ulrich Müller <ulm@g.o> emacs-vcs-23.3.9999.ebuild,
81 + emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
82 + emacs-vcs-24.0.9999-r2.ebuild:
83 + Restore fallback code in pkg_preinst because of failures with paludis.
84
85 05 Jan 2012; Ulrich Mueller <ulm@g.o> emacs-vcs-23.3.9999.ebuild,
86 emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
87
88
89
90 1.6 app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.6&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.6&content-type=text/plain
94 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?r1=1.5&r2=1.6
95
96 Index: emacs-vcs-24.0.92.ebuild
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v
99 retrieving revision 1.5
100 retrieving revision 1.6
101 diff -u -r1.5 -r1.6
102 --- emacs-vcs-24.0.92.ebuild 5 Jan 2012 23:43:15 -0000 1.5
103 +++ emacs-vcs-24.0.92.ebuild 8 Jan 2012 21:29:32 -0000 1.6
104 @@ -1,6 +1,6 @@
105 # Copyright 1999-2012 Gentoo Foundation
106 # Distributed under the terms of the GNU General Public License v2
107 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.5 2012/01/05 23:43:15 ulm Exp $
108 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.6 2012/01/08 21:29:32 ulm Exp $
109
110 EAPI=4
111
112 @@ -300,8 +300,20 @@
113
114 pkg_preinst() {
115 # move Info dir file to correct name
116 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
117 - || die "moving info dir failed"
118 + local infodir=/usr/share/info/${EMACS_SUFFIX} f
119 + if [[ -f ${ED}${infodir}/dir.orig ]]; then
120 + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
121 + else
122 + # this should not happen in EAPI 4
123 + ewarn "Regenerating Info directory index in ${infodir} ..."
124 + rm -f "${ED}"${infodir}/dir{,.*}
125 + for f in "${ED}"${infodir}/*; do
126 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
127 + install-info --info-dir="${ED}"${infodir} "${f}" \
128 + || die "install-info failed"
129 + fi
130 + done
131 + fi
132 }
133
134 pkg_postinst() {
135
136
137
138 1.19 app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
139
140 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.19&view=markup
141 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.19&content-type=text/plain
142 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?r1=1.18&r2=1.19
143
144 Index: emacs-vcs-23.3.9999.ebuild
145 ===================================================================
146 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v
147 retrieving revision 1.18
148 retrieving revision 1.19
149 diff -u -r1.18 -r1.19
150 --- emacs-vcs-23.3.9999.ebuild 5 Jan 2012 23:43:15 -0000 1.18
151 +++ emacs-vcs-23.3.9999.ebuild 8 Jan 2012 21:29:32 -0000 1.19
152 @@ -1,6 +1,6 @@
153 # Copyright 1999-2012 Gentoo Foundation
154 # Distributed under the terms of the GNU General Public License v2
155 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.18 2012/01/05 23:43:15 ulm Exp $
156 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.19 2012/01/08 21:29:32 ulm Exp $
157
158 EAPI=4
159 WANT_AUTOMAKE="none"
160 @@ -293,8 +293,20 @@
161
162 pkg_preinst() {
163 # move Info dir file to correct name
164 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
165 - || die "moving info dir failed"
166 + local infodir=/usr/share/info/${EMACS_SUFFIX} f
167 + if [[ -f ${ED}${infodir}/dir.orig ]]; then
168 + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
169 + else
170 + # this should not happen in EAPI 4
171 + ewarn "Regenerating Info directory index in ${infodir} ..."
172 + rm -f "${ED}"${infodir}/dir{,.*}
173 + for f in "${ED}"${infodir}/*; do
174 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
175 + install-info --info-dir="${ED}"${infodir} "${f}" \
176 + || die "install-info failed"
177 + fi
178 + done
179 + fi
180 }
181
182 pkg_postinst() {
183
184
185
186 1.8 app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
187
188 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.8&view=markup
189 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.8&content-type=text/plain
190 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?r1=1.7&r2=1.8
191
192 Index: emacs-vcs-24.0.91.ebuild
193 ===================================================================
194 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v
195 retrieving revision 1.7
196 retrieving revision 1.8
197 diff -u -r1.7 -r1.8
198 --- emacs-vcs-24.0.91.ebuild 5 Jan 2012 23:43:15 -0000 1.7
199 +++ emacs-vcs-24.0.91.ebuild 8 Jan 2012 21:29:32 -0000 1.8
200 @@ -1,6 +1,6 @@
201 # Copyright 1999-2012 Gentoo Foundation
202 # Distributed under the terms of the GNU General Public License v2
203 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.7 2012/01/05 23:43:15 ulm Exp $
204 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.8 2012/01/08 21:29:32 ulm Exp $
205
206 EAPI=4
207
208 @@ -300,8 +300,20 @@
209
210 pkg_preinst() {
211 # move Info dir file to correct name
212 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
213 - || die "moving info dir failed"
214 + local infodir=/usr/share/info/${EMACS_SUFFIX} f
215 + if [[ -f ${ED}${infodir}/dir.orig ]]; then
216 + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
217 + else
218 + # this should not happen in EAPI 4
219 + ewarn "Regenerating Info directory index in ${infodir} ..."
220 + rm -f "${ED}"${infodir}/dir{,.*}
221 + for f in "${ED}"${infodir}/*; do
222 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
223 + install-info --info-dir="${ED}"${infodir} "${f}" \
224 + || die "install-info failed"
225 + fi
226 + done
227 + fi
228 }
229
230 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups