| 1 |
ulm 14/05/24 08:47:29 |
| 2 |
|
| 3 |
Modified: elisp-common.eclass ChangeLog |
| 4 |
Log: |
| 5 |
elisp-site-regen: Look for site-init files only in site-gentoo.d subdirectory. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.88 eclass/elisp-common.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.87&r2=1.88 |
| 13 |
|
| 14 |
Index: elisp-common.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
| 17 |
retrieving revision 1.87 |
| 18 |
retrieving revision 1.88 |
| 19 |
diff -u -r1.87 -r1.88 |
| 20 |
--- elisp-common.eclass 4 Nov 2013 21:36:36 -0000 1.87 |
| 21 |
+++ elisp-common.eclass 24 May 2014 08:47:29 -0000 1.88 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.87 2013/11/04 21:36:36 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.88 2014/05/24 08:47:29 ulm Exp $ |
| 28 |
# |
| 29 |
# @ECLASS: elisp-common.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -342,10 +342,6 @@ |
| 32 |
# Regenerate the site-gentoo.el file, based on packages' site |
| 33 |
# initialisation files in the /usr/share/emacs/site-lisp/site-gentoo.d/ |
| 34 |
# directory. |
| 35 |
-# |
| 36 |
-# Note: Before December 2007, site initialisation files were installed |
| 37 |
-# in /usr/share/emacs/site-lisp/. For backwards compatibility, this |
| 38 |
-# location is still supported when generating site-gentoo.el. |
| 39 |
|
| 40 |
elisp-site-regen() { |
| 41 |
local sitelisp=${ROOT}${EPREFIX}${SITELISP} |
| 42 |
@@ -369,16 +365,8 @@ |
| 43 |
|
| 44 |
ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" |
| 45 |
|
| 46 |
- for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ |
| 47 |
- "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el |
| 48 |
- do |
| 49 |
- [[ -r ${sf} ]] || continue |
| 50 |
- # sort files by their basename. straight insertion sort. |
| 51 |
- for ((i=${#sflist[@]}; i>0; i--)); do |
| 52 |
- [[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break |
| 53 |
- sflist[i]=${sflist[i-1]} |
| 54 |
- done |
| 55 |
- sflist[i]=${sf} |
| 56 |
+ for sf in "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el; do |
| 57 |
+ [[ -r ${sf} ]] && sflist+=("${sf}") |
| 58 |
done |
| 59 |
|
| 60 |
cat <<-EOF >"${T}"/site-gentoo.el |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.1272 eclass/ChangeLog |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1271&r2=1.1272 |
| 69 |
|
| 70 |
Index: ChangeLog |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 73 |
retrieving revision 1.1271 |
| 74 |
retrieving revision 1.1272 |
| 75 |
diff -u -r1.1271 -r1.1272 |
| 76 |
--- ChangeLog 23 May 2014 17:11:10 -0000 1.1271 |
| 77 |
+++ ChangeLog 24 May 2014 08:47:29 -0000 1.1272 |
| 78 |
@@ -1,6 +1,10 @@ |
| 79 |
# ChangeLog for eclass directory |
| 80 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1271 2014/05/23 17:11:10 mgorny Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1272 2014/05/24 08:47:29 ulm Exp $ |
| 83 |
+ |
| 84 |
+ 24 May 2014; Ulrich Müller <ulm@g.o> elisp-common.eclass: |
| 85 |
+ elisp-site-regen: Look for site-init files only in site-gentoo.d |
| 86 |
+ subdirectory. |
| 87 |
|
| 88 |
23 May 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 89 |
Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules |
Archives