dev-python/ipykernel: add conditional block on ipython-6 for python-2.7

Package-Manager: Portage-2.3.7, Repoman-2.3.3

diff --git a/dev-python/ipykernel/ipykernel-4.2.2.ebuild b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
index 1c84abb227f80cfdffb6c129e2422274ac7d58f4..f92f84765ba6ebbb1209c16203173963446c06e7 100644 (file)
--- 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 e6985ef4de50671fa95c149591e553c55c52894e..608aee74cc654bab00038fb5cd0b756c4040258f 100644 (file)
--- 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 2d2adf778c5963135595c6e81d7039ee3b0f2e1c..1e126fb6cc6cb1fd8d56b0df6f5476b15f446141 100644 (file)
--- 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 3e015222c820369ae5aa74385d7bf5061777d67f..83d385129770b46837520eadf633b6f970bcc800 100644 (file)
--- 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-r1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
new file mode 100644 (file)
index 0000000..ec1018d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+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 d0ddc55f8daefa9b1ffaad6f93988d6260726779..fc775127657e6ffbaa5db36c939dedec496f1f2f 100644 (file)
--- 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}]