diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2015-09-29 15:12:19 +0200 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2015-09-29 16:14:35 +0200 |
| commit | c9cbd8218419463a9f78a511810b0b482d2a01d8 (patch) | |
| tree | 5a2f18ebe99a598c84b0d5739c76b51abc4b3026 /eclass/eutils.eclass | |
| parent | dev-python/mock: add ~alpha keyword (diff) | |
| download | gentoo-c9cbd8218419463a9f78a511810b0b482d2a01d8.tar.gz gentoo-c9cbd8218419463a9f78a511810b0b482d2a01d8.tar.bz2 gentoo-c9cbd8218419463a9f78a511810b0b482d2a01d8.zip | |
eutils.eclass: Allow to configure base patch location for epatch_user
This is particularly useful for people who run alternative
package managers and want to control their configuration.
Reviewed-By: SpanKY <vapier@gentoo.org>
Gentoo-Bug: 559698
Github-PR: https://github.com/gentoo/gentoo/pull/69
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index b7f097041feb..7331796c8b81 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -350,6 +350,12 @@ EPATCH_FORCE="no" # List of patches not to apply. Note this is only file names, # and not the full path. Globs accepted. +# @VARIABLE: EPATCH_USER_SOURCE +# @DESCRIPTION: +# Location for user patches, see the epatch_user function. +# Should be set by the user. Don't set this in ebuilds. +: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches} + # @FUNCTION: epatch # @USAGE: [options] [patches] [dirs of patches] # @DESCRIPTION: @@ -697,11 +703,11 @@ epatch_user() { [[ -e ${applied} ]] && return 2 # don't clobber any EPATCH vars that the parent might want - local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches + local EPATCH_SOURCE check 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} + EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check} + [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check} + [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check} if [[ -d ${EPATCH_SOURCE} ]] ; then EPATCH_SOURCE=${EPATCH_SOURCE} \ EPATCH_SUFFIX="patch" \ |