1 |
commit: e41bfd514502f6ae23112ed6afddeb19f0bce2bc |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Thu Feb 5 18:44:40 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 7 18:59:51 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=e41bfd51 |
7 |
|
8 |
app-editors/emacs-vcs: Use hybrid malloc |
9 |
|
10 |
--- |
11 |
.../emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild | 365 +++++++++++++++++++++ |
12 |
app-editors/emacs-vcs/files/emacs-vcs-musl.patch | 89 +++++ |
13 |
app-editors/emacs-vcs/metadata.xml | 46 +++ |
14 |
3 files changed, 500 insertions(+) |
15 |
|
16 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild |
17 |
new file mode 100644 |
18 |
index 0000000..32e5e1d |
19 |
--- /dev/null |
20 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild |
21 |
@@ -0,0 +1,365 @@ |
22 |
+# Copyright 1999-2014 Gentoo Foundation |
23 |
+# Distributed under the terms of the GNU General Public License v2 |
24 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.3 2014/12/29 11:28:11 ulm Exp $ |
25 |
+ |
26 |
+EAPI=5 |
27 |
+ |
28 |
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo |
29 |
+ |
30 |
+if [[ ${PV##*.} = 9999 ]]; then |
31 |
+ inherit git-r3 |
32 |
+ EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" |
33 |
+ EGIT_BRANCH="master" |
34 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" |
35 |
+ S="${EGIT_CHECKOUT_DIR}" |
36 |
+else |
37 |
+ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz |
38 |
+ mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" |
39 |
+ KEYWORDS="~amd64 ~arm ~ppc ~x86" |
40 |
+ # FULL_VERSION keeps the full version number, which is needed in |
41 |
+ # order to determine some path information correctly for copy/move |
42 |
+ # operations later on |
43 |
+ FULL_VERSION="${PV%%_*}" |
44 |
+ #S="${WORKDIR}/emacs-${FULL_VERSION}" |
45 |
+ S="${WORKDIR}/emacs" |
46 |
+fi |
47 |
+ |
48 |
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
49 |
+HOMEPAGE="http://www.gnu.org/software/emacs/" |
50 |
+ |
51 |
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
52 |
+SLOT="25" |
53 |
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
54 |
+REQUIRED_USE="?? ( aqua X )" |
55 |
+ |
56 |
+RDEPEND="sys-libs/ncurses |
57 |
+ >=app-admin/eselect-emacs-1.16 |
58 |
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] |
59 |
+ net-libs/liblockfile |
60 |
+ acl? ( virtual/acl ) |
61 |
+ alsa? ( media-libs/alsa-lib ) |
62 |
+ dbus? ( sys-apps/dbus ) |
63 |
+ gfile? ( >=dev-libs/glib-2.28.6 ) |
64 |
+ gnutls? ( net-libs/gnutls ) |
65 |
+ gpm? ( sys-libs/gpm ) |
66 |
+ hesiod? ( net-dns/hesiod ) |
67 |
+ kerberos? ( virtual/krb5 ) |
68 |
+ libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
69 |
+ selinux? ( sys-libs/libselinux ) |
70 |
+ zlib? ( sys-libs/zlib ) |
71 |
+ X? ( |
72 |
+ x11-libs/libXmu |
73 |
+ x11-libs/libXt |
74 |
+ x11-misc/xbitmaps |
75 |
+ gconf? ( >=gnome-base/gconf-2.26.2 ) |
76 |
+ gsettings? ( >=dev-libs/glib-2.28.6 ) |
77 |
+ gif? ( media-libs/giflib ) |
78 |
+ jpeg? ( virtual/jpeg:0= ) |
79 |
+ png? ( >=media-libs/libpng-1.4:0= ) |
80 |
+ svg? ( >=gnome-base/librsvg-2.0 ) |
81 |
+ tiff? ( media-libs/tiff ) |
82 |
+ xpm? ( x11-libs/libXpm ) |
83 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) |
84 |
+ xft? ( |
85 |
+ media-libs/fontconfig |
86 |
+ media-libs/freetype |
87 |
+ x11-libs/libXft |
88 |
+ m17n-lib? ( |
89 |
+ >=dev-libs/libotf-0.9.4 |
90 |
+ >=dev-libs/m17n-lib-1.5.1 |
91 |
+ ) |
92 |
+ ) |
93 |
+ gtk? ( |
94 |
+ gtk3? ( x11-libs/gtk+:3 ) |
95 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
96 |
+ ) |
97 |
+ !gtk? ( |
98 |
+ motif? ( >=x11-libs/motif-2.3:0 ) |
99 |
+ !motif? ( |
100 |
+ Xaw3d? ( x11-libs/libXaw3d ) |
101 |
+ !Xaw3d? ( athena? ( x11-libs/libXaw ) ) |
102 |
+ ) |
103 |
+ ) |
104 |
+ )" |
105 |
+ |
106 |
+DEPEND="${RDEPEND} |
107 |
+ virtual/pkgconfig |
108 |
+ gzip-el? ( app-arch/gzip ) |
109 |
+ pax_kernel? ( |
110 |
+ sys-apps/attr |
111 |
+ sys-apps/paxctl |
112 |
+ )" |
113 |
+ |
114 |
+if [[ ${PV##*.} = 9999 ]]; then |
115 |
+ DEPEND="${DEPEND} |
116 |
+ sys-apps/texinfo" |
117 |
+fi |
118 |
+ |
119 |
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
120 |
+SITEFILE="20${PN}-${SLOT}-gentoo.el" |
121 |
+ |
122 |
+src_prepare() { |
123 |
+ epatch "${FILESDIR}"/${PN}-musl.patch |
124 |
+ |
125 |
+ if [[ ${PV##*.} = 9999 ]]; then |
126 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
127 |
+ configure.ac) |
128 |
+ [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" |
129 |
+ einfo "Emacs branch: ${EGIT_BRANCH}" |
130 |
+ einfo "Commit: ${EGIT_VERSION}" |
131 |
+ einfo "Emacs version number: ${FULL_VERSION}" |
132 |
+ [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ |
133 |
+ || die "Upstream version number changed to ${FULL_VERSION}" |
134 |
+ fi |
135 |
+ |
136 |
+ epatch_user |
137 |
+ |
138 |
+ # Fix filename reference in redirected man page |
139 |
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
140 |
+ || die "unable to sed ctags.1" |
141 |
+ |
142 |
+ AT_M4DIR=m4 eautoreconf |
143 |
+} |
144 |
+ |
145 |
+src_configure() { |
146 |
+ strip-flags |
147 |
+ filter-flags -pie #526948 |
148 |
+ |
149 |
+ if use sh; then |
150 |
+ replace-flags "-O[1-9]" -O0 #262359 |
151 |
+ elif use ia64; then |
152 |
+ replace-flags "-O[2-9]" -O1 #325373 |
153 |
+ else |
154 |
+ replace-flags "-O[3-9]" -O2 |
155 |
+ fi |
156 |
+ |
157 |
+ local myconf |
158 |
+ |
159 |
+ if use alsa; then |
160 |
+ use sound || ewarn \ |
161 |
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
162 |
+ myconf+=" --with-sound=alsa" |
163 |
+ else |
164 |
+ myconf+=" --with-sound=$(usex sound oss)" |
165 |
+ fi |
166 |
+ |
167 |
+ if use X; then |
168 |
+ myconf+=" --with-x --without-ns" |
169 |
+ myconf+=" $(use_with gconf)" |
170 |
+ myconf+=" $(use_with gsettings)" |
171 |
+ myconf+=" $(use_with toolkit-scroll-bars)" |
172 |
+ myconf+=" $(use_with gif)" |
173 |
+ myconf+=" $(use_with jpeg)" |
174 |
+ myconf+=" $(use_with png)" |
175 |
+ myconf+=" $(use_with svg rsvg)" |
176 |
+ myconf+=" $(use_with tiff)" |
177 |
+ myconf+=" $(use_with xpm)" |
178 |
+ myconf+=" $(use_with imagemagick)" |
179 |
+ |
180 |
+ if use xft; then |
181 |
+ myconf+=" --with-xft" |
182 |
+ myconf+=" $(use_with m17n-lib libotf)" |
183 |
+ myconf+=" $(use_with m17n-lib m17n-flt)" |
184 |
+ else |
185 |
+ myconf+=" --without-xft" |
186 |
+ myconf+=" --without-libotf --without-m17n-flt" |
187 |
+ use m17n-lib && ewarn \ |
188 |
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
189 |
+ fi |
190 |
+ |
191 |
+ local f |
192 |
+ if use gtk; then |
193 |
+ einfo "Configuring to build with GIMP Toolkit (GTK+)" |
194 |
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
195 |
+ for f in motif Xaw3d athena; do |
196 |
+ use ${f} && ewarn \ |
197 |
+ "USE flag \"${f}\" has no effect if \"gtk\" is set." |
198 |
+ done |
199 |
+ elif use motif; then |
200 |
+ einfo "Configuring to build with Motif toolkit" |
201 |
+ myconf+=" --with-x-toolkit=motif" |
202 |
+ for f in Xaw3d athena; do |
203 |
+ use ${f} && ewarn \ |
204 |
+ "USE flag \"${f}\" has no effect if \"motif\" is set." |
205 |
+ done |
206 |
+ elif use athena || use Xaw3d; then |
207 |
+ einfo "Configuring to build with Athena/Lucid toolkit" |
208 |
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
209 |
+ else |
210 |
+ einfo "Configuring to build with no toolkit" |
211 |
+ myconf+=" --with-x-toolkit=no" |
212 |
+ fi |
213 |
+ elif use aqua; then |
214 |
+ einfo "Configuring to build with Nextstep (Cocoa) support" |
215 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
216 |
+ myconf+=" --without-x" |
217 |
+ else |
218 |
+ myconf+=" --without-x --without-ns" |
219 |
+ fi |
220 |
+ |
221 |
+ # Save version information in the Emacs binary. It will be available |
222 |
+ # in variable "system-configuration-options". |
223 |
+ myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" |
224 |
+ if [[ ${PV##*.} = 9999 ]]; then |
225 |
+ myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}" |
226 |
+ fi |
227 |
+ |
228 |
+ econf \ |
229 |
+ --program-suffix="-${EMACS_SUFFIX}" \ |
230 |
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
231 |
+ --localstatedir="${EPREFIX}"/var \ |
232 |
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
233 |
+ --with-gameuser="${GAMES_USER_DED:-games}" \ |
234 |
+ --without-compress-install \ |
235 |
+ --with-file-notification=$(usev gfile || usev inotify || echo no) \ |
236 |
+ $(use_enable acl) \ |
237 |
+ $(use_with dbus) \ |
238 |
+ $(use_with gnutls) \ |
239 |
+ $(use_with gpm) \ |
240 |
+ $(use_with hesiod) \ |
241 |
+ $(use_with kerberos) $(use_with kerberos kerberos5) \ |
242 |
+ $(use_with libxml2 xml2) \ |
243 |
+ $(use_with selinux) \ |
244 |
+ $(use_with wide-int) \ |
245 |
+ $(use_with zlib) \ |
246 |
+ ${myconf} |
247 |
+} |
248 |
+ |
249 |
+src_compile() { |
250 |
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
251 |
+ emake |
252 |
+} |
253 |
+ |
254 |
+src_install () { |
255 |
+ emake DESTDIR="${D}" NO_BIN_LINK=t install |
256 |
+ |
257 |
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
258 |
+ || die "moving emacs executable failed" |
259 |
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
260 |
+ || die "moving emacs man page failed" |
261 |
+ |
262 |
+ # move info dir to avoid collisions with the dir file generated by portage |
263 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
264 |
+ || die "moving info dir failed" |
265 |
+ touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
266 |
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
267 |
+ |
268 |
+ # avoid collision between slots, see bug #169033 e.g. |
269 |
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
270 |
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} |
271 |
+ rm -rf "${ED}"/var |
272 |
+ |
273 |
+ # remove unused <version>/site-lisp dir |
274 |
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
275 |
+ |
276 |
+ # remove COPYING file (except for etc/COPYING used by describe-copying) |
277 |
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
278 |
+ |
279 |
+ if use gzip-el; then |
280 |
+ # compress .el files when a corresponding .elc exists |
281 |
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
282 |
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n |
283 |
+ assert "gzip .el failed" |
284 |
+ fi |
285 |
+ |
286 |
+ local cdir |
287 |
+ if use source; then |
288 |
+ cdir="/usr/share/emacs/${FULL_VERSION}/src" |
289 |
+ insinto "${cdir}" |
290 |
+ # This is not meant to install all the source -- just the |
291 |
+ # C source you might find via find-function |
292 |
+ doins src/*.{c,h,m} |
293 |
+ elif has installsources ${FEATURES}; then |
294 |
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
295 |
+ fi |
296 |
+ |
297 |
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF |
298 |
+ X |
299 |
+ ;;; ${PN}-${SLOT} site-lisp configuration |
300 |
+ X |
301 |
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
302 |
+ Y (setq find-function-C-source-directory |
303 |
+ Y "${EPREFIX}${cdir}") |
304 |
+ X (let ((path (getenv "INFOPATH")) |
305 |
+ X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
306 |
+ X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
307 |
+ X (and path |
308 |
+ X ;; move Emacs Info dir before anything else in /usr/share/info |
309 |
+ X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
310 |
+ X (while (and (cdr q) (not (string-match re (cadr q)))) |
311 |
+ X (setq q (cdr q))) |
312 |
+ X (setcdr q (cons dir (delete dir (cdr q)))) |
313 |
+ X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
314 |
+ EOF |
315 |
+ elisp-site-file-install "${T}/${SITEFILE}" || die |
316 |
+ |
317 |
+ dodoc README BUGS CONTRIBUTE |
318 |
+ |
319 |
+ if use aqua; then |
320 |
+ dodir /Applications/Gentoo |
321 |
+ rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app |
322 |
+ mv nextstep/Emacs.app \ |
323 |
+ "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die |
324 |
+ fi |
325 |
+ |
326 |
+ DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs |
327 |
+ through the Emacs eselect module, which also redirects man and info |
328 |
+ pages. Therefore, several Emacs versions can be installed at the |
329 |
+ same time. \"man emacs.eselect\" for details. |
330 |
+ \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
331 |
+ strongly recommended that you use app-admin/emacs-updater to rebuild |
332 |
+ all byte-compiled elisp files of the installed Emacs packages." |
333 |
+ use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
334 |
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
335 |
+ machine would satisfy basic Emacs requirements under X11. |
336 |
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
337 |
+ for how to enable anti-aliased fonts." |
338 |
+ use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
339 |
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
340 |
+ it into /Applications by yourself." |
341 |
+ readme.gentoo_create_doc |
342 |
+} |
343 |
+ |
344 |
+pkg_preinst() { |
345 |
+ # move Info dir file to correct name |
346 |
+ local infodir=/usr/share/info/${EMACS_SUFFIX} f |
347 |
+ if [[ -f ${ED}${infodir}/dir.orig ]]; then |
348 |
+ mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
349 |
+ elif [[ -d "${ED}"${infodir} ]]; then |
350 |
+ # this should not happen in EAPI 4 |
351 |
+ ewarn "Regenerating Info directory index in ${infodir} ..." |
352 |
+ rm -f "${ED}"${infodir}/dir{,.*} |
353 |
+ for f in "${ED}"${infodir}/*; do |
354 |
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
355 |
+ install-info --info-dir="${ED}"${infodir} "${f}" \ |
356 |
+ || die "install-info failed" |
357 |
+ fi |
358 |
+ done |
359 |
+ fi |
360 |
+} |
361 |
+ |
362 |
+pkg_postinst() { |
363 |
+ elisp-site-regen |
364 |
+ |
365 |
+ local pvr |
366 |
+ for pvr in ${REPLACING_VERSIONS}; do |
367 |
+ [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1 |
368 |
+ done |
369 |
+ readme.gentoo_print_elog |
370 |
+ |
371 |
+ if use livecd; then |
372 |
+ # force an update of the emacs symlink for the livecd/dvd, |
373 |
+ # because some microemacs packages set it with USE=livecd |
374 |
+ eselect emacs update |
375 |
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
376 |
+ # refresh symlinks in case any installed files have changed |
377 |
+ eselect emacs set ${EMACS_SUFFIX} |
378 |
+ else |
379 |
+ eselect emacs update ifunset |
380 |
+ fi |
381 |
+} |
382 |
+ |
383 |
+pkg_postrm() { |
384 |
+ elisp-site-regen |
385 |
+ eselect emacs update ifunset |
386 |
+} |
387 |
|
388 |
diff --git a/app-editors/emacs-vcs/files/emacs-vcs-musl.patch b/app-editors/emacs-vcs/files/emacs-vcs-musl.patch |
389 |
new file mode 100644 |
390 |
index 0000000..95a2c26 |
391 |
--- /dev/null |
392 |
+++ b/app-editors/emacs-vcs/files/emacs-vcs-musl.patch |
393 |
@@ -0,0 +1,89 @@ |
394 |
+http://www.openwall.com/lists/musl/2015/02/03/1 |
395 |
+ |
396 |
+--- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/configure.ac |
397 |
++++ emacs/configure.ac |
398 |
+@@ -2092,7 +2092,7 @@ |
399 |
+ |
400 |
+ system_malloc=$emacs_cv_sanitize_address |
401 |
+ |
402 |
+-hybrid_malloc= |
403 |
++hybrid_malloc=yes |
404 |
+ |
405 |
+ case "$opsys" in |
406 |
+ ## darwin ld insists on the use of malloc routines in the System framework. |
407 |
+--- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/Makefile.in |
408 |
++++ emacs/src/Makefile.in |
409 |
+@@ -373,6 +373,7 @@ |
410 |
+ region-cache.o sound.o atimer.o \ |
411 |
+ doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \ |
412 |
+ profiler.o decompress.o \ |
413 |
++ sheap.o \ |
414 |
+ $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ |
415 |
+ $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) |
416 |
+ obj = $(base_obj) $(NS_OBJC_OBJ) |
417 |
+--- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/gmalloc.c |
418 |
++++ emacs/src/gmalloc.c |
419 |
+@@ -72,7 +72,7 @@ |
420 |
+ #define free gfree |
421 |
+ #endif /* HYBRID_MALLOC */ |
422 |
+ |
423 |
+-#ifdef CYGWIN |
424 |
++//#ifdef CYGWIN |
425 |
+ extern void *bss_sbrk (ptrdiff_t size); |
426 |
+ extern int bss_sbrk_did_unexec; |
427 |
+ extern char bss_sbrk_buffer[]; |
428 |
+@@ -80,7 +80,7 @@ |
429 |
+ #define DUMPED bss_sbrk_did_unexec |
430 |
+ #define ALLOCATED_BEFORE_DUMPING(P) \ |
431 |
+ ((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer) |
432 |
+-#endif |
433 |
++//#endif |
434 |
+ |
435 |
+ #ifdef __cplusplus |
436 |
+ extern "C" |
437 |
+@@ -1525,16 +1525,19 @@ |
438 |
+ __default_morecore (ptrdiff_t increment) |
439 |
+ { |
440 |
+ void *result; |
441 |
+-#if defined (CYGWIN) |
442 |
++//#if defined (CYGWIN) |
443 |
+ if (!DUMPED) |
444 |
+ { |
445 |
+ return bss_sbrk (increment); |
446 |
+ } |
447 |
+-#endif |
448 |
++//#endif |
449 |
++#if 0 |
450 |
+ result = (void *) __sbrk (increment); |
451 |
+ if (result == (void *) -1) |
452 |
+ return NULL; |
453 |
+ return result; |
454 |
++#endif |
455 |
++ return NULL; |
456 |
+ } |
457 |
+ /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. |
458 |
+ |
459 |
+--- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/print.c |
460 |
++++ emacs/src/print.c |
461 |
+@@ -755,7 +755,7 @@ |
462 |
+ print_output_debug_flag = x; |
463 |
+ } |
464 |
+ |
465 |
+-#if defined (GNU_LINUX) |
466 |
++#if defined (GNU_LINUX) && defined (__GLIBC__) |
467 |
+ |
468 |
+ /* This functionality is not vitally important in general, so we rely on |
469 |
+ non-portable ability to use stderr as lvalue. */ |
470 |
+--- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/unexelf.c |
471 |
++++ emacs/src/unexelf.c |
472 |
+@@ -632,6 +632,9 @@ |
473 |
+ off_t new_file_size; |
474 |
+ void *new_break; |
475 |
+ |
476 |
++ extern int bss_sbrk_did_unexec; |
477 |
++ bss_sbrk_did_unexec = 1; |
478 |
++ |
479 |
+ /* Pointers to the base of the image of the two files. */ |
480 |
+ caddr_t old_base, new_base; |
481 |
+ |
482 |
+ |
483 |
|
484 |
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml |
485 |
new file mode 100644 |
486 |
index 0000000..88ecff5 |
487 |
--- /dev/null |
488 |
+++ b/app-editors/emacs-vcs/metadata.xml |
489 |
@@ -0,0 +1,46 @@ |
490 |
+<?xml version="1.0" encoding="UTF-8"?> |
491 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
492 |
+<pkgmetadata> |
493 |
+<herd>emacs</herd> |
494 |
+<longdescription> |
495 |
+ GNU Emacs is an extensible, customizable text editor - and more. At its core |
496 |
+ is an interpreter for Emacs Lisp, a dialect of the Lisp programming language |
497 |
+ with extensions to support text editing. The features of GNU Emacs include: |
498 |
+ * Content-sensitive editing modes, including syntax coloring, for a variety |
499 |
+ of file types including plain text, source code, and HTML. |
500 |
+ * Complete built-in documentation, including a tutorial for new users. |
501 |
+ * Full Unicode support for nearly all human languages and their scripts. |
502 |
+ * Highly customizable, using Emacs Lisp code or a graphical interface. |
503 |
+ * A large number of extensions that add other functionality, including a |
504 |
+ project planner, mail and news reader, debugger interface, calendar, and |
505 |
+ more. Many of these extensions are distributed with GNU Emacs; others are |
506 |
+ available separately. |
507 |
+</longdescription> |
508 |
+<use> |
509 |
+ <flag name='athena'>Enable the MIT Athena widget set |
510 |
+ (<pkg>x11-libs/libXaw</pkg>)</flag> |
511 |
+ <flag name='games'>Support shared score files for games</flag> |
512 |
+ <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system |
513 |
+ font name</flag> |
514 |
+ <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file |
515 |
+ notification</flag> |
516 |
+ <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
517 |
+ system font name</flag> |
518 |
+ <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of |
519 |
+ version 2 (<pkg>x11-libs/gtk+</pkg>)</flag> |
520 |
+ <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag> |
521 |
+ <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag> |
522 |
+ <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image |
523 |
+ processing</flag> |
524 |
+ <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead |
525 |
+ of the internal Lisp implementations</flag> |
526 |
+ <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag> |
527 |
+ <flag name='source'>Install C source files and make them available for |
528 |
+ find-function</flag> |
529 |
+ <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in |
530 |
+ preference to Emacs' own scrollbars</flag> |
531 |
+ <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit). |
532 |
+ This option has an effect only on architectures where "long" and |
533 |
+ "long long" types have different size.</flag> |
534 |
+</use> |
535 |
+</pkgmetadata> |