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 7/8] scons-utils.eclass: Support EAPI 7
Date: Thu,  3 May 2018 12:18:10 +0200	[thread overview]
Message-ID: <20180503101811.28837-8-mgorny@gentoo.org> (raw)
In-Reply-To: <20180503101811.28837-1-mgorny@gentoo.org>

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.17.0



  parent reply	other threads:[~2018-05-03 10:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-03 10:18 [gentoo-dev] [PATCH 0/8] EAPI 7 in my eclasses, part one Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 1/8] bash-completion-r1.eclass: Allow EAPI 7 (no changes) Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 2/8] git-r3.eclass: Support EAPI 7 Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 3/8] multibuild.eclass: Enable EAPI 7 (no changes) Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 4/8] multilib-build.eclass: Enable EAPI 7 support Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 5/8] ninja-utils.eclass: Enable EAPI 7 (no changes) Michał Górny
2018-05-03 10:18 ` [gentoo-dev] [PATCH 6/8] out-of-source.eclass: " Michał Górny
2018-05-03 10:18 ` Michał Górny [this message]
2018-05-03 10:18 ` [gentoo-dev] [PATCH 8/8] multilib-minimal.eclass: " 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=20180503101811.28837-8-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