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

2021-03-05 Thread Michał Górny 
commit: 37cca71d79c4a0137ffb5b7c532d3b9ef1d4932f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  5 21:03:49 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  5 21:06:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cca71d

dev-python/pypy3: Remove old

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

 dev-python/pypy3/Manifest  |   1 -
 UnixCCompiler.runtime_library_dir_option.patch |  11 -
 dev-python/pypy3/files/7.2.0-distutils-cxx.patch   | 306 
 dev-python/pypy3/files/7.3.1-gentoo-path.patch |  42 ---
 .../pypy3/files/7.3.2-py37-distutils-cxx.patch | 314 -
 dev-python/pypy3/files/7.3.3_p37-sni-handle.patch  |  38 ---
 .../files/python-3.5-distutils-OO-build.patch  |  80 --
 dev-python/pypy3/pypy3-7.3.3.ebuild| 207 --
 dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild | 180 
 9 files changed, 1179 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 64c074ac59d..8f103b863d6 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,2 @@
-DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B 
a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e256e5f73218e3c35ae1ebd
 SHA512 
3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
 DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 
135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c
 SHA512 
acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 
0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce
 SHA512 
c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a

diff --git 
a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
 
b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 29d99dcfdb7..000
--- 
a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/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/pypy3/files/7.2.0-distutils-cxx.patch 
b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
deleted file mode 100644
index 89a38050c80..000
--- a/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff --git a/lib-python/3/distutils/cygwinccompiler.py 
b/lib-python/3/distutils/cygwinccompiler.py
-index 1c36990..ead3174 100644
 a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -125,8 +125,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
-@@ -140,9 +142,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":
-@@ -166,8

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

2021-02-09 Thread Michał Górny 
commit: ba21d61bf2fd7912252e10ecff3e03f735a78855
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Feb  9 23:34:56 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb  9 23:38:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba21d61b

dev-python/pypy3: Backport servername_callback fix

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

 dev-python/pypy3/files/7.3.3_p37-sni-handle.patch  | 38 ++
 ...-7.3.3_p37.ebuild => pypy3-7.3.3_p37-r1.ebuild} |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch 
b/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
new file mode 100644
index 000..c4e377c3d8d
--- /dev/null
+++ b/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
@@ -0,0 +1,38 @@
+diff -dupr a/lib_pypy/_cffi_ssl/_stdssl/__init__.py 
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py   2021-02-10 00:15:40.815208732 
+0100
 b/lib_pypy/_cffi_ssl/_stdssl/__init__.py   2021-02-10 00:19:27.963109365 
+0100
+@@ -1008,10 +1008,10 @@ for name in SSL_CTX_STATS_NAMES:
+ SSL_CTX_STATS.append((name, getattr(lib, attr)))
+ 
+ class _SSLContext(object):
+-__slots__ = ('ctx', '_check_hostname', 'servername_callback',
++__slots__ = ('ctx', '_check_hostname',
+  'alpn_protocols', '_alpn_protocols_handle', '_protocol'
+  'npn_protocols', 'set_hostname', '_post_handshake_auth',
+- '_sni_cb', '_npn_protocols_handle')
++ '_sni_cb', '_sni_cb_handle', '_npn_protocols_handle')
+ def __new__(cls, protocol):
+ self = object.__new__(cls)
+ self.ctx = ffi.NULL
+@@ -1451,15 +1451,17 @@ class _SSLContext(object):
+ "is not in the current OpenSSL library.")
+ if cb is None:
+ lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
+-self._sni_cb= None
++self._sni_cb = None
++lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, ffi.NULL)
++self._sni_cb_handle = None
+ return
+ if not callable(cb):
+ lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
+ raise TypeError("not a callable object")
+-self.scb = ServernameCallback(cb, self)
+-sni_cb = ffi.new_handle(self.scb)
++self._sni_cb = ServernameCallback(cb, self)
++self._sni_cb_handle = ffi.new_handle(self._sni_cb)
+ lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, 
_servername_callback)
+-lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, sni_cb)
++lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, self._sni_cb_handle)
+ 
+ def cert_store_stats(self):
+ store = lib.SSL_CTX_get_cert_store(self.ctx)

