1 |
Signed-off-by: Justin Lecher <jlec@g.o> |
2 |
--- |
3 |
eclass/virtualx.eclass | 17 ++++++++++++++++- |
4 |
1 file changed, 16 insertions(+), 1 deletion(-) |
5 |
|
6 |
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass |
7 |
index bdecda6..344cd63 100644 |
8 |
--- a/eclass/virtualx.eclass |
9 |
+++ b/eclass/virtualx.eclass |
10 |
@@ -22,7 +22,7 @@ case "${EAPI:-0}" in |
11 |
;; |
12 |
esac |
13 |
|
14 |
-inherit eutils |
15 |
+[[ ${EAPI} == [2345] ]] && inherit eutils |
16 |
|
17 |
# @ECLASS-VARIABLE: VIRTUALX_REQUIRED |
18 |
# @DESCRIPTION: |
19 |
@@ -58,6 +58,8 @@ case ${VIRTUALX_REQUIRED} in |
20 |
RDEPEND="" |
21 |
;; |
22 |
optional|tests) |
23 |
+ [[ ${EAPI} == [2345] ]] \ |
24 |
+ || die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5' |
25 |
# deprecated section YAY. |
26 |
eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." |
27 |
eqawarn "You can drop the variable definition completely from ebuild," |
28 |
@@ -89,8 +91,12 @@ esac |
29 |
virtualmake() { |
30 |
debug-print-function ${FUNCNAME} "$@" |
31 |
|
32 |
+ [[ ${EAPI} == [2345] ]] \ |
33 |
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" |
34 |
+ |
35 |
# backcompat for maketype |
36 |
if [[ -n ${maketype} ]]; then |
37 |
+ [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5" |
38 |
eqawarn "ebuild is exporting \$maketype=${maketype}" |
39 |
eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." |
40 |
eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." |
41 |
@@ -204,6 +210,9 @@ virtx() { |
42 |
Xmake() { |
43 |
debug-print-function ${FUNCNAME} "$@" |
44 |
|
45 |
+ [[ ${EAPI} == [2345] ]] \ |
46 |
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'" |
47 |
+ |
48 |
eqawarn "you should not execute make directly" |
49 |
eqawarn "rather execute Xemake -j1 if you have issues with parallel make" |
50 |
VIRTUALX_COMMAND="emake -j1" virtualmake "$@" |
51 |
@@ -215,6 +224,9 @@ Xmake() { |
52 |
Xemake() { |
53 |
debug-print-function ${FUNCNAME} "$@" |
54 |
|
55 |
+ [[ ${EAPI} == [2345] ]] \ |
56 |
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'" |
57 |
+ |
58 |
VIRTUALX_COMMAND="emake" virtualmake "$@" |
59 |
} |
60 |
|
61 |
@@ -224,6 +236,9 @@ Xemake() { |
62 |
Xeconf() { |
63 |
debug-print-function ${FUNCNAME} "$@" |
64 |
|
65 |
+ [[ ${EAPI} == [2345] ]] \ |
66 |
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'" |
67 |
+ |
68 |
VIRTUALX_COMMAND="econf" virtualmake "$@" |
69 |
} |
70 |
|
71 |
-- |
72 |
2.6.3 |