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, 29 Apr 2018 06:34:01
Message-Id: 1524983044.bec363675dc5618efc31cb4f5ae61edc0236a419.mgorny@gentoo
1 commit: bec363675dc5618efc31cb4f5ae61edc0236a419
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 06:18:44 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 06:24:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec36367
7
8 dev-python/pypy-bin: Drop <5.10.0
9
10 dev-python/pypy-bin/Manifest | 11 --
11 dev-python/pypy-bin/pypy-bin-5.9.0-r2.ebuild | 211 ---------------------------
12 2 files changed, 222 deletions(-)
13
14 diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
15 index a6c073949af..80e3da1f11b 100644
16 --- a/dev-python/pypy-bin/Manifest
17 +++ b/dev-python/pypy-bin/Manifest
18 @@ -8,16 +8,6 @@ DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6264162 BLAKE2B 67bb
19 DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz 6252626 BLAKE2B 6f036b0a526a2ef2c6ea0d559baaae13d4ec0da2d4705c959ec84c85fdde171319da9be1a2d859ebf2c7d6168464dccb057904596a64c0ddc33724a706e699da SHA512 5f284ae0230b22775978525d2f53b57f5c808b6a47b783b6bdccbb9727af412f640abe79e7c05792acdda861719ed9a0c392a9c906237514ad4285f50e283ff0
20 DIST pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5912628 BLAKE2B 5859cb60c9cc68cba1bf3e1f3f58ff8e86d352aef990a837baf5a1802116dda4bc9e550a3c38163d7a165efc65ff26fc1c004dbb845a4df401ca6c986866a658 SHA512 d2aee265718cd75e02ad4e8dc7cedcf006180960128a10cc4b3b1920092860a1d1a110c27b60d45b88ef99822e0a2e9c74c2c7d3c899ef049adc9916ea5fefb4
21 DIST pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5912272 BLAKE2B e50e3f5cc2c8411700f00009bfb6d9fe0c06b32faed6fc5b94dfd3eeb404e37fe353741aeb0851a4e42dc86e2bed524750cfe527bfc005abbec4cfa6e65444e1 SHA512 ea63b7ff20633bcec55258cf02d0035e213e94595032cf7a43342292cbdd4bf4276ea36d299bb3342e6de8919dadb338f879393950770473329ed6a0fd982897
22 -DIST pypy-bin-5.9.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12726957 BLAKE2B afbb25d0084a4040dd296212f5d5be130c288ee79bf3c7110e3ef53fb0d1469d5294194163004c7efda388f86a3a761b780ee348f2cd9cb070318efdc6b4eff1 SHA512 25256218106fc71f0179fe5b175e780be200a44bf500a5814c05c767747201370b19943d76f4859d780c9799d583d809c8c6ba49423ddad477b974b927625d3e
23 -DIST pypy-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 12849816 BLAKE2B 4655cf9bc6e3ac64713577615927752dd86b7a0b73764a782e7e7f1a54da50b7a8fad462933cd06b82a78d21809e76fb7614a5b3756f2abf67d8e0c41b025914 SHA512 d4d67f2281d01ecb19602fdaf1149e424e6e331d9e98278ed5f0a948e7ef8b6dc0307accc5d924cb9491f789cea2285cdc9e16f0e9f0c1b76804d259ce5df6bb
24 -DIST pypy-bin-5.9.0-amd64+bzip2+libressl+ncurses.tar.lz 7419957 BLAKE2B 13f14e0ff3337d13f634bc90033340341d2c9eba3665b36b746a54983aab9887ea3f939ec3c552bc7b4e6f4a11376d41d4e5cbd0514f007e97f2eeb05d5c147e SHA512 a0be5a190fc3f71291a65a14a5993fd95f4f077070b812d0aff7b0110bc5dacbd2e005476f97d6b386f2093086621609a64b2a728d9d3d0e70948caaede53292
25 -DIST pypy-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 7452420 BLAKE2B 63ec6546942ab826808b8705d747ab7eb6d442f5bef4bb02c0055d549ed29ca2f43870d11644805cae238fbd3294bbc3402007437829a44fb46d5523825aa395 SHA512 caaa9fce43e67055b75bff059e288124cb5ac7a2d34f512e613b083ab7ee42bc07b26f013250f74e361bcf79498c2cba0277c1005ba1ff9d7cc7b24e18d40475
26 -DIST pypy-bin-5.9.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10264806 BLAKE2B 8434b2fecbe3c9f6dbd3698e67ed0cc9c54b44744af614cb01d1b6f177d45cb4d5391183d6cf0a6146ff380bc2bd274a4999ada2516310530162d59d029f0052 SHA512 c5187e352948d4581e6c7b52077d9d431dacd4202ad3efddbab35ad04cc50f5c6ea290f540a11d384d5aabf5b636879efb7eb954d416323fa745a4744c2fb5ff
27 -DIST pypy-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10218708 BLAKE2B b241b57a86bcf7b5232aa0271ce181ee5719d88a6b48441ddf03c4463a010ab566f589a1dd4aade20bd46557221bf52e511e32f2d974e5f05f60ca6d00e096a9 SHA512 b2a4169dc7ad8216f754d1245283024d0accc0543d86acf6452a19e67051482ac4cf5b3cf4ae20be7c865bfdb1515b75030a5d4a02b8965252e7810baaefcff8
28 -DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6261405 BLAKE2B 37f443b68cf7784436e14fcdbe022bb21c9a4c2f646ba5fc3be1daa22f6b711a542a0741cbec9a42dc3714df76e573b0471400dbe2fcf165fd7763fe7ea7f447 SHA512 e51e97e42e591d87ddfccc4f6348fcae12b80aa48fde626a25c28611bf53ae5eaab649809a4ae0536a24c2cc0b2c2308cf9bb2eb9f8bc9ae6f822a994f3424a3
29 -DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses.tar.lz 6262511 BLAKE2B bf70bf73bcfc503ffe7024a0e1df37cf64471de0b7060c49c08e1b339f6357b0f8183de7d035e12fc1e884cd25c5b43a05535274b2843954a459581bb2dfba88 SHA512 376f801dad960b3e36cb401d8221596e93248abbc40b1118e1e2f3f79009a44866612df931c3b91b1b72059f48512bf3a5dd0d58a21733380937577851e5dc92
30 -DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 BLAKE2B b0ca490135a6b4215a09e5dea24be5c950fba24aceca50bf2e04ad0b3bb5e6a8511b167e567aea9d3ca9b92a53d093c3746b38abd9e5266148621733430767ce SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622
31 -DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 BLAKE2B 7d0dace223ae6793ca18b36628f7a43b20d55d6b702c6dd0bad413055261614bedba265f2f1411bdf4543ca64612d32cda93f609c2433a3fc10e3fe44aab3984 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349
32 DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
33 DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
34 DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
35 @@ -29,6 +19,5 @@ DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9c
36 DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
37 DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
38 DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
39 -DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
40 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
41 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
42
43 diff --git a/dev-python/pypy-bin/pypy-bin-5.9.0-r2.ebuild b/dev-python/pypy-bin/pypy-bin-5.9.0-r2.ebuild
44 deleted file mode 100644
45 index 8c3b3d419da..00000000000
46 --- a/dev-python/pypy-bin/pypy-bin-5.9.0-r2.ebuild
47 +++ /dev/null
48 @@ -1,211 +0,0 @@
49 -# Copyright 1999-2017 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -EAPI=6
53 -
54 -PYTHON_COMPAT=( python2_7 pypy )
55 -inherit pax-utils python-any-r1 unpacker versionator
56 -
57 -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
58 -CPY_PATCHSET_VERSION="2.7.14-0"
59 -MY_P=pypy2-v${PV}
60 -
61 -DESCRIPTION="Pre-built version of PyPy"
62 -HOMEPAGE="http://pypy.org/"
63 -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
64 - https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
65 - amd64? (
66 - !libressl? (
67 - jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
68 - !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
69 - )
70 - libressl? (
71 - jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
72 - !jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
73 - )
74 - )
75 - x86? (
76 - !libressl? (
77 - cpu_flags_x86_sse2? (
78 - jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
79 - !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
80 - )
81 - !cpu_flags_x86_sse2? (
82 - !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
83 - )
84 - )
85 - libressl? (
86 - cpu_flags_x86_sse2? (
87 - jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
88 - !jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
89 - )
90 - !cpu_flags_x86_sse2? (
91 - !jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
92 - )
93 - )
94 - )"
95 -
96 -# Supported variants
97 -REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
98 -
99 -LICENSE="MIT"
100 -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
101 -SLOT="0/41"
102 -KEYWORDS="~amd64 ~x86"
103 -IUSE="doc gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
104 -
105 -RDEPEND="
106 - app-arch/bzip2:0/1
107 - dev-libs/expat:0/0
108 - dev-libs/libffi:0/0
109 - sys-devel/gcc:*
110 - sys-libs/glibc
111 - sys-libs/ncurses:0/6
112 - sys-libs/zlib:0/1
113 - gdbm? ( sys-libs/gdbm:0= )
114 - !libressl? ( dev-libs/openssl:0/0[-bindist] )
115 - libressl? ( dev-libs/libressl:0/44 )
116 - sqlite? ( dev-db/sqlite:3= )
117 - tk? (
118 - dev-lang/tk:0=
119 - dev-tcltk/tix:0=
120 - )
121 - !dev-python/pypy:0"
122 -DEPEND="${RDEPEND}
123 - app-arch/lzip
124 - app-arch/xz-utils
125 - doc? ( ${PYTHON_DEPS}
126 - dev-python/sphinx )"
127 -
128 -S=${WORKDIR}/${MY_P}-src
129 -
130 -QA_PREBUILT="
131 - usr/lib*/pypy/pypy-c
132 - usr/lib*/pypy/libpypy-c.so"
133 -
134 -pkg_setup() {
135 - if [[ ${MERGE_TYPE} != binary ]]; then
136 - use doc && python-any-r1_pkg_setup
137 - fi
138 -}
139 -
140 -src_prepare() {
141 - eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
142 - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
143 -
144 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
145 - -e "s^@libdir@^$(get_libdir)^" \
146 - -i lib-python/2.7/distutils/command/install.py || die
147 -
148 - # apply CPython stdlib patches
149 - pushd lib-python/2.7 > /dev/null || die
150 - # TODO: cpy turkish locale patch now fixes C code
151 - # probably needs better port to pypy, if it is broken there
152 - eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
153 - eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
154 - popd > /dev/null || die
155 -
156 - eapply_user
157 -}
158 -
159 -src_compile() {
160 - # Tadaam! PyPy compiled!
161 - mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
162 - mv "${WORKDIR}"/${P}*/include/*.h include/ || die
163 - # (not installed by pypy)
164 - rm pypy/module/cpyext/include/_numpypy/numpy/README || die
165 - mv pypy/module/cpyext/include/* include/ || die
166 - mv pypy/module/cpyext/parse/*.h include/ || die
167 -
168 - pax-mark m pypy-c libpypy-c.so
169 -
170 - use doc && emake -C pypy/doc html
171 -
172 - einfo "Generating caches and CFFI modules ..."
173 -
174 - # Generate Grammar and PatternGrammar pickles.
175 - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
176 - || die "Generation of Grammar and PatternGrammar pickles failed"
177 -
178 - # Generate cffi modules
179 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
180 -#cffi_build_scripts = {
181 -# "sqlite3": "_sqlite3_build.py",
182 -# "audioop": "_audioop_build.py",
183 -# "tk": "_tkinter/tklib_build.py",
184 -# "curses": "_curses_build.py" if sys.platform != "win32" else None,
185 -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
186 -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
187 -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
188 -# "resource": "_resource_build.py" if sys.platform != "win32" else None,
189 - cffi_targets=( audioop curses syslog pwdgrp resource )
190 - use gdbm && cffi_targets+=( gdbm )
191 - use sqlite && cffi_targets+=( sqlite3 )
192 - use tk && cffi_targets+=( tkinter/tklib )
193 -
194 - local t
195 - # all modules except tkinter output to .
196 - # tkinter outputs to the correct dir ...
197 - cd lib_pypy || die
198 - for t in "${cffi_targets[@]}"; do
199 - # tkinter doesn't work via -m
200 - ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
201 - done
202 -
203 - # Cleanup temporary objects
204 - find -name "_cffi_*.[co]" -delete || die
205 - find -type d -empty -delete || die
206 -}
207 -
208 -src_test() {
209 - # (unset)
210 - local -x PYTHONDONTWRITEBYTECODE
211 -
212 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
213 -}
214 -
215 -src_install() {
216 - local dest=/usr/$(get_libdir)/pypy
217 - einfo "Installing PyPy ..."
218 - exeinto "${dest}"
219 - doexe pypy-c libpypy-c.so
220 - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
221 - insinto "${dest}"
222 - # preserve mtimes to avoid obsoleting caches
223 - insopts -p
224 - doins -r include lib_pypy lib-python
225 - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
226 - dodoc README.rst
227 -
228 - if ! use gdbm; then
229 - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
230 - "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
231 - fi
232 - if ! use sqlite; then
233 - rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
234 - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
235 - "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
236 - fi
237 - if ! use tk; then
238 - rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
239 - "${ED%/}${dest}"/lib_pypy/_tkinter \
240 - "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
241 - fi
242 -
243 - # Install docs
244 - use doc && dodoc -r pypy/doc/_build/html
245 -
246 - local -x PYTHON=${ED%/}${dest}/pypy-c
247 - # we can't use eclass function since PyPy is dumb and always gives
248 - # paths relative to the interpreter
249 - local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
250 - python_export pypy EPYTHON
251 -
252 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
253 - python_domodule epython.py
254 -
255 - einfo "Byte-compiling Python standard library..."
256 -
257 - # compile the installed modules
258 - python_optimize "${ED%/}${dest}"
259 -}