Drop old, fix dependency on zeromq, #539442

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index 7f6511fafb49bee8af73cfdcbb502bc84f8c4809..57f7905daf46a86db52698cf4fa923aed789c916 100644 (file)
--- a/dev-python/pyzmq/ChangeLog
+++ b/dev-python/pyzmq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyzmq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.64 2015/02/08 14:45:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.65 2015/02/11 10:50:51 jlec Exp $
+
+  11 Feb 2015; Justin Lecher <jlec@gentoo.org> -pyzmq-2.2.0.1-r1.ebuild,
+  metadata.xml, pyzmq-14.5.0.ebuild:
+  Drop old, fix dependency on zeromq, #539442
 
 *pyzmq-14.5.0 (08 Feb 2015)
 

diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index df79fe1d61f4678e4aed8c354b19a007a3e11f01..4107b9d2848b3f71be2b04c49e3b3450f2465440 100644 (file)
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,23 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pyzmq-2.2.0.1-python3.patch 1005 SHA256 b7bcad01d0d810da01e777a37e3d3965e69bbad0b39421cba84ef5aa8052f79c SHA512 90971232bfd18893edeb1ef0ba5af9ef9ac819e42d0b9be168a8530870f1d468ea96beba6875f15bd17f6ab78b9a6dc2bc16f82bd8d914061b99289edf013871 WHIRLPOOL 6e280656d3728c7af74f809c5ee6c4a361b57c98a23385ce87655dbca119a87c8af0c1f1417fece9c8f7e1fe5d89c9ba1ca136baa5e0afb530ae9c474ddb8972
 DIST pyzmq-14.3.1.tar.gz 982527 SHA256 00e263c26a524f81127247e6f37cbf427eddf3a3657d170cf4865bd522df3914 SHA512 3d93a8fbd94fc3f1f90df68257cda548ba1adf3d7a819e7a17edc8681894003ac7ae6abd319473054340c11443a6a3817b931366fd7dae78e3807d549c544f8b WHIRLPOOL d91b958346faa62dc153e3adc86711af30262ffec13d28133f3a327e40de7ce0a63b3d2c0263e74756e993a38947ca5cac9f83e256b25acf13e5e4cdaeedad93
 DIST pyzmq-14.4.0.tar.gz 994313 SHA256 cb8e39c2c532c1e6af5afb01ca37da769377037c3a709c62fa6176f3cc5d345b SHA512 8d5a0bd61e3a3e70bdb14b78fb1463e7f8e8506a49e0e65f0c090968dda8667867a739af315d4b718e87c4a289ec755a47780ea69d9afa55570375c3a9fefe28 WHIRLPOOL ef45fc443469e4f2a04849762fcdfab3d934d7e9753aa6d4d344cff650d0abba19b8f36c7d307715fe009a380bd11430ed4894fecb1ee4792451ef1d857c8e35
 DIST pyzmq-14.4.1.tar.gz 995366 SHA256 cb4a59875fdc26315045d800bac008b8e10a4cf2d72ac9af2fc45ef6ac8f330a SHA512 4b71677e4bfa771177a34dbff59cf6dfd54310a8996689a3d62902aaba35c7cf2ad6b7da806f9e189ad4b89fcefe9cbb3e192788eecd5d2c269e8a980b4d50fa WHIRLPOOL f6c093023b4494e1f9293a81ac86dcc55ff05f7ae10bb9677ff4fffd2e38fefe2462eb241c74b1ee283958a8546b128585c78c644dae544aa38f4b9c1f3e3ad8
 DIST pyzmq-14.5.0.tar.gz 997150 SHA256 5d6e045634456cf5496f50871fd3e3a5ede2b90433284dbfe985bb67c97f77bd SHA512 20164f7b05c308e0f089c07fc46b1c522094f3ac136f2e0bba84f19cb63dfd36152a2465df723dd4d93c6fbd2de4f0d94c160e2bbc353a92cfd680eb03cbdc87 WHIRLPOOL 3317f9d3cc11d78f183fe66774c12807724b1c8694e30736dc1b888bbfb42b56e7bb14872d12ce906ca04542f893957c65acea992403c3c076f601c4b7c50627
