eutils.eclass: Disable epatch_user in EAPI 6.

EAPI 6 has eapply_user which should be used instead.

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 6457501c6b08412cfc024fdb33859b79e904ce7d..5481b7f28879ff7726f7c155e719670bbf349d2c 100644 (file)
--- 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]