From 1c3e4b596c9b488f6c6e5a1f7f2b475b080880de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 3 May 2018 12:02:25 +0200 Subject: [PATCH] scons-utils.eclass: Support EAPI 7 Enable EAPI 7 support. Move dev-util/scons to BDEPEND in EAPI 7 since it needs to run on the build host. --- eclass/scons-utils.eclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 41a86adfa14a..02c9061ba95d 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: scons-utils.eclass @@ -93,7 +93,7 @@ # -- EAPI support check -- case ${EAPI:-0} in - 0|1|2|3|4|5|6) ;; + 0|1|2|3|4|5|6|7) ;; *) die "EAPI ${EAPI} unsupported." esac @@ -102,9 +102,14 @@ inherit multiprocessing # -- ebuild variables setup -- if [[ -n ${SCONS_MIN_VERSION} ]]; then - DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" + BDEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" else - DEPEND="dev-util/scons" + BDEPEND="dev-util/scons" +fi + +if [[ ${EAPI:-0} == [0123456] ]]; then + DEPEND=${BDEPEND} + unset BDEPEND fi # -- public functions -- -- 2.26.2