Gentoo Archives: gentoo-dev

From: Ulrich Mueller <ulm@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Subject: [gentoo-dev] Small change for epatch_user() in eutils.eclass
Date: Sun, 29 Jan 2012 11:23:02
Message-Id: 20261.11226.752406.675230@a1i15.kph.uni-mainz.de
1 epatch_user() currently looks into <CATEGORY>/<PF|P|PN> subdirectories
2 of /etc/portage/patches. If the package has no revision, then PF and P
3 are identical, so there's no way to specify that a patch should only
4 apply to -r0.
5
6 The patch below changes ${PF} to ${P}-${PR}. Behaviour should be
7 identical for all non-zero revisions. For -r0 it will look in ${P}-r0
8 first, then in ${P} and ${PN}, as before.
9
10 --- eutils.eclass 3 Jan 2012 08:45:36 -0000 1.377
11 +++ eutils.eclass 29 Jan 2012 11:00:15 -0000
12 @@ -544,7 +544,7 @@
13
14 # don't clobber any EPATCH vars that the parent might want
15 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
16 - for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
17 + for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}; do
18 EPATCH_SOURCE=${base}/${CTARGET}/${check}
19 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
20 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}

Replies

Subject Author
Re: [gentoo-dev] Small change for epatch_user() in eutils.eclass Mike Frysinger <vapier@g.o>