From 0bc7cb19818978ac52f3141116ff38c0d3bbfc7b Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 20 Dec 2014 17:57:18 +0000 Subject: [PATCH] Force early import of setuptools to work around bug 532708. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- dev-python/pyzmq/ChangeLog | 6 +++++- dev-python/pyzmq/Manifest | 14 +++++++------- dev-python/pyzmq/pyzmq-14.3.1.ebuild | 10 ++++++---- dev-python/pyzmq/pyzmq-14.4.0.ebuild | 11 ++++++----- dev-python/pyzmq/pyzmq-14.4.1.ebuild | 10 ++++++---- 5 files changed, 30 insertions(+), 21 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 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 pyzmq-14.4.0.ebuild: arm stable, bug #530592 diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index 4f31c1220c16..079a2725d8ae 100644 --- a/dev-python/pyzmq/Manifest +++ b/dev-python/pyzmq/Manifest @@ -8,16 +8,16 @@ DIST pyzmq-14.4.0.tar.gz 994313 SHA256 cb8e39c2c532c1e6af5afb01ca37da769377037c3 DIST pyzmq-14.4.1.tar.gz 995366 SHA256 cb4a59875fdc26315045d800bac008b8e10a4cf2d72ac9af2fc45ef6ac8f330a SHA512 4b71677e4bfa771177a34dbff59cf6dfd54310a8996689a3d62902aaba35c7cf2ad6b7da806f9e189ad4b89fcefe9cbb3e192788eecd5d2c269e8a980b4d50fa WHIRLPOOL f6c093023b4494e1f9293a81ac86dcc55ff05f7ae10bb9677ff4fffd2e38fefe2462eb241c74b1ee283958a8546b128585c78c644dae544aa38f4b9c1f3e3ad8 DIST pyzmq-2.2.0.1.tar.gz 789996 SHA256 dae7423f4aa7c93f8c77dadd15e34ce6576121a6e7ae0ecdb6084d855097decc SHA512 781829783dd932f2f7c9ca37ca84f2797ec23860260da3d1005600981d51c1006f187b9b84e937fd3b6dd0e7e58734992336a593eaa0514966dd204227ae1cac WHIRLPOOL 4a1827879e38edbff8f2badf537887ab48f7a67e1139f45c8472760403bf27ea1aeb8c1b6f1be1123ead906d44f98f46f7194b1839ec2b73e1d7bf76e9f032d3 EBUILD pyzmq-13.1.0.ebuild 1635 SHA256 25e1f5fe8cd4cc24ec16d4ad990832154c57af37b6fc74f7b6322850f148223c SHA512 5d2884deb883b2cb99e4cee0b9ed52abe1f9c3f9742755219c2fba8c4f252a54abb6bc42e74c457afffb783b866b29c34b0be4e3ea24187adbbb0bcea317fc1a WHIRLPOOL 311ba53511bde1c7c50f034ba42553888ee6ee19695cdfc03b0e625c9b3864309fdb8a0bcccf520e17a27a836deac56452cf406b909686a1a0e16ca06e522041 -EBUILD pyzmq-14.3.1.ebuild 1669 SHA256 d202f37b8332ca03c3d85a9f6385eeef7f64df7de18f1f3e72e7a9ff3d976b15 SHA512 b9c37a6cab4bea43811ffe6e29e71752eeaba860cb0a818596e7aba8583072c0eeb1af172602f35a54299cca9d739ba716990fd109f88d72f99d32901044444e WHIRLPOOL 6a4b86f386bdc2ec1767751d0360423e0485c5a9ec98858e474e00d71cc52a7b4094bd16283ab6e8720d55c1d198a2291fd190f884c89e7e4419ab4e87bdb2af -EBUILD pyzmq-14.4.0.ebuild 1727 SHA256 d6b3d8c013042526f2482baf6ae5236dc223f0c37211e944789cd7a973f73f95 SHA512 89666920bb21151061e6b4850ec9a9499ca119d2dd9f97bef7ad96122a45f535bc1ad23410f806001171a9e5deb8b87cd5ff40f3f8dd7409ce541adbf05be224 WHIRLPOOL 6193104f0a9cd44b54f31d616dc185ecb87fd9a91889e906716036b92f84f4e33efdc24d5465a1f00358929b44fdebeb1091496049a2b854f43539df882bcf2a -EBUILD pyzmq-14.4.1.ebuild 1901 SHA256 6494fee45429973dc37641f47957747c3643bff655ef1d304d90ad730119cc14 SHA512 868bfce27d0fdd39799cc848d1319e0e5c479f396b57b8b7dafe435f1729e44c65045db1d3dd3f660f6d36756530b95274c2817fec110a51ee163b6d40e2a5a4 WHIRLPOOL 5bb88aabb9238a142edb50ccdccea7bd880507a9d9cd87415d5ef2ef367057b1bb56a7fa8c7d68813438212eb7e2f371d7bc51f16d60c5f08562ad725892b1b4 +EBUILD pyzmq-14.3.1.ebuild 1737 SHA256 3ef65ddefa89da0578261f49b812fb198a4a08d33571a36a9d7d31e0052cd25e SHA512 1d8a05e7af969877fa5e88650f759ef942ee5452767175d0fd417ee0883f47afb7f683e405ba66ee1fe1b8399bc71f266b315a3a36f4710f308ff4fc060dc145 WHIRLPOOL 6c2abac465f8fb93fb4446dfa62bfda0d535f370e2e503beb9ba5df48f1980e2dbd0b6478c44ae016e15edd5344c3b2d2affaeb0baae101338fdf349c55169a0 +EBUILD pyzmq-14.4.0.ebuild 1794 SHA256 9e258452f1509b4dd603dc315173dc9d97759989485620ce56e2c35ca51933cf SHA512 db1bd352c9561b006f2c8546182523572e4a0900d7d50c2793cfc48d2b11dab1c16392618f2d54b11ebd24105d30cb29a91035b337dede7322568d2587023db8 WHIRLPOOL be3cab9ebf4682dcd84f775381ed1100be4e4e757b4f6253cf5580152e9f43fceb146b3fafca309e3b161c5fcd088c6697a1c6fc3a28be7c71c2dca78efc1031 +EBUILD pyzmq-14.4.1.ebuild 1969 SHA256 66fa72a4e529481cd60e1788898e09d98f84268ef19a7ce439b4e9c1e271f991 SHA512 87073654cd1afbc2be4061c01f09b749d8042fe763f5b8fd5422997f3e65aac49d51bdc379bd9736524ec8c9ce2f85b8f6845880f8203197a06d5c6af47441a7 WHIRLPOOL d1bd1058e3ab5fabdbc6454e4d9d4e5102d947fa56aa6da5ef434b7bc3aeed996b4b7ba7abc7824fa54b1a8274b39d7d6a1df898708f200b541a2455d1b6645b EBUILD pyzmq-2.2.0.1-r1.ebuild 1320 SHA256 5b77b2df5713ecd38e7a3c0e28e1c42edd259721926a49a9c4257a1e440c2c2f SHA512 312e8e68dd68fd42f7b94705a048a2157f8f717487fc225409c44a35fbe633ee289ed435b73d3fa4ae70e9eca2c567c9f7d168fe8028da3ec085125470008f7e WHIRLPOOL 4e927c4eb5c4aa96d8a2ce7f9faae1004716079728ea35d6da55d91514de84e159bdac45046bf72430b9a681e5d57409f8b427149d296773c12a7cad45276cd6 -MISC ChangeLog 8304 SHA256 57275d7a027d7fdcf56095dfb8b1dc82c94c281a73d1e02d8af0a11a67f0e384 SHA512 4a3bb53aa591c6090ab589d8020dc09a2a98210bc0b9f489de9fc178ff2174e33dbc7143baddabda03eacc43302f14dee0208e6f5308cd56a3541cab58144065 WHIRLPOOL 169dc2ef92e37c94af73205a6f3d382184e2ee57053bf5a0eb8c9c157f90edc77a8d2f4cae177d8f715becb6992593fb3f5fdbe41b75053a4ddf2acfecbebc1f +MISC ChangeLog 8482 SHA256 5fad6160589dbdafecdb537d38ab70baac4d1d56150305bab8c69672338ced7b SHA512 bc577f0d52e67ff2d6969a63c686e4ab3e0170e88021b22a97e40ae4a39686c65772ca0623877470f9a6e44eed93faae0e499ae4343c00187e4a700ecec8c113 WHIRLPOOL 5ee7e014d4f965a973cb59586dada6171e1755701267a4bbc0419ba2d834a3aa4799ee9ff1f98f57cf2db19da8ff4cf56a39acaaf4441e06abe1cc58c255d622 MISC metadata.xml 311 SHA256 7bf0844998c23d4dc8fec7840b0ebf8fdd510be512de46049243fc7b211c6c5a SHA512 c8c0381428fad7c3cd93380444721ddcbfbe0fbfcce78dac081f38ee0b24e79cd28ac582de808e9fd1b95d2d8a9005faf27c414e9d3cfb21921e64cfd1ace8b2 WHIRLPOOL 3e8755a2f9a84b6cb86d88b01fedee0bcd953512859f50412ed939c86c10f09297f1d74213a10e18af50a9dd1a7e797c5b0622c0822f62cdba5e324536e574ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSQmW4ACgkQkKaRLQcq0GJaMgCgjBbLe46s57tZdMnnYyx2+LgX -0/AAoIep3tEOuo1okgQQd/2QuAnAgKH1 -=efjS +iF4EAREIAAYFAlSVuH4ACgkQC77qH+pIQ6T7wgD/T26ZiCQoiM0VkbdGRLMGIeVq +yvPOnECD1huPA6Z56OcA/0vrThl7i5PKxE2msL6Gm7pjsZ2O+4QAZ9MFWJyMKNIw +=sgxG -----END PGP SIGNATURE----- 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 } -- 2.26.2