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