dev-python/ipykernel: specify python major version in kernelspec

  Revision bump and remove old revisions.

Credit: Eric Hermes
Bug: 628222

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 8 insertions, 36 deletions

diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index ec1018dbdab0..01461f099319 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -32,6 +32,14 @@ DEPEND="${RDEPEND}
 	)
 "
 
+python_install() {
+	distutils-r1_python_install
+
+	# bug 628222, specify python 2 or 3.
+	sed -e "s:python:${EPYTHON}:" \
+		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
+}
+
 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
deleted file mode 100644
index fc775127657e..000000000000
--- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	nosetests --verbose ipykernel || die
-}