1 |
Date: Sun, 29 Nov 2015 13:35:08 +0100 |
2 |
|
3 |
EAPI 6 has eapply_user which should be used instead. |
4 |
--- |
5 |
eclass/eutils.eclass | 14 ++++++++------ |
6 |
1 file changed, 8 insertions(+), 6 deletions(-) |
7 |
|
8 |
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass |
9 |
index 6457501..5481b7f 100644 |
10 |
--- a/eclass/eutils.eclass |
11 |
+++ b/eclass/eutils.eclass |
12 |
@@ -350,12 +350,6 @@ EPATCH_FORCE="no" |
13 |
# List of patches not to apply. Note this is only file names, |
14 |
# and not the full path. Globs accepted. |
15 |
|
16 |
-# @VARIABLE: EPATCH_USER_SOURCE |
17 |
-# @DESCRIPTION: |
18 |
-# Location for user patches, see the epatch_user function. |
19 |
-# Should be set by the user. Don't set this in ebuilds. |
20 |
-: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches} |
21 |
- |
22 |
# @FUNCTION: epatch |
23 |
# @USAGE: [options] [patches] [dirs of patches] |
24 |
# @DESCRIPTION: |
25 |
@@ -669,6 +663,13 @@ epatch() { |
26 |
: # everything worked |
27 |
} |
28 |
|
29 |
+if has "${EAPI:-0}" 0 1 2 3 4 5; then |
30 |
+# @VARIABLE: EPATCH_USER_SOURCE |
31 |
+# @DESCRIPTION: |
32 |
+# Location for user patches, see the epatch_user function. |
33 |
+# Should be set by the user. Don't set this in ebuilds. |
34 |
+: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches} |
35 |
+ |
36 |
# @FUNCTION: epatch_user |
37 |
# @USAGE: |
38 |
# @DESCRIPTION: |
39 |
@@ -731,6 +732,7 @@ epatch_user() { |
40 |
epatch_user_death_notice() { |
41 |
ewarn "!!! User patches were applied to this build!" |
42 |
} |
43 |
+fi |
44 |
|
45 |
# @FUNCTION: emktemp |
46 |
# @USAGE: [temp dir] |
47 |
-- |
48 |
2.6.3 |