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