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

2020-04-12 Thread Michał Górny 
commit: 1aafbb4cdaf3067e41a772660b28dc1843ae4e8d
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 12 10:34:41 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 12 11:29:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aafbb4c

dev-lang/python: Fix test failure due to importing numpy in 3.8+

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

 dev-lang/python/files/test-__all__-numpy.patch | 13 +
 dev-lang/python/python-3.8.2-r1.ebuild |  2 ++
 dev-lang/python/python-3.9.0_alpha5.ebuild |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/dev-lang/python/files/test-__all__-numpy.patch 
b/dev-lang/python/files/test-__all__-numpy.patch
new file mode 100644
index 000..1b91abbf6f6
--- /dev/null
+++ b/dev-lang/python/files/test-__all__-numpy.patch
@@ -0,0 +1,13 @@
+diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
+index c077881511..0728bef6c4 100644
+--- a/Lib/test/test___all__.py
 b/Lib/test/test___all__.py
+@@ -71,6 +71,8 @@ class AllTest(unittest.TestCase):
+ blacklist = set([
+ # Will raise a SyntaxError when compiling the exec statement
+ '__future__',
++# imports numpy which causes warnings
++'test.test_pickletools',
+ ])
+ 
+ if not sys.platform.startswith('java'):

diff --git a/dev-lang/python/python-3.8.2-r1.ebuild 
b/dev-lang/python/python-3.8.2-r1.ebuild
index 35d43534599..d6b9c2e9ec3 100644
--- a/dev-lang/python/python-3.8.2-r1.ebuild
+++ b/dev-lang/python/python-3.8.2-r1.ebuild
@@ -67,6 +67,8 @@ src_prepare() {
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
"${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
+   # add module importing numpy to blacklist
+   "${FILESDIR}/test-__all__-numpy.patch"
)
 
default

diff --git a/dev-lang/python/python-3.9.0_alpha5.ebuild 
b/dev-lang/python/python-3.9.0_alpha5.ebuild
index 49d4c9d5f87..2e9353ebaf6 100644
--- a/dev-lang/python/python-3.9.0_alpha5.ebuild
+++ b/dev-lang/python/python-3.9.0_alpha5.ebuild
@@ -83,6 +83,8 @@ src_prepare() {
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
"${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
+   # add module importing numpy to blacklist
+   "${FILESDIR}/test-__all__-numpy.patch"
)
 
default

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

2020-04-04 Thread Mike Gilbert 
commit: 4ddeacea98c15971264056972cd6d03631c73aca
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr  4 18:21:50 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr  4 18:22:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ddeacea

dev-lang/python: ignore EACCES instead of EPERM

Fixes: 212bc8ce91237d28de326e84ff8607863602d1f7
Closes: https://bugs.gentoo.org/679628
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert  gentoo.org>

 ...ore-EPERM.patch => test.support.unlink-ignore-EACCES.patch} | 10 +-
 dev-lang/python/python-2.7.17-r2.ebuild|  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch 
b/dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
similarity index 76%
rename from dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
rename to dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
index 291398137c7..865a914b410 100644
--- a/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
+++ b/dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
@@ -1,7 +1,7 @@
-From 789c61e1a1966241d274012cdbd5fb9716448952 Mon Sep 17 00:00:00 2001
+From b8dc49c87f29fa875bd24fe47c741d11962a33b6 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert 
-Date: Fri, 3 Apr 2020 10:37:56 -0400
-Subject: [PATCH] test.support.unlink: ignore EPERM
+Date: Sat, 4 Apr 2020 14:11:25 -0400
+Subject: [PATCH] test.support.unlink: ignore EACCES
 
 Resolves test errors when running in the Gentoo sandbox environment.
 
@@ -11,7 +11,7 @@ Bug: https://bugs.gentoo.org/679628
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index ccc11c1b4b0..c5ec06bb420 100644
+index ccc11c1b4b0..d47bdebda5c 100644
 --- a/Lib/test/support/__init__.py
 +++ b/Lib/test/support/__init__.py
 @@ -291,7 +291,7 @@ def unlink(filename):
@@ -19,7 +19,7 @@ index ccc11c1b4b0..c5ec06bb420 100644
  _unlink(filename)
  except OSError as exc:
 -if exc.errno not in (errno.ENOENT, errno.ENOTDIR):
-+if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EPERM):
++if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EACCES):
  raise
  
  def rmdir(dirname):

diff --git a/dev-lang/python/python-2.7.17-r2.ebuild 
b/dev-lang/python/python-2.7.17-r2.ebuild
index c38022f956b..7cb8c9b155e 100644
--- a/dev-lang/python/python-2.7.17-r2.ebuild
+++ b/dev-lang/python/python-2.7.17-r2.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
-   "${FILESDIR}/test.support.unlink-ignore-EPERM.patch"
+   "${FILESDIR}/test.support.unlink-ignore-EACCES.patch"
)
 
default

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

2020-04-03 Thread Mike Gilbert 
commit: 212bc8ce91237d28de326e84ff8607863602d1f7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Apr  3 14:54:43 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr  3 14:55:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212bc8ce

dev-lang/python: ignore EPERM in test.support.unlink()

Closes: https://bugs.gentoo.org/679628
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/test.support.unlink-ignore-EPERM.patch   | 28 ++
 ...est.support.unlink-ignore-PermissionError.patch | 28 ++
 dev-lang/python/python-2.7.17-r1.ebuild|  1 +
 dev-lang/python/python-3.6.10.ebuild   |  1 +
 dev-lang/python/python-3.7.6.ebuild|  1 +
 dev-lang/python/python-3.7.7.ebuild|  1 +
 dev-lang/python/python-3.8.2.ebuild|  1 +
 dev-lang/python/python-3.9.0_alpha4.ebuild |  1 +
 dev-lang/python/python-3.9.0_alpha5.ebuild |  1 +
 9 files changed, 63 insertions(+)

