| 1 |
ulm 09/09/10 06:48:39 |
| 2 |
|
| 3 |
Modified: emacs-22.3-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Backport INFOPATH patch from bug 281979 to the stable ebuild. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 app-editors/emacs/emacs-22.3-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: emacs-22.3-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- emacs-22.3-r2.ebuild 29 May 2009 16:14:57 -0000 1.12 |
| 22 |
+++ emacs-22.3-r2.ebuild 10 Sep 2009 06:48:39 -0000 1.13 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.12 2009/05/29 16:14:57 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.13 2009/09/10 06:48:39 ulm Exp $ |
| 28 |
|
| 29 |
EAPI=2 |
| 30 |
|
| 31 |
@@ -195,11 +195,15 @@ |
| 32 |
X ${c}(setq find-function-C-source-directory |
| 33 |
X ${c} "/usr/share/emacs/${FULL_VERSION}/src") |
| 34 |
X (let ((path (getenv "INFOPATH")) |
| 35 |
- X (dir "/usr/share/info/emacs-${SLOT}")) |
| 36 |
+ X (dir "/usr/share/info/emacs-${SLOT}") |
| 37 |
+ X (re "\\\\\`/usr/share/info\\\\>")) |
| 38 |
X (and path |
| 39 |
- X ;; move Emacs Info dir to beginning of list |
| 40 |
- X (setq Info-directory-list |
| 41 |
- X (cons dir (delete dir (split-string path ":" t))))))) |
| 42 |
+ X ;; move Emacs Info dir before anything else in /usr/share/info |
| 43 |
+ X (let* ((p (cons nil (split-string path ":" t))) (q p)) |
| 44 |
+ X (while (and (cdr q) (not (string-match re (cadr q)))) |
| 45 |
+ X (setq q (cdr q))) |
| 46 |
+ X (setcdr q (cons dir (delete dir (cdr q)))) |
| 47 |
+ X (setq Info-directory-list (prune-directory-list (cdr p))))))) |
| 48 |
EOF |
| 49 |
elisp-site-file-install "${SITEFILE}" || die |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.332 app-editors/emacs/ChangeLog |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.332&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.332&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.331&r2=1.332 |
| 59 |
|
| 60 |
Index: ChangeLog |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 63 |
retrieving revision 1.331 |
| 64 |
retrieving revision 1.332 |
| 65 |
diff -u -r1.331 -r1.332 |
| 66 |
--- ChangeLog 31 Aug 2009 18:17:58 -0000 1.331 |
| 67 |
+++ ChangeLog 10 Sep 2009 06:48:39 -0000 1.332 |
| 68 |
@@ -1,6 +1,9 @@ |
| 69 |
# ChangeLog for app-editors/emacs |
| 70 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.331 2009/08/31 18:17:58 fauli Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.332 2009/09/10 06:48:39 ulm Exp $ |
| 73 |
+ |
| 74 |
+ 10 Sep 2009; Ulrich Mueller <ulm@g.o> emacs-22.3-r2.ebuild: |
| 75 |
+ Backport INFOPATH patch from bug 281979 to the stable ebuild. |
| 76 |
|
| 77 |
31 Aug 2009; Christian Faulhammer <fauli@g.o> |
| 78 |
-emacs-21.4-r18.ebuild: |
Archives