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