commit: b9c4e4272bace02805880b798f8ae8637737c840
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 2 08:15:24 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 2 08:17:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c4e427
install-qa-check.d: Switch DUS entry point check to pure bdepend
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
metadata/install-qa-check.d/60distutils-use-setuptools | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools
b/metadata/install-qa-check.d/60distutils-use-setuptools
index 25300fddda9..a7905c3f0b2 100644
--- a/metadata/install-qa-check.d/60distutils-use-setuptools
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools
@@ -68,18 +68,12 @@ distutils_use_setuptools_check() {
[[ ${#expected[@]} -eq 0 ]] && expected=( no )
# *+rdepend=rdepend
has rdepend "${expected[@]}" && expected=( rdepend )
-
- if has entry-point "${expected[@]}"; then
- if [[ ${DISTUTILS_STRICT_ENTRY_POINTS} ]]; then
- # option for devs to future-proof their packages
- # please don't let ago enable it
- expected=( bdepend )
- else
- # accept either rdepend or bdepend for the time
being
- # but suggest bdepend as the future-proof option
- expected=( bdepend rdepend )
- fi
- fi
+ # NB: note that expected is overwritten above, so this implies
!rdepend
+ # if the package is using entry points, modern versions of
setuptools
+ # use built-in importlib.metadata module, so no rdep needed
anymore
+ # NB2: this is incorrect for pypy3.7 but we ignore this for the
time
+ # being
+ has entry-point "${expected[@]}" && expected=( bdepend )
if ! has ${DISTUTILS_USE_SETUPTOOLS} "${expected[@]}"; then
local def=
