public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 5/6] scons-utils.eclass: Default SCONS_MIN_VERSION to current stable
Date: Fri, 28 Oct 2022 19:51:10 +0200	[thread overview]
Message-ID: <20221028175111.5064-6-mgorny@gentoo.org> (raw)
In-Reply-To: <20221028175111.5064-1-mgorny@gentoo.org>

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/scons-utils.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index b8e3332a1263..cbe92f6fc385 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -64,6 +64,7 @@
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The minimal version of SCons required for the build to work.
+: "${SCONS_MIN_VERSION:=4.4.0}"
 
 # @ECLASS_VARIABLE: SCONSOPTS
 # @USER_VARIABLE
@@ -92,11 +93,7 @@ inherit multiprocessing
 
 # -- ebuild variables setup --
 
-if [[ -n ${SCONS_MIN_VERSION} ]]; then
-	SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
-else
-	SCONS_DEPEND="dev-util/scons"
-fi
+SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
 
 if [[ ${_PYTHON_ANY_R1} ]]; then
 	# when using python-any-r1, use any-of dep API
-- 
2.38.1



  parent reply	other threads:[~2022-10-28 17:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-28 17:51 [gentoo-dev] [PATCH 0/6] scons-utils.eclass: EAPI 8 support and cleanup Michał Górny
2022-10-28 17:51 ` [gentoo-dev] [PATCH 1/6] scons-utils.eclass: Remove support for EAPI 0..6 Michał Górny
2022-10-28 17:51 ` [gentoo-dev] [PATCH 2/6] scons-utils.eclass: Use python_has_version Michał Górny
2022-10-28 17:51 ` [gentoo-dev] [PATCH 3/6] scons-utils.eclass: Enable EAPI 8 support Michał Górny
2022-10-28 17:51 ` [gentoo-dev] [PATCH 4/6] scons-utils.eclass: Update documentation Michał Górny
2022-10-28 17:51 ` Michał Górny [this message]
2022-10-28 17:51 ` [gentoo-dev] [PATCH 6/6] scons-utils.eclass: Reuse makeopts_jobs Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221028175111.5064-6-mgorny@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox