diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-05-24 08:47:29 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-05-24 08:47:29 +0000 |
| commit | b17e6bfc7f560140142d329295f860e6a58be945 (patch) | |
| tree | 20701567a54c27484fb9e922408c9af30bb18d73 /eclass/elisp-common.eclass | |
| parent | Fix build on hardened x86, bug #507080 by Anthoine Bourgeois. (diff) | |
| download | historical-b17e6bfc7f560140142d329295f860e6a58be945.tar.gz historical-b17e6bfc7f560140142d329295f860e6a58be945.tar.bz2 historical-b17e6bfc7f560140142d329295f860e6a58be945.zip | |
elisp-site-regen: Look for site-init files only in site-gentoo.d subdirectory.
Diffstat (limited to 'eclass/elisp-common.eclass')
| -rw-r--r-- | eclass/elisp-common.eclass | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index c4215125b4fe..fd59584fd8fb 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.87 2013/11/04 21:36:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.88 2014/05/24 08:47:29 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -342,10 +342,6 @@ elisp-site-file-install() { # Regenerate the site-gentoo.el file, based on packages' site # initialisation files in the /usr/share/emacs/site-lisp/site-gentoo.d/ # directory. -# -# Note: Before December 2007, site initialisation files were installed -# in /usr/share/emacs/site-lisp/. For backwards compatibility, this -# location is still supported when generating site-gentoo.el. elisp-site-regen() { local sitelisp=${ROOT}${EPREFIX}${SITELISP} @@ -369,16 +365,8 @@ elisp-site-regen() { ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" - for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ - "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el - do - [[ -r ${sf} ]] || continue - # sort files by their basename. straight insertion sort. - for ((i=${#sflist[@]}; i>0; i--)); do - [[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break - sflist[i]=${sflist[i-1]} - done - sflist[i]=${sf} + for sf in "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el; do + [[ -r ${sf} ]] && sflist+=("${sf}") done cat <<-EOF >"${T}"/site-gentoo.el |