diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-10-07 06:22:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-07 06:22:01 +0000 |
| commit | 86d7a1a7e59e5719760f299020a9d5dfede3071e (patch) | |
| tree | 6ea4ab948e355723ac4f14a4b93e55c415074bb9 /eclass/eutils.eclass | |
| parent | whitespace (diff) | |
| download | historical-86d7a1a7e59e5719760f299020a9d5dfede3071e.tar.gz historical-86d7a1a7e59e5719760f299020a9d5dfede3071e.tar.bz2 historical-86d7a1a7e59e5719760f299020a9d5dfede3071e.zip | |
add :${SLOT} support to epatch_user #435132 by Bartosz Brachaczek
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 16570765eb90..fb2a2370fd06 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # 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.405 2012/09/28 15:18:04 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.406 2012/10/07 06:22:01 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -551,7 +551,7 @@ epatch() { # @USAGE: # @DESCRIPTION: # Applies user-provided patches to the source tree. The patches are -# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first +# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>[:SLOT]/, where the first # of these three directories to exist will be the one to use, ignoring # any more general directories which might exist as well. They must end # in ".patch" to be applied. @@ -583,7 +583,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}/{${P}-${PR},${P},${PN}}; do + for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do EPATCH_SOURCE=${base}/${CTARGET}/${check} [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} |