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

2020-08-02 Thread Michał Górny
commit: 142555b7efeff4b8da9297ab20a0b91728b1ad51
Author: Tom Gillespie  gmail  com>
AuthorDate: Sun Aug  2 08:37:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  2 09:34:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142555b7

dev-python/pypy: fix gentoo-path.patch and rev bump

Signed-off-by: Tom Gillespie  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pypy/files/7.3.1-gentoo-path.patch  | 2 +-
 dev-python/pypy/{pypy-7.3.1-r1.ebuild => pypy-7.3.1-r2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch 
b/dev-python/pypy/files/7.3.1-gentoo-path.patch
index 5281781865a..74ca86a84ac 100644
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644
  if (hasattr(sys, 'pypy_version_info') and
  not name.endswith(('_user', '_home'))):
 -if os.name == 'nt':
-+if self.install_base == 
os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++if 
self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
 +# override paths for system-wide install
 +name = 'gentoo'
 +elif os.name == 'nt':

diff --git a/dev-python/pypy/pypy-7.3.1-r1.ebuild 
b/dev-python/pypy/pypy-7.3.1-r2.ebuild
similarity index 100%
rename from dev-python/pypy/pypy-7.3.1-r1.ebuild
rename to dev-python/pypy/pypy-7.3.1-r2.ebuild



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

2020-06-30 Thread Michał Górny
commit: f10ac590f28aec30526050e57b54893b1a4e4d7a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun 30 16:09:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jun 30 18:50:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10ac590

dev-python/pypy: fix headers install dir

Thanks to Tom Gillespie for preparing the fix for pypy3.

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

 dev-python/pypy/files/7.3.1-gentoo-path.patch   | 2 +-
 dev-python/pypy/{pypy-7.3.1.ebuild => pypy-7.3.1-r1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch 
b/dev-python/pypy/files/7.3.1-gentoo-path.patch
index dd2c635055d..5281781865a 100644
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -18,7 +18,7 @@ index 6fe62be..a4e9f0d 100644
 +'gentoo': {
 +'purelib': '$base/site-packages',
 +'platlib': '$base/site-packages',
-+'headers': '$base/include',
++'headers': '$base/include/$dist_name',
 +'scripts': '@EPREFIX@/usr/bin',
 +'data'   : '@EPREFIX@/usr',
 +},

diff --git a/dev-python/pypy/pypy-7.3.1.ebuild 
b/dev-python/pypy/pypy-7.3.1-r1.ebuild
similarity index 100%
rename from dev-python/pypy/pypy-7.3.1.ebuild
rename to dev-python/pypy/pypy-7.3.1-r1.ebuild



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

2020-04-11 Thread Michał Górny
commit: 70ab8389753fa428ffd8c58f4d4f0f101227829c
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr 11 04:52:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 11 07:49:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ab8389

dev-python/pypy: Bump to 7.3.1

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

 dev-python/pypy/Manifest  |   1 +
 dev-python/pypy/files/7.3.1-gentoo-path.patch |  42 ++
 dev-python/pypy/pypy-7.3.1.ebuild | 182 ++
 3 files changed, 225 insertions(+)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 1f70ebaafe4..213a5503a61 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,2 +1,3 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 
7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61
 SHA512 
05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
+DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 
071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb
 SHA512 
1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B 
f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8
 SHA512 
ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f

diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch 
b/dev-python/pypy/files/7.3.1-gentoo-path.patch
new file mode 100644
index 000..dd2c635055d
--- /dev/null
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -0,0 +1,42 @@
+From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Sat, 11 Apr 2020 07:01:27 +0200
+Subject: [PATCH] Support Gentoo install scheme
+
+---
+ lib-python/2.7/distutils/command/install.py | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py 
b/lib-python/2.7/distutils/command/install.py
+index 6fe62be..a4e9f0d 100644
+--- a/lib-python/2.7/distutils/command/install.py
 b/lib-python/2.7/distutils/command/install.py
+@@ -97,6 +97,13 @@ INSTALL_SCHEMES = {
+ 'scripts': '$base/Scripts',
+ '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
+@@ -483,7 +490,10 @@ 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'))):
+-if os.name == 'nt':
++if self.install_base == 
os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++# override paths for system-wide install
++name = 'gentoo'
++elif os.name == 'nt':
+ name = 'pypy_nt'
+ else:
+ name = 'pypy'
+-- 
+2.26.0
+

diff --git a/dev-python/pypy/pypy-7.3.1.ebuild 
b/dev-python/pypy/pypy-7.3.1.ebuild
new file mode 100644
index 000..e38b85a5caa
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.17-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python 
language"
+HOMEPAGE="https://pypy.org/;
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+   https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz;
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+   || (
+   dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+   dev-python/pypy-exe-bin:${PV}
+   )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   gdbm? ( sys-libs/gdbm:0= )
+   sqlite? ( dev-db/sqlite:3= )
+   tk? (
+   dev-lang/tk:0=
+   dev-tcltk/tix:0=
+   )
+   ! /dev/null || die
+   # TODO: 

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

2019-02-16 Thread Michał Górny
commit: 4c0261d9ad80c7ffbb7c3cd82b06cbed86f5eb33
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 16 14:33:31 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 16 15:08:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0261d9

dev-python/pypy: Restore Gentoo path patch

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

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

diff --git a/dev-python/pypy/files/7.0.0-gentoo-path.patch 
b/dev-python/pypy/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000..9be52cd0b75
--- /dev/null
+++ b/dev-python/pypy/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?= 
+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/pypy-7.0.0.ebuild 
b/dev-python/pypy/pypy-7.0.0-r1.ebuild
similarity index 98%
rename from dev-python/pypy/pypy-7.0.0.ebuild
rename to dev-python/pypy/pypy-7.0.0-r1.ebuild
index b3575616959..7a956b9f4a0 100644
--- a/dev-python/pypy/pypy-7.0.0.ebuild
+++ b/dev-python/pypy/pypy-7.0.0-r1.ebuild
@@ -99,9 +99,13 @@ 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
 
+   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

diff --git a/dev-python/pypy/pypy-.ebuild b/dev-python/pypy/pypy-.ebuild
index 762e9c5e7e9..708273fc4d5 100644
--- a/dev-python/pypy/pypy-.ebuild
+++ b/dev-python/pypy/pypy-.ebuild
@@ -105,9 +105,13 @@ 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
 
+   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



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

2017-10-15 Thread Michał Górny
commit: a2fa03f1dbd6cad2321215a91b29e1acf1b66505
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 15 09:29:17 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 15 09:38:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fa03f1

dev-python/pypy: Drop old

 dev-python/pypy/Manifest   |   3 -
 .../pypy/files/5.6.0_all_distutils_cxx.patch   | 340 --
 dev-python/pypy/files/5.7.1-kill-flto.patch|  27 --
 .../pypy/files/5.7.1_all_distutils_cxx.patch   | 388 -
 dev-python/pypy/metadata.xml   |   1 -
 dev-python/pypy/pypy-5.6.0.ebuild  | 267 --
 dev-python/pypy/pypy-5.7.1.ebuild  | 268 --
 7 files changed, 1294 deletions(-)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 6a21a59a297..3dd018ddb29 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,4 @@
-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 pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 
504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 
222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
 WHIRLPOOL 
775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 
de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512 
3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 WHIRLPOOL 
5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa
-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
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 
3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 WHIRLPOOL 
ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d

diff --git a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch 
b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d9c2cd1a5a..000
--- a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
-
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py 
pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
 pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py2016-11-08 
09:52:16.0 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py2016-12-08 
16:59:26.213690338 +0100
-@@ -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',
-+  

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

2017-10-09 Thread Michał Górny
commit: ccc170f64e0040984d5306106a1c395f330bebed
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Oct  5 17:40:25 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=ccc170f6

dev-python/pypy: Bump to 5.9.0

 dev-python/pypy/Manifest|  2 ++
 dev-python/pypy/files/5.9.0-shared-lib.patch| 12 
 dev-python/pypy/{pypy-.ebuild => pypy-5.9.0.ebuild} | 16 +---
 dev-python/pypy/pypy-.ebuild|  4 ++--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index e454f08ba6b..6a21a59a297 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,5 +1,7 @@
 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 pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 
504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 
222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
 WHIRLPOOL 
775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
+DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 
de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512 
3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 WHIRLPOOL 
5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa
 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
+DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 
3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 WHIRLPOOL 
ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d

diff --git a/dev-python/pypy/files/5.9.0-shared-lib.patch 
b/dev-python/pypy/files/5.9.0-shared-lib.patch
new file mode 100644
index 000..5d89d3b15a3
--- /dev/null
+++ b/dev-python/pypy/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/pypy/pypy-.ebuild 
b/dev-python/pypy/pypy-5.9.0.ebuild
similarity index 96%
copy from dev-python/pypy/pypy-.ebuild
copy to dev-python/pypy/pypy-5.9.0.ebuild
index eaf3b675ad2..0ac7919c6ef 100644
--- a/dev-python/pypy/pypy-.ebuild
+++ 

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

2017-04-25 Thread Michał Górny
commit: d97c60b5c1273e8e6b9899d54522ef5dbdd3866b
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 24 17:20:47 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 25 21:49:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97c60b5

dev-python/pypy: Bump  to EAPI 6

 dev-python/pypy/files/2.5.0-shared-lib.patch |  4 ++--
 dev-python/pypy/pypy-.ebuild | 18 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-python/pypy/files/2.5.0-shared-lib.patch 
b/dev-python/pypy/files/2.5.0-shared-lib.patch
index ddd74730f3d..b5c877bd58b 100644
--- a/dev-python/pypy/files/2.5.0-shared-lib.patch
+++ b/dev-python/pypy/files/2.5.0-shared-lib.patch
@@ -1,6 +1,6 @@
 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
+--- 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); }" > $@')

diff --git a/dev-python/pypy/pypy-.ebuild b/dev-python/pypy/pypy-.ebuild
index c6a8bd08960..c4d67f9bbc1 100644
--- a/dev-python/pypy/pypy-.ebuild
+++ b/dev-python/pypy/pypy-.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 pypy )
 EHG_REPO_URI="https://bitbucket.org/pypy/pypy;