-DIST pyzmq-2.2.0.1.tar.gz 789996 SHA256 dae7423f4aa7c93f8c77dadd15e34ce6576121a6e7ae0ecdb6084d855097decc SHA512 781829783dd932f2f7c9ca37ca84f2797ec23860260da3d1005600981d51c1006f187b9b84e937fd3b6dd0e7e58734992336a593eaa0514966dd204227ae1cac WHIRLPOOL 4a1827879e38edbff8f2badf537887ab48f7a67e1139f45c8472760403bf27ea1aeb8c1b6f1be1123ead906d44f98f46f7194b1839ec2b73e1d7bf76e9f032d3
 EBUILD pyzmq-14.3.1.ebuild 1543 SHA256 085989ef2cfb8d94a46027a2ac30b4a5daf2aa76fe2f45c0b1785d6417cefe08 SHA512 fcd39ebcace072fe293a430ec02090a97cc841d5ab813d60ff7dd7ae2073bdbd490bcd1cfa802e338e2c504ee2d4368eec1f340737ed108dfce1a2ae90106584 WHIRLPOOL ac3740b59f5a8f7cbbbcfd5132b43714a247cfac01e563b3140469633e0494acd29d00f0190378acb42901c02ae9dc193b96f500015a8fd9476dcef3fcb9cf3b
 EBUILD pyzmq-14.4.0.ebuild 1600 SHA256 e5b81359883218c25ac28b498ca5190003dc89c23d309569ba7c617c4976d0ef SHA512 d4769e2abe314a6931b145e2a0a4b0b375326fd7eadeae756b368e31377bc6e3aa886c479e3af76d8cb1574cf97a7e6f40b27d715ee4e2d77cd3ccd7218aaa7e WHIRLPOOL 92d75268b8113b7ffb0f5075c7aa7bfaa4412682e2fa718b87f5a0f6576f62611e2fc08e42ab229226b28716a498f643494caf67455d93e94e494fe4fc2d9cfc
 EBUILD pyzmq-14.4.1.ebuild 1658 SHA256 e04676ddad2a7013fd6853e04568a83e463caf644e7c2579ae2b5dadbe54399d SHA512 abaac6ba01d549a74632c60d4c64b2a1d1be4c9be228a0ee2653beb8cd2f79e3d0059b9f05654884017b422ab1a2e5873d48cf1e4fe18d41d46bab340a2d4850 WHIRLPOOL 5bd569e3d3d3b1a0dd9994775cc7765ac5fc23cb6ae59d0fd4ce875b54e2ec83840ad4afb8227b7d3aacee94c9906a6c7308f98809f2ea08afac23d2a02db87c
