[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     9aa12f6df659e6d3059fbcd17ac8508ad6458822
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 13:27:31 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 07:57:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa12f6d

distutils-r1.eclass: Do not require distutils-r1_python_install_all

Stop requiring ebuilds to call distutils-r1_python_install_all default
function.  It just calls einstalldocs these days, and it is unlikely
that more magic will ever be added there.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 8b7745686d7..5267cae948a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -922,8 +922,6 @@ distutils-r1_python_install_all() {
 		)
 		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
-
-	_DISTUTILS_DEFAULT_CALLED=1
 }
 
 # @FUNCTION: distutils-r1_run_phase
@@ -1146,21 +1144,12 @@ distutils-r1_src_install() {
 		_distutils-r1_run_foreach_impl distutils-r1_python_install
 	fi
 
-	local _DISTUTILS_DEFAULT_CALLED
-
 	if declare -f python_install_all >/dev/null; then
 		_distutils-r1_run_common_phase python_install_all
 	else
 		_distutils-r1_run_common_phase distutils-r1_python_install_all
 	fi
 
-	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		local cmd=die
-		[[ ${EAPI} == [45] ]] && cmd=eqawarn
-
-		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
-	fi
-
 	_distutils-r1_check_namespace_pth
 }