jlec 14/06/26 07:01:13 Modified: readme.gentoo.eclass ChangeLog Log: Rename FILE_SUFFIX to README_GENTOO_SUFFIX in order to avoid variable clashes
Revision Changes Path 1.10 eclass/readme.gentoo.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.9&r2=1.10 Index: readme.gentoo.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- readme.gentoo.eclass 24 Jun 2014 18:36:54 -0000 1.9 +++ readme.gentoo.eclass 26 Jun 2014 07:01:13 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.9 2014/06/24 18:36:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.10 2014/06/26 07:01:13 jlec Exp $ # @ECLASS: readme.gentoo # @MAINTAINER: @@ -48,10 +48,10 @@ # @DESCRIPTION: # If non-empty this variable forces elog messages to be printed. -# @ECLASS-VARIABLE: FILE_SUFFIX +# @ECLASS-VARIABLE: README_GENTOO_SUFFIX # @DESCRIPTION: # If you want to specify a suffix for README.gentoo file please export it. -: ${FILE_SUFFIX:=""} +: ${README_GENTOO_SUFFIX:=""} # @FUNCTION: readme.gentoo_create_doc # @DESCRIPTION: @@ -75,7 +75,7 @@ elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die elif [[ -f "${FILESDIR}/README.gentoo" ]]; then - cp "${FILESDIR}/README.gentoo${FILE_SUFFIX}" "${T}"/README.gentoo || die + cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die else die "You are not specifying README.gentoo contents!" fi 1.1300 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1300&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1300&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1299&r2=1.1300 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1299 retrieving revision 1.1300 diff -u -r1.1299 -r1.1300 --- ChangeLog 24 Jun 2014 18:36:54 -0000 1.1299 +++ ChangeLog 26 Jun 2014 07:01:13 -0000 1.1300 @@ -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.1299 2014/06/24 18:36:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1300 2014/06/26 07:01:13 jlec Exp $ + + 26 Jun 2014; Justin Lecher <j...@gentoo.org> readme.gentoo.eclass, + waf-utils.eclass: + Rename FILE_SUFFIX to README_GENTOO_SUFFIX in order to avoid variable clashes 24 Jun 2014; Pacho Ramos <pa...@gentoo.org> readme.gentoo.eclass: Allow to handle more README.gentoo files (#513190 by Justin Lecher)
