1 |
commit: 34d70352d1e25613117aff022aae253a4ff15333 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 16:15:24 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 16:15:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=34d70352 |
7 |
|
8 |
app-editors/emacs: in tree version (probably) works |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
app-editors/emacs/Manifest | 3 - |
13 |
app-editors/emacs/emacs-24.5-r5.ebuild | 367 -------------------- |
14 |
app-editors/emacs/emacs-25.3-r1.ebuild | 371 --------------------- |
15 |
app-editors/emacs/emacs-25.3-r3.ebuild | 371 --------------------- |
16 |
.../files/emacs-24.3-alloc-invalid-frees.patch | 58 ---- |
17 |
app-editors/emacs/files/emacs-24.3-stderr.patch | 11 - |
18 |
app-editors/emacs/files/emacs-24.4-configure.patch | 10 - |
19 |
app-editors/emacs/files/emacs-24.4-lisp.patch | 10 - |
20 |
.../emacs/files/emacs-24.4-preload-hack.patch | 11 - |
21 |
app-editors/emacs/files/emacs-vcs-musl.patch | 89 ----- |
22 |
app-editors/emacs/files/preload.c | 88 ----- |
23 |
app-editors/emacs/metadata.xml | 52 --- |
24 |
12 files changed, 1441 deletions(-) |
25 |
|
26 |
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest |
27 |
deleted file mode 100644 |
28 |
index ffd77aa..0000000 |
29 |
--- a/app-editors/emacs/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,3 +0,0 @@ |
32 |
-DIST emacs-24.5-patches-4.tar.xz 13632 SHA256 3b2d7c2034711d114494745780b6521150aa0c524966cbaceeb8d4d053dcbdd3 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 WHIRLPOOL 1855ac4178faafcc2d86141e023ff2626246c87e7ff2e7bfbaf9a989e9a48d2767acb9f7af99924cd7db04d34913a42764490831b7b45a34bcd131999180ff28 |
33 |
-DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 |
34 |
-DIST emacs-25.3.tar.xz 42854740 SHA256 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f WHIRLPOOL 603ec6b203523a22556e48616b4a5ab227c32d3653ac4b713e6cb0357e3556964bc92a1818b417bbf9037cca7dac55935da9458dc3d29b3bb24d66157e74c8df |
35 |
|
36 |
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild |
37 |
deleted file mode 100644 |
38 |
index 48fb51c..0000000 |
39 |
--- a/app-editors/emacs/emacs-24.5-r5.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,367 +0,0 @@ |
42 |
-# Copyright 1999-2018 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=6 |
46 |
- |
47 |
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1 |
48 |
- |
49 |
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
50 |
-HOMEPAGE="https://www.gnu.org/software/emacs/" |
51 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
52 |
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz" |
53 |
- |
54 |
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
55 |
-SLOT="24" |
56 |
-KEYWORDS="amd64 arm arm64 ia64 ~mips ppc ~sh ~sparc x86" |
57 |
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
58 |
-REQUIRED_USE="?? ( aqua X )" |
59 |
- |
60 |
-RDEPEND="sys-libs/ncurses:0= |
61 |
- >=app-eselect/eselect-emacs-1.16 |
62 |
- >=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
63 |
- net-libs/liblockfile |
64 |
- acl? ( virtual/acl ) |
65 |
- alsa? ( media-libs/alsa-lib ) |
66 |
- dbus? ( sys-apps/dbus ) |
67 |
- gpm? ( sys-libs/gpm ) |
68 |
- !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) |
69 |
- kerberos? ( virtual/krb5 ) |
70 |
- libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
71 |
- selinux? ( sys-libs/libselinux ) |
72 |
- ssl? ( net-libs/gnutls:0= ) |
73 |
- zlib? ( sys-libs/zlib ) |
74 |
- X? ( |
75 |
- x11-libs/libICE |
76 |
- x11-libs/libSM |
77 |
- x11-libs/libX11 |
78 |
- x11-libs/libXext |
79 |
- x11-libs/libXinerama |
80 |
- x11-libs/libXrandr |
81 |
- x11-misc/xbitmaps |
82 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
83 |
- gsettings? ( >=dev-libs/glib-2.28.6 ) |
84 |
- gif? ( media-libs/giflib:0= ) |
85 |
- jpeg? ( virtual/jpeg:0= ) |
86 |
- png? ( >=media-libs/libpng-1.4:0= ) |
87 |
- svg? ( >=gnome-base/librsvg-2.0 ) |
88 |
- tiff? ( media-libs/tiff:0 ) |
89 |
- xpm? ( x11-libs/libXpm ) |
90 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
91 |
- xft? ( |
92 |
- media-libs/fontconfig |
93 |
- media-libs/freetype |
94 |
- x11-libs/libXft |
95 |
- x11-libs/libXrender |
96 |
- m17n-lib? ( |
97 |
- >=dev-libs/libotf-0.9.4 |
98 |
- >=dev-libs/m17n-lib-1.5.1 |
99 |
- ) |
100 |
- ) |
101 |
- gtk? ( |
102 |
- gtk3? ( x11-libs/gtk+:3 ) |
103 |
- !gtk3? ( x11-libs/gtk+:2 ) |
104 |
- ) |
105 |
- !gtk? ( |
106 |
- motif? ( |
107 |
- >=x11-libs/motif-2.3:0 |
108 |
- x11-libs/libXpm |
109 |
- x11-libs/libXmu |
110 |
- x11-libs/libXt |
111 |
- ) |
112 |
- !motif? ( |
113 |
- Xaw3d? ( |
114 |
- x11-libs/libXaw3d |
115 |
- x11-libs/libXmu |
116 |
- x11-libs/libXt |
117 |
- ) |
118 |
- !Xaw3d? ( athena? ( |
119 |
- x11-libs/libXaw |
120 |
- x11-libs/libXmu |
121 |
- x11-libs/libXt |
122 |
- ) ) |
123 |
- ) |
124 |
- ) |
125 |
- )" |
126 |
- |
127 |
-DEPEND="${RDEPEND} |
128 |
- virtual/pkgconfig |
129 |
- gzip-el? ( app-arch/gzip ) |
130 |
- pax_kernel? ( sys-apps/attr )" |
131 |
- |
132 |
-RDEPEND="${RDEPEND} |
133 |
- !<app-editors/emacs-vcs-${PV}" |
134 |
- |
135 |
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
136 |
-SITEFILE="20${PN}-${SLOT}-gentoo.el" |
137 |
-# FULL_VERSION keeps the full version number, which is needed in |
138 |
-# order to determine some path information correctly for copy/move |
139 |
-# operations later on |
140 |
-FULL_VERSION="${PV%%_*}" |
141 |
-S="${WORKDIR}/emacs-${FULL_VERSION}" |
142 |
- |
143 |
-src_prepare() { |
144 |
- eapply ../patch |
145 |
- |
146 |
- eapply "${FILESDIR}/${PN}-24.3-stderr.patch" |
147 |
- eapply "${FILESDIR}/${PN}-24.3-alloc-invalid-frees.patch" |
148 |
- eapply "${FILESDIR}/${PN}-24.4-configure.patch" |
149 |
- eapply "${FILESDIR}/${PN}-24.4-preload-hack.patch" |
150 |
- eapply "${FILESDIR}/${PN}-24.4-lisp.patch" |
151 |
- |
152 |
- eapply_user |
153 |
- |
154 |
- # Fix filename reference in redirected man page |
155 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
156 |
- || die "unable to sed ctags.1" |
157 |
- |
158 |
- AT_M4DIR=m4 eautoreconf |
159 |
- touch src/stamp-h.in || die |
160 |
-} |
161 |
- |
162 |
-src_configure() { |
163 |
- strip-flags |
164 |
- filter-flags -pie #526948 |
165 |
- append-ldflags $(test-flags -no-pie) #639570 |
166 |
- |
167 |
- if use sh; then |
168 |
- replace-flags "-O[1-9]" -O0 #262359 |
169 |
- elif use ia64; then |
170 |
- replace-flags "-O[2-9]" -O1 #325373 |
171 |
- else |
172 |
- replace-flags "-O[3-9]" -O2 |
173 |
- fi |
174 |
- |
175 |
- local myconf |
176 |
- |
177 |
- if use alsa; then |
178 |
- use sound || ewarn \ |
179 |
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
180 |
- myconf+=" --with-sound=alsa" |
181 |
- else |
182 |
- myconf+=" --with-sound=$(usex sound oss)" |
183 |
- fi |
184 |
- |
185 |
- if use X; then |
186 |
- myconf+=" --with-x --without-ns" |
187 |
- myconf+=" $(use_with gconf)" |
188 |
- myconf+=" $(use_with gsettings)" |
189 |
- myconf+=" $(use_with toolkit-scroll-bars)" |
190 |
- myconf+=" $(use_with gif)" |
191 |
- myconf+=" $(use_with jpeg)" |
192 |
- myconf+=" $(use_with png)" |
193 |
- myconf+=" $(use_with svg rsvg)" |
194 |
- myconf+=" $(use_with tiff)" |
195 |
- myconf+=" $(use_with xpm)" |
196 |
- myconf+=" $(use_with imagemagick)" |
197 |
- |
198 |
- if use xft; then |
199 |
- myconf+=" --with-xft" |
200 |
- myconf+=" $(use_with m17n-lib libotf)" |
201 |
- myconf+=" $(use_with m17n-lib m17n-flt)" |
202 |
- else |
203 |
- myconf+=" --without-xft" |
204 |
- myconf+=" --without-libotf --without-m17n-flt" |
205 |
- use m17n-lib && ewarn \ |
206 |
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
207 |
- fi |
208 |
- |
209 |
- local f line |
210 |
- if use gtk; then |
211 |
- einfo "Configuring to build with GIMP Toolkit (GTK+)" |
212 |
- while read line; do ewarn "${line}"; done <<-EOF |
213 |
- Your version of GTK+ will have problems with closing open |
214 |
- displays. This is no problem if you just use one display, but |
215 |
- if you use more than one and close one of them Emacs may crash. |
216 |
- See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. |
217 |
- If you intend to use more than one display, then it is strongly |
218 |
- recommended that you compile Emacs with the Athena/Lucid or the |
219 |
- Motif toolkit instead. |
220 |
- EOF |
221 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
222 |
- for f in motif Xaw3d athena; do |
223 |
- use ${f} && ewarn \ |
224 |
- "USE flag \"${f}\" has no effect if \"gtk\" is set." |
225 |
- done |
226 |
- elif use motif; then |
227 |
- einfo "Configuring to build with Motif toolkit" |
228 |
- myconf+=" --with-x-toolkit=motif" |
229 |
- for f in Xaw3d athena; do |
230 |
- use ${f} && ewarn \ |
231 |
- "USE flag \"${f}\" has no effect if \"motif\" is set." |
232 |
- done |
233 |
- elif use athena || use Xaw3d; then |
234 |
- einfo "Configuring to build with Athena/Lucid toolkit" |
235 |
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
236 |
- else |
237 |
- einfo "Configuring to build with no toolkit" |
238 |
- myconf+=" --with-x-toolkit=no" |
239 |
- fi |
240 |
- elif use aqua; then |
241 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
242 |
- myconf+=" --with-ns --disable-ns-self-contained" |
243 |
- myconf+=" --without-x" |
244 |
- else |
245 |
- myconf+=" --without-x --without-ns" |
246 |
- fi |
247 |
- |
248 |
- # Save version information in the Emacs binary. It will be available |
249 |
- # in variable "system-configuration-options". |
250 |
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" |
251 |
- |
252 |
- econf \ |
253 |
- --program-suffix="-${EMACS_SUFFIX}" \ |
254 |
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
255 |
- --localstatedir="${EPREFIX}"/var \ |
256 |
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
257 |
- --with-gameuser=":gamestat" \ |
258 |
- --without-compress-install \ |
259 |
- --without-hesiod \ |
260 |
- --with-file-notification=$(usev inotify || usev gfile || echo no) \ |
261 |
- $(use_enable acl) \ |
262 |
- $(use_with dbus) \ |
263 |
- $(use_with gpm) \ |
264 |
- $(use_with kerberos) $(use_with kerberos kerberos5) \ |
265 |
- $(use_with libxml2 xml2) \ |
266 |
- $(use_with selinux) \ |
267 |
- $(use_with ssl gnutls) \ |
268 |
- $(use_with wide-int) \ |
269 |
- $(use_with zlib) \ |
270 |
- ${myconf} |
271 |
-} |
272 |
- |
273 |
-src_compile() { |
274 |
- # compile preload hack |
275 |
- $(tc-getCC) -shared -fPIC -o preload.so "${FILESDIR}/preload.c" || die |
276 |
- |
277 |
- # Disable sandbox when dumping. For the unbelievers, see bug #131505 |
278 |
- emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD=preload.so ./temacs" |
279 |
-} |
280 |
- |
281 |
-src_install () { |
282 |
- emake DESTDIR="${D}" NO_BIN_LINK=t install |
283 |
- |
284 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
285 |
- || die "moving emacs executable failed" |
286 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
287 |
- || die "moving emacs man page failed" |
288 |
- |
289 |
- # move info dir to avoid collisions with the dir file generated by portage |
290 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
291 |
- || die "moving info dir failed" |
292 |
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
293 |
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
294 |
- |
295 |
- # avoid collision between slots, see bug #169033 e.g. |
296 |
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
297 |
- rm -rf "${ED}"/usr/share/{applications,icons} |
298 |
- rm -rf "${ED}"/var |
299 |
- |
300 |
- # remove unused <version>/site-lisp dir |
301 |
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
302 |
- |
303 |
- # remove COPYING file (except for etc/COPYING used by describe-copying) |
304 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
305 |
- |
306 |
- if use gzip-el; then |
307 |
- # compress .el files when a corresponding .elc exists |
308 |
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
309 |
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n |
310 |
- assert "gzip .el failed" |
311 |
- fi |
312 |
- |
313 |
- local cdir |
314 |
- if use source; then |
315 |
- cdir="/usr/share/emacs/${FULL_VERSION}/src" |
316 |
- insinto "${cdir}" |
317 |
- # This is not meant to install all the source -- just the |
318 |
- # C source you might find via find-function |
319 |
- doins src/*.{c,h,m} |
320 |
- elif has installsources ${FEATURES}; then |
321 |
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
322 |
- fi |
323 |
- |
324 |
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die |
325 |
- X |
326 |
- ;;; ${PN}-${SLOT} site-lisp configuration |
327 |
- X |
328 |
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
329 |
- Y (setq find-function-C-source-directory |
330 |
- Y "${EPREFIX}${cdir}") |
331 |
- X (let ((path (getenv "INFOPATH")) |
332 |
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
333 |
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
334 |
- X (and path |
335 |
- X ;; move Emacs Info dir before anything else in /usr/share/info |
336 |
- X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
337 |
- X (while (and (cdr q) (not (string-match re (cadr q)))) |
338 |
- X (setq q (cdr q))) |
339 |
- X (setcdr q (cons dir (delete dir (cdr q)))) |
340 |
- X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
341 |
- EOF |
342 |
- elisp-site-file-install "${T}/${SITEFILE}" || die |
343 |
- |
344 |
- dodoc README BUGS |
345 |
- |
346 |
- if use aqua; then |
347 |
- dodir /Applications/Gentoo |
348 |
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app |
349 |
- mv nextstep/Emacs.app \ |
350 |
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die |
351 |
- fi |
352 |
- |
353 |
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs |
354 |
- through the Emacs eselect module, which also redirects man and info |
355 |
- pages. Therefore, several Emacs versions can be installed at the |
356 |
- same time. \"man emacs.eselect\" for details. |
357 |
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
358 |
- strongly recommended that you use app-admin/emacs-updater to rebuild |
359 |
- all byte-compiled elisp files of the installed Emacs packages." |
360 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
361 |
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
362 |
- machine would satisfy basic Emacs requirements under X11. |
363 |
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
364 |
- for how to enable anti-aliased fonts." |
365 |
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
366 |
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
367 |
- it into /Applications by yourself." |
368 |
- readme.gentoo_create_doc |
369 |
-} |
370 |
- |
371 |
-pkg_preinst() { |
372 |
- # move Info dir file to correct name |
373 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
374 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
375 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
376 |
- elif [[ -d "${ED}"${infodir} ]]; then |
377 |
- # this should not happen in EAPI 4 |
378 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
379 |
- rm -f "${ED}"${infodir}/dir{,.*} |
380 |
- for f in "${ED}"${infodir}/*; do |
381 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
382 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
383 |
- || die "install-info failed" |
384 |
- fi |
385 |
- done |
386 |
- fi |
387 |
-} |
388 |
- |
389 |
-pkg_postinst() { |
390 |
- elisp-site-regen |
391 |
- readme.gentoo_print_elog |
392 |
- |
393 |
- if use livecd; then |
394 |
- # force an update of the emacs symlink for the livecd/dvd, |
395 |
- # because some microemacs packages set it with USE=livecd |
396 |
- eselect emacs update |
397 |
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
398 |
- # refresh symlinks in case any installed files have changed |
399 |
- eselect emacs set ${EMACS_SUFFIX} |
400 |
- else |
401 |
- eselect emacs update ifunset |
402 |
- fi |
403 |
-} |
404 |
- |
405 |
-pkg_postrm() { |
406 |
- elisp-site-regen |
407 |
- eselect emacs update ifunset |
408 |
-} |
409 |
|
410 |
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild |
411 |
deleted file mode 100644 |
412 |
index 030e523..0000000 |
413 |
--- a/app-editors/emacs/emacs-25.3-r1.ebuild |
414 |
+++ /dev/null |
415 |
@@ -1,371 +0,0 @@ |
416 |
-# Copyright 1999-2018 Gentoo Foundation |
417 |
-# Distributed under the terms of the GNU General Public License v2 |
418 |
- |
419 |
-EAPI=6 |
420 |
- |
421 |
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1 |
422 |
- |
423 |
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
424 |
-HOMEPAGE="https://www.gnu.org/software/emacs/" |
425 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
426 |
- |
427 |
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
428 |
-SLOT="25" |
429 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" |
430 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
431 |
-REQUIRED_USE="?? ( aqua X )" |
432 |
- |
433 |
-RDEPEND="sys-libs/ncurses:0= |
434 |
- >=app-eselect/eselect-emacs-1.16 |
435 |
- >=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
436 |
- net-libs/liblockfile |
437 |
- acl? ( virtual/acl ) |
438 |
- alsa? ( media-libs/alsa-lib ) |
439 |
- dbus? ( sys-apps/dbus ) |
440 |
- gpm? ( sys-libs/gpm ) |
441 |
- !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) |
442 |
- kerberos? ( virtual/krb5 ) |
443 |
- libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
444 |
- selinux? ( sys-libs/libselinux ) |
445 |
- ssl? ( net-libs/gnutls:0= ) |
446 |
- zlib? ( sys-libs/zlib ) |
447 |
- X? ( |
448 |
- x11-libs/libICE |
449 |
- x11-libs/libSM |
450 |
- x11-libs/libX11 |
451 |
- x11-libs/libXext |
452 |
- x11-libs/libXfixes |
453 |
- x11-libs/libXinerama |
454 |
- x11-libs/libXrandr |
455 |
- x11-libs/libxcb |
456 |
- x11-misc/xbitmaps |
457 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
458 |
- gsettings? ( >=dev-libs/glib-2.28.6 ) |
459 |
- gif? ( media-libs/giflib:0= ) |
460 |
- jpeg? ( virtual/jpeg:0= ) |
461 |
- png? ( >=media-libs/libpng-1.4:0= ) |
462 |
- svg? ( >=gnome-base/librsvg-2.0 ) |
463 |
- tiff? ( media-libs/tiff:0 ) |
464 |
- xpm? ( x11-libs/libXpm ) |
465 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
466 |
- xft? ( |
467 |
- media-libs/fontconfig |
468 |
- media-libs/freetype |
469 |
- x11-libs/libXft |
470 |
- x11-libs/libXrender |
471 |
- cairo? ( >=x11-libs/cairo-1.12.18 ) |
472 |
- m17n-lib? ( |
473 |
- >=dev-libs/libotf-0.9.4 |
474 |
- >=dev-libs/m17n-lib-1.5.1 |
475 |
- ) |
476 |
- ) |
477 |
- gtk? ( |
478 |
- gtk3? ( x11-libs/gtk+:3 ) |
479 |
- !gtk3? ( x11-libs/gtk+:2 ) |
480 |
- ) |
481 |
- !gtk? ( |
482 |
- motif? ( |
483 |
- >=x11-libs/motif-2.3:0 |
484 |
- x11-libs/libXpm |
485 |
- x11-libs/libXmu |
486 |
- x11-libs/libXt |
487 |
- ) |
488 |
- !motif? ( |
489 |
- Xaw3d? ( |
490 |
- x11-libs/libXaw3d |
491 |
- x11-libs/libXmu |
492 |
- x11-libs/libXt |
493 |
- ) |
494 |
- !Xaw3d? ( athena? ( |
495 |
- x11-libs/libXaw |
496 |
- x11-libs/libXmu |
497 |
- x11-libs/libXt |
498 |
- ) ) |
499 |
- ) |
500 |
- ) |
501 |
- )" |
502 |
- |
503 |
-DEPEND="${RDEPEND} |
504 |
- virtual/pkgconfig |
505 |
- gzip-el? ( app-arch/gzip ) |
506 |
- pax_kernel? ( sys-apps/attr )" |
507 |
- |
508 |
-RDEPEND="${RDEPEND} |
509 |
- !<app-editors/emacs-vcs-${PV}" |
510 |
- |
511 |
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
512 |
-SITEFILE="20${PN}-${SLOT}-gentoo.el" |
513 |
-# FULL_VERSION keeps the full version number, which is needed in |
514 |
-# order to determine some path information correctly for copy/move |
515 |
-# operations later on |
516 |
-FULL_VERSION="${PV%%_*}" |
517 |
-S="${WORKDIR}/emacs-${FULL_VERSION}" |
518 |
- |
519 |
-src_prepare() { |
520 |
- eapply "${FILESDIR}/${PN}-vcs-musl.patch" |
521 |
- |
522 |
- eapply_user |
523 |
- |
524 |
- # Fix filename reference in redirected man page |
525 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
526 |
- || die "unable to sed ctags.1" |
527 |
- |
528 |
- #AT_M4DIR=m4 eautoreconf |
529 |
- #touch src/stamp-h.in || die |
530 |
-} |
531 |
- |
532 |
-src_configure() { |
533 |
- strip-flags |
534 |
- filter-flags -pie #526948 |
535 |
- |
536 |
- if use sh; then |
537 |
- replace-flags "-O[1-9]" -O0 #262359 |
538 |
- elif use ia64; then |
539 |
- replace-flags "-O[2-9]" -O1 #325373 |
540 |
- else |
541 |
- replace-flags "-O[3-9]" -O2 |
542 |
- fi |
543 |
- |
544 |
- local myconf |
545 |
- |
546 |
- if use alsa; then |
547 |
- use sound || ewarn \ |
548 |
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
549 |
- myconf+=" --with-sound=alsa" |
550 |
- else |
551 |
- myconf+=" --with-sound=$(usex sound oss)" |
552 |
- fi |
553 |
- |
554 |
- if use X; then |
555 |
- myconf+=" --with-x --without-ns" |
556 |
- myconf+=" $(use_with gconf)" |
557 |
- myconf+=" $(use_with gsettings)" |
558 |
- myconf+=" $(use_with toolkit-scroll-bars)" |
559 |
- myconf+=" $(use_with gif)" |
560 |
- myconf+=" $(use_with jpeg)" |
561 |
- myconf+=" $(use_with png)" |
562 |
- myconf+=" $(use_with svg rsvg)" |
563 |
- myconf+=" $(use_with tiff)" |
564 |
- myconf+=" $(use_with xpm)" |
565 |
- myconf+=" $(use_with imagemagick)" |
566 |
- |
567 |
- if use xft; then |
568 |
- myconf+=" --with-xft" |
569 |
- myconf+=" $(use_with cairo)" |
570 |
- myconf+=" $(use_with m17n-lib libotf)" |
571 |
- myconf+=" $(use_with m17n-lib m17n-flt)" |
572 |
- else |
573 |
- myconf+=" --without-xft" |
574 |
- myconf+=" --without-cairo" |
575 |
- myconf+=" --without-libotf --without-m17n-flt" |
576 |
- use cairo && ewarn \ |
577 |
- "USE flag \"cairo\" has no effect if \"xft\" is not set." |
578 |
- use m17n-lib && ewarn \ |
579 |
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
580 |
- fi |
581 |
- |
582 |
- local f line |
583 |
- if use gtk; then |
584 |
- einfo "Configuring to build with GIMP Toolkit (GTK+)" |
585 |
- while read line; do ewarn "${line}"; done <<-EOF |
586 |
- Your version of GTK+ will have problems with closing open |
587 |
- displays. This is no problem if you just use one display, but |
588 |
- if you use more than one and close one of them Emacs may crash. |
589 |
- See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. |
590 |
- If you intend to use more than one display, then it is strongly |
591 |
- recommended that you compile Emacs with the Athena/Lucid or the |
592 |
- Motif toolkit instead. |
593 |
- EOF |
594 |
- #if use xwidgets; then |
595 |
- # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
596 |
- #else |
597 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
598 |
- myconf+=" --without-xwidgets" |
599 |
- #fi |
600 |
- for f in motif Xaw3d athena; do |
601 |
- use ${f} && ewarn \ |
602 |
- "USE flag \"${f}\" has no effect if \"gtk\" is set." |
603 |
- done |
604 |
- elif use motif; then |
605 |
- einfo "Configuring to build with Motif toolkit" |
606 |
- myconf+=" --with-x-toolkit=motif" |
607 |
- for f in Xaw3d athena; do |
608 |
- use ${f} && ewarn \ |
609 |
- "USE flag \"${f}\" has no effect if \"motif\" is set." |
610 |
- done |
611 |
- elif use athena || use Xaw3d; then |
612 |
- einfo "Configuring to build with Athena/Lucid toolkit" |
613 |
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
614 |
- else |
615 |
- einfo "Configuring to build with no toolkit" |
616 |
- myconf+=" --with-x-toolkit=no" |
617 |
- fi |
618 |
- #! use gtk && use xwidgets && ewarn \ |
619 |
- # "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
620 |
- elif use aqua; then |
621 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
622 |
- myconf+=" --with-ns --disable-ns-self-contained" |
623 |
- myconf+=" --without-x" |
624 |
- else |
625 |
- myconf+=" --without-x --without-ns" |
626 |
- fi |
627 |
- |
628 |
- # Save version information in the Emacs binary. It will be available |
629 |
- # in variable "system-configuration-options". |
630 |
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" |
631 |
- |
632 |
- econf \ |
633 |
- --program-suffix="-${EMACS_SUFFIX}" \ |
634 |
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
635 |
- --localstatedir="${EPREFIX}"/var \ |
636 |
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
637 |
- --with-gameuser=":gamestat" \ |
638 |
- --without-compress-install \ |
639 |
- --without-hesiod \ |
640 |
- --with-file-notification=$(usev inotify || usev gfile || echo no) \ |
641 |
- $(use_enable acl) \ |
642 |
- $(use_with dbus) \ |
643 |
- $(use_with dynamic-loading modules) \ |
644 |
- $(use_with gpm) \ |
645 |
- $(use_with kerberos) $(use_with kerberos kerberos5) \ |
646 |
- $(use_with libxml2 xml2) \ |
647 |
- $(use_with selinux) \ |
648 |
- $(use_with ssl gnutls) \ |
649 |
- $(use_with wide-int) \ |
650 |
- $(use_with zlib) \ |
651 |
- ${myconf} |
652 |
-} |
653 |
- |
654 |
-src_compile() { |
655 |
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
656 |
- emake |
657 |
-} |
658 |
- |
659 |
-src_install () { |
660 |
- emake DESTDIR="${D}" NO_BIN_LINK=t install |
661 |
- |
662 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
663 |
- || die "moving emacs executable failed" |
664 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
665 |
- || die "moving emacs man page failed" |
666 |
- |
667 |
- # move info dir to avoid collisions with the dir file generated by portage |
668 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
669 |
- || die "moving info dir failed" |
670 |
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
671 |
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
672 |
- |
673 |
- # avoid collision between slots, see bug #169033 e.g. |
674 |
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
675 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} |
676 |
- rm -rf "${ED}"/var |
677 |
- |
678 |
- # remove unused <version>/site-lisp dir |
679 |
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
680 |
- |
681 |
- # remove COPYING file (except for etc/COPYING used by describe-copying) |
682 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
683 |
- |
684 |
- if use gzip-el; then |
685 |
- # compress .el files when a corresponding .elc exists |
686 |
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
687 |
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n |
688 |
- assert "gzip .el failed" |
689 |
- fi |
690 |
- |
691 |
- local cdir |
692 |
- if use source; then |
693 |
- cdir="/usr/share/emacs/${FULL_VERSION}/src" |
694 |
- insinto "${cdir}" |
695 |
- # This is not meant to install all the source -- just the |
696 |
- # C source you might find via find-function |
697 |
- doins src/*.{c,h,m} |
698 |
- elif has installsources ${FEATURES}; then |
699 |
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
700 |
- fi |
701 |
- |
702 |
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die |
703 |
- X |
704 |
- ;;; ${PN}-${SLOT} site-lisp configuration |
705 |
- X |
706 |
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
707 |
- Y (setq find-function-C-source-directory |
708 |
- Y "${EPREFIX}${cdir}") |
709 |
- X (let ((path (getenv "INFOPATH")) |
710 |
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
711 |
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
712 |
- X (and path |
713 |
- X ;; move Emacs Info dir before anything else in /usr/share/info |
714 |
- X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
715 |
- X (while (and (cdr q) (not (string-match re (cadr q)))) |
716 |
- X (setq q (cdr q))) |
717 |
- X (setcdr q (cons dir (delete dir (cdr q)))) |
718 |
- X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
719 |
- EOF |
720 |
- elisp-site-file-install "${T}/${SITEFILE}" || die |
721 |
- |
722 |
- dodoc README BUGS CONTRIBUTE |
723 |
- |
724 |
- if use aqua; then |
725 |
- dodir /Applications/Gentoo |
726 |
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app |
727 |
- mv nextstep/Emacs.app \ |
728 |
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die |
729 |
- fi |
730 |
- |
731 |
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs |
732 |
- through the Emacs eselect module, which also redirects man and info |
733 |
- pages. Therefore, several Emacs versions can be installed at the |
734 |
- same time. \"man emacs.eselect\" for details. |
735 |
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
736 |
- strongly recommended that you use app-admin/emacs-updater to rebuild |
737 |
- all byte-compiled elisp files of the installed Emacs packages." |
738 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
739 |
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
740 |
- machine would satisfy basic Emacs requirements under X11. |
741 |
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
742 |
- for how to enable anti-aliased fonts." |
743 |
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
744 |
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
745 |
- it into /Applications by yourself." |
746 |
- readme.gentoo_create_doc |
747 |
-} |
748 |
- |
749 |
-pkg_preinst() { |
750 |
- # move Info dir file to correct name |
751 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
752 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
753 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
754 |
- elif [[ -d "${ED}"${infodir} ]]; then |
755 |
- # this should not happen in EAPI 4 |
756 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
757 |
- rm -f "${ED}"${infodir}/dir{,.*} |
758 |
- for f in "${ED}"${infodir}/*; do |
759 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
760 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
761 |
- || die "install-info failed" |
762 |
- fi |
763 |
- done |
764 |
- fi |
765 |
-} |
766 |
- |
767 |
-pkg_postinst() { |
768 |
- elisp-site-regen |
769 |
- readme.gentoo_print_elog |
770 |
- |
771 |
- if use livecd; then |
772 |
- # force an update of the emacs symlink for the livecd/dvd, |
773 |
- # because some microemacs packages set it with USE=livecd |
774 |
- eselect emacs update |
775 |
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
776 |
- # refresh symlinks in case any installed files have changed |
777 |
- eselect emacs set ${EMACS_SUFFIX} |
778 |
- else |
779 |
- eselect emacs update ifunset |
780 |
- fi |
781 |
-} |
782 |
- |
783 |
-pkg_postrm() { |
784 |
- elisp-site-regen |
785 |
- eselect emacs update ifunset |
786 |
-} |
787 |
|
788 |
diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild |
789 |
deleted file mode 100644 |
790 |
index 8883244..0000000 |
791 |
--- a/app-editors/emacs/emacs-25.3-r3.ebuild |
792 |
+++ /dev/null |
793 |
@@ -1,371 +0,0 @@ |
794 |
-# Copyright 1999-2018 Gentoo Foundation |
795 |
-# Distributed under the terms of the GNU General Public License v2 |
796 |
- |
797 |
-EAPI=6 |
798 |
- |
799 |
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1 |
800 |
- |
801 |
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
802 |
-HOMEPAGE="https://www.gnu.org/software/emacs/" |
803 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
804 |
- |
805 |
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
806 |
-SLOT="25" |
807 |
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" |
808 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
809 |
-REQUIRED_USE="?? ( aqua X )" |
810 |
- |
811 |
-RDEPEND="sys-libs/ncurses:0= |
812 |
- >=app-eselect/eselect-emacs-1.16 |
813 |
- >=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
814 |
- net-libs/liblockfile |
815 |
- acl? ( virtual/acl ) |
816 |
- alsa? ( media-libs/alsa-lib ) |
817 |
- dbus? ( sys-apps/dbus ) |
818 |
- gpm? ( sys-libs/gpm ) |
819 |
- !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) |
820 |
- kerberos? ( virtual/krb5 ) |
821 |
- libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
822 |
- selinux? ( sys-libs/libselinux ) |
823 |
- ssl? ( net-libs/gnutls:0= ) |
824 |
- zlib? ( sys-libs/zlib ) |
825 |
- X? ( |
826 |
- x11-libs/libICE |
827 |
- x11-libs/libSM |
828 |
- x11-libs/libX11 |
829 |
- x11-libs/libXext |
830 |
- x11-libs/libXfixes |
831 |
- x11-libs/libXinerama |
832 |
- x11-libs/libXrandr |
833 |
- x11-libs/libxcb |
834 |
- x11-misc/xbitmaps |
835 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
836 |
- gsettings? ( >=dev-libs/glib-2.28.6 ) |
837 |
- gif? ( media-libs/giflib:0= ) |
838 |
- jpeg? ( virtual/jpeg:0= ) |
839 |
- png? ( >=media-libs/libpng-1.4:0= ) |
840 |
- svg? ( >=gnome-base/librsvg-2.0 ) |
841 |
- tiff? ( media-libs/tiff:0 ) |
842 |
- xpm? ( x11-libs/libXpm ) |
843 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
844 |
- xft? ( |
845 |
- media-libs/fontconfig |
846 |
- media-libs/freetype |
847 |
- x11-libs/libXft |
848 |
- x11-libs/libXrender |
849 |
- cairo? ( >=x11-libs/cairo-1.12.18 ) |
850 |
- m17n-lib? ( |
851 |
- >=dev-libs/libotf-0.9.4 |
852 |
- >=dev-libs/m17n-lib-1.5.1 |
853 |
- ) |
854 |
- ) |
855 |
- gtk? ( |
856 |
- gtk3? ( x11-libs/gtk+:3 ) |
857 |
- !gtk3? ( x11-libs/gtk+:2 ) |
858 |
- ) |
859 |
- !gtk? ( |
860 |
- motif? ( |
861 |
- >=x11-libs/motif-2.3:0 |
862 |
- x11-libs/libXpm |
863 |
- x11-libs/libXmu |
864 |
- x11-libs/libXt |
865 |
- ) |
866 |
- !motif? ( |
867 |
- Xaw3d? ( |
868 |
- x11-libs/libXaw3d |
869 |
- x11-libs/libXmu |
870 |
- x11-libs/libXt |
871 |
- ) |
872 |
- !Xaw3d? ( athena? ( |
873 |
- x11-libs/libXaw |
874 |
- x11-libs/libXmu |
875 |
- x11-libs/libXt |
876 |
- ) ) |
877 |
- ) |
878 |
- ) |
879 |
- )" |
880 |
- |
881 |
-DEPEND="${RDEPEND} |
882 |
- virtual/pkgconfig |
883 |
- gzip-el? ( app-arch/gzip ) |
884 |
- pax_kernel? ( sys-apps/attr )" |
885 |
- |
886 |
-RDEPEND="${RDEPEND} |
887 |
- !<app-editors/emacs-vcs-${PV}" |
888 |
- |
889 |
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
890 |
-SITEFILE="20${PN}-${SLOT}-gentoo.el" |
891 |
-# FULL_VERSION keeps the full version number, which is needed in |
892 |
-# order to determine some path information correctly for copy/move |
893 |
-# operations later on |
894 |
-FULL_VERSION="${PV%%_*}" |
895 |
-S="${WORKDIR}/emacs-${FULL_VERSION}" |
896 |
- |
897 |
-src_prepare() { |
898 |
- eapply "${FILESDIR}/${PN}-vcs-musl.patch" |
899 |
- |
900 |
- eapply_user |
901 |
- |
902 |
- # Fix filename reference in redirected man page |
903 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
904 |
- || die "unable to sed ctags.1" |
905 |
- |
906 |
- #AT_M4DIR=m4 eautoreconf |
907 |
- #touch src/stamp-h.in || die |
908 |
-} |
909 |
- |
910 |
-src_configure() { |
911 |
- strip-flags |
912 |
- filter-flags -pie #526948 |
913 |
- |
914 |
- if use sh; then |
915 |
- replace-flags "-O[1-9]" -O0 #262359 |
916 |
- elif use ia64; then |
917 |
- replace-flags "-O[2-9]" -O1 #325373 |
918 |
- else |
919 |
- replace-flags "-O[3-9]" -O2 |
920 |
- fi |
921 |
- |
922 |
- local myconf |
923 |
- |
924 |
- if use alsa; then |
925 |
- use sound || ewarn \ |
926 |
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
927 |
- myconf+=" --with-sound=alsa" |
928 |
- else |
929 |
- myconf+=" --with-sound=$(usex sound oss)" |
930 |
- fi |
931 |
- |
932 |
- if use X; then |
933 |
- myconf+=" --with-x --without-ns" |
934 |
- myconf+=" $(use_with gconf)" |
935 |
- myconf+=" $(use_with gsettings)" |
936 |
- myconf+=" $(use_with toolkit-scroll-bars)" |
937 |
- myconf+=" $(use_with gif)" |
938 |
- myconf+=" $(use_with jpeg)" |
939 |
- myconf+=" $(use_with png)" |
940 |
- myconf+=" $(use_with svg rsvg)" |
941 |
- myconf+=" $(use_with tiff)" |
942 |
- myconf+=" $(use_with xpm)" |
943 |
- myconf+=" $(use_with imagemagick)" |
944 |
- |
945 |
- if use xft; then |
946 |
- myconf+=" --with-xft" |
947 |
- myconf+=" $(use_with cairo)" |
948 |
- myconf+=" $(use_with m17n-lib libotf)" |
949 |
- myconf+=" $(use_with m17n-lib m17n-flt)" |
950 |
- else |
951 |
- myconf+=" --without-xft" |
952 |
- myconf+=" --without-cairo" |
953 |
- myconf+=" --without-libotf --without-m17n-flt" |
954 |
- use cairo && ewarn \ |
955 |
- "USE flag \"cairo\" has no effect if \"xft\" is not set." |
956 |
- use m17n-lib && ewarn \ |
957 |
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
958 |
- fi |
959 |
- |
960 |
- local f line |
961 |
- if use gtk; then |
962 |
- einfo "Configuring to build with GIMP Toolkit (GTK+)" |
963 |
- while read line; do ewarn "${line}"; done <<-EOF |
964 |
- Your version of GTK+ will have problems with closing open |
965 |
- displays. This is no problem if you just use one display, but |
966 |
- if you use more than one and close one of them Emacs may crash. |
967 |
- See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. |
968 |
- If you intend to use more than one display, then it is strongly |
969 |
- recommended that you compile Emacs with the Athena/Lucid or the |
970 |
- Motif toolkit instead. |
971 |
- EOF |
972 |
- #if use xwidgets; then |
973 |
- # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
974 |
- #else |
975 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
976 |
- myconf+=" --without-xwidgets" |
977 |
- #fi |
978 |
- for f in motif Xaw3d athena; do |
979 |
- use ${f} && ewarn \ |
980 |
- "USE flag \"${f}\" has no effect if \"gtk\" is set." |
981 |
- done |
982 |
- elif use motif; then |
983 |
- einfo "Configuring to build with Motif toolkit" |
984 |
- myconf+=" --with-x-toolkit=motif" |
985 |
- for f in Xaw3d athena; do |
986 |
- use ${f} && ewarn \ |
987 |
- "USE flag \"${f}\" has no effect if \"motif\" is set." |
988 |
- done |
989 |
- elif use athena || use Xaw3d; then |
990 |
- einfo "Configuring to build with Athena/Lucid toolkit" |
991 |
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
992 |
- else |
993 |
- einfo "Configuring to build with no toolkit" |
994 |
- myconf+=" --with-x-toolkit=no" |
995 |
- fi |
996 |
- #! use gtk && use xwidgets && ewarn \ |
997 |
- # "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
998 |
- elif use aqua; then |
999 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
1000 |
- myconf+=" --with-ns --disable-ns-self-contained" |
1001 |
- myconf+=" --without-x" |
1002 |
- else |
1003 |
- myconf+=" --without-x --without-ns" |
1004 |
- fi |
1005 |
- |
1006 |
- # Save version information in the Emacs binary. It will be available |
1007 |
- # in variable "system-configuration-options". |
1008 |
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" |
1009 |
- |
1010 |
- econf \ |
1011 |
- --program-suffix="-${EMACS_SUFFIX}" \ |
1012 |
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
1013 |
- --localstatedir="${EPREFIX}"/var \ |
1014 |
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
1015 |
- --with-gameuser=":gamestat" \ |
1016 |
- --without-compress-install \ |
1017 |
- --without-hesiod \ |
1018 |
- --with-file-notification=$(usev inotify || usev gfile || echo no) \ |
1019 |
- $(use_enable acl) \ |
1020 |
- $(use_with dbus) \ |
1021 |
- $(use_with dynamic-loading modules) \ |
1022 |
- $(use_with gpm) \ |
1023 |
- $(use_with kerberos) $(use_with kerberos kerberos5) \ |
1024 |
- $(use_with libxml2 xml2) \ |
1025 |
- $(use_with selinux) \ |
1026 |
- $(use_with ssl gnutls) \ |
1027 |
- $(use_with wide-int) \ |
1028 |
- $(use_with zlib) \ |
1029 |
- ${myconf} |
1030 |
-} |
1031 |
- |
1032 |
-src_compile() { |
1033 |
- # Disable sandbox when dumping. For the unbelievers, see bug #131505 |
1034 |
- emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs" |
1035 |
-} |
1036 |
- |
1037 |
-src_install () { |
1038 |
- emake DESTDIR="${D}" NO_BIN_LINK=t install |
1039 |
- |
1040 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
1041 |
- || die "moving emacs executable failed" |
1042 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
1043 |
- || die "moving emacs man page failed" |
1044 |
- |
1045 |
- # move info dir to avoid collisions with the dir file generated by portage |
1046 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
1047 |
- || die "moving info dir failed" |
1048 |
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
1049 |
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
1050 |
- |
1051 |
- # avoid collision between slots, see bug #169033 e.g. |
1052 |
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
1053 |
- rm -rf "${ED}"/usr/share/{appdata,applications,icons} |
1054 |
- rm -rf "${ED}"/var |
1055 |
- |
1056 |
- # remove unused <version>/site-lisp dir |
1057 |
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
1058 |
- |
1059 |
- # remove COPYING file (except for etc/COPYING used by describe-copying) |
1060 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
1061 |
- |
1062 |
- if use gzip-el; then |
1063 |
- # compress .el files when a corresponding .elc exists |
1064 |
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
1065 |
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n |
1066 |
- assert "gzip .el failed" |
1067 |
- fi |
1068 |
- |
1069 |
- local cdir |
1070 |
- if use source; then |
1071 |
- cdir="/usr/share/emacs/${FULL_VERSION}/src" |
1072 |
- insinto "${cdir}" |
1073 |
- # This is not meant to install all the source -- just the |
1074 |
- # C source you might find via find-function |
1075 |
- doins src/*.{c,h,m} |
1076 |
- elif has installsources ${FEATURES}; then |
1077 |
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
1078 |
- fi |
1079 |
- |
1080 |
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die |
1081 |
- X |
1082 |
- ;;; ${PN}-${SLOT} site-lisp configuration |
1083 |
- X |
1084 |
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
1085 |
- Y (setq find-function-C-source-directory |
1086 |
- Y "${EPREFIX}${cdir}") |
1087 |
- X (let ((path (getenv "INFOPATH")) |
1088 |
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
1089 |
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
1090 |
- X (and path |
1091 |
- X ;; move Emacs Info dir before anything else in /usr/share/info |
1092 |
- X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
1093 |
- X (while (and (cdr q) (not (string-match re (cadr q)))) |
1094 |
- X (setq q (cdr q))) |
1095 |
- X (setcdr q (cons dir (delete dir (cdr q)))) |
1096 |
- X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
1097 |
- EOF |
1098 |
- elisp-site-file-install "${T}/${SITEFILE}" || die |
1099 |
- |
1100 |
- dodoc README BUGS CONTRIBUTE |
1101 |
- |
1102 |
- if use aqua; then |
1103 |
- dodir /Applications/Gentoo |
1104 |
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app |
1105 |
- mv nextstep/Emacs.app \ |
1106 |
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die |
1107 |
- fi |
1108 |
- |
1109 |
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs |
1110 |
- through the Emacs eselect module, which also redirects man and info |
1111 |
- pages. Therefore, several Emacs versions can be installed at the |
1112 |
- same time. \"man emacs.eselect\" for details. |
1113 |
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
1114 |
- strongly recommended that you use app-admin/emacs-updater to rebuild |
1115 |
- all byte-compiled elisp files of the installed Emacs packages." |
1116 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
1117 |
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
1118 |
- machine would satisfy basic Emacs requirements under X11. |
1119 |
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
1120 |
- for how to enable anti-aliased fonts." |
1121 |
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
1122 |
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
1123 |
- it into /Applications by yourself." |
1124 |
- readme.gentoo_create_doc |
1125 |
-} |
1126 |
- |
1127 |
-pkg_preinst() { |
1128 |
- # move Info dir file to correct name |
1129 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
1130 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
1131 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
1132 |
- elif [[ -d "${ED}"${infodir} ]]; then |
1133 |
- # this should not happen in EAPI 4 |
1134 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
1135 |
- rm -f "${ED}"${infodir}/dir{,.*} |
1136 |
- for f in "${ED}"${infodir}/*; do |
1137 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
1138 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
1139 |
- || die "install-info failed" |
1140 |
- fi |
1141 |
- done |
1142 |
- fi |
1143 |
-} |
1144 |
- |
1145 |
-pkg_postinst() { |
1146 |
- elisp-site-regen |
1147 |
- readme.gentoo_print_elog |
1148 |
- |
1149 |
- if use livecd; then |
1150 |
- # force an update of the emacs symlink for the livecd/dvd, |
1151 |
- # because some microemacs packages set it with USE=livecd |
1152 |
- eselect emacs update |
1153 |
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
1154 |
- # refresh symlinks in case any installed files have changed |
1155 |
- eselect emacs set ${EMACS_SUFFIX} |
1156 |
- else |
1157 |
- eselect emacs update ifunset |
1158 |
- fi |
1159 |
-} |
1160 |
- |
1161 |
-pkg_postrm() { |
1162 |
- elisp-site-regen |
1163 |
- eselect emacs update ifunset |
1164 |
-} |
1165 |
|
1166 |
diff --git a/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch b/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch |
1167 |
deleted file mode 100644 |
1168 |
index 1638e5f..0000000 |
1169 |
--- a/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch |
1170 |
+++ /dev/null |
1171 |
@@ -1,58 +0,0 @@ |
1172 |
-From http://www.openwall.com/lists/musl/2015/02/03/1 |
1173 |
- |
1174 |
---- emacs-24.3.orig/src/alloc.c |
1175 |
-+++ emacs-24.3/src/alloc.c |
1176 |
-@@ -47,6 +47,13 @@ |
1177 |
- |
1178 |
- #include <verify.h> |
1179 |
- |
1180 |
-+static void *initial_brk; |
1181 |
-+__attribute__((__constructor__)) |
1182 |
-+static void init() |
1183 |
-+{ |
1184 |
-+ initial_brk = sbrk(0); |
1185 |
-+} |
1186 |
-+ |
1187 |
- /* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects. |
1188 |
- Doable only if GC_MARK_STACK. */ |
1189 |
- #if ! GC_MARK_STACK |
1190 |
-@@ -699,6 +706,14 @@ |
1191 |
- { |
1192 |
- void *val; |
1193 |
- |
1194 |
-+ if (block && block < initial_brk) { |
1195 |
-+ size_t len = (char *)initial_brk - (char *)block; |
1196 |
-+ if (len > size) len = size; |
1197 |
-+ void *p = xmalloc(size); |
1198 |
-+ memcpy(p, block, len); |
1199 |
-+ return p; |
1200 |
-+ } |
1201 |
-+ |
1202 |
- MALLOC_BLOCK_INPUT; |
1203 |
- /* We must call malloc explicitly when BLOCK is 0, since some |
1204 |
- reallocs don't do this. */ |
1205 |
-@@ -720,6 +735,7 @@ |
1206 |
- void |
1207 |
- xfree (void *block) |
1208 |
- { |
1209 |
-+ if (block < initial_brk) return; |
1210 |
- if (!block) |
1211 |
- return; |
1212 |
- MALLOC_BLOCK_INPUT; |
1213 |
-@@ -910,6 +926,7 @@ |
1214 |
- static void |
1215 |
- lisp_free (void *block) |
1216 |
- { |
1217 |
-+ if (block < initial_brk) return; |
1218 |
- MALLOC_BLOCK_INPUT; |
1219 |
- free (block); |
1220 |
- #if GC_MARK_STACK && !defined GC_MALLOC_CHECK |
1221 |
-@@ -1117,6 +1134,8 @@ |
1222 |
- { |
1223 |
- struct ablock *ablock = block; |
1224 |
- struct ablocks *abase = ABLOCK_ABASE (ablock); |
1225 |
-+ |
1226 |
-+ if (block < initial_brk) return; |
1227 |
- |
1228 |
- MALLOC_BLOCK_INPUT; |
1229 |
- #if GC_MARK_STACK && !defined GC_MALLOC_CHECK |
1230 |
|
1231 |
diff --git a/app-editors/emacs/files/emacs-24.3-stderr.patch b/app-editors/emacs/files/emacs-24.3-stderr.patch |
1232 |
deleted file mode 100644 |
1233 |
index 8c7d552..0000000 |
1234 |
--- a/app-editors/emacs/files/emacs-24.3-stderr.patch |
1235 |
+++ /dev/null |
1236 |
@@ -1,11 +0,0 @@ |
1237 |
---- emacs-24.3.orig/src/print.c |
1238 |
-+++ emacs-24.3/src/print.c |
1239 |
-@@ -733,7 +733,7 @@ |
1240 |
- print_output_debug_flag = x; |
1241 |
- } |
1242 |
- |
1243 |
--#if defined (GNU_LINUX) |
1244 |
-+#if 0 |
1245 |
- |
1246 |
- /* This functionality is not vitally important in general, so we rely on |
1247 |
- non-portable ability to use stderr as lvalue. */ |
1248 |
|
1249 |
diff --git a/app-editors/emacs/files/emacs-24.4-configure.patch b/app-editors/emacs/files/emacs-24.4-configure.patch |
1250 |
deleted file mode 100644 |
1251 |
index 8c63009..0000000 |
1252 |
--- a/app-editors/emacs/files/emacs-24.4-configure.patch |
1253 |
+++ /dev/null |
1254 |
@@ -1,10 +0,0 @@ |
1255 |
---- a/configure.ac 2015-02-03 20:27:53.649248696 -0100 |
1256 |
-+++ b/configure.ac 2015-02-03 20:29:40.708910266 -0100 |
1257 |
-@@ -2004,6 +2004,7 @@ |
1258 |
- ## darwin ld insists on the use of malloc routines in the System framework. |
1259 |
- darwin|sol2-10) system_malloc=yes ;; |
1260 |
- esac |
1261 |
-+system_malloc=yes |
1262 |
- |
1263 |
- GMALLOC_OBJ= |
1264 |
- if test "${system_malloc}" = "yes"; then |
1265 |
|
1266 |
diff --git a/app-editors/emacs/files/emacs-24.4-lisp.patch b/app-editors/emacs/files/emacs-24.4-lisp.patch |
1267 |
deleted file mode 100644 |
1268 |
index bc8a3f7..0000000 |
1269 |
--- a/app-editors/emacs/files/emacs-24.4-lisp.patch |
1270 |
+++ /dev/null |
1271 |
@@ -1,10 +0,0 @@ |
1272 |
---- a/src/lisp.h 2015-02-03 20:42:39.233177373 -0100 |
1273 |
-+++ b/src/lisp.h 2015-02-03 20:44:01.780145394 -0100 |
1274 |
-@@ -270,6 +270,7 @@ |
1275 |
- This can be used in #if, e.g., '#if VAL_MAX < UINTPTR_MAX' below. */ |
1276 |
- #define VAL_MAX (EMACS_INT_MAX >> (GCTYPEBITS - 1)) |
1277 |
- |
1278 |
-+#define USE_LSB_TAG 1 |
1279 |
- /* Unless otherwise specified, use USE_LSB_TAG on systems where: */ |
1280 |
- #ifndef USE_LSB_TAG |
1281 |
- /* 1. We know malloc returns a multiple of 8. */ |
1282 |
|
1283 |
diff --git a/app-editors/emacs/files/emacs-24.4-preload-hack.patch b/app-editors/emacs/files/emacs-24.4-preload-hack.patch |
1284 |
deleted file mode 100644 |
1285 |
index 8bed0bd..0000000 |
1286 |
--- a/app-editors/emacs/files/emacs-24.4-preload-hack.patch |
1287 |
+++ /dev/null |
1288 |
@@ -1,11 +0,0 @@ |
1289 |
---- a/src/Makefile.in 2014-05-26 16:50:55.000000000 -0100 |
1290 |
-+++ b/src/Makefile.in 2015-02-03 20:25:11.915270649 -0100 |
1291 |
-@@ -292,7 +292,7 @@ |
1292 |
- |
1293 |
- GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ |
1294 |
- |
1295 |
--RUN_TEMACS = ./temacs |
1296 |
-+RUN_TEMACS = LD_PRELOAD=../preload.so ./temacs |
1297 |
- |
1298 |
- ## Invoke ../nt/addsection for MinGW, ":" elsewhere. |
1299 |
- TEMACS_POST_LINK = @TEMACS_POST_LINK@ |
1300 |
|
1301 |
diff --git a/app-editors/emacs/files/emacs-vcs-musl.patch b/app-editors/emacs/files/emacs-vcs-musl.patch |
1302 |
deleted file mode 100644 |
1303 |
index 95a2c26..0000000 |
1304 |
--- a/app-editors/emacs/files/emacs-vcs-musl.patch |
1305 |
+++ /dev/null |
1306 |
@@ -1,89 +0,0 @@ |
1307 |
-http://www.openwall.com/lists/musl/2015/02/03/1 |
1308 |
- |
1309 |
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/configure.ac |
1310 |
-+++ emacs/configure.ac |
1311 |
-@@ -2092,7 +2092,7 @@ |
1312 |
- |
1313 |
- system_malloc=$emacs_cv_sanitize_address |
1314 |
- |
1315 |
--hybrid_malloc= |
1316 |
-+hybrid_malloc=yes |
1317 |
- |
1318 |
- case "$opsys" in |
1319 |
- ## darwin ld insists on the use of malloc routines in the System framework. |
1320 |
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/Makefile.in |
1321 |
-+++ emacs/src/Makefile.in |
1322 |
-@@ -373,6 +373,7 @@ |
1323 |
- region-cache.o sound.o atimer.o \ |
1324 |
- doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \ |
1325 |
- profiler.o decompress.o \ |
1326 |
-+ sheap.o \ |
1327 |
- $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ |
1328 |
- $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) |
1329 |
- obj = $(base_obj) $(NS_OBJC_OBJ) |
1330 |
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/gmalloc.c |
1331 |
-+++ emacs/src/gmalloc.c |
1332 |
-@@ -72,7 +72,7 @@ |
1333 |
- #define free gfree |
1334 |
- #endif /* HYBRID_MALLOC */ |
1335 |
- |
1336 |
--#ifdef CYGWIN |
1337 |
-+//#ifdef CYGWIN |
1338 |
- extern void *bss_sbrk (ptrdiff_t size); |
1339 |
- extern int bss_sbrk_did_unexec; |
1340 |
- extern char bss_sbrk_buffer[]; |
1341 |
-@@ -80,7 +80,7 @@ |
1342 |
- #define DUMPED bss_sbrk_did_unexec |
1343 |
- #define ALLOCATED_BEFORE_DUMPING(P) \ |
1344 |
- ((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer) |
1345 |
--#endif |
1346 |
-+//#endif |
1347 |
- |
1348 |
- #ifdef __cplusplus |
1349 |
- extern "C" |
1350 |
-@@ -1525,16 +1525,19 @@ |
1351 |
- __default_morecore (ptrdiff_t increment) |
1352 |
- { |
1353 |
- void *result; |
1354 |
--#if defined (CYGWIN) |
1355 |
-+//#if defined (CYGWIN) |
1356 |
- if (!DUMPED) |
1357 |
- { |
1358 |
- return bss_sbrk (increment); |
1359 |
- } |
1360 |
--#endif |
1361 |
-+//#endif |
1362 |
-+#if 0 |
1363 |
- result = (void *) __sbrk (increment); |
1364 |
- if (result == (void *) -1) |
1365 |
- return NULL; |
1366 |
- return result; |
1367 |
-+#endif |
1368 |
-+ return NULL; |
1369 |
- } |
1370 |
- /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. |
1371 |
- |
1372 |
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/print.c |
1373 |
-+++ emacs/src/print.c |
1374 |
-@@ -755,7 +755,7 @@ |
1375 |
- print_output_debug_flag = x; |
1376 |
- } |
1377 |
- |
1378 |
--#if defined (GNU_LINUX) |
1379 |
-+#if defined (GNU_LINUX) && defined (__GLIBC__) |
1380 |
- |
1381 |
- /* This functionality is not vitally important in general, so we rely on |
1382 |
- non-portable ability to use stderr as lvalue. */ |
1383 |
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/unexelf.c |
1384 |
-+++ emacs/src/unexelf.c |
1385 |
-@@ -632,6 +632,9 @@ |
1386 |
- off_t new_file_size; |
1387 |
- void *new_break; |
1388 |
- |
1389 |
-+ extern int bss_sbrk_did_unexec; |
1390 |
-+ bss_sbrk_did_unexec = 1; |
1391 |
-+ |
1392 |
- /* Pointers to the base of the image of the two files. */ |
1393 |
- caddr_t old_base, new_base; |
1394 |
- |
1395 |
- |
1396 |
|
1397 |
diff --git a/app-editors/emacs/files/preload.c b/app-editors/emacs/files/preload.c |
1398 |
deleted file mode 100644 |
1399 |
index 65cdcef..0000000 |
1400 |
--- a/app-editors/emacs/files/preload.c |
1401 |
+++ /dev/null |
1402 |
@@ -1,88 +0,0 @@ |
1403 |
-// http://www.openwall.com/lists/musl/2015/02/03/1 |
1404 |
-#include <pthread.h> |
1405 |
-#include <stdint.h> |
1406 |
-#include <stdlib.h> |
1407 |
-#include <string.h> |
1408 |
-#include <dlfcn.h> |
1409 |
-#include <unistd.h> |
1410 |
-#include <stdio.h> |
1411 |
- |
1412 |
-static void *(*real_malloc)(size_t); |
1413 |
-static void *initial_brk; |
1414 |
- |
1415 |
-static pthread_once_t once_control[1]; |
1416 |
-static void once_func() |
1417 |
-{ |
1418 |
- real_malloc = dlsym(RTLD_NEXT, "malloc"); |
1419 |
- initial_brk = sbrk(0); |
1420 |
-} |
1421 |
- |
1422 |
-static int cmp(const void *a, const void *b) |
1423 |
-{ |
1424 |
- void *aa = *(void **)a, *bb = *(void **)b; |
1425 |
- return aa < bb ? -1 : aa > bb ? 1 : 0; |
1426 |
-} |
1427 |
- |
1428 |
-void *malloc(size_t n) |
1429 |
-{ |
1430 |
- size_t i, j, k; |
1431 |
- pthread_once(once_control, once_func); |
1432 |
- if (n < 100000 || n > (size_t)-1/2) { |
1433 |
- void *p; |
1434 |
- do p = real_malloc(n); |
1435 |
- while (p > sbrk(0) || (p && p < initial_brk)); |
1436 |
- return p; |
1437 |
- } |
1438 |
- size_t cnt = n/16384; |
1439 |
- void **list = real_malloc(sizeof *list * cnt); |
1440 |
- if (!list) return 0; |
1441 |
- for (i=0; i<cnt; i++) list[i] = 0; |
1442 |
- for (i=0; i<cnt; i++) { |
1443 |
- list[i] = real_malloc(65536 - 2*sizeof(size_t)); |
1444 |
- if (!list[i]) goto fail; |
1445 |
- if (i<cnt/4) continue; |
1446 |
- size_t base = 0; |
1447 |
- qsort(list, i+1, sizeof(void *), cmp); |
1448 |
- for (j=0; j<i; j++) { |
1449 |
- char *p = list[base]; |
1450 |
- char *s = list[j]; |
1451 |
- char *z = list[j+1]; |
1452 |
- if (z-s > 65536) { |
1453 |
- base = j+1; |
1454 |
- continue; |
1455 |
- } |
1456 |
- if (z-p < n+64) { |
1457 |
- continue; |
1458 |
- } |
1459 |
- for (k=0; k<base; k++) free(list[k]); |
1460 |
- *(size_t *)(p-sizeof(size_t)) = z-p | 1; |
1461 |
- *(size_t *)(z-2*sizeof(size_t)) = z-p | 1; |
1462 |
- for (k=j+1; k<i+1; k++) free(list[k]); |
1463 |
- free(list); |
1464 |
- return p; |
1465 |
- } |
1466 |
- } |
1467 |
-fail: |
1468 |
- for (i=0; i<cnt; i++) free(list[i]); |
1469 |
- free(list); |
1470 |
- return 0; |
1471 |
-} |
1472 |
- |
1473 |
-void *calloc(size_t n, size_t m) |
1474 |
-{ |
1475 |
- if ((size_t)-1/n <= m) n *= m; |
1476 |
- else n = (size_t)-1; |
1477 |
- void *p = malloc(n); |
1478 |
- if (p) memset(p, 0, n); |
1479 |
- return p; |
1480 |
-} |
1481 |
- |
1482 |
-void *realloc(void *p, size_t n) |
1483 |
-{ |
1484 |
- void *q = malloc(n); |
1485 |
- if (!q) return 0; |
1486 |
- size_t l = *(size_t *)((char *)p - sizeof(size_t)) & -8; |
1487 |
- memcpy(q, p, l<n ? l : n); |
1488 |
- free(p); |
1489 |
- return q; |
1490 |
-} |
1491 |
|
1492 |
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml |
1493 |
deleted file mode 100644 |
1494 |
index d0265f5..0000000 |
1495 |
--- a/app-editors/emacs/metadata.xml |
1496 |
+++ /dev/null |
1497 |
@@ -1,52 +0,0 @@ |
1498 |
-<?xml version="1.0" encoding="UTF-8"?> |
1499 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1500 |
-<pkgmetadata> |
1501 |
-<maintainer type="project"> |
1502 |
- <email>gnu-emacs@g.o</email> |
1503 |
- <name>Gentoo GNU Emacs project</name> |
1504 |
-</maintainer> |
1505 |
-<longdescription> |
1506 |
- GNU Emacs is an extensible, customizable text editor - and more. At its core |
1507 |
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language |
1508 |
- with extensions to support text editing. The features of GNU Emacs include: |
1509 |
- * Content-sensitive editing modes, including syntax coloring, for a variety |
1510 |
- of file types including plain text, source code, and HTML. |
1511 |
- * Complete built-in documentation, including a tutorial for new users. |
1512 |
- * Full Unicode support for nearly all human languages and their scripts. |
1513 |
- * Highly customizable, using Emacs Lisp code or a graphical interface. |
1514 |
- * A large number of extensions that add other functionality, including a |
1515 |
- project planner, mail and news reader, debugger interface, calendar, and |
1516 |
- more. Many of these extensions are distributed with GNU Emacs; others are |
1517 |
- available separately. |
1518 |
-</longdescription> |
1519 |
-<use> |
1520 |
- <flag name="athena">Enable the MIT Athena widget set |
1521 |
- (<pkg>x11-libs/libXaw</pkg>)</flag> |
1522 |
- <flag name="dynamic-loading">Enable loading of dynamic libraries at |
1523 |
- runtime</flag> |
1524 |
- <flag name="games">Support shared score files for games</flag> |
1525 |
- <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system |
1526 |
- font name</flag> |
1527 |
- <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file |
1528 |
- notification</flag> |
1529 |
- <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
1530 |
- system font name</flag> |
1531 |
- <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 |
1532 |
- (<pkg>x11-libs/gtk+</pkg>)</flag> |
1533 |
- <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> |
1534 |
- <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |
1535 |
- processing</flag> |
1536 |
- <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead |
1537 |
- of the internal Lisp implementations</flag> |
1538 |
- <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> |
1539 |
- <flag name="source">Install C source files and make them available for |
1540 |
- find-function</flag> |
1541 |
- <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in |
1542 |
- preference to Emacs' own scrollbars</flag> |
1543 |
- <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). |
1544 |
- This option has an effect only on architectures where "long" and |
1545 |
- "long long" types have different size.</flag> |
1546 |
- <!--flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers |
1547 |
- (requires GTK3)</flag--> |
1548 |
-</use> |
1549 |
-</pkgmetadata> |