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: Sun, 03 Jul 2016 08:19:29
Message-Id: 1467533947.47b2958db4e542dd29b751b122cccf35a2ae4f2c.mgorny@gentoo
1 commit: 47b2958db4e542dd29b751b122cccf35a2ae4f2c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 07:43:09 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 08:19:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b2958d
7
8 dev-python/pypy-bin: Bump to 5.3.1, minor fixes
9
10 dev-python/pypy-bin/Manifest | 8 ++
11 dev-python/pypy-bin/pypy-bin-5.3.1.ebuild | 205 ++++++++++++++++++++++++++++++
12 2 files changed, 213 insertions(+)
13
14 diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
15 index be2c589..6405b93 100644
16 --- a/dev-python/pypy-bin/Manifest
17 +++ b/dev-python/pypy-bin/Manifest
18 @@ -29,6 +29,14 @@ DIST pypy-bin-5.3.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10236641 SHA25
19 DIST pypy-bin-5.3.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11388844 SHA256 a1ed4a65a4e04ecd3a3ee6a94bdd313511e9c78a82e70b491a835d9d6b00ecba SHA512 24dd548147a1e045d646be633058f1b40e35f3c069fe44b93a60262a134163a7811664a279e70b54ad149a4659b5bafb0fffa0e213d0dc5fb62eb14e41c46bf6 WHIRLPOOL 5b8a17fd56baae8b039e723ec32728b5d89b58bd3606372b9b09cf0353a77070ca63fd5107fdfe964184072f466c6de6b10a9dea30a185baf08e8fb300427b25
20 DIST pypy-bin-5.3.0-x86+bzip2+ncurses+sse2.tar.lz 5955669 SHA256 24f76d7c4803c69ae66bcdc38fee60a41b843cc81ca83d76e0ece4464efd22a5 SHA512 692f5601291d7ed3789d38cc6fdf4e4c0c56318953f9109113cb7cb11659f6d649287425b60cf5a2cab2a005d174e6c44be05b4c49ce148bfbdbf117892c888f WHIRLPOOL 03c6a14f5c09e25e3a16b23c96b4754063e29d1847f549295ab81891de1cf35a473d84143897d0be36b2f2a683da8d45bc6506b7fef6985fdcd84f127d522fa2
21 DIST pypy-bin-5.3.0-x86+bzip2+ncurses.tar.lz 5955780 SHA256 f3e5affc786235ec61491cc0c6941303df486314b7707f98e342a5d9f39eea67 SHA512 d55dc85a2c968289320658da80507e2b1a8993a923aac09963adcc2482689b5094b0734cee481dd4490d83261744a720bc0606ec9a578c4e6deba3e41ba7e92e WHIRLPOOL b76bb53064e8a4d00012fee500d06f0f94a8548fe7ce89efa26b2f5482f169cf93f2b835e841b0c094ee6b58e7df67433520ccb5df3463678604e790cfa54689
22 +DIST pypy-bin-5.3.1-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 12719733 SHA256 47b275cc2db72572d574097eff11438eeec8d36a8cd389aaec26d8b51dd6575b SHA512 f7cc370b2b5ec106f8391adda3c49b51e374fff794ac3776ee247bbe6bbb32c3068decb3958bd015270b737d8b05bb5d13471abf2d215eadd93155710ae45433 WHIRLPOOL 59b91372b0d3b8d2378dcedc63a55323c10df314f0e03448eacffedc98195b62e67c9450b67290bbd50339de8b90d54c5689c62e5c316f83de0897bf6f3e6cab
23 +DIST pypy-bin-5.3.1-amd64+bzip2+jit+ncurses.tar.lz 13761610 SHA256 23763847865ec0a08e1e4fcee978991cfc3558476e194cc5b58372c5205c3460 SHA512 f2647ed47f10a8576f338dc2a3e950dbe2bf1404958b85e09ad44a6826adbbbea062fd5f8881bcea3d6e875fb040366e83f948228ac978850afb4cc6c666ac0b WHIRLPOOL 8535780f15c1ef0886c4433d7604b7d8384418d0d4b49fa20f08734fee76f0a1336df49e96416de46440e3e437c8c7e4aa7a791e03c3221bbfb36990e892fc67
24 +DIST pypy-bin-5.3.1-amd64+bzip2+ncurses.tar.lz 7207110 SHA256 001f4a8c051098569ccf3c426bcda2c173d307aa30d2a74d9f5e37670c9e03fe SHA512 1c69865abf6abf3199d63f575a269a36739adbda8956db76b26dcdd4ead2142d7b9638d5dd3b6ea60d6e5760fb4e97039454e68170c9e264ac8998ab7e8bb3c3 WHIRLPOOL 2f00b8ec3c78ef4e0825aea4e205ee10cfbb2cb0fa32bb593c69fee062f06fa91efc442a505f3ae3066f8a53adacbf3cb89715df384e0bbd7e176e27e9e54c9b
25 +DIST pypy-bin-5.3.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10268792 SHA256 2ef23f4506fe71cb301610054a5fc398902017bdf57866c7bf873b43a0adc17b SHA512 9fa8504941f47de98f104ff13d4571a2d78ee929cf62c929640bdf1af5aa47d0665e268b237ab0378910255dd166890a6347c58bcb55cefc7cc418703ed123a8 WHIRLPOOL 6ab119483bc3b9a73363662d5b7a864bf1db7c8a1bc194f74a9ab4960b96ccabc3d88856afd729beb29ac0aa3eaec18af2d74ec94cb460774499d5699571d80d
26 +DIST pypy-bin-5.3.1-x86+bzip2+jit+ncurses+sse2.tar.lz 11318171 SHA256 afc1a7083ef354cd5037d4d23e44bc243881624037b5eb39084e1e65b61c2284 SHA512 ccfb921a54ff60e0bbdd7f6b8b96f66bc41c47d93d0f9a4fb735a5901081be21db2d60c9d7f89bf8ff07d8cdeed481e9987a7b970d925a0e9579231a86b5441a WHIRLPOOL 842c6210b28653b9a143678ba59dd2649e83b929463fd8e4ddfad00346ad551c8f3c6ffb864b71b60651e6744432afd7305d6a12a6ed6a0f19d73f3564d6de88
27 +DIST pypy-bin-5.3.1-x86+bzip2+ncurses+sse2.tar.lz 5954728 SHA256 bc7289832ca4c9984180b6cb593de502952d76f6810ee26aff4d37e2798eacfe SHA512 5ced6edb305fd6a38b89baf4c73756ac280934d66b2d11b9a5b1eaf425c3430f6dc3da9e43fa495f8b677fe1263cabacab73ef6ef95bf348c6dbce0defa41ac6 WHIRLPOOL bd7b31b521b7835ad8673b508f5815c80c3c9c1628ba0999ec07340d8b4982a8e04583c7ae0afd73f15437069950c635c25ce42da3ae6a80065de46c6af7a0d7
28 +DIST pypy-bin-5.3.1-x86+bzip2+ncurses.tar.lz 5953506 SHA256 317b29daa7fe4df693a79eed7dc330fadbfe00084cedbbc5217721b4750c4b30 SHA512 78ee21fc0224e8104843d2652039d26ada52cd5a544056161e739458a83fe28c8cf7b4077c40070deef817a2f6d0581120e44ebc38f017a5f843badb31fa5f3c WHIRLPOOL 62e3a119a7a720710ceb46e15453d6cdb65726af97b5c9f664f7748aeafd3cf0ca6a4e748040a1eb24acfec2afb20543b25c08211f42f3d354d3e01a7cfa214b
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 python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
32 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
33
34 diff --git a/dev-python/pypy-bin/pypy-bin-5.3.1.ebuild b/dev-python/pypy-bin/pypy-bin-5.3.1.ebuild
35 new file mode 100644
36 index 0000000..c0d6f13
37 --- /dev/null
38 +++ b/dev-python/pypy-bin/pypy-bin-5.3.1.ebuild
39 @@ -0,0 +1,205 @@
40 +# Copyright 1999-2016 Gentoo Foundation
41 +# Distributed under the terms of the GNU General Public License v2
42 +# $Id$
43 +
44 +EAPI=5
45 +
46 +PYTHON_COMPAT=( python2_7 pypy )
47 +inherit eutils multilib pax-utils python-any-r1 unpacker versionator
48 +
49 +BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
50 +CPY_PATCHSET_VERSION="2.7.11-0"
51 +MY_P=pypy2-v${PV}
52 +
53 +DESCRIPTION="Pre-built version of PyPy"
54 +HOMEPAGE="http://pypy.org/"
55 +SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
56 + https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
57 + amd64? (
58 + jit? ( shadowstack? (
59 + ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
60 + ) )
61 + jit? ( !shadowstack? (
62 + ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
63 + ) )
64 + !jit? ( !shadowstack? (
65 + ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
66 + ) )
67 + )
68 + x86? (
69 + cpu_flags_x86_sse2? (
70 + jit? ( shadowstack? (
71 + ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
72 + ) )
73 + jit? ( !shadowstack? (
74 + ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
75 + ) )
76 + !jit? ( !shadowstack? (
77 + ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
78 + ) )
79 + )
80 + !cpu_flags_x86_sse2? (
81 + !jit? ( !shadowstack? (
82 + ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
83 + ) )
84 + )
85 + )"
86 +
87 +# Supported variants
88 +REQUIRED_USE="!jit? ( !shadowstack )
89 + x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
90 +
91 +LICENSE="MIT"
92 +SLOT="0/$(get_version_component_range 1-2 ${PV})"
93 +KEYWORDS="~amd64 ~x86"
94 +IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
95 +
96 +# yep, world would be easier if people started filling subslots...
97 +RDEPEND="
98 + app-arch/bzip2:0=
99 + dev-libs/expat:0=
100 + dev-libs/libffi:0=
101 + dev-libs/openssl:0=[-bindist]
102 + sys-libs/glibc:2.2=
103 + sys-libs/ncurses:0/6
104 + sys-libs/zlib:0=
105 + gdbm? ( sys-libs/gdbm:0= )
106 + sqlite? ( dev-db/sqlite:3= )
107 + tk? (
108 + dev-lang/tk:0=
109 + dev-tcltk/tix:0=
110 + )
111 + !dev-python/pypy:0"
112 +DEPEND="${RDEPEND}
113 + app-arch/lzip
114 + app-arch/xz-utils
115 + doc? ( ${PYTHON_DEPS}
116 + dev-python/sphinx )"
117 +PDEPEND="app-admin/python-updater"
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 +}