commit: c6d725a8d80647537ccb5b6f0f01a4c294f23404
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 16:11:09 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 08:50:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d725a8
distutils-r1.eclass: Remove obsolete EAPI condition for *.pth files
Remove the EAPI condition for *.pth files, as they are banned in all
EAPIs currently supported by the eclass.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/distutils-r1.eclass | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index ac03659120d5..0345e3a12c02 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -2023,21 +2023,19 @@ _distutils-r1_check_namespace_pth() {
done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
if [[ ${pth[@]} ]]; then
- ewarn "The following *-nspkg.pth files were found installed:"
- ewarn
+ eerror "The following *-nspkg.pth files were found installed:"
+ eerror
for f in "${pth[@]}"; do
- ewarn " ${f#${ED%/}}"
+ eerror " ${f#${ED%/}}"
done
- ewarn
- ewarn "The presence of those files may break namespaces in
Python 3.5+. Please"
- ewarn "read our documentation on reliable handling of
namespaces and update"
- ewarn "the ebuild accordingly:"
- ewarn
- ewarn "
https://projects.gentoo.org/python/guide/concept.html#namespace-packages";
-
- if ! has "${EAPI}" 6 7 8; then
- die "*-nspkg.pth files are banned in EAPI ${EAPI}"
- fi
+ eerror
+ eerror "The presence of those files may break namespaces in
Python 3.5+. Please"
+ eerror "read our documentation on reliable handling of
namespaces and update"
+ eerror "the ebuild accordingly:"
+ eerror
+ eerror "
https://projects.gentoo.org/python/guide/concept.html#namespace-packages";
+
+ die "Installing *-nspkg.pth files is banned"
fi
}
