1 |
ulm 07/10/12 23:31:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: emacs-cvs-23.0.60.ebuild |
5 |
Log: |
6 |
Live CVS ebuild for unicode-2 branch. |
7 |
(Portage version: 2.1.3.12) |
8 |
|
9 |
Revision Changes Path |
10 |
1.163 app-editors/emacs-cvs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.163&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.163&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.162&r2=1.163 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v |
19 |
retrieving revision 1.162 |
20 |
retrieving revision 1.163 |
21 |
diff -u -r1.162 -r1.163 |
22 |
--- ChangeLog 12 Oct 2007 16:42:03 -0000 1.162 |
23 |
+++ ChangeLog 12 Oct 2007 23:31:12 -0000 1.163 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-editors/emacs-cvs |
26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.162 2007/10/12 16:42:03 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.163 2007/10/12 23:31:12 ulm Exp $ |
29 |
+ |
30 |
+*emacs-cvs-23.0.60 (12 Oct 2007) |
31 |
+ |
32 |
+ 12 Oct 2007; Ulrich Mueller <ulm@g.o> +emacs-cvs-23.0.60.ebuild: |
33 |
+ Live CVS ebuild for unicode-2 branch. |
34 |
|
35 |
12 Oct 2007; Ulrich Mueller <ulm@g.o> emacs-cvs-22.1.50-r1.ebuild, |
36 |
emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild, |
37 |
|
38 |
|
39 |
|
40 |
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: emacs-cvs-23.0.60.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2007 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild,v 1.1 2007/10/12 23:31:12 ulm Exp $ |
50 |
|
51 |
ECVS_AUTH="pserver" |
52 |
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" |
53 |
ECVS_MODULE="emacs" |
54 |
ECVS_BRANCH="emacs-unicode-2" |
55 |
ECVS_LOCALNAME="emacs-unicode" |
56 |
|
57 |
WANT_AUTOCONF="latest" |
58 |
WANT_AUTOMAKE="latest" |
59 |
|
60 |
inherit autotools cvs elisp-common eutils flag-o-matic |
61 |
|
62 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
63 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
64 |
SRC_URI="" |
65 |
|
66 |
LICENSE="GPL-3 FDL-1.2 BSD" |
67 |
SLOT="23-unicode" |
68 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
69 |
IUSE="alsa gif gpm gtk gzip-el hesiod jpeg motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" |
70 |
RESTRICT="strip" |
71 |
|
72 |
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" |
73 |
|
74 |
RDEPEND="sys-libs/ncurses |
75 |
>=app-admin/eselect-emacs-0.7-r1 |
76 |
sys-libs/zlib |
77 |
hesiod? ( net-dns/hesiod ) |
78 |
spell? ( || ( app-text/ispell app-text/aspell ) ) |
79 |
alsa? ( media-sound/alsa-headers ) |
80 |
gpm? ( sys-libs/gpm ) |
81 |
X? ( |
82 |
$X_DEPEND |
83 |
x11-misc/emacs-desktop |
84 |
gif? ( media-libs/giflib ) |
85 |
jpeg? ( media-libs/jpeg ) |
86 |
tiff? ( media-libs/tiff ) |
87 |
png? ( media-libs/libpng ) |
88 |
svg? ( >=gnome-base/librsvg-2.0 ) |
89 |
xpm? ( x11-libs/libXpm ) |
90 |
xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) |
91 |
gtk? ( =x11-libs/gtk+-2* ) |
92 |
!gtk? ( |
93 |
Xaw3d? ( x11-libs/Xaw3d ) |
94 |
!Xaw3d? ( |
95 |
motif? ( virtual/motif ) |
96 |
) |
97 |
) |
98 |
)" |
99 |
|
100 |
DEPEND="${RDEPEND} |
101 |
gzip-el? ( app-arch/gzip )" |
102 |
|
103 |
S="${WORKDIR}/${ECVS_LOCALNAME}" |
104 |
|
105 |
EMACS_SUFFIX="emacs-${SLOT}" |
106 |
|
107 |
src_unpack() { |
108 |
cvs_src_unpack |
109 |
|
110 |
cd "${S}" |
111 |
# FULL_VERSION keeps the full version number, which is needed in |
112 |
# order to determine some path information correctly for copy/move |
113 |
# operations later on |
114 |
FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ |
115 |
| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
116 |
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
117 |
echo |
118 |
einfo "Emacs CVS branch: ${ECVS_BRANCH}" |
119 |
einfo "Emacs version number: ${FULL_VERSION}" |
120 |
[ "${FULL_VERSION}" = ${PV} ] \ |
121 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
122 |
echo |
123 |
|
124 |
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
125 |
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ |
126 |
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" |
127 |
if ! use gzip-el; then |
128 |
# Emacs' build system automatically detects the gzip binary and |
129 |
# compresses el files. We don't want that so confuse it with a |
130 |
# wrong binary name |
131 |
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
132 |
|| die "unable to sed configure.in" |
133 |
fi |
134 |
|
135 |
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" |
136 |
# ALSA is detected and used even if not requested by the USE=alsa flag. |
137 |
# So remove the automagic check |
138 |
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" |
139 |
|
140 |
eautoreconf |
141 |
} |
142 |
|
143 |
src_compile() { |
144 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
145 |
ALLOWED_FLAGS="" |
146 |
strip-flags |
147 |
unset LDFLAGS |
148 |
replace-flags -O[3-9] -O2 |
149 |
|
150 |
local myconf |
151 |
|
152 |
if use alsa && ! use sound; then |
153 |
echo |
154 |
einfo "Although sound USE flag is disabled you chose to have alsa," |
155 |
einfo "so sound is switched on anyway." |
156 |
echo |
157 |
myconf="${myconf} --with-sound" |
158 |
else |
159 |
myconf="${myconf} $(use_with sound)" |
160 |
fi |
161 |
|
162 |
if use X; then |
163 |
myconf="${myconf} --with-x" |
164 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
165 |
myconf="${myconf} $(use_enable xft font-backend)" |
166 |
myconf="${myconf} $(use_with xft freetype)" |
167 |
myconf="${myconf} $(use_with xft)" |
168 |
myconf="${myconf} $(use_with jpeg) $(use_with tiff)" |
169 |
myconf="${myconf} $(use_with gif) $(use_with png)" |
170 |
myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" |
171 |
|
172 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
173 |
# possibilities. Emacs upstream thinks this should be standard |
174 |
# policy on all distributions |
175 |
if use gtk; then |
176 |
echo |
177 |
einfo "Configuring to build with GTK support, disabling all other toolkits" |
178 |
echo |
179 |
myconf="${myconf} --with-x-toolkit=gtk" |
180 |
elif use Xaw3d; then |
181 |
einfo "Configuring to build with Xaw3d(athena) support" |
182 |
myconf="${myconf} --with-x-toolkit=athena" |
183 |
myconf="${myconf} --without-gtk" |
184 |
elif use motif; then |
185 |
einfo "Configuring to build with motif toolkit support" |
186 |
myconf="${myconf} --with-x-toolkit=motif" |
187 |
myconf="${myconf} --without-gtk" |
188 |
else |
189 |
einfo "Configuring to build with no toolkit" |
190 |
myconf="${myconf} --with-x-toolkit=no" |
191 |
myconf="${myconf} --without-gtk" |
192 |
fi |
193 |
else |
194 |
myconf="${myconf} --without-x" |
195 |
fi |
196 |
|
197 |
myconf="${myconf} $(use_with hesiod)" |
198 |
myconf="${myconf} $(use_with gpm)" |
199 |
|
200 |
econf \ |
201 |
--program-suffix=-${EMACS_SUFFIX} \ |
202 |
--infodir=/usr/share/info/${EMACS_SUFFIX} \ |
203 |
--without-carbon \ |
204 |
${myconf} || die "econf emacs failed" |
205 |
|
206 |
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
207 |
} |
208 |
|
209 |
src_install () { |
210 |
emake install DESTDIR="${D}" || die "make install failed" |
211 |
|
212 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
213 |
|| die "removing duplicate emacs executable failed" |
214 |
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ |
215 |
|| die "moving Emacs executable failed" |
216 |
|
217 |
# move info documentation to the correct place |
218 |
einfo "Fixing info documentation ..." |
219 |
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do |
220 |
mv ${i} ${i}.info || die "mv info failed" |
221 |
done |
222 |
|
223 |
# move man pages to the correct place |
224 |
einfo "Fixing manpages ..." |
225 |
for m in "${D}"/usr/share/man/man1/* ; do |
226 |
mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed" |
227 |
done |
228 |
|
229 |
# avoid collision between slots, see bug #169033 e.g. |
230 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
231 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
232 |
keepdir /var/lib/games/emacs/ |
233 |
|
234 |
if use source; then |
235 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
236 |
# This is not meant to install all the source -- just the |
237 |
# C source you might find via find-function |
238 |
doins src/*.[ch] |
239 |
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF |
240 |
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
241 |
X (setq find-function-C-source-directory |
242 |
X "/usr/share/emacs/${FULL_VERSION}/src")) |
243 |
EOF |
244 |
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el |
245 |
fi |
246 |
|
247 |
dodoc README README.unicode BUGS || die "dodoc failed" |
248 |
} |
249 |
|
250 |
emacs-infodir-rebuild() { |
251 |
# Depending on the Portage version, the Info dir file is compressed |
252 |
# or removed. It is only rebuilt by Portage if our directory is in |
253 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
254 |
|
255 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
256 |
einfo "Regenerating Info directory index in ${infodir} ..." |
257 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
258 |
for f in "${ROOT}"${infodir}/*.info*; do |
259 |
[[ ${f##*/} == *[0-9].info* ]] \ |
260 |
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
261 |
done |
262 |
echo |
263 |
} |
264 |
|
265 |
pkg_postinst() { |
266 |
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || |
267 |
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el |
268 |
|
269 |
local f |
270 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
271 |
test -e ${f} || touch ${f} |
272 |
done |
273 |
|
274 |
elisp-site-regen |
275 |
emacs-infodir-rebuild |
276 |
eselect emacs update --if-unset |
277 |
|
278 |
if use X; then |
279 |
elog "You need to install some fonts for Emacs. Under monolithic" |
280 |
elog "XFree86/Xorg you typically had such fonts installed by default." |
281 |
elog "With modular Xorg, you will have to perform this step yourself." |
282 |
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" |
283 |
elog "machine would satisfy basic Emacs requirements under X11." |
284 |
fi |
285 |
|
286 |
echo |
287 |
elog "You can set the version to be started by /usr/bin/emacs through" |
288 |
elog "the Emacs eselect module, which also redirects man and info pages." |
289 |
elog "You can therefore test emacs-cvs along with the stable release." |
290 |
elog "\"man emacs.eselect\" for details." |
291 |
} |
292 |
|
293 |
pkg_postrm() { |
294 |
elisp-site-regen |
295 |
emacs-infodir-rebuild |
296 |
eselect emacs update --if-unset |
297 |
} |
298 |
|
299 |
|
300 |
|
301 |
-- |
302 |
gentoo-commits@g.o mailing list |