diff --git a/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch 
b/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
new file mode 100644
index 000..291398137c7
--- /dev/null
+++ b/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
@@ -0,0 +1,28 @@
+From 789c61e1a1966241d274012cdbd5fb9716448952 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 3 Apr 2020 10:37:56 -0400
+Subject: [PATCH] test.support.unlink: ignore EPERM
+
+Resolves test errors when running in the Gentoo sandbox environment.
+
+Bug: https://bugs.gentoo.org/679628
+---
+ Lib/test/support/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index ccc11c1b4b0..c5ec06bb420 100644
+--- a/Lib/test/support/__init__.py
 b/Lib/test/support/__init__.py
+@@ -291,7 +291,7 @@ def unlink(filename):
+ try:
+ _unlink(filename)
+ except OSError as exc:
+-if exc.errno not in (errno.ENOENT, errno.ENOTDIR):
++if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EPERM):
+ raise
+ 
+ def rmdir(dirname):
+-- 
+2.26.0
+

diff --git 
a/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch 
b/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch
new file mode 100644
index 000..6cae17b5518
--- /dev/null
+++ b/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch
@@ -0,0 +1,28 @@
+From 6e6402caa7962a9c9f7c5327f3c802545824f7f9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 3 Apr 2020 10:37:56 -0400
+Subject: [PATCH] test.support.unlink: ignore PermissionError
+
+Resolves test errors when running in the Gentoo sandbox environment.
+
+Bug: https://bugs.gentoo.org/679628
+---
+ Lib/test/support/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index 1f792d8514d..a0772480eb4 100644
+--- a/Lib/test/support/__init__.py
 b/Lib/test/support/__init__.py
+@@ -488,7 +488,7 @@ else:
+ def unlink(filename):
+ try:
+ _unlink(filename)
+-except (FileNotFoundError, NotADirectoryError):
++except (FileNotFoundError, NotADirectoryError, PermissionError):
+ pass
+ 
+ def rmdir(dirname):
+-- 
+2.26.0
+

diff --git a/dev-lang/python/python-2.7.17-r1.ebuild 
b/dev-lang/python/python-2.7.17-r1.ebuild
index 87a23fa5fb6..f38156d7d51 100644
--- a/dev-lang/python/python-2.7.17-r1.ebuild
+++ b/dev-lang/python/python-2.7.17-r1.ebuild
@@ -88,6 +88,7 @@ src_prepare() {
 
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
+   "${FILESDIR}/test.support.unlink-ignore-EPERM.patch"
)
 
default

diff --git a/dev-lang/python/python-3.6.10.ebuild 
b/dev-lang/python/python-3.6.10.ebuild
index fabe76bc113..c572c8146d0 100644
--- a/dev-lang/python/python-3.6.10.ebuild
+++ b/dev-lang/python/python-3.6.10.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
 
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
+   "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
)
 
default

diff --git a/dev-lang/python/python-3.7.6.ebuild 
b/dev-lang/python/python-3.7.6.ebuild
index 35666215d46..8f29c79414d 100644
--- a/dev-lang/python/python-3.7.6.ebuild
+++ b/dev-lang/python/python-3.7.6.ebuild
@@ -66,6 +66,7 @@ src_prepare() {
 
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
+   "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
)
 
default