-EBUILD pyzmq-14.5.0.ebuild 1694 SHA256 814ca9e6f3c7e35ff15810dfaf2049d282f45a88b0f5b1a5fb8c8e893bc0896c SHA512 bdac4baf04bcf120958ee9abbcfdb92fc4ac27d25fc5e71c6784195a8c4be75ac598193a8a2d510f897b9c76d71052e23acd9b78b6848bcafb2c4a125c82c6c5 WHIRLPOOL 2edaa44efdfab072b2de2f57dacf073e90e7770ef2c450fc389f63e6ae24b4926d973ee41d6ee1ffb3be4e5f7d6f09ee080c31073936a86067af5c382120b7e2
-EBUILD pyzmq-2.2.0.1-r1.ebuild 1320 SHA256 5b77b2df5713ecd38e7a3c0e28e1c42edd259721926a49a9c4257a1e440c2c2f SHA512 312e8e68dd68fd42f7b94705a048a2157f8f717487fc225409c44a35fbe633ee289ed435b73d3fa4ae70e9eca2c567c9f7d168fe8028da3ec085125470008f7e WHIRLPOOL 4e927c4eb5c4aa96d8a2ce7f9faae1004716079728ea35d6da55d91514de84e159bdac45046bf72430b9a681e5d57409f8b427149d296773c12a7cad45276cd6
-MISC ChangeLog 8920 SHA256 d157371c42f8ffb31ef86eed9e3ac7197e8171dc22fe80a716ec04bd45a6b080 SHA512 0ccef353833abefb7ad084d76021493d688a7e0574e624add11f84c7abe95292b1fc1a6bd22cbe846593b9648a0abc80b12026995032db026d1719b52c2b3aef WHIRLPOOL 7eef4c9a6d8fc4a45e1a756224d92a26010b1b348409ac0ffdadba4dcaf064f7cbae111e41f70e853d12f5a1048966fcd51d74f1bdf872738098f48e702d4e11
-MISC metadata.xml 311 SHA256 7bf0844998c23d4dc8fec7840b0ebf8fdd510be512de46049243fc7b211c6c5a SHA512 c8c0381428fad7c3cd93380444721ddcbfbe0fbfcce78dac081f38ee0b24e79cd28ac582de808e9fd1b95d2d8a9005faf27c414e9d3cfb21921e64cfd1ace8b2 WHIRLPOOL 3e8755a2f9a84b6cb86d88b01fedee0bcd953512859f50412ed939c86c10f09297f1d74213a10e18af50a9dd1a7e797c5b0622c0822f62cdba5e324536e574ed
+EBUILD pyzmq-14.5.0.ebuild 1682 SHA256 40735b1631ff4b6fdaccb24d1d450a9da8f2958919269796cd6b781dd724e326 SHA512 6520c1f8577486c396cc1a79cdcb215d1629a505afa98b44f05e32082b4444d35c1f9e7656719ddbcb0481722b4fe93bfb74411fb35062d7b281648874593e46 WHIRLPOOL 3188d88d25397d752a1364d0604ea6eea7dfb9dc1fb529e4112bc7c782c2cf59852878c6eafe8daa9a2615bf54788348cd6afaa88f81decd678ca56c43266052
+MISC ChangeLog 9074 SHA256 367624916be26fe855270a6869b9a0073493b30448eef8d44694786904daef95 SHA512 0251afa44d36a039a61a74c166ff0ed71677a752ee8dcf54ed981e7193dcdb3d8063609fe8f205fbed54c2346ac22dff8873404a71200d04f7ac64d0cb4ebfa0 WHIRLPOOL a52240b04c69b7dc80815d9963a88096e3841d674a9b250ebe2e9581d2b8d76d8ba0027fde6f176f8fce80081ee23fb2f6ec8eb2d702347b76c038ad20ef217e
+MISC metadata.xml 320 SHA256 5cc79f062e08c2817eb3bbaae89c519b7f99d418dc081d7fac14c8d67942a72b SHA512 78293d289ac76c873f0380ed9f0257f3469f9352f41f3f35f614d7d6226be1ffec5ceab68d341df988fabaa72255f8c5c8a4a2a5866d7f1b8caebc8194747ab5 WHIRLPOOL 65c5dbb946f52ba7a5182d598730073472efa5ceb6772c0b31a0da3c40a9582150d689bb947b3a35e49740b8fdc8b969c11253d35c2548b711348a47c18b5588
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTXdoAACgkQso7CE7gHKw05RACeOWREQE2XeXe7iLCXtGgLX0Sa
-UaUAn3J8rIuKO81srDSWWTHWp7twHeo4
-=hTYq
+iQJ8BAEBCgBmBQJU2zUBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0vcP/AjRJ1ifDSWMS6PufFopruah
+7BO+PQFZ5gwZe+IbIfItdOPWP9lLRZjZzlDxXT7/GuswiEaNfbw1waUcXfphlTJn
+dvfDMQRcFXvRXYLAkUIB+GzzVxk6LGprJUogJeKtOgOkGG1tgYc9tpjk0aebJTb8
+92NuhjBHQ2l7TszO1XdY6ZPcV9vTYI6lKRTEIlmiYiv5KiI4DmOk+37UwS2AYqeT
+zGEK9WS/x3dEMDCbQu0kMOiYnqHHHBfQvSwLdqKkoMSZm7fHXIP2rWewrD9zY38f
+n5JNRcO3soxb5JbxROonUHh7Rs839KUJiHMccK9OVxXwxcvRiYbLX10v/USIzznL
+9KcmLvjqFH0C2UJFNKeTkt6jKKG1eTXrQiwfSFsURpw24ExJbgRIIgFJz1Xn2e8I
+vjWkUxKm0sb7iSE+d7cI578yWBrZiStiW25QltbTXpGWPfyAsqRZKsdVq67AuxKS
+MnUs0YWwb6laliXg3r89/bLMlVl6dJAXdKVUph3lyvLWTmtOermAUU3yawJ7Ui2k
+u5Xtm0lpwBX2+8pmhs/X+V6v/wGWnF1aIITg//pfSkQM+yHF5T8Lm79+HIaXO9eR
+nw/MWM6tnuR5WGokampKa6cUNaZ4QLM5TJaqXolYphJC+6Hp/t8x5aQTTDWnKWm+
+3PlZig5KAzhpg6w10eoy
+=cE0m
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
index f110ed7f9f6cfa28f52e472f6910ca7a0105152e..4fecbd76e7e64381d273faf8ea8e4ac1ef0ff9f6 100644 (file)
--- a/dev-python/pyzmq/metadata.xml
+++ b/dev-python/pyzmq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>python</herd>
-       <use>
-               <flag name="green">Enable gevent compatibility with zeromq</flag>
-       </use>
-       <upstream>
-               <remote-id type="pypi">pyzmq</remote-id>
-       </upstream>
+  <herd>python</herd>
+  <use>
+    <flag name="green">Enable gevent compatibility with zeromq</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">pyzmq</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-python/pyzmq/pyzmq-14.5.0.ebuild b/dev-python/pyzmq/pyzmq-14.5.0.ebuild
index 343746b5ccc352ff438d3eda38fddcde35c2cf7a..e1710727316318b92c65c7fb4ec4ea68262ccc8e 100644 (file)
--- a/dev-python/pyzmq/pyzmq-14.5.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.5.0.ebuild
@@ -1,24 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.5.0.ebuild,v 1.1 2015/02/08 14:45:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.5.0.ebuild,v 1.2 2015/02/11 10:50:51 jlec Exp $
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1 toolchain-funcs
 
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
+DESCRIPTION="lightweight and super-fast messaging library built on top of the ZeroMQ library"
 HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="doc examples green test"
 
