From: Mike Gilbert Date: Tue, 30 Dec 2014 16:58:15 +0000 (+0000) Subject: Remove workaround for bug 532708; issue is resolved in setuptools-9.1. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d31b9f0ed1b00e44b5d6e51887c6cbfa5480b437;p=gentoo.git Remove workaround for bug 532708; issue is resolved in setuptools-9.1. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- 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 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 pyzmq-14.3.1.ebuild, pyzmq-14.4.0.ebuild, pyzmq-14.4.1.ebuild: diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index 079a2725d8ae..336b14d0fc26 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 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-14.3.1.ebuild 1543 SHA256 085989ef2cfb8d94a46027a2ac30b4a5daf2aa76fe2f45c0b1785d6417cefe08 SHA512 fcd39ebcace072fe293a430ec02090a97cc841d5ab813d60ff7dd7ae2073bdbd490bcd1cfa802e338e2c504ee2d4368eec1f340737ed108dfce1a2ae90106584 WHIRLPOOL ac3740b59f5a8f7cbbbcfd5132b43714a247cfac01e563b3140469633e0494acd29d00f0190378acb42901c02ae9dc193b96f500015a8fd9476dcef3fcb9cf3b +EBUILD pyzmq-14.4.0.ebuild 1600 SHA256 e5b81359883218c25ac28b498ca5190003dc89c23d309569ba7c617c4976d0ef SHA512 d4769e2abe314a6931b145e2a0a4b0b375326fd7eadeae756b368e31377bc6e3aa886c479e3af76d8cb1574cf97a7e6f40b27d715ee4e2d77cd3ccd7218aaa7e WHIRLPOOL 92d75268b8113b7ffb0f5075c7aa7bfaa4412682e2fa718b87f5a0f6576f62611e2fc08e42ab229226b28716a498f643494caf67455d93e94e494fe4fc2d9cfc +EBUILD pyzmq-14.4.1.ebuild 1775 SHA256 c6db0086518aae3f5f30b0228ab8630598f64f3b0bf7f761970566b9d4e651c8 SHA512 092a91092103451ded0dbe4b0caaf47602a8b6ad60bb4eb24d74f1060e64a2992d80062f35095b0e14bdd30531f8fb0238ae17e4023b1dbad2c72bff2b11ca8d WHIRLPOOL 3c4378b2c2ba522eff46d82834835d4ee63354f8143ad2690dcc6825d6910af5bab68a55a83138470fea172aff8e0089137ffd3726fa65029ba2cf2c1afcfb47 EBUILD pyzmq-2.2.0.1-r1.ebuild 1320 SHA256 5b77b2df5713ecd38e7a3c0e28e1c42edd259721926a49a9c4257a1e440c2c2f SHA512 312e8e68dd68fd42f7b94705a048a2157f8f717487fc225409c44a35fbe633ee289ed435b73d3fa4ae70e9eca2c567c9f7d168fe8028da3ec085125470008f7e WHIRLPOOL 4e927c4eb5c4aa96d8a2ce7f9faae1004716079728ea35d6da55d91514de84e159bdac45046bf72430b9a681e5d57409f8b427149d296773c12a7cad45276cd6 -MISC ChangeLog 8482 SHA256 5fad6160589dbdafecdb537d38ab70baac4d1d56150305bab8c69672338ced7b SHA512 bc577f0d52e67ff2d6969a63c686e4ab3e0170e88021b22a97e40ae4a39686c65772ca0623877470f9a6e44eed93faae0e499ae4343c00187e4a700ecec8c113 WHIRLPOOL 5ee7e014d4f965a973cb59586dada6171e1755701267a4bbc0419ba2d834a3aa4799ee9ff1f98f57cf2db19da8ff4cf56a39acaaf4441e06abe1cc58c255d622 +MISC ChangeLog 8670 SHA256 ba8e77d997b4149dc94a9b90e7dbf496f4e18bf2245427585b900f06888da10c SHA512 bc4f98bd7e0ae33e098b241add18589ea082af83e7ccc43998ff9203f30f0432d4a8e6c8e00a637175370db33c46fb961d03a04c70828b41c8b1683c00ee8c12 WHIRLPOOL 20813d9f6814da0bdf1c204965a13aa1851c6bd141a8cf25bf80e7c6b0aff99281950fc3127a072626a2c47d4744f86acee253302e9e4aef6b8f8e5a46ea4188 MISC metadata.xml 311 SHA256 7bf0844998c23d4dc8fec7840b0ebf8fdd510be512de46049243fc7b211c6c5a SHA512 c8c0381428fad7c3cd93380444721ddcbfbe0fbfcce78dac081f38ee0b24e79cd28ac582de808e9fd1b95d2d8a9005faf27c414e9d3cfb21921e64cfd1ace8b2 WHIRLPOOL 3e8755a2f9a84b6cb86d88b01fedee0bcd953512859f50412ed939c86c10f09297f1d74213a10e18af50a9dd1a7e797c5b0622c0822f62cdba5e324536e574ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSVuH4ACgkQC77qH+pIQ6T7wgD/T26ZiCQoiM0VkbdGRLMGIeVq -yvPOnECD1huPA6Z56OcA/0vrThl7i5PKxE2msL6Gm7pjsZ2O+4QAZ9MFWJyMKNIw -=sgxG +iF4EAREIAAYFAlSi2aYACgkQC77qH+pIQ6SsCgEAoC5jFKFh7k/zRhdX6VlH2huz +vUwbSX4LyVHyX2l0F6MA/30KE6b40sWUmsJ7hhiBs4dS4tU6GDDPheNz2YWeBJo1 +=rhcj -----END PGP SIGNATURE----- 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 }