diff --git a/dev-lang/python/python-3.7.7.ebuild 
b/dev-lang/python/python-3.7.7.ebuild
index 07492f4fb2a..d57ddee45e6 100644
--- a/dev-lang/python/python-3.7.7.ebuild
+++ b/dev-lang/python/python-3.7.7.ebuild
@@ -66,6 +66,7 @@ src_prepare() {
 
local PATCHES=(

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

2020-03-07 Thread Michał Górny 
commit: 7fc5957ee0cb88e607f4c1988d91a07cebaf6d96
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Mar  7 15:39:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  7 15:39:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc5957e

dev-lang/python: Remove redundant versions

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

 dev-lang/python/Manifest   |   7 -
 .../python-2.7.10-cross-compile-warn-test.patch|  24 --
 .../python/files/python-2.7.10-system-libffi.patch |  36 --
 .../files/python-2.7.5-nonfatal-compileall.patch   |  18 -
 .../files/python-2.7.9-ncurses-pkg-config.patch|  13 -
 dev-lang/python/files/python-3.7.5-hashlib.patch   |  25 --
 dev-lang/python/python-2.7.17.ebuild   | 361 -
 dev-lang/python/python-3.6.9.ebuild| 348 
 dev-lang/python/python-3.7.5-r1.ebuild | 328 ---
 dev-lang/python/python-3.8.1.ebuild| 343 
 dev-lang/python/python-3.9.0_alpha2.ebuild | 324 --
 11 files changed, 1827 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d98cd07888d..84e356a15b4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,17 +1,10 @@
 DIST Python-2.7.17.tar.xz 12855568 BLAKE2B 
6d09214a51d6595fe5253a279ee556d7510dcb9a0e8ad71e9cf73b4fb00c3abd3680e2429f4f87d9387d1fc16d4887f5f33fc600b24b0ca2c70f36bf34df2157
 SHA512 
2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a
 DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 
822e231cf2755e6477e49e9128a983185a4f1e30e9d6c221f1b5720891c0de345e8c5402af458d3627eba124e75fea4b5daa94e01b0eaddc116dc3281263ecbe
 SHA512 
26147099e1f1a0ffc85febad26e18e991f019599a150887ea0b925e34663fad8e03b3c2a941e2770c1a63960695e173ef32709572c9361e7f2cb862ccf75b28a
-DIST Python-3.6.9.tar.xz 17212164 BLAKE2B 
ef33dbc1ea3bbeaf92092de867279d759e3a204ca4e8bf0e5c6a1adbb17a9220d8829245fa9f067ec6497a5789a4f60b8db8c727bb2bd8126df470921d552a53
 SHA512 
05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819
-DIST Python-3.7.5.tar.xz 17236432 BLAKE2B 
fb49a3bfd9b1944d567a45682f789ef840e63ed610e0dddb5695da7a84a0bcb50a6fa52097722f09b57d6fc15a5f89aeaa46a061125219e597897086f3dffe40
 SHA512 
f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414
 DIST Python-3.7.6.tar.xz 17246360 BLAKE2B 
b83a440a1ad5b1a2210e03be0522d39f53778774ea725fa41b28cccfcdf007996f1a1d3cb95f8040b71b692189e28db67ba6ec136af82158363a1aadbba6
 SHA512 
5be022c384728b0c6709d165486f66226d126c521b466ed24d0c4c3c5910ec786a734f4c2c916ac409213c54a492b9fb230fb721c41e3de281676a7e9d8f3171
-DIST Python-3.8.1.tar.xz 17828408 BLAKE2B 
db1841625de89b812cadcd538a990401a4e49d43968dce733c289121e9de9749eaf39e1c772a32e10ed2b40bef215b19ae9c7d88e0ec9e99cd3d467406ea063c
 SHA512 
d41381848cc1ec8009643b71875f395a9ac2c8e12a5b1efef33caf8a9e99a337c790d4354695c85352d11b62092ae372b5af62f78724363fcbf3504ff9a6ddca
 DIST Python-3.8.2.tar.xz 17869888 BLAKE2B 
f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4
 SHA512 
ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
-DIST Python-3.9.0a2.tar.xz 17988748 BLAKE2B 
3d6a6facacb49d8eeaf01c3194bad8e6c920bd03a8f50ac171016fd61288120dfa06af50583c647e5850b5965fc41e03515042ef1594ec4dcbf39794e999b61a
 SHA512 
3f17869f3ca4db423f66e145e67c9fb4935d8c908c5362de585898343190edb901861701e27ab9187a287880ee42bbb4897aa298967c1862f44b12dbab19d412
 DIST Python-3.9.0a4.tar.xz 18032300 BLAKE2B 
1c9ad55c7c055c3a704c4062e092d44b8d778e334e05589e7166777da328df54ef257aeb2e203416710bb9f9f1571d7700c2c12aed5b8e63adf7a1b3aedb08b5
 SHA512 
8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B 
f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8
 SHA512 
ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
-DIST python-gentoo-patches-2.7.17.tar.xz 13476 BLAKE2B 
788688e2941d2d6d4f768168881b2c3639213a97e214557b3a93f8db44d81e2b6d70be847b7462e54e3786660ebee4ee331402081d92167d74ad149279c3f389
 SHA512 
1641737635d33607a77ed2ee2462854cec603be39737de3f81abb188702aaf46f039d1616f9dcd413da1f4a8040175c66a2883e496132c2e4ebe8f860b36f9f1
 DIST python-gentoo-patches-3.6.10.tar.xz 10964 BLAKE2B 
e32c8cb3050c7324ee234f585be7fc40cfacc6ad87759eaa300e57289e6dc6cbaed3913f33ad632b8754638e8d71983d8364ceeaad8ef325cfa6d4d2dfb56df0

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

2020-01-03 Thread Michał Górny 
commit: 752d072cccd6a048f78ed59eb1a45a07f6d22e8a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  3 08:13:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  3 08:27:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752d072c

dev-lang/python: Remove 3.5*

Python 3.5 is no longer supported.  A clean ebuild for the interpreter
now resides in ::python.

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

 dev-lang/python/Manifest   |   3 -
 dev-lang/python/files/3.6-disable-nis.patch|  21 --
 .../files/python-3.4.3-ncurses-pkg-config.patch|  13 -
 .../files/python-3.5-distutils-OO-build.patch  |  80 -
 .../python/files/python-3.5.5-hash-unaligned.patch |  43 ---
 dev-lang/python/python-3.5.7.ebuild| 367 -
 dev-lang/python/python-3.5.9.ebuild| 367 -
 7 files changed, 894 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5cce34e4461..9a8ed640988 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,7 +1,5 @@
 DIST Python-2.7.16.tar.xz 12752104 BLAKE2B 
7d6b5b853f9974d44e04dd35ecdffaab87511e183b4b01dd4f8f4ee109c4b4ab208f045708f69717be9d3a706aa078b71438ed482c062c0b89c12730eae074ae
 SHA512 
16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0
 DIST Python-2.7.17.tar.xz 12855568 BLAKE2B 
6d09214a51d6595fe5253a279ee556d7510dcb9a0e8ad71e9cf73b4fb00c3abd3680e2429f4f87d9387d1fc16d4887f5f33fc600b24b0ca2c70f36bf34df2157
 SHA512 
2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a
-DIST Python-3.5.7.tar.xz 15324736 BLAKE2B 
0f1dd80584385b7f859652c85dc6b51bf71cd9f1d53fcf1716c54e8ffc3d2a36ef9969956e4429ac1ba878dad1e9acbb5f82ddb6a9923886bf3c84b3327dfecb
 SHA512 
83f57451e1d7082bf19e4e49a0902e9257e381836d9a04154a6b276135fa49e5c96b6869eed9ec4475e06b76556c1ae89f5cca111b762eb8b2dee6f65373e0f4
-DIST Python-3.5.9.tar.xz 15388876 BLAKE2B 
6086ed2350b6dce3203360f24c2fddf77df65a5815d6da019809796b30c2f43440a9e349c7defd0187cfc3a50a387352dfa63594c2ec513dd6bf585e7c34ec51
 SHA512 
58127793adef42ed57ae4d56338268866e14c2d084f09f57f26fc6b1c9454e70cc6d3dffc638f8d56f182acc0884021a4dbb578f312dd6fc01995fa85e31377e
 DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 
822e231cf2755e6477e49e9128a983185a4f1e30e9d6c221f1b5720891c0de345e8c5402af458d3627eba124e75fea4b5daa94e01b0eaddc116dc3281263ecbe
 SHA512 
26147099e1f1a0ffc85febad26e18e991f019599a150887ea0b925e34663fad8e03b3c2a941e2770c1a63960695e173ef32709572c9361e7f2cb862ccf75b28a
 DIST Python-3.6.9.tar.xz 17212164 BLAKE2B 
ef33dbc1ea3bbeaf92092de867279d759e3a204ca4e8bf0e5c6a1adbb17a9220d8829245fa9f067ec6497a5789a4f60b8db8c727bb2bd8126df470921d552a53
 SHA512 
05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819
 DIST Python-3.7.5.tar.xz 17236432 BLAKE2B 
fb49a3bfd9b1944d567a45682f789ef840e63ed610e0dddb5695da7a84a0bcb50a6fa52097722f09b57d6fc15a5f89aeaa46a061125219e597897086f3dffe40
 SHA512 
f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414
@@ -10,7 +8,6 @@ DIST Python-3.8.1.tar.xz 17828408 BLAKE2B 
db1841625de89b812cadcd538a990401a4e49d
 DIST python-gentoo-patches-2.7.16.tar.xz 13904 BLAKE2B 
218b46f8656f4a792dcd47eabca6d59a1558276b77676544991ee75914cd76dda84c36f43e72e477b850dd4cb52374d289f20dccd244a3b52ae5debaf3363432
 SHA512 
83f90545231c663a34c6925352a357a2b15997ac0362578a1893304c5070b5251922585ae8bc1bafb68d306bcddd4cdba4b6406648d473bd3e980eef65fe3ecd
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B 
f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8
 SHA512 
ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.17.tar.xz 13476 BLAKE2B 
788688e2941d2d6d4f768168881b2c3639213a97e214557b3a93f8db44d81e2b6d70be847b7462e54e3786660ebee4ee331402081d92167d74ad149279c3f389
 SHA512 
1641737635d33607a77ed2ee2462854cec603be39737de3f81abb188702aaf46f039d1616f9dcd413da1f4a8040175c66a2883e496132c2e4ebe8f860b36f9f1
-DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 
4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d
 SHA512 
d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
 DIST python-gentoo-patches-3.6.10.tar.xz 10964 BLAKE2B 
e32c8cb3050c7324ee234f585be7fc40cfacc6ad87759eaa300e57289e6dc6cbaed3913f33ad632b8754638e8d71983d8364ceeaad8ef325cfa6d4d2dfb56df0
 SHA512

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

2019-10-18 Thread Mike Gilbert 
commit: 838b6612b964efa1ceba6bdd548cff6fb9da68c3
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct 19 01:05:37 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 19 01:05:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838b6612

dev-lang/python: re-enable all openssl algorithms

Package-Manager: Portage-2.3.77_p5, Repoman-2.3.17_p81
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-lang/python/files/python-3.7.5-hashlib.patch |  25 ++
 dev-lang/python/python-3.7.5-r1.ebuild   | 329 +++
 2 files changed, 354 insertions(+)

diff --git a/dev-lang/python/files/python-3.7.5-hashlib.patch 
b/dev-lang/python/files/python-3.7.5-hashlib.patch
new file mode 100644
index 000..a70a4796310
--- /dev/null
+++ b/dev-lang/python/files/python-3.7.5-hashlib.patch
@@ -0,0 +1,25 @@
+From 2c0c356ca109d1550bfb09b0da7dec3f80db77a3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 18 Oct 2019 16:39:16 -0400
+Subject: [PATCH] Call OPENSSL_init_crypto for openssl >= 1.1.0
+
+---
+ Modules/_hashopenssl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
+index b13ade60496..8abbde5120f 100644
+--- a/Modules/_hashopenssl.c
 b/Modules/_hashopenssl.c
+@@ -1077,6 +1077,8 @@ PyInit__hashlib(void)
+ /* Load all digest algorithms and initialize cpuid */
+ OPENSSL_add_all_algorithms_noconf();
+ ERR_load_crypto_strings();
++#else
++
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|OPENSSL_INIT_ADD_ALL_DIGESTS, 
NULL);
+ #endif
+ 
+ /* TODO build EVP_functions openssl_* entries dynamically based
+-- 
+2.23.0
+

diff --git a/dev-lang/python/python-3.7.5-r1.ebuild 
b/dev-lang/python/python-3.7.5-r1.ebuild
new file mode 100644
index 000..fb27d536f6e
--- /dev/null
+++ b/dev-lang/python/python-3.7.5-r1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.7.4-1"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/;
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz;
+
+LICENSE="PSF-2"
+SLOT="3.7/3.7m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline 
sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+   app-arch/xz-utils:0=
+   sys-apps/util-linux:0=
+   >=sys-libs/zlib-1.1.3:0=
+   virtual/libffi:=
+   virtual/libintl
+   gdbm? ( sys-libs/gdbm:0=[berkdb] )
+   ncurses? ( >=sys-libs/ncurses-5.2:0= )
+   readline? ( >=sys-libs/readline-4.1:0= )
+   sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   tk? (
+   >=dev-lang/tcl-8.0:0=
+   >=dev-lang/tk-8.0:0=
+   dev-tcltk/blt:0=
+   dev-tcltk/tix
+   )
+   xml? ( >=dev-libs/expat-2.1:0= )
+   !!https://bugs.gentoo.org/show_bug.cgi?id=50309
+   if is-flagq -O3; then
+   is-flagq -fstack-protector-all && replace-flags -O3 -O2
+   use hardened && replace-flags -O3 -O2
+   fi
+
+   # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+   tc-export CXX
+
+   # Set LDFLAGS so we link modules with -lpython3.2 correctly.
+   # Needed on FreeBSD unless Python 3.2 is already installed.
+   # Please query BSD team before removing this!
+   append-ldflags "-L."
+
+   # Fix implicit declarations on cross and prefix builds. Bug #674070.
+   use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+   local dbmliborder
+   if use gdbm; then
+   dbmliborder+="${dbmliborder:+:}gdbm"
+   fi
+
+   local myeconfargs=(
+   --enable-shared
+   $(use_enable ipv6)
+   --infodir='${prefix}/share/info'
+   --mandir='${prefix}/share/man'
+   --with-computed-gotos
+   --with-dbmliborder="${dbmliborder}"
+   --with-libc=
+   --enable-loadable-sqlite-extensions
+   --without-ensurepip
+   --with-system-expat
+   --with-system-ffi
+   )
+
+   OPT="" econf

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

2018-04-13 Thread Aaron Bauman 
commit: f2a1e08538c931af0ff6252fa6051340bef3e5a2
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Apr 13 17:34:44 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Apr 13 19:33:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a1e085

dev-lang/python: compatibility patch for libressl

This patch fixes building with >=dev-libs/libressl-2.7. Additionally,
the slot and subslot modifier have been updated to ensure rebuilds are
properly triggered. Patch is from upstream commit
4ca0739c9d97ac7cd45499e0d31be68dc659d0e1.

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7971

 .../files/python-2.7-libressl-compatibility.patch  | 92 ++
 dev-lang/python/python-2.7.14-r1.ebuild|  3 +-
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/dev-lang/python/files/python-2.7-libressl-compatibility.patch 
b/dev-lang/python/files/python-2.7-libressl-compatibility.patch
new file mode 100644
index 000..c9e7a8458e3
--- /dev/null
+++ b/dev-lang/python/files/python-2.7-libressl-compatibility.patch
@@ -0,0 +1,92 @@
+# From https://github.com/python/cpython/pull/6215
+
+# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
+# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
+# LibreSSL < 2.7.
+
+# Documentation updates and fixes for failing tests will be provided in
+# another patch set.
+
+# Signed-off-by: Christian Heimes christ...@python.org.
+# (cherry picked from commit 4ca0739)
+
+#Co-authored-by: Christian Heimes christ...@python.org
+
+--- a/Modules/_ssl.c   2017-09-16 17:38:35.0 +
 b/Modules/_ssl.c   2018-04-13 15:55:10.919424126 +
+@@ -97,6 +102,12 @@
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1010L) && 
!defined(LIBRESSL_VERSION_NUMBER)
+ #  define OPENSSL_VERSION_1_1 1
++#  define PY_OPENSSL_1_1_API 1
++#endif
++
++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x207fL
++#  define PY_OPENSSL_1_1_API 1
+ #endif
+ 
+ /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
+@@ -118,24 +129,44 @@
+ #endif
+ 
+ /* ALPN added in OpenSSL 1.0.2 */
+-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 
0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+-# define HAVE_ALPN
++#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
++# define HAVE_ALPN 1
++#else
++# define HAVE_ALPN 0
++#endif
++
++/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped
++ * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility
++ * reasons. The check for TLSEXT_TYPE_next_proto_neg works with
++ * OpenSSL 1.0.1+ and LibreSSL.
++ * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg.
++ */
++#ifdef OPENSSL_NO_NEXTPROTONEG
++# define HAVE_NPN 0
++#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && 
!defined(LIBRESSL_VERSION_NUMBER)
++# define HAVE_NPN 0
++#elif defined(TLSEXT_TYPE_next_proto_neg)
++# define HAVE_NPN 1
++#else
++# define HAVE_NPN 0
+ #endif
+ 
+ #ifndef INVALID_SOCKET /* MS defines this */
+ #define INVALID_SOCKET (-1)
+ #endif
+ 
+-#ifdef OPENSSL_VERSION_1_1
+-/* OpenSSL 1.1.0+ */
+-#ifndef OPENSSL_NO_SSL2
+-#define OPENSSL_NO_SSL2
+-#endif
+-#else /* OpenSSL < 1.1.0 */
+-#if defined(WITH_THREAD)
++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
+ #define HAVE_OPENSSL_CRYPTO_LOCK
+ #endif
+ 
++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
++#define OPENSSL_NO_SSL2
++#endif
++
++#ifndef PY_OPENSSL_1_1_API
++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
++
+ #define TLS_method SSLv23_method
+ 
+ static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
+@@ -178,7 +209,7 @@
+ {
+ return store->param;
+ }
+-#endif /* OpenSSL < 1.1.0 or LibreSSL */
++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
+ 
+ 
+ enum py_ssl_error {

diff --git a/dev-lang/python/python-2.7.14-r1.ebuild 
b/dev-lang/python/python-2.7.14-r1.ebuild
index 7a006eb67d7..f5e6506189e 100644
--- a/dev-lang/python/python-2.7.14-r1.ebuild
+++ b/dev-lang/python/python-2.7.14-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="app-arch/bzip2:0=
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
ssl? (
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   libressl? ( dev-libs/libressl:0= )
)
tk? (
>=dev-lang/tcl-8.0:0=
@@ -102,6 +102,7 @@ src_prepare() {
epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
epatch "${FILESDIR}/2.7-disable-nis.patch"
+   epatch "${FILESDIR}/python-2.7-libressl-compatibility.patch"
 
epatch_user

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

2018-04-01 Thread Mike Gilbert 
commit: c380580255f99b84574ea57470ac217af9aaa35f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Apr  1 17:18:02 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Apr  1 17:18:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3805802

dev-lang/python: bump to 3.6.5

Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81

 dev-lang/python/Manifest  |   1 +
 dev-lang/python/files/3.6.5-disable-nis.patch |  11 +
 dev-lang/python/python-3.6.5.ebuild   | 346 ++
 3 files changed, 358 insertions(+)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 4928ff20ac6..484ccefe0f4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -6,6 +6,7 @@ DIST Python-3.5.4.tar.xz 15332320 BLAKE2B 
1fc3ba4eb1ed949062961c13fd1f9851c7f9cb
 DIST Python-3.5.5.tar.xz 15351440 BLAKE2B 
217cb7f51e04d57983ce053ff4276d056e17c8223b6f3d87b69f556453fe2ae3d4dc2c1a6b9c2c6aad033cea9b40cd32264d8208cc81a1ec34ff252379bf95b8
 SHA512 
c9056baee6a2d1fe7f14b1f310db95b78e8972766d086f8ae10954f38f8182956171580bde01ddadebe897f2545a6fbe47669ca3e4887026ac1fae5ee9197f22
 DIST Python-3.6.3.tar.xz 16974296 BLAKE2B 
8220fc0c2eaa315d3972085b0f531f169adb6cfad57023ad2c115603b5a484573ea3540eb3216edd0f4514256c8edb07469cf38d17727d69cdc15cdf1f601623
 SHA512 
32f24a3adcb7880003c7ecdc5e53e838e774adda76b308961d8215e28db630b2fa2828097817924c76afa4212b2df3362eb64d4e10f37c0147f512ec5aa8662b
 DIST Python-3.6.4.tar.xz 16992824 BLAKE2B 
2347a70bb25468221178b1542ddd4376f136a515f2873ee1f640c4629eb77a9608af0f6be37128ba3e8ad614ebc17e7be20b73384983533aa77bca4403ea7935
 SHA512 
09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2
+DIST Python-3.6.5.tar.xz 17049912 BLAKE2B 
f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889
 SHA512 
6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 
0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad
 SHA512 
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 BLAKE2B 
7fb3cc7dcd987debd5aa263d8e26b21aad439d8e3177c06c3683406a53bbda9652175673b09b6300f6a5b62148190cd8a75c9b65a5de04d770866733fcc0ebcb
 SHA512 
108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8
 DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 BLAKE2B 
2a636f5500f4c7d354f421133f086cba9a25c30d5feaaa2dc25c9c588125d7c9097baecaa11f31548fa598b5dc137ca310ad86222510c0a955fa632a6d0a4b06
 SHA512 
41c22dc8f1db8800fc0b97eed2b27bf1873e5de1369bd4aecf7a7a91e609a78e45a4b56fc89d575317f33a7704c0c1cad1494e8a993415a198f256e8338f49ab

diff --git a/dev-lang/python/files/3.6.5-disable-nis.patch 
b/dev-lang/python/files/3.6.5-disable-nis.patch
new file mode 100644
index 000..3937c6fe795
--- /dev/null
+++ b/dev-lang/python/files/3.6.5-disable-nis.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
 b/setup.py
+@@ -1364,7 +1364,7 @@ class PyBuildExt(build_ext):
+ else:
+ missing.extend(['resource', 'termios'])
+ 
+-nis = self._detect_nis(inc_dirs, lib_dirs)
++nis = None
+ if nis is not None:
+ exts.append(nis)
+ else:

diff --git a/dev-lang/python/python-3.6.5.ebuild 
b/dev-lang/python/python-3.6.5.ebuild
new file mode 100644
index 000..b3c248f7363
--- /dev/null
+++ b/dev-lang/python/python-3.6.5.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.6.4"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/;
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz;
+
+LICENSE="PSF-2"
+SLOT="3.6/3.6m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite 
+ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+

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

2017-07-30 Thread Mike Gilbert 
commit: 61958b88555c08f099c70d0b1989b86bcd3f2465
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul 30 15:23:27 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul 30 15:26:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61958b88

dev-lang/python: fix build failure in blake2 module

Thanks to Johannes Hirte for the simple solution.

Bug: https://bugs.gentoo.org/608586
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1

 dev-lang/python/files/3.6-blake2.patch | 37 ++
 dev-lang/python/python-3.6.1-r1.ebuild |  1 +
 2 files changed, 38 insertions(+)

diff --git a/dev-lang/python/files/3.6-blake2.patch 
b/dev-lang/python/files/3.6-blake2.patch
new file mode 100644
index 000..48ee5855952
--- /dev/null
+++ b/dev-lang/python/files/3.6-blake2.patch
@@ -0,0 +1,37 @@
+From 2e7c906c085a01ea8175a19e1e143257abc8f566 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sun, 30 Jul 2017 11:17:39 -0400
+Subject: [PATCH] blake2: remove commented code
+
+The nested comments cause a build failure.
+
+Bug: https://bugs.gentoo.org/608586
+---
+ Modules/_blake2/impl/blake2s-load-xop.h | 11 ---
+ 1 file changed, 11 deletions(-)
+
+diff --git a/Modules/_blake2/impl/blake2s-load-xop.h 
b/Modules/_blake2/impl/blake2s-load-xop.h
+index a3b5d65e2d..7e76c399c6 100644
+--- a/Modules/_blake2/impl/blake2s-load-xop.h
 b/Modules/_blake2/impl/blake2s-load-xop.h
+@@ -18,17 +18,6 @@
+ 
+ #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */
+ 
+-/* Basic VPPERM emulation, for testing purposes */
+-/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const 
__m128i sel)
+-{
+-   const __m128i sixteen = _mm_set1_epi8(16);
+-   const __m128i t0 = _mm_shuffle_epi8(src1, sel);
+-   const __m128i s1 = _mm_shuffle_epi8(src2, _mm_sub_epi8(sel, sixteen));
+-   const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen),
+- _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) 
= 0xff : 00 */
+-   return _mm_blendv_epi8(t0, s1, mask);
+-}*/
+-
+ #define LOAD_MSG_0_1(buf) \
+ buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) );
+ 
+-- 
+2.13.3
+

