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