[gentoo-dev] [PATCH 05/25] distutils-r2.eclass: Make all old QA warnings fatal

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@g.o>
---
 eclass/distutils-r2.eclass | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/eclass/distutils-r2.eclass b/eclass/distutils-r2.eclass
index 66df9e8f7272..1b3f9e89fc49 100644
--- a/eclass/distutils-r2.eclass
+++ b/eclass/distutils-r2.eclass
@@ -93,7 +93,6 @@ esac
 
 if [[ ! ${_DISTUTILS_R2} ]]; then
 
-[[ ${EAPI} == [456] ]] && inherit eutils
 [[ ${EAPI} == [56] ]] && inherit xdg-utils
 inherit multiprocessing toolchain-funcs
 
@@ -462,9 +461,10 @@ _distutils_verify_use_setuptools() {
 			local def=
 			[[ ${DISTUTILS_USE_SETUPTOOLS} == bdepend ]] && def=' (default?)'
 
-			eqawarn "DISTUTILS_USE_SETUPTOOLS value is probably incorrect"
-			eqawarn "  value:    DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}${def}"
-			eqawarn "  expected: DISTUTILS_USE_SETUPTOOLS=${expected}"
+			ewarn "DISTUTILS_USE_SETUPTOOLS value is probably incorrect"
+			ewarn "  value:    DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}${def}"
+			ewarn "  expected: DISTUTILS_USE_SETUPTOOLS=${expected}"
+			die "Incorrect DISTUTILS_USE_SETUPTOOLS"
 		fi
 	fi
 }
@@ -852,9 +852,7 @@ distutils-r2_python_install() {
 	${shopt_save}
 
 	if [[ -n ${pypy_dirs} ]]; then
-		local cmd=die
-		[[ ${EAPI} == [45] ]] && cmd=eqawarn
-		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
+		die "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
@@ -1001,10 +999,7 @@ distutils-r2_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		local cmd=die
-		[[ ${EAPI} == [45] ]] && cmd=eqawarn
-
-		"${cmd}" "QA: python_prepare_all() didn't call distutils-r2_python_prepare_all"
+		die "QA: python_prepare_all() didn't call distutils-r2_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -1086,6 +1081,7 @@ _distutils-r2_check_namespace_pth() {
 		ewarn "the ebuild accordingly:"
 		ewarn
 		ewarn "  https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+		die ".pth files installed"
 	fi
 }
 
@@ -1107,10 +1103,7 @@ distutils-r2_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		local cmd=die
-		[[ ${EAPI} == [45] ]] && cmd=eqawarn
-
-		"${cmd}" "QA: python_install_all() didn't call distutils-r2_python_install_all"
+		die "QA: python_install_all() didn't call distutils-r2_python_install_all"
 	fi
 
 	_distutils-r2_check_namespace_pth
-- 
2.25.1