Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 5/6] scons-utils.eclass: Default SCONS_MIN_VERSION to current stable
Date: Fri, 28 Oct 2022 17:52:50
Message-Id: 20221028175111.5064-6-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/6] scons-utils.eclass: EAPI 8 support and cleanup by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/scons-utils.eclass | 7 ++-----
4 1 file changed, 2 insertions(+), 5 deletions(-)
5
6 diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
7 index b8e3332a1263..cbe92f6fc385 100644
8 --- a/eclass/scons-utils.eclass
9 +++ b/eclass/scons-utils.eclass
10 @@ -64,6 +64,7 @@
11 # @DEFAULT_UNSET
12 # @DESCRIPTION:
13 # The minimal version of SCons required for the build to work.
14 +: "${SCONS_MIN_VERSION:=4.4.0}"
15
16 # @ECLASS_VARIABLE: SCONSOPTS
17 # @USER_VARIABLE
18 @@ -92,11 +93,7 @@ inherit multiprocessing
19
20 # -- ebuild variables setup --
21
22 -if [[ -n ${SCONS_MIN_VERSION} ]]; then
23 - SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
24 -else
25 - SCONS_DEPEND="dev-util/scons"
26 -fi
27 +SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
28
29 if [[ ${_PYTHON_ANY_R1} ]]; then
30 # when using python-any-r1, use any-of dep API
31 --
32 2.38.1