distutils-r1.eclass: Do not require distutils-r1_python_install_all
authorMichał Górny <mgorny@gentoo.org>
Wed, 4 Mar 2020 13:27:31 +0000 (14:27 +0100)
committerMichał Górny <mgorny@gentoo.org>
Thu, 5 Mar 2020 07:57:44 +0000 (08:57 +0100)
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@gentoo.org>
eclass/distutils-r1.eclass

index 8b7745686d73e7706aaec960b8bb183c8f5dacb2..5267cae948a55e2a8570fe916d8e34c332654732 100644 (file)
@@ -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
 }