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

[Michał Górny]

commit:     2a0bda7dbbf4a80a17c45a62a003a7eee2aa865d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 29 07:30:59 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 07:53:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0bda7d

distutils-r1.eclass: Fix installing scripts w/ PEP517 & single-impl

Closes: https://bugs.gentoo.org/832267
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e25263ee7e1d..a5500df86937 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1146,6 +1146,9 @@ distutils-r1_python_install() {
                # remove the altered bindir, executables from the package
                # are already in scriptdir
                rm -r "${root}${scriptdir}" || die
+               if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then
+                       mv "${root}$(python_get_scriptdir)" 
"${root}${scriptdir}" || die
+               fi
        else
                local root=${D%/}/_${EPYTHON}
                [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}