1 |
commit: d988e57a22d2ed5d81e38db61ca00d46b8246bbe |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 30 18:37:52 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 30 18:40:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d988e57a |
7 |
|
8 |
app-editors/emacs: Slot 23 stable. |
9 |
|
10 |
This was merely a bump to EAPI 7 and should have gone straight to |
11 |
stable immediately. |
12 |
|
13 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
14 |
|
15 |
app-editors/emacs/emacs-23.4-r17.ebuild | 367 -------------------------------- |
16 |
app-editors/emacs/emacs-23.4-r18.ebuild | 2 +- |
17 |
2 files changed, 1 insertion(+), 368 deletions(-) |
18 |
|
19 |
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild |
20 |
deleted file mode 100644 |
21 |
index 82d3ed24554..00000000000 |
22 |
--- a/app-editors/emacs/emacs-23.4-r17.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,367 +0,0 @@ |
25 |
-# Copyright 1999-2018 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=6 |
29 |
-WANT_AUTOMAKE="none" |
30 |
- |
31 |
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
32 |
- |
33 |
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
34 |
-HOMEPAGE="https://www.gnu.org/software/emacs/" |
35 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 |
36 |
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-21.tar.xz" |
37 |
- |
38 |
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
39 |
-SLOT="23" |
40 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
41 |
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
42 |
-REQUIRED_USE="?? ( aqua X )" |
43 |
- |
44 |
-RDEPEND="sys-libs/ncurses:0= |
45 |
- >=app-eselect/eselect-emacs-1.16 |
46 |
- >=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
47 |
- net-libs/liblockfile |
48 |
- kerberos? ( virtual/krb5 ) |
49 |
- alsa? ( media-libs/alsa-lib ) |
50 |
- gpm? ( sys-libs/gpm ) |
51 |
- dbus? ( sys-apps/dbus ) |
52 |
- X? ( |
53 |
- x11-libs/libICE |
54 |
- x11-libs/libSM |
55 |
- x11-libs/libX11 |
56 |
- x11-misc/xbitmaps |
57 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
58 |
- gif? ( media-libs/giflib:0= ) |
59 |
- jpeg? ( virtual/jpeg:0= ) |
60 |
- png? ( >=media-libs/libpng-1.4:0= ) |
61 |
- svg? ( >=gnome-base/librsvg-2.0 ) |
62 |
- tiff? ( media-libs/tiff:0 ) |
63 |
- xpm? ( x11-libs/libXpm ) |
64 |
- xft? ( |
65 |
- media-libs/fontconfig |
66 |
- media-libs/freetype |
67 |
- x11-libs/libXft |
68 |
- x11-libs/libXrender |
69 |
- m17n-lib? ( |
70 |
- >=dev-libs/libotf-0.9.4 |
71 |
- >=dev-libs/m17n-lib-1.5.1 |
72 |
- ) |
73 |
- ) |
74 |
- gtk? ( x11-libs/gtk+:2 ) |
75 |
- !gtk? ( |
76 |
- motif? ( |
77 |
- >=x11-libs/motif-2.3:0 |
78 |
- x11-libs/libXpm |
79 |
- x11-libs/libXext |
80 |
- x11-libs/libXmu |
81 |
- x11-libs/libXt |
82 |
- ) |
83 |
- !motif? ( |
84 |
- Xaw3d? ( |
85 |
- x11-libs/libXaw3d |
86 |
- x11-libs/libXext |
87 |
- x11-libs/libXmu |
88 |
- x11-libs/libXt |
89 |
- ) |
90 |
- !Xaw3d? ( athena? ( |
91 |
- x11-libs/libXaw |
92 |
- x11-libs/libXext |
93 |
- x11-libs/libXmu |
94 |
- x11-libs/libXt |
95 |
- ) ) |
96 |
- ) |
97 |
- ) |
98 |
- )" |
99 |
- |
100 |
-DEPEND="${RDEPEND} |
101 |
- alsa? ( virtual/pkgconfig ) |
102 |
- dbus? ( virtual/pkgconfig ) |
103 |
- X? ( |
104 |
- virtual/pkgconfig |
105 |
- x11-base/xorg-proto |
106 |
- ) |
107 |
- gzip-el? ( app-arch/gzip )" |
108 |
-# pax_kernel? ( sys-apps/attr ) |
109 |
- |
110 |
-RDEPEND="${RDEPEND} |
111 |
- !<app-editors/emacs-vcs-${PV}" |
112 |
- |
113 |
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
114 |
-SITEFILE="20${PN}-${SLOT}-gentoo.el" |
115 |
-# FULL_VERSION keeps the full version number, which is needed in |
116 |
-# order to determine some path information correctly for copy/move |
117 |
-# operations later on |
118 |
-FULL_VERSION="${PV%%_*}" |
119 |
-S="${WORKDIR}/emacs-${FULL_VERSION}" |
120 |
- |
121 |
-src_prepare() { |
122 |
- eapply ../patch |
123 |
- eapply_user |
124 |
- |
125 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
126 |
- || die "unable to sed ctags.1" |
127 |
- |
128 |
- if ! use alsa; then |
129 |
- # ALSA is detected even if not requested by its USE flag. |
130 |
- # Suppress it by supplying pkg-config with a wrong library name. |
131 |
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ |
132 |
- || die "unable to sed configure.in" |
133 |
- fi |
134 |
- if ! use gzip-el; then |
135 |
- # Emacs' build system automatically detects the gzip binary and |
136 |
- # compresses el files. We don't want that so confuse it with a |
137 |
- # wrong binary name |
138 |
- sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
139 |
- || die "unable to sed configure.in" |
140 |
- fi |
141 |
- |
142 |
- mv configure.in configure.ac || die |
143 |
- eautoreconf |
144 |
- touch src/stamp-h.in || die |
145 |
-} |
146 |
- |
147 |
-src_configure() { |
148 |
- strip-flags |
149 |
- filter-flags -fstrict-aliasing -pie |
150 |
- append-flags $(test-flags -fno-strict-aliasing) |
151 |
- append-ldflags $(test-flags -no-pie) #639568 |
152 |
- |
153 |
- if use sh; then |
154 |
- replace-flags "-O[1-9]" -O0 #262359 |
155 |
- elif use ia64; then |
156 |
- replace-flags "-O[2-9]" -O1 #325373 |
157 |
- else |
158 |
- replace-flags "-O[3-9]" -O2 |
159 |
- fi |
160 |
- |
161 |
- # Don't trigger a floating point exception for NaNs on alpha |
162 |
- use alpha && append-flags -mieee |
163 |
- |
164 |
- local myconf |
165 |
- |
166 |
- if use alsa && ! use sound; then |
167 |
- einfo "Although sound USE flag is disabled you chose to have alsa," |
168 |
- einfo "so sound is switched on anyway." |
169 |
- myconf+=" --with-sound" |
170 |
- else |
171 |
- myconf+=" $(use_with sound)" |
172 |
- fi |
173 |
- |
174 |
- if use X; then |
175 |
- myconf+=" --with-x --without-ns" |
176 |
- myconf+=" $(use_with gconf)" |
177 |
- myconf+=" $(use_with toolkit-scroll-bars)" |
178 |
- myconf+=" $(use_with gif)" |
179 |
- myconf+=" $(use_with jpeg)" |
180 |
- myconf+=" $(use_with png)" |
181 |
- myconf+=" $(use_with svg rsvg)" |
182 |
- myconf+=" $(use_with tiff)" |
183 |
- myconf+=" $(use_with xpm)" |
184 |
- |
185 |
- if use xft; then |
186 |
- myconf+=" --with-xft" |
187 |
- myconf+=" $(use_with m17n-lib libotf)" |
188 |
- myconf+=" $(use_with m17n-lib m17n-flt)" |
189 |
- else |
190 |
- myconf+=" --without-xft" |
191 |
- myconf+=" --without-libotf --without-m17n-flt" |
192 |
- use m17n-lib && ewarn \ |
193 |
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
194 |
- fi |
195 |
- |
196 |
- # GTK+ is the default toolkit if USE=gtk is chosen with other |
197 |
- # possibilities. Emacs upstream thinks this should be standard |
198 |
- # policy on all distributions |
199 |
- local f |
200 |
- if use gtk; then |
201 |
- einfo "Configuring to build with GIMP Toolkit (GTK+)" |
202 |
- myconf+=" --with-x-toolkit=gtk" |
203 |
- for f in motif Xaw3d athena; do |
204 |
- use ${f} && ewarn \ |
205 |
- "USE flag \"${f}\" has no effect if \"gtk\" is set." |
206 |
- done |
207 |
- elif use motif; then |
208 |
- einfo "Configuring to build with Motif toolkit" |
209 |
- myconf+=" --with-x-toolkit=motif" |
210 |
- for f in Xaw3d athena; do |
211 |
- use ${f} && ewarn \ |
212 |
- "USE flag \"${f}\" has no effect if \"motif\" is set." |
213 |
- done |
214 |
- elif use athena || use Xaw3d; then |
215 |
- einfo "Configuring to build with Athena/Lucid toolkit" |
216 |
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
217 |
- else |
218 |
- einfo "Configuring to build with no toolkit" |
219 |
- myconf+=" --with-x-toolkit=no" |
220 |
- fi |
221 |
- elif use aqua; then |
222 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
223 |
- myconf+=" --with-ns --disable-ns-self-contained" |
224 |
- myconf+=" --without-x" |
225 |
- else |
226 |
- myconf+=" --without-x --without-ns" |
227 |
- fi |
228 |
- |
229 |
- # According to configure, this option is only used for GNU/Linux |
230 |
- # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell |
231 |
- # out the location because $(get_libdir) does not necessarily return |
232 |
- # something that matches the host OS's libdir naming (e.g. RHEL). |
233 |
- local crtdir=$($(tc-getCC) -print-file-name=crt1.o) |
234 |
- crtdir=${crtdir%/*} |
235 |
- |
236 |
- econf \ |
237 |
- --program-suffix="-${EMACS_SUFFIX}" \ |
238 |
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
239 |
- --localstatedir="${EPREFIX}"/var \ |
240 |
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
241 |
- --with-crt-dir="${crtdir}" \ |
242 |
- --with-gameuser=":gamestat" \ |
243 |
- --without-hesiod \ |
244 |
- $(use_with kerberos) $(use_with kerberos kerberos5) \ |
245 |
- $(use_with gpm) \ |
246 |
- $(use_with dbus) \ |
247 |
- ${myconf} |
248 |
-} |
249 |
- |
250 |
-src_compile() { |
251 |
- # Disable sandbox when dumping. For the unbelievers, see bug #131505 |
252 |
- emake CC="$(tc-getCC)" \ |
253 |
- AR="$(tc-getAR) cq" \ |
254 |
- RANLIB="$(tc-getRANLIB)" \ |
255 |
- RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" |
256 |
-} |
257 |
- |
258 |
-src_install () { |
259 |
- emake DESTDIR="${D}" install |
260 |
- |
261 |
- rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
262 |
- || die "removing duplicate emacs executable failed" |
263 |
- mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ |
264 |
- || die "moving emacs executable failed" |
265 |
- |
266 |
- # move man pages to the correct place |
267 |
- local m |
268 |
- mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \ |
269 |
- || die "moving emacs man page failed" |
270 |
- for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do |
271 |
- mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \ |
272 |
- || die "moving ${m} man page failed" |
273 |
- done |
274 |
- |
275 |
- # move info dir to avoid collisions with the dir file generated by portage |
276 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
277 |
- || die "moving info dir failed" |
278 |
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
279 |
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
280 |
- |
281 |
- # avoid collision between slots, see bug #169033 e.g. |
282 |
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
283 |
- rm -rf "${ED}"/usr/share/{applications,icons} |
284 |
- rm -rf "${ED}"/var |
285 |
- |
286 |
- # remove unused <version>/site-lisp dir |
287 |
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
288 |
- |
289 |
- # remove COPYING file (except for etc/COPYING used by describe-copying) |
290 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
291 |
- |
292 |
- local cdir |
293 |
- if use source; then |
294 |
- cdir="/usr/share/emacs/${FULL_VERSION}/src" |
295 |
- insinto "${cdir}" |
296 |
- # This is not meant to install all the source -- just the |
297 |
- # C source you might find via find-function |
298 |
- doins src/*.{c,h,m} |
299 |
- doins -r src/{m,s} |
300 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c |
301 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README |
302 |
- elif has installsources ${FEATURES}; then |
303 |
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
304 |
- fi |
305 |
- |
306 |
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die |
307 |
- X |
308 |
- ;;; ${PN}-${SLOT} site-lisp configuration |
309 |
- X |
310 |
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
311 |
- Y (setq find-function-C-source-directory |
312 |
- Y "${EPREFIX}${cdir}") |
313 |
- X (let ((path (getenv "INFOPATH")) |
314 |
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
315 |
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
316 |
- X (and path |
317 |
- X ;; move Emacs Info dir before anything else in /usr/share/info |
318 |
- X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
319 |
- X (while (and (cdr q) (not (string-match re (cadr q)))) |
320 |
- X (setq q (cdr q))) |
321 |
- X (setcdr q (cons dir (delete dir (cdr q)))) |
322 |
- X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
323 |
- EOF |
324 |
- elisp-site-file-install "${T}/${SITEFILE}" || die |
325 |
- |
326 |
- dodoc README BUGS |
327 |
- |
328 |
- if use aqua; then |
329 |
- dodir /Applications/Gentoo |
330 |
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app |
331 |
- mv nextstep/Emacs.app \ |
332 |
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die |
333 |
- fi |
334 |
- |
335 |
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs |
336 |
- through the Emacs eselect module, which also redirects man and info |
337 |
- pages. Therefore, several Emacs versions can be installed at the |
338 |
- same time. \"man emacs.eselect\" for details. |
339 |
- \\n\\nIf you upgrade from a previous major version of Emacs, then |
340 |
- it is strongly recommended that you use app-admin/emacs-updater |
341 |
- to rebuild all byte-compiled elisp files of the installed Emacs |
342 |
- packages." |
343 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
344 |
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
345 |
- machine would satisfy basic Emacs requirements under X11. |
346 |
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
347 |
- for how to enable anti-aliased fonts." |
348 |
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
349 |
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
350 |
- it into /Applications by yourself." |
351 |
- readme.gentoo_create_doc |
352 |
-} |
353 |
- |
354 |
-pkg_preinst() { |
355 |
- # move Info dir file to correct name |
356 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
357 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
358 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
359 |
- elif [[ -d "${ED}"${infodir} ]]; then |
360 |
- # this should not happen in EAPI 4 |
361 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
362 |
- rm -f "${ED}"${infodir}/dir{,.*} |
363 |
- for f in "${ED}"${infodir}/*; do |
364 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
365 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
366 |
- || die "install-info failed" |
367 |
- fi |
368 |
- done |
369 |
- fi |
370 |
-} |
371 |
- |
372 |
-pkg_postinst() { |
373 |
- elisp-site-regen |
374 |
- readme.gentoo_print_elog |
375 |
- |
376 |
- if use livecd; then |
377 |
- # force an update of the emacs symlink for the livecd/dvd, |
378 |
- # because some microemacs packages set it with USE=livecd |
379 |
- eselect emacs update |
380 |
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
381 |
- # refresh symlinks in case any installed files have changed |
382 |
- eselect emacs set ${EMACS_SUFFIX} |
383 |
- else |
384 |
- eselect emacs update ifunset |
385 |
- fi |
386 |
-} |
387 |
- |
388 |
-pkg_postrm() { |
389 |
- elisp-site-regen |
390 |
- eselect emacs update ifunset |
391 |
-} |
392 |
|
393 |
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild |
394 |
index dca287c47b0..f662dbb65db 100644 |
395 |
--- a/app-editors/emacs/emacs-23.4-r18.ebuild |
396 |
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild |
397 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 |
398 |
|
399 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
400 |
SLOT="23" |
401 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
402 |
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
403 |
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
404 |
REQUIRED_USE="?? ( aqua X )" |