Force early import of setuptools to work around bug 532708.

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

4 files changed, 23 insertions, 14 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index fae1a82e325d..ce48f58fb57b 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.61 2014/12/16 20:43:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.62 2014/12/20 17:57:16 floppym Exp $
+
+  20 Dec 2014; Mike Gilbert <floppym@gentoo.org> pyzmq-14.3.1.ebuild,
+  pyzmq-14.4.0.ebuild, pyzmq-14.4.1.ebuild:
+  Force early import of setuptools to work around bug 532708.
 
   16 Dec 2014; Markus Meier <maekke@gentoo.org> pyzmq-14.4.0.ebuild:
   arm stable, bug #530592
diff --git a/dev-python/pyzmq/pyzmq-14.3.1.ebuild b/dev-python/pyzmq/pyzmq-14.3.1.ebuild
index e46039ca2646..717a18d476cf 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.6 2014/12/08 10:08:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild,v 1.7 2014/12/20 17:57:16 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -21,8 +21,9 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 python_configure_all() {
@@ -30,7 +31,8 @@ python_configure_all() {
 }
 
 python_prepare_all() {
-	sed -e s':intersphinx_mapping:#&:' -i docs/source/conf.py || die
+	# Work around bug 532708.
+	sed -i -e "/import distutils/i import setuptools" setup.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pyzmq/pyzmq-14.4.0.ebuild b/dev-python/pyzmq/pyzmq-14.4.0.ebuild
index 570c1ceb3d11..2eeb3695e167 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.7 2014/12/16 20:43:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild,v 1.8 2014/12/20 17:57:16 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -22,9 +22,9 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
-DEPEND="test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_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}] )"
 
@@ -35,7 +35,8 @@ python_configure_all() {
 }
 
 python_prepare_all() {
-	sed -e s':intersphinx_mapping:#&:' -i docs/source/conf.py || die
+	# Work around bug 532708.
+	sed -i -e "/import distutils/i import setuptools" setup.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
index b6903afcb045..6acd8e15b7a9 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.3 2014/12/08 06:54:28 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild,v 1.4 2014/12/20 17:57:16 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -22,8 +22,9 @@ RDEPEND=">=net-libs/zeromq-2.1.9
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
-DEPEND="test? (
-		${RDEPEND}
+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,7 +40,8 @@ python_configure_all() {
 }
 
 python_prepare_all() {
-	sed -i -e s':intersphinx_mapping:#&:' docs/source/conf.py || die
+	# Work around bug 532708.
+	sed -i -e "/import distutils/i import setuptools" setup.py || die
 	distutils-r1_python_prepare_all
 }