1 |
Reviewed-by: Mart Raudsepp <leio@g.o> |
2 |
Reviewed-by: David Seifert <soap@g.o> |
3 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
4 |
--- |
5 |
v2: Use negative logic in EAPI test |
6 |
|
7 |
eclass/wxwidgets.eclass | 20 ++++++++++++-------- |
8 |
1 file changed, 12 insertions(+), 8 deletions(-) |
9 |
|
10 |
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass |
11 |
index 4357e7367cc7..273e6ac72d41 100644 |
12 |
--- a/eclass/wxwidgets.eclass |
13 |
+++ b/eclass/wxwidgets.eclass |
14 |
@@ -4,7 +4,7 @@ |
15 |
# @ECLASS: wxwidgets.eclass |
16 |
# @MAINTAINER: |
17 |
# wxwidgets@g.o |
18 |
-# @SUPPORTED_EAPIS: 7 |
19 |
+# @SUPPORTED_EAPIS: 7 8 |
20 |
# @BLURB: Manages build configuration for wxGTK-using packages. |
21 |
# @DESCRIPTION: |
22 |
# This eclass sets up the proper environment for ebuilds using the wxGTK |
23 |
@@ -21,10 +21,9 @@ |
24 |
# The configuration chosen is based on the version required and the flags |
25 |
# wxGTK was built with. |
26 |
|
27 |
-case ${EAPI:-0} in |
28 |
- [0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; |
29 |
- 7) ;; |
30 |
- *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; |
31 |
+case ${EAPI} in |
32 |
+ 7|8) ;; |
33 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
34 |
esac |
35 |
|
36 |
if [[ -z ${_WXWIDGETS_ECLASS} ]]; then |
37 |
@@ -37,9 +36,14 @@ _WXWIDGETS_ECLASS=1 |
38 |
# The SLOT of the x11-libs/wxGTK you're targeting. Needs to be defined before |
39 |
# inheriting the eclass. Can be either "3.0" or "3.0-gtk3". |
40 |
case ${WX_GTK_VER} in |
41 |
- 3.0|3.0-gtk3) ;; |
42 |
- "") die "WX_GTK_VER not declared" ;; |
43 |
- *) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;; |
44 |
+ 3.0-gtk3) ;; |
45 |
+ 3.0) |
46 |
+ if [[ ${EAPI} != 7 ]]; then |
47 |
+ die "${ECLASS}: GTK 2 no longer supported in EAPI ${EAPI}" |
48 |
+ fi |
49 |
+ ;; |
50 |
+ "") die "WX_GTK_VER not declared" ;; |
51 |
+ *) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;; |
52 |
esac |
53 |
readonly WX_GTK_VER |
54 |
|
55 |
-- |
56 |
2.32.0 |