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

[Michał Górny]

commit:     3adbe305677653d372da5973ac19b6b547f27312
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 15:10:05 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 18:05:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adbe305

distutils-r1.eclass: Fix PEP517 + single-impl w/ no scripts

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

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1724804687a1..02d8bf547cba 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1274,7 +1274,10 @@ distutils-r1_python_install() {
                # are already in scriptdir
                rm -r "${root}${scriptdir}" || die
                if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then
-                       mv "${root}$(python_get_scriptdir)" 
"${root}${scriptdir}" || die
+                       local wrapped_scriptdir=${root}$(python_get_scriptdir)
+                       if [[ -d ${wrapped_scriptdir} ]]; then
+                               mv "${wrapped_scriptdir}" "${root}${scriptdir}" 
|| die
+                       fi
                fi
        else
                local root=${D%/}/_${EPYTHON}