diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-08-20 07:40:30 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-08-20 07:40:30 +0000 |
| commit | a9ebdc2d6389a66ce47387b68697358c14d8f78a (patch) | |
| tree | 85c140c943c59cdd726ecf1a2ec45e21d973b228 /app-editors/emacs-cvs | |
| parent | version bump to snapshot releases (bug #156953) - ebuild submitted by Marijn ... (diff) | |
| download | gentoo-2-a9ebdc2d6389a66ce47387b68697358c14d8f78a.tar.gz gentoo-2-a9ebdc2d6389a66ce47387b68697358c14d8f78a.tar.bz2 gentoo-2-a9ebdc2d6389a66ce47387b68697358c14d8f78a.zip | |
Fix INFOPATH issue, bug 281979.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'app-editors/emacs-cvs')
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild | 18 |
2 files changed, 19 insertions, 6 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 7c22542f7ca9..6b5487bd36cb 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.255 2009/07/30 15:00:00 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.256 2009/08/20 07:40:30 ulm Exp $ + + 20 Aug 2009; Ulrich Mueller <ulm@gentoo.org> + emacs-cvs-23.1.9999-r1.ebuild: + Be more conservative when rearranging the INFOPATH in the site-init file, + in order to respect any local directories. Fixes bug 281979. *emacs-cvs-23.1.9999-r1 (30 Jul 2009) diff --git a/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild index 078cbbce089b..d9fdc641f732 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild,v 1.1 2009/07/30 15:00:00 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.1.9999-r1.ebuild,v 1.2 2009/08/20 07:40:30 ulm Exp $ EAPI=2 @@ -242,11 +242,15 @@ src_install () { X ${c}(setq find-function-C-source-directory X ${c} "/usr/share/emacs/${FULL_VERSION}/src") X (let ((path (getenv "INFOPATH")) - X (dir "/usr/share/info/${EMACS_SUFFIX}")) + X (dir "/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`/usr/share/info\\\\>")) X (and path - X ;; move Emacs Info dir to beginning of list - X (setq Info-directory-list - X (cons dir (delete dir (split-string path ":" t))))))) + X ;; move Emacs Info dir before anything else in /usr/share/info + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setq Info-directory-list (prune-directory-list (cdr p))))))) EOF elisp-site-file-install "${SITEFILE}" || die @@ -285,6 +289,10 @@ pkg_postinst() { elog "the Emacs eselect module, which also redirects man and info pages." elog "Therefore, several Emacs versions can be installed at the same time." elog "\"man emacs.eselect\" for details." + echo + elog "If you upgrade from a previous major version of Emacs, then it is" + elog "strongly recommended that you use app-admin/emacs-updater to rebuild" + elog "all byte-compiled elisp files of the installed Emacs packages." } pkg_postrm() { |