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: ChangeLog emacs-22.3-r9.ebuild emacs-23.4-r1.ebuild metadata.xml emacs-23.4-r2.ebuild emacs-24.1_rc.ebuild
Date: Fri, 01 Jun 2012 17:12:19
Message-Id: 20120601171208.ADB2B2004B@flycatcher.gentoo.org
1 ulm 12/06/01 17:12:08
2
3 Modified: ChangeLog emacs-22.3-r9.ebuild emacs-23.4-r1.ebuild
4 metadata.xml emacs-23.4-r2.ebuild
5 Added: emacs-24.1_rc.ebuild
6 Log:
7 Version bump, release candidate for Emacs 24.1. Drop ~sparc-fbsd keyword.
8
9 (Portage version: 2.1.10.63/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.491 app-editors/emacs/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.491&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.491&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.490&r2=1.491
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
21 retrieving revision 1.490
22 retrieving revision 1.491
23 diff -u -r1.490 -r1.491
24 --- ChangeLog 31 May 2012 22:22:54 -0000 1.490
25 +++ ChangeLog 1 Jun 2012 17:12:08 -0000 1.491
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-editors/emacs
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.490 2012/05/31 22:22:54 zmedico Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.491 2012/06/01 17:12:08 ulm Exp $
31 +
32 +*emacs-24.1_rc (01 Jun 2012)
33 +
34 + 01 Jun 2012; Ulrich Müller <ulm@g.o> emacs-22.3-r9.ebuild,
35 + emacs-23.4-r1.ebuild, emacs-23.4-r2.ebuild, +emacs-24.1_rc.ebuild,
36 + metadata.xml:
37 + Version bump, release candidate for Emacs 24.1. Drop ~sparc-fbsd keyword.
38
39 31 May 2012; Zac Medico <zmedico@g.o> emacs-21.4-r24.ebuild:
40 inherit multilib for get_libdir
41
42
43
44 1.6 app-editors/emacs/emacs-22.3-r9.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild?rev=1.6&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild?rev=1.6&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild?r1=1.5&r2=1.6
49
50 Index: emacs-22.3-r9.ebuild
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild,v
53 retrieving revision 1.5
54 retrieving revision 1.6
55 diff -u -r1.5 -r1.6
56 --- emacs-22.3-r9.ebuild 24 May 2012 21:12:49 -0000 1.5
57 +++ emacs-22.3-r9.ebuild 1 Jun 2012 17:12:08 -0000 1.6
58 @@ -1,6 +1,6 @@
59 # Copyright 1999-2012 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild,v 1.5 2012/05/24 21:12:49 ulm Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild,v 1.6 2012/06/01 17:12:08 ulm Exp $
63
64 EAPI=4
65 WANT_AUTOMAKE="none"
66 @@ -14,7 +14,7 @@
67
68 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
69 SLOT="22"
70 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
71 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
72 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
73
74 RDEPEND="sys-libs/ncurses
75
76
77
78 1.14 app-editors/emacs/emacs-23.4-r1.ebuild
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild?rev=1.14&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild?rev=1.14&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild?r1=1.13&r2=1.14
83
84 Index: emacs-23.4-r1.ebuild
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v
87 retrieving revision 1.13
88 retrieving revision 1.14
89 diff -u -r1.13 -r1.14
90 --- emacs-23.4-r1.ebuild 24 May 2012 21:12:49 -0000 1.13
91 +++ emacs-23.4-r1.ebuild 1 Jun 2012 17:12:08 -0000 1.14
92 @@ -1,6 +1,6 @@
93 # Copyright 1999-2012 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v 1.13 2012/05/24 21:12:49 ulm Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v 1.14 2012/06/01 17:12:08 ulm Exp $
97
98 EAPI=4
99 WANT_AUTOMAKE="none"
100 @@ -14,7 +14,7 @@
101
102 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
103 SLOT="23"
104 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
105 +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
106 IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
107 REQUIRED_USE="aqua? ( !X )"
108
109
110
111
112 1.11 app-editors/emacs/metadata.xml
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/metadata.xml?rev=1.11&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/metadata.xml?rev=1.11&content-type=text/plain
116 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/metadata.xml?r1=1.10&r2=1.11
117
118 Index: metadata.xml
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/metadata.xml,v
121 retrieving revision 1.10
122 retrieving revision 1.11
123 diff -u -r1.10 -r1.11
124 --- metadata.xml 26 May 2012 16:11:19 -0000 1.10
125 +++ metadata.xml 1 Jun 2012 17:12:08 -0000 1.11
126 @@ -21,13 +21,24 @@
127 (<pkg>x11-libs/libXaw</pkg>)</flag>
128 <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
129 font name</flag>
130 + <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
131 + system font name</flag>
132 + <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
133 + version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
134 <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
135 <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
136 + <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
137 + processing</flag>
138 <flag name='leim'>Add support for Emacs input methods</flag>
139 + <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
140 + of the internal Lisp implementations</flag>
141 <flag name='pax_kernel'>Enable building under a PaX enabled kernel
142 (<pkg>sys-apps/paxctl</pkg>)</flag>
143 <flag name='sendmail'>Build Emacs with MTA support</flag>
144 <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
145 preference to Emacs' own scrollbars</flag>
146 + <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
147 + This option has an effect only on architectures where "long" and
148 + "long long" types have different size.</flag>
149 </use>
150 </pkgmetadata>
151
152
153
154 1.2 app-editors/emacs/emacs-23.4-r2.ebuild
155
156 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild?rev=1.2&view=markup
157 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild?rev=1.2&content-type=text/plain
158 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild?r1=1.1&r2=1.2
159
160 Index: emacs-23.4-r2.ebuild
161 ===================================================================
162 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild,v
163 retrieving revision 1.1
164 retrieving revision 1.2
165 diff -u -r1.1 -r1.2
166 --- emacs-23.4-r2.ebuild 26 May 2012 16:11:19 -0000 1.1
167 +++ emacs-23.4-r2.ebuild 1 Jun 2012 17:12:08 -0000 1.2
168 @@ -1,6 +1,6 @@
169 # Copyright 1999-2012 Gentoo Foundation
170 # Distributed under the terms of the GNU General Public License v2
171 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild,v 1.1 2012/05/26 16:11:19 ulm Exp $
172 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild,v 1.2 2012/06/01 17:12:08 ulm Exp $
173
174 EAPI=4
175 WANT_AUTOMAKE="none"
176 @@ -14,7 +14,7 @@
177
178 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
179 SLOT="23"
180 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
181 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
182 IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
183 REQUIRED_USE="aqua? ( !X )"
184
185
186
187
188 1.1 app-editors/emacs/emacs-24.1_rc.ebuild
189
190 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.1_rc.ebuild?rev=1.1&view=markup
191 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.1_rc.ebuild?rev=1.1&content-type=text/plain
192
193 Index: emacs-24.1_rc.ebuild
194 ===================================================================
195 # Copyright 1999-2012 Gentoo Foundation
196 # Distributed under the terms of the GNU General Public License v2
197 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1_rc.ebuild,v 1.1 2012/06/01 17:12:08 ulm Exp $
198
199 EAPI=4
200
201 inherit autotools elisp-common eutils flag-o-matic multilib
202
203 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
204 HOMEPAGE="http://www.gnu.org/software/emacs/"
205 SRC_URI="mirror://gnu-alpha/emacs/pretest/${P/_/-}.tar.gz
206 mirror://gentoo/${P}-patches-1.tar.bz2"
207
208 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
209 SLOT="24"
210 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
211 IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
212 REQUIRED_USE="aqua? ( !X )"
213
214 RDEPEND="sys-libs/ncurses
215 >=app-admin/eselect-emacs-1.2
216 net-libs/liblockfile
217 hesiod? ( net-dns/hesiod )
218 kerberos? ( virtual/krb5 )
219 alsa? ( media-libs/alsa-lib )
220 gpm? ( sys-libs/gpm )
221 dbus? ( sys-apps/dbus )
222 gnutls? ( net-libs/gnutls )
223 libxml2? ( >=dev-libs/libxml2-2.2.0 )
224 selinux? ( sys-libs/libselinux )
225 X? (
226 x11-libs/libXmu
227 x11-libs/libXt
228 x11-misc/xbitmaps
229 gconf? ( >=gnome-base/gconf-2.26.2 )
230 gsettings? ( >=dev-libs/glib-2.28.6 )
231 gif? ( media-libs/giflib )
232 jpeg? ( virtual/jpeg )
233 png? ( >=media-libs/libpng-1.4:0 )
234 svg? ( >=gnome-base/librsvg-2.0 )
235 tiff? ( media-libs/tiff )
236 xpm? ( x11-libs/libXpm )
237 imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
238 xft? (
239 media-libs/fontconfig
240 media-libs/freetype
241 x11-libs/libXft
242 m17n-lib? (
243 >=dev-libs/libotf-0.9.4
244 >=dev-libs/m17n-lib-1.5.1
245 )
246 )
247 gtk? (
248 gtk3? ( x11-libs/gtk+:3 )
249 !gtk3? ( x11-libs/gtk+:2 )
250 )
251 !gtk? (
252 Xaw3d? ( x11-libs/libXaw3d )
253 !Xaw3d? (
254 athena? ( x11-libs/libXaw )
255 !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
256 )
257 )
258 )"
259
260 DEPEND="${RDEPEND}
261 alsa? ( virtual/pkgconfig )
262 dbus? ( virtual/pkgconfig )
263 gnutls? ( virtual/pkgconfig )
264 libxml2? ( virtual/pkgconfig )
265 X? ( virtual/pkgconfig )
266 gzip-el? ( app-arch/gzip )
267 pax_kernel? ( sys-apps/paxctl )"
268
269 RDEPEND="${RDEPEND}
270 !<app-editors/emacs-vcs-24.1.9999-r1
271 >=app-emacs/emacs-common-gentoo-1.3[X?]"
272
273 EMACS_SUFFIX="emacs-${SLOT}"
274 SITEFILE="20${PN}-${SLOT}-gentoo.el"
275 # FULL_VERSION keeps the full version number, which is needed in
276 # order to determine some path information correctly for copy/move
277 # operations later on
278 FULL_VERSION="${PV%%_*}"
279 S="${WORKDIR}/emacs-${FULL_VERSION}"
280
281 src_prepare() {
282 EPATCH_SUFFIX=patch epatch
283 epatch_user
284
285 if ! use alsa; then
286 # ALSA is detected even if not requested by its USE flag.
287 # Suppress it by supplying pkg-config with a wrong library name.
288 sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
289 || die "unable to sed configure.in"
290 fi
291 if ! use gzip-el; then
292 # Emacs' build system automatically detects the gzip binary and
293 # compresses el files. We don't want that so confuse it with a
294 # wrong binary name
295 sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
296 || die "unable to sed configure.in"
297 fi
298
299 AT_M4DIR=m4 eautoreconf
300 }
301
302 src_configure() {
303 strip-flags
304
305 if use sh; then
306 replace-flags "-O[1-9]" -O0 #262359
307 elif use ia64; then
308 replace-flags "-O[2-9]" -O1 #325373
309 else
310 replace-flags "-O[3-9]" -O2
311 fi
312
313 local myconf
314
315 if use alsa && ! use sound; then
316 einfo "Although sound USE flag is disabled you chose to have alsa,"
317 einfo "so sound is switched on anyway."
318 myconf="${myconf} --with-sound"
319 else
320 myconf="${myconf} $(use_with sound)"
321 fi
322
323 if use X; then
324 myconf="${myconf} --with-x --without-ns"
325 myconf="${myconf} $(use_with gconf)"
326 myconf="${myconf} $(use_with gsettings)"
327 myconf="${myconf} $(use_with toolkit-scroll-bars)"
328 myconf="${myconf} $(use_with wide-int)"
329 myconf="${myconf} $(use_with gif) $(use_with jpeg)"
330 myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
331 myconf="${myconf} $(use_with tiff) $(use_with xpm)"
332 myconf="${myconf} $(use_with imagemagick)"
333
334 if use xft; then
335 myconf="${myconf} --with-xft"
336 myconf="${myconf} $(use_with m17n-lib libotf)"
337 myconf="${myconf} $(use_with m17n-lib m17n-flt)"
338 else
339 myconf="${myconf} --without-xft"
340 myconf="${myconf} --without-libotf --without-m17n-flt"
341 use m17n-lib && ewarn \
342 "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
343 fi
344
345 if use gtk; then
346 einfo "Configuring to build with GIMP Toolkit (GTK+)"
347 myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
348 local f
349 for f in athena Xaw3d motif; do
350 use ${f} && ewarn "USE flag \"${f}\" ignored" \
351 "(superseded by \"gtk\")"
352 done
353 elif use athena || use Xaw3d; then
354 einfo "Configuring to build with Athena/Lucid toolkit"
355 myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
356 use motif && ewarn "USE flag \"motif\" ignored" \
357 "(superseded by \"athena\" or \"Xaw3d\")"
358 elif use motif; then
359 einfo "Configuring to build with Motif toolkit"
360 myconf="${myconf} --with-x-toolkit=motif"
361 else
362 einfo "Configuring to build with no toolkit"
363 myconf="${myconf} --with-x-toolkit=no"
364 fi
365
366 ! use gtk && use gtk3 \
367 && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
368 elif use aqua; then
369 einfo "Configuring to build with Cocoa support"
370 myconf="${myconf} --with-ns --disable-ns-self-contained"
371 myconf="${myconf} --without-x"
372 else
373 myconf="${myconf} --without-x --without-ns"
374 fi
375
376 # According to configure, this option is only used for GNU/Linux
377 # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
378 # out the location because $(get_libdir) does not necessarily return
379 # something that matches the host OS's libdir naming (e.g. RHEL).
380 local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
381 crtdir=${crtdir%/*}
382
383 econf \
384 --program-suffix=-${EMACS_SUFFIX} \
385 --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
386 --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
387 --with-crt-dir="${crtdir}" \
388 --with-gameuser="${GAMES_USER_DED:-games}" \
389 --without-compress-info \
390 --disable-maintainer-mode \
391 $(use_with hesiod) \
392 $(use_with kerberos) $(use_with kerberos kerberos5) \
393 $(use_with gpm) \
394 $(use_with dbus) \
395 $(use_with gnutls) \
396 $(use_with libxml2 xml2) \
397 $(use_with selinux) \
398 ${myconf}
399 }
400
401 src_compile() {
402 export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
403 # set last component of emacs-version to (package revision + 1)
404 touch src/emacs-${FULL_VERSION}.${PR#r}
405 emake CC="$(tc-getCC)"
406 }
407
408 src_install () {
409 emake install DESTDIR="${D}"
410
411 rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
412 || die "removing duplicate emacs executable failed"
413 mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
414 || die "moving Emacs executable failed"
415
416 # move man pages to the correct place
417 local m
418 for m in "${ED}"/usr/share/man/man1/* ; do
419 mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
420 done
421
422 # move info dir to avoid collisions with the dir file generated by portage
423 mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
424 || die "moving info dir failed"
425 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
426 docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
427
428 # avoid collision between slots, see bug #169033 e.g.
429 rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
430 rm -rf "${ED}"/usr/share/{applications,icons}
431 rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
432 keepdir /var/lib/games/emacs
433
434 # remove unused <version>/site-lisp dir
435 rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
436
437 local c=";;"
438 if use source; then
439 insinto /usr/share/emacs/${FULL_VERSION}/src
440 # This is not meant to install all the source -- just the
441 # C source you might find via find-function
442 doins src/*.{c,h,m}
443 doins -r src/{m,s}
444 rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
445 c=""
446 fi
447
448 sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
449 X
450 ;;; ${PN}-${SLOT} site-lisp configuration
451 X
452 (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
453 X ${c}(setq find-function-C-source-directory
454 X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
455 X (let ((path (getenv "INFOPATH"))
456 X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
457 X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
458 X (and path
459 X ;; move Emacs Info dir before anything else in /usr/share/info
460 X (let* ((p (cons nil (split-string path ":" t))) (q p))
461 X (while (and (cdr q) (not (string-match re (cadr q))))
462 X (setq q (cdr q)))
463 X (setcdr q (cons dir (delete dir (cdr q))))
464 X (setq Info-directory-list (prune-directory-list (cdr p)))))))
465 EOF
466 elisp-site-file-install "${T}/${SITEFILE}" || die
467
468 dodoc README BUGS
469
470 if use aqua; then
471 dodir /Applications/Gentoo
472 rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
473 mv nextstep/Emacs.app \
474 "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
475 elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
476 elog "You may want to copy or symlink it into /Applications by yourself."
477 fi
478 }
479
480 pkg_preinst() {
481 # move Info dir file to correct name
482 local infodir=/usr/share/info/${EMACS_SUFFIX} f
483 if [[ -f ${ED}${infodir}/dir.orig ]]; then
484 mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
485 elif [[ -d "${ED}"${infodir} ]]; then
486 # this should not happen in EAPI 4
487 ewarn "Regenerating Info directory index in ${infodir} ..."
488 rm -f "${ED}"${infodir}/dir{,.*}
489 for f in "${ED}"${infodir}/*; do
490 if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
491 install-info --info-dir="${ED}"${infodir} "${f}" \
492 || die "install-info failed"
493 fi
494 done
495 fi
496 }
497
498 pkg_postinst() {
499 local f
500 for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
501 [[ -e ${f} ]] || touch "${f}"
502 done
503 chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
504
505 elisp-site-regen
506
507 if use livecd; then
508 # force an update of the emacs symlink for the livecd/dvd,
509 # because some microemacs packages set it with USE=livecd
510 eselect emacs update
511 else
512 eselect emacs update ifunset
513 fi
514
515 if use X; then
516 elog "You need to install some fonts for Emacs."
517 elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
518 elog "machine would satisfy basic Emacs requirements under X11."
519 elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
520 elog "for how to enable anti-aliased fonts."
521 elog
522 fi
523
524 elog "You can set the version to be started by /usr/bin/emacs through"
525 elog "the Emacs eselect module, which also redirects man and info pages."
526 elog "Therefore, several Emacs versions can be installed at the same time."
527 elog "\"man emacs.eselect\" for details."
528 elog
529 elog "If you upgrade from a previous major version of Emacs, then it is"
530 elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
531 elog "all byte-compiled elisp files of the installed Emacs packages."
532 }
533
534 pkg_postrm() {
535 elisp-site-regen
536 eselect emacs update ifunset
537 }