diff --git a/dev-python/pypy3/pypy3-7.3.3_p37.ebuild 
b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
similarity index 97%
rename from dev-python/pypy3/pypy3-7.3.3_p37.ebuild
rename to dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
index 9c1fc7d860b..a5d9d3cf0aa 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,8 @@ src_prepare() {
eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
eapply 
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
+   # https://foss.heptapod.net/pypy/pypy/-/issues/3396
+   eapply "${FILESDIR}/7.3.3_p37-sni-handle.patch"
 
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-i lib-python/3/distutils/command/install.py || die

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

2020-09-17 Thread Michał Górny 
commit: 64acf094486c22d682426e56019c5f1cc8e3ec7f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Sep 17 14:02:36 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Sep 17 16:56:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64acf094

dev-python/pypy3: Remove old

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

 dev-python/pypy3/Manifest  |   3 -
 dev-python/pypy3/files/7.0.0-gentoo-path.patch |  52 
 dev-python/pypy3/pypy3-7.3.0.ebuild| 219 ---
 dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild   | 352 -
 dev-python/pypy3/pypy3-7.3.2_rc1.ebuild| 202 --
 5 files changed, 828 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 45dd21d0c51..39001d40e36 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,6 +1,3 @@
-DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B 
c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d
 SHA512 
313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 
4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374
 SHA512 
f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 
41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a
 SHA512 
1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
 DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 
6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332
 SHA512 
a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 
7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4
 SHA512 
d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0
 DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 
286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53
 SHA512 
c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f

diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch 
b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
deleted file mode 100644
index 135e496f253..000
--- a/dev-python/pypy3/files/7.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-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/3/distutils/command/install.py | 13 -
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py 
b/lib-python/3/distutils/command/install.py
-index 77a1827d4b..255603967f 100644
 a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -50,6 +50,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',
-+},
- }
- 
- # user site schemes
-@@ -461,7 +468,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/pypy3.6'):
-+# override paths for system-wide install
-+name = 'gentoo'
-+else:
-+name = 'pypy'
- scheme = INSTALL_SCHEMES[name]
- for key in SCHEME_KEYS:
- attrname = 'install_' + key
---

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

2020-09-11 Thread Michał Górny 
commit: 0605937f45b2f636fd675e53367279e4c54e85e1
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 11 10:42:56 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 11 21:05:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0605937f

dev-python/pypy3: Add PyPy3.7 version

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

 dev-python/pypy3/Manifest  |   1 +
 .../pypy3/files/7.3.2-py37-distutils-cxx.patch | 314 ++
 dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild   | 352 +
 3 files changed, 667 insertions(+)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 0b16f02d6f2..4d82772ad7b 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,4 @@
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B 
c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d
 SHA512 
313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 
4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374
 SHA512 
f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 
41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a
 SHA512 
1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
+DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 
7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4
 SHA512 
d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0

diff --git a/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch 
b/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
new file mode 100644
index 000..d126edacc6b
--- /dev/null
+++ b/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
@@ -0,0 +1,314 @@
+diff --git a/lib-python/3/distutils/cygwinccompiler.py 
b/lib-python/3/distutils/cygwinccompiler.py
+index 6c5d777..640fa2d 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
 b/lib-python/3/distutils/cygwinccompiler.py
+@@ -125,8 +125,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
+@@ -140,9 +142,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":
+@@ -166,8 +172,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 as msg:
+ raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+ self.set_executables(compiler='gcc -O -Wall',
+  compiler_so='gcc -mdll -O -Wall',
+  compiler_cxx='g++ -O -Wall',
++ compiler_so_cxx='g++ -mdll -O

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

2019-05-24 Thread Michał Górny 
commit: 69aac0302c7db2c99ae564fc564218fe5f14f843
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 24 14:15:31 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 24 14:21:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69aac030

dev-python/pypy3: Drop old (<7.1.1)

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

 dev-python/pypy3/Manifest  |   3 -
 dev-python/pypy3/files/4.0.0-gentoo-path.patch |  50 ---
 .../pypy3/files/5.8.0_all_distutils_cxx.patch  | 342 -
 dev-python/pypy3/pypy3-6.0.0.ebuild| 245 ---
 dev-python/pypy3/pypy3-7.0.0-r1.ebuild | 244 ---
 dev-python/pypy3/pypy3-7.1.0.ebuild| 250 ---
 6 files changed, 1134 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 40244f11480..d687ce6ca9f 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1 @@
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B 
b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d
 SHA512 
ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 
312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3
 SHA512 
3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 
12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1
 SHA512 
1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B 
be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec66bd2c0bd506db64af69d6b75b59a9dd0353ee70e6629b
 SHA512 
17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473

diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch 
b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index cf96d3fb2a5..000
--- a/dev-python/pypy3/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?= 
-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/3/distutils/command/install.py | 13 -
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py 
b/lib-python/3/distutils/command/install.py
-index fc43951..fed5218 100644
 a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/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@/pypy3'):
-+# 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/pypy3/files/5.8.0_all_distutils_cxx.patch 
b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d89ce2711c..000
--- a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-

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

2019-02-16 Thread Michał Górny 
commit: 233a876f75e258f9e72383917a1c2ee40ca55aa6
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 16 14:45:01 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 16 15:08:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233a876f

dev-python/pypy3: Restore Gentoo path patch

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

 dev-python/pypy3/files/7.0.0-gentoo-path.patch | 52 ++
 .../{pypy3-7.0.0.ebuild => pypy3-7.0.0-r1.ebuild}  |  4 ++
 dev-python/pypy3/pypy3-.ebuild |  4 ++
 3 files changed, 60 insertions(+)

diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch 
b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000..17409fa89a4
--- /dev/null
+++ b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+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/3/distutils/command/install.py | 13 -
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py 
b/lib-python/3/distutils/command/install.py
+index 77a1827d4b..255603967f 100644
+--- a/lib-python/3/distutils/command/install.py
 b/lib-python/3/distutils/command/install.py
+@@ -50,6 +50,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',
++},
+ }
+ 
+ # user site schemes
+@@ -461,7 +468,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/pypy3.5'):
++# 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/pypy3/pypy3-7.0.0.ebuild 
b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
similarity index 97%
rename from dev-python/pypy3/pypy3-7.0.0.ebuild
rename to dev-python/pypy3/pypy3-7.0.0-r1.ebuild
index c318a1f521a..87ce4dbc248 100644
--- a/dev-python/pypy3/pypy3-7.0.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
@@ -84,10 +84,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
eapply 
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
+   sed -e "s^@EPREFIX@^${EPREFIX}^" \
+   -i lib-python/3/distutils/command/install.py || die
+
# apply CPython stdlib patches
pushd lib-python/3 > /dev/null || die
eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch

