From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-bin/
Date: Sat, 14 May 2016 09:07:02 +0000 (UTC) [thread overview]
Message-ID: <1463216809.5decd48c8782c4bd377d0c9087e2048a5965f03d.mgorny@gentoo> (raw)
commit: 5decd48c8782c4bd377d0c9087e2048a5965f03d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 09:06:10 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 14 09:06:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5decd48c
dev-python/pypy3-bin: INSDESTTREE -> custom var, #582982
dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild | 33 +++++++++++++-------------
1 file changed, 17 insertions(+), 16 deletions(-)
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 f675894..eecd280 100644
--- 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}"
}
next reply other threads:[~2016-05-14 9:07 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-14 9:07 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-25 18:38 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-bin/ Michał Górny
2019-11-20 12:27 Michał Górny
2019-08-15 11:24 Michał Górny
2019-04-21 6:29 Michał Górny
2019-03-28 14:22 Michał Górny
2019-02-18 16:12 Michał Górny
2019-02-16 15:08 Michał Górny
2019-01-05 13:39 Michał Górny
2019-01-05 13:39 Michał Górny
2018-10-04 17:10 Michał Górny
2018-10-04 17:10 Michał Górny
2018-10-04 16:01 Michał Górny
2018-08-01 12:24 Michał Górny
2018-04-29 6:33 Michał Górny
2018-04-27 6:34 Michał Górny
2018-01-14 14:38 Michał Górny
2018-01-08 19:41 Michał Górny
2018-01-05 23:19 Michał Górny
2017-12-27 18:20 Michał Górny
2017-11-16 12:33 Michał Górny
2017-11-14 18:09 Michał Górny
2017-11-11 19:22 Michał Górny
2017-11-11 15:07 Michał Górny
2017-11-05 16:23 Michał Górny
2017-10-15 7:14 Michał Górny
2017-10-09 18:58 Michał Górny
2017-06-10 7:48 Michał Górny
2017-06-09 23:10 Michał Górny
2017-05-30 7:34 Michał Górny
2016-10-12 20:59 Michał Górny
2016-07-29 15:09 Michał Górny
2016-06-12 19:47 Michał Górny
2016-06-09 19:46 Michał Górny
2016-05-14 9:07 Michał Górny
2016-05-05 15:18 Patrice Clement
2016-03-03 10:47 Michał Górny
2016-03-03 10:47 Michał Górny
2016-03-02 20:56 Michał Górny
2016-03-02 20:56 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463216809.5decd48c8782c4bd377d0c9087e2048a5965f03d.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox