Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 8/9] distutils-r1.eclass: Do not require distutils-r1_python_install_all
Date: Wed, 04 Mar 2020 14:35:19
Message-Id: 20200304143223.55830-9-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/9] python-r1 suite cleanup by "Michał Górny"
1 Stop requiring ebuilds to call distutils-r1_python_install_all default
2 function. It just calls einstalldocs these days, and it is unlikely
3 that more magic will ever be added there.
4
5 Signed-off-by: Michał Górny <mgorny@g.o>
6 ---
7 eclass/distutils-r1.eclass | 9 ---------
8 1 file changed, 9 deletions(-)
9
10 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
11 index 8b7745686d73..abb86996c5d6 100644
12 --- a/eclass/distutils-r1.eclass
13 +++ b/eclass/distutils-r1.eclass
14 @@ -922,8 +922,6 @@ distutils-r1_python_install_all() {
15 )
16 docompress -x "/usr/share/doc/${PF}/examples"
17 fi
18 -
19 - _DISTUTILS_DEFAULT_CALLED=1
20 }
21
22 # @FUNCTION: distutils-r1_run_phase
23 @@ -1154,13 +1152,6 @@ distutils-r1_src_install() {
24 _distutils-r1_run_common_phase distutils-r1_python_install_all
25 fi
26
27 - if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
28 - local cmd=die
29 - [[ ${EAPI} == [45] ]] && cmd=eqawarn
30 -
31 - "${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
32 - fi
33 -
34 _distutils-r1_check_namespace_pth
35 }
36
37 --
38 2.25.1