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