dev-python/pypy3-bin: INSDESTTREE -> custom var, #582982

diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
index f675894055eb9df664331615ebe81bef683697a5..eecd2805cbb97541f29006d3607f307fd1b2c2df 100644 (file)
--- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
@@ -128,27 +128,28 @@ src_test() {
 }
 
 src_install() {
+       local dest=/usr/$(get_libdir)/pypy3
        einfo "Installing PyPy ..."
-       insinto "/usr/$(get_libdir)/pypy3"
+       insinto "${dest}"
        doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-       fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
-       pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+       fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+       pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
        dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
        dodoc README.rst
 
        if ! use gdbm; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+               rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+                       "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
        fi
        if ! use sqlite; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+               rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+                       "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+                       "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
        fi
        if ! use tk; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+               rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+                       "${ED%/}${dest}"/lib_pypy/_tkinter \
+                       "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
        fi
 
        # Install docs
@@ -156,8 +157,8 @@ src_install() {
 
        einfo "Generating caches and byte-compiling ..."
 
-       local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-       local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+       local -x PYTHON=${ED%/}${dest}/pypy-c
+       local -x LD_LIBRARY_PATH="${ED%/}${dest}"
        # we can't use eclass function since PyPy is dumb and always gives
        # paths relative to the interpreter
        local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -185,9 +186,9 @@ src_install() {
        fi
 
        # Cleanup temporary objects
-       find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-       find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+       find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+       find "${ED%/}${dest}" -type d -empty -delete || die
 
        # compile the installed modules
-       python_optimize "${ED%/}${INSDESTTREE}"
+       python_optimize "${ED%/}${dest}"
 }