diff --git a/dev-python/pypy3/pypy3-.ebuild 
b/dev-python/pypy3/pypy3-.ebuild
index 3b0362d0252..236616d1f28 100644
--- a/dev-python/pypy3/pypy3-.ebuild
+++ b/dev-python/pypy3/pypy3-.ebuild
@@ -92,10 +92,14 @@ src_unpack() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
eapply 
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
+   sed -e "s^@EPREFIX@^${EPREFIX}^" \
+   -i lib-python/3/distutils/command/install.py || die
+
# apply CPython stdlib patches
pushd lib-python/3 > /dev/null || die
eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch

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

2019-02-14 Thread Michał Górny 
commit: 8c6ad58918e983f531e19772f51bbb39e1e04537
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Feb 14 10:27:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Feb 14 22:07:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6ad589

dev-python/pypy3: Bump to 7.0.0

Bump to the 7.0.0 release.  Upstream has apparently changed install
location to be /usr/lib/pypy3.5 independently of prefix, so we remove
the Gentoo patch and adjust our paths accordingly.  Also distutils C++
patch needed rebasing.  Thanks to Sander Sweers for early reporting
and research.

Bug: https://bugs.gentoo.org/677398
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pypy3/Manifest  |   1 +
 .../pypy3/files/7.0.0_all_distutils_cxx.patch  | 347 +
 dev-python/pypy3/pypy3-7.0.0.ebuild| 240 ++
 3 files changed, 588 insertions(+)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index c4da582a7c1..e330cd40201 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1 +1,2 @@
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B 
b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d
 SHA512 
ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
+DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 
312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3
 SHA512 
3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2

diff --git a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch 
b/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
new file mode 100644
index 000..a9099e5c9dc
--- /dev/null
+++ b/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
@@ -0,0 +1,347 @@
+From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
+
+https://bugs.python.org/issue1222585
+---
+ lib-python/3/_osx_support.py| 10 ++--
+ lib-python/3/distutils/cygwinccompiler.py   | 21 ++--
+ lib-python/3/distutils/sysconfig_cpython.py | 25 --
+ lib-python/3/distutils/sysconfig_pypy.py| 34 ++---
+ lib-python/3/distutils/unixccompiler.py | 54 +++--
+ lib_pypy/_sysconfigdata.py  |  1 +
+ 6 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
+index 13fcd8b8d2..0525be1cbc 100644
+--- a/lib-python/3/_osx_support.py
 b/lib-python/3/_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/lib-python/3/distutils/cygwinccompiler.py 
b/lib-python/3/distutils/cygwinccompiler.py
+index c879646c0f..a6157fbd5f 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
 b/lib-python/3/distutils/cygwinccompiler.py
+@@ -125,8 +125,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
+@@ -140,9 +142,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',
+

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

2018-01-05 Thread Michał Górny 
commit: e106c34cf8d3786faa62b91f79feb430a2e3d7eb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  5 22:19:47 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  5 23:19:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e106c34c

dev-python/pypy3: Clean old up

 dev-python/pypy3/Manifest |   1 -
 dev-python/pypy3/files/2.5.0-shared-lib.patch |  12 --
 dev-python/pypy3/pypy3-5.8.0.ebuild   | 238 --
 3 files changed, 251 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 0cf5fe7f341..4e6e3227823 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,2 @@
 DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 
02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4
 SHA512 
69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
-DIST pypy3-v5.8.0-src.tar.bz2 28986883 BLAKE2B 
dc6c906109269e8d1bd6b171cabf6475aa803e4326a9974ded86fbb0943798317761bc0ae0ab09829a48c073b3755c8a2bdcb03bed4b06b9a70cee061867edb6
 SHA512 
d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 
181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040
 SHA512 
3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd

diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch 
b/dev-python/pypy3/files/2.5.0-shared-lib.patch
deleted file mode 100644
index b5c877bd58b..000
--- a/dev-python/pypy3/files/2.5.0-shared-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py 
pypy-2.5.0-src/rpython/translator/platform/posix.py
 a/rpython/translator/platform/posix.py 2015-02-03 05:12:49.0 
