Remove workaround for bug 532708; issue is resolved in setuptools-9.1.

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

4 files changed, 8 insertions, 25 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index ce48f58fb57b..a34243e9e657 100644
--- a/dev-python/pyzmq/ChangeLog
+++ b/dev-python/pyzmq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyzmq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.62 2014/12/20 17:57:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.63 2014/12/30 16:58:13 floppym Exp $
+
+  30 Dec 2014; Mike Gilbert <floppym@gentoo.org> pyzmq-14.3.1.ebuild,
+  pyzmq-14.4.0.ebuild, pyzmq-14.4.1.ebuild:
+  Remove workaround for bug 532708; issue is resolved in setuptools-9.1.
 
   20 Dec 2014; Mike Gilbert <floppym@gentoo.org> pyzmq-14.3.1.ebuild,
   pyzmq-14.4.0.ebuild, pyzmq-14.4.1.ebuild:
diff --git a/dev-python/pyzmq/pyzmq-14.3.1.ebuild b/dev-python/pyzmq/pyzmq-14.3.1.ebuild
index 717a18d476cf..b834afd19603 100644
--- a/dev-python/pyzmq/pyzmq-14.3.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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-14.3.1.ebuild,v 1.7 2014/12/20 17:57:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild,v 1.8 2014/12/30 16:58:13 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -22,7 +22,6 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
@@ -30,12 +29,6 @@ python_configure_all() {
 	tc-export CC
 }
 
-python_prepare_all() {
-	# Work around bug 532708.
-	sed -i -e "/import distutils/i import setuptools" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	use doc && emake -C docs html
 }
diff --git a/dev-python/pyzmq/pyzmq-14.4.0.ebuild b/dev-python/pyzmq/pyzmq-14.4.0.ebuild
index 2eeb3695e167..2fe18337a477 100644
--- a/dev-python/pyzmq/pyzmq-14.4.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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-14.4.0.ebuild,v 1.8 2014/12/20 17:57:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild,v 1.9 2014/12/30 16:58:13 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -23,7 +23,6 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}] )"
@@ -34,12 +33,6 @@ python_configure_all() {
 	tc-export CC
 }
 
-python_prepare_all() {
-	# Work around bug 532708.
-	sed -i -e "/import distutils/i import setuptools" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	use doc && emake -C docs html
 }
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
index 6acd8e15b7a9..03c6c984266c 100644
--- a/dev-python/pyzmq/pyzmq-14.4.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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-14.4.1.ebuild,v 1.4 2014/12/20 17:57:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild,v 1.5 2014/12/30 16:58:13 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -23,7 +23,6 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep "dev-python/gevent[${PY2_USEDEP}]" python2_7)
@@ -39,12 +38,6 @@ python_configure_all() {
 	tc-export CC
 }
 
-python_prepare_all() {
-	# Work around bug 532708.
-	sed -i -e "/import distutils/i import setuptools" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	use doc && emake -C docs html
 }