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: Fri, 12 Apr 2019 17:30:20
Message-Id: 1555089531.759b696f825c9922e421f85645ce5ae281490c49.ulm@gentoo
1 commit: 759b696f825c9922e421f85645ce5ae281490c49
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 12 17:18:51 2019 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 12 17:18:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759b696f
7
8 app-editors/emacs: Version bump to 26.2.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 app-editors/emacs/Manifest | 1 +
14 app-editors/emacs/emacs-26.2.ebuild | 384 ++++++++++++++++++++++++++++++++++++
15 2 files changed, 385 insertions(+)
16
17 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
18 index 5bd8ae01836..1a35e95de9f 100644
19 --- a/app-editors/emacs/Manifest
20 +++ b/app-editors/emacs/Manifest
21 @@ -13,3 +13,4 @@ DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207
22 DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21
23 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
24 DIST emacs-26.2-rc1.tar.xz 44405668 BLAKE2B 05d1788b974328f53c654daa9e6fc50138271c5805dfeefae088b74450245368d25f7a721d636a3c771d5abd4bba75b1b05ef312ace7c821b8fd59d2c1f82e30 SHA512 27c5551adb0641dee6bbd962dcefece6465f0ce1c37da1be0ab56966e04c277ad8db35763ce56fd35a4643f60c6576c36aa27cac695f62bd4e4e7501d09654b5
25 +DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
26
27 diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
28 new file mode 100644
29 index 00000000000..2c7db3be3fd
30 --- /dev/null
31 +++ b/app-editors/emacs/emacs-26.2.ebuild
32 @@ -0,0 +1,384 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
39 +
40 +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
41 +HOMEPAGE="https://www.gnu.org/software/emacs/"
42 +SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
43 +
44 +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
45 +SLOT="26"
46 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
47 +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg 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"
48 +REQUIRED_USE="?? ( aqua X )"
49 +
50 +RDEPEND="sys-libs/ncurses:0=
51 + >=app-eselect/eselect-emacs-1.16
52 + >=app-emacs/emacs-common-gentoo-1.5[games?,X?]
53 + acl? ( virtual/acl )
54 + alsa? ( media-libs/alsa-lib )
55 + dbus? ( sys-apps/dbus )
56 + gpm? ( sys-libs/gpm )
57 + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
58 + kerberos? ( virtual/krb5 )
59 + lcms? ( media-libs/lcms:2 )
60 + libxml2? ( >=dev-libs/libxml2-2.2.0 )
61 + mailutils? ( net-mail/mailutils[clients] )
62 + !mailutils? ( net-libs/liblockfile )
63 + selinux? ( sys-libs/libselinux )
64 + ssl? ( net-libs/gnutls:0= )
65 + systemd? ( sys-apps/systemd )
66 + zlib? ( sys-libs/zlib )
67 + X? (
68 + x11-libs/libICE
69 + x11-libs/libSM
70 + x11-libs/libX11
71 + x11-libs/libXext
72 + x11-libs/libXfixes
73 + x11-libs/libXinerama
74 + x11-libs/libXrandr
75 + x11-libs/libxcb
76 + x11-misc/xbitmaps
77 + gconf? ( >=gnome-base/gconf-2.26.2 )
78 + gsettings? ( >=dev-libs/glib-2.28.6 )
79 + gif? ( media-libs/giflib:0= )
80 + jpeg? ( virtual/jpeg:0= )
81 + png? ( >=media-libs/libpng-1.4:0= )
82 + svg? ( >=gnome-base/librsvg-2.0 )
83 + tiff? ( media-libs/tiff:0 )
84 + xpm? ( x11-libs/libXpm )
85 + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
86 + xft? (
87 + media-libs/fontconfig
88 + media-libs/freetype
89 + x11-libs/libXft
90 + x11-libs/libXrender
91 + cairo? ( >=x11-libs/cairo-1.12.18 )
92 + m17n-lib? (
93 + >=dev-libs/libotf-0.9.4
94 + >=dev-libs/m17n-lib-1.5.1
95 + )
96 + )
97 + gtk? (
98 + gtk2? ( x11-libs/gtk+:2 )
99 + !gtk2? (
100 + x11-libs/gtk+:3
101 + xwidgets? (
102 + net-libs/webkit-gtk:4=
103 + x11-libs/libXcomposite
104 + )
105 + )
106 + )
107 + !gtk? (
108 + motif? (
109 + >=x11-libs/motif-2.3:0
110 + x11-libs/libXpm
111 + x11-libs/libXmu
112 + x11-libs/libXt
113 + )
114 + !motif? (
115 + Xaw3d? (
116 + x11-libs/libXaw3d
117 + x11-libs/libXmu
118 + x11-libs/libXt
119 + )
120 + !Xaw3d? ( athena? (
121 + x11-libs/libXaw
122 + x11-libs/libXmu
123 + x11-libs/libXt
124 + ) )
125 + )
126 + )
127 + )"
128 +
129 +DEPEND="${RDEPEND}
130 + X? ( x11-base/xorg-proto )"
131 +
132 +BDEPEND="virtual/pkgconfig
133 + gzip-el? ( app-arch/gzip )"
134 +# pax_kernel? ( sys-apps/attr )
135 +
136 +RDEPEND="${RDEPEND}
137 + !<app-editors/emacs-vcs-${PV}"
138 +
139 +EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
140 +SITEFILE="20${PN}-${SLOT}-gentoo.el"
141 +# FULL_VERSION keeps the full version number, which is needed in
142 +# order to determine some path information correctly for copy/move
143 +# operations later on
144 +FULL_VERSION="${PV%%_*}"
145 +S="${WORKDIR}/emacs-${FULL_VERSION}"
146 +
147 +src_prepare() {
148 + #eapply ../patch
149 + eapply_user
150 +
151 + # Fix filename reference in redirected man page
152 + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
153 +
154 + #AT_M4DIR=m4 eautoreconf
155 +}
156 +
157 +src_configure() {
158 + strip-flags
159 + filter-flags -pie #526948
160 +
161 + if use sh; then
162 + replace-flags "-O[1-9]" -O0 #262359
163 + elif use ia64; then
164 + replace-flags "-O[2-9]" -O1 #325373
165 + else
166 + replace-flags "-O[3-9]" -O2
167 + fi
168 +
169 + local myconf
170 +
171 + if use alsa; then
172 + use sound || ewarn \
173 + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
174 + myconf+=" --with-sound=alsa"
175 + else
176 + myconf+=" --with-sound=$(usex sound oss)"
177 + fi
178 +
179 + if use X; then
180 + myconf+=" --with-x --without-ns"
181 + myconf+=" $(use_with gconf)"
182 + myconf+=" $(use_with gsettings)"
183 + myconf+=" $(use_with toolkit-scroll-bars)"
184 + myconf+=" $(use_with gif)"
185 + myconf+=" $(use_with jpeg)"
186 + myconf+=" $(use_with png)"
187 + myconf+=" $(use_with svg rsvg)"
188 + myconf+=" $(use_with tiff)"
189 + myconf+=" $(use_with xpm)"
190 + myconf+=" $(use_with imagemagick)"
191 +
192 + if use xft; then
193 + myconf+=" --with-xft"
194 + myconf+=" $(use_with cairo)"
195 + myconf+=" $(use_with m17n-lib libotf)"
196 + myconf+=" $(use_with m17n-lib m17n-flt)"
197 + else
198 + myconf+=" --without-xft"
199 + myconf+=" --without-cairo"
200 + myconf+=" --without-libotf --without-m17n-flt"
201 + use cairo && ewarn \
202 + "USE flag \"cairo\" has no effect if \"xft\" is not set."
203 + use m17n-lib && ewarn \
204 + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
205 + fi
206 +
207 + local f line
208 + if use gtk; then
209 + einfo "Configuring to build with GIMP Toolkit (GTK+)"
210 + while read line; do ewarn "${line}"; done <<-EOF
211 + Your version of GTK+ will have problems with closing open
212 + displays. This is no problem if you just use one display, but
213 + if you use more than one and close one of them Emacs may crash.
214 + See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
215 + If you intend to use more than one display, then it is strongly
216 + recommended that you compile Emacs with the Athena/Lucid or the
217 + Motif toolkit instead.
218 + EOF
219 + if use gtk2; then
220 + myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
221 + use xwidgets && ewarn \
222 + "USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
223 + else
224 + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
225 + fi
226 + for f in motif Xaw3d athena; do
227 + use ${f} && ewarn \
228 + "USE flag \"${f}\" has no effect if \"gtk\" is set."
229 + done
230 + elif use motif; then
231 + einfo "Configuring to build with Motif toolkit"
232 + myconf+=" --with-x-toolkit=motif"
233 + for f in Xaw3d athena; do
234 + use ${f} && ewarn \
235 + "USE flag \"${f}\" has no effect if \"motif\" is set."
236 + done
237 + elif use athena || use Xaw3d; then
238 + einfo "Configuring to build with Athena/Lucid toolkit"
239 + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
240 + else
241 + einfo "Configuring to build with no toolkit"
242 + myconf+=" --with-x-toolkit=no"
243 + fi
244 + if ! use gtk; then
245 + use gtk2 && ewarn \
246 + "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
247 + use xwidgets && ewarn \
248 + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
249 + fi
250 + elif use aqua; then
251 + einfo "Configuring to build with Nextstep (Cocoa) support"
252 + myconf+=" --with-ns --disable-ns-self-contained"
253 + myconf+=" --without-x"
254 + else
255 + myconf+=" --without-x --without-ns"
256 + fi
257 +
258 + econf \
259 + --program-suffix="-${EMACS_SUFFIX}" \
260 + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
261 + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
262 + --localstatedir="${EPREFIX}"/var \
263 + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
264 + --without-compress-install \
265 + --without-hesiod \
266 + --without-pop \
267 + --with-file-notification=$(usev inotify || usev gfile || echo no) \
268 + $(use_enable acl) \
269 + $(use_with dbus) \
270 + $(use_with dynamic-loading modules) \
271 + $(use_with games gameuser ":gamestat") \
272 + $(use_with gpm) \
273 + $(use_with kerberos) $(use_with kerberos kerberos5) \
274 + $(use_with lcms lcms2) \
275 + $(use_with libxml2 xml2) \
276 + $(use_with mailutils) \
277 + $(use_with selinux) \
278 + $(use_with ssl gnutls) \
279 + $(use_with systemd libsystemd) \
280 + $(use_with threads) \
281 + $(use_with wide-int) \
282 + $(use_with zlib) \
283 + ${myconf}
284 +}
285 +
286 +src_compile() {
287 + # Disable sandbox when dumping. For the unbelievers, see bug #131505
288 + emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
289 +}
290 +
291 +src_install () {
292 + emake DESTDIR="${D}" NO_BIN_LINK=t install
293 +
294 + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
295 + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
296 + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
297 +
298 + # move info dir to avoid collisions with the dir file generated by portage
299 + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
300 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
301 + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
302 +
303 + # avoid collision between slots, see bug #169033 e.g.
304 + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
305 + rm -rf "${ED}"/usr/share/{appdata,applications,icons}
306 + rm -rf "${ED}/usr/$(get_libdir)"
307 + rm -rf "${ED}"/var
308 +
309 + # remove unused <version>/site-lisp dir
310 + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
311 +
312 + # remove COPYING file (except for etc/COPYING used by describe-copying)
313 + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
314 +
315 + if use gzip-el; then
316 + # compress .el files when a corresponding .elc exists
317 + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
318 + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
319 + assert "gzip .el failed"
320 + fi
321 +
322 + local cdir
323 + if use source; then
324 + cdir="/usr/share/emacs/${FULL_VERSION}/src"
325 + insinto "${cdir}"
326 + # This is not meant to install all the source -- just the
327 + # C source you might find via find-function
328 + doins src/*.{c,h,m}
329 + elif has installsources ${FEATURES}; then
330 + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
331 + fi
332 +
333 + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
334 + X
335 + ;;; ${PN}-${SLOT} site-lisp configuration
336 + X
337 + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
338 + Y (setq find-function-C-source-directory
339 + Y "${EPREFIX}${cdir}")
340 + X (let ((path (getenv "INFOPATH"))
341 + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
342 + X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
343 + X (and path
344 + X ;; move Emacs Info dir before anything else in /usr/share/info
345 + X (let* ((p (cons nil (split-string path ":" t))) (q p))
346 + X (while (and (cdr q) (not (string-match re (cadr q))))
347 + X (setq q (cdr q)))
348 + X (setcdr q (cons dir (delete dir (cdr q))))
349 + X (setq Info-directory-list (prune-directory-list (cdr p)))))))
350 + EOF
351 + elisp-site-file-install "${T}/${SITEFILE}" || die
352 +
353 + dodoc README BUGS CONTRIBUTE
354 +
355 + if use aqua; then
356 + dodir /Applications/Gentoo
357 + rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
358 + mv nextstep/Emacs.app \
359 + "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
360 + fi
361 +
362 + DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
363 + through the Emacs eselect module, which also redirects man and info
364 + pages. Therefore, several Emacs versions can be installed at the
365 + same time. \"man emacs.eselect\" for details.
366 + \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
367 + strongly recommended that you use app-admin/emacs-updater to rebuild
368 + all byte-compiled elisp files of the installed Emacs packages."
369 + use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
370 + Installing media-fonts/font-adobe-{75,100}dpi on the X server's
371 + machine would satisfy basic Emacs requirements under X11.
372 + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
373 + for how to enable anti-aliased fonts."
374 + use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
375 + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
376 + it into /Applications by yourself."
377 + readme.gentoo_create_doc
378 +}
379 +
380 +pkg_preinst() {
381 + # move Info dir file to correct name
382 + local infodir=/usr/share/info/${EMACS_SUFFIX} f
383 + if [[ -f ${ED}${infodir}/dir.orig ]]; then
384 + mv "${ED}"${infodir}/dir{.orig,} || die
385 + elif [[ -d "${ED}"${infodir} ]]; then
386 + # this should not happen in EAPI 4
387 + ewarn "Regenerating Info directory index in ${infodir} ..."
388 + rm -f "${ED}"${infodir}/dir{,.*}
389 + for f in "${ED}"${infodir}/*; do
390 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
391 + install-info --info-dir="${ED}"${infodir} "${f}" || die
392 + fi
393 + done
394 + fi
395 +}
396 +
397 +pkg_postinst() {
398 + elisp-site-regen
399 + readme.gentoo_print_elog
400 +
401 + if use livecd; then
402 + # force an update of the emacs symlink for the livecd/dvd,
403 + # because some microemacs packages set it with USE=livecd
404 + eselect emacs update
405 + elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
406 + # refresh symlinks in case any installed files have changed
407 + eselect emacs set ${EMACS_SUFFIX}
408 + else
409 + eselect emacs update ifunset
410 + fi
411 +}
412 +
413 +pkg_postrm() {
414 + elisp-site-regen
415 + eselect emacs update ifunset
416 +}