floppym 14/12/20 17:57:16
Modified: pyzmq-14.3.1.ebuild pyzmq-14.4.1.ebuild
pyzmq-14.4.0.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.7 dev-python/pyzmq/pyzmq-14.3.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild?r1=1.6&r2=1.7
Index: pyzmq-14.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pyzmq-14.3.1.ebuild 8 Dec 2014 10:08:48 -0000 1.6
+++ pyzmq-14.3.1.ebuild 20 Dec 2014 17:57:16 -0000 1.7
@@ -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 @@
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_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
}
1.4 dev-python/pyzmq/pyzmq-14.4.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild?r1=1.3&r2=1.4
Index: pyzmq-14.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyzmq-14.4.1.ebuild 8 Dec 2014 06:54:28 -0000 1.3
+++ pyzmq-14.4.1.ebuild 20 Dec 2014 17:57:16 -0000 1.4
@@ -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 @@
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_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
}
1.8 dev-python/pyzmq/pyzmq-14.4.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild?r1=1.7&r2=1.8
Index: pyzmq-14.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyzmq-14.4.0.ebuild 16 Dec 2014 20:43:25 -0000 1.7
+++ pyzmq-14.4.0.ebuild 20 Dec 2014 17:57:16 -0000 1.8
@@ -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 @@
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_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
}
1.62 dev-python/pyzmq/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/ChangeLog?rev=1.62&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/ChangeLog?rev=1.62&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyzmq/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 16 Dec 2014 20:43:25 -0000 1.61
+++ ChangeLog 20 Dec 2014 17:57:16 -0000 1.62
@@ -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 <[email protected]> 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 <[email protected]> pyzmq-14.4.0.ebuild:
arm stable, bug #530592
