ulm 14/05/24 08:47:29 Modified: elisp-common.eclass ChangeLog Log: elisp-site-regen: Look for site-init files only in site-gentoo.d subdirectory.
Revision Changes Path 1.88 eclass/elisp-common.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.87&r2=1.88 Index: elisp-common.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- elisp-common.eclass 4 Nov 2013 21:36:36 -0000 1.87 +++ elisp-common.eclass 24 May 2014 08:47:29 -0000 1.88 @@ -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 @@ # 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 @@ 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 1.1272 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1271&r2=1.1272 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1271 retrieving revision 1.1272 diff -u -r1.1271 -r1.1272 --- ChangeLog 23 May 2014 17:11:10 -0000 1.1271 +++ ChangeLog 24 May 2014 08:47:29 -0000 1.1272 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1271 2014/05/23 17:11:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1272 2014/05/24 08:47:29 ulm Exp $ + + 24 May 2014; Ulrich Müller <[email protected]> elisp-common.eclass: + elisp-site-regen: Look for site-init files only in site-gentoo.d + subdirectory. 23 May 2014; Michał Górny <[email protected]> multilib-build.eclass: Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules
