Drop old, fix dependency on zeromq, #539442

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 20 insertions, 63 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index 7f6511fafb49..57f7905daf46 100644
--- 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/metadata.xml b/dev-python/pyzmq/metadata.xml
index f110ed7f9f6c..4fecbd76e7e6 100644
--- 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 343746b5ccc3..e17107273163 100644
--- 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
index a648db4d1185..000000000000
--- 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
-}