diff --git a/dev-lang/python/python-3.6.1-r1.ebuild 
b/dev-lang/python/python-3.6.1-r1.ebuild
index eef0e26c7dc..ef6e62034cd 100644
--- a/dev-lang/python/python-3.6.1-r1.ebuild
+++ b/dev-lang/python/python-3.6.1-r1.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"
epatch "${FILESDIR}/3.6.1-test_socket-AEAD.patch"
+   epatch "${FILESDIR}/3.6-blake2.patch"
 
epatch_user

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

2016-06-06 Thread Michał Górny 
commit: ea1d100da4d130d0493025cfebf6f56905f6a837
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jun  5 06:48:13 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jun  6 19:40:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1d100d

dev-lang/python: Fix distutils to compile .opt-1 & .opt-2 in 3.5

 .../files/python-3.5-distutils-OO-build.patch  |  80 +
 dev-lang/python/python-3.5.1-r3.ebuild | 360 +
 2 files changed, 440 insertions(+)

diff --git a/dev-lang/python/files/python-3.5-distutils-OO-build.patch 
b/dev-lang/python/files/python-3.5-distutils-OO-build.patch
new file mode 100644
index 000..8af8c30
--- /dev/null
+++ b/dev-lang/python/files/python-3.5-distutils-OO-build.patch
@@ -0,0 +1,80 @@
+From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Sun, 5 Jun 2016 08:18:01 +0200
+Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
+
+Bug: http://bugs.python.org/issue27226
+Bug: https://bugs.gentoo.org/585060
+---
+ Lib/distutils/command/build_py.py|  8 
+ Lib/distutils/command/install_lib.py | 12 ++--
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Lib/distutils/command/build_py.py 
b/Lib/distutils/command/build_py.py
+index cf0ca57..838d4e4 100644
+--- a/Lib/distutils/command/build_py.py
 b/Lib/distutils/command/build_py.py
