diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-09-10 06:48:39 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-09-10 06:48:39 +0000 |
| commit | 2ea4906998f3bfc191a1ab7710a2a839bd6c16fa (patch) | |
| tree | 55dd90c99d4429b5b02ee5f3ae840c7bec3096ef /app-editors | |
| parent | Version bump. (diff) | |
| download | historical-2ea4906998f3bfc191a1ab7710a2a839bd6c16fa.tar.gz historical-2ea4906998f3bfc191a1ab7710a2a839bd6c16fa.tar.bz2 historical-2ea4906998f3bfc191a1ab7710a2a839bd6c16fa.zip | |
Backport INFOPATH patch from bug 281979 to the stable ebuild.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 12 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.3-r2.ebuild | 14 |
3 files changed, 19 insertions, 12 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index c5696e7c5161..31b81d474831 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.331 2009/08/31 18:17:58 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.332 2009/09/10 06:48:39 ulm Exp $ + + 10 Sep 2009; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r2.ebuild: + Backport INFOPATH patch from bug 281979 to the stable ebuild. 31 Aug 2009; Christian Faulhammer <fauli@gentoo.org> -emacs-21.4-r18.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 56f0a6ab5e6e..0755df61fc20 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -13,14 +13,14 @@ DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b EBUILD emacs-18.59-r6.ebuild 2517 RMD160 e4b5cfb9d6710a7ff31f9d77bb2738753fab36fc SHA1 0adec98b539e5165fbee402a1924281d83400aa0 SHA256 e57897cbd150b96fedb234f24ca33fadba5bef18ee9059b9a59f456e3768a565 EBUILD emacs-21.4-r19.ebuild 5314 RMD160 163ffd52b686ad7fe4aa2126e34250d9c4e33950 SHA1 3a6ebd946d73a0cf86f19633a189bf8ea9069d31 SHA256 9c93d672f72648fb383c5bdb8bc305db9609d5e88e2b0e856fbc3ac621e53cc8 -EBUILD emacs-22.3-r2.ebuild 7624 RMD160 5938d8f514e63a7c2a939025751ba2bc5ea0b59b SHA1 9a0a8bdf8119bbf5a943651ea3ec6d37210b4b1a SHA256 3c899850399efdbab28b3dcfd1128ba645ce4698d605eb3c8c029ba370927448 +EBUILD emacs-22.3-r2.ebuild 7848 RMD160 4ff1cd1dfa6aa792b92f48ddd1acbebd839368cc SHA1 914f22df412ca73b4a128fc25f7675d54df7f435 SHA256 b94cca9747e3d117a58aa2245d1b30c63fc7bcd56e9e7548b54c92b5b948b3ab EBUILD emacs-23.1.ebuild 9374 RMD160 3c892cd2f2a8e24c57c4eb8770e2eb001dcac3f0 SHA1 b246e3042b5c700ef415cafa4f8e27163ee1b8ec SHA256 36ae69008874a620ce5ccb026308f28e95aeae95b969487e239549542a292140 -MISC ChangeLog 47408 RMD160 7eb136c5adeb3d820253850f608f6b268b77143a SHA1 e387163d074a6261b8bb0ffc75cf2d682c4cfff9 SHA256 c483120ac9980d82da92961d4f670c076f072960521e693bf5d510cfe3f4ae9d +MISC ChangeLog 47540 RMD160 e19c99db3fd3f1e5c67cc227ca9dcccc99adaf71 SHA1 1954f7e8521790aafa99fda502fa6a575f9aba1e SHA256 123d0c79aa3367c796b6f6af75dc27bd359f80873cabd7fd5e34aaebe043394b MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v1.4.10 (GNU/Linux) -iEYEARECAAYFAkqcE94ACgkQNQqtfCuFneOhDgCfUl2+lyu8BIFOKsKlSTe4xPLx -AqMAnjBUJHFE+z6Wj2+vINbP4zKmP0gp -=FLHS +iEYEARECAAYFAkqoocwACgkQOeoy/oIi7uwtsgCfbA8z9JleSUNWm4mmgIIhVVOH +dX8AoOwIChaLaCIVFbcqR+kLHqmrK3ja +=fTE6 -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild index 6e3a6dd273e4..34645b7c2fcb 100644 --- a/app-editors/emacs/emacs-22.3-r2.ebuild +++ b/app-editors/emacs/emacs-22.3-r2.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/emacs-22.3-r2.ebuild,v 1.12 2009/05/29 16:14:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.13 2009/09/10 06:48:39 ulm Exp $ EAPI=2 @@ -195,11 +195,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-${SLOT}")) + X (dir "/usr/share/info/emacs-${SLOT}") + 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 |