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

diff --git a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
index 3ff58949031525f673652ed811134284a6daf8c0..1cc2f079a45afded5fe3230e3094b70e37d43ee0 100644 (file)
--- a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
@@ -175,27 +175,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
@@ -203,8 +204,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
@@ -234,9 +235,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}"
 }

diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index c00fc6575e06e3a29af73cdda17f7a05801ec2fc..8eb168a515c83f84c5b07cf9c019040c60fa1618 100644 (file)
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -164,27 +164,28 @@ src_compile() {
 }
 
 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
@@ -192,8 +193,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
@@ -225,16 +226,16 @@ src_install() {
        local t
        # all modules except tkinter output to .
        # tkinter outputs to the correct dir ...
-       cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+       cd "${ED%/}${dest}"/lib_pypy || die
        for t in "${cffi_targets[@]}"; do
                # tkinter doesn't work via -m
                "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
        done
 
        # 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}"
 }