commit: 29e16e14253a3fd9de6c43b211347e37440da447 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 22:32:55 2017 +0000 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 22:32:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e16e14
dev-python/ipykernel: add conditional block on ipython-6 for python-2.7 Package-Manager: Portage-2.3.7, Repoman-2.3.3 dev-python/ipykernel/ipykernel-4.2.2.ebuild | 3 ++- dev-python/ipykernel/ipykernel-4.3.1.ebuild | 3 ++- dev-python/ipykernel/ipykernel-4.4.1.ebuild | 3 ++- dev-python/ipykernel/ipykernel-4.5.2.ebuild | 1 + .../ipykernel/{ipykernel-4.6.1.ebuild => ipykernel-4.6.1-r1.ebuild} | 4 +++- dev-python/ipykernel/ipykernel-4.6.1.ebuild | 1 + 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dev-python/ipykernel/ipykernel-4.2.2.ebuild b/dev-python/ipykernel/ipykernel-4.2.2.ebuild index 1c84abb227f..f92f84765ba 100644 --- a/dev-python/ipykernel/ipykernel-4.2.2.ebuild +++ b/dev-python/ipykernel/ipykernel-4.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,6 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/nose[${PYTHON_USEDEP}] ) " diff --git a/dev-python/ipykernel/ipykernel-4.3.1.ebuild b/dev-python/ipykernel/ipykernel-4.3.1.ebuild index e6985ef4de5..608aee74cc6 100644 --- a/dev-python/ipykernel/ipykernel-4.3.1.ebuild +++ b/dev-python/ipykernel/ipykernel-4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,6 +19,7 @@ IUSE="test" RDEPEND=" >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/jupyter_client[${PYTHON_USEDEP}] >=www-servers/tornado-4.0[${PYTHON_USEDEP}] dev-python/traitlets[${PYTHON_USEDEP}] diff --git a/dev-python/ipykernel/ipykernel-4.4.1.ebuild b/dev-python/ipykernel/ipykernel-4.4.1.ebuild index 2d2adf778c5..1e126fb6cc6 100644 --- a/dev-python/ipykernel/ipykernel-4.4.1.ebuild +++ b/dev-python/ipykernel/ipykernel-4.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,6 +19,7 @@ IUSE="test" RDEPEND=" >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/jupyter_client[${PYTHON_USEDEP}] >=www-servers/tornado-4.0[${PYTHON_USEDEP}] >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] diff --git a/dev-python/ipykernel/ipykernel-4.5.2.ebuild b/dev-python/ipykernel/ipykernel-4.5.2.ebuild index 3e015222c82..83d38512977 100644 --- a/dev-python/ipykernel/ipykernel-4.5.2.ebuild +++ b/dev-python/ipykernel/ipykernel-4.5.2.ebuild @@ -19,6 +19,7 @@ IUSE="test" RDEPEND=" >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/jupyter_client[${PYTHON_USEDEP}] >=www-servers/tornado-4.0[${PYTHON_USEDEP}] >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild similarity index 87% copy from dev-python/ipykernel/ipykernel-4.6.1.ebuild copy to dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild index d0ddc55f8da..ec1018dbdab 100644 --- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild +++ b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild @@ -19,16 +19,18 @@ IUSE="test" RDEPEND=" >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/jupyter_client[${PYTHON_USEDEP}] >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] >=www-servers/tornado-4.0[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/nose_warnings_filters[${PYTHON_USEDEP}] ) - " +" python_test() { nosetests --verbose ipykernel || die diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1.ebuild index d0ddc55f8da..fc775127657 100644 --- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild +++ b/dev-python/ipykernel/ipykernel-4.6.1.ebuild @@ -19,6 +19,7 @@ IUSE="test" RDEPEND=" >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') dev-python/jupyter_client[${PYTHON_USEDEP}] >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] >=www-servers/tornado-4.0[${PYTHON_USEDEP}]