summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-01-31 06:36:19 +0000
committerUlrich Müller <ulm@gentoo.org>2012-01-31 06:36:19 +0000
commitd57b95f447e288496239b2a93d79452deb6d2e78 (patch)
tree02e43374418d7b59d86713431f48b764f5ab5284 /eclass/eutils.eclass
parentVersion bump. Removed old. Fixed debug build with patch from upstream (bug #4... (diff)
downloadgentoo-2-d57b95f447e288496239b2a93d79452deb6d2e78.tar.gz
gentoo-2-d57b95f447e288496239b2a93d79452deb6d2e78.tar.bz2
gentoo-2-d57b95f447e288496239b2a93d79452deb6d2e78.zip
Use ${P}-${PR} instead of ${PF} in epatch_user.
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index e06ea4830334..ef0f1ec37c1f 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.377 2012/01/03 08:45:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.378 2012/01/31 06:36:19 ulm Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -544,7 +544,7 @@ epatch_user() {
# don't clobber any EPATCH vars that the parent might want
local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
- for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+ for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}; do
EPATCH_SOURCE=${base}/${CTARGET}/${check}
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}