+@@ -315,9 +315,9 @@ class build_py (Command):
+ if self.compile:
+ outputs.append(importlib.util.cache_from_source(
+ filename, optimization=''))
+-if self.optimize > 0:
++for opt in range(1, self.optimize + 1):
+ outputs.append(importlib.util.cache_from_source(
+-filename, optimization=self.optimize))
++filename, optimization=opt))
+ 
+ outputs += [
+ os.path.join(build_dir, filename)
+@@ -387,8 +387,8 @@ class build_py (Command):
+ if self.compile:
+ byte_compile(files, optimize=0,
+  force=self.force, prefix=prefix, 
dry_run=self.dry_run)
+-if self.optimize > 0:
+-byte_compile(files, optimize=self.optimize,
++for opt in range(1, self.optimize + 1):
++byte_compile(files, optimize=opt,
+  force=self.force, prefix=prefix, 
dry_run=self.dry_run)
+ 
+ class build_py_2to3(build_py, Mixin2to3):
+diff --git a/Lib/distutils/command/install_lib.py 
b/Lib/distutils/command/install_lib.py
+index 6154cf0..049b662 100644
+--- a/Lib/distutils/command/install_lib.py
 b/Lib/distutils/command/install_lib.py
+@@ -24,8 +24,8 @@ class install_lib(Command):
+ #   2) compile .pyc only (--compile --no-optimize; default)
+ #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+ #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-#   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-#   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++#   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++#   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+ #
+ # The UI for this is two options, 'compile' and 'optimize'.
+ # 'compile' is strictly boolean, and only decides whether to
+@@ -132,8 +132,8 @@ class install_lib(Command):
+ byte_compile(files, optimize=0,
+  force=self.force, prefix=install_root,
+  dry_run=self.dry_run)
+-if self.optimize > 0:
+-byte_compile(files, optimize=self.optimize,
++for opt in range(1, self.optimize + 1):
++byte_compile(files, optimize=opt,
+  force=self.force, prefix=install_root,
+  verbose=self.verbose, dry_run=self.dry_run)
+ 
+@@ -167,9 +167,9 @@ class install_lib(Command):
+ if self.compile:
+ bytecode_files.append(importlib.util.cache_from_source(
+ py_file, optimization=''))
+-if self.optimize > 0:
++for opt in range(1, self.optimize + 1):
+ bytecode_files.append(importlib.util.cache_from_source(
+-py_file, optimization=self.optimize))
++py_file, optimization=opt))
+ 
+ return bytecode_files
+ 
+-- 
+2.8.3
+

diff --git a/dev-lang/python/python-3.5.1-r3.ebuild 
b/dev-lang/python/python-3.5.1-r3.ebuild
new file mode 100644
index 000..3e8fc98
--- /dev/null
+++ b/dev-lang/python/python-3.5.1-r3.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils

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

2015-10-02 Thread Mike Frysinger 
commit: bd3586765e47208668f27f707ec7f6d06b5d92a8
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Oct  2 13:56:16 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Oct  2 13:56:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd358676

dev-lang/python: add upstream fix for testing w/gcc-5 #547626

 dev-lang/python/files/python-3.4-gcc-5.patch | 37 
 dev-lang/python/python-3.3.5-r2.ebuild   |  1 +
 dev-lang/python/python-3.4.3-r2.ebuild   |  1 +
 3 files changed, 39 insertions(+)

diff --git a/dev-lang/python/files/python-3.4-gcc-5.patch 
b/dev-lang/python/files/python-3.4-gcc-5.patch
new file mode 100644
index 000..80afbd1
--- /dev/null
+++ b/dev-lang/python/files/python-3.4-gcc-5.patch
@@ -0,0 +1,37 @@
+changeset:   94583:689092296ad3
+branch:  3.4
+parent:  94579:645f3d750be1
+user:Victor Stinner 
+date:Wed Feb 11 14:23:35 2015 +0100
+summary: Issue #23433: Fix faulthandler._stack_overflow()
+
+diff -r 645f3d750be1 -r 689092296ad3 Modules/faulthandler.c
+--- a/Modules/faulthandler.c   Tue Feb 10 14:49:32 2015 +0100
 b/Modules/faulthandler.c   Wed Feb 11 14:23:35 2015 +0100
+@@ -911,12 +911,12 @@
+ }
+ 
+ #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
+-static void*
+-stack_overflow(void *min_sp, void *max_sp, size_t *depth)
++static Py_uintptr_t
++stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth)
+ {
+ /* allocate 4096 bytes on the stack at each call */
+ unsigned char buffer[4096];
+-void *sp = 
++Py_uintptr_t sp = (Py_uintptr_t)
+ *depth += 1;
+ if (sp < min_sp || max_sp < sp)
+ return sp;
+@@ -929,7 +929,8 @@
+ faulthandler_stack_overflow(PyObject *self)
+ {
+ size_t depth, size;
+-char *sp = (char *), *stop;
++Py_uintptr_t sp = (Py_uintptr_t)
++Py_uintptr_t stop;
+ 
+ depth = 0;
+ stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,
+

diff --git a/dev-lang/python/python-3.3.5-r2.ebuild 
b/dev-lang/python/python-3.3.5-r2.ebuild
index 59fc5b7..f14b121 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -75,6 +75,7 @@ src_prepare() {
 
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
+   epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
 
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \

diff --git a/dev-lang/python/python-3.4.3-r2.ebuild 
b/dev-lang/python/python-3.4.3-r2.ebuild
index 888e7a7..80d86b6 100644
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ b/dev-lang/python/python-3.4.3-r2.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
 
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+   epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
 
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \

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

2015-08-09 Thread Michał Górny 
commit: 33cf38e4f1eb6b456df0874b34ff54a8961cf97e
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Sun Aug  9 08:43:34 2015 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sun Aug  9 08:47:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cf38e4

Move 3.2 to ::python. Remove old patches.

Package-Manager: portage-2.2.20

 dev-lang/python/Manifest   |   2 -
 dev-lang/python/files/CVE-2013-4238_py27.patch | 247 -
 dev-lang/python/files/CVE-2013-4238_py33.patch | 241 -
 dev-lang/python/files/python-2.7-issue16248.patch  |  19 -
 dev-lang/python/files/python-2.7-issue18851.patch  | 287 ---
 .../python/files/python-2.7.10-semaphore-pid.patch |  51 ---
 .../python/files/python-2.7.5-library-path.patch   |  25 --
 .../files/python-2.7.5-re_unsigned_ptrdiff.patch   |  23 --
 ...ython-2.7.6-recvfrom_into_buffer_overflow.patch |  17 -
 .../python/files/python-3.2-CVE-2013-2099.patch|  51 ---
 .../python/files/python-3.2-CVE-2014-1912.patch|  51 ---
 .../python/files/python-3.2-CVE-2014-4616.patch|  39 ---
 dev-lang/python/files/python-3.2-issue16248.patch  |  19 -
 .../python/files/python-3.3-CVE-2013-2099.patch|  51 ---
 dev-lang/python/files/python-config-2.4-r1 |  58 
 dev-lang/python/python-3.2.5-r6.ebuild | 384 -
 16 files changed, 1565 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 28e908b..8b86bf1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,7 +1,6 @@
 DIST Python-2.6.9.tgz 13285074 SHA256 
7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db SHA512 
7ff28f41f7dc12e1504a781060520440bbf74b96c5df269ca5218f5910eae63898b94fdd398f549217912689814bc5275bb3b5ec4cc892f20bb468fc1b041c0c
 WHIRLPOOL 
909f612286314ea004eef328a58d7b0aecffc1a524f6b28ef0f299413055c1f7ec4e2d21a44d1beeaa8e11aabd68510cf9c5840cb5394176cbc8f2e5c147
 DIST Python-2.7.10.tar.xz 12250696 SHA256 
1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 SHA512 
67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb
 WHIRLPOOL 
3a9dcfc55b107dc55ad0ae93fb24a11eab7d4d9b4cfbe6b6830a090b6e5f71bb2ac91526b89c6f3e4f2610fa1a2cc4e82b58a83c599aa71f94894c74181b504b
 DIST Python-2.7.9.tar.xz 12164712 SHA256 
90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 
6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4
 WHIRLPOOL 
993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
-DIST Python-3.2.5.tar.xz 9221624 SHA256 
8ccb9645b9779fc4550055b2ebb21a724ab7a63dee45643286eb4f79b2f84116 SHA512 
6e71d01695c7b1e74d9781e4ac40a8d1560cae659d5351d392fc685b84316568d93740a99d2ed878dd87d4ce1708d0474cb01c6bad7b3dab610c639f3255b09d
 WHIRLPOOL 
d5e5fae5e1d4110861e1e1dac00c9812abbbc37205e8ce3cd268535ab9f66e24038ab4778af8bb834fd472eaa0281730f1f2fabdf6dffc4f6b54ef32c1d75953
 DIST Python-3.3.5.tar.xz 12116308 SHA256 
abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 
562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550
 WHIRLPOOL 
f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8
 DIST Python-3.4.0.tar.xz 14084912 SHA256 
f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe SHA512 
4fd4d3352e3b64ef8017ba083a2d894b99e89882581bcf30cdb218578f0f384aa6efc89211ffe44f5bb3d783c79763e26823242d27382fd05900099dd966ca31
 WHIRLPOOL 
82a1bb14a7683e2bce32221792923f334b61fabc75b0b293b0ecc0d810c8a4bebf05b75a061d85dd6612a8ca699c9b4f358e2aef5d14706aad1c18f42c9b8d55
 DIST Python-3.4.1.tar.xz 14125788 SHA256 
c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4 SHA512 
09b6390c07334974f189fb1c90bc2310898aef76661b1cecaa2b4d50001fa3df0fa0c63d3471a5a0dc7f9e08dd559d38d3bc45a6c05a816d8b2ed6b2a20e5fa9
 WHIRLPOOL 
c8f879bb5d42a759b0804aa58d90330d9be6f4c29652ec40f07ca7da31510eadbd6b4eceb2b213af9a1af031c8321fc25faccae77763a31814eb0569831b8bfd
@@ -11,7 +10,6 @@ DIST python-gentoo-patches-2.6.9-0.tar.xz 17532 SHA256 
6ff9448c3a8412f9624363ec6
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 
c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 
5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056
 WHIRLPOOL 
f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
 DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 
d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512