Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-25.0.50_pre20150131.ebuild emacs-vcs-25.0.50_pre20141031.ebuild
Date: Sun, 01 Feb 2015 15:15:14
Message-Id: 20150201151506.5AEF110D4B@oystercatcher.gentoo.org
1 ulm 15/02/01 15:15:06
2
3 Modified: ChangeLog
4 Added: emacs-vcs-25.0.50_pre20150131.ebuild
5 Removed: emacs-vcs-25.0.50_pre20141031.ebuild
6 Log:
7 New snapshot of trunk, last revision before the xwidget merge. Remove old.
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
10
11 Revision Changes Path
12 1.182 app-editors/emacs-vcs/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.182&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.182&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.181&r2=1.182
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
21 retrieving revision 1.181
22 retrieving revision 1.182
23 diff -u -r1.181 -r1.182
24 --- ChangeLog 25 Jan 2015 20:17:23 -0000 1.181
25 +++ ChangeLog 1 Feb 2015 15:15:06 -0000 1.182
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-editors/emacs-vcs
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.181 2015/01/25 20:17:23 ulm Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.182 2015/02/01 15:15:06 ulm Exp $
31 +
32 +*emacs-vcs-25.0.50_pre20150131 (01 Feb 2015)
33 +
34 + 01 Feb 2015; Ulrich Müller <ulm@g.o>
35 + -emacs-vcs-25.0.50_pre20141031.ebuild, +emacs-vcs-25.0.50_pre20150131.ebuild:
36 + New snapshot of trunk, last revision before the xwidget merge. Remove old.
37
38 25 Jan 2015; Ulrich Müller <ulm@g.o> metadata.xml:
39 Update flag description.
40
41
42
43 1.1 app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild?rev=1.1&content-type=text/plain
47
48 Index: emacs-vcs-25.0.50_pre20150131.ebuild
49 ===================================================================
50 # Copyright 1999-2015 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild,v 1.1 2015/02/01 15:15:06 ulm Exp $
53
54 EAPI=5
55
56 inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
57
58 if [[ ${PV##*.} = 9999 ]]; then
59 inherit git-r3
60 EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
61 EGIT_BRANCH="master"
62 EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
63 S="${EGIT_CHECKOUT_DIR}"
64 else
65 SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
66 mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
67 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
68 # FULL_VERSION keeps the full version number, which is needed in
69 # order to determine some path information correctly for copy/move
70 # operations later on
71 FULL_VERSION="${PV%%_*}"
72 #S="${WORKDIR}/emacs-${FULL_VERSION}"
73 S="${WORKDIR}/emacs"
74 fi
75
76 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
77 HOMEPAGE="http://www.gnu.org/software/emacs/"
78
79 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
80 SLOT="25"
81 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
82 REQUIRED_USE="?? ( aqua X )"
83
84 RDEPEND="sys-libs/ncurses
85 >=app-admin/eselect-emacs-1.16
86 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
87 net-libs/liblockfile
88 acl? ( virtual/acl )
89 alsa? ( media-libs/alsa-lib )
90 dbus? ( sys-apps/dbus )
91 gfile? ( >=dev-libs/glib-2.28.6 )
92 gnutls? ( net-libs/gnutls )
93 gpm? ( sys-libs/gpm )
94 hesiod? ( net-dns/hesiod )
95 kerberos? ( virtual/krb5 )
96 libxml2? ( >=dev-libs/libxml2-2.2.0 )
97 selinux? ( sys-libs/libselinux )
98 zlib? ( sys-libs/zlib )
99 X? (
100 x11-libs/libXmu
101 x11-libs/libXt
102 x11-misc/xbitmaps
103 gconf? ( >=gnome-base/gconf-2.26.2 )
104 gsettings? ( >=dev-libs/glib-2.28.6 )
105 gif? ( media-libs/giflib )
106 jpeg? ( virtual/jpeg:0= )
107 png? ( >=media-libs/libpng-1.4:0= )
108 svg? ( >=gnome-base/librsvg-2.0 )
109 tiff? ( media-libs/tiff )
110 xpm? ( x11-libs/libXpm )
111 imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
112 xft? (
113 media-libs/fontconfig
114 media-libs/freetype
115 x11-libs/libXft
116 m17n-lib? (
117 >=dev-libs/libotf-0.9.4
118 >=dev-libs/m17n-lib-1.5.1
119 )
120 )
121 gtk? (
122 gtk3? ( x11-libs/gtk+:3 )
123 !gtk3? ( x11-libs/gtk+:2 )
124 )
125 !gtk? (
126 motif? ( >=x11-libs/motif-2.3:0 )
127 !motif? (
128 Xaw3d? ( x11-libs/libXaw3d )
129 !Xaw3d? ( athena? ( x11-libs/libXaw ) )
130 )
131 )
132 )"
133
134 DEPEND="${RDEPEND}
135 virtual/pkgconfig
136 gzip-el? ( app-arch/gzip )
137 pax_kernel? (
138 sys-apps/attr
139 sys-apps/paxctl
140 )"
141
142 if [[ ${PV##*.} = 9999 ]]; then
143 DEPEND="${DEPEND}
144 sys-apps/texinfo"
145 fi
146
147 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
148 SITEFILE="20${PN}-${SLOT}-gentoo.el"
149
150 src_prepare() {
151 if [[ ${PV##*.} = 9999 ]]; then
152 FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
153 configure.ac)
154 [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
155 einfo "Emacs branch: ${EGIT_BRANCH}"
156 einfo "Commit: ${EGIT_VERSION}"
157 einfo "Emacs version number: ${FULL_VERSION}"
158 [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
159 || die "Upstream version number changed to ${FULL_VERSION}"
160 fi
161
162 epatch_user
163
164 # Fix filename reference in redirected man page
165 sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
166 || die "unable to sed ctags.1"
167
168 AT_M4DIR=m4 eautoreconf
169 }
170
171 src_configure() {
172 strip-flags
173 filter-flags -pie #526948
174
175 if use sh; then
176 replace-flags "-O[1-9]" -O0 #262359
177 elif use ia64; then
178 replace-flags "-O[2-9]" -O1 #325373
179 else
180 replace-flags "-O[3-9]" -O2
181 fi
182
183 local myconf
184
185 if use alsa; then
186 use sound || ewarn \
187 "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
188 myconf+=" --with-sound=alsa"
189 else
190 myconf+=" --with-sound=$(usex sound oss)"
191 fi
192
193 if use X; then
194 myconf+=" --with-x --without-ns"
195 myconf+=" $(use_with gconf)"
196 myconf+=" $(use_with gsettings)"
197 myconf+=" $(use_with toolkit-scroll-bars)"
198 myconf+=" $(use_with gif)"
199 myconf+=" $(use_with jpeg)"
200 myconf+=" $(use_with png)"
201 myconf+=" $(use_with svg rsvg)"
202 myconf+=" $(use_with tiff)"
203 myconf+=" $(use_with xpm)"
204 myconf+=" $(use_with imagemagick)"
205
206 if use xft; then
207 myconf+=" --with-xft"
208 myconf+=" $(use_with m17n-lib libotf)"
209 myconf+=" $(use_with m17n-lib m17n-flt)"
210 else
211 myconf+=" --without-xft"
212 myconf+=" --without-libotf --without-m17n-flt"
213 use m17n-lib && ewarn \
214 "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
215 fi
216
217 local f
218 if use gtk; then
219 einfo "Configuring to build with GIMP Toolkit (GTK+)"
220 myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
221 for f in motif Xaw3d athena; do
222 use ${f} && ewarn \
223 "USE flag \"${f}\" has no effect if \"gtk\" is set."
224 done
225 elif use motif; then
226 einfo "Configuring to build with Motif toolkit"
227 myconf+=" --with-x-toolkit=motif"
228 for f in Xaw3d athena; do
229 use ${f} && ewarn \
230 "USE flag \"${f}\" has no effect if \"motif\" is set."
231 done
232 elif use athena || use Xaw3d; then
233 einfo "Configuring to build with Athena/Lucid toolkit"
234 myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
235 else
236 einfo "Configuring to build with no toolkit"
237 myconf+=" --with-x-toolkit=no"
238 fi
239 elif use aqua; then
240 einfo "Configuring to build with Nextstep (Cocoa) support"
241 myconf+=" --with-ns --disable-ns-self-contained"
242 myconf+=" --without-x"
243 else
244 myconf+=" --without-x --without-ns"
245 fi
246
247 # Save version information in the Emacs binary. It will be available
248 # in variable "system-configuration-options".
249 myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
250 if [[ ${PV##*.} = 9999 ]]; then
251 myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
252 fi
253
254 econf \
255 --program-suffix="-${EMACS_SUFFIX}" \
256 --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
257 --localstatedir="${EPREFIX}"/var \
258 --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
259 --with-gameuser="${GAMES_USER_DED:-games}" \
260 --without-compress-install \
261 --with-file-notification=$(usev gfile || usev inotify || echo no) \
262 $(use_enable acl) \
263 $(use_with dbus) \
264 $(use_with gnutls) \
265 $(use_with gpm) \
266 $(use_with hesiod) \
267 $(use_with kerberos) $(use_with kerberos kerberos5) \
268 $(use_with libxml2 xml2) \
269 $(use_with selinux) \
270 $(use_with wide-int) \
271 $(use_with zlib) \
272 ${myconf}
273 }
274
275 src_compile() {
276 export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
277 emake
278 }
279
280 src_install () {
281 emake DESTDIR="${D}" NO_BIN_LINK=t install
282
283 mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
284 || die "moving emacs executable failed"
285 mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
286 || die "moving emacs man page failed"
287
288 # move info dir to avoid collisions with the dir file generated by portage
289 mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
290 || die "moving info dir failed"
291 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
292 docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
293
294 # avoid collision between slots, see bug #169033 e.g.
295 rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
296 rm -rf "${ED}"/usr/share/{appdata,applications,icons}
297 rm -rf "${ED}"/var
298
299 # remove unused <version>/site-lisp dir
300 rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
301
302 # remove COPYING file (except for etc/COPYING used by describe-copying)
303 rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
304
305 if use gzip-el; then
306 # compress .el files when a corresponding .elc exists
307 find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
308 -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
309 assert "gzip .el failed"
310 fi
311
312 local cdir
313 if use source; then
314 cdir="/usr/share/emacs/${FULL_VERSION}/src"
315 insinto "${cdir}"
316 # This is not meant to install all the source -- just the
317 # C source you might find via find-function
318 doins src/*.{c,h,m}
319 elif has installsources ${FEATURES}; then
320 cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
321 fi
322
323 sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
324 X
325 ;;; ${PN}-${SLOT} site-lisp configuration
326 X
327 (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
328 Y (setq find-function-C-source-directory
329 Y "${EPREFIX}${cdir}")
330 X (let ((path (getenv "INFOPATH"))
331 X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
332 X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
333 X (and path
334 X ;; move Emacs Info dir before anything else in /usr/share/info
335 X (let* ((p (cons nil (split-string path ":" t))) (q p))
336 X (while (and (cdr q) (not (string-match re (cadr q))))
337 X (setq q (cdr q)))
338 X (setcdr q (cons dir (delete dir (cdr q))))
339 X (setq Info-directory-list (prune-directory-list (cdr p)))))))
340 EOF
341 elisp-site-file-install "${T}/${SITEFILE}" || die
342
343 dodoc README BUGS CONTRIBUTE
344
345 if use aqua; then
346 dodir /Applications/Gentoo
347 rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
348 mv nextstep/Emacs.app \
349 "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
350 fi
351
352 DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
353 through the Emacs eselect module, which also redirects man and info
354 pages. Therefore, several Emacs versions can be installed at the
355 same time. \"man emacs.eselect\" for details.
356 \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
357 strongly recommended that you use app-admin/emacs-updater to rebuild
358 all byte-compiled elisp files of the installed Emacs packages."
359 use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
360 Installing media-fonts/font-adobe-{75,100}dpi on the X server's
361 machine would satisfy basic Emacs requirements under X11.
362 See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
363 for how to enable anti-aliased fonts."
364 use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
365 \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
366 it into /Applications by yourself."
367 readme.gentoo_create_doc
368 }
369
370 pkg_preinst() {
371 # move Info dir file to correct name
372 local infodir=/usr/share/info/${EMACS_SUFFIX} f
373 if [[ -f ${ED}${infodir}/dir.orig ]]; then
374 mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
375 elif [[ -d "${ED}"${infodir} ]]; then
376 # this should not happen in EAPI 4
377 ewarn "Regenerating Info directory index in ${infodir} ..."
378 rm -f "${ED}"${infodir}/dir{,.*}
379 for f in "${ED}"${infodir}/*; do
380 if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
381 install-info --info-dir="${ED}"${infodir} "${f}" \
382 || die "install-info failed"
383 fi
384 done
385 fi
386 }
387
388 pkg_postinst() {
389 elisp-site-regen
390
391 local pvr
392 for pvr in ${REPLACING_VERSIONS}; do
393 [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
394 done
395 readme.gentoo_print_elog
396
397 if use livecd; then
398 # force an update of the emacs symlink for the livecd/dvd,
399 # because some microemacs packages set it with USE=livecd
400 eselect emacs update
401 elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
402 # refresh symlinks in case any installed files have changed
403 eselect emacs set ${EMACS_SUFFIX}
404 else
405 eselect emacs update ifunset
406 fi
407 }
408
409 pkg_postrm() {
410 elisp-site-regen
411 eselect emacs update ifunset
412 }