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 6/6] distutils-r1.eclass: Restore QA warning for DUS + DISTUTILS_OPTIONAL
Date: Mon, 31 Jan 2022 23:01:27
Message-Id: 20220131225920.192125-7-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/6] Another batch of distutils-r1.eclass fixes by "Michał Górny"
1 Restore the QA warning (proviously issued as part of install-qa-check.d)
2 for combining DISTUTILS_USE_SETUPTOOLS and DISTUTILS_OPTIONAL.
3
4 Signed-off-by: Michał Górny <mgorny@g.o>
5 ---
6 eclass/distutils-r1.eclass | 5 +++++
7 1 file changed, 5 insertions(+)
8
9 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
10 index a0ad598eb58f..2b5acb09d926 100644
11 --- a/eclass/distutils-r1.eclass
12 +++ b/eclass/distutils-r1.eclass
13 @@ -201,6 +201,11 @@ _distutils_set_globals() {
14 die "Unknown DISTUTILS_USE_PEP517=${DISTUTILS_USE_PEP517}"
15 ;;
16 esac
17 + elif [[ ${DISTUTILS_OPTIONAL} ]]; then
18 + if [[ ${DISTUTILS_USE_SETUPTOOLS} ]]; then
19 + eqawarn "QA Notice: DISTUTILS_USE_SETUPTOOLS is not used when DISTUTILS_OPTIONAL"
20 + eqawarn "is enabled."
21 + fi
22 else
23 local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]'
24
25 --
26 2.35.1