gentoo resync : 13.06.2020

3 files changed, 66 insertions, 23 deletions

diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 472a7adbbacd..99a8af55c390 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,7 +1,8 @@
-AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
+DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3
 EBUILD pyzmq-19.0.0.ebuild 1543 BLAKE2B 416944298550b4e5fc76591c4cd9727f5c1dc162b585050aeb343b667406fa398f4d0396809bad04e78d4f4f1044e5d57ed9ba9f5bba77008eb0d32a085bc0c6 SHA512 ea0593aebe18e5c3c371b7aae95737dbc405a101aa20704860b599e0dcd4b878c15a68f3b5a6b9724be70bb5a0c7544ca1be53e4ef016692bc1c8ca71f8925f5
+EBUILD pyzmq-19.0.1_p20200608.ebuild 1502 BLAKE2B d2db4bf85470754dae4b3f848922cfb89464f7162eaff5ae8cc0fba54bd722c88a08764c3323729ed030998e70491c8367c31c6dacc3be216b53d71f733745ac SHA512 cdc2d41d19b563ddec84c6ef24125eb1e2bd91ec42ac907f38fc5692e03f03b8f34556541391cd890ce8086a350758decdf4254de95f415dcbf8f43fee03fa9f
 MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch b/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
deleted file mode 100644
index 66d0de75e38c..000000000000
--- a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable hanging test
-Bug: https://github.com/zeromq/pyzmq/issues/1202
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- pyzmq-17.1.0/zmq/tests/test_message.py
-+++ pyzmq-17.1.0/zmq/tests/test_message.py
-@@ -14,6 +14,7 @@ import time
- from pprint import pprint
- from unittest import TestCase
- 
-+import pytest
- import zmq
- from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY
- from zmq.utils.strtypes import unicode, bytes, b, u
-@@ -262,6 +263,7 @@ class TestFrame(BaseZMQTestCase):
-             self.assertEqual(s,r)
-         self.assertEqual(s, m.bytes)
-     
-+    @pytest.mark.skip("test sometimes hangs")
-     def test_buffer_numpy(self):
-         """test non-copying numpy array messages"""
-         try:
diff --git a/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
new file mode 100644
index 000000000000..56869da78599
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+EGIT_COMMIT="dd4dac055152d47c829034224cdecf594c7b3f12"
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://www.zeromq.org/bindings:python
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+RDEPEND="${DEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pyzmq-19.0.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_prepare_all() {
+	# probably broken with new numpy
+	sed -i -e 's:test_buffer_numpy:_&:' zmq/tests/test_message.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}