From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1822413825A for ; Sat, 14 May 2016 09:07:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DACB22404F; Sat, 14 May 2016 09:07:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64CDF21C03A for ; Sat, 14 May 2016 09:07:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BBAC340A7B for ; Sat, 14 May 2016 09:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB00E96C for ; Sat, 14 May 2016 09:07:01 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1463216809.1f2cdfa8b8d790198ea0838443ac5ea577fc2ed7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/pypy-4.0.1.ebuild dev-python/pypy/pypy-5.0.0.ebuild dev-python/pypy/pypy-9999.ebuild X-VCS-Directories: dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1f2cdfa8b8d790198ea0838443ac5ea577fc2ed7 X-VCS-Branch: master Date: Sat, 14 May 2016 09:07:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ab9d153-d4f4-462f-b2e1-f0c186059b29 X-Archives-Hash: bdab27f0c1141a20ccd81bef52d73fc3 commit: 1f2cdfa8b8d790198ea0838443ac5ea577fc2ed7 Author: Michał Górny gentoo org> AuthorDate: Sat May 14 09:02:59 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat May 14 09:06:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2cdfa8 dev-python/pypy: INSDESTTREE -> custom var, #582982 dev-python/pypy/pypy-4.0.1.ebuild | 35 ++++++++++++++++++----------------- dev-python/pypy/pypy-5.0.0.ebuild | 35 ++++++++++++++++++----------------- dev-python/pypy/pypy-9999.ebuild | 35 ++++++++++++++++++----------------- 3 files changed, 54 insertions(+), 51 deletions(-) diff --git a/dev-python/pypy/pypy-4.0.1.ebuild b/dev-python/pypy/pypy-4.0.1.ebuild index 2fed250..a6c918a 100644 --- a/dev-python/pypy/pypy-4.0.1.ebuild +++ b/dev-python/pypy/pypy-4.0.1.ebuild @@ -176,27 +176,28 @@ src_test() { } src_install() { + local dest=/usr/$(get_libdir)/pypy einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" + 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)/pypy/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die + rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die fi if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ + "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die fi if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ + "${ED%/}${dest}"/lib_pypy/_tkinter \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs @@ -204,8 +205,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)/pypy/site-packages @@ -237,16 +238,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}" } diff --git a/dev-python/pypy/pypy-5.0.0.ebuild b/dev-python/pypy/pypy-5.0.0.ebuild index 2fed250..a6c918a 100644 --- a/dev-python/pypy/pypy-5.0.0.ebuild +++ b/dev-python/pypy/pypy-5.0.0.ebuild @@ -176,27 +176,28 @@ src_test() { } src_install() { + local dest=/usr/$(get_libdir)/pypy einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" + 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)/pypy/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die + rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die fi if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ + "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die fi if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ + "${ED%/}${dest}"/lib_pypy/_tkinter \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs @@ -204,8 +205,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)/pypy/site-packages @@ -237,16 +238,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}" } diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild index 52a0851..07df847 100644 --- a/dev-python/pypy/pypy-9999.ebuild +++ b/dev-python/pypy/pypy-9999.ebuild @@ -182,27 +182,28 @@ src_test() { } src_install() { + local dest=/usr/$(get_libdir)/pypy einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" + 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)/pypy/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die + rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die fi if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ + "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die fi if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die + rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ + "${ED%/}${dest}"/lib_pypy/_tkinter \ + "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs @@ -210,8 +211,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)/pypy/site-packages @@ -243,16 +244,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}" }