gentoo resync : 14.05.2020

3 files changed, 2 insertions, 71 deletions

diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 098c907bdce6..472a7adbbacd 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,9 +1,7 @@
 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-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
 DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
 EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3
-EBUILD pyzmq-17.1.0.ebuild 1692 BLAKE2B b75924c63d6332a3dd54beefa42b4a656539214ce154e6dab3c3cf6a115078cd61fc34545b75739ef716475b74301064296f1d4a24f9c6078371ddeb362589a6 SHA512 e69f961773f54e6d2460740d5eb2cdf139689b4eeddc8a2713ecc931ab6d60bc65d49015407bea467bb69f0bab7c7a181f94e71596deb96981cf37c9b78f8f1c
-EBUILD pyzmq-19.0.0.ebuild 1547 BLAKE2B aae98a7aa31dae3543fc5c0a842141edcfbbde8c32587eb5b0d76247dbd47bb548ef88fb78d5212f725dfd8727ce6de7a870c9a50b50b22e75bae6a7884e3126 SHA512 b905ffccdd3ce477961f3ae76f9d89619694f3cb2d86c568e1e1b92bed371a572fd9bf56ff7576f6148424a63315a9c70175b663ba5b611ce69843fba4269822
+EBUILD pyzmq-19.0.0.ebuild 1543 BLAKE2B 416944298550b4e5fc76591c4cd9727f5c1dc162b585050aeb343b667406fa398f4d0396809bad04e78d4f4f1044e5d57ed9ba9f5bba77008eb0d32a085bc0c6 SHA512 ea0593aebe18e5c3c371b7aae95737dbc405a101aa20704860b599e0dcd4b878c15a68f3b5a6b9724be70bb5a0c7544ca1be53e4ef016692bc1c8ca71f8925f5
 MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
deleted file mode 100644
index 1e918eb84bc5..000000000000
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit flag-o-matic distutils-r1 toolchain-funcs
-
-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/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-test_message.patch )
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	tc-export CC
-	append-cppflags -DZMQ_BUILD_DRAFT_API=1
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	esetup.py cython --force
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v "${BUILD_DIR}/lib" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyzmq/pyzmq-19.0.0.ebuild b/dev-python/pyzmq/pyzmq-19.0.0.ebuild
index be7f07be845a..4b60d5b65a75 100644
--- a/dev-python/pyzmq/pyzmq-19.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-19.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc +draft test"
 RESTRICT="!test? ( test )"