+# Ensures installation of gevent for test phase
+REQUIRED_USE="test? ( green )"
+
 PY2_USEDEP=$(python_gen_usedep python2_7)
-RDEPEND=">=net-libs/zeromq-2.1.9
+RDEPEND="
+       >=net-libs/zeromq-4.0.5
        dev-python/py[${PYTHON_USEDEP}]
        dev-python/cffi[${PYTHON_USEDEP}]
        green? ( dev-python/gevent[${PY2_USEDEP}] )"
@@ -30,9 +34,6 @@ DEPEND="${RDEPEND}
                dev-python/numpydoc[${PYTHON_USEDEP}]
        )"
 
-# Ensures installation of gevent for test phase
-REQUIRED_USE="test? ( green )"
-
 python_configure_all() {
        tc-export CC
 }

diff --git a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
deleted file mode 100644 (file)
index a648db4..0000000
--- a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild,v 1.5 2014/08/14 23:22:48 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-RDEPEND=">=net-libs/zeromq-2.1.9"
-DEPEND="${RDEPEND}
-       test? ( dev-python/nose[${PY2_USEDEP}]
-               dev-python/gevent[${PY2_USEDEP}]
-               www-servers/tornado[${PY2_USEDEP}] )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.2.0.1-python3.patch"
-)
-
-# Configure checks write to cwd.
-# https://github.com/zeromq/pyzmq/issues/318
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-       if [[ ${EPYTHON} == python3* ]]; then
-               einfo "Skipping tests for ${EPYTHON}, not supported."
-       else
-               nosetests -svw build/lib* || die "Tests fail with ${EPYTHON}"
-       fi
-}
-
-python_install_all() {
-       if use examples; then
-               dodoc -r examples
-               docompress -x /usr/share/doc/${PF}/examples
-       fi
-}