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: Tue, 01 Feb 2022 18:33:47
Message-Id: 1643740400.8a8c999ecf9892c8b41ccb120d0098212cd1374f.mgorny@gentoo
1 commit: 8a8c999ecf9892c8b41ccb120d0098212cd1374f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 31 19:15:58 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 1 18:33:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8c999e
7
8 distutils-r1.eclass: Restore QA warning for DUS + DISTUTILS_OPTIONAL
9
10 Restore the QA warning (proviously issued as part of install-qa-check.d)
11 for combining DISTUTILS_USE_SETUPTOOLS and DISTUTILS_OPTIONAL.
12
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 eclass/distutils-r1.eclass | 5 +++++
16 1 file changed, 5 insertions(+)
17
18 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
19 index a0ad598eb58f..2b5acb09d926 100644
20 --- a/eclass/distutils-r1.eclass
21 +++ b/eclass/distutils-r1.eclass
22 @@ -201,6 +201,11 @@ _distutils_set_globals() {
23 die "Unknown DISTUTILS_USE_PEP517=${DISTUTILS_USE_PEP517}"
24 ;;
25 esac
26 + elif [[ ${DISTUTILS_OPTIONAL} ]]; then
27 + if [[ ${DISTUTILS_USE_SETUPTOOLS} ]]; then
28 + eqawarn "QA Notice: DISTUTILS_USE_SETUPTOOLS is not used when DISTUTILS_OPTIONAL"
29 + eqawarn "is enabled."
30 + fi
31 else
32 local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]'