Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/
Date: Sat, 03 Sep 2016 17:35:46
Message-Id: 1472924133.358f12b0d5b186bf7a6ac249ff8a156b86fc5097.mgorny@gentoo
1 commit: 358f12b0d5b186bf7a6ac249ff8a156b86fc5097
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 15:30:48 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 17:35:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358f12b0
7
8 dev-python/pypy-bin: Bump to 5.4.0
9
10 dev-python/pypy-bin/Manifest | 8 ++
11 dev-python/pypy-bin/pypy-bin-5.4.0.ebuild | 204 ++++++++++++++++++++++++++++++
12 2 files changed, 212 insertions(+)
13
14 diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
15 index 6405b93..1587b2e 100644
16 --- a/dev-python/pypy-bin/Manifest
17 +++ b/dev-python/pypy-bin/Manifest
18 @@ -36,7 +36,15 @@ DIST pypy-bin-5.3.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10268792 SHA25
19 DIST pypy-bin-5.3.1-x86+bzip2+jit+ncurses+sse2.tar.lz 11318171 SHA256 afc1a7083ef354cd5037d4d23e44bc243881624037b5eb39084e1e65b61c2284 SHA512 ccfb921a54ff60e0bbdd7f6b8b96f66bc41c47d93d0f9a4fb735a5901081be21db2d60c9d7f89bf8ff07d8cdeed481e9987a7b970d925a0e9579231a86b5441a WHIRLPOOL 842c6210b28653b9a143678ba59dd2649e83b929463fd8e4ddfad00346ad551c8f3c6ffb864b71b60651e6744432afd7305d6a12a6ed6a0f19d73f3564d6de88
20 DIST pypy-bin-5.3.1-x86+bzip2+ncurses+sse2.tar.lz 5954728 SHA256 bc7289832ca4c9984180b6cb593de502952d76f6810ee26aff4d37e2798eacfe SHA512 5ced6edb305fd6a38b89baf4c73756ac280934d66b2d11b9a5b1eaf425c3430f6dc3da9e43fa495f8b677fe1263cabacab73ef6ef95bf348c6dbce0defa41ac6 WHIRLPOOL bd7b31b521b7835ad8673b508f5815c80c3c9c1628ba0999ec07340d8b4982a8e04583c7ae0afd73f15437069950c635c25ce42da3ae6a80065de46c6af7a0d7
21 DIST pypy-bin-5.3.1-x86+bzip2+ncurses.tar.lz 5953506 SHA256 317b29daa7fe4df693a79eed7dc330fadbfe00084cedbbc5217721b4750c4b30 SHA512 78ee21fc0224e8104843d2652039d26ada52cd5a544056161e739458a83fe28c8cf7b4077c40070deef817a2f6d0581120e44ebc38f017a5f843badb31fa5f3c WHIRLPOOL 62e3a119a7a720710ceb46e15453d6cdb65726af97b5c9f664f7748aeafd3cf0ca6a4e748040a1eb24acfec2afb20543b25c08211f42f3d354d3e01a7cfa214b
22 +DIST pypy-bin-5.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 12931554 SHA256 f91ebc6ec7424f6051a984259c851df5c0e9e6dd382623308819d22d0ad5afce SHA512 4611bae9f02448615c1a96f2113342ae34e3bb753196da81bc8139f7bc6488b21c4b9beeec1d318e7190f1448f1889b413e02ce4b6d24daad85d557fcd7f2c43 WHIRLPOOL 925fb730ebf624c19ccdd236bef0452c8ef06cc28e183c664d2de875fca3c1323202be27a98cae459b0833bf5ad78524e5578448e0c9917911598d4a09f2f1a2
23 +DIST pypy-bin-5.4.0-amd64+bzip2+jit+ncurses.tar.lz 14045080 SHA256 9838367177d5702255d73dad23a2a65ee3f6c7513e53b8b00ca3f512f68abb3e SHA512 0cc94174f2565973c629f6d8736825b489ef2da8919cd339e6451199793ef4068d8c953881a76528f193c245f45de9481d2a3f263ff1c78f57a466995818edbe WHIRLPOOL ec0d0d481f3af9a0b91dac95ccf9b575bc2f809f5f5dd5803337968233a1de6c4dc3fb8a32d9f61e9537ce464d887220c18cd0ef367248244c0adfd9b4ad86a6
24 +DIST pypy-bin-5.4.0-amd64+bzip2+ncurses.tar.lz 7234735 SHA256 1f1dd1a55242888c6e1e9bb0d2186516f7ca4e89b85b9cd1ea1f1441a247079f SHA512 de4db731eac20a4d3006b2a443c99007954486b170fa2207a2711aba45ff6e0029eb04ed9cccaf20d3451e7479d8960fe30f5db17f2ffdf3a47186b440947d85 WHIRLPOOL ceeea695484e1c4357bd46ec2c8125141924ae5020cd24f9fcbb777efca1d5525e7987f406a3bb34e6050bee9c4777b04b8bc8c465a847ad00f32aec4f2e6a6a
25 +DIST pypy-bin-5.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10323530 SHA256 392adca7e4af88c5c768320a29166838a0b8647e3fa1f53df747f19e42948d4a SHA512 a6a3cd98c56dffca1e45482c3b0bc7e2f17b5503e9368d5c44e257109f45a6f5124f5bcc28490def0ab729380fc15e819be0e88e20c2170b4d2942470930837c WHIRLPOOL 6eff91f2284e5a46cec006a07451ae293c426861fd7a4344750cbaf1f022f2c8ec4724c57fac83b048a9d15db9d3420176fc65c92dca58018793836fcb9f8784
26 +DIST pypy-bin-5.4.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11451215 SHA256 8673f3a44cd7c988bfc437d98786e32ac7ffc81bbd9cc70f1c5409b7a91d0f73 SHA512 36f5c5ee89d9d3ce93cf5c2ff0a1cfdaf4c317ac28a96c79f7dc9670e81fd3d7afbad1474e4542e59522019729c123000fb94950dbaa6cdf37e542706e08c9b8 WHIRLPOOL 65ede342b4a4d61df73ab88ff63ececbd93b0a608609413a6e9ebd14aa4c4105c41aed9c5a9b0f72f789208f73d18abe3dfd6bdc48cdbe8b39e2ab614c1a9278
27 +DIST pypy-bin-5.4.0-x86+bzip2+ncurses+sse2.tar.lz 5990323 SHA256 272a2aa4cd0bd4b4653fb36c72e10b3f8d383f76dd616bb218dd8d44067a9c30 SHA512 12c5875d720b6fb1865d0080cfafd50304a01083f48c240897dc726515078216eb2302483688df102e14068f900765e504ed2176d51b46bbeca51195e0437657 WHIRLPOOL 5fc099af5154f0f26ad287451924b55f6ed9e5070585b2b0014cae6f6b9351072eb2dfb63401862e0daa391559e1a05b2c8e12464b58d98606c32ca15a85dbe7
28 +DIST pypy-bin-5.4.0-x86+bzip2+ncurses.tar.lz 6009517 SHA256 38a03bbc64f368fa58e511038566cff8e3c01570e48aa00d686737809e41e81b SHA512 3dbea8724dc025bfcd1592a851db1fdd742fae7638314d6ca56770802c1041cee6c95d1ca7b881e4ce64d7daea42c53fe40228512ad6d62918c6daae1ccf0dc6 WHIRLPOOL 567abe65875131c32c046d6538823926c8544e22518512e1eb2aa10036d3f28f5319e848c43ecdcd1f6d828a4eb8d5763260f365b847d6b1a8ee597659cdce5c
29 DIST pypy2-v5.3.0-src.tar.bz2 17361429 SHA256 4142eb8f403810bc88a4911792bb5a502e152df95806e33e69050c828cd160d5 SHA512 6387987b93bebf8ca6d820bde6c42c1a7427a778ff01cf93766df34be792cb1a8d927b3e402f90159df75f68aa1c913a28e9d453e3b13b28489cb68670ef121d WHIRLPOOL 57b9718b1ed72f13005a6d5a60b24d0fdab522ff63b3f91264433cf17f0bb4c5f36e3121d8d92744386fa5d31fbce14711689c85f87a53b68bfdbddaa19a3edd
30 DIST pypy2-v5.3.1-src.tar.bz2 17361760 SHA256 31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e SHA512 3138dde3cb1a155e389a2be615601e22f468d2bc77dd219a35b310052fa06f68f80c3ff62fa4d0a9179eae014ace18620d0a076a0528cb155b1c33cc94d6b397 WHIRLPOOL 518b73ec649673fb1fc333b5d0e7669f06e9569624e2f8b55dbbf24b5f109a3b9680ed1d45c6401eb62ee8761043ec9c38a33e6d396c39c3f2fb5ba30f15e93a
31 +DIST pypy2-v5.4.0-src.tar.bz2 17414795 SHA256 d9568ebe9a14d0eaefde887d78f3cba63d665e95c0d234bb583932341f55a655 SHA512 a989393f75ff45d6a8b8b2597c0a208559b3188ffdf65205ad491332f1836a86bbb419a3dfba67f80e5ab8d075aa97f44c63316f805a51d7ce1481e81b461373 WHIRLPOOL 623bbaed02214cbc2092abd163e102c11405f12b73dd2ace8098e08a415bd43a0bf13809913b56c378a8a688ff6ff561dc9a90bcd479de85bb301aa67c670d26
32 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
33 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
34
35 diff --git a/dev-python/pypy-bin/pypy-bin-5.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.4.0.ebuild
36 new file mode 100644
37 index 00000000..88876b6
38 --- /dev/null
39 +++ b/dev-python/pypy-bin/pypy-bin-5.4.0.ebuild
40 @@ -0,0 +1,204 @@
41 +# Copyright 1999-2016 Gentoo Foundation
42 +# Distributed under the terms of the GNU General Public License v2
43 +# $Id$
44 +
45 +EAPI=5
46 +
47 +PYTHON_COMPAT=( python2_7 pypy )
48 +inherit eutils multilib pax-utils python-any-r1 unpacker versionator
49 +
50 +BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
51 +CPY_PATCHSET_VERSION="2.7.11-0"
52 +MY_P=pypy2-v${PV}
53 +
54 +DESCRIPTION="Pre-built version of PyPy"
55 +HOMEPAGE="http://pypy.org/"
56 +SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
57 + https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
58 + amd64? (
59 + jit? ( shadowstack? (
60 + ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
61 + ) )
62 + jit? ( !shadowstack? (
63 + ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
64 + ) )
65 + !jit? ( !shadowstack? (
66 + ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
67 + ) )
68 + )
69 + x86? (
70 + cpu_flags_x86_sse2? (
71 + jit? ( shadowstack? (
72 + ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
73 + ) )
74 + jit? ( !shadowstack? (
75 + ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
76 + ) )
77 + !jit? ( !shadowstack? (
78 + ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
79 + ) )
80 + )
81 + !cpu_flags_x86_sse2? (
82 + !jit? ( !shadowstack? (
83 + ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
84 + ) )
85 + )
86 + )"
87 +
88 +# Supported variants
89 +REQUIRED_USE="!jit? ( !shadowstack )
90 + x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
91 +
92 +LICENSE="MIT"
93 +SLOT="0/$(get_version_component_range 1-2 ${PV})"
94 +KEYWORDS="~amd64 ~x86"
95 +IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
96 +
97 +# yep, world would be easier if people started filling subslots...
98 +RDEPEND="
99 + app-arch/bzip2:0=
100 + dev-libs/expat:0=
101 + dev-libs/libffi:0=
102 + dev-libs/openssl:0=[-bindist]
103 + sys-libs/glibc:2.2=
104 + sys-libs/ncurses:0/6
105 + sys-libs/zlib:0=
106 + gdbm? ( sys-libs/gdbm:0= )
107 + sqlite? ( dev-db/sqlite:3= )
108 + tk? (
109 + dev-lang/tk:0=
110 + dev-tcltk/tix:0=
111 + )
112 + !dev-python/pypy:0"
113 +DEPEND="${RDEPEND}
114 + app-arch/lzip
115 + app-arch/xz-utils
116 + doc? ( ${PYTHON_DEPS}
117 + dev-python/sphinx )"
118 +
119 +S=${WORKDIR}/${MY_P}-src
120 +
121 +QA_PREBUILT="
122 + usr/lib*/pypy/pypy-c
123 + usr/lib*/pypy/libpypy-c.so"
124 +
125 +pkg_setup() {
126 + if [[ ${MERGE_TYPE} != binary ]]; then
127 + use doc && python-any-r1_pkg_setup
128 + fi
129 +}
130 +
131 +src_prepare() {
132 + epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
133 + "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
134 +
135 + sed -e "s^@EPREFIX@^${EPREFIX}^" \
136 + -e "s^@libdir@^$(get_libdir)^" \
137 + -i lib-python/2.7/distutils/command/install.py || die
138 +
139 + # apply CPython stdlib patches
140 + pushd lib-python/2.7 > /dev/null || die
141 + epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
142 + "${WORKDIR}"/patches/22_all_turkish_locale.patch \
143 + "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
144 + popd > /dev/null || die
145 +
146 + epatch_user
147 +}
148 +
149 +src_compile() {
150 + # Tadaam! PyPy compiled!
151 + mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
152 + mv "${WORKDIR}"/${P}*/include/*.h include/ || die
153 + # (not installed by pypy)
154 + rm pypy/module/cpyext/include/_numpypy/numpy/README || die
155 + mv pypy/module/cpyext/include/* include/ || die
156 +
157 + use doc && emake -C pypy/doc/ html
158 + #needed even without jit :( also needed in both compile and install phases
159 + pax-mark m pypy-c libpypy-c.so
160 +}
161 +
162 +src_test() {
163 + # (unset)
164 + local -x PYTHONDONTWRITEBYTECODE
165 +
166 + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
167 +}
168 +
169 +src_install() {
170 + local dest=/usr/$(get_libdir)/pypy
171 + einfo "Installing PyPy ..."
172 + insinto "${dest}"
173 + doins -r include lib_pypy lib-python pypy-c libpypy-c.so
174 + fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
175 + pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
176 + dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
177 + dodoc README.rst
178 +
179 + if ! use gdbm; then
180 + rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
181 + "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
182 + fi
183 + if ! use sqlite; then
184 + rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
185 + "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
186 + "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
187 + fi
188 + if ! use tk; then
189 + rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
190 + "${ED%/}${dest}"/lib_pypy/_tkinter \
191 + "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
192 + fi
193 +
194 + # Install docs
195 + use doc && dohtml -r pypy/doc/_build/html/
196 +
197 + einfo "Generating caches and byte-compiling ..."
198 +
199 + local -x PYTHON=${ED%/}${dest}/pypy-c
200 + local -x LD_LIBRARY_PATH="${ED%/}${dest}"
201 + # we can't use eclass function since PyPy is dumb and always gives
202 + # paths relative to the interpreter
203 + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
204 + python_export pypy EPYTHON
205 +
206 + echo "EPYTHON='${EPYTHON}'" > epython.py || die
207 + python_domodule epython.py
208 +
209 + # Generate Grammar and PatternGrammar pickles.
210 + "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
211 + || die "Generation of Grammar and PatternGrammar pickles failed"
212 +
213 + # Generate cffi modules
214 + # Please keep in sync with pypy/tool/build_cffi_imports.py!
215 +#cffi_build_scripts = {
216 +# "sqlite3": "_sqlite3_build.py",
217 +# "audioop": "_audioop_build.py",
218 +# "tk": "_tkinter/tklib_build.py",
219 +# "curses": "_curses_build.py" if sys.platform != "win32" else None,
220 +# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
221 +# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
222 +# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
223 +# "resource": "_resource_build.py" if sys.platform != "win32" else None,
224 + cffi_targets=( audioop curses syslog pwdgrp resource )
225 + use gdbm && cffi_targets+=( gdbm )
226 + use sqlite && cffi_targets+=( sqlite3 )
227 + use tk && cffi_targets+=( tkinter/tklib )
228 +
229 + local t
230 + # all modules except tkinter output to .
231 + # tkinter outputs to the correct dir ...
232 + cd "${ED%/}${dest}"/lib_pypy || die
233 + for t in "${cffi_targets[@]}"; do
234 + # tkinter doesn't work via -m
235 + "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
236 + done
237 +
238 + # Cleanup temporary objects
239 + find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
240 + find "${ED%/}${dest}" -type d -empty -delete || die
241 +
242 + # compile the installed modules
243 + python_optimize "${ED%/}${dest}"
244 +}