commit: 1c3e4b596c9b488f6c6e5a1f7f2b475b080880de
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 10:02:25 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 7 07:43:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3e4b59
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 41a86adfa14..02c9061ba95 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 --
