1 |
Don't inherit multilib, which apparently was needed only for get_libdir |
2 |
(and should have been removed for EAPI 6 already). |
3 |
|
4 |
Drop deprecated need-wxwidgets function. |
5 |
|
6 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
7 |
--- |
8 |
eclass/wxwidgets.eclass | 29 ++++++++++++++++------------- |
9 |
1 file changed, 16 insertions(+), 13 deletions(-) |
10 |
|
11 |
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass |
12 |
index 1cd6e49505d..9b37074d3b6 100644 |
13 |
--- a/eclass/wxwidgets.eclass |
14 |
+++ b/eclass/wxwidgets.eclass |
15 |
@@ -4,7 +4,7 @@ |
16 |
# @ECLASS: wxwidgets.eclass |
17 |
# @MAINTAINER: |
18 |
# wxwidgets@g.o |
19 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 |
20 |
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
21 |
# @BLURB: Manages build configuration for wxGTK-using packages. |
22 |
# @DESCRIPTION: |
23 |
# This eclass sets up the proper environment for ebuilds using the wxGTK |
24 |
@@ -23,9 +23,11 @@ |
25 |
|
26 |
if [[ -z ${_WXWIDGETS_ECLASS} ]]; then |
27 |
|
28 |
-case ${EAPI} in |
29 |
+inherit flag-o-matic |
30 |
+ |
31 |
+case ${EAPI:-0} in |
32 |
0|1|2|3|4|5) |
33 |
- inherit eutils flag-o-matic multilib |
34 |
+ inherit eutils multilib |
35 |
|
36 |
# This was used to set up a sane default for ebuilds so they could |
37 |
# avoid calling need-wxwidgets if they didn't need a particular build. |
38 |
@@ -56,12 +58,9 @@ case ${EAPI} in |
39 |
unset _wxdebug |
40 |
unset _wxconf |
41 |
;; |
42 |
- 6) |
43 |
- inherit flag-o-matic multilib |
44 |
- ;; |
45 |
- *) |
46 |
- die "EAPI=${EAPI:-0} is not supported" |
47 |
- ;; |
48 |
+ 6) inherit multilib ;; # compatibility only, not needed by eclass |
49 |
+ 7) ;; |
50 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;; |
51 |
esac |
52 |
|
53 |
# @FUNCTION: setup-wxwidgets |
54 |
@@ -130,10 +129,14 @@ setup-wxwidgets() { |
55 |
echo |
56 |
} |
57 |
|
58 |
-# deprecated |
59 |
-need-wxwidgets() { |
60 |
- setup-wxwidgets |
61 |
-} |
62 |
+case ${EAPI:-0} in |
63 |
+ 0|1|2|3|4|5|6) |
64 |
+ # deprecated |
65 |
+ need-wxwidgets() { |
66 |
+ setup-wxwidgets |
67 |
+ } |
68 |
+ ;; |
69 |
+esac |
70 |
|
71 |
_WXWIDGETS_ECLASS=1 |
72 |
fi |
73 |
-- |
74 |
2.22.0 |