[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2015-11-27 16:11 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2015-11-27 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     be7f6ff0fc9907523a29c950f2c85148d23be364
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 16:10:12 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 16:11:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7f6ff0

dev-python/pypy-bin: Remove old

 dev-python/pypy-bin/Manifest                       |  16 -
 .../pypy-bin/files/2.3-21_all_distutils_c++.patch  | 321 ---------------------
 dev-python/pypy-bin/pypy-bin-2.4.0.ebuild          | 183 ------------
 dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild       | 183 ------------
 4 files changed, 703 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 81398f5..8409437 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,21 +1,5 @@
-DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
-DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3
 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c
 DIST pypy-4.0.0-src.tar.bz2 17244624 SHA256 acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b WHIRLPOOL e94bdf5e8ea2cbab8e25d37bb7cb36b9bae773ec051d603cfce784e0fd8e591ed16e6896f49d14d9ae094c5f613a0ba871380c8adc2a1cf0023157e3e2a51f52
-DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6
-DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90
-DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba
-DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 8596232 SHA256 3fded027e8e70fc11ec793b99ec18bde7893c54122492e5599fea59049b3a5fb SHA512 bac9647580cbee99e327d436a02c038a621aa6f4b2635b3a392218c76a0690bb9a8f3a3f79520c716cffd30a613874a1104114c287e130e2c0eadb5f3a5b05bd WHIRLPOOL 00f646d55093ea07abfe1f8ac9e354f8bb39a2dd3fe2925436583ad6209e6da0c34476b29832de4274dfe516d70db5ea6345e23532925ed09360464d4405b926
-DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9511800 SHA256 5178ce53d9da16a0d989797dd909677aaec4a8d4a936a4d27d8be1ea248489d9 SHA512 4910c72ea0b0849245657772eebfc598779f4a3eb077cec7d6e735c8aae3564ab064f9462fb0576f18792df2459d6c8f372578803497a83e4525671ffe0f8054 WHIRLPOOL 1ae421817e5f5f30ae7e9c446b4afe024de7d271a4fd8185002240e942c96dae93d45e80f6fe794dcb4a1c542a5b2ba76ab1ee81702e501de53861901ba7092b
-DIST pypy-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5655980 SHA256 fcfbd71b903e9c6a26cd6590090d8d0c2f8c507e9f4650f7972f36a8ef86fcc6 SHA512 45d71f2d785a65091c9f25376bcb2f7f7e02cf1f00111fcb4b0a3bf0fc5e56947be7f66f5281744de31424f9e0b7249523a4bcd5fec7bf4f3c829b66598b02af WHIRLPOOL a9fef84296f9e77062b0e0cb17537615a02f3ba7d0ed804cf63cce9baf7c1ab843b326301bde5e5a33744b716ea0efd4619e9ba55c0387acfa1622aa11b875de
-DIST pypy-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5634780 SHA256 2d0494fdab270c26efbe84fa42118b822b3fc021940e2d260a5c39938dcbed8d SHA512 672468e436646ed0334352addeda824ddd76a4cf1ad46231983aec7b697ae6ef2cc2b9072ae5149b4b0987b06caade65ab8bf67ca1dea10219030a9b3fd5b4b4 WHIRLPOOL 003bf4ef085b01c6625f43d34bdcfc2fa035e93373197c67540548856b160db39aed8f0a319ff3f77063dbb8abd2b6a4b412dccbab8c6a70689cf701cf98c4cc
-DIST pypy-bin-2.5.1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 12366684 SHA256 14e7667b36da045c5eb6758e68d0647ba6eb9804125ad9bb9425891492012b5a SHA512 6b4abd9f8546a7e39670c8d0a00bd1f4eb5ee860eda5e6d16fc64a4b8259e8c784ac4ea567b4dad84d2ff3c72a48b07836720aaee8e608f7e7ecb2b2fcf20f89 WHIRLPOOL f2517cfd7d7d46208c8cfcdb2adcfed7c1782fd014179addc9da6842070d8d90c193bedecb20538a8330c9ae31df73fe1abf9b22727aebd0770fc3caa6e0163c
-DIST pypy-bin-2.5.1-amd64+bzip2+jit+ncurses.tar.xz 14282808 SHA256 be3f365d6250a600e7494b687f41f1632774fa08938dac09cf61da1cdc331079 SHA512 41d81febca05ad6df500e1a8ff712c77ef920ae244ea48523bf637022a0a6ea07663723c284c3b2d9c7893777be4dd2266369b51c583bee9c7e42d53f4bf5c10 WHIRLPOOL 7d3719ba751f5a9b7056aa2be341823a8bacffb851f549d873ad269bc15445a7805105d201b27429247402126c2ba207bad602532372baf7053372219fbda2b2
-DIST pypy-bin-2.5.1-amd64+bzip2+ncurses.tar.xz 7298184 SHA256 4f19b38509644ebf855eabf794f89fcf83fff22d7e8b50d471a7018ce4d98f80 SHA512 45ee8a21d106b035c98bb812664b3687cfeb5eb4dfd429d84b6ee66d035692f94ca6e23ce28e68dc2c243af7008287e1cfa8f76b32b166db0af40cc206ca7168 WHIRLPOOL 7f8f86a861beb297d4081681669ae900b0fd743c76d69b695194708f192d2e00741314cd35010d71c6a7838672e223896058c34d1665777c4e4b195d74bd8474
-DIST pypy-bin-2.5.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9521220 SHA256 90fc72bd6333ef805bb996badc5a954fa1ecc7bb3d43ff655cba86db533ec8e7 SHA512 ece7fd6f126c8923854fdd5c05a343ec77a79a342f17588b66eb475ade9541190144d4beb7d57ab4437581109c4d74648fe941ec392bb939e325ee8f87bfd768 WHIRLPOOL 12b28e947a732bc5403a41638aa4c9167424ae70d4b620b91bfc2968daa449c03ebc8cc06e89992c4916e091987d9801b86dba9cf62a22b3a3965f547dec5602
-DIST pypy-bin-2.5.1-x86+bzip2+jit+ncurses+sse2.tar.xz 11702676 SHA256 ccd17d468a1e5a33e7f45ca542644d4ea4f24f8c070cc85264aea430c31b0f7c SHA512 70da9139476b1c0d05464b54001c276018ab70c41d2032d7b1b82a1ed88d697646f476a4589ec7b2ba1faca5a3ed751c22582939adb6f7bdcab93bc8b201d8ee WHIRLPOOL 4c816821c8c54d3762939a70718bcc0fbbd194e98b1efea25899e1dc1f31b037a798c02bb684c8d86ae1bfcb5a5f93ede3dd67c07fe6b112b1a99ced83b7999b
-DIST pypy-bin-2.5.1-x86+bzip2+ncurses+sse2.tar.xz 5687144 SHA256 bcb27dbd3c6158970c705be18c162442b0b655a09af564ea12e1492559ee4f0a SHA512 524a638373079789ca97d9a5dbbe2a68e5123945d2c730408cc3b693b5182c16223b320581936b644f2e54b1b37e8f8b9f4ab6b6834483ff6462fea2572cf180 WHIRLPOOL ba73cf944180a6925ff9d429f3f6c1404e7ba24c0257ac45b7e0d449bd73c95742cc0a41901d2420ed811e62012b5a7d177c9f724fe6bee010b21ad1b7906079
-DIST pypy-bin-2.5.1-x86+bzip2+ncurses.tar.xz 5725788 SHA256 668339be67618d47aaf7a64cca6900b53b74fc23e411afed9911ef5d12401de4 SHA512 56f0a200386ee97a1d4bacab43a2b0b71a9d8aae519b9b6480a982757852ef9aa8faa53490088704398507a559af05af590e778a0284c9adfbfe151c9da556b3 WHIRLPOOL 180aa2265fb2eb9b3db86e977bcc8c09d076facf17c42de0a6eb4b0a4a753643634fa742cef37aa52e814127d5d9dfee39cc71ee844482d7cb2ee29abc1c2c33
 DIST pypy-bin-2.6.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 12713852 SHA256 5a23efc74a73f2073d14975949b29b46f85eb815e40fe617d788bcc8463914c2 SHA512 3dbb73047365ab39f328b1c48f370015577ac68aa8ae331d2f49b89a65f2146fa9f53629c33e424ca3949e03caf1b7616c852bd65f49a635a0a3d600f1f252ae WHIRLPOOL fdb1f43231a2e0b99f9a4db6077cda172160514b8504def1f925a66521033a522710b68f7755363701639069bb8d20edfc627dc4fb8c04015b78214581c0999d
 DIST pypy-bin-2.6.0-amd64+bzip2+jit+ncurses.tar.xz 13707848 SHA256 f989708173de093a9d98f190b249a8ed32642fe96ace548f231457e4c743ce57 SHA512 c45cc995349f30630ae14171125bb2ddf8974a77eb817f01a0d86845050832932ca00f3d2c0fcabb15649d3b19a19cfa55d515a90e750d507828ec598aaf998e WHIRLPOOL 3e07920c7bbc9217dccbad948dd404af808c441a725c804e90b2a427fb37fbaaa08dbe12f1ad970292b301e4dd2c0014442761839290a8c7f39a3a11bf6a4019
 DIST pypy-bin-2.6.0-amd64+bzip2+ncurses.tar.xz 7440860 SHA256 b86d2c6939949c16f745729082ee35ef221a48d745f98d0d9a09897187412ca9 SHA512 de9bfe9ddd342e806c59477e333c22afc672175fa3207519379c71d8d359b004a187ac0ed59211347beb562802daa05ba4e6cbb08dd8ad3587c2c9be41ed1307 WHIRLPOOL d62aec345b8a98b3ab790a2588108745c4e0203e8a76580ee700c2379b22215b141141c31d41ab211c451713aadebf05ae0f9cdd1e2b318b73e43a6f2a5ff76f

diff --git a/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
deleted file mode 100644
index 2787360..0000000
--- a/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-http://bugs.python.org/issue1222585
-
---- Lib/distutils/cygwinccompiler.py
-+++ Lib/distutils/cygwinccompiler.py
-@@ -117,8 +117,10 @@
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -132,9 +134,13 @@
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -160,8 +166,12 @@
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-@@ -327,9 +337,14 @@
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
---- Lib/distutils/emxccompiler.py
-+++ Lib/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@
-         # XXX optimization, warnings etc. should be customizable.
-         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
--                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
- 
-         # want the gcc library statically linked (so that we don't have
-         # to distribute a version dependent on the compiler we have)
-@@ -83,8 +87,12 @@
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
---- Lib/distutils/sysconfig_cpython.py
-+++ Lib/distutils/sysconfig_cpython.py
-@@ -170,10 +170,12 @@
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -188,19 +190,27 @@
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -209,13 +219,17 @@
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
---- Lib/distutils/unixccompiler.py
-+++ Lib/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["cc"],
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -112,12 +115,19 @@
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError, msg:
-             raise CompileError, msg
- 
-@@ -174,23 +184,16 @@
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i = i + 1
--
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
---- Lib/_osx_support.py
-+++ Lib/_osx_support.py
-@@ -14,13 +14,13 @@
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -123,7 +123,55 @@
-     optional C speedup components.
-     """
-     if compiler.compiler_type == "unix":
--        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
-+        cc = ' '.join(compiler.compiler)
-+        cxx = ' '.join(compiler.compiler_cxx)
-+        ldshared = ' '.join(compiler.linker_so)
-+        ldcxxshared = ' '.join(compiler.linker_so_cxx)
-+
-+        cflags = ''
-+        cxxflags = ''
-+        ccshared = '-fPIC'
-+
-+        if 'CC' in os.environ:
-+            cc = os.environ['CC']
-+        if 'CXX' in os.environ:
-+            cxx = os.environ['CXX']
-+        if 'LDSHARED' in os.environ:
-+            ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-+        if 'CPP' in os.environ:
-+            cpp = os.environ['CPP']
-+        else:
-+            cpp = cc + " -E"           # not always
-+        if 'LDFLAGS' in os.environ:
-+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-+        if 'CFLAGS' in os.environ:
-+            cflags = os.environ['CFLAGS']
-+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-+        if 'CPPFLAGS' in os.environ:
-+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
-+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-+
-+        cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-+        compiler.set_executables(
-+            preprocessor=cpp,
-+            compiler=cc_cmd,
-+            compiler_so=cc_cmd + ' ' + ccshared,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-+            linker_so=ldshared,
-+            linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx)
-         compiler.shared_lib_extension = get_config_var('SO')
-         if "CPPFLAGS" in os.environ:
-             cppflags = shlex.split(os.environ["CPPFLAGS"])

diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
deleted file mode 100644
index 55e1fc2..0000000
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils multilib pax-utils python-any-r1 versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
-	amd64? (
-		jit? ( shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-		) )
-		jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-		) )
-		!jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-		) )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-			) )
-			jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
-			) )
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
-			) )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
-			) )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0
-	dev-libs/expat:0
-	dev-libs/libffi:0
-	dev-libs/openssl:0[-bindist]
-	sys-libs/glibc:2.2
-	=sys-libs/ncurses-5*:0
-	sys-libs/zlib:0
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )
-	test? ( ${RDEPEND} )"
-PDEPEND="app-admin/python-updater"
-
-S=${WORKDIR}/pypy-${PV}-src
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	pushd lib-python/2.7 > /dev/null || die
-	epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/include/numpy include/ || die
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c
-
-	# ctypes config cache
-	# this one we need to do with python2 too...
-	./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \
-		|| die "Failed to rebuild ctypes config cache"
-}
-
-# Doesn't work - pypy missing its own libs
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	insinto "/usr/$(get_libdir)/pypy"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi cache
-	# Please keep in sync with pypy/tool/release/package.py!
-	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
-	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
-	if use gdbm; then
-		"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
-	fi
-	if use sqlite; then
-		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
-	fi
-	if use tk; then
-		"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
-	fi
-
-	# Cleanup temporary objects
-	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${INSDESTTREE}"
-}

diff --git a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
deleted file mode 100644
index 52c2798..0000000
--- a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils multilib pax-utils python-any-r1 versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
-	amd64? (
-		jit? ( shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-		) )
-		jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-		) )
-		!jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-		) )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-			) )
-			jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
-			) )
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
-			) )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
-			) )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0
-	dev-libs/expat:0
-	dev-libs/libffi:0
-	dev-libs/openssl:0[-bindist]
-	sys-libs/glibc:2.2
-	=sys-libs/ncurses-5*:0
-	sys-libs/zlib:0
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )
-	test? ( ${RDEPEND} )"
-PDEPEND="app-admin/python-updater"
-
-S=${WORKDIR}/pypy-${PV}-src
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	pushd lib-python/2.7 > /dev/null || die
-	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/include/numpy include/ || die
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c
-
-	# ctypes config cache
-	# this one we need to do with python2 too...
-	./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \
-		|| die "Failed to rebuild ctypes config cache"
-}
-
-# Doesn't work - pypy missing its own libs
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	insinto "/usr/$(get_libdir)/pypy"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi cache
-	# Please keep in sync with pypy/tool/release/package.py!
-	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
-	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
-	if use gdbm; then
-		"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
-	fi
-	if use sqlite; then
-		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
-	fi
-	if use tk; then
-		"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
-	fi
-
-	# Cleanup temporary objects
-	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${INSDESTTREE}"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2015-11-27 19:49 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2015-11-27 19:49 UTC (permalink / raw
  To: gentoo-commits

commit:     2d1cc6f35df19bf9f787d5b717fa8879a47e99d7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 16:29:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 19:49:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1cc6f3

dev-python/pypy-bin: Apply full Gentoo path set, for Gentoo sys.prefix

Override all default distutils.command.install paths for Gentoo rather
than just scriptdir. However, do that only when install_base equals
the default prefix in which PyPy is installed system-wide.

This fixes both issues resulting from lack of prefix override (like
installing data files in /usr/lib*/pypy), and from overeager prefix
overrides (like virtualenv installing scripts in /usr/bin).

Fixes: https://bugs.gentoo.org/462306
Fixes: https://bugs.gentoo.org/465546

 .../pypy-bin/files/1.9-scripts-location.patch      | 11 -----
 dev-python/pypy-bin/files/4.0.0-gentoo-path.patch  | 50 ++++++++++++++++++++++
 ...in-2.6.0-r1.ebuild => pypy-bin-2.6.0-r2.ebuild} |  6 ++-
 ...y-bin-4.0.0.ebuild => pypy-bin-4.0.0-r1.ebuild} |  6 ++-
 4 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/dev-python/pypy-bin/files/1.9-scripts-location.patch b/dev-python/pypy-bin/files/1.9-scripts-location.patch
deleted file mode 100644
index 5f0190d..0000000
--- a/dev-python/pypy-bin/files/1.9-scripts-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py
-+++ pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py
-@@ -87,7 +87,7 @@
-         'purelib': '$base/site-packages',
-         'platlib': '$base/site-packages',
-         'headers': '$base/include',
--        'scripts': '$base/bin',
-+        'scripts': '/usr/bin',
-         'data'   : '$base',
-         },
-     }

diff --git a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
new file mode 100644
index 0000000..4d394f9
--- /dev/null
+++ b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+

diff --git a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
similarity index 97%
rename from dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
rename to dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
index 5459d26..24c009e 100644
--- a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
@@ -84,9 +84,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
 		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \

diff --git a/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
similarity index 97%
rename from dev-python/pypy-bin/pypy-bin-4.0.0.ebuild
rename to dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
index 1b916dd..d5081dd 100644
--- a/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
@@ -84,9 +84,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
 		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2017-04-25 21:49 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-04-25 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     2139820ad4f1757fccb18b80e4cf0ee0db8bb107
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:19:10 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 21:49:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2139820a

dev-python/pypy-bin: Bump to 5.7.1

 dev-python/pypy-bin/Manifest                       |   7 +
 ....UnixCCompiler.runtime_library_dir_option.patch |   4 +-
 .../pypy-bin/files/5.7.1_all_distutils_cxx.patch   | 388 +++++++++++++++++++++
 dev-python/pypy-bin/pypy-bin-5.7.1.ebuild          | 189 ++++++++++
 4 files changed, 586 insertions(+), 2 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 8136b27f39b..b730043c8b0 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -5,5 +5,12 @@ DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10451373 SHA25
 DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11678153 SHA256 3a1cafb572f3565862dce0e4a3386bcd63da26eb17a39301637e7751b827c2d4 SHA512 9608eed3c1583c09ce504b47a6efd82edaf27e83fc6471ee4e478a3167fcf38cae57470ba0246ef6e56398922ec270e81ceb75e7a6d0744a02f5bca454fa33cf WHIRLPOOL 24ad25b4cd686976de99494943135ad2fbb56898981f26e1ff339ea5b0d96171f0e65e24afa40374cfabcae75887ce4e59ab8a5f323bc4af41e1ccc38fc5d74c
 DIST pypy-bin-5.6.0-x86+bzip2+ncurses+sse2.tar.lz 6075399 SHA256 14e3dde904e6ee5b8d276f6785cf8a3339e3689f5d151d0b146f76cde77b7ca2 SHA512 b2c6ce1415b7c49be7c69a02c744884b03ccd17227d8c66c0b042f8b5421e006c3e81353f20d6c74bc886ff10927d2efaf0f4b938571e165678135e18870e06b WHIRLPOOL fc3c3e0554d96a52c0a9631080250a6fd825d3ccf5d3c31da172c6f820fea6106b7c4f1094ea2fe838deb786a6ce8b0e78a9a78b7864394c828db32d9c31adc1
 DIST pypy-bin-5.6.0-x86+bzip2+ncurses.tar.lz 6073628 SHA256 a667781d65abee8f535769a08cc9cf7e39ae2c12f6aa71cab32de53baf21ceb3 SHA512 adfe5c01c575378c537dc72eaa6cf98cf2f8f2642abeefcfde70f0930f26202b6c08bb715e0c6cf058495fcf1baa035f43e0452014e90e249a27118bcece4dda WHIRLPOOL 4b74440e22fc76c128d8330df57a54dd48a5d5b4fd390f6b912ace46a34d58b03f4a1f6990a274bd1ea8c88615e5f1d1fe56a124a25e1d6618798d7c3a00646a
+DIST pypy-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 12313034 SHA256 410f32b11f6d28ea4bdc59d6ee9de4239178b16834fcd35bf5e9f462e3a51ebd SHA512 e6a66b2aeb3b3d2fd8b99ef5d0fa49b9e99752f9baa996280d14d9031b4103795bd5f0180755e3a360889b808267e19939b32e504bd91811df3875c9ae634775 WHIRLPOOL 1ab24432bc071d2aea1c0023817a8ef89444b560f21276d7f66c4d5a3c72662eda4b2ec13b39a60920dade363b39051f610af8505f011b5cb626ff2cdebb65cb
+DIST pypy-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 7104886 SHA256 76373ee444a173287d02dda552a07bf029ee7b3c1d5b94784cf13b53d0b12584 SHA512 fed7f2f3ae78f7e1723cb22cd2de1772b2afb633e84714335e06c91ef8062ba1216f3539b2f49e1570e174e823417c83d30d9cff852c6118241b8ff7fe16d627 WHIRLPOOL b661b9a6f4033e15a6d398f724455ad7b9c06bf5ab2a4a06656a4a0888adfee5abfcefe6c27e1d9e4c38c99d38d944523cf1afd2da1084e7fefc9a6c91c89e6a
+DIST pypy-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9956906 SHA256 25638e27a0939268014c35b94f4b5e9031d5f3a92cb51e96adbe4b59befbb579 SHA512 1ef83113f832a71ee4370381f21a07c24059a3b1bd2cad14846f06aa4d8319c14cb3633314f81f6ee898ecd9d2612bd03b72a3c1a87264ff34214f716e13bc4f WHIRLPOOL 8896245974d5a9b7b524edc888399c88e1dd651561017a8688405ad82d9906ff5c81e899cee57eb64506903af583439045dc5fe7f8f5592d071642fb8bb6d9e2
+DIST pypy-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5958810 SHA256 05228eabb25b02aea0c80aca4902ee3d81c3767e64daae5662c4797b39ed6a07 SHA512 e27e84e4a060a7c20bcb862da7d0f32508f5588753b067d726d7cd43835307853a7409203c0bbb98844ac59affc03ea43dc650266d74c345a1afcb7e528f1a8f WHIRLPOOL 2169a6e306643669573434dc065235dc5272c8dffd34a09b136e5a23cd2b8bb70fef552cdf3d79018c7e3b3b1c4edb4d7dcde0a4feb550827dbeafea514742aa
+DIST pypy-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5984920 SHA256 a1507fb0d55633b28fe6c249291f4dbf0097cfaf2e2a8d36f20636c5ccd34ea3 SHA512 769f62cb3768b762a09f83926ea695d2aea01f8bb3f33d921607f454a9f1d9ab30fc5400787274d1d94a8ca5b82027d737df4e5e693d639b6944c22eb69e75f8 WHIRLPOOL 825a531ae629015022ce1260e11258ee057535ae8e491f9f08fb90cc38a6eda4f02a5f9e32c8ecb85cdeb81c5de9f2353c415abd83d05e107ebce3669560b484
 DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
+DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
+DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d

diff --git a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
index b3d5235000d..65321bb60e6 100644
--- a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -1,5 +1,5 @@
---- lib-python/2.7/distutils/unixccompiler.py
-+++ lib-python/2.7/distutils/unixccompiler.py
+--- a/lib-python/2.7/distutils/unixccompiler.py
++++ b/lib-python/2.7/distutils/unixccompiler.py
 @@ -297,7 +297,7 @@
          # this time, there's no way to determine this information from
          # the configuration data stored in the Python installation, so

diff --git a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 00000000000..8249fbc91db
--- /dev/null
+++ b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "gcc -pthread -shared"
++    g['LDCXXSHARED'] = "g++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+

diff --git a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
new file mode 100644
index 00000000000..aaa6411b77b
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2019-02-16 15:08 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-02-16 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     cafa64a947b51070d0fe3869818bf2231c072f47
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 14:34:21 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 15:08:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafa64a9

dev-python/pypy-bin: Restore Gentoo path patch

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy-bin/files/7.0.0-gentoo-path.patch  | 52 ++++++++++++++++++++++
 ...y-bin-7.0.0.ebuild => pypy-bin-7.0.0-r1.ebuild} |  4 ++
 2 files changed, 56 insertions(+)

diff --git a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
new file mode 100644
index 00000000000..9be52cd0b75
--- /dev/null
+++ b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+
+[updated for 7.0.0]
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951da0..c2564188cb 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.21.0.rc1
+

diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
similarity index 97%
rename from dev-python/pypy-bin/pypy-bin-7.0.0.ebuild
rename to dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
index 3793bd49daa..eff1516e978 100644
--- a/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
@@ -82,8 +82,12 @@ QA_PREBUILT="
 	usr/lib*/pypy/libpypy-c.so"
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2019-05-24 14:21 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-05-24 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     040b9386526a09ab0de0e3dbaae719060f0a2d83
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 14:15:54 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 24 14:21:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040b9386

dev-python/pypy-bin: Drop old (<7.1.1)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy-bin/Manifest                      |  49 -----
 dev-python/pypy-bin/files/4.0.0-gentoo-path.patch |  50 ------
 dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild    | 208 ---------------------
 dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild    | 209 ----------------------
 dev-python/pypy-bin/pypy-bin-6.0.0.ebuild         | 208 ---------------------
 dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild      | 208 ---------------------
 dev-python/pypy-bin/pypy-bin-7.1.0.ebuild         | 208 ---------------------
 7 files changed, 1140 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index c6177223e4d..faec8ae0817 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,48 +1,3 @@
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz 12981891 BLAKE2B b098e2ee15bbdfbeab5b9ab0b2b818f24160badadc8d7e3e8921eca85251a2246a595964ec491e1d23f84150253f2db23642038b476ebe930129d1b9ad170ff8 SHA512 65202d2970e52df83e206068d66079e7fd3254c9d6fa3e410f23f379b3accf324af09fd3da4c13a483c00b9de523485b8f3008f4160f134b5935948f05028c80
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz 7525252 BLAKE2B ccb34328f579a61070d6021f59fb948a80cb11803479a7960d6459cd4df861f125057982c4b051b7e9825ce3eb4c6ae3308b9639c9ed91dac1e042c76af1bd68 SHA512 a2439faae18ed12e1c8d2693471f665c08c29163957f94fe1daf240844e932b012d6cec6d1e70c9b14837ddb800359dacde44ac1444af56b296ab913fd541d44
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz 9877659 BLAKE2B fb017132e28f9249b4cf1878694cde812fb53c26e58e66156d0c7512a66baa8c4961d7aaf5358d3f2acdac9aa41c6abfd9432d9c7e6fc199cd80ade911db3790 SHA512 516f7290ea2f36c9fa6c62464c32bf80f6f15b4d94dee50d1f153400f0b1fe9c12afef517cedee014d8e88f254985c70cba08a0da29250d78057d222b4e529f2
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9cdf7e2b9194e00ec9480cef3668e7c1fa7e632eaff0b7f1ba415096bdb2a2a4322ae25b611e4ffab28f00d15a4429142bf7a62bf0d32ba4a157ed79 SHA512 258404258f7bb96fc55cf4bd8a086d598e0b583a62b282ed6809af740c09792dd854efe4a3780b85d7b84ff1c8b0169875dae38f271f95db76db494d63f0774b
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz 5947112 BLAKE2B 9153940c44f99fa0c9e911e3a815679f93413fa4be46cbd965b48e8ffe68a1e7ebfc6e872bd7d59e4d0e0ff9d02fbd5c30b1e0d9db1521448c0b0ffb89cbee7c SHA512 435d33f8ff36f424c162a450f3a9c8419bb46280b34b9d2370bc18f961a78f144128aa712dba094755e7d350cee97f395a9b61fdcc6f0d4054703dbd01d29c3e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz 5940234 BLAKE2B ba4133f9c261c7b8d7c3a5c04de61398f48c1d34d146009535c5445dd8abab17e914fa675c6c9f4717cafb1be5ee8defcb6d1ecb20cda60223677bf5c2b22db9 SHA512 afe12fcac3a93b8b139a0cbbc5475edd23eceddf3b6e58e5d425459dbc51056ad10459133adee3f7d282c403e881fa0d4d1f9c30955163e580c87be7e1b7825a
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13183739 BLAKE2B 41e95be3e48f0b53425ce9777b7bdb998dfbccb054c369cfab9b15f3835649d1520ed6ff6bb746feb96517b608b711678e3efe2cb8b70012c29347cfcbeb144f SHA512 974b438233bb9fbc3d3b9979a4f7591ae9e6b5a36795cd9a86c2a9b45e2288aa478811433b62696e33aaa4f8c9d3579b909554a4bb0a2b53975d01357fdb0b58
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 13129901 BLAKE2B 9966e298e25d3a40c78f5d729c61e57c82423dda7415b692179131289bfc64506dc347586b7ef0da3a134398671657d89281e35c217d422a343505492dee0081 SHA512 0c00195abe6481ace527bb0653f6f0df1e3b431246948f76d608dc5ea606a1f7ec9bfc014dff8070047c607648575d29356e44b1768c8fb7d07b50be4feded04
-DIST pypy-bin-7.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7650838 BLAKE2B cded65d6d3791f36f8bb61909555bc85110cbb2550336b2366444217d55ed6c615bbd58d0797048e940bd67dd049df063207bd46858e69c7f1ac70dd6c6eedff SHA512 db2d2aff65662dd1cfa2cf42d9bd588f6d7c6f031608931807435c31b4c2b53277e56b517157e8234b386eab2299c51828980817e3d730d946288571f11ea733
-DIST pypy-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 7652033 BLAKE2B c2a8d54ae2ea6c727ee686d5c2e6b612c940c61ea335596ed8fee0397396a0d7a4344e4e03ebc4f3c50fdf311ea6932b93b7422ad2147c5ea6ec8ac1ff8b7271 SHA512 fc39e427fb1b73136d8786d9f594fa355e8d93cebf01a4f5b319e0506b9d6843ef2332086eca569ff694bfb64a9808eb65c727e96b9c7d998f28cddb35717dda
-DIST pypy-bin-7.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9985530 BLAKE2B da9155481b466ad6f3b28764c01c49fa397a728ec6646727038cccb84fdaac9a5808ed73aecebad7d8e1b436932554e5f65e1078547b96dc82c6e6cc1f4b44b8 SHA512 2c378a47473152e464e2f497f959c1f0bad9f5237d18e83969643e267123d1819c2a551892279800b0b810d6ebea6b0e769f9ee6f2077bee5e92dc3c2c80df3e
-DIST pypy-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9981851 BLAKE2B 75d89b10e9220c2f8b507529404849d24a88678c0884ce1c8c0254306165c5a6782c4a6efef63228e813a4f42103d7ef33a514dda8726e4ff72c3ff1fbf5f127 SHA512 e09f4f1d7c4e12735d2a4529dc603bcef43c76e97ee6ad7b4505675c7fcdc2bdb3d6550f45b8b731dd7c4f0813ad25a0c503084b4822c44d45e1c6e9aac23171
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb831c82f7056d30b5ad2c7829be82e282008a5840ba32edea97394819845281825ec88885daafc0097bf11e572ea6021249ca424f00d6133ed274b3fc990f SHA512 3fe84c10c7f8e5775137d154dea45aefd2b101acd10da38f70935fd4cd69000d64656a96f1452c76537dd7297ca45fcfdc5be2b383fd7fdd3ce0d4848c6d0a81
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz 6010259 BLAKE2B e841ff1809424a06b018d8ca219aa57d6bc0942e2bfdae545bed548efbca0d19e84365d5e9d0fd3324904d9ed8c5e50bee5b87ffa9742af7d23af84abd11ce82 SHA512 1f736593a1ae0c49e6929498a655bf778a826cb104908356c1ce13298c36fbdb55d4a8de0e39571d74d9ff3757815e81249b301983d6d3efa8cdd21497781603
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 6023604 BLAKE2B 07a218bffe485e6b39bea2f901a2de473ce7f6e334739bcc8d9fc9aff1e83cd2fd72aeb420a61464e69bfd9eb9468ae8401a597e8b8251bbdeae5b5644dc44ac SHA512 e74a868e6e12e266d75feeeddf4df700eeb84be70d6f259efa1a5effb0c9c0fe5d228c16f5015b2b993540f17e3b2f45644f6b1ba0356dfe71b778358983e2a8
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz 6022022 BLAKE2B 26f7e87cdbafafe956e143bc5b6814ac9db2e1a3a53a5dc7c10ed436192645951e2a4966514081df94fb918b871a15b68afc55289e611fa04339591a81d3f90d SHA512 47a8d1ae2c3ba5caf7b0c08c37b01f7ef7dc3b2fd44ad2f61823305e02cdfac551080b80958bc1dfbe738fd5da960f43a37bec318e2805b8bdf90dac4dfab5b9
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13185942 BLAKE2B 74c7478c8869b12d78c0173494eebd563fc704ee79a2b2eccd177b714efe1e96025a198cdd916e6a18f7ddeb14c34737198a323c85b7715e9f53363ad64f784b SHA512 ab390b0b9edd4707c96eb68369c5c7d2de6c71dcc2f8f34bec0f9c9aec6b85106c81cd3cb101ba756dc369ac45f109a93e14bf4f5037bebf108577f7686a316f
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 13079893 BLAKE2B 6818a3282569ed3c3b0d462d5bc3003d4eae31dd811f863ec78b11c1ce6242da9a7c7af8c1b75b677d3b0fa0c4845a3bfb8a964dba21d1d050b5c25396168a52 SHA512 38a66d4143d4b9de0d735a1131f72bc259ba2128e4bad1786d56288bcc28da49df588d790514b29c9ea5a8cb45523a853690ff0637941fe47d7be1be96633e02
-DIST pypy-bin-7.1.0-amd64+bzip2+libressl+ncurses.tar.lz 7683507 BLAKE2B 1c7ab3cc128f40499740978cd2edd6c9dcb3a92df1c3dea398c4bb759afda15c04539c39b487875a70a7982eba91b55ba8966398a53d79f3c6b41dc7f09b303f SHA512 abf5e8d084d3270b1658564af5a5e786ef3dc5296b5379671dfbccd56d231d2b43da7482089b0877858d9e04c99f86e09db0b22c3735e4d7a2f44f62026d2a46
-DIST pypy-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 7765738 BLAKE2B 3e535cc65a4bf3c61cdd7dd34dd4fc9ce731c762aa2d85aa5efed82f78bb69b55ba6f92e5cad83e8123c1fc60e0be43e9a86a8c429f45d435ed84c1610c726bb SHA512 31f103e95a8e8878dcdfdd0f5b8ec1546f866c2aee8dad4a3bb66e3bdf1a3933ad5c844b2a4453477c5e69a8a869962e2325dbbb5c23b529f7d57d27b99762a1
-DIST pypy-bin-7.1.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10015037 BLAKE2B 3dd9612f2329eca5816dfd08fd2a82cdfb0b8461cbcafb5abc0f270b8ef686bd69d87d240e0368e6a69681f369c99d350aac4fd300330b5c2038ad139b737585 SHA512 a593a3b3ba48f97ff531ac7d6539d7e52e56bbe3c766ff28e7380bf2661e6bd2282d588fe31765cbcd589254dd1c239da468487a846647919a8dc7c2aa03a998
-DIST pypy-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9986329 BLAKE2B 19eba48891da80bc4922a6d3fcd8278091a045a4f8371b4bb1a787eec1cdd7668f8ca78039bfc2df4c2164dc3256b3c3ead5b342bbfc42491dd2ea7709e6fe71 SHA512 1a6c57b559458094ee1867cf9f4547004f31f928e340684145be9f598470bddaa7e0c94354fb3de8d51742ab666893437238ab0f81337ad6d137eddfe279e660
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6093992 BLAKE2B e9cc966e4fe6a3c2d2cf4193abc0e3d8b81b5353e690ce3b11ff199cfc30c3e1dceda2d26d04cab1848a04e49c62c91912404d002624b94408e81ac667680d47 SHA512 0bbd040e7e9161209a056136a508bd3befa123f3086f165b0de05d404996fabda9fb0ba360be31bac2d80056e5b8d7081a9d47433ee5b1386a859c8b97aeb544
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses.tar.lz 6090777 BLAKE2B bcb332825409a50c57d09ac67c21104a88c58b237b84ce4c31484c3b81afeb783dc140123773fe5702df41002eb44b403bf29dbda1c66a40ef9aa037d6ae6217 SHA512 3a65faf263085abb2f1652b58e6da1712dc8632f27944bdabec1d9ddcd21065babc30967942717d7ca179ce449f94175b0d03ca44179afaed55a32d11bb7e9d8
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 6093175 BLAKE2B 31a7e0b517370bb5f77372361205e5f24d8e129004af3430b3d2e3b2c58f455eb7fb2e88f86419d498724202349777189aea40cdf90eeec73b83a37a185aa653 SHA512 daeef87f64f5efd77e178fbdc6a85c0170db3d351c6951439c74ab3cef1641db8ab9266ac3d1e2b8e0a1efd2d2b1b90a1576ee21c069d8fe62fb1274ed49ed24
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses.tar.lz 6089713 BLAKE2B 8e733f4bf527fc5ecff06907d96dc8a8462b3f92cf5e328e8e232f54e7ad26303fc38b127d481ad70dccd406ef0b752619899ba45b18b3e1ad9ed692e6529a18 SHA512 b8b66a23c8b03b2840d721291b7ac39a9a0617acc7e54e3da35a930a37f8f64b95eb784c0a010513575972ad7477751966360dc0de10659f4b481d9ed275dafd
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+libressl+ncurses.tar.lz 13220880 BLAKE2B d4b45f757069405f5641ed9b70ce8e94970b1a67c9ee2865fe4250c4c85b8dd44268c5e3aeb7c852fbb8822df4c0326d4d9fc5f77cc8db1dfa4eda749b6c1122 SHA512 b8d4b35ce8b1119fef4dc624cd28c71afdb13669e9c44f380440cd6275156f7f2a1ce240a855038bc82638152f69d1f27191d4937c23052e0a9b0ca4a4efa215
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 13081888 BLAKE2B f693f6148eae1583d4fcfcffa48cdf2317d99d4839ecc9e592868285f789e74a88b5aad1c842dd22e8c4b3c43a897fedd2ad95076105e95bf8cab53a27cb8308 SHA512 db4ac8050597da6a727b7cb4ee9549697796a1452b786888c9e9fb5cdd218817edcf4b3b6317a39716b589df140d831539185b6120eb516f80f472e8d7acd0b4
 DIST pypy-bin-7.1.1-amd64+bzip2+libressl+ncurses.tar.lz 7737448 BLAKE2B 02c5aa5227bc6d2fc4087b4767c63737378d90f222a7402b20fee166f36c636fae35855dbf1df9c63984df5624c6ec052e1ec598ca4eb367a6ffccec7c397952 SHA512 ab2b274b3aadf04d55dbc9e4df5ca59ea97ec7df4dd1f8bb24feee4d46d7c02d9c72d55fad784d7412382e0803f172e871f01f82deba2cc5155b97e5139602e9
@@ -53,9 +8,5 @@ DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses+sse2.tar.lz 6092434 BLAKE2B 71141
 DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses.tar.lz 6060032 BLAKE2B 660d834c3a76ed699170b7c13d36f6dc00df3b4811a09c5dec161af7f9b0416c7fda461ca04481ad656bea39b6ed25f5220b8d38c8ec02c9634a025e3b3d6cfc SHA512 21baa8cd6bd255a335c67a1197ccef856553987740f517e1b33c27758e57b61c22b8274419b445a257ad32511d3c07901d4550151047e04adcd39c9cbf20058e
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 6091202 BLAKE2B c173cf6890143e27677e6d6ee68b2a1f55ec97897817622559c25f2f49ca5bbb5a0a2c32785a3356a6bb8f4899ff19164e550fd2762003ee018faadf80227c95 SHA512 a630e380177da78daef288e69f15a4cb333c4ef1ab2da8b4b6cf76ec139c1961d692873c7ec119e54f596ef4e1435a6c6b3ef933edca2b0b5cd6fc24963d3b0d
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses.tar.lz 6088838 BLAKE2B 555bca61d4693b3e5d3c8344bac3781cfe06acc4a50bcd74add2d122c68f177258ef438a7801ca4633a006e8a001500110287934f232ceb52789f3cc72b9b34b SHA512 0748e14e903b0863bb2a067b558826f47cad2063c31c935b84249eee2a9cf96cfa36a5d5ef92f0facca61356499f4b9cfee6496a6cc3228bae7729e50edf6be0
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
-DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca

diff --git a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index 4d394f9340d..00000000000
--- a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-

diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
deleted file mode 100644
index 66d1c991e75..00000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}

diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
deleted file mode 100644
index b36272792ba..00000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7.ossl11"
-BINHOST_LIBRESSL="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.ossl11.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}

diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
deleted file mode 100644
index 2330fd7634d..00000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}

diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
deleted file mode 100644
index 53daf3ce27b..00000000000
--- a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}

diff --git a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
deleted file mode 100644
index 53daf3ce27b..00000000000
--- a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/
@ 2019-12-30 11:59 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-12-30 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     efd41e5075867bed18fb89ea31f09cd9db1f918d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 11:03:58 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 11:57:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd41e50

dev-python/pypy-bin: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy-bin/Manifest                       |   6 -
 ....UnixCCompiler.runtime_library_dir_option.patch |  11 -
 .../pypy-bin/files/5.8.0_all_distutils_cxx.patch   | 388 ---------------------
 dev-python/pypy-bin/files/7.0.0-gentoo-path.patch  |  52 ---
 dev-python/pypy-bin/pypy-bin-7.2.0.ebuild          | 188 ----------
 5 files changed, 645 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
deleted file mode 100644
index 4c6ea3a6d7e..00000000000
--- a/dev-python/pypy-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pypy-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 13208672 BLAKE2B 526e2f4eeb57d1f169344244384f3aa35d77bd0f9dc4e1f463248eeac023e7c98a21e565080d0cc3e56c1950128450b1fc6e830e33032e8267aa21c5beb4f80b SHA512 d49942d1cd97ab580850b95590cf0982eb7f53e0b88681408392266cdad814d00d195edd757b106e4016d8df9e0d3c53bf937de145f9257313f33ffb86c2229e
-DIST pypy-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7865924 BLAKE2B 1d3cf776274285aee433de2dc8ebd5e0bf52a7cc700f1bbfb16ca071ac5b6017dddad211d9dcdf809f97289e12d38e5758023dbd80c6a68323ffaa02e8c72614 SHA512 ad481a62359c615a0fcb1bb3e57b84c536b43d569ac88393000bd8b9e9d0fc3e685c3907cfcf241c3dc60479589d042009ffe1382a27be2581c8ab421e7f0397
-DIST pypy-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9887935 BLAKE2B 177780ff596b1256f623982ba44ec2ec1c951e420a4521520ffee93e6e480864c59e8e55769f583841a0622693a578f84f408f6e577f97e7812ced7fb7594104 SHA512 dd0c71bff27beaef98ab0ce114108cd586863ef2d6eac999dbb0bdbef7cda1f5f568b465e803339a7b92262354bfe674cc6161ee1c0d479545c6d7bcd58ec3cd
-DIST pypy-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 6092349 BLAKE2B e285f4c5443c356cba90c0e56dcf9ad75357613bcf486e80816d4304bc9459ba53250a58f09155382f6ebb624610780a9f77c312aeb55a28236474cedf994e26 SHA512 0a4d782f5b074cc5fb206cd2843a59ea59c3a17ac8fd8bf2c74f0997d906e5f722142f0d33a20cdb3a7c7eb476f3799a797d5c2ccac2632c425317d38cb54b7c
-DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
-DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca

diff --git a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 65321bb60e6..00000000000
--- a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib-python/2.7/distutils/unixccompiler.py
-+++ b/lib-python/2.7/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir

diff --git a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index f0268e29695..00000000000
--- a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 07:14:11 +0200
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
-
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
----
- _osx_support.py                | 10 ++---
- distutils/cygwinccompiler.py   | 21 ++++++++--
- distutils/emxccompiler.py      | 14 +++++--
- distutils/sysconfig_cpython.py | 26 ++++++++++---
- distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
- distutils/unixccompiler.py     | 55 ++++++++++++++-------------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/distutils/emxccompiler.py
-+++ b/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # XXX optimization, warnings etc. should be customizable.
-         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
--                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
- 
-         # want the gcc library statically linked (so that we don't have
-         # to distribute a version dependent on the compiler we have)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 35f39e4..8dd032d 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -171,10 +171,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -210,13 +220,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index 368f232..4fe1f08 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
- 
-     global _config_vars
-@@ -168,37 +170,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -207,13 +224,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index dee88a5..558b568 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i = i + 1
--
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-

diff --git a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
deleted file mode 100644
index 9be52cd0b75..00000000000
--- a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
-
-[updated for 7.0.0]
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951da0..c2564188cb 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.21.0.rc1
-

diff --git a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
deleted file mode 100644
index 45eeb5eebb3..00000000000
--- a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-	)"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 tk"
-# Supported variants
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-12-30 11:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-30 11:59 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/files/, dev-python/pypy-bin/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2019-05-24 14:21 Michał Górny
2019-02-16 15:08 Michał Górny
2017-04-25 21:49 Michał Górny
2015-11-27 19:49 Michał Górny
2015-11-27 16:11 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox