ulm 15/04/24 22:42:01 Modified: elisp-common.eclass ChangeLog Log: Fix filename matching in elisp-site-file-install. It should use shortest match, not longest.
Revision Changes Path 1.91 eclass/elisp-common.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.91&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.91&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.90&r2=1.91 Index: elisp-common.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- elisp-common.eclass 11 Jun 2014 09:13:36 -0000 1.90 +++ elisp-common.eclass 24 Apr 2015 22:42:01 -0000 1.91 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.90 2014/06/11 09:13:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.91 2015/04/24 22:42:01 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -322,7 +322,8 @@ [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \ || ewarn "elisp-site-file-install: bad name of site-init file" - sf="${T}/${sf/%-gentoo*.el/-gentoo.el}" + [[ ${sf%-gentoo*.el} != "${sf}" ]] && sf="${sf%-gentoo*.el}-gentoo.el" + sf="${T}/${sf}" ebegin "Installing site initialisation file for GNU Emacs" [[ $1 = "${sf}" ]] || cp "$1" "${sf}" sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ 1.1593 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1593&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1593&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1592&r2=1.1593 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1592 retrieving revision 1.1593 diff -u -r1.1592 -r1.1593 --- ChangeLog 22 Apr 2015 20:23:47 -0000 1.1592 +++ ChangeLog 24 Apr 2015 22:42:01 -0000 1.1593 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1592 2015/04/22 20:23:47 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1593 2015/04/24 22:42:01 ulm Exp $ + + 24 Apr 2015; Ulrich Müller <[email protected]> elisp-common.eclass: + Fix filename matching in elisp-site-file-install. It should use shortest + match, not longest. 22 Apr 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
