Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 29 Jan 2022 07:53:39
Message-Id: 1643442809.2a0bda7dbbf4a80a17c45a62a003a7eee2aa865d.mgorny@gentoo
1 commit: 2a0bda7dbbf4a80a17c45a62a003a7eee2aa865d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 07:30:59 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 07:53:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0bda7d
7
8 distutils-r1.eclass: Fix installing scripts w/ PEP517 & single-impl
9
10 Closes: https://bugs.gentoo.org/832267
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 eclass/distutils-r1.eclass | 3 +++
14 1 file changed, 3 insertions(+)
15
16 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
17 index e25263ee7e1d..a5500df86937 100644
18 --- a/eclass/distutils-r1.eclass
19 +++ b/eclass/distutils-r1.eclass
20 @@ -1146,6 +1146,9 @@ distutils-r1_python_install() {
21 # remove the altered bindir, executables from the package
22 # are already in scriptdir
23 rm -r "${root}${scriptdir}" || die
24 + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then
25 + mv "${root}$(python_get_scriptdir)" "${root}${scriptdir}" || die
26 + fi
27 else
28 local root=${D%/}/_${EPYTHON}
29 [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}