Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 04 Feb 2022 18:40:35
Message-Id: 1644000010.62db869f4c3a1d24f31c2cbf8565e5d63364ca42.mgorny@gentoo
1 commit: 62db869f4c3a1d24f31c2cbf8565e5d63364ca42
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 4 18:37:45 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 4 18:40:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62db869f
7
8 scons-utils.eclass: Replace deprecated PYTHON_MULTI_USEDEP
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/scons-utils.eclass | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
16 index 93eac1a4c4aa..35bda2bc1ac3 100644
17 --- a/eclass/scons-utils.eclass
18 +++ b/eclass/scons-utils.eclass
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 # @ECLASS: scons-utils.eclass
25 @@ -128,9 +128,9 @@ if [[ ${_PYTHON_ANY_R1} ]]; then
26 }
27 python_check_deps() { scons-utils_python_check_deps; }
28 elif [[ ${_PYTHON_SINGLE_R1} ]]; then
29 - # when using python-single-r1, use PYTHON_MULTI_USEDEP API
30 + # when using python-single-r1, use PYTHON_USEDEP API
31 BDEPEND="
32 - $(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_MULTI_USEDEP}]")
33 + $(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")
34 ${PYTHON_DEPS}"
35 elif [[ ${EAPI:-0} == [0123456] ]]; then
36 # in older EAPIs, just force Python 2.7