1 |
Signed-off-by: David Seifert <soap@g.o> |
2 |
--- |
3 |
eclass/meson.eclass | 13 +++---------- |
4 |
1 file changed, 3 insertions(+), 10 deletions(-) |
5 |
|
6 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
7 |
index 905c4d89f50..7ba6501688b 100644 |
8 |
--- a/eclass/meson.eclass |
9 |
+++ b/eclass/meson.eclass |
10 |
@@ -5,7 +5,7 @@ |
11 |
# @MAINTAINER: |
12 |
# William Hubbs <williamh@g.o> |
13 |
# Mike Gilbert <floppym@g.o> |
14 |
-# @SUPPORTED_EAPIS: 6 7 8 |
15 |
+# @SUPPORTED_EAPIS: 7 8 |
16 |
# @BLURB: common ebuild functions for meson-based packages |
17 |
# @DESCRIPTION: |
18 |
# This eclass contains the default phase functions for packages which |
19 |
@@ -35,29 +35,22 @@ |
20 |
# @CODE |
21 |
|
22 |
case ${EAPI} in |
23 |
- 6|7|8) ;; |
24 |
+ 7|8) ;; |
25 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
26 |
esac |
27 |
|
28 |
if [[ -z ${_MESON_ECLASS} ]]; then |
29 |
_MESON_ECLASS=1 |
30 |
|
31 |
-[[ ${EAPI} == 6 ]] && inherit eapi7-ver |
32 |
inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs |
33 |
|
34 |
EXPORT_FUNCTIONS src_configure src_compile src_test src_install |
35 |
|
36 |
-_MESON_DEPEND=">=dev-util/meson-0.59.4 |
37 |
+BDEPEND=">=dev-util/meson-0.59.4 |
38 |
${NINJA_DEPEND} |
39 |
dev-util/meson-format-array |
40 |
" |
41 |
|
42 |
-if [[ ${EAPI} == 6 ]]; then |
43 |
- DEPEND=${_MESON_DEPEND} |
44 |
-else |
45 |
- BDEPEND=${_MESON_DEPEND} |
46 |
-fi |
47 |
- |
48 |
# @ECLASS_VARIABLE: BUILD_DIR |
49 |
# @DEFAULT_UNSET |
50 |
# @DESCRIPTION: |
51 |
-- |
52 |
2.35.1 |