1 |
ulm 08/11/29 12:19:25 |
2 |
|
3 |
Modified: emacs-cvs-23.0.9999.ebuild ChangeLog |
4 |
Log: |
5 |
Add site initialisation for Info. Rename site-init file. |
6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.15 app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.15&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.15&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?r1=1.14&r2=1.15 |
14 |
|
15 |
Index: emacs-cvs-23.0.9999.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v |
18 |
retrieving revision 1.14 |
19 |
retrieving revision 1.15 |
20 |
diff -u -r1.14 -r1.15 |
21 |
--- emacs-cvs-23.0.9999.ebuild 26 Nov 2008 21:27:00 -0000 1.14 |
22 |
+++ emacs-cvs-23.0.9999.ebuild 29 Nov 2008 12:19:25 -0000 1.15 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.14 2008/11/26 21:27:00 ulm Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.15 2008/11/29 12:19:25 ulm Exp $ |
28 |
|
29 |
ECVS_AUTH="pserver" |
30 |
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" |
31 |
@@ -67,6 +67,7 @@ |
32 |
S="${WORKDIR}/${ECVS_LOCALNAME}" |
33 |
|
34 |
EMACS_SUFFIX="emacs-${SLOT}" |
35 |
+SITEFILE="20${PN}-${SLOT}-gentoo.el" |
36 |
|
37 |
src_unpack() { |
38 |
cvs_src_unpack |
39 |
@@ -214,22 +215,31 @@ |
40 |
keepdir /usr/share/emacs/site-lisp |
41 |
keepdir /var/lib/games/emacs |
42 |
|
43 |
+ local c=";;" |
44 |
if use source; then |
45 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
46 |
# This is not meant to install all the source -- just the |
47 |
# C source you might find via find-function |
48 |
doins src/*.[ch] |
49 |
- sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF |
50 |
- |
51 |
- ;;; ${PN}-${SLOT} site-lisp configuration |
52 |
- |
53 |
- (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
54 |
- X (setq find-function-C-source-directory |
55 |
- X "/usr/share/emacs/${FULL_VERSION}/src")) |
56 |
- EOF |
57 |
- elisp-site-file-install 10${PN}-${SLOT}-gentoo.el |
58 |
+ c="" |
59 |
fi |
60 |
|
61 |
+ sed 's/^X//' >"${SITEFILE}" <<-EOF |
62 |
+ X |
63 |
+ ;;; ${PN}-${SLOT} site-lisp configuration |
64 |
+ X |
65 |
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
66 |
+ X ${c}(setq find-function-C-source-directory |
67 |
+ X ${c} "/usr/share/emacs/${FULL_VERSION}/src") |
68 |
+ X (let ((path (getenv "INFOPATH")) |
69 |
+ X (dir "/usr/share/info/${EMACS_SUFFIX}")) |
70 |
+ X (and path |
71 |
+ X ;; move Emacs Info dir to beginning of list |
72 |
+ X (setq Info-directory-list |
73 |
+ X (cons dir (delete dir (split-string path ":" t))))))) |
74 |
+ EOF |
75 |
+ elisp-site-file-install "${SITEFILE}" || die |
76 |
+ |
77 |
dodoc README BUGS || die "dodoc failed" |
78 |
} |
79 |
|
80 |
|
81 |
|
82 |
|
83 |
1.225 app-editors/emacs-cvs/ChangeLog |
84 |
|
85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.225&view=markup |
86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.225&content-type=text/plain |
87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.224&r2=1.225 |
88 |
|
89 |
Index: ChangeLog |
90 |
=================================================================== |
91 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v |
92 |
retrieving revision 1.224 |
93 |
retrieving revision 1.225 |
94 |
diff -u -r1.224 -r1.225 |
95 |
--- ChangeLog 26 Nov 2008 21:27:00 -0000 1.224 |
96 |
+++ ChangeLog 29 Nov 2008 12:19:25 -0000 1.225 |
97 |
@@ -1,6 +1,11 @@ |
98 |
# ChangeLog for app-editors/emacs-cvs |
99 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.224 2008/11/26 21:27:00 ulm Exp $ |
101 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.225 2008/11/29 12:19:25 ulm Exp $ |
102 |
+ |
103 |
+ 29 Nov 2008; Ulrich Mueller <ulm@g.o> emacs-cvs-23.0.9999.ebuild: |
104 |
+ Add site initialisation for Info, so that Emacs' dir is first in list; |
105 |
+ this will also help to get the right documentation if Emacs is started |
106 |
+ as emacs-${SLOT}. Rename site-init file to 20${PN}-${SLOT}-gentoo.el. |
107 |
|
108 |
26 Nov 2008; Ulrich Mueller <ulm@g.o> emacs-cvs-23.0.9999.ebuild: |
109 |
Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a |