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 08/15] scons-utils.eclass: Deprecate use_scons, ban it in EAPI 6
Date: Fri, 01 Jan 2016 16:45:25
Message-Id: 1451666481-22145-9-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/15] scons-utils.eclass: EAPI 6, better docs and cleanup by "Michał Górny"
1 ---
2 eclass/scons-utils.eclass | 9 +++++++++
3 1 file changed, 9 insertions(+)
4
5 diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
6 index fdc6af3..b8051b0 100644
7 --- a/eclass/scons-utils.eclass
8 +++ b/eclass/scons-utils.eclass
9 @@ -79,11 +79,15 @@
10
11 # @ECLASS-VARIABLE: USE_SCONS_TRUE
12 # @DESCRIPTION:
13 +# DEPRECATED: use usex instead
14 +#
15 # The default value for truth in scons-use() (1 by default).
16 : ${USE_SCONS_TRUE:=1}
17
18 # @ECLASS-VARIABLE: USE_SCONS_FALSE
19 # @DESCRIPTION:
20 +# DEPRECATED: use usex instead
21 +#
22 # The default value for false in scons-use() (0 by default).
23 : ${USE_SCONS_FALSE:=0}
24
25 @@ -236,6 +240,8 @@ scons_clean_makeopts() {
26 # @FUNCTION: use_scons
27 # @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false]
28 # @DESCRIPTION:
29 +# DEPRECATED, EAPI 0..5 ONLY: use usex instead
30 +#
31 # Output a SCons parameter with value depending on the USE flag state.
32 # If the USE flag is set, output <var-name>=<var-opt-true>; otherwise
33 # <var-name>=<var-opt-false>.
34 @@ -247,6 +253,9 @@ scons_clean_makeopts() {
35 # If <var-opt-true> and/or <var-opt-false> are omitted,
36 # ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead.
37 use_scons() {
38 + [[ ${EAPI} == [012345] ]] \
39 + || die "${FUNCNAME} is banned in EAPI ${EAPI}, use usex instead"
40 +
41 local flag=${1}
42 local varname=${2:-${flag/\!/no}}
43 local vartrue=${3:-${USE_SCONS_TRUE}}
44 --
45 2.6.4