1 |
ulm 09/05/01 19:49:00 |
2 |
|
3 |
Modified: ChangeLog emacs-cvs-23.0.9999-r1.ebuild |
4 |
Added: emacs-cvs-23.0.93.ebuild |
5 |
Log: |
6 |
New prerelease version from upstream. Remove "freetype" configure option. |
7 |
(Portage version: 2.2_rc31/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.243 app-editors/emacs-cvs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.243&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.243&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.242&r2=1.243 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v |
19 |
retrieving revision 1.242 |
20 |
retrieving revision 1.243 |
21 |
diff -u -r1.242 -r1.243 |
22 |
--- ChangeLog 5 Apr 2009 18:46:49 -0000 1.242 |
23 |
+++ ChangeLog 1 May 2009 19:49:00 -0000 1.243 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for app-editors/emacs-cvs |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.242 2009/04/05 18:46:49 armin76 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.243 2009/05/01 19:49:00 ulm Exp $ |
29 |
+ |
30 |
+*emacs-cvs-23.0.93 (01 May 2009) |
31 |
+ |
32 |
+ 01 May 2009; Ulrich Mueller <ulm@g.o> +emacs-cvs-23.0.93.ebuild, |
33 |
+ emacs-cvs-23.0.9999-r1.ebuild: |
34 |
+ New prerelease version from upstream. Remove "freetype" configure option. |
35 |
|
36 |
05 Apr 2009; Raúl Porcel <armin76@g.o> emacs-cvs-23.0.92.ebuild, |
37 |
emacs-cvs-23.0.9999-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.9 app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild?rev=1.9&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild?rev=1.9&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild?r1=1.8&r2=1.9 |
46 |
|
47 |
Index: emacs-cvs-23.0.9999-r1.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v |
50 |
retrieving revision 1.8 |
51 |
retrieving revision 1.9 |
52 |
diff -u -r1.8 -r1.9 |
53 |
--- emacs-cvs-23.0.9999-r1.ebuild 5 Apr 2009 18:46:49 -0000 1.8 |
54 |
+++ emacs-cvs-23.0.9999-r1.ebuild 1 May 2009 19:49:00 -0000 1.9 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2009 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.8 2009/04/05 18:46:49 armin76 Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.9 2009/05/01 19:49:00 ulm Exp $ |
60 |
|
61 |
EAPI=2 |
62 |
|
63 |
@@ -142,7 +142,7 @@ |
64 |
myconf="${myconf} $(use_with gif) $(use_with jpeg)" |
65 |
myconf="${myconf} $(use_with png) $(use_with svg rsvg)" |
66 |
myconf="${myconf} $(use_with tiff) $(use_with xpm)" |
67 |
- myconf="${myconf} $(use_with xft freetype) $(use_with xft)" |
68 |
+ myconf="${myconf} $(use_with xft)" |
69 |
|
70 |
if use xft; then |
71 |
myconf="${myconf} $(use_with m17n-lib libotf)" |
72 |
|
73 |
|
74 |
|
75 |
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild |
76 |
|
77 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild?rev=1.1&view=markup |
78 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild?rev=1.1&content-type=text/plain |
79 |
|
80 |
Index: emacs-cvs-23.0.93.ebuild |
81 |
=================================================================== |
82 |
# Copyright 1999-2009 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild,v 1.1 2009/05/01 19:49:00 ulm Exp $ |
85 |
|
86 |
EAPI=2 |
87 |
|
88 |
inherit autotools elisp-common eutils flag-o-matic |
89 |
|
90 |
if [ "${PV##*.}" = "9999" ]; then |
91 |
ECVS_AUTH="pserver" |
92 |
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" |
93 |
ECVS_MODULE="emacs" |
94 |
ECVS_BRANCH="HEAD" |
95 |
ECVS_LOCALNAME="emacs" |
96 |
inherit cvs |
97 |
SRC_URI="" |
98 |
FULL_VERSION="" |
99 |
S="${WORKDIR}/${ECVS_LOCALNAME}" |
100 |
else |
101 |
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz |
102 |
ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" |
103 |
# FULL_VERSION keeps the full version number, which is needed in |
104 |
# order to determine some path information correctly for copy/move |
105 |
# operations later on |
106 |
FULL_VERSION="${PV%%_*}" |
107 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
108 |
fi |
109 |
|
110 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
111 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
112 |
|
113 |
LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C" |
114 |
SLOT="23" |
115 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
116 |
IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
117 |
RESTRICT="strip" |
118 |
|
119 |
RDEPEND="sys-libs/ncurses |
120 |
>=app-admin/eselect-emacs-1.2 |
121 |
net-libs/liblockfile |
122 |
hesiod? ( net-dns/hesiod ) |
123 |
kerberos? ( virtual/krb5 ) |
124 |
alsa? ( media-libs/alsa-lib ) |
125 |
gpm? ( sys-libs/gpm ) |
126 |
dbus? ( sys-apps/dbus ) |
127 |
X? ( |
128 |
x11-libs/libXmu |
129 |
x11-libs/libXt |
130 |
x11-misc/xbitmaps |
131 |
gif? ( media-libs/giflib ) |
132 |
jpeg? ( media-libs/jpeg ) |
133 |
png? ( media-libs/libpng ) |
134 |
svg? ( >=gnome-base/librsvg-2.0 ) |
135 |
tiff? ( media-libs/tiff ) |
136 |
xpm? ( x11-libs/libXpm ) |
137 |
xft? ( |
138 |
media-libs/fontconfig |
139 |
media-libs/freetype |
140 |
x11-libs/libXft |
141 |
m17n-lib? ( |
142 |
>=dev-libs/libotf-0.9.4 |
143 |
>=dev-libs/m17n-lib-1.5.1 |
144 |
) |
145 |
) |
146 |
gtk? ( x11-libs/gtk+:2 ) |
147 |
!gtk? ( |
148 |
Xaw3d? ( x11-libs/Xaw3d ) |
149 |
!Xaw3d? ( motif? ( x11-libs/openmotif ) ) |
150 |
) |
151 |
)" |
152 |
|
153 |
DEPEND="${RDEPEND} |
154 |
dev-util/pkgconfig |
155 |
gzip-el? ( app-arch/gzip )" |
156 |
|
157 |
RDEPEND="${RDEPEND} |
158 |
>=app-emacs/emacs-common-gentoo-1[X?] |
159 |
spell? ( || ( app-text/aspell app-text/ispell ) )" |
160 |
|
161 |
EMACS_SUFFIX="emacs-${SLOT}" |
162 |
SITEFILE="20${PN}-${SLOT}-gentoo.el" |
163 |
|
164 |
src_prepare() { |
165 |
if [ -z "${FULL_VERSION}" ]; then |
166 |
FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ |
167 |
| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
168 |
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
169 |
echo |
170 |
einfo "Emacs CVS branch: ${ECVS_BRANCH}" |
171 |
einfo "Emacs version number: ${FULL_VERSION}" |
172 |
[ "${FULL_VERSION%.*}" = ${PV%.*} ] \ |
173 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
174 |
echo |
175 |
fi |
176 |
|
177 |
epatch "${FILESDIR}/emacs-23.0.92-sh.patch" #262359 |
178 |
|
179 |
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
180 |
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ |
181 |
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" |
182 |
|
183 |
if ! use alsa; then |
184 |
# ALSA is detected even if not requested by its USE flag. |
185 |
# Suppress it by supplying pkg-config with a wrong library name. |
186 |
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ |
187 |
|| die "unable to sed configure.in" |
188 |
fi |
189 |
if ! use gzip-el; then |
190 |
# Emacs' build system automatically detects the gzip binary and |
191 |
# compresses el files. We don't want that so confuse it with a |
192 |
# wrong binary name |
193 |
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
194 |
|| die "unable to sed configure.in" |
195 |
fi |
196 |
|
197 |
eautoreconf |
198 |
} |
199 |
|
200 |
src_configure() { |
201 |
ALLOWED_FLAGS="" |
202 |
strip-flags |
203 |
#unset LDFLAGS |
204 |
if use sh; then |
205 |
replace-flags -O[1-9] -O0 #262359 |
206 |
else |
207 |
replace-flags -O[3-9] -O2 |
208 |
fi |
209 |
|
210 |
local myconf |
211 |
|
212 |
if use alsa && ! use sound; then |
213 |
echo |
214 |
einfo "Although sound USE flag is disabled you chose to have alsa," |
215 |
einfo "so sound is switched on anyway." |
216 |
echo |
217 |
myconf="${myconf} --with-sound" |
218 |
else |
219 |
myconf="${myconf} $(use_with sound)" |
220 |
fi |
221 |
|
222 |
if use X; then |
223 |
myconf="${myconf} --with-x" |
224 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
225 |
myconf="${myconf} $(use_with gif) $(use_with jpeg)" |
226 |
myconf="${myconf} $(use_with png) $(use_with svg rsvg)" |
227 |
myconf="${myconf} $(use_with tiff) $(use_with xpm)" |
228 |
myconf="${myconf} $(use_with xft)" |
229 |
|
230 |
if use xft; then |
231 |
myconf="${myconf} $(use_with m17n-lib libotf)" |
232 |
myconf="${myconf} $(use_with m17n-lib m17n-flt)" |
233 |
else |
234 |
myconf="${myconf} --without-libotf --without-m17n-flt" |
235 |
use m17n-lib && einfo \ |
236 |
"USE flag \"m17n-lib\" has no effect because xft is not set." |
237 |
fi |
238 |
|
239 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
240 |
# possibilities. Emacs upstream thinks this should be standard |
241 |
# policy on all distributions |
242 |
if use gtk; then |
243 |
einfo "Configuring to build with GIMP Toolkit (GTK+)" |
244 |
myconf="${myconf} --with-x-toolkit=gtk" |
245 |
elif use Xaw3d; then |
246 |
einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" |
247 |
myconf="${myconf} --with-x-toolkit=athena" |
248 |
elif use motif; then |
249 |
einfo "Configuring to build with Motif toolkit" |
250 |
myconf="${myconf} --with-x-toolkit=motif" |
251 |
else |
252 |
einfo "Configuring to build with no toolkit" |
253 |
myconf="${myconf} --with-x-toolkit=no" |
254 |
fi |
255 |
|
256 |
local f tk= |
257 |
for f in gtk Xaw3d motif; do |
258 |
use ${f} || continue |
259 |
[ "${tk}" ] \ |
260 |
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
261 |
tk="${tk}${tk:+ }${f}" |
262 |
done |
263 |
else |
264 |
myconf="${myconf} --without-x" |
265 |
fi |
266 |
|
267 |
myconf="${myconf} $(use_with hesiod)" |
268 |
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" |
269 |
myconf="${myconf} $(use_with gpm) $(use_with dbus)" |
270 |
|
271 |
econf \ |
272 |
--program-suffix=-${EMACS_SUFFIX} \ |
273 |
--infodir=/usr/share/info/${EMACS_SUFFIX} \ |
274 |
${myconf} || die "econf emacs failed" |
275 |
} |
276 |
|
277 |
src_compile() { |
278 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
279 |
if [ "${PV##*.}" = "9999" ]; then |
280 |
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
281 |
# cleanup, otherwise emacs will be dumped again in src_install |
282 |
(cd src; emake versionclean) |
283 |
fi |
284 |
emake CC="$(tc-getCC)" || die "emake failed" |
285 |
} |
286 |
|
287 |
src_install () { |
288 |
local i m |
289 |
|
290 |
emake install DESTDIR="${D}" || die "make install failed" |
291 |
|
292 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
293 |
|| die "removing duplicate emacs executable failed" |
294 |
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ |
295 |
|| die "moving Emacs executable failed" |
296 |
|
297 |
# move info documentation to the correct place |
298 |
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do |
299 |
mv "${i}" "${i}.info" || die "mv info failed" |
300 |
done |
301 |
|
302 |
# move man pages to the correct place |
303 |
for m in "${D}"/usr/share/man/man1/* ; do |
304 |
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" |
305 |
done |
306 |
|
307 |
# avoid collision between slots, see bug #169033 e.g. |
308 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
309 |
rm -rf "${D}"/usr/share/{applications,icons} |
310 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
311 |
keepdir /var/lib/games/emacs |
312 |
|
313 |
local c=";;" |
314 |
if use source; then |
315 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
316 |
# This is not meant to install all the source -- just the |
317 |
# C source you might find via find-function |
318 |
doins src/*.[ch] |
319 |
c="" |
320 |
fi |
321 |
|
322 |
sed 's/^X//' >"${SITEFILE}" <<-EOF |
323 |
X |
324 |
;;; ${PN}-${SLOT} site-lisp configuration |
325 |
X |
326 |
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
327 |
X ${c}(setq find-function-C-source-directory |
328 |
X ${c} "/usr/share/emacs/${FULL_VERSION}/src") |
329 |
X (let ((path (getenv "INFOPATH")) |
330 |
X (dir "/usr/share/info/${EMACS_SUFFIX}")) |
331 |
X (and path |
332 |
X ;; move Emacs Info dir to beginning of list |
333 |
X (setq Info-directory-list |
334 |
X (cons dir (delete dir (split-string path ":" t))))))) |
335 |
EOF |
336 |
elisp-site-file-install "${SITEFILE}" || die |
337 |
|
338 |
dodoc README BUGS || die "dodoc failed" |
339 |
} |
340 |
|
341 |
emacs-infodir-rebuild() { |
342 |
# Depending on the Portage version, the Info dir file is compressed |
343 |
# or removed. It is only rebuilt by Portage if our directory is in |
344 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
345 |
|
346 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
347 |
[ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo |
348 |
einfo "Regenerating Info directory index in ${infodir} ..." |
349 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
350 |
for f in "${ROOT}"${infodir}/*.info*; do |
351 |
[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \ |
352 |
&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
353 |
done |
354 |
rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty |
355 |
echo |
356 |
} |
357 |
|
358 |
pkg_postinst() { |
359 |
local f |
360 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
361 |
[ -e "${f}" ] || touch "${f}" |
362 |
done |
363 |
|
364 |
elisp-site-regen |
365 |
emacs-infodir-rebuild |
366 |
eselect emacs update ifunset |
367 |
|
368 |
echo |
369 |
elog "You can set the version to be started by /usr/bin/emacs through" |
370 |
elog "the Emacs eselect module, which also redirects man and info pages." |
371 |
elog "You can therefore test emacs-cvs along with the stable release." |
372 |
elog "\"man emacs.eselect\" for details." |
373 |
} |
374 |
|
375 |
pkg_postrm() { |
376 |
elisp-site-regen |
377 |
emacs-infodir-rebuild |
378 |
eselect emacs update ifunset |
379 |
} |