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 5573B13825A for ; Sat, 14 May 2016 09:07:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4066A21C03E; Sat, 14 May 2016 09:07:08 +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 0AED721C03A for ; Sat, 14 May 2016 09:07:07 +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 DC085340A9E 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 EE91596D 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.ca951458e345912a6b3f051244d3047823b6a516.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/pypy3-2.4.0-r2.ebuild dev-python/pypy3/pypy3-9999.ebuild X-VCS-Directories: dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ca951458e345912a6b3f051244d3047823b6a516 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: b9ea4852-d0f1-4a4c-a84b-3c45864d9350 X-Archives-Hash: 9e4432376615eff28e0fc439fabfcd11 commit: ca951458e345912a6b3f051244d3047823b6a516 Author: Michał Górny gentoo org> AuthorDate: Sat May 14 09:05:37 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=ca951458 dev-python/pypy3: INSDESTTREE -> custom var, #582982 dev-python/pypy3/pypy3-2.4.0-r2.ebuild | 33 ++++++++++++++++---------------- dev-python/pypy3/pypy3-9999.ebuild | 35 +++++++++++++++++----------------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild index 3ff5894..1cc2f07 100644 --- 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 c00fc65..8eb168a 100644 --- 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}" }