diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e46c0f1..34ffa34 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,3 +1,8 @@ +2014-05-18 Ulrich Müller <ulm@gentoo.org> + + * elisp-common.eclass (elisp-site-regen): Look for site-init files + only in site-gentoo.d subdirectory. + 2013-10-31 Ulrich Müller <ulm@gentoo.org> * elisp-common.eclass (elisp-site-regen): Don't create @@ -794,5 +799,5 @@ * elisp.eclass: Initial. -Copyright 2002-2013 Gentoo Foundation +Copyright 2002-2014 Gentoo Foundation Distributed under the terms of the GNU General Public License v2 diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index d1e7fbb..12bbc00 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @@ -369,16 +369,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 |