1 |
ulm 10/05/08 07:52:53 |
2 |
|
3 |
Modified: ChangeLog emacs-vcs-24.0.9999.ebuild |
4 |
Added: emacs-vcs-23.2.9999.ebuild |
5 |
Removed: emacs-vcs-23.1.9999-r3.ebuild |
6 |
emacs-vcs-23.1.95.ebuild emacs-vcs-23.1.97.ebuild |
7 |
emacs-vcs-23.1.96.ebuild |
8 |
Log: |
9 |
Bump emacs-23 live ebuild. Remove pretest ebuilds. |
10 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.18 app-editors/emacs-vcs/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.18&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.18&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.17&r2=1.18 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
22 |
retrieving revision 1.17 |
23 |
retrieving revision 1.18 |
24 |
diff -u -r1.17 -r1.18 |
25 |
--- ChangeLog 4 May 2010 07:59:43 -0000 1.17 |
26 |
+++ ChangeLog 8 May 2010 07:52:53 -0000 1.18 |
27 |
@@ -1,6 +1,15 @@ |
28 |
# ChangeLog for app-editors/emacs-vcs |
29 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.17 2010/05/04 07:59:43 ulm Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.18 2010/05/08 07:52:53 ulm Exp $ |
32 |
+ |
33 |
+*emacs-vcs-23.2.9999 (08 May 2010) |
34 |
+ |
35 |
+ 08 May 2010; Ulrich Mueller <ulm@g.o> -emacs-vcs-23.1.95.ebuild, |
36 |
+ -emacs-vcs-23.1.96.ebuild, -emacs-vcs-23.1.97.ebuild, |
37 |
+ -emacs-vcs-23.1.9999-r3.ebuild, +emacs-vcs-23.2.9999.ebuild, |
38 |
+ emacs-vcs-24.0.9999.ebuild: |
39 |
+ Bump emacs-23 live ebuild to reflect upstream change of version number. |
40 |
+ Remove pretest ebuilds. |
41 |
|
42 |
*emacs-vcs-23.1.97 (04 May 2010) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.4 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.4&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.4&content-type=text/plain |
51 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.3&r2=1.4 |
52 |
|
53 |
Index: emacs-vcs-24.0.9999.ebuild |
54 |
=================================================================== |
55 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v |
56 |
retrieving revision 1.3 |
57 |
retrieving revision 1.4 |
58 |
diff -u -r1.3 -r1.4 |
59 |
--- emacs-vcs-24.0.9999.ebuild 1 May 2010 15:16:49 -0000 1.3 |
60 |
+++ emacs-vcs-24.0.9999.ebuild 8 May 2010 07:52:53 -0000 1.4 |
61 |
@@ -1,6 +1,6 @@ |
62 |
# Copyright 1999-2010 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.3 2010/05/01 15:16:49 ulm Exp $ |
65 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.4 2010/05/08 07:52:53 ulm Exp $ |
66 |
|
67 |
EAPI=2 |
68 |
|
69 |
@@ -244,7 +244,7 @@ |
70 |
c="" |
71 |
fi |
72 |
|
73 |
- sed 's/^X//' >"${SITEFILE}" <<-EOF |
74 |
+ sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF |
75 |
X |
76 |
;;; ${PN}-${SLOT} site-lisp configuration |
77 |
X |
78 |
@@ -262,7 +262,7 @@ |
79 |
X (setcdr q (cons dir (delete dir (cdr q)))) |
80 |
X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
81 |
EOF |
82 |
- elisp-site-file-install "${SITEFILE}" || die |
83 |
+ elisp-site-file-install "${T}/${SITEFILE}" || die |
84 |
|
85 |
dodoc README BUGS || die "dodoc failed" |
86 |
} |
87 |
|
88 |
|
89 |
|
90 |
1.1 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild |
91 |
|
92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.1&view=markup |
93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.1&content-type=text/plain |
94 |
|
95 |
Index: emacs-vcs-23.2.9999.ebuild |
96 |
=================================================================== |
97 |
# Copyright 1999-2010 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.1 2010/05/08 07:52:53 ulm Exp $ |
100 |
|
101 |
EAPI=2 |
102 |
|
103 |
inherit autotools elisp-common eutils flag-o-matic |
104 |
|
105 |
if [ "${PV##*.}" = "9999" ]; then |
106 |
inherit bzr |
107 |
EMACS_BRANCH="emacs-23" |
108 |
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/" |
109 |
EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" |
110 |
SRC_URI="" |
111 |
else |
112 |
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz |
113 |
ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" |
114 |
# FULL_VERSION keeps the full version number, which is needed in |
115 |
# order to determine some path information correctly for copy/move |
116 |
# operations later on |
117 |
FULL_VERSION="${PV%%_*}" |
118 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
119 |
fi |
120 |
|
121 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
122 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
123 |
|
124 |
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode" |
125 |
SLOT="23" |
126 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
127 |
IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
128 |
RESTRICT="strip" |
129 |
|
130 |
RDEPEND="sys-libs/ncurses |
131 |
>=app-admin/eselect-emacs-1.2 |
132 |
net-libs/liblockfile |
133 |
hesiod? ( net-dns/hesiod ) |
134 |
kerberos? ( virtual/krb5 ) |
135 |
alsa? ( media-libs/alsa-lib ) |
136 |
gpm? ( sys-libs/gpm ) |
137 |
dbus? ( sys-apps/dbus ) |
138 |
X? ( |
139 |
x11-libs/libXmu |
140 |
x11-libs/libXt |
141 |
x11-misc/xbitmaps |
142 |
gconf? ( >=gnome-base/gconf-2.26.2 ) |
143 |
gif? ( media-libs/giflib ) |
144 |
jpeg? ( media-libs/jpeg:0 ) |
145 |
png? ( media-libs/libpng ) |
146 |
svg? ( >=gnome-base/librsvg-2.0 ) |
147 |
tiff? ( media-libs/tiff ) |
148 |
xpm? ( x11-libs/libXpm ) |
149 |
xft? ( |
150 |
media-libs/fontconfig |
151 |
media-libs/freetype |
152 |
x11-libs/libXft |
153 |
m17n-lib? ( |
154 |
>=dev-libs/libotf-0.9.4 |
155 |
>=dev-libs/m17n-lib-1.5.1 |
156 |
) |
157 |
) |
158 |
gtk? ( x11-libs/gtk+:2 ) |
159 |
!gtk? ( |
160 |
Xaw3d? ( x11-libs/Xaw3d ) |
161 |
!Xaw3d? ( motif? ( x11-libs/openmotif ) ) |
162 |
) |
163 |
)" |
164 |
|
165 |
DEPEND="${RDEPEND} |
166 |
dev-util/pkgconfig |
167 |
gzip-el? ( app-arch/gzip )" |
168 |
|
169 |
RDEPEND="${RDEPEND} |
170 |
>=app-emacs/emacs-common-gentoo-1[X?]" |
171 |
|
172 |
EMACS_SUFFIX="emacs-${SLOT}-vcs" |
173 |
SITEFILE="20${PN}-${SLOT}-gentoo.el" |
174 |
|
175 |
src_prepare() { |
176 |
if [ "${PV##*.}" = "9999" ]; then |
177 |
FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ |
178 |
| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
179 |
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
180 |
echo |
181 |
einfo "Emacs branch: ${EMACS_BRANCH}" |
182 |
einfo "Emacs version number: ${FULL_VERSION}" |
183 |
[ "${FULL_VERSION%.*}" = ${PV%.*} ] \ |
184 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
185 |
echo |
186 |
#else |
187 |
# EPATCH_SUFFIX=patch epatch |
188 |
fi |
189 |
|
190 |
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
191 |
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ |
192 |
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" |
193 |
|
194 |
if ! use alsa; then |
195 |
# ALSA is detected even if not requested by its USE flag. |
196 |
# Suppress it by supplying pkg-config with a wrong library name. |
197 |
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ |
198 |
|| die "unable to sed configure.in" |
199 |
fi |
200 |
if ! use gzip-el; then |
201 |
# Emacs' build system automatically detects the gzip binary and |
202 |
# compresses el files. We don't want that so confuse it with a |
203 |
# wrong binary name |
204 |
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
205 |
|| die "unable to sed configure.in" |
206 |
fi |
207 |
|
208 |
eautoreconf |
209 |
} |
210 |
|
211 |
src_configure() { |
212 |
ALLOWED_FLAGS="" |
213 |
strip-flags |
214 |
#unset LDFLAGS |
215 |
if use sh; then |
216 |
replace-flags -O[1-9] -O0 #262359 |
217 |
else |
218 |
replace-flags -O[3-9] -O2 |
219 |
fi |
220 |
|
221 |
local myconf |
222 |
|
223 |
if use alsa && ! use sound; then |
224 |
echo |
225 |
einfo "Although sound USE flag is disabled you chose to have alsa," |
226 |
einfo "so sound is switched on anyway." |
227 |
echo |
228 |
myconf="${myconf} --with-sound" |
229 |
else |
230 |
myconf="${myconf} $(use_with sound)" |
231 |
fi |
232 |
|
233 |
if use X; then |
234 |
myconf="${myconf} --with-x" |
235 |
myconf="${myconf} $(use_with gconf)" |
236 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
237 |
myconf="${myconf} $(use_with gif) $(use_with jpeg)" |
238 |
myconf="${myconf} $(use_with png) $(use_with svg rsvg)" |
239 |
myconf="${myconf} $(use_with tiff) $(use_with xpm)" |
240 |
myconf="${myconf} $(use_with xft)" |
241 |
|
242 |
if use xft; then |
243 |
myconf="${myconf} $(use_with m17n-lib libotf)" |
244 |
myconf="${myconf} $(use_with m17n-lib m17n-flt)" |
245 |
else |
246 |
myconf="${myconf} --without-libotf --without-m17n-flt" |
247 |
use m17n-lib && ewarn \ |
248 |
"USE flag \"m17n-lib\" has no effect because xft is not set." |
249 |
fi |
250 |
|
251 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
252 |
# possibilities. Emacs upstream thinks this should be standard |
253 |
# policy on all distributions |
254 |
if use gtk; then |
255 |
einfo "Configuring to build with GIMP Toolkit (GTK+)" |
256 |
myconf="${myconf} --with-x-toolkit=gtk" |
257 |
elif use Xaw3d; then |
258 |
einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" |
259 |
myconf="${myconf} --with-x-toolkit=athena" |
260 |
elif use motif; then |
261 |
einfo "Configuring to build with Motif toolkit" |
262 |
myconf="${myconf} --with-x-toolkit=motif" |
263 |
else |
264 |
einfo "Configuring to build with no toolkit" |
265 |
myconf="${myconf} --with-x-toolkit=no" |
266 |
fi |
267 |
|
268 |
local f tk= |
269 |
for f in gtk Xaw3d motif; do |
270 |
use ${f} || continue |
271 |
[ "${tk}" ] \ |
272 |
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
273 |
tk="${tk}${tk:+ }${f}" |
274 |
done |
275 |
else |
276 |
myconf="${myconf} --without-x" |
277 |
fi |
278 |
|
279 |
myconf="${myconf} $(use_with hesiod)" |
280 |
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" |
281 |
myconf="${myconf} $(use_with gpm) $(use_with dbus)" |
282 |
|
283 |
econf \ |
284 |
--program-suffix=-${EMACS_SUFFIX} \ |
285 |
--infodir=/usr/share/info/${EMACS_SUFFIX} \ |
286 |
${myconf} || die "econf emacs failed" |
287 |
} |
288 |
|
289 |
src_compile() { |
290 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
291 |
if [ "${PV##*.}" = "9999" ]; then |
292 |
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
293 |
# cleanup, otherwise emacs will be dumped again in src_install |
294 |
(cd src; emake versionclean) |
295 |
fi |
296 |
emake CC="$(tc-getCC)" || die "emake failed" |
297 |
} |
298 |
|
299 |
src_install () { |
300 |
local i m |
301 |
|
302 |
emake install DESTDIR="${D}" || die "make install failed" |
303 |
|
304 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
305 |
|| die "removing duplicate emacs executable failed" |
306 |
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ |
307 |
|| die "moving Emacs executable failed" |
308 |
|
309 |
# move info documentation to the correct place |
310 |
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do |
311 |
mv "${i}" "${i}.info" || die "mv info failed" |
312 |
done |
313 |
|
314 |
# move man pages to the correct place |
315 |
for m in "${D}"/usr/share/man/man1/* ; do |
316 |
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" |
317 |
done |
318 |
|
319 |
# avoid collision between slots, see bug #169033 e.g. |
320 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
321 |
rm -rf "${D}"/usr/share/{applications,icons} |
322 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
323 |
keepdir /var/lib/games/emacs |
324 |
|
325 |
local c=";;" |
326 |
if use source; then |
327 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
328 |
# This is not meant to install all the source -- just the |
329 |
# C source you might find via find-function |
330 |
doins src/*.[ch] |
331 |
c="" |
332 |
fi |
333 |
|
334 |
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF |
335 |
X |
336 |
;;; ${PN}-${SLOT} site-lisp configuration |
337 |
X |
338 |
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
339 |
X ${c}(setq find-function-C-source-directory |
340 |
X ${c} "/usr/share/emacs/${FULL_VERSION}/src") |
341 |
X (let ((path (getenv "INFOPATH")) |
342 |
X (dir "/usr/share/info/${EMACS_SUFFIX}") |
343 |
X (re "\\\\\`/usr/share/info\\\\>")) |
344 |
X (and path |
345 |
X ;; move Emacs Info dir before anything else in /usr/share/info |
346 |
X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
347 |
X (while (and (cdr q) (not (string-match re (cadr q)))) |
348 |
X (setq q (cdr q))) |
349 |
X (setcdr q (cons dir (delete dir (cdr q)))) |
350 |
X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
351 |
EOF |
352 |
elisp-site-file-install "${T}/${SITEFILE}" || die |
353 |
|
354 |
dodoc README BUGS || die "dodoc failed" |
355 |
} |
356 |
|
357 |
emacs-infodir-rebuild() { |
358 |
# Depending on the Portage version, the Info dir file is compressed |
359 |
# or removed. It is only rebuilt by Portage if our directory is in |
360 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
361 |
|
362 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
363 |
[ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
364 |
einfo "Regenerating Info directory index in ${infodir} ..." |
365 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
366 |
for f in "${ROOT}"${infodir}/*.info*; do |
367 |
[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
368 |
&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
369 |
done |
370 |
rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
371 |
} |
372 |
|
373 |
pkg_postinst() { |
374 |
local f |
375 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
376 |
[ -e "${f}" ] || touch "${f}" |
377 |
done |
378 |
chown games:games "${ROOT}"/var/lib/games/emacs |
379 |
|
380 |
elisp-site-regen |
381 |
emacs-infodir-rebuild |
382 |
eselect emacs update ifunset |
383 |
|
384 |
if use X; then |
385 |
echo |
386 |
elog "You need to install some fonts for Emacs." |
387 |
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" |
388 |
elog "machine would satisfy basic Emacs requirements under X11." |
389 |
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" |
390 |
elog "for how to enable anti-aliased fonts." |
391 |
fi |
392 |
|
393 |
echo |
394 |
elog "You can set the version to be started by /usr/bin/emacs through" |
395 |
elog "the Emacs eselect module, which also redirects man and info pages." |
396 |
elog "Therefore, several Emacs versions can be installed at the same time." |
397 |
elog "\"man emacs.eselect\" for details." |
398 |
echo |
399 |
elog "If you upgrade from a previous major version of Emacs, then it is" |
400 |
elog "strongly recommended that you use app-admin/emacs-updater to rebuild" |
401 |
elog "all byte-compiled elisp files of the installed Emacs packages." |
402 |
} |
403 |
|
404 |
pkg_postrm() { |
405 |
elisp-site-regen |
406 |
emacs-infodir-rebuild |
407 |
eselect emacs update ifunset |
408 |
} |