Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
Date: Sat, 01 Aug 2020 18:09:33
Message-Id: 1596305288.9a8bf5b4fe3732c561ad5d3c30ed689a08c2ad8c.ulm@gentoo
1 commit: 9a8bf5b4fe3732c561ad5d3c30ed689a08c2ad8c
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 1 18:05:57 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 1 18:08:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8bf5b4
7
8 app-editors/emacs: Remove old.
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 app-editors/emacs/Manifest | 3 -
14 app-editors/emacs/emacs-27.0.50_pre20191223.ebuild | 412 ---------------------
15 app-editors/emacs/emacs-27.0.90.ebuild | 412 ---------------------
16 app-editors/emacs/emacs-27.0.91.ebuild | 412 ---------------------
17 4 files changed, 1239 deletions(-)
18
19 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
20 index 945e9409b33..a844a97724b 100644
21 --- a/app-editors/emacs/Manifest
22 +++ b/app-editors/emacs/Manifest
23 @@ -8,7 +8,4 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
24 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
25 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
26 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
27 -DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
28 -DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b
29 -DIST emacs-27.0.91.tar.xz 43730296 BLAKE2B 9ed0f425539cd22b84e3c1e2973d6a66d983e6b6de5fff30c1db2ca3fb1d761cf2c4de566b28dcffff858d032ff996a528e14daaecc45eb71aa07c3f3a6e4a74 SHA512 fcae087c7d153ce45640dc5785e0829e85b14400eec70f833e1f7ee7d3903f1e4adb469d812596fc6e7ff792ccaeda3fde5fa1c37b609ab83e8432d9f63be36a
30 DIST emacs-27.1-rc1.tar.xz 43758028 BLAKE2B e1cc285a954aa1de00c4925909f9d027c5edb71aab740cf856e47001a0b0343cbab547819b367e8391814df4f833e39f1624d914ee52381b612e41b9b02c7fb2 SHA512 fba75ee01e3f82e8fedb09f94d2a6edf76fa2e4cf1e135294a86ffa8d8444292c75cccfeb30037c25f76cd5f0c6376145c09550614e7e42ddc934a8656424134
31
32 diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
33 deleted file mode 100644
34 index b16211b43e3..00000000000
35 --- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
36 +++ /dev/null
37 @@ -1,412 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1
44 -
45 -if [[ ${PV##*.} = 9999 ]]; then
46 - inherit git-r3
47 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
48 - EGIT_BRANCH="master"
49 - EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
50 - S="${EGIT_CHECKOUT_DIR}"
51 -else
52 - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
53 - mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
54 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
55 - # FULL_VERSION keeps the full version number, which is needed in
56 - # order to determine some path information correctly for copy/move
57 - # operations later on
58 - FULL_VERSION="${PV%%_*}"
59 - S="${WORKDIR}/emacs-${FULL_VERSION}"
60 - [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
61 -fi
62 -
63 -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
64 -HOMEPAGE="https://www.gnu.org/software/emacs/"
65 -
66 -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
67 -SLOT="27-vcs"
68 -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
69 -REQUIRED_USE="?? ( aqua X )"
70 -RESTRICT="test"
71 -
72 -RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
73 - sys-libs/ncurses:0=
74 - acl? ( virtual/acl )
75 - alsa? ( media-libs/alsa-lib )
76 - dbus? ( sys-apps/dbus )
77 - games? ( acct-group/gamestat )
78 - gmp? ( dev-libs/gmp:0= )
79 - gpm? ( sys-libs/gpm )
80 - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
81 - json? ( dev-libs/jansson )
82 - kerberos? ( virtual/krb5 )
83 - lcms? ( media-libs/lcms:2 )
84 - libxml2? ( >=dev-libs/libxml2-2.2.0 )
85 - mailutils? ( net-mail/mailutils[clients] )
86 - !mailutils? ( net-libs/liblockfile )
87 - selinux? ( sys-libs/libselinux )
88 - ssl? ( net-libs/gnutls:0= )
89 - systemd? ( sys-apps/systemd )
90 - zlib? ( sys-libs/zlib )
91 - X? (
92 - x11-libs/libICE
93 - x11-libs/libSM
94 - x11-libs/libX11
95 - x11-libs/libXext
96 - x11-libs/libXfixes
97 - x11-libs/libXinerama
98 - x11-libs/libXrandr
99 - x11-libs/libxcb
100 - x11-misc/xbitmaps
101 - gconf? ( >=gnome-base/gconf-2.26.2 )
102 - gsettings? ( >=dev-libs/glib-2.28.6 )
103 - gif? ( media-libs/giflib:0= )
104 - jpeg? ( virtual/jpeg:0= )
105 - png? ( >=media-libs/libpng-1.4:0= )
106 - svg? ( >=gnome-base/librsvg-2.0 )
107 - tiff? ( media-libs/tiff:0 )
108 - xpm? ( x11-libs/libXpm )
109 - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
110 - xft? (
111 - media-libs/fontconfig
112 - media-libs/freetype
113 - x11-libs/libXft
114 - x11-libs/libXrender
115 - cairo? ( >=x11-libs/cairo-1.12.18 )
116 - harfbuzz? ( media-libs/harfbuzz:0= )
117 - m17n-lib? (
118 - >=dev-libs/libotf-0.9.4
119 - >=dev-libs/m17n-lib-1.5.1
120 - )
121 - )
122 - gtk? (
123 - gtk2? ( x11-libs/gtk+:2 )
124 - !gtk2? (
125 - x11-libs/gtk+:3
126 - xwidgets? (
127 - net-libs/webkit-gtk:4=
128 - x11-libs/libXcomposite
129 - )
130 - )
131 - )
132 - !gtk? (
133 - motif? (
134 - >=x11-libs/motif-2.3:0
135 - x11-libs/libXpm
136 - x11-libs/libXmu
137 - x11-libs/libXt
138 - )
139 - !motif? (
140 - Xaw3d? (
141 - x11-libs/libXaw3d
142 - x11-libs/libXmu
143 - x11-libs/libXt
144 - )
145 - !Xaw3d? ( athena? (
146 - x11-libs/libXaw
147 - x11-libs/libXmu
148 - x11-libs/libXt
149 - ) )
150 - )
151 - )
152 - )"
153 -
154 -DEPEND="${RDEPEND}
155 - X? ( x11-base/xorg-proto )"
156 -
157 -BDEPEND="app-eselect/eselect-emacs
158 - sys-apps/texinfo
159 - virtual/pkgconfig
160 - gzip-el? ( app-arch/gzip )"
161 -
162 -RDEPEND="${RDEPEND}
163 - !app-editors/emacs-vcs:27
164 - app-eselect/eselect-emacs"
165 -
166 -EMACS_SUFFIX="emacs-${SLOT}"
167 -SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
168 -
169 -src_prepare() {
170 - if [[ ${PV##*.} = 9999 ]]; then
171 - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
172 - configure.ac)
173 - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
174 - einfo "Emacs branch: ${EGIT_BRANCH}"
175 - einfo "Commit: ${EGIT_VERSION}"
176 - einfo "Emacs version number: ${FULL_VERSION}"
177 - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
178 - || die "Upstream version number changed to ${FULL_VERSION}"
179 - fi
180 -
181 - eapply_user
182 -
183 - # Fix filename reference in redirected man page
184 - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
185 -
186 - AT_M4DIR=m4 eautoreconf
187 -}
188 -
189 -src_configure() {
190 - strip-flags
191 - filter-flags -pie #526948
192 -
193 - if use ia64; then
194 - replace-flags "-O[2-9]" -O1 #325373
195 - else
196 - replace-flags "-O[3-9]" -O2
197 - fi
198 -
199 - local myconf
200 -
201 - if use alsa; then
202 - use sound || ewarn \
203 - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
204 - myconf+=" --with-sound=alsa"
205 - else
206 - myconf+=" --with-sound=$(usex sound oss)"
207 - fi
208 -
209 - if use X; then
210 - myconf+=" --with-x --without-ns"
211 - myconf+=" $(use_with gconf)"
212 - myconf+=" $(use_with gsettings)"
213 - myconf+=" $(use_with toolkit-scroll-bars)"
214 - myconf+=" $(use_with gif)"
215 - myconf+=" $(use_with jpeg)"
216 - myconf+=" $(use_with png)"
217 - myconf+=" $(use_with svg rsvg)"
218 - myconf+=" $(use_with tiff)"
219 - myconf+=" $(use_with xpm)"
220 - myconf+=" $(use_with imagemagick)"
221 -
222 - if use xft; then
223 - myconf+=" --with-xft"
224 - myconf+=" $(use_with cairo)"
225 - myconf+=" $(use_with harfbuzz)"
226 - myconf+=" $(use_with m17n-lib libotf)"
227 - myconf+=" $(use_with m17n-lib m17n-flt)"
228 - else
229 - myconf+=" --without-xft"
230 - myconf+=" --without-cairo"
231 - myconf+=" --without-libotf --without-m17n-flt"
232 - use cairo && ewarn \
233 - "USE flag \"cairo\" has no effect if \"xft\" is not set."
234 - use m17n-lib && ewarn \
235 - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
236 - fi
237 -
238 - local f line
239 - if use gtk; then
240 - einfo "Configuring to build with GIMP Toolkit (GTK+)"
241 - while read line; do ewarn "${line}"; done <<-EOF
242 - Your version of GTK+ will have problems with closing open
243 - displays. This is no problem if you just use one display, but
244 - if you use more than one and close one of them Emacs may crash.
245 - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
246 - If you intend to use more than one display, then it is strongly
247 - recommended that you compile Emacs with the Athena/Lucid or the
248 - Motif toolkit instead.
249 - EOF
250 - if use gtk2; then
251 - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
252 - use xwidgets && ewarn \
253 - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
254 - else
255 - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
256 - fi
257 - for f in motif Xaw3d athena; do
258 - use ${f} && ewarn \
259 - "USE flag \"${f}\" has no effect if \"gtk\" is set."
260 - done
261 - elif use motif; then
262 - einfo "Configuring to build with Motif toolkit"
263 - myconf+=" --with-x-toolkit=motif"
264 - for f in Xaw3d athena; do
265 - use ${f} && ewarn \
266 - "USE flag \"${f}\" has no effect if \"motif\" is set."
267 - done
268 - elif use athena || use Xaw3d; then
269 - einfo "Configuring to build with Athena/Lucid toolkit"
270 - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
271 - else
272 - einfo "Configuring to build with no toolkit"
273 - myconf+=" --with-x-toolkit=no"
274 - fi
275 - if ! use gtk; then
276 - use gtk2 && ewarn \
277 - "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
278 - use xwidgets && ewarn \
279 - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
280 - fi
281 - elif use aqua; then
282 - einfo "Configuring to build with Nextstep (Cocoa) support"
283 - myconf+=" --with-ns --disable-ns-self-contained"
284 - myconf+=" --without-x"
285 - else
286 - myconf+=" --without-x --without-ns"
287 - fi
288 -
289 - econf \
290 - --program-suffix="-${EMACS_SUFFIX}" \
291 - --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
292 - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
293 - --localstatedir="${EPREFIX}"/var \
294 - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
295 - --without-compress-install \
296 - --without-hesiod \
297 - --without-pop \
298 - --with-dumping=pdumper \
299 - --with-file-notification=$(usev inotify || usev gfile || echo no) \
300 - $(use_enable acl) \
301 - $(use_with dbus) \
302 - $(use_with dynamic-loading modules) \
303 - $(use_with games gameuser ":gamestat") \
304 - $(use_with gmp libgmp) \
305 - $(use_with gpm) \
306 - $(use_with json) \
307 - $(use_with kerberos) $(use_with kerberos kerberos5) \
308 - $(use_with lcms lcms2) \
309 - $(use_with libxml2 xml2) \
310 - $(use_with mailutils) \
311 - $(use_with selinux) \
312 - $(use_with ssl gnutls) \
313 - $(use_with systemd libsystemd) \
314 - $(use_with threads) \
315 - $(use_with wide-int) \
316 - $(use_with zlib) \
317 - ${myconf}
318 -}
319 -
320 -#src_compile() {
321 -# # Disable sandbox when dumping. For the unbelievers, see bug #131505
322 -# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
323 -#}
324 -
325 -src_install() {
326 - emake DESTDIR="${D}" NO_BIN_LINK=t install
327 -
328 - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
329 - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
330 - mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
331 -
332 - # move info dir to avoid collisions with the dir file generated by portage
333 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
334 - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
335 - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
336 -
337 - # avoid collision between slots, see bug #169033 e.g.
338 - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
339 - rm -rf "${ED}"/usr/share/{appdata,applications,icons}
340 - rm -rf "${ED}/usr/$(get_libdir)"
341 - rm -rf "${ED}"/var
342 -
343 - # remove unused <version>/site-lisp dir
344 - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
345 -
346 - # remove COPYING file (except for etc/COPYING used by describe-copying)
347 - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
348 -
349 - if use systemd; then
350 - insinto /usr/lib/systemd/user
351 - sed -e "/^##/d" \
352 - -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
353 - -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
354 - etc/emacs.service | newins - ${EMACS_SUFFIX}.service
355 - assert
356 - fi
357 -
358 - if use gzip-el; then
359 - # compress .el files when a corresponding .elc exists
360 - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
361 - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
362 - assert "gzip .el failed"
363 - fi
364 -
365 - local cdir
366 - if use source; then
367 - cdir="/usr/share/emacs/${FULL_VERSION}/src"
368 - insinto "${cdir}"
369 - # This is not meant to install all the source -- just the
370 - # C source you might find via find-function
371 - doins src/*.{c,h,m}
372 - elif has installsources ${FEATURES}; then
373 - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
374 - fi
375 -
376 - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
377 - X
378 - ;;; ${EMACS_SUFFIX} site-lisp configuration
379 - X
380 - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
381 - Y (setq find-function-C-source-directory
382 - Y "${EPREFIX}${cdir}")
383 - X (let ((path (getenv "INFOPATH"))
384 - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
385 - X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
386 - X (and path
387 - X ;; move Emacs Info dir before anything else in /usr/share
388 - X (let* ((p (cons nil (split-string path ":" t))) (q p))
389 - X (while (and (cdr q) (not (string-match re (cadr q))))
390 - X (setq q (cdr q)))
391 - X (setcdr q (cons dir (delete dir (cdr q))))
392 - X (setq Info-directory-list (prune-directory-list (cdr p)))))))
393 - EOF
394 - elisp-site-file-install "${T}/${SITEFILE}" || die
395 -
396 - dodoc README BUGS CONTRIBUTE
397 -
398 - if use aqua; then
399 - dodir /Applications/Gentoo
400 - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
401 - mv nextstep/Emacs.app \
402 - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
403 - fi
404 -
405 - local DOC_CONTENTS="You can set the version to be started by
406 - /usr/bin/emacs through the Emacs eselect module, which also
407 - redirects man and info pages. Therefore, several Emacs versions can
408 - be installed at the same time. \"man emacs.eselect\" for details.
409 - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
410 - strongly recommended that you use app-admin/emacs-updater to rebuild
411 - all byte-compiled elisp files of the installed Emacs packages."
412 - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
413 - Installing media-fonts/font-adobe-{75,100}dpi on the X server's
414 - machine would satisfy basic Emacs requirements under X11.
415 - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
416 - for how to enable anti-aliased fonts."
417 - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
418 - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
419 - it into /Applications by yourself."
420 - readme.gentoo_create_doc
421 -}
422 -
423 -pkg_preinst() {
424 - # move Info dir file to correct name
425 - if [[ -d ${ED}/usr/share/info ]]; then
426 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
427 - fi
428 -}
429 -
430 -pkg_postinst() {
431 - elisp-site-regen
432 - readme.gentoo_print_elog
433 -
434 - if use livecd; then
435 - # force an update of the emacs symlink for the livecd/dvd,
436 - # because some microemacs packages set it with USE=livecd
437 - eselect emacs update
438 - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
439 - # refresh symlinks in case any installed files have changed
440 - eselect emacs set ${EMACS_SUFFIX}
441 - else
442 - eselect emacs update ifunset
443 - fi
444 -}
445 -
446 -pkg_postrm() {
447 - elisp-site-regen
448 - eselect emacs update ifunset
449 -}
450
451 diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild
452 deleted file mode 100644
453 index 6b20eefd9d2..00000000000
454 --- a/app-editors/emacs/emacs-27.0.90.ebuild
455 +++ /dev/null
456 @@ -1,412 +0,0 @@
457 -# Copyright 1999-2020 Gentoo Authors
458 -# Distributed under the terms of the GNU General Public License v2
459 -
460 -EAPI=7
461 -
462 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1
463 -
464 -if [[ ${PV##*.} = 9999 ]]; then
465 - inherit git-r3
466 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
467 - EGIT_BRANCH="emacs-27"
468 - EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
469 - S="${EGIT_CHECKOUT_DIR}"
470 -else
471 - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
472 - mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
473 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
474 - # FULL_VERSION keeps the full version number, which is needed in
475 - # order to determine some path information correctly for copy/move
476 - # operations later on
477 - FULL_VERSION="${PV%%_*}"
478 - S="${WORKDIR}/emacs-${FULL_VERSION}"
479 - [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
480 -fi
481 -
482 -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
483 -HOMEPAGE="https://www.gnu.org/software/emacs/"
484 -
485 -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
486 -SLOT="27-vcs"
487 -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
488 -REQUIRED_USE="?? ( aqua X )"
489 -RESTRICT="test"
490 -
491 -RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
492 - sys-libs/ncurses:0=
493 - acl? ( virtual/acl )
494 - alsa? ( media-libs/alsa-lib )
495 - dbus? ( sys-apps/dbus )
496 - games? ( acct-group/gamestat )
497 - gmp? ( dev-libs/gmp:0= )
498 - gpm? ( sys-libs/gpm )
499 - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
500 - json? ( dev-libs/jansson )
501 - kerberos? ( virtual/krb5 )
502 - lcms? ( media-libs/lcms:2 )
503 - libxml2? ( >=dev-libs/libxml2-2.2.0 )
504 - mailutils? ( net-mail/mailutils[clients] )
505 - !mailutils? ( net-libs/liblockfile )
506 - selinux? ( sys-libs/libselinux )
507 - ssl? ( net-libs/gnutls:0= )
508 - systemd? ( sys-apps/systemd )
509 - zlib? ( sys-libs/zlib )
510 - X? (
511 - x11-libs/libICE
512 - x11-libs/libSM
513 - x11-libs/libX11
514 - x11-libs/libXext
515 - x11-libs/libXfixes
516 - x11-libs/libXinerama
517 - x11-libs/libXrandr
518 - x11-libs/libxcb
519 - x11-misc/xbitmaps
520 - gconf? ( >=gnome-base/gconf-2.26.2 )
521 - gsettings? ( >=dev-libs/glib-2.28.6 )
522 - gif? ( media-libs/giflib:0= )
523 - jpeg? ( virtual/jpeg:0= )
524 - png? ( >=media-libs/libpng-1.4:0= )
525 - svg? ( >=gnome-base/librsvg-2.0 )
526 - tiff? ( media-libs/tiff:0 )
527 - xpm? ( x11-libs/libXpm )
528 - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
529 - xft? (
530 - media-libs/fontconfig
531 - media-libs/freetype
532 - x11-libs/libXft
533 - x11-libs/libXrender
534 - cairo? ( >=x11-libs/cairo-1.12.18 )
535 - harfbuzz? ( media-libs/harfbuzz:0= )
536 - m17n-lib? (
537 - >=dev-libs/libotf-0.9.4
538 - >=dev-libs/m17n-lib-1.5.1
539 - )
540 - )
541 - gtk? (
542 - gtk2? ( x11-libs/gtk+:2 )
543 - !gtk2? (
544 - x11-libs/gtk+:3
545 - xwidgets? (
546 - net-libs/webkit-gtk:4=
547 - x11-libs/libXcomposite
548 - )
549 - )
550 - )
551 - !gtk? (
552 - motif? (
553 - >=x11-libs/motif-2.3:0
554 - x11-libs/libXpm
555 - x11-libs/libXmu
556 - x11-libs/libXt
557 - )
558 - !motif? (
559 - Xaw3d? (
560 - x11-libs/libXaw3d
561 - x11-libs/libXmu
562 - x11-libs/libXt
563 - )
564 - !Xaw3d? ( athena? (
565 - x11-libs/libXaw
566 - x11-libs/libXmu
567 - x11-libs/libXt
568 - ) )
569 - )
570 - )
571 - )"
572 -
573 -DEPEND="${RDEPEND}
574 - X? ( x11-base/xorg-proto )"
575 -
576 -BDEPEND="app-eselect/eselect-emacs
577 - sys-apps/texinfo
578 - virtual/pkgconfig
579 - gzip-el? ( app-arch/gzip )"
580 -
581 -RDEPEND="${RDEPEND}
582 - !app-editors/emacs-vcs:27
583 - app-eselect/eselect-emacs"
584 -
585 -EMACS_SUFFIX="emacs-${SLOT}"
586 -SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
587 -
588 -src_prepare() {
589 - if [[ ${PV##*.} = 9999 ]]; then
590 - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
591 - configure.ac)
592 - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
593 - einfo "Emacs branch: ${EGIT_BRANCH}"
594 - einfo "Commit: ${EGIT_VERSION}"
595 - einfo "Emacs version number: ${FULL_VERSION}"
596 - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
597 - || die "Upstream version number changed to ${FULL_VERSION}"
598 - fi
599 -
600 - eapply_user
601 -
602 - # Fix filename reference in redirected man page
603 - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
604 -
605 - AT_M4DIR=m4 eautoreconf
606 -}
607 -
608 -src_configure() {
609 - strip-flags
610 - filter-flags -pie #526948
611 -
612 - if use ia64; then
613 - replace-flags "-O[2-9]" -O1 #325373
614 - else
615 - replace-flags "-O[3-9]" -O2
616 - fi
617 -
618 - local myconf
619 -
620 - if use alsa; then
621 - use sound || ewarn \
622 - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
623 - myconf+=" --with-sound=alsa"
624 - else
625 - myconf+=" --with-sound=$(usex sound oss)"
626 - fi
627 -
628 - if use X; then
629 - myconf+=" --with-x --without-ns"
630 - myconf+=" $(use_with gconf)"
631 - myconf+=" $(use_with gsettings)"
632 - myconf+=" $(use_with toolkit-scroll-bars)"
633 - myconf+=" $(use_with gif)"
634 - myconf+=" $(use_with jpeg)"
635 - myconf+=" $(use_with png)"
636 - myconf+=" $(use_with svg rsvg)"
637 - myconf+=" $(use_with tiff)"
638 - myconf+=" $(use_with xpm)"
639 - myconf+=" $(use_with imagemagick)"
640 -
641 - if use xft; then
642 - myconf+=" --with-xft"
643 - myconf+=" $(use_with cairo)"
644 - myconf+=" $(use_with harfbuzz)"
645 - myconf+=" $(use_with m17n-lib libotf)"
646 - myconf+=" $(use_with m17n-lib m17n-flt)"
647 - else
648 - myconf+=" --without-xft"
649 - myconf+=" --without-cairo"
650 - myconf+=" --without-libotf --without-m17n-flt"
651 - use cairo && ewarn \
652 - "USE flag \"cairo\" has no effect if \"xft\" is not set."
653 - use m17n-lib && ewarn \
654 - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
655 - fi
656 -
657 - local f line
658 - if use gtk; then
659 - einfo "Configuring to build with GIMP Toolkit (GTK+)"
660 - while read line; do ewarn "${line}"; done <<-EOF
661 - Your version of GTK+ will have problems with closing open
662 - displays. This is no problem if you just use one display, but
663 - if you use more than one and close one of them Emacs may crash.
664 - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
665 - If you intend to use more than one display, then it is strongly
666 - recommended that you compile Emacs with the Athena/Lucid or the
667 - Motif toolkit instead.
668 - EOF
669 - if use gtk2; then
670 - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
671 - use xwidgets && ewarn \
672 - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
673 - else
674 - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
675 - fi
676 - for f in motif Xaw3d athena; do
677 - use ${f} && ewarn \
678 - "USE flag \"${f}\" has no effect if \"gtk\" is set."
679 - done
680 - elif use motif; then
681 - einfo "Configuring to build with Motif toolkit"
682 - myconf+=" --with-x-toolkit=motif"
683 - for f in Xaw3d athena; do
684 - use ${f} && ewarn \
685 - "USE flag \"${f}\" has no effect if \"motif\" is set."
686 - done
687 - elif use athena || use Xaw3d; then
688 - einfo "Configuring to build with Athena/Lucid toolkit"
689 - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
690 - else
691 - einfo "Configuring to build with no toolkit"
692 - myconf+=" --with-x-toolkit=no"
693 - fi
694 - if ! use gtk; then
695 - use gtk2 && ewarn \
696 - "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
697 - use xwidgets && ewarn \
698 - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
699 - fi
700 - elif use aqua; then
701 - einfo "Configuring to build with Nextstep (Cocoa) support"
702 - myconf+=" --with-ns --disable-ns-self-contained"
703 - myconf+=" --without-x"
704 - else
705 - myconf+=" --without-x --without-ns"
706 - fi
707 -
708 - econf \
709 - --program-suffix="-${EMACS_SUFFIX}" \
710 - --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
711 - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
712 - --localstatedir="${EPREFIX}"/var \
713 - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
714 - --without-compress-install \
715 - --without-hesiod \
716 - --without-pop \
717 - --with-dumping=pdumper \
718 - --with-file-notification=$(usev inotify || usev gfile || echo no) \
719 - $(use_enable acl) \
720 - $(use_with dbus) \
721 - $(use_with dynamic-loading modules) \
722 - $(use_with games gameuser ":gamestat") \
723 - $(use_with gmp libgmp) \
724 - $(use_with gpm) \
725 - $(use_with json) \
726 - $(use_with kerberos) $(use_with kerberos kerberos5) \
727 - $(use_with lcms lcms2) \
728 - $(use_with libxml2 xml2) \
729 - $(use_with mailutils) \
730 - $(use_with selinux) \
731 - $(use_with ssl gnutls) \
732 - $(use_with systemd libsystemd) \
733 - $(use_with threads) \
734 - $(use_with wide-int) \
735 - $(use_with zlib) \
736 - ${myconf}
737 -}
738 -
739 -#src_compile() {
740 -# # Disable sandbox when dumping. For the unbelievers, see bug #131505
741 -# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
742 -#}
743 -
744 -src_install() {
745 - emake DESTDIR="${D}" NO_BIN_LINK=t install
746 -
747 - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
748 - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
749 - mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
750 -
751 - # move info dir to avoid collisions with the dir file generated by portage
752 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
753 - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
754 - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
755 -
756 - # avoid collision between slots, see bug #169033 e.g.
757 - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
758 - rm -rf "${ED}"/usr/share/{appdata,applications,icons}
759 - rm -rf "${ED}/usr/$(get_libdir)"
760 - rm -rf "${ED}"/var
761 -
762 - # remove unused <version>/site-lisp dir
763 - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
764 -
765 - # remove COPYING file (except for etc/COPYING used by describe-copying)
766 - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
767 -
768 - if use systemd; then
769 - insinto /usr/lib/systemd/user
770 - sed -e "/^##/d" \
771 - -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
772 - -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
773 - etc/emacs.service | newins - ${EMACS_SUFFIX}.service
774 - assert
775 - fi
776 -
777 - if use gzip-el; then
778 - # compress .el files when a corresponding .elc exists
779 - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
780 - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
781 - assert "gzip .el failed"
782 - fi
783 -
784 - local cdir
785 - if use source; then
786 - cdir="/usr/share/emacs/${FULL_VERSION}/src"
787 - insinto "${cdir}"
788 - # This is not meant to install all the source -- just the
789 - # C source you might find via find-function
790 - doins src/*.{c,h,m}
791 - elif has installsources ${FEATURES}; then
792 - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
793 - fi
794 -
795 - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
796 - X
797 - ;;; ${EMACS_SUFFIX} site-lisp configuration
798 - X
799 - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
800 - Y (setq find-function-C-source-directory
801 - Y "${EPREFIX}${cdir}")
802 - X (let ((path (getenv "INFOPATH"))
803 - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
804 - X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
805 - X (and path
806 - X ;; move Emacs Info dir before anything else in /usr/share
807 - X (let* ((p (cons nil (split-string path ":" t))) (q p))
808 - X (while (and (cdr q) (not (string-match re (cadr q))))
809 - X (setq q (cdr q)))
810 - X (setcdr q (cons dir (delete dir (cdr q))))
811 - X (setq Info-directory-list (prune-directory-list (cdr p)))))))
812 - EOF
813 - elisp-site-file-install "${T}/${SITEFILE}" || die
814 -
815 - dodoc README BUGS CONTRIBUTE
816 -
817 - if use aqua; then
818 - dodir /Applications/Gentoo
819 - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
820 - mv nextstep/Emacs.app \
821 - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
822 - fi
823 -
824 - local DOC_CONTENTS="You can set the version to be started by
825 - /usr/bin/emacs through the Emacs eselect module, which also
826 - redirects man and info pages. Therefore, several Emacs versions can
827 - be installed at the same time. \"man emacs.eselect\" for details.
828 - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
829 - strongly recommended that you use app-admin/emacs-updater to rebuild
830 - all byte-compiled elisp files of the installed Emacs packages."
831 - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
832 - Installing media-fonts/font-adobe-{75,100}dpi on the X server's
833 - machine would satisfy basic Emacs requirements under X11.
834 - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
835 - for how to enable anti-aliased fonts."
836 - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
837 - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
838 - it into /Applications by yourself."
839 - readme.gentoo_create_doc
840 -}
841 -
842 -pkg_preinst() {
843 - # move Info dir file to correct name
844 - if [[ -d ${ED}/usr/share/info ]]; then
845 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
846 - fi
847 -}
848 -
849 -pkg_postinst() {
850 - elisp-site-regen
851 - readme.gentoo_print_elog
852 -
853 - if use livecd; then
854 - # force an update of the emacs symlink for the livecd/dvd,
855 - # because some microemacs packages set it with USE=livecd
856 - eselect emacs update
857 - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
858 - # refresh symlinks in case any installed files have changed
859 - eselect emacs set ${EMACS_SUFFIX}
860 - else
861 - eselect emacs update ifunset
862 - fi
863 -}
864 -
865 -pkg_postrm() {
866 - elisp-site-regen
867 - eselect emacs update ifunset
868 -}
869
870 diff --git a/app-editors/emacs/emacs-27.0.91.ebuild b/app-editors/emacs/emacs-27.0.91.ebuild
871 deleted file mode 100644
872 index 6b20eefd9d2..00000000000
873 --- a/app-editors/emacs/emacs-27.0.91.ebuild
874 +++ /dev/null
875 @@ -1,412 +0,0 @@
876 -# Copyright 1999-2020 Gentoo Authors
877 -# Distributed under the terms of the GNU General Public License v2
878 -
879 -EAPI=7
880 -
881 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1
882 -
883 -if [[ ${PV##*.} = 9999 ]]; then
884 - inherit git-r3
885 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
886 - EGIT_BRANCH="emacs-27"
887 - EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
888 - S="${EGIT_CHECKOUT_DIR}"
889 -else
890 - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
891 - mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
892 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
893 - # FULL_VERSION keeps the full version number, which is needed in
894 - # order to determine some path information correctly for copy/move
895 - # operations later on
896 - FULL_VERSION="${PV%%_*}"
897 - S="${WORKDIR}/emacs-${FULL_VERSION}"
898 - [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
899 -fi
900 -
901 -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
902 -HOMEPAGE="https://www.gnu.org/software/emacs/"
903 -
904 -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
905 -SLOT="27-vcs"
906 -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
907 -REQUIRED_USE="?? ( aqua X )"
908 -RESTRICT="test"
909 -
910 -RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
911 - sys-libs/ncurses:0=
912 - acl? ( virtual/acl )
913 - alsa? ( media-libs/alsa-lib )
914 - dbus? ( sys-apps/dbus )
915 - games? ( acct-group/gamestat )
916 - gmp? ( dev-libs/gmp:0= )
917 - gpm? ( sys-libs/gpm )
918 - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
919 - json? ( dev-libs/jansson )
920 - kerberos? ( virtual/krb5 )
921 - lcms? ( media-libs/lcms:2 )
922 - libxml2? ( >=dev-libs/libxml2-2.2.0 )
923 - mailutils? ( net-mail/mailutils[clients] )
924 - !mailutils? ( net-libs/liblockfile )
925 - selinux? ( sys-libs/libselinux )
926 - ssl? ( net-libs/gnutls:0= )
927 - systemd? ( sys-apps/systemd )
928 - zlib? ( sys-libs/zlib )
929 - X? (
930 - x11-libs/libICE
931 - x11-libs/libSM
932 - x11-libs/libX11
933 - x11-libs/libXext
934 - x11-libs/libXfixes
935 - x11-libs/libXinerama
936 - x11-libs/libXrandr
937 - x11-libs/libxcb
938 - x11-misc/xbitmaps
939 - gconf? ( >=gnome-base/gconf-2.26.2 )
940 - gsettings? ( >=dev-libs/glib-2.28.6 )
941 - gif? ( media-libs/giflib:0= )
942 - jpeg? ( virtual/jpeg:0= )
943 - png? ( >=media-libs/libpng-1.4:0= )
944 - svg? ( >=gnome-base/librsvg-2.0 )
945 - tiff? ( media-libs/tiff:0 )
946 - xpm? ( x11-libs/libXpm )
947 - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
948 - xft? (
949 - media-libs/fontconfig
950 - media-libs/freetype
951 - x11-libs/libXft
952 - x11-libs/libXrender
953 - cairo? ( >=x11-libs/cairo-1.12.18 )
954 - harfbuzz? ( media-libs/harfbuzz:0= )
955 - m17n-lib? (
956 - >=dev-libs/libotf-0.9.4
957 - >=dev-libs/m17n-lib-1.5.1
958 - )
959 - )
960 - gtk? (
961 - gtk2? ( x11-libs/gtk+:2 )
962 - !gtk2? (
963 - x11-libs/gtk+:3
964 - xwidgets? (
965 - net-libs/webkit-gtk:4=
966 - x11-libs/libXcomposite
967 - )
968 - )
969 - )
970 - !gtk? (
971 - motif? (
972 - >=x11-libs/motif-2.3:0
973 - x11-libs/libXpm
974 - x11-libs/libXmu
975 - x11-libs/libXt
976 - )
977 - !motif? (
978 - Xaw3d? (
979 - x11-libs/libXaw3d
980 - x11-libs/libXmu
981 - x11-libs/libXt
982 - )
983 - !Xaw3d? ( athena? (
984 - x11-libs/libXaw
985 - x11-libs/libXmu
986 - x11-libs/libXt
987 - ) )
988 - )
989 - )
990 - )"
991 -
992 -DEPEND="${RDEPEND}
993 - X? ( x11-base/xorg-proto )"
994 -
995 -BDEPEND="app-eselect/eselect-emacs
996 - sys-apps/texinfo
997 - virtual/pkgconfig
998 - gzip-el? ( app-arch/gzip )"
999 -
1000 -RDEPEND="${RDEPEND}
1001 - !app-editors/emacs-vcs:27
1002 - app-eselect/eselect-emacs"
1003 -
1004 -EMACS_SUFFIX="emacs-${SLOT}"
1005 -SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
1006 -
1007 -src_prepare() {
1008 - if [[ ${PV##*.} = 9999 ]]; then
1009 - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
1010 - configure.ac)
1011 - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
1012 - einfo "Emacs branch: ${EGIT_BRANCH}"
1013 - einfo "Commit: ${EGIT_VERSION}"
1014 - einfo "Emacs version number: ${FULL_VERSION}"
1015 - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
1016 - || die "Upstream version number changed to ${FULL_VERSION}"
1017 - fi
1018 -
1019 - eapply_user
1020 -
1021 - # Fix filename reference in redirected man page
1022 - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
1023 -
1024 - AT_M4DIR=m4 eautoreconf
1025 -}
1026 -
1027 -src_configure() {
1028 - strip-flags
1029 - filter-flags -pie #526948
1030 -
1031 - if use ia64; then
1032 - replace-flags "-O[2-9]" -O1 #325373
1033 - else
1034 - replace-flags "-O[3-9]" -O2
1035 - fi
1036 -
1037 - local myconf
1038 -
1039 - if use alsa; then
1040 - use sound || ewarn \
1041 - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
1042 - myconf+=" --with-sound=alsa"
1043 - else
1044 - myconf+=" --with-sound=$(usex sound oss)"
1045 - fi
1046 -
1047 - if use X; then
1048 - myconf+=" --with-x --without-ns"
1049 - myconf+=" $(use_with gconf)"
1050 - myconf+=" $(use_with gsettings)"
1051 - myconf+=" $(use_with toolkit-scroll-bars)"
1052 - myconf+=" $(use_with gif)"
1053 - myconf+=" $(use_with jpeg)"
1054 - myconf+=" $(use_with png)"
1055 - myconf+=" $(use_with svg rsvg)"
1056 - myconf+=" $(use_with tiff)"
1057 - myconf+=" $(use_with xpm)"
1058 - myconf+=" $(use_with imagemagick)"
1059 -
1060 - if use xft; then
1061 - myconf+=" --with-xft"
1062 - myconf+=" $(use_with cairo)"
1063 - myconf+=" $(use_with harfbuzz)"
1064 - myconf+=" $(use_with m17n-lib libotf)"
1065 - myconf+=" $(use_with m17n-lib m17n-flt)"
1066 - else
1067 - myconf+=" --without-xft"
1068 - myconf+=" --without-cairo"
1069 - myconf+=" --without-libotf --without-m17n-flt"
1070 - use cairo && ewarn \
1071 - "USE flag \"cairo\" has no effect if \"xft\" is not set."
1072 - use m17n-lib && ewarn \
1073 - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
1074 - fi
1075 -
1076 - local f line
1077 - if use gtk; then
1078 - einfo "Configuring to build with GIMP Toolkit (GTK+)"
1079 - while read line; do ewarn "${line}"; done <<-EOF
1080 - Your version of GTK+ will have problems with closing open
1081 - displays. This is no problem if you just use one display, but
1082 - if you use more than one and close one of them Emacs may crash.
1083 - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
1084 - If you intend to use more than one display, then it is strongly
1085 - recommended that you compile Emacs with the Athena/Lucid or the
1086 - Motif toolkit instead.
1087 - EOF
1088 - if use gtk2; then
1089 - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
1090 - use xwidgets && ewarn \
1091 - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
1092 - else
1093 - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
1094 - fi
1095 - for f in motif Xaw3d athena; do
1096 - use ${f} && ewarn \
1097 - "USE flag \"${f}\" has no effect if \"gtk\" is set."
1098 - done
1099 - elif use motif; then
1100 - einfo "Configuring to build with Motif toolkit"
1101 - myconf+=" --with-x-toolkit=motif"
1102 - for f in Xaw3d athena; do
1103 - use ${f} && ewarn \
1104 - "USE flag \"${f}\" has no effect if \"motif\" is set."
1105 - done
1106 - elif use athena || use Xaw3d; then
1107 - einfo "Configuring to build with Athena/Lucid toolkit"
1108 - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
1109 - else
1110 - einfo "Configuring to build with no toolkit"
1111 - myconf+=" --with-x-toolkit=no"
1112 - fi
1113 - if ! use gtk; then
1114 - use gtk2 && ewarn \
1115 - "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
1116 - use xwidgets && ewarn \
1117 - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
1118 - fi
1119 - elif use aqua; then
1120 - einfo "Configuring to build with Nextstep (Cocoa) support"
1121 - myconf+=" --with-ns --disable-ns-self-contained"
1122 - myconf+=" --without-x"
1123 - else
1124 - myconf+=" --without-x --without-ns"
1125 - fi
1126 -
1127 - econf \
1128 - --program-suffix="-${EMACS_SUFFIX}" \
1129 - --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
1130 - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
1131 - --localstatedir="${EPREFIX}"/var \
1132 - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
1133 - --without-compress-install \
1134 - --without-hesiod \
1135 - --without-pop \
1136 - --with-dumping=pdumper \
1137 - --with-file-notification=$(usev inotify || usev gfile || echo no) \
1138 - $(use_enable acl) \
1139 - $(use_with dbus) \
1140 - $(use_with dynamic-loading modules) \
1141 - $(use_with games gameuser ":gamestat") \
1142 - $(use_with gmp libgmp) \
1143 - $(use_with gpm) \
1144 - $(use_with json) \
1145 - $(use_with kerberos) $(use_with kerberos kerberos5) \
1146 - $(use_with lcms lcms2) \
1147 - $(use_with libxml2 xml2) \
1148 - $(use_with mailutils) \
1149 - $(use_with selinux) \
1150 - $(use_with ssl gnutls) \
1151 - $(use_with systemd libsystemd) \
1152 - $(use_with threads) \
1153 - $(use_with wide-int) \
1154 - $(use_with zlib) \
1155 - ${myconf}
1156 -}
1157 -
1158 -#src_compile() {
1159 -# # Disable sandbox when dumping. For the unbelievers, see bug #131505
1160 -# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
1161 -#}
1162 -
1163 -src_install() {
1164 - emake DESTDIR="${D}" NO_BIN_LINK=t install
1165 -
1166 - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
1167 - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
1168 - mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
1169 -
1170 - # move info dir to avoid collisions with the dir file generated by portage
1171 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
1172 - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
1173 - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
1174 -
1175 - # avoid collision between slots, see bug #169033 e.g.
1176 - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
1177 - rm -rf "${ED}"/usr/share/{appdata,applications,icons}
1178 - rm -rf "${ED}/usr/$(get_libdir)"
1179 - rm -rf "${ED}"/var
1180 -
1181 - # remove unused <version>/site-lisp dir
1182 - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
1183 -
1184 - # remove COPYING file (except for etc/COPYING used by describe-copying)
1185 - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
1186 -
1187 - if use systemd; then
1188 - insinto /usr/lib/systemd/user
1189 - sed -e "/^##/d" \
1190 - -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
1191 - -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
1192 - etc/emacs.service | newins - ${EMACS_SUFFIX}.service
1193 - assert
1194 - fi
1195 -
1196 - if use gzip-el; then
1197 - # compress .el files when a corresponding .elc exists
1198 - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
1199 - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
1200 - assert "gzip .el failed"
1201 - fi
1202 -
1203 - local cdir
1204 - if use source; then
1205 - cdir="/usr/share/emacs/${FULL_VERSION}/src"
1206 - insinto "${cdir}"
1207 - # This is not meant to install all the source -- just the
1208 - # C source you might find via find-function
1209 - doins src/*.{c,h,m}
1210 - elif has installsources ${FEATURES}; then
1211 - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
1212 - fi
1213 -
1214 - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
1215 - X
1216 - ;;; ${EMACS_SUFFIX} site-lisp configuration
1217 - X
1218 - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
1219 - Y (setq find-function-C-source-directory
1220 - Y "${EPREFIX}${cdir}")
1221 - X (let ((path (getenv "INFOPATH"))
1222 - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
1223 - X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
1224 - X (and path
1225 - X ;; move Emacs Info dir before anything else in /usr/share
1226 - X (let* ((p (cons nil (split-string path ":" t))) (q p))
1227 - X (while (and (cdr q) (not (string-match re (cadr q))))
1228 - X (setq q (cdr q)))
1229 - X (setcdr q (cons dir (delete dir (cdr q))))
1230 - X (setq Info-directory-list (prune-directory-list (cdr p)))))))
1231 - EOF
1232 - elisp-site-file-install "${T}/${SITEFILE}" || die
1233 -
1234 - dodoc README BUGS CONTRIBUTE
1235 -
1236 - if use aqua; then
1237 - dodir /Applications/Gentoo
1238 - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
1239 - mv nextstep/Emacs.app \
1240 - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
1241 - fi
1242 -
1243 - local DOC_CONTENTS="You can set the version to be started by
1244 - /usr/bin/emacs through the Emacs eselect module, which also
1245 - redirects man and info pages. Therefore, several Emacs versions can
1246 - be installed at the same time. \"man emacs.eselect\" for details.
1247 - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
1248 - strongly recommended that you use app-admin/emacs-updater to rebuild
1249 - all byte-compiled elisp files of the installed Emacs packages."
1250 - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
1251 - Installing media-fonts/font-adobe-{75,100}dpi on the X server's
1252 - machine would satisfy basic Emacs requirements under X11.
1253 - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
1254 - for how to enable anti-aliased fonts."
1255 - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
1256 - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
1257 - it into /Applications by yourself."
1258 - readme.gentoo_create_doc
1259 -}
1260 -
1261 -pkg_preinst() {
1262 - # move Info dir file to correct name
1263 - if [[ -d ${ED}/usr/share/info ]]; then
1264 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
1265 - fi
1266 -}
1267 -
1268 -pkg_postinst() {
1269 - elisp-site-regen
1270 - readme.gentoo_print_elog
1271 -
1272 - if use livecd; then
1273 - # force an update of the emacs symlink for the livecd/dvd,
1274 - # because some microemacs packages set it with USE=livecd
1275 - eselect emacs update
1276 - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
1277 - # refresh symlinks in case any installed files have changed
1278 - eselect emacs set ${EMACS_SUFFIX}
1279 - else
1280 - eselect emacs update ifunset
1281 - fi
1282 -}
1283 -
1284 -pkg_postrm() {
1285 - elisp-site-regen
1286 - eselect emacs update ifunset
1287 -}