From: Mike Gilbert Date: Sun, 23 Nov 2014 17:32:33 +0000 (+0000) Subject: Use python_gen_cond_dep for numpy. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65514d252bca62ce2d2da2bd6f23ce51d2594121;p=gentoo.git Use python_gen_cond_dep for numpy. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- diff --git a/dev-python/cython/ChangeLog b/dev-python/cython/ChangeLog index 0f99cdd6620c..858072f343ae 100644 --- a/dev-python/cython/ChangeLog +++ b/dev-python/cython/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/cython # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.136 2014/11/22 12:17:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.137 2014/11/23 17:32:30 floppym Exp $ + + 23 Nov 2014; Mike Gilbert cython-0.19.1-r1.ebuild, + cython-0.21.1.ebuild, cython-0.21.ebuild: + Use python_gen_cond_dep for numpy. 22 Nov 2014; Justin Lecher cython-0.21.1.ebuild: Add pypy3 support diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest index 09c7916c3a70..e6b7512f32b7 100644 --- a/dev-python/cython/Manifest +++ b/dev-python/cython/Manifest @@ -1,32 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX cython-0.20.1-backport-test-fix.patch 492 SHA256 542e65c629511e7d2f32d1d9c40ab84065474a83c52e6932e45648681f6177ef SHA512 dd4657248d2b1e4f7e6188d64b7a91cf94263b69ae13eff70b15db1dc78b9def69b97708e628b43384e77359bcb7fc15ad8fc4d0647371862f29bffd28d79279 WHIRLPOOL ab5115c739391d4f29e20a902c2eb9bfd88c6872ba88e886a6d4dd66453cd184527f2a2586e6cd89b45e00b2182a9bd39a6fbd121e831ed753f129301b7cf40d DIST Cython-0.19.1.tar.gz 1384406 SHA256 0b90aaa286acdd1bf75a6dd144dfc45192f011f2c2401cf5f80ed6ab5f8bf778 SHA512 9dcdda5b2ee2e63c2d3755245b7b4ed2f4592455f40feb6f8e86503195d9474559094ed27e789ab1c086d09da0bb21c4fe844af0e32a7d47c81ff59979b18ca0 WHIRLPOOL 7c1208608375170c78b2383b746e44948f5bf3253fb3f3f30e0660e968704b039d66592cb775939530dfc14ae1d4039302e794a14395de4b1b543b3845e9cc3d DIST Cython-0.21.1.tar.gz 2743480 SHA256 43f64d225186ec7601249ebd1e8f8a7c33767974b493de6783c5b3dd0415bf35 SHA512 464fb3adccc1771d8126fa3b41312b3b1b00c2aa479c0eed532da5f4c3c70d5dc800e30f5a376f1a4e69613a24d7707247c81a4f2c992074df5182eb258edfea WHIRLPOOL d6f14772b6b55ea259c5925db553acf5b02e6d106d0912ea0bac1b98c9d705bf2376f92a367389c124012ab6a3a4ce114d9b1f949592666c2f1eb57be6ecd34d DIST Cython-0.21.tar.gz 1490358 SHA256 0cd5787fb3f1eaf8326b21bdfcb90aabd3eca7c214c5b7b503fbb82da97bbaa0 SHA512 b9666644d5f096812bdcb05d8498f657a53479cde42ec5cb5939150a9b43a2206933956e2a5ee9e34a331b35a3833bdb3acbd836689cc6c87cfd37200d384b6a WHIRLPOOL cfdf836b0945b4baf13d51f5671c615ec1f37fa91df3fe679832b45800355bd8efb905a1b4a800824725e220d0afa3863cb76c7014af3604c04b15766ec2d675 -EBUILD cython-0.19.1-r1.ebuild 1595 SHA256 666e573438ec84a00418c5b6c4a9bed81e2e64f04abd048aabfa5ca40b5378d3 SHA512 5a06ecddb024c575fe595901ed4ad3fd99094e75c86001e1e528d61a2866421e80b6839ea47d2bab50cc20af6136571b70a2f0326bb362811dd137dfb0c3293e WHIRLPOOL b3a82aa89fbbdf4261578d23c55d379f7f6e57c80f2f4c99e878da63ef1bdfa70c6aa977e8e83b55ee160dfb9d0ad7b439a3cfce59d86163dd1d8c40f7df8be3 +EBUILD cython-0.19.1-r1.ebuild 1603 SHA256 02d0d3c714bc705fbf4d365e38d7694c66173a03af60a9e7d410dd0b120ccba4 SHA512 779c908bdcbe78493f2cfe79725d7ff37672224d12bad30cdfe7fbf31b6d4809a2050e7ce6305f28c42eedee90bc2372180cf1ead17f630dd9a59eca166757ea WHIRLPOOL 97d477cb039a8de70bc50ff12798b9860dc4e49e2036af19163bef0cb01a13312aefa8fc359a800ac9f1452f153297a0372ba4c5482f93dd738132e8f5d59003 EBUILD cython-0.19.1.ebuild 1555 SHA256 48a86641a71bb9e1449bbe80146c17a25100b97a09a842241c05688d254f1c79 SHA512 912c09aba26b1b32f086b9fc72de605f418dd1402362cb72cc17a81c6d2612b5fe0996880cc817da9630927f74228d2c6cb4124b96f0b0292e4d0daa47adedc3 WHIRLPOOL 3b7894b78b999eaf43997b912d45bbcc57d359763e03905114464c1bf5d4cab34377cd703784f1d371acb4d43ecc7b0d929dad96425036e6eb1071bc1721465d -EBUILD cython-0.21.1.ebuild 1672 SHA256 090f93c63e12e11fb25bd030260d6a171516e1be99cf69dc9ea2a6218d18e7f8 SHA512 4686c96b9127c6cf3f3eb145ecef7827aba8fdc0e4e68f63514f8ba3f0f511836deb661235a1c5b8041e6051b38b47eefb55ee18d296098dc9784a9bbae8c6b1 WHIRLPOOL 184108afcd18afb1b266f1eb1cb343e3f81e3cc53dd0e7e9dcf4e98be521e341fce4f555abd2354bfa690a52e2a636d8b463029546bbdc861c347c7ede6d2012 -EBUILD cython-0.21.ebuild 1664 SHA256 dfd2f32d726548611497aa8e9c29708ca891658313bf364918164e49d4385737 SHA512 f39547bed79210ebedc18f6c9df94459767c12ffe39b6f7bddf4e6f845c82b8bbf5f45d0fa04b4696965082dcf85429156eb011cf45986716ec12a73a3985402 WHIRLPOOL 5118f5e11ae31508712c7aba9f6329decb466d7c1ef5d54e3fb2af8c5741f450e7dac04495234fd4b06de40729386b9a53e23151b4f18780b12a23febe395bf8 -MISC ChangeLog 18034 SHA256 98e71fadbb79ba622ba51a7d250772e285988df7ffedb1396c6b921061dc419d SHA512 5ca8b831096f4237799ffb2d26a3805ad5e3db8793ed3cde1079933f942700920a87c303e7e192dab457d1d356eae33028d4717bda21712028c6826d713ea2ec WHIRLPOOL 6849ed13c5ae8700ebda88187ee5f5782b3f18d39c31a3b210808b70482e46b522544719520fa5ddf75df1269089f494c0497d17b994545d5974aa497b789079 +EBUILD cython-0.21.1.ebuild 1686 SHA256 154b62480ee2d072e18501a16f2d0e76ed82776bad42a481e408c7aa1211b37c SHA512 76c8deaa31d79e566a2d94ee3450a459739f2b63fc63e66158fdf79d35f38f5b590a2d1cc57dab543f342aa33a510d01899f272f4154c96918d5f16b38fc9f25 WHIRLPOOL c87cbcd9d60e797971b9be9ccedfe9707edae6be040006ed14d49a906854073b180f63c5bb74f5036fdbfdbbc3ed6100df496b872724c9b7fe1da1e49fdaf03f +EBUILD cython-0.21.ebuild 1675 SHA256 6bd3e5db13144cbe6d6ccad5010c6a407c03a40f52f9fa121b14f0d63b0689c7 SHA512 680407f949ee53239e8c95745db399767ea37047ad292250e5af7dd1485de19a755e80595da6e374566c6f48b2fe95061c03151c7404267fdf8ff2114ff93cb6 WHIRLPOOL 6a90174cd5e227d341fcd49c23d15371259711149f0fe1ec08ecc44d76aeff85541d871cd19a273e547dd60d39703dce2eb59efd85869c61ef273d140b06f1e9 +MISC ChangeLog 18193 SHA256 5c2c0bf1e961d61a493fab59e7d382725141c0bff24bd9251a725c3ca5fc1c09 SHA512 45e63d4c79825c559fde9f39d1de01ec332fd71753005a49216b735724a212c3fae8c63df4422b4dfb39e246c228701fa57c4ecf6e9952c8ba9af3757a4dbfc3 WHIRLPOOL e3d202da30e507a7168e280b197dc8092a695a6a9ac81e5d784f9b45aa319cb1359d575f3e7ce346a82051e0cf31717a5db923da323cb03e7ed221b61b538894 MISC metadata.xml 413 SHA256 3fa4b401e71b4f60b65f7c53fc40a43a356252e45f5f347c86831e68c8caa465 SHA512 c8faba0fe09577803c49c5b83d441e4e2043967dac26394c1b2570b29cb806c4db339a646da7038acf7a7710d8c7d22a21bc6efe97b7321e2e1641a43b23aca9 WHIRLPOOL efe25320a63b078ec2bc3dcc17c84538132df8e640f649c5052e05a9e84068a28bef4e34afefe4f272991f10b2214b0d7afcbc1cb695c0422b16f29f67088744 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCgBmBQJUcH7zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxm8QAIKGVovm5GzGeBgLPnX2/v0u -2rIWVRPw+B93mTkx2+kQzCVNUoTndsnBD9EJJras6TxD2jXMQMUxmeb2YrQ7u6Nd -I5BmUk5/VDcCeXCjy9uZqJ6L5MZN+hRiT6b7GUraTjCAZm0+pKUIRIWpV5wNy9Kc -05oQPZEogTaWlLkbuLvlU8BfYDsPj8aFc7IIKEV7/KtaxsZVVdbLKvzCsqoH/k9n -azeBcG15IlAaYc1SfIK8AExh/fx6MhEzY3hzULYiYR3lhF6YlZeCz/4f/ugTbK+0 -tb+bplRRIhbpQa77nrC5BMwYre1bwQvg827CGGR8/kn/teiN6KsHjtgHjroytAGL -QN/5XOFx36wtoKrbATFtcof/oCSYR/2wTQU6yLrAtuFWEpln/Lv8vz0yC8M4/e/2 -CSuQwK9VMY3V4fAAEgj8vPHT5sf1k6Jwqo0foEbah9BGb0hFHa3OqgWCIcsdV6z5 -zDFz1A9N4Zp4jdI1ZUx4h7x7KMBY+qGgQYRp2xW1Fmh2XmsbyV+jiVIA/thuJ5Ku -uporfRrK35WbYilMKMxXpa20ii/VM+POBMC9FiYY9U+zPTbJ1+0U3UlDNjjylp+0 -5FxNqSzrwazyLoDPspvLcvxx8MqQLN+7N1zCjUGSc52Ik6TDH/XpCCYzmqaUiTpD -VobIfCDOS+NENdXIUnnd -=R9EP +iF4EAREIAAYFAlRyGjAACgkQC77qH+pIQ6TFfAD/SfuyGQrmloRaBTZ9ipvZXGCs +9XreCNOxf14YGBwiiSQA/3nh3yds/WId9MVxo/wNBhymsZO2mt+/kLdLIWRh/+jL +=/KJA -----END PGP SIGNATURE----- diff --git a/dev-python/cython/cython-0.19.1-r1.ebuild b/dev-python/cython/cython-0.19.1-r1.ebuild index 273e84302660..1f6efbc00f8a 100644 --- a/dev-python/cython/cython-0.19.1-r1.ebuild +++ b/dev-python/cython/cython-0.19.1-r1.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/cython/cython-0.19.1-r1.ebuild,v 1.11 2014/11/10 11:22:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.1-r1.ebuild,v 1.12 2014/11/23 17:32:30 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 ) @@ -24,7 +24,7 @@ RDEPEND="" DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) test? ( - >=dev-python/numpy-1.6.1-r1[$(python_gen_usedep 'python2*' 'python3_[12]' )] + $(python_gen_cond_dep '>=dev-python/numpy-1.6.1-r1[${PYTHON_USEDEP}]' 'python*') )" S="${WORKDIR}/${MY_PN}-${PV%_*}" diff --git a/dev-python/cython/cython-0.21.1.ebuild b/dev-python/cython/cython-0.21.1.ebuild index cd36d80479d7..50c8df719bfd 100644 --- a/dev-python/cython/cython-0.21.1.ebuild +++ b/dev-python/cython/cython-0.21.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/cython/cython-0.21.1.ebuild,v 1.2 2014/11/22 12:17:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v 1.3 2014/11/23 17:32:30 floppym Exp $ EAPI=5 @@ -24,7 +24,7 @@ RDEPEND="" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[$(python_gen_usedep python{2_7,3_3,3_4})] )" + test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*') )" S="${WORKDIR}/${MY_PN}-${PV%_*}" diff --git a/dev-python/cython/cython-0.21.ebuild b/dev-python/cython/cython-0.21.ebuild index a6442d4a1c56..21c55e8265a6 100644 --- a/dev-python/cython/cython-0.21.ebuild +++ b/dev-python/cython/cython-0.21.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/cython/cython-0.21.ebuild,v 1.11 2014/11/11 11:14:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.ebuild,v 1.12 2014/11/23 17:32:30 floppym Exp $ EAPI=5 @@ -24,7 +24,7 @@ RDEPEND="" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[$(python_gen_usedep python{2_7,3_2,3_3,3_4})] )" + test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*') )" S="${WORKDIR}/${MY_PN}-${PV%_*}"