diff options
| author | Ulrich Müller <ulm@gentoo.org> | 2015-11-29 13:35:08 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-12-01 15:21:30 +0100 |
| commit | 324c60a90afb8c34ba05b5b4f5814ce72e835c48 (patch) | |
| tree | 88648a8a6d1a269c968ba4afb064f621215c4385 /eclass | |
| parent | 3f80bc644baa02eec908289ffc588532d8febaec (diff) | |
| download | gentoo-324c60a90afb8c34ba05b5b4f5814ce72e835c48.tar.gz gentoo-324c60a90afb8c34ba05b5b4f5814ce72e835c48.tar.xz | |
eutils.eclass: Disable epatch_user in EAPI 6.
EAPI 6 has eapply_user which should be used instead.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 6457501c6b0..5481b7f2887 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -350,12 +350,6 @@ 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: @@ -669,6 +663,13 @@ epatch() { : # everything worked } +if has "${EAPI:-0}" 0 1 2 3 4 5; then +# @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_user # @USAGE: # @DESCRIPTION: @@ -731,6 +732,7 @@ epatch_user() { epatch_user_death_notice() { ewarn "!!! User patches were applied to this build!" } +fi # @FUNCTION: emktemp # @USAGE: [temp dir] |