1 |
commit: ba82b6fa40b41126da6eba338d5386492c1fab09 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 24 14:14:40 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 24 14:21:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba82b6fa |
7 |
|
8 |
dev-python/pypy3-bin: Drop old (<7.1.1) |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pypy3-bin/Manifest | 23 -- |
13 |
dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch | 50 --- |
14 |
.../pypy3-bin/files/5.8.0_all_distutils_cxx.patch | 342 --------------------- |
15 |
dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild | 183 ----------- |
16 |
dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild | 183 ----------- |
17 |
dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild | 182 ----------- |
18 |
dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild | 188 ----------- |
19 |
7 files changed, 1151 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest |
22 |
index eea989c40c9..f8f5694c26c 100644 |
23 |
--- a/dev-python/pypy3-bin/Manifest |
24 |
+++ b/dev-python/pypy3-bin/Manifest |
25 |
@@ -1,29 +1,6 @@ |
26 |
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54 |
27 |
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca |
28 |
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0 |
29 |
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b |
30 |
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e |
31 |
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044 |
32 |
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3 |
33 |
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f |
34 |
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f |
35 |
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873 |
36 |
-DIST pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 11042296 BLAKE2B 3717c92b3e3a0239c3089cc86434db42725f7e42891fcf5c46f7234aca09a6c693ce662a8bedda4e5a9f646f3266ebd16f25668068d6c1d9df30b6696627ec42 SHA512 5108388bd322c5af4e3d411a4c59a4d8b8b4a75e4ad1e53e90ddd9f76f64868b2c31210d8ac5b0d8222402441ca58c781264742e74e5ff872189ed6c24c2707f |
37 |
-DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd6614441e6fb838328b687c44415e1444f27e74f3db4bd3eeb7c077f0cc95cafcacffaabd396d68f6ff481fdfa44f9e6b26f83f1e61e99e30 SHA512 dbdd3e6a21b4553060804eef1036698324743e5eeb4b9e2933785f93871a750ae98daf5a1ef7061238d6161a6df8d18c590b88dcd0ea97ae4ab742aa4df7dbd3 |
38 |
-DIST pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8484244 BLAKE2B d23b84aa9f045e46c2461a4d26383e4fcd0c33283f54e11d0693faafec2d3792039534c9a93b418cb78f3e4d45b98f1377cd0555a20ccb2fdce5b9b2e17a133d SHA512 4c90ee87585a448466883aa47ebd4a3f92438d54fceb6cf752fd638746f1c0f2ab7a3145b310555ab19ba53838352523e981485904c4092bc457c7002931ab59 |
39 |
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 5529689 BLAKE2B 038ad3c9132d430268dad3ae7b1c2b6ca507743f3b2f7a3aef8b7aaa580b070287767878d2b528297c152ecd0a440aaa6a47e32f7aa5400bfda2703302c583fe SHA512 8932dbdf49f7a227e9108bcfd0e7136cd1287b036eee7665bf16868a0e322ca841eb6daa6a18b8a57e4184b8878abd20de9616f90845c0dc76d5382f7f53f3a3 |
40 |
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz 5537714 BLAKE2B 49cdf63c1f94899ec4642d395dbf8ae6fe44fe9fc46e7f64b31e30d20f9e1dcc5d40b511d582f6c902724f5629e7b3b8e1090d76a3bb1a789b32b1c29b533e87 SHA512 42c8afa8fea5474d5b2c7c7192b2a79d8a3eb8d832038aad68edb011c056d6efb3903e67084f423ff167b1757804a5d796fddfa6f6f077966c855a1e56eba9cc |
41 |
-DIST pypy3-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 11031092 BLAKE2B 9e9b530ff356aeeadd9da18853ece9f7e292412db427e70e4d93e58c57523a36594131b9d5185ca5f00e19da2b4843e7fa1fc79ec6ca2cfb94abd8360775486c SHA512 b002c6018335481e6960fbfbf75fdefcb45093687491b591e9db2ef870201b33ed33294a4cc975128aae8d8df4d186309c748c620255337b688d21683b653861 |
42 |
-DIST pypy3-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 6917379 BLAKE2B 1be91d0001a09574e970c53cfb156f04b84149d6fb4f78e7713d26a44edf03cf3c4556900343d36e59edd2e273c1e626faff443ab097481c54d6e3dc353867b1 SHA512 dcfc9cc25df65bb477bc0e62f2b3dd5c723d928b2b3a7ac96e6583cbba25162681f736eef13ba3fee637f27326015e32832a2e7f021051c294efb4c7d26d0fca |
43 |
-DIST pypy3-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8510623 BLAKE2B 91bbe4286d82d90d05c3a4280c285bfccee3ae8661cf974554ef8c96f3806f95187cae1767340cc1e17f65c37f380dc9a4636cf3388a3c4bd2664ea4d61b63b8 SHA512 f5aa0efc4cbff57c0eb49504a46aac8b03bf298e5b996dd2264d923fe514543736df2f856d841b15a4386cd84809051ce6b29840c47fc32cdf7482d53d52b755 |
44 |
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 5546135 BLAKE2B 7ce2fe3c8b662d808ec63c96fe7ba42b78210d5cd1828050b139616d577feb41cca65c79c291d376b3f53d54feb157894700fda705d067fd536af3bb0a4e9d72 SHA512 87fd9091e30a60f034d96cefa3a192801ab5c8ebf76d8e13741cf5f18317b4751e619b1b1e9ddf9098767526c119761208885744c08a4ce131915f3758e198d0 |
45 |
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses.tar.lz 5540259 BLAKE2B dcd4e666c66d5bb711e5b95431fafe19a81a8b8458af2fdfe1f2272ff05214f9687b9f88d8b58ef6b05272252db4b308b32cfe4778e0f224825bcca9609313ed SHA512 8a9f681b998189b6871d85fbef00289b5c258ec67805fc2bf3179fa4650655051c33b7715845dde8e93c5ce9884a36cb1501f653804328e4104099ddcdd1763d |
46 |
DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98 |
47 |
DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914 |
48 |
DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0 |
49 |
DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3 |
50 |
DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032 |
51 |
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e |
52 |
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2 |
53 |
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1 SHA512 1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4 |
54 |
DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473 |
55 |
|
56 |
diff --git a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch |
57 |
deleted file mode 100644 |
58 |
index cf96d3fb2a5..00000000000 |
59 |
--- a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch |
60 |
+++ /dev/null |
61 |
@@ -1,50 +0,0 @@ |
62 |
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001 |
63 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
64 |
-Date: Fri, 27 Nov 2015 17:02:42 +0100 |
65 |
-Subject: [PATCH] Gentoo: override paths for system-wide install based on |
66 |
- sys.prefix |
67 |
- |
68 |
-Override all default distutils install paths to ones suitable for |
69 |
-system-wide install when sys.prefix indicates we're running the Gentoo |
70 |
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv). |
71 |
- |
72 |
-Fixes: https://bugs.gentoo.org/462306 |
73 |
-Fixes: https://bugs.gentoo.org/465546 |
74 |
---- |
75 |
- lib-python/3/distutils/command/install.py | 13 ++++++++++++- |
76 |
- 1 file changed, 12 insertions(+), 1 deletion(-) |
77 |
- |
78 |
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py |
79 |
-index fc43951..fed5218 100644 |
80 |
---- a/lib-python/3/distutils/command/install.py |
81 |
-+++ b/lib-python/3/distutils/command/install.py |
82 |
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = { |
83 |
- 'scripts': '$base/bin', |
84 |
- 'data' : '$base', |
85 |
- }, |
86 |
-+ 'gentoo': { |
87 |
-+ 'purelib': '$base/site-packages', |
88 |
-+ 'platlib': '$base/site-packages', |
89 |
-+ 'headers': '$base/include', |
90 |
-+ 'scripts': '@EPREFIX@/usr/bin', |
91 |
-+ 'data' : '@EPREFIX@/usr', |
92 |
-+ }, |
93 |
- } |
94 |
- |
95 |
- # The keys to an installation scheme; if any new types of files are to be |
96 |
-@@ -476,7 +483,11 @@ class install (Command): |
97 |
- # it's the caller's problem if they supply a bad name! |
98 |
- if (hasattr(sys, 'pypy_version_info') and |
99 |
- not name.endswith(('_user', '_home'))): |
100 |
-- name = 'pypy' |
101 |
-+ if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'): |
102 |
-+ # override paths for system-wide install |
103 |
-+ name = 'gentoo' |
104 |
-+ else: |
105 |
-+ name = 'pypy' |
106 |
- scheme = INSTALL_SCHEMES[name] |
107 |
- for key in SCHEME_KEYS: |
108 |
- attrname = 'install_' + key |
109 |
--- |
110 |
-2.6.3 |
111 |
- |
112 |
|
113 |
diff --git a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch |
114 |
deleted file mode 100644 |
115 |
index 5d89ce2711c..00000000000 |
116 |
--- a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch |
117 |
+++ /dev/null |
118 |
@@ -1,342 +0,0 @@ |
119 |
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001 |
120 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
121 |
-Date: Tue, 25 Apr 2017 17:42:33 +0200 |
122 |
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5 |
123 |
- |
124 |
-https://bugs.python.org/issue1222585 |
125 |
---- |
126 |
- _osx_support.py | 10 +++--- |
127 |
- distutils/cygwinccompiler.py | 21 +++++++++-- |
128 |
- distutils/sysconfig_cpython.py | 25 ++++++++++--- |
129 |
- distutils/sysconfig_pypy.py | 35 +++++++++++++++---- |
130 |
- distutils/unixccompiler.py | 54 ++++++++++++++++------------- |
131 |
- 5 files changed, 100 insertions(+), 45 deletions(-) |
132 |
- |
133 |
-diff --git a/_osx_support.py b/_osx_support.py |
134 |
-index 13fcd8b..0525be1 100644 |
135 |
---- a/_osx_support.py |
136 |
-+++ b/_osx_support.py |
137 |
-@@ -14,13 +14,13 @@ __all__ = [ |
138 |
- # configuration variables that may contain universal build flags, |
139 |
- # like "-arch" or "-isdkroot", that may need customization for |
140 |
- # the user environment |
141 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
142 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
143 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
144 |
-- 'PY_CORE_CFLAGS') |
145 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
146 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
147 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
148 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
149 |
- |
150 |
- # configuration variables that may contain compiler calls |
151 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
152 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
153 |
- |
154 |
- # prefix added to original configuration variable names |
155 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
156 |
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py |
157 |
-index c879646..a6157fb 100644 |
158 |
---- a/distutils/cygwinccompiler.py |
159 |
-+++ b/distutils/cygwinccompiler.py |
160 |
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): |
161 |
- # dllwrap 2.10.90 is buggy |
162 |
- if self.ld_version >= "2.10.90": |
163 |
- self.linker_dll = "gcc" |
164 |
-+ self.linker_dll_cxx = "g++" |
165 |
- else: |
166 |
- self.linker_dll = "dllwrap" |
167 |
-+ self.linker_dll_cxx = "dllwrap" |
168 |
- |
169 |
- # ld_version >= "2.13" support -shared so use it instead of |
170 |
- # -mdll -static |
171 |
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): |
172 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
173 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
174 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
175 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
176 |
- linker_exe='gcc -mcygwin', |
177 |
- linker_so=('%s -mcygwin %s' % |
178 |
-- (self.linker_dll, shared_option))) |
179 |
-+ (self.linker_dll, shared_option)), |
180 |
-+ linker_exe_cxx='g++ -mcygwin', |
181 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
182 |
-+ (self.linker_dll_cxx, shared_option))) |
183 |
- |
184 |
- # cygwin and mingw32 need different sets of libraries |
185 |
- if self.gcc_version == "2.91.57": |
186 |
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): |
187 |
- raise CompileError(msg) |
188 |
- else: # for other files use the C-compiler |
189 |
- try: |
190 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
191 |
-- extra_postargs) |
192 |
-+ if self.detect_language(src) == 'c++': |
193 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
194 |
-+ extra_postargs) |
195 |
-+ else: |
196 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
197 |
-+ extra_postargs) |
198 |
- except DistutilsExecError as msg: |
199 |
- raise CompileError(msg) |
200 |
- |
201 |
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): |
202 |
- self.set_executables(compiler='gcc -O -Wall', |
203 |
- compiler_so='gcc -mdll -O -Wall', |
204 |
- compiler_cxx='g++ -O -Wall', |
205 |
-+ compiler_so_cxx='g++ -mdll -O -Wall', |
206 |
- linker_exe='gcc', |
207 |
- linker_so='%s %s %s' |
208 |
- % (self.linker_dll, shared_option, |
209 |
-+ entry_point), |
210 |
-+ linker_exe_cxx='g++', |
211 |
-+ linker_so_cxx='%s %s %s' |
212 |
-+ % (self.linker_dll_cxx, shared_option, |
213 |
- entry_point)) |
214 |
- # Maybe we should also append -mthreads, but then the finished |
215 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
216 |
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py |
217 |
-index 573724d..0a04f33 100644 |
218 |
---- a/distutils/sysconfig_cpython.py |
219 |
-+++ b/distutils/sysconfig_cpython.py |
220 |
-@@ -173,9 +173,12 @@ def customize_compiler(compiler): |
221 |
- _osx_support.customize_compiler(_config_vars) |
222 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
223 |
- |
224 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
225 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
226 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
227 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
228 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
229 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
230 |
-+ |
231 |
-+ cflags = '' |
232 |
-+ cxxflags = '' |
233 |
- |
234 |
- if 'CC' in os.environ: |
235 |
- newcc = os.environ['CC'] |
236 |
-@@ -190,19 +193,27 @@ def customize_compiler(compiler): |
237 |
- cxx = os.environ['CXX'] |
238 |
- if 'LDSHARED' in os.environ: |
239 |
- ldshared = os.environ['LDSHARED'] |
240 |
-+ if 'LDCXXSHARED' in os.environ: |
241 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
242 |
- if 'CPP' in os.environ: |
243 |
- cpp = os.environ['CPP'] |
244 |
- else: |
245 |
- cpp = cc + " -E" # not always |
246 |
- if 'LDFLAGS' in os.environ: |
247 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
248 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
249 |
- if 'CFLAGS' in os.environ: |
250 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
251 |
-+ cflags = os.environ['CFLAGS'] |
252 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
253 |
-+ if 'CXXFLAGS' in os.environ: |
254 |
-+ cxxflags = os.environ['CXXFLAGS'] |
255 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
256 |
- if 'CPPFLAGS' in os.environ: |
257 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
258 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
259 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
260 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
261 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
262 |
- if 'AR' in os.environ: |
263 |
- ar = os.environ['AR'] |
264 |
- if 'ARFLAGS' in os.environ: |
265 |
-@@ -211,13 +222,17 @@ def customize_compiler(compiler): |
266 |
- archiver = ar + ' ' + ar_flags |
267 |
- |
268 |
- cc_cmd = cc + ' ' + cflags |
269 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
270 |
- compiler.set_executables( |
271 |
- preprocessor=cpp, |
272 |
- compiler=cc_cmd, |
273 |
- compiler_so=cc_cmd + ' ' + ccshared, |
274 |
-- compiler_cxx=cxx, |
275 |
-+ compiler_cxx=cxx_cmd, |
276 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
277 |
- linker_so=ldshared, |
278 |
- linker_exe=cc, |
279 |
-+ linker_so_cxx=ldcxxshared, |
280 |
-+ linker_exe_cxx=cxx, |
281 |
- archiver=archiver) |
282 |
- |
283 |
- compiler.shared_lib_extension = shlib_suffix |
284 |
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py |
285 |
-index a0a8dec..aa97c4e 100644 |
286 |
---- a/distutils/sysconfig_pypy.py |
287 |
-+++ b/distutils/sysconfig_pypy.py |
288 |
-@@ -72,6 +72,7 @@ def _init_posix(): |
289 |
- g['CFLAGS'] = "-DNDEBUG -O2" |
290 |
- g['CCSHARED'] = "-fPIC" |
291 |
- g['LDSHARED'] = "cc -pthread -shared" |
292 |
-+ g['LDCXXSHARED'] = "c++ -pthread -shared" |
293 |
- g['EXT_SUFFIX'] = so_ext |
294 |
- g['SHLIB_SUFFIX'] = so_ext |
295 |
- g['SO'] = so_ext # deprecated in Python 3, for backward compatibility |
296 |
-@@ -156,36 +157,52 @@ def customize_compiler(compiler): |
297 |
- _osx_support.customize_compiler(_config_vars) |
298 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
299 |
- |
300 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
301 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
302 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
303 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
304 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
305 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
306 |
-+ |
307 |
-+ cflags = '' |
308 |
-+ cxxflags = '' |
309 |
- |
310 |
- if 'CC' in os.environ: |
311 |
- newcc = os.environ['CC'] |
312 |
-- if (sys.platform == 'darwin' |
313 |
-+ if (True |
314 |
- and 'LDSHARED' not in os.environ |
315 |
- and ldshared.startswith(cc)): |
316 |
- # On OS X, if CC is overridden, use that as the default |
317 |
- # command for LDSHARED as well |
318 |
-+ # Gentoo: s/OS X/every system/ |
319 |
- ldshared = newcc + ldshared[len(cc):] |
320 |
- cc = newcc |
321 |
- if 'CXX' in os.environ: |
322 |
-- cxx = os.environ['CXX'] |
323 |
-+ newcxx = os.environ['CXX'] |
324 |
-+ if ('LDCXXSHARED' not in os.environ |
325 |
-+ and ldcxxshared.startswith(cxx)): |
326 |
-+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] |
327 |
-+ cxx = newcxx |
328 |
- if 'LDSHARED' in os.environ: |
329 |
- ldshared = os.environ['LDSHARED'] |
330 |
-+ if 'LDCXXSHARED' in os.environ: |
331 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
332 |
- if 'CPP' in os.environ: |
333 |
- cpp = os.environ['CPP'] |
334 |
- else: |
335 |
- cpp = cc + " -E" # not always |
336 |
- if 'LDFLAGS' in os.environ: |
337 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
338 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
339 |
- if 'CFLAGS' in os.environ: |
340 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
341 |
-+ cflags = os.environ['CFLAGS'] |
342 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
343 |
-+ if 'CXXFLAGS' in os.environ: |
344 |
-+ cxxflags = os.environ['CXXFLAGS'] |
345 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
346 |
- if 'CPPFLAGS' in os.environ: |
347 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
348 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
349 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
350 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
351 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
352 |
- if 'AR' in os.environ: |
353 |
- ar = os.environ['AR'] |
354 |
- if 'ARFLAGS' in os.environ: |
355 |
-@@ -194,13 +211,17 @@ def customize_compiler(compiler): |
356 |
- archiver = ar + ' ' + ar_flags |
357 |
- |
358 |
- cc_cmd = cc + ' ' + cflags |
359 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
360 |
- compiler.set_executables( |
361 |
- preprocessor=cpp, |
362 |
- compiler=cc_cmd, |
363 |
- compiler_so=cc_cmd + ' ' + ccshared, |
364 |
-- compiler_cxx=cxx, |
365 |
-+ compiler_cxx=cxx_cmd, |
366 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
367 |
- linker_so=ldshared, |
368 |
- linker_exe=cc, |
369 |
-+ linker_so_cxx=ldcxxshared, |
370 |
-+ linker_exe_cxx=cxx, |
371 |
- archiver=archiver) |
372 |
- |
373 |
- compiler.shared_lib_extension = shlib_suffix |
374 |
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py |
375 |
-index 254b22d..c9cacc1 100644 |
376 |
---- a/distutils/unixccompiler.py |
377 |
-+++ b/distutils/unixccompiler.py |
378 |
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): |
379 |
- # are pretty generic; they will probably have to be set by an outsider |
380 |
- # (eg. using information discovered by the sysconfig about building |
381 |
- # Python extensions). |
382 |
-- executables = {'preprocessor' : None, |
383 |
-- 'compiler' : ["cc"], |
384 |
-- 'compiler_so' : ["cc"], |
385 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
386 |
-- 'linker_so' : ["cc", "-shared"], |
387 |
-- 'linker_exe' : ["cc"], |
388 |
-- 'archiver' : ["ar", "-cr"], |
389 |
-- 'ranlib' : None, |
390 |
-+ executables = {'preprocessor' : None, |
391 |
-+ 'compiler' : ["cc"], |
392 |
-+ 'compiler_so' : ["cc"], |
393 |
-+ 'compiler_cxx' : ["c++"], |
394 |
-+ 'compiler_so_cxx' : ["c++"], |
395 |
-+ 'linker_so' : ["cc", "-shared"], |
396 |
-+ 'linker_exe' : ["cc"], |
397 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
398 |
-+ 'linker_exe_cxx' : ["c++"], |
399 |
-+ 'archiver' : ["ar", "-cr"], |
400 |
-+ 'ranlib' : None, |
401 |
- } |
402 |
- |
403 |
- if sys.platform[:6] == "darwin": |
404 |
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler): |
405 |
- |
406 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
407 |
- compiler_so = self.compiler_so |
408 |
-+ compiler_so_cxx = self.compiler_so_cxx |
409 |
- if sys.platform == 'darwin': |
410 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
411 |
- cc_args + extra_postargs) |
412 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
413 |
-+ cc_args + extra_postargs) |
414 |
- try: |
415 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
416 |
-- extra_postargs) |
417 |
-+ if self.detect_language(src) == 'c++': |
418 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
419 |
-+ extra_postargs) |
420 |
-+ else: |
421 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
422 |
-+ extra_postargs) |
423 |
- except DistutilsExecError as msg: |
424 |
- raise CompileError(msg) |
425 |
- |
426 |
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler): |
427 |
- ld_args.extend(extra_postargs) |
428 |
- self.mkpath(os.path.dirname(output_filename)) |
429 |
- try: |
430 |
-- if target_desc == CCompiler.EXECUTABLE: |
431 |
-- linker = self.linker_exe[:] |
432 |
-+ if target_lang == "c++": |
433 |
-+ if target_desc == CCompiler.EXECUTABLE: |
434 |
-+ linker = self.linker_exe_cxx[:] |
435 |
-+ else: |
436 |
-+ linker = self.linker_so_cxx[:] |
437 |
- else: |
438 |
-- linker = self.linker_so[:] |
439 |
-- if target_lang == "c++" and self.compiler_cxx: |
440 |
-- # skip over environment variable settings if /usr/bin/env |
441 |
-- # is used to set up the linker's environment. |
442 |
-- # This is needed on OSX. Note: this assumes that the |
443 |
-- # normal and C++ compiler have the same environment |
444 |
-- # settings. |
445 |
-- i = 0 |
446 |
-- if os.path.basename(linker[0]) == "env": |
447 |
-- i = 1 |
448 |
-- while '=' in linker[i]: |
449 |
-- i += 1 |
450 |
-- linker[i] = self.compiler_cxx[i] |
451 |
-+ if target_desc == CCompiler.EXECUTABLE: |
452 |
-+ linker = self.linker_exe[:] |
453 |
-+ else: |
454 |
-+ linker = self.linker_so[:] |
455 |
- |
456 |
- if sys.platform == 'darwin': |
457 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
458 |
--- |
459 |
-2.12.2 |
460 |
- |
461 |
|
462 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild |
463 |
deleted file mode 100644 |
464 |
index 6a1c7f4db7b..00000000000 |
465 |
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild |
466 |
+++ /dev/null |
467 |
@@ -1,183 +0,0 @@ |
468 |
-# Copyright 1999-2019 Gentoo Authors |
469 |
-# Distributed under the terms of the GNU General Public License v2 |
470 |
- |
471 |
-EAPI=6 |
472 |
- |
473 |
-# Test runner needs Python 2. |
474 |
-PYTHON_COMPAT=( python2_7 pypy ) |
475 |
-inherit pax-utils python-any-r1 unpacker versionator |
476 |
- |
477 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}.ffi7" |
478 |
-MY_P=pypy3-v${PV} |
479 |
- |
480 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)" |
481 |
-HOMEPAGE="http://pypy.org/" |
482 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
483 |
- amd64? ( |
484 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz ) |
485 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz ) |
486 |
- ) |
487 |
- x86? ( |
488 |
- cpu_flags_x86_sse2? ( |
489 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz ) |
490 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz ) |
491 |
- ) |
492 |
- !cpu_flags_x86_sse2? ( |
493 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz ) |
494 |
- ) |
495 |
- )" |
496 |
- |
497 |
-# Supported variants |
498 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
499 |
- |
500 |
-LICENSE="MIT" |
501 |
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' |
502 |
-SLOT="0/60" |
503 |
-KEYWORDS="~amd64 ~x86" |
504 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
505 |
- |
506 |
-RDEPEND=" |
507 |
- app-arch/bzip2:0/1 |
508 |
- dev-libs/expat:0/0 |
509 |
- dev-libs/libffi:0/7 |
510 |
- sys-devel/gcc:* |
511 |
- sys-libs/glibc |
512 |
- sys-libs/ncurses:0/6 |
513 |
- sys-libs/zlib:0/1 |
514 |
- gdbm? ( sys-libs/gdbm:0= ) |
515 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
516 |
- libressl? ( dev-libs/libressl:0= ) |
517 |
- sqlite? ( dev-db/sqlite:3= ) |
518 |
- tk? ( |
519 |
- dev-lang/tk:0= |
520 |
- dev-tcltk/tix:0= |
521 |
- ) |
522 |
- !dev-python/pypy3:0" |
523 |
-DEPEND="${RDEPEND} |
524 |
- app-arch/lzip |
525 |
- app-arch/xz-utils |
526 |
- test? ( ${PYTHON_DEPS} )" |
527 |
- |
528 |
-S=${WORKDIR}/${MY_P}-src |
529 |
- |
530 |
-QA_PREBUILT=" |
531 |
- usr/lib*/pypy3/pypy3-c |
532 |
- usr/lib*/pypy3/libpypy3-c.so" |
533 |
- |
534 |
-src_prepare() { |
535 |
- eapply "${FILESDIR}/4.0.0-gentoo-path.patch" |
536 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
537 |
- |
538 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
539 |
- -e "s^@libdir@^$(get_libdir)^" \ |
540 |
- -i lib-python/3/distutils/command/install.py || die |
541 |
- |
542 |
- # apply CPython stdlib patches |
543 |
- pushd lib-python/3 > /dev/null || die |
544 |
- eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch |
545 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
546 |
- popd > /dev/null || die |
547 |
- |
548 |
- eapply_user |
549 |
-} |
550 |
- |
551 |
-src_compile() { |
552 |
- # Tadaam! PyPy compiled! |
553 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
554 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
555 |
- mv pypy/module/cpyext/include/*.h include/ || die |
556 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
557 |
- |
558 |
- pax-mark m pypy3-c libpypy3-c.so |
559 |
- |
560 |
- einfo "Generating caches and CFFI modules ..." |
561 |
- |
562 |
- # Generate Grammar and PatternGrammar pickles. |
563 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
564 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
565 |
- |
566 |
- # Generate cffi modules |
567 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
568 |
-#cffi_build_scripts = { |
569 |
-# "sqlite3": "_sqlite3_build.py", |
570 |
-# "audioop": "_audioop_build.py", |
571 |
-# "tk": "_tkinter/tklib_build.py", |
572 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
573 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
574 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
575 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
576 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
577 |
-# "lzma": "_lzma_build.py", |
578 |
-# "_decimal": "_decimal_build.py", |
579 |
-# "ssl": "_ssl_build.py", |
580 |
- cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl ) |
581 |
- use gdbm && cffi_targets+=( gdbm ) |
582 |
- use sqlite && cffi_targets+=( sqlite3 ) |
583 |
- use tk && cffi_targets+=( tkinter/tklib ) |
584 |
- |
585 |
- local t |
586 |
- # all modules except tkinter output to . |
587 |
- # tkinter outputs to the correct dir ... |
588 |
- cd lib_pypy || die |
589 |
- for t in "${cffi_targets[@]}"; do |
590 |
- # tkinter doesn't work via -m |
591 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
592 |
- done |
593 |
- |
594 |
- # Cleanup temporary objects |
595 |
- find -name "_cffi_*.[co]" -delete || die |
596 |
- find -type d -empty -delete || die |
597 |
-} |
598 |
- |
599 |
-src_test() { |
600 |
- # (unset) |
601 |
- local -x PYTHONDONTWRITEBYTECODE= |
602 |
- |
603 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
604 |
- # internally so that we end up testing the correct interpreter. |
605 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
606 |
-} |
607 |
- |
608 |
-src_install() { |
609 |
- local dest=/usr/$(get_libdir)/pypy3 |
610 |
- einfo "Installing PyPy ..." |
611 |
- exeinto "${dest}" |
612 |
- doexe pypy3-c libpypy3-c.so |
613 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
614 |
- insinto "${dest}" |
615 |
- # preserve mtimes to avoid obsoleting caches |
616 |
- insopts -p |
617 |
- doins -r include lib_pypy lib-python |
618 |
- dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3 |
619 |
- dodoc README.rst |
620 |
- |
621 |
- if ! use gdbm; then |
622 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
623 |
- fi |
624 |
- if ! use sqlite; then |
625 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
626 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
627 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
628 |
- fi |
629 |
- if ! use tk; then |
630 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
631 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
632 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
633 |
- fi |
634 |
- |
635 |
- einfo "Generating caches and byte-compiling ..." |
636 |
- |
637 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
638 |
- # we can't use eclass function since PyPy is dumb and always gives |
639 |
- # paths relative to the interpreter |
640 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages |
641 |
- python_export pypy3 EPYTHON |
642 |
- |
643 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
644 |
- python_domodule epython.py |
645 |
- |
646 |
- einfo "Byte-compiling Python standard library..." |
647 |
- |
648 |
- # compile the installed modules |
649 |
- python_optimize "${ED%/}${dest}" |
650 |
-} |
651 |
|
652 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild |
653 |
deleted file mode 100644 |
654 |
index 262971abd21..00000000000 |
655 |
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild |
656 |
+++ /dev/null |
657 |
@@ -1,183 +0,0 @@ |
658 |
-# Copyright 1999-2018 Gentoo Foundation |
659 |
-# Distributed under the terms of the GNU General Public License v2 |
660 |
- |
661 |
-EAPI=6 |
662 |
- |
663 |
-# Test runner needs Python 2. |
664 |
-PYTHON_COMPAT=( python2_7 pypy ) |
665 |
-inherit pax-utils python-any-r1 unpacker versionator |
666 |
- |
667 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
668 |
-MY_P=pypy3-v${PV} |
669 |
- |
670 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)" |
671 |
-HOMEPAGE="http://pypy.org/" |
672 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
673 |
- amd64? ( |
674 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
675 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
676 |
- ) |
677 |
- x86? ( |
678 |
- cpu_flags_x86_sse2? ( |
679 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
680 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
681 |
- ) |
682 |
- !cpu_flags_x86_sse2? ( |
683 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) |
684 |
- ) |
685 |
- )" |
686 |
- |
687 |
-# Supported variants |
688 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
689 |
- |
690 |
-LICENSE="MIT" |
691 |
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' |
692 |
-SLOT="0/60" |
693 |
-KEYWORDS="~amd64 ~x86" |
694 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
695 |
- |
696 |
-RDEPEND=" |
697 |
- app-arch/bzip2:0/1 |
698 |
- dev-libs/expat:0/0 |
699 |
- dev-libs/libffi:0/0 |
700 |
- sys-devel/gcc:* |
701 |
- sys-libs/glibc |
702 |
- sys-libs/ncurses:0/6 |
703 |
- sys-libs/zlib:0/1 |
704 |
- gdbm? ( sys-libs/gdbm:0= ) |
705 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
706 |
- libressl? ( dev-libs/libressl:0= ) |
707 |
- sqlite? ( dev-db/sqlite:3= ) |
708 |
- tk? ( |
709 |
- dev-lang/tk:0= |
710 |
- dev-tcltk/tix:0= |
711 |
- ) |
712 |
- !dev-python/pypy3:0" |
713 |
-DEPEND="${RDEPEND} |
714 |
- app-arch/lzip |
715 |
- app-arch/xz-utils |
716 |
- test? ( ${PYTHON_DEPS} )" |
717 |
- |
718 |
-S=${WORKDIR}/${MY_P}-src |
719 |
- |
720 |
-QA_PREBUILT=" |
721 |
- usr/lib*/pypy3/pypy3-c |
722 |
- usr/lib*/pypy3/libpypy3-c.so" |
723 |
- |
724 |
-src_prepare() { |
725 |
- eapply "${FILESDIR}/4.0.0-gentoo-path.patch" |
726 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
727 |
- |
728 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
729 |
- -e "s^@libdir@^$(get_libdir)^" \ |
730 |
- -i lib-python/3/distutils/command/install.py || die |
731 |
- |
732 |
- # apply CPython stdlib patches |
733 |
- pushd lib-python/3 > /dev/null || die |
734 |
- eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch |
735 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
736 |
- popd > /dev/null || die |
737 |
- |
738 |
- eapply_user |
739 |
-} |
740 |
- |
741 |
-src_compile() { |
742 |
- # Tadaam! PyPy compiled! |
743 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
744 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
745 |
- mv pypy/module/cpyext/include/*.h include/ || die |
746 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
747 |
- |
748 |
- pax-mark m pypy3-c libpypy3-c.so |
749 |
- |
750 |
- einfo "Generating caches and CFFI modules ..." |
751 |
- |
752 |
- # Generate Grammar and PatternGrammar pickles. |
753 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
754 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
755 |
- |
756 |
- # Generate cffi modules |
757 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
758 |
-#cffi_build_scripts = { |
759 |
-# "sqlite3": "_sqlite3_build.py", |
760 |
-# "audioop": "_audioop_build.py", |
761 |
-# "tk": "_tkinter/tklib_build.py", |
762 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
763 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
764 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
765 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
766 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
767 |
-# "lzma": "_lzma_build.py", |
768 |
-# "_decimal": "_decimal_build.py", |
769 |
-# "ssl": "_ssl_build.py", |
770 |
- cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl ) |
771 |
- use gdbm && cffi_targets+=( gdbm ) |
772 |
- use sqlite && cffi_targets+=( sqlite3 ) |
773 |
- use tk && cffi_targets+=( tkinter/tklib ) |
774 |
- |
775 |
- local t |
776 |
- # all modules except tkinter output to . |
777 |
- # tkinter outputs to the correct dir ... |
778 |
- cd lib_pypy || die |
779 |
- for t in "${cffi_targets[@]}"; do |
780 |
- # tkinter doesn't work via -m |
781 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
782 |
- done |
783 |
- |
784 |
- # Cleanup temporary objects |
785 |
- find -name "_cffi_*.[co]" -delete || die |
786 |
- find -type d -empty -delete || die |
787 |
-} |
788 |
- |
789 |
-src_test() { |
790 |
- # (unset) |
791 |
- local -x PYTHONDONTWRITEBYTECODE= |
792 |
- |
793 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
794 |
- # internally so that we end up testing the correct interpreter. |
795 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
796 |
-} |
797 |
- |
798 |
-src_install() { |
799 |
- local dest=/usr/$(get_libdir)/pypy3 |
800 |
- einfo "Installing PyPy ..." |
801 |
- exeinto "${dest}" |
802 |
- doexe pypy3-c libpypy3-c.so |
803 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
804 |
- insinto "${dest}" |
805 |
- # preserve mtimes to avoid obsoleting caches |
806 |
- insopts -p |
807 |
- doins -r include lib_pypy lib-python |
808 |
- dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3 |
809 |
- dodoc README.rst |
810 |
- |
811 |
- if ! use gdbm; then |
812 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
813 |
- fi |
814 |
- if ! use sqlite; then |
815 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
816 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
817 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
818 |
- fi |
819 |
- if ! use tk; then |
820 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
821 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
822 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
823 |
- fi |
824 |
- |
825 |
- einfo "Generating caches and byte-compiling ..." |
826 |
- |
827 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
828 |
- # we can't use eclass function since PyPy is dumb and always gives |
829 |
- # paths relative to the interpreter |
830 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages |
831 |
- python_export pypy3 EPYTHON |
832 |
- |
833 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
834 |
- python_domodule epython.py |
835 |
- |
836 |
- einfo "Byte-compiling Python standard library..." |
837 |
- |
838 |
- # compile the installed modules |
839 |
- python_optimize "${ED%/}${dest}" |
840 |
-} |
841 |
|
842 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild |
843 |
deleted file mode 100644 |
844 |
index adbc9b5b3fe..00000000000 |
845 |
--- a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild |
846 |
+++ /dev/null |
847 |
@@ -1,182 +0,0 @@ |
848 |
-# Copyright 1999-2019 Gentoo Authors |
849 |
-# Distributed under the terms of the GNU General Public License v2 |
850 |
- |
851 |
-EAPI=7 |
852 |
- |
853 |
-# Test runner needs Python 2. |
854 |
-PYTHON_COMPAT=( python2_7 pypy ) |
855 |
-inherit pax-utils python-any-r1 unpacker |
856 |
- |
857 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
858 |
-MY_P=pypy3.5-v${PV} |
859 |
- |
860 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.5 (binary package)" |
861 |
-HOMEPAGE="http://pypy.org/" |
862 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
863 |
- amd64? ( |
864 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
865 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
866 |
- ) |
867 |
- x86? ( |
868 |
- cpu_flags_x86_sse2? ( |
869 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
870 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
871 |
- ) |
872 |
- !cpu_flags_x86_sse2? ( |
873 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) |
874 |
- ) |
875 |
- )" |
876 |
- |
877 |
-# Supported variants |
878 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
879 |
- |
880 |
-LICENSE="MIT" |
881 |
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' |
882 |
-SLOT="0/71" |
883 |
-KEYWORDS="~amd64 ~x86" |
884 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
885 |
- |
886 |
-RDEPEND=" |
887 |
- app-arch/bzip2:0/1 |
888 |
- dev-libs/expat:0/0 |
889 |
- dev-libs/libffi:0/7 |
890 |
- sys-devel/gcc:* |
891 |
- >=sys-libs/glibc-2.28 |
892 |
- sys-libs/ncurses:0/6 |
893 |
- sys-libs/zlib:0/1 |
894 |
- gdbm? ( sys-libs/gdbm:0= ) |
895 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
896 |
- libressl? ( dev-libs/libressl:0= ) |
897 |
- sqlite? ( dev-db/sqlite:3= ) |
898 |
- tk? ( |
899 |
- dev-lang/tk:0= |
900 |
- dev-tcltk/tix:0= |
901 |
- ) |
902 |
- !dev-python/pypy3:0" |
903 |
-DEPEND="${RDEPEND} |
904 |
- app-arch/lzip |
905 |
- app-arch/xz-utils |
906 |
- test? ( ${PYTHON_DEPS} )" |
907 |
- |
908 |
-S=${WORKDIR}/${MY_P}-src |
909 |
- |
910 |
-QA_PREBUILT=" |
911 |
- usr/lib/pypy3.5/pypy3-c |
912 |
- usr/lib/pypy3.5/libpypy3-c.so" |
913 |
- |
914 |
-src_prepare() { |
915 |
- eapply "${FILESDIR}/7.0.0-gentoo-path.patch" |
916 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
917 |
- eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch |
918 |
- |
919 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
920 |
- -i lib-python/3/distutils/command/install.py || die |
921 |
- |
922 |
- # apply CPython stdlib patches |
923 |
- pushd lib-python/3 > /dev/null || die |
924 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
925 |
- popd > /dev/null || die |
926 |
- |
927 |
- eapply_user |
928 |
-} |
929 |
- |
930 |
-src_compile() { |
931 |
- # Tadaam! PyPy compiled! |
932 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
933 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
934 |
- mv pypy/module/cpyext/include/*.h include/ || die |
935 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
936 |
- |
937 |
- pax-mark m pypy3-c libpypy3-c.so |
938 |
- |
939 |
- einfo "Generating caches and CFFI modules ..." |
940 |
- |
941 |
- # Generate Grammar and PatternGrammar pickles. |
942 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
943 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
944 |
- |
945 |
- # Generate cffi modules |
946 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
947 |
-#cffi_build_scripts = { |
948 |
-# "sqlite3": "_sqlite3_build.py", |
949 |
-# "audioop": "_audioop_build.py", |
950 |
-# "tk": "_tkinter/tklib_build.py", |
951 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
952 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
953 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
954 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
955 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
956 |
-# "lzma": "_lzma_build.py", |
957 |
-# "_decimal": "_decimal_build.py", |
958 |
-# "ssl": "_ssl_build.py", |
959 |
- cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl ) |
960 |
- use gdbm && cffi_targets+=( gdbm ) |
961 |
- use sqlite && cffi_targets+=( sqlite3 ) |
962 |
- use tk && cffi_targets+=( tkinter/tklib ) |
963 |
- |
964 |
- local t |
965 |
- # all modules except tkinter output to . |
966 |
- # tkinter outputs to the correct dir ... |
967 |
- cd lib_pypy || die |
968 |
- for t in "${cffi_targets[@]}"; do |
969 |
- # tkinter doesn't work via -m |
970 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
971 |
- done |
972 |
- |
973 |
- # Cleanup temporary objects |
974 |
- find -name "_cffi_*.[co]" -delete || die |
975 |
- find -type d -empty -delete || die |
976 |
-} |
977 |
- |
978 |
-src_test() { |
979 |
- # (unset) |
980 |
- local -x PYTHONDONTWRITEBYTECODE= |
981 |
- |
982 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
983 |
- # internally so that we end up testing the correct interpreter. |
984 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
985 |
-} |
986 |
- |
987 |
-src_install() { |
988 |
- local dest=/usr/lib/pypy3.5 |
989 |
- einfo "Installing PyPy ..." |
990 |
- exeinto "${dest}" |
991 |
- doexe pypy3-c libpypy3-c.so |
992 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
993 |
- insinto "${dest}" |
994 |
- # preserve mtimes to avoid obsoleting caches |
995 |
- insopts -p |
996 |
- doins -r include lib_pypy lib-python |
997 |
- dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3 |
998 |
- dodoc README.rst |
999 |
- |
1000 |
- if ! use gdbm; then |
1001 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
1002 |
- fi |
1003 |
- if ! use sqlite; then |
1004 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
1005 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
1006 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
1007 |
- fi |
1008 |
- if ! use tk; then |
1009 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
1010 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
1011 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
1012 |
- fi |
1013 |
- |
1014 |
- einfo "Generating caches and byte-compiling ..." |
1015 |
- |
1016 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
1017 |
- # we can't use eclass function since PyPy is dumb and always gives |
1018 |
- # paths relative to the interpreter |
1019 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages |
1020 |
- python_export pypy3 EPYTHON |
1021 |
- |
1022 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
1023 |
- python_domodule epython.py |
1024 |
- |
1025 |
- einfo "Byte-compiling Python standard library..." |
1026 |
- |
1027 |
- # compile the installed modules |
1028 |
- python_optimize "${ED%/}${dest}" |
1029 |
-} |
1030 |
|
1031 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild |
1032 |
deleted file mode 100644 |
1033 |
index 0f8954a4f84..00000000000 |
1034 |
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild |
1035 |
+++ /dev/null |
1036 |
@@ -1,188 +0,0 @@ |
1037 |
-# Copyright 1999-2019 Gentoo Authors |
1038 |
-# Distributed under the terms of the GNU General Public License v2 |
1039 |
- |
1040 |
-EAPI=7 |
1041 |
- |
1042 |
-# Test runner needs Python 2. |
1043 |
-PYTHON_COMPAT=( python2_7 pypy ) |
1044 |
-inherit pax-utils python-any-r1 unpacker |
1045 |
- |
1046 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
1047 |
-MY_P=pypy3.6-v${PV} |
1048 |
- |
1049 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)" |
1050 |
-HOMEPAGE="http://pypy.org/" |
1051 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
1052 |
- amd64? ( |
1053 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
1054 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
1055 |
- ) |
1056 |
- x86? ( |
1057 |
- cpu_flags_x86_sse2? ( |
1058 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
1059 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
1060 |
- ) |
1061 |
- !cpu_flags_x86_sse2? ( |
1062 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) |
1063 |
- ) |
1064 |
- )" |
1065 |
- |
1066 |
-# Supported variants |
1067 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
1068 |
- |
1069 |
-LICENSE="MIT" |
1070 |
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' |
1071 |
-SLOT="0/71-py36" |
1072 |
-KEYWORDS="~amd64 ~x86" |
1073 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
1074 |
- |
1075 |
-RDEPEND=" |
1076 |
- app-arch/bzip2:0/1 |
1077 |
- dev-libs/expat:0/0 |
1078 |
- dev-libs/libffi:0/7 |
1079 |
- sys-devel/gcc:* |
1080 |
- >=sys-libs/glibc-2.28 |
1081 |
- sys-libs/ncurses:0/6 |
1082 |
- sys-libs/zlib:0/1 |
1083 |
- gdbm? ( sys-libs/gdbm:0= ) |
1084 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
1085 |
- libressl? ( dev-libs/libressl:0= ) |
1086 |
- sqlite? ( dev-db/sqlite:3= ) |
1087 |
- tk? ( |
1088 |
- dev-lang/tk:0= |
1089 |
- dev-tcltk/tix:0= |
1090 |
- ) |
1091 |
- !dev-python/pypy3:0" |
1092 |
-DEPEND="${RDEPEND} |
1093 |
- app-arch/lzip |
1094 |
- app-arch/xz-utils |
1095 |
- test? ( ${PYTHON_DEPS} )" |
1096 |
- |
1097 |
-S=${WORKDIR}/${MY_P}-src |
1098 |
- |
1099 |
-QA_PREBUILT=" |
1100 |
- usr/lib/pypy3.6/pypy3-c |
1101 |
- usr/lib/pypy3.6/libpypy3-c.so" |
1102 |
- |
1103 |
-src_prepare() { |
1104 |
- eapply "${FILESDIR}/7.0.0-gentoo-path.patch" |
1105 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
1106 |
- eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch |
1107 |
- |
1108 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
1109 |
- -i lib-python/3/distutils/command/install.py || die |
1110 |
- |
1111 |
- # apply CPython stdlib patches |
1112 |
- pushd lib-python/3 > /dev/null || die |
1113 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
1114 |
- popd > /dev/null || die |
1115 |
- |
1116 |
- eapply_user |
1117 |
-} |
1118 |
- |
1119 |
-src_compile() { |
1120 |
- # Tadaam! PyPy compiled! |
1121 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
1122 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
1123 |
- mv pypy/module/cpyext/include/*.h include/ || die |
1124 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
1125 |
- |
1126 |
- pax-mark m pypy3-c libpypy3-c.so |
1127 |
- |
1128 |
- einfo "Generating caches and CFFI modules ..." |
1129 |
- |
1130 |
- # Generate Grammar and PatternGrammar pickles. |
1131 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
1132 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
1133 |
- |
1134 |
- # Generate cffi modules |
1135 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
1136 |
-#cffi_build_scripts = { |
1137 |
-# "sqlite3": "_sqlite3_build.py", |
1138 |
-# "audioop": "_audioop_build.py", |
1139 |
-# "tk": "_tkinter/tklib_build.py", |
1140 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
1141 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
1142 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
1143 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
1144 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
1145 |
-# "lzma": "_lzma_build.py", |
1146 |
-# "_decimal": "_decimal_build.py", |
1147 |
-# "ssl": "_ssl_build.py", |
1148 |
-# "_blake2": "_blake2/_blake2_build.py", |
1149 |
-# "_sha3": "_sha3/_sha3_build.py", |
1150 |
- cffi_targets=( blake2/_blake2 sha3/_sha3 ssl |
1151 |
- audioop curses syslog pwdgrp resource lzma decimal ) |
1152 |
- use gdbm && cffi_targets+=( gdbm ) |
1153 |
- use sqlite && cffi_targets+=( sqlite3 ) |
1154 |
- use tk && cffi_targets+=( tkinter/tklib ) |
1155 |
- |
1156 |
- einfo "Please disregard the import errors during CFFI cache generation." |
1157 |
- einfo "They come from modules not built yet." |
1158 |
- |
1159 |
- local t |
1160 |
- # all modules except tkinter output to . |
1161 |
- # tkinter outputs to the correct dir ... |
1162 |
- cd lib_pypy || die |
1163 |
- for t in "${cffi_targets[@]}"; do |
1164 |
- # tkinter doesn't work via -m |
1165 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
1166 |
- done |
1167 |
- |
1168 |
- # Cleanup temporary objects |
1169 |
- find -name "_cffi_*.[co]" -delete || die |
1170 |
- find -type d -empty -delete || die |
1171 |
-} |
1172 |
- |
1173 |
-src_test() { |
1174 |
- # (unset) |
1175 |
- local -x PYTHONDONTWRITEBYTECODE= |
1176 |
- |
1177 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
1178 |
- # internally so that we end up testing the correct interpreter. |
1179 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
1180 |
-} |
1181 |
- |
1182 |
-src_install() { |
1183 |
- local dest=/usr/lib/pypy3.6 |
1184 |
- einfo "Installing PyPy ..." |
1185 |
- exeinto "${dest}" |
1186 |
- doexe pypy3-c libpypy3-c.so |
1187 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
1188 |
- insinto "${dest}" |
1189 |
- # preserve mtimes to avoid obsoleting caches |
1190 |
- insopts -p |
1191 |
- doins -r include lib_pypy lib-python |
1192 |
- dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3 |
1193 |
- dodoc README.rst |
1194 |
- |
1195 |
- if ! use gdbm; then |
1196 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
1197 |
- fi |
1198 |
- if ! use sqlite; then |
1199 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
1200 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
1201 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
1202 |
- fi |
1203 |
- if ! use tk; then |
1204 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
1205 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
1206 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
1207 |
- fi |
1208 |
- |
1209 |
- einfo "Generating caches and byte-compiling ..." |
1210 |
- |
1211 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
1212 |
- # we can't use eclass function since PyPy is dumb and always gives |
1213 |
- # paths relative to the interpreter |
1214 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages |
1215 |
- python_export pypy3 EPYTHON |
1216 |
- |
1217 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
1218 |
- python_domodule epython.py |
1219 |
- |
1220 |
- einfo "Byte-compiling Python standard library..." |
1221 |
- |
1222 |
- # compile the installed modules |
1223 |
- python_optimize "${ED%/}${dest}" |
1224 |
-} |