-inherit check-reqs eutils mercurial multilib multiprocessing pax-utils 
python-any-r1 toolchain-funcs versionator
+inherit check-reqs mercurial multiprocessing pax-utils python-any-r1 
toolchain-funcs versionator
 
 # note: remember to update this to newest dev-lang/python:2.7 on bump
 CPY_PATCHSET_VERSION="2.7.13-0"
@@ -93,9 +93,9 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
-   
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 \
-   "${FILESDIR}"/2.5.0-shared-lib.patch# 517002
+   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
 
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-e "s^@libdir@^$(get_libdir)^" \
@@ -105,11 +105,11 @@ src_prepare() {
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
-   epatch "${FILESDIR}"/5.7.1_all_distutils_cxx.patch \
-   "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+   eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
+   eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
popd > /dev/null || die
 
-   epatch_user
+   eapply_user
 }
 
 src_configure() {
@@ -220,7 +220,7 @@ src_install() {
fi
 
# Install docs
-   use doc && dohtml -r pypy/doc/_build/html/
+   use doc && dodoc -r pypy/doc/_build/html
 
einfo "Generating caches and byte-compiling ..."
 



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

2017-04-25 Thread Michał Górny
commit: 63581c519419c7ef888b7e51f557af0afa99a922
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Apr 25 15:05:24 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 25 21:49:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63581c51

dev-python/pypy: Disarm implicit -flto (in )

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

diff --git a/dev-python/pypy/files/5.7.1-kill-flto.patch 
b/dev-python/pypy/files/5.7.1-kill-flto.patch
new file mode 100644
index 000..92395bdb6ca
--- /dev/null
+++ b/dev-python/pypy/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/pypy/pypy-.ebuild b/dev-python/pypy/pypy-.ebuild
index c4d67f9bbc1..4e672b8cf6b 100644
--- a/dev-python/pypy/pypy-.ebuild
+++ b/dev-python/pypy/pypy-.ebuild
@@ -96,6 +96,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/pypy/files/, dev-python/pypy/

2017-04-25 Thread Michał Górny
commit: 3fd6c1a1b17e9e90680e71b550d0dddc597378ee
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 24 17:12:08 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 25 21:49:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd6c1a1

dev-python/pypy: Update the distutils-cxx patch for upcoming 5.7.1

 .../pypy/files/5.7.1_all_distutils_cxx.patch   | 388 +
 dev-python/pypy/pypy-.ebuild   |   2 +-
 2 files changed, 389 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch 
b/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000..8249fbc91db
--- /dev/null
+++ b/dev-python/pypy/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?= 
+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 @@ 

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

2016-12-09 Thread Michał Górny
commit: 821aaac711cc96499f4483b6ce88cebfba239c9f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec  8 21:06:33 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec  9 18:10:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821aaac7

dev-python/pypy: Bump to 5.6.0, #599918

Bump to 5.6.0 release. Includes an updated C/C++ compiler support patch
by Jan Ziak.

 dev-python/pypy/Manifest   |   1 +
 .../pypy/files/5.6.0_all_distutils_cxx.patch   | 340 +
 dev-python/pypy/pypy-5.6.0.ebuild  | 256 
 3 files changed, 597 insertions(+)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 918ddca..3b75954 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,5 +5,6 @@ DIST pypy2-v5.3.0-src.tar.bz2 17361429 SHA256 
4142eb8f403810bc88a4911792bb5a502e
 DIST pypy2-v5.3.1-src.tar.bz2 17361760 SHA256 
31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e SHA512 
3138dde3cb1a155e389a2be615601e22f468d2bc77dd219a35b310052fa06f68f80c3ff62fa4d0a9179eae014ace18620d0a076a0528cb155b1c33cc94d6b397
 WHIRLPOOL 
518b73ec649673fb1fc333b5d0e7669f06e9569624e2f8b55dbbf24b5f109a3b9680ed1d45c6401eb62ee8761043ec9c38a33e6d396c39c3f2fb5ba30f15e93a
 DIST pypy2-v5.4.0-src.tar.bz2 17414795 SHA256 
d9568ebe9a14d0eaefde887d78f3cba63d665e95c0d234bb583932341f55a655 SHA512 
a989393f75ff45d6a8b8b2597c0a208559b3188ffdf65205ad491332f1836a86bbb419a3dfba67f80e5ab8d075aa97f44c63316f805a51d7ce1481e81b461373
 WHIRLPOOL 
623bbaed02214cbc2092abd163e102c11405f12b73dd2ace8098e08a415bd43a0bf13809913b56c378a8a688ff6ff561dc9a90bcd479de85bb301aa67c670d26
 DIST pypy2-v5.4.1-src.tar.bz2 17412285 SHA256 
45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352 SHA512 
a366457f5d1fc06dfb256256350b5f2e8e107fe9bc587acc291500ae8b03083788128681ebd5ae272a87b5b7c95abda0210ed7b5594e15f8f0a96a9ff4953375
 WHIRLPOOL 
1b84ed9a5df88f4ec7beebf75f86d02ddab2349e34c5516bf4ea21e0374dbb5520ca0c6c429b83262c63e6bc452a3270a4d79fec6b2caff7bc884d8103989acc
+DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 
7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 
a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de
 WHIRLPOOL 
896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 
c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 
5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056
 WHIRLPOOL 
f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 
e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 
f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52
 WHIRLPOOL 
305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77

diff --git a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch 
b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
new file mode 100644
index ..5d9c2cd
--- /dev/null
+++ b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
@@ -0,0 +1,340 @@
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py 
pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
+--- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py2016-11-08 
09:52:16.0 +0100
 pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py2016-12-08 
16:59:26.213690338 +0100
+@@ -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_'
+diff -Naur 

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

2015-11-27 Thread Michał Górny
commit: e1ac9809d47a37efdcc535cd6b6a6d41068833dc
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov 27 16:09:30 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Nov 27 16:11:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ac9809

dev-python/pypy: Remove old

 dev-python/pypy/Manifest   |   2 -
 .../pypy/files/2.3-21_all_distutils_c++.patch  | 321 -
 dev-python/pypy/files/2.3.1-shared-lib.patch   |  11 -
 dev-python/pypy/pypy-2.4.0.ebuild  | 233 ---
 dev-python/pypy/pypy-2.5.1.ebuild  | 233 ---
 5 files changed, 800 deletions(-)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 8a06322..f5e2f43 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,5 +1,3 @@
-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 python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 
c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 
5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056
 WHIRLPOOL 
f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9

diff --git a/dev-python/pypy/files/2.3-21_all_distutils_c++.patch 
b/dev-python/pypy/files/2.3-21_all_distutils_c++.patch
deleted file mode 100644
index 2787360..000
--- a/dev-python/pypy/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:
-+

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

2015-11-27 Thread Michał Górny
commit: ac802704f1c23ef89035b5a817ae4314ea1b5c0c
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov 27 16:13:31 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Nov 27 19:49:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac802704

dev-python/pypy: Apply full Gentoo path set, only 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

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

diff --git a/dev-python/pypy/files/1.9-scripts-location.patch 
b/dev-python/pypy/files/1.9-scripts-location.patch
deleted file mode 100644
index 7453908..000
--- a/dev-python/pypy/files/1.9-scripts-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib-python/2.7/distutils/command/install.py
-+++ b/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/files/4.0.0-gentoo-path.patch 
b/dev-python/pypy/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000..4d394f9
--- /dev/null
+++ b/dev-python/pypy/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/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/pypy-2.6.0.ebuild 
b/dev-python/pypy/pypy-2.6.0-r1.ebuild
similarity index 97%
rename from dev-python/pypy/pypy-2.6.0.ebuild
rename to dev-python/pypy/pypy-2.6.0-r1.ebuild
index 779b81c..4058bf0 100644
--- a/dev-python/pypy/pypy-2.6.0.ebuild
+++ b/dev-python/pypy/pypy-2.6.0-r1.ebuild
@@ -85,10 +85,14 @@ 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"
 \
"${FILESDIR}"/2.5.0-shared-lib.patch# 517002
 
+   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/pypy-4.0.0.ebuild