[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     324c60a90afb8c34ba05b5b4f5814ce72e835c48
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 12:35:08 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 14:21:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324c60a9

eutils.eclass: Disable epatch_user in EAPI 6.

EAPI 6 has eapply_user which should be used instead.

 eclass/eutils.eclass | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 6457501..5481b7f 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]