From 024cdab7e1abf2895a2ed3c5ff0ff1803d0ed2bc Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 23 Nov 2014 17:32:30 +0000 Subject: Use python_gen_cond_dep for numpy. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) --- dev-python/cython/ChangeLog | 6 +++++- dev-python/cython/cython-0.19.1-r1.ebuild | 4 ++-- dev-python/cython/cython-0.21.1.ebuild | 4 ++-- dev-python/cython/cython-0.21.ebuild | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'dev-python/cython') 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/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%_*}" -- cgit v1.2.3-65-gdbad