+0800
-+++ b/rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 
+0800
-@@ -183,7 +183,7 @@
-'int main(int argc, char* argv[]) '
-'{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
- m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
--   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
-+   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
- 
- return m
- 

diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild 
b/dev-python/pypy3/pypy3-5.8.0.ebuild
deleted file mode 100644
index b286c989e72..000
--- a/dev-python/pypy3/pypy3-5.8.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) 
language"
-HOMEPAGE="http://pypy.org/;
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2;
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/58"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-   virtual/libffi:0=
-   virtual/libintl:0=
-   dev-libs/expat:0=
-   !libressl? ( dev-libs/openssl:0=[-bindist] )
-   libressl? ( dev-libs/libressl:0= )
-   bzip2? ( app-arch/bzip2:0= )
-   gdbm? ( sys-libs/gdbm:0= )
-   ncurses? ( sys-libs/ncurses:0= )
-   sqlite? ( dev-db/sqlite:3= )
-   tk? (
-   dev-lang/tk:0=
-   dev-tcltk/tix:0=
-   )
-   !dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-   low-memory? ( virtual/pypy:0 )
-   !low-memory? ( ${PYTHON_DEPS} )"
-#  doc? ( dev-python/sphinx )
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-   if use low-memory; then
-   CHECKREQS_MEMORY="1750M"
-   use amd64 && CHECKREQS_MEMORY="3500M"
-   else
-   CHECKREQS_MEMORY="3G"
-   use amd64 && CHECKREQS_MEMORY="6G"
-   fi
-
-   check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   check_env
-
-   # unset to allow forcing pypy below :)
-   use low-memory && local EPYTHON=
-   if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == 
pypy ]]; then
-   einfo "Using PyPy to perform the translation."
-

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

2017-10-15 Thread Michał Górny 
commit: a46e22a8d586b11151dd9f974f0588f8d98df431
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 15 09:16:59 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 15 09:38:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46e22a8

dev-python/pypy3: Drop old

 dev-python/pypy3/Manifest  |   3 -
 dev-python/pypy3/files/5.2.0-distutils-c++.patch   | 284 -
 dev-python/pypy3/files/5.7.1-kill-flto.patch   |  27 --
 .../pypy3/files/5.7.1_all_distutils_cxx.patch  | 342 -
 dev-python/pypy3/metadata.xml  |   1 -
 dev-python/pypy3/pypy3-5.5.0_alpha.ebuild  | 260 
 dev-python/pypy3/pypy3-5.7.1-r2.ebuild | 238 --
 7 files changed, 1155 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ba2c2b770e8..b145fb4f4b2 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,5 +1,2 @@
-DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 
40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 
f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60
 WHIRLPOOL 
180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 
9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 
d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a
 WHIRLPOOL 
b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 
a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 
3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
 WHIRLPOOL 
e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
-DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 
d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 
b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168
 WHIRLPOOL 
6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
-DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 
a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 
27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16
 WHIRLPOOL 
edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e

diff --git a/dev-python/pypy3/files/5.2.0-distutils-c++.patch 
b/dev-python/pypy3/files/5.2.0-distutils-c++.patch
deleted file mode 100644
index 1251694107d..000
--- a/dev-python/pypy3/files/5.2.0-distutils-c++.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-Date: Thu, 9 Jun 2016 20:48:10 +0200
-Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3
-

- lib-python/3/_osx_support.py| 10 +++---
- lib-python/3/distutils/cygwinccompiler.py   | 21 +--
- lib-python/3/distutils/emxccompiler.py  | 14 ++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++---
- lib-python/3/distutils/unixccompiler.py | 54 -
- 5 files changed, 83 insertions(+), 41 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 50b2d17..1d19599 100644
 a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_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',

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

2017-10-09 Thread Michał Górny 
commit: 53ef182b3f5663c226d06a043e6dac3843648c13
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Oct  5 17:45:39 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct  9 18:58:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ef182b

dev-python/pypy3: Bump to 5.9.0

 dev-python/pypy3/Manifest  |  1 +
 dev-python/pypy3/files/5.9.0-shared-lib.patch  | 12 +
 .../{pypy3-.ebuild => pypy3-5.9.0.ebuild}  | 54 ++
 dev-python/pypy3/pypy3-.ebuild |  6 +--
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 84c8dbad617..ba2c2b770e8 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1,5 @@
 DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 
40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 
f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60
 WHIRLPOOL 
180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 
9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 
d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a
 WHIRLPOOL 
b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
+DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 
a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 
3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
 WHIRLPOOL 
e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
 DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 
d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 
b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168
 WHIRLPOOL 
6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 
a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 
27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16
 WHIRLPOOL 
edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e

