commit: 626f9cd78c5aeea237199e6a49076a19ecb9a36d Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Jul 2 18:13:43 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jul 2 18:13:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626f9cd7
meson.eclass: remove EAPI 6 Signed-off-by: David Seifert <soap <AT> gentoo.org> eclass/meson.eclass | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 905c4d89f501..7ba6501688b7 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # William Hubbs <[email protected]> # Mike Gilbert <[email protected]> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: common ebuild functions for meson-based packages # @DESCRIPTION: # This eclass contains the default phase functions for packages which @@ -35,29 +35,22 @@ # @CODE case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_MESON_ECLASS} ]]; then _MESON_ECLASS=1 -[[ ${EAPI} == 6 ]] && inherit eapi7-ver inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs EXPORT_FUNCTIONS src_configure src_compile src_test src_install -_MESON_DEPEND=">=dev-util/meson-0.59.4 +BDEPEND=">=dev-util/meson-0.59.4 ${NINJA_DEPEND} dev-util/meson-format-array " -if [[ ${EAPI} == 6 ]]; then - DEPEND=${_MESON_DEPEND} -else - BDEPEND=${_MESON_DEPEND} -fi - # @ECLASS_VARIABLE: BUILD_DIR # @DEFAULT_UNSET # @DESCRIPTION:
