Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass ChangeLog
Date: Tue, 31 Jan 2012 06:36:31
Message-Id: 20120131063619.3ED472004B@flycatcher.gentoo.org
1 ulm 12/01/31 06:36:19
2
3 Modified: eutils.eclass ChangeLog
4 Log:
5 Use ${P}-${PR} instead of ${PF} in epatch_user.
6
7 Revision Changes Path
8 1.378 eclass/eutils.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.378&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.378&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.377&r2=1.378
13
14 Index: eutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
17 retrieving revision 1.377
18 retrieving revision 1.378
19 diff -u -r1.377 -r1.378
20 --- eutils.eclass 3 Jan 2012 08:45:36 -0000 1.377
21 +++ eutils.eclass 31 Jan 2012 06:36:19 -0000 1.378
22 @@ -1,6 +1,6 @@
23 -# Copyright 1999-2011 Gentoo Foundation
24 +# Copyright 1999-2012 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.377 2012/01/03 08:45:36 jlec Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.378 2012/01/31 06:36:19 ulm Exp $
28
29 # @ECLASS: eutils.eclass
30 # @MAINTAINER:
31 @@ -544,7 +544,7 @@
32
33 # don't clobber any EPATCH vars that the parent might want
34 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
35 - for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
36 + for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}; do
37 EPATCH_SOURCE=${base}/${CTARGET}/${check}
38 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
39 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
40
41
42
43 1.107 eclass/ChangeLog
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.107&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.107&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.106&r2=1.107
48
49 Index: ChangeLog
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
52 retrieving revision 1.106
53 retrieving revision 1.107
54 diff -u -r1.106 -r1.107
55 --- ChangeLog 30 Jan 2012 22:04:32 -0000 1.106
56 +++ ChangeLog 31 Jan 2012 06:36:19 -0000 1.107
57 @@ -1,6 +1,9 @@
58 # ChangeLog for eclass directory
59 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
60 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.106 2012/01/30 22:04:32 floppym Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.107 2012/01/31 06:36:19 ulm Exp $
62 +
63 + 31 Jan 2012; Ulrich Müller <ulm@g.o> eutils.eclass:
64 + Use ${P}-${PR} instead of ${PF} in epatch_user.
65
66 30 Jan 2012; Mike Gilbert <floppym@g.o> python.eclass:
67 Avoid inheriting eutils from python.eclass.