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

[Mike Gilbert]

commit:     adb01ab507f01f938f77d5e1794d7acb42378ad6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 19:22:23 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 21:05:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb01ab5

Revert "distutils-r1.eclass: Use 'dosym -r' in EAPI 8"

This breaks installation of scripts when EPREFIX is non-empty.

_distutils-r1_wrap_scripts should create a symlink like this:

"${D}/_${EPYTHON}${EPREFIX}/usr/bin/myscript"

The "dosym" version of this code creates the following instead:

"${D}${EPREFIX}/_${EPYTHON}/usr/bin/myscript"

Reverts: 9f831e240a9804a996fc80015f64d5e102ced740
Closes: https://bugs.gentoo.org/798456
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/distutils-r1.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index cc0416fb1d9..a26130f7a19 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -776,10 +776,8 @@ _distutils-r1_wrap_scripts() {
                        local basename=${f##*/}
 
                        debug-print "${FUNCNAME}: installing wrapper at 
${bindir}/${basename}"
-                       local dosym=dosym
-                       [[ ${EAPI} == [67] ]] && dosym=dosym8
-                       "${dosym}" -r 
"${path#${D}}"/usr/lib/python-exec/python-exec2 \
-                               "${path#${D}}${bindir#${EPREFIX}}/${basename}"
+                       _python_ln_rel 
"${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \
+                               "${path}${bindir}/${basename}" || die
                done
 
                for f in "${non_python_files[@]}"; do