diff --git a/dev-python/pypy3/files/5.9.0-shared-lib.patch 
b/dev-python/pypy3/files/5.9.0-shared-lib.patch
new file mode 100644
index 000..5d89d3b15a3
--- /dev/null
+++ b/dev-python/pypy3/files/5.9.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -dupr a/rpython/translator/platform/posix.py 
b/rpython/translator/platform/posix.py
+--- a/rpython/translator/platform/posix.py 2017-10-05 20:17:25.009954656 
+0200
 b/rpython/translator/platform/posix.py 2017-10-05 20:17:31.115666386 
+0200
+@@ -227,7 +227,7 @@ class BasePosix(Platform):
+'int main(int argc, char* argv[]) '
+'{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+ m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)', '$(MAKE) postcompile 
BIN=$(DEFAULT_TARGET)'])
++   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@', '$(MAKE) postcompile 
BIN=$(DEFAULT_TARGET)'])
+ 
+ return m
+ 

diff --git a/dev-python/pypy3/pypy3-.ebuild 
b/dev-python/pypy3/pypy3-5.9.0.ebuild
similarity index 85%
copy from dev-python/pypy3/pypy3-.ebuild
copy to dev-python/pypy3/pypy3-5.9.0.ebuild
index 7291b119ea0..1c93d21dd75 100644
--- a/dev-python/pypy3/pypy3-.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -5,20 +5,19 @@ EAPI=6
 
 # pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 pypy )
-EHG_PROJECT="pypy"
-EHG_REPO_URI="https://bitbucket.org/pypy/pypy;
-EHG_REVISION="py3k"
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs 
versionator
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) 
language"
 HOMEPAGE="http://pypy.org/;
-SRC_URI=""
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2;
 
 LICENSE="MIT"
-# XX from pypy3-XX.so module suffix
-SLOT="0/57"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite 
cpu_flags_x86_sse2 tk"
+# pypy3 -c 'import sysconfig;

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

2017-04-25 Thread Michał Górny 
commit: 27d9dc7c45731e84947d401db38022c1eab49b5c
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Apr 25 16:03:22 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 25 21:49:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d9dc7c

dev-python/pypy3: Fix implicit -flto in 

 dev-python/pypy3/files/5.7.1-kill-flto.patch | 27 +++
 dev-python/pypy3/pypy3-.ebuild   |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-python/pypy3/files/5.7.1-kill-flto.patch 
b/dev-python/pypy3/files/5.7.1-kill-flto.patch
new file mode 100644
index 000..92395bdb6ca
--- /dev/null
+++ b/dev-python/pypy3/files/5.7.1-kill-flto.patch
@@ -0,0 +1,27 @@
+From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Tue, 25 Apr 2017 17:03:46 +0200
+Subject: [PATCH] Kill -flto
+
+---
+ rpython/translator/platform/posix.py | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rpython/translator/platform/posix.py 
b/rpython/translator/platform/posix.py
+index a8d4768..20a2934 100644
+--- a/rpython/translator/platform/posix.py
 b/rpython/translator/platform/posix.py
+@@ -130,10 +130,6 @@ class BasePosix(Platform):
+ else:
+ cflags = tuple(self.cflags) + tuple(self.standalone_only)
+ 
+-# xxx check which compilers accept this option or not
+-if not config or config.translation.gcrootfinder != 'asmgcc':
+-cflags = ('-flto',) + cflags
+-
+ m = GnuMakefile(path)
+ m.exe_name = path.join(exe_name.basename)
+ m.eci = eci
+-- 
+2.12.2
+

