---
It seems this is all that is needed, and all the eclasses inherited by
it are supported for EAPI 7. I could be missing something, so please do
comment if I have.
eclass/meson.eclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index f2202a04593..7c5b3da6ffa 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -34,7 +34,7 @@
# @CODE
case ${EAPI:-0} in
- 6) ;;
+ 6|7) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
@@ -69,7 +69,11 @@ MESON_DEPEND=">=dev-util/meson-0.40.0
# their own DEPEND string.
: ${MESON_AUTO_DEPEND:=yes}
if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then
- DEPEND=${MESON_DEPEND}
+ if [[ ${EAPI:-0} == [0123456] ]]; then
+ DEPEND=${MESON_DEPEND}
+ else
+ BDEPEND=${MESON_DEPEND}
+ fi
fi
__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
--
2.18.0
