| 1 |
commit: 1c3e4b596c9b488f6c6e5a1f7f2b475b080880de |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 10:02:25 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 7 07:43:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3e4b59 |
| 7 |
|
| 8 |
scons-utils.eclass: Support EAPI 7 |
| 9 |
|
| 10 |
Enable EAPI 7 support. Move dev-util/scons to BDEPEND in EAPI 7 |
| 11 |
since it needs to run on the build host. |
| 12 |
|
| 13 |
eclass/scons-utils.eclass | 13 +++++++++---- |
| 14 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass |
| 17 |
index 41a86adfa14..02c9061ba95 100644 |
| 18 |
--- a/eclass/scons-utils.eclass |
| 19 |
+++ b/eclass/scons-utils.eclass |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# @ECLASS: scons-utils.eclass |
| 26 |
@@ -93,7 +93,7 @@ |
| 27 |
# -- EAPI support check -- |
| 28 |
|
| 29 |
case ${EAPI:-0} in |
| 30 |
- 0|1|2|3|4|5|6) ;; |
| 31 |
+ 0|1|2|3|4|5|6|7) ;; |
| 32 |
*) die "EAPI ${EAPI} unsupported." |
| 33 |
esac |
| 34 |
|
| 35 |
@@ -102,9 +102,14 @@ inherit multiprocessing |
| 36 |
# -- ebuild variables setup -- |
| 37 |
|
| 38 |
if [[ -n ${SCONS_MIN_VERSION} ]]; then |
| 39 |
- DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" |
| 40 |
+ BDEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" |
| 41 |
else |
| 42 |
- DEPEND="dev-util/scons" |
| 43 |
+ BDEPEND="dev-util/scons" |
| 44 |
+fi |
| 45 |
+ |
| 46 |
+if [[ ${EAPI:-0} == [0123456] ]]; then |
| 47 |
+ DEPEND=${BDEPEND} |
| 48 |
+ unset BDEPEND |
| 49 |
fi |
| 50 |
|
| 51 |
# -- public functions -- |
Archives