diff --git a/dev-python/pypy3/pypy3-.ebuild 
b/dev-python/pypy3/pypy3-.ebuild
index f22d4d75d87..eaa0e20886c 100644
--- a/dev-python/pypy3/pypy3-.ebuild
+++ b/dev-python/pypy3/pypy3-.ebuild
@@ -86,6 +86,8 @@ src_prepare() {
eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
eapply 
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
+   # disarm implicit -flto
+   eapply "${FILESDIR}"/5.7.1-kill-flto.patch
 
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-e "s^@libdir@^$(get_libdir)^" \

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

2017-04-25 Thread Michał Górny 
commit: de2429b416e556af4cec2cf05da1ede52cb6a473
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 24 20:14:35 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 25 21:49:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2429b4

dev-python/pypy3: Update the distutils C++ patch

 .../pypy3/files/5.7.1_all_distutils_cxx.patch  | 342 +
 dev-python/pypy3/pypy3-.ebuild |   2 +-
 2 files changed, 343 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch 
b/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000..52a833f29d9
--- /dev/null
+++ b/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py| 10 +++---
+ distutils/cygwinccompiler.py   | 21 +--
+ distutils/sysconfig_cpython.py | 25 ++---
+ distutils/sysconfig_pypy.py| 35 +++
+ distutils/unixccompiler.py | 54 -
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 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 c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
 b/distutils/cygwinccompiler.py
+@@ -125,8 +125,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
+@@ -140,9 +142,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":
+@@ -166,8 +172,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 as msg:
+ raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+ self.set_executables(compiler='gcc -O -Wall',
+

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

2016-05-05 Thread Patrice Clement 
commit: b5f1e9968e573009453180799b1156a37b40e6b8
Author: PPed72  iol  it>
AuthorDate: Fri Apr 22 15:34:22 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu May  5 08:59:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f1e996

dev-python/pypy3: fix regression in tkinter

Gentoo-Bug: https://bugs.gentoo.org/533384
Closes: https://github.com/gentoo/gentoo/pull/1326

Signed-off-by: Patrice Clement  gentoo.org>

 .../files/pypy3-2.4.0-fix-tkinter-regression.patch | 74 ++
 dev-python/pypy3/pypy3-2.4.0-r2.ebuild |  1 +
 2 files changed, 75 insertions(+)

diff --git a/dev-python/pypy3/files/pypy3-2.4.0-fix-tkinter-regression.patch 
b/dev-python/pypy3/files/pypy3-2.4.0-fix-tkinter-regression.patch
new file mode 100644
index 000..a92152e
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-fix-tkinter-regression.patch
@@ -0,0 +1,74 @@
+# HG changeset patch
+# User Philip Jenvey 
+# Date 1414136649 25200
+# Branch py3k
+# Node ID 8c340acffe279d63dd2df525173713b2054619c8
+# Parent  a87e6542c186bdc7408ea027aed83c62820a9c49
+issue1899: fix broken bytes usage from default
+
+diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
+--- a/lib_pypy/_tkinter/app.py
 b/lib_pypy/_tkinter/app.py
+@@ -439,7 +439,7 @@
+ if isinstance(s, int):
+ return s
+ s = s.encode('utf-8')
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("int*")
+ res = tklib.Tcl_GetBoolean(self.interp, s, v)
+@@ -451,7 +451,7 @@
+ if isinstance(s, int):
+ return s
+ s = s.encode('utf-8')
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("int*")
+ res = tklib.Tcl_GetInt(self.interp, s, v)
+@@ -463,7 +463,7 @@
+ if isinstance(s, float):
+ return s
+ s = s.encode('utf-8')
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("double*")
+ res = tklib.Tcl_GetDouble(self.interp, s, v)
+@@ -472,7 +472,7 @@
+ return v[0]
+ 
+ def exprboolean(self, s):
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("int*")
+ res = tklib.Tcl_ExprBoolean(self.interp, s, v)
+@@ -481,7 +481,7 @@
+ return v[0]
+ 
+ def exprlong(self, s):
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("long*")
+ res = tklib.Tcl_ExprLong(self.interp, s, v)
+@@ -490,7 +490,7 @@
+ return v[0]
+ 
+ def exprdouble(self, s):
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ v = tkffi.new("double*")
+ res = tklib.Tcl_ExprDouble(self.interp, s, v)
+@@ -499,7 +499,7 @@
+ return v[0]
+ 
+ def exprstring(self, s):
+-if '\x00' in s:
++if b'\x00' in s:
+ raise TypeError
+ res = tklib.Tcl_ExprString(self.interp, s)
+ if res == tklib.TCL_ERROR:

diff --git a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild 
b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
index 446c8d6..07646db 100644
--- a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
@@ -82,6 +82,7 @@ src_prepare() {
"${FILESDIR}"/2.3.1-shared-lib.patch# 517002
epatch "${FILESDIR}/2.4.0-ncurses6.patch"
epatch "${FILESDIR}"/${PN}-2.4.0-libressl.patch
+   epatch "${FILESDIR}/${PN}-2.4.0-fix-tkinter-regression.patch"   # 533384
 
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-e "s^@libdir@^$(get_libdir)^" \

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

2016-03-03 Thread Michał Górny 
commit: 83eb744d8b60b3c911902999a40c0479823c271b
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar  3 09:48:00 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  3 10:47:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83eb744d

dev-python/pypy3: Sync between release and live ebuild

 .../pypy3/files/2.4.0-21_all_distutils_c++.patch   | 251 +
 dev-python/pypy3/pypy3-2.4.0-r2.ebuild |   9 +-
 dev-python/pypy3/pypy3-.ebuild |  10 +-
 3 files changed, 264 insertions(+), 6 deletions(-)

diff --git a/dev-python/pypy3/files/2.4.0-21_all_distutils_c++.patch 
b/dev-python/pypy3/files/2.4.0-21_all_distutils_c++.patch
new file mode 100644
index 000..90525d5
--- /dev/null
+++ b/dev-python/pypy3/files/2.4.0-21_all_distutils_c++.patch
@@ -0,0 +1,251 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
 Lib/distutils/cygwinccompiler.py
+@@ -136,9 +136,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, shared_option)))
+ 
+ # cygwin and mingw32 need different sets of libraries
+ if self.gcc_version == "2.91.57":
+@@ -162,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 as msg:
+ raise CompileError(msg)
+ 
+@@ -294,10 +302,15 @@
+ self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+  compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+  compiler_cxx='g++ -mno-cygwin -O -Wall',
++ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
+  linker_exe='gcc -mno-cygwin',
+  linker_so='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+-   entry_point))
++   entry_point),
++ linker_exe_cxx='g++ -mno-cygwin',
++ linker_so_cxx='%s -mno-cygwin %s %s'
++% (self.linker_dll, shared_option,
++   entry_point))
+ # Maybe we should also append -mthreads, but then the finished
+ # dlls need another dll (mingwm10.dll see Mingw32 docs)
+ # (-mthreads: Support thread-safe exception handling on `Mingw32')
+--- Lib/distutils/emxccompiler.py
 Lib/distutils/emxccompiler.py
+@@ -63,8 +63,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)
+@@ -81,8 +85,12 @@
+ raise CompileError(msg)
+ else: # for other files use the C-compiler
+ try:
+-self.spawn(self.compiler_so + cc_args + [src, '-o',

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

2016-02-06 Thread Michał Górny 
commit: 6bf196ac851d5427e020ceb9b79cbb40ea0ecba4
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb  6 22:42:07 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb  6 22:45:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf196ac

dev-python/pypy3: Apply fix for ncurses-6, #564454

 dev-python/pypy3/files/2.4.0-ncurses6.patch |  34 
 dev-python/pypy3/pypy3-2.4.0-r1.ebuild  | 232 
 2 files changed, 266 insertions(+)

diff --git a/dev-python/pypy3/files/2.4.0-ncurses6.patch 
b/dev-python/pypy3/files/2.4.0-ncurses6.patch
new file mode 100644
index 000..63a450f
--- /dev/null
+++ b/dev-python/pypy3/files/2.4.0-ncurses6.patch
@@ -0,0 +1,34 @@
+Patch by Vadim A. Misbakh-Soloviov (mva)
+https://bugs.gentoo.org/show_bug.cgi?id=564454
+
+--- lib_pypy/_curses.py.old 2016-01-18 19:13:00.241886442 +
 lib_pypy/_curses.py 2016-01-18 19:26:01.061885605 +
+@@ -1,6 +1,7 @@
+ """Reimplementation of the standard extension module '_curses' using cffi."""
+
+ import sys
++import platform
+ if sys.platform == 'win32':
+ #This module does not exist in windows
+ raise ImportError('No module named _curses')
+@@ -10,12 +11,18 @@
+
+ ffi = FFI()
+
++# Monkeypatch to make it build against ncurses-6.
++# Inspired by https://goo.gl/xvjQcd
++_type = "uint32_t"
++if platform.machine() == "x86_64":
++_type = "unsigned"
++
+ ffi.cdef("""
+ typedef ... WINDOW;
+ typedef ... SCREEN;
+-typedef unsigned long mmask_t;
++typedef """+_type+""" mmask_t;
+ typedef unsigned char bool;
+-typedef unsigned long chtype;
++typedef """+_type+""" chtype;
+ typedef chtype attr_t;
+
+ typedef struct

diff --git a/dev-python/pypy3/pypy3-2.4.0-r1.ebuild 
b/dev-python/pypy3/pypy3-2.4.0-r1.ebuild
new file mode 100644
index 000..e555175
--- /dev/null
+++ b/dev-python/pypy3/pypy3-2.4.0-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs eutils multilib multiprocessing pax-utils \
+   python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3"
+HOMEPAGE="http://pypy.org/;
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2;
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite 
cpu_flags_x86_sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+   virtual/libffi:0=
+   virtual/libintl:0=
+   dev-libs/expat:0=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   bzip2? ( app-arch/bzip2:0= )
+   gdbm? ( sys-libs/gdbm:0= )
+   ncurses? ( >=sys-libs/ncurses-6.0:0= )
+   sqlite? ( dev-db/sqlite:3= )
+   tk? (
+   dev-lang/tk:0=
+   dev-tcltk/tix:0=
+   )
+   !dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+   low-memory? ( virtual/pypy:0 )
+   !low-memory? ( ${PYTHON_DEPS} )"
+#  doc? ( dev-python/sphinx )
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   if use low-memory; then
+   CHECKREQS_MEMORY="1750M"
+   use amd64 && CHECKREQS_MEMORY="3500M"
+   else
+   CHECKREQS_MEMORY="3G"
+   use amd64 && CHECKREQS_MEMORY="6G"
+   fi
+   fi
+
+   check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   pkg_pretend
+
+   # unset to allow forcing pypy below :)
+   use low-memory && local EPYTHON=
+   if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == 
pypy ]]; then
+   einfo "Using PyPy to perform the translation."
+   local EPYTHON=pypy
+   else
+   einfo "Using ${EPYTHON:-python2} to perform the 
translation. Please note that upstream"
+   einfo "recommends using PyPy for that. If you wish to 
do so, please install"
+   einfo "virtual/pypy and ensure that EPYTHON variable is 
unset."
+   fi
+
+   python-any-r1_pkg_setup
+   fi
+}
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/${P}-gcc-4.9.patch \
+   "${FILESDIR}/1.9-scripts-location.patch" \
+   
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 \
+   "${FILESDIR}"/2.3.1-shared-lib.patch# 517002
+   epatch "${FILESDIR}/2.4.0-ncurses6.patch"
+   epatch "${FILESDIR}"/${PN}-2.4.0-libressl.patch
+
+   epatch_user
+}
+
+src_compile() {
+

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

2015-12-20 Thread Michał Górny 
commit: fd32d95f547b668b9d8fdddf36b35ce35a7edc77
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 20 21:12:42 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 20 21:13:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd32d95f

dev-python/pypy3: Add a live ebuild

 dev-python/pypy3/files/2.5.0-shared-lib.patch  |  12 ++
 dev-python/pypy3/files/4.0.0-gentoo-path.patch |  50 ++
 dev-python/pypy3/pypy3-.ebuild | 233 +
 3 files changed, 295 insertions(+)

diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch 
b/dev-python/pypy3/files/2.5.0-shared-lib.patch
new file mode 100644
index 000..ddd7473
--- /dev/null
+++ b/dev-python/pypy3/files/2.5.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py 
pypy-2.5.0-src/rpython/translator/platform/posix.py
+--- rpython/translator/platform/posix.py   2015-02-03 05:12:49.0 
+0800
 rpython/translator/platform/posix.py   2015-03-22 07:36:01.420116684 
+0800
+@@ -183,7 +183,7 @@
+'int main(int argc, char* argv[]) '
+'{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+ m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
++   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. 
-l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+ return m
+ 

diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch 
b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000..1c0270d
--- /dev/null
+++ b/dev-python/pypy3/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?= 
+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/3/distutils/command/install.py | 13 -
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py 
b/lib-python/3/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/3/distutils/command/install.py
 b/lib-python/3/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/pypy3/pypy3-.ebuild 
b/dev-python/pypy3/pypy3-.ebuild
new file mode 100644
index 000..a335b0f
--- /dev/null
+++ b/dev-python/pypy3/pypy3-.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_PROJECT="pypy"
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy;
+EHG_REVISION="py3k"
+inherit check-reqs eutils mercurial multilib multiprocessing pax-utils 
python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python 
language"
+HOMEPAGE="http://pypy.org/;
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite 
cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+   virtual/libffi:0=
+   virtual/libintl:0=
+   dev-libs/expat:0=
+   dev-libs/openssl:0=[-bindist]
+   bzip2? ( app-arch/bzip2:0= )
+   gdbm? ( sys-libs/gdbm:0= )
+   ncurses? ( sys-libs/ncurses:0= )
+   sqlite? ( dev-db/sqlite:3= )
+   tk? (
+

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

2015-08-18 Thread Justin Lecher 
commit: bd9b4c3f9787eb28082595d88427b23c61dd25fd
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Tue Aug 18 16:34:18 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Tue Aug 18 16:34:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9b4c3f

dev-python/pypy3: Backport for fix gcc-4.9

https://bitbucket.org/pypy/pypy/commits/c1abec418acf30bb04891c3249bc12cbe8f48d4a

Bug-Debian: https://bugs.debian.org/771137
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=536920

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher jlec AT gentoo.org

 dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch | 26 
 dev-python/pypy3/pypy3-2.4.0.ebuild  |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch 
b/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch
new file mode 100644
index 000..dd3a688
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch
@@ -0,0 +1,26 @@
+Description: Expect cmovnb and jnb
+ Fixes an FTBFS since gcc 4.9.2, which is emmiting new operations
+Author: Stefano Rivera stefa...@debian.org
+Forwarded: 
https://bitbucket.org/pypy/pypy/commits/c1abec418acf30bb04891c3249bc12cbe8f48d4a
+Bug-Debian: https://bugs.debian.org/771137
+Last-Update: 2014-11-26
+
+--- a/rpython/translator/c/gcc/trackgcroot.py
 b/rpython/translator/c/gcc/trackgcroot.py
+@@ -590,7 +590,7 @@
+ 
+ # The various cmov* operations
+ for name in '''
+-e ne g ge l le a ae b be p np s ns o no
++e ne g ge l le a ae b be nb p np s ns o no
+ '''.split():
+ locals()['visit_cmov' + name] = binary_insn
+ locals()['visit_cmov' + name + 'l'] = binary_insn
+@@ -837,6 +837,7 @@
+ visit_jb = conditional_jump
+ visit_jbe = conditional_jump
+ visit_jp = conditional_jump
++visit_jnb = conditional_jump
+ visit_jnp = conditional_jump
+ visit_js = conditional_jump
+ visit_jns = conditional_jump

diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild 
b/dev-python/pypy3/pypy3-2.4.0.ebuild
index eda2f1d..9903c1b 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -70,7 +70,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-   epatch ${FILESDIR}/1.9-scripts-location.patch \
+   epatch \
+   ${FILESDIR}/${P}-gcc-4.9.patch \
+   ${FILESDIR}/1.9-scripts-location.patch \

${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
 \
${FILESDIR}/2.3.1-shared-lib.patch# 517002