gentoo Easter resync : 12.04.2020

6 files changed, 9 insertions, 148 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 742c94e5356c..54e7bad10492 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,9 +1,3 @@
-DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
-DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
-DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-DIST ipykernel-5.1.3.tar.gz 103924 BLAKE2B f68b0299cfbc3e8dc5a4feb08ece6c8a6d0ff3cc6d08a696707ac4c07c1f214dd39b33d61f58b11b4be7fc230d48980fe766209af7eb8302e1d3088e5d879658 SHA512 0fe14aaeace83af4488a53e8710868e67378fedf1ca6fec6a1b8fad6a2d3d4d2a2bd087a1169fb916288ede99d86d3e3ea2ddb6679555bef6d7e75fe55befe98
-EBUILD ipykernel-4.6.1-r2.ebuild 1072 BLAKE2B a5d8f6fe957eab471c538bacf72b24acfe3f37534d69ac63eff38c7b9d051b8b01a237fe98976bf51a7f9954a7b343f8f13802c7f8977cbe61dc71825408773e SHA512 4cac17033ded0eb7b4f21c95374a184765e0d6a8cc9d9c24d55a839d98e381ba3a449d59e23a92a75c28c29ac898aac6a95cb37f8fec6d4335c5034fedd4c63f
-EBUILD ipykernel-4.8.2.ebuild 1070 BLAKE2B 048402bb348c3394be25f16977ff32858245ba299d8e19c42fb0231bc3103bdbf9eb5e7ddcaf2b79aed7fd4d102c56ff98b79cf7cedfd8e5bece55ee440a2505 SHA512 b5b222618dcbd81b137ff83cf52a06c80459e1d05efe6464b7028fc40531c31f6ee5da346cad529db0a6988f013d95f7855c968bece8efce868b5cb13395fdc1
-EBUILD ipykernel-5.1.0.ebuild 1075 BLAKE2B 9b9f6773ad4a1e8711752488f0a52b215631a5a6f116ad0b77afc49f6a02c67a56ff9a62e5a4a3867edd7810f8debfc59cb52a38a0841e9c9d7e9a24f66f4efb SHA512 a4727e6627c7b08ce769bcf1907c07ed2cc83d1e9be808b4da21a2e43bb765cc6a547c457cb1564b9cbf2480c2b90d149fe2f27a718241ecc0f01b54cc6835b3
-EBUILD ipykernel-5.1.3.ebuild 785 BLAKE2B 77e969979703dbad45f86d45033b7bd5a68a5c58a17cc9403114b23aff63ea1ed8a91314cf23169b04fc938f16c467a81dafbbfa2a4e8c48077c752b4efd270b SHA512 972bf09b66672797b45c26ab45f16944e5c6c459f0c13294bda562225ad0d3ee7bf041dc5525918496d7fd9c71c64bd723517e3837a056ced2e1b3e5009d8480
-MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
+DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
+EBUILD ipykernel-5.1.4.ebuild 831 BLAKE2B 6e86274287543c6645ab4ad83175e6561bc6053ac54b6cf31ee397744c6eb8f74e03e897021ec1ba90cd5f2dc19a1ad643eaa06151bb41057b2664a24d0d7809 SHA512 b9d762eb0bfd0bdc0bb077cb234962f4b572c0e7e0e8befca4a3f0e0a99c6ed9c812028b0c15d4e178aafb0358090ea8be96f61b815ec53d4cc1c7f457442b8a
+MISC metadata.xml 501 BLAKE2B 86da6845e84d32dc9571aef5828ed06703c942882a34b2392cf83d3cd2f59a01fd0d353445e67cbd45a9479ae1a8600a0c4dabf72f68eca0985d1f3423a146ee SHA512 2f8e8ee7fade5fb1c4b1065a1176cba942556bebb417824a900fca11e467ba6dc54a6ad4e49c0c0575bed769abf01fe52a9b6c0c090c7a530e8806226fa089a7
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
deleted file mode 100644
index 78065f9f8b82..000000000000
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/ipython-6[${PYTHON_USEDEP}]
-	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_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!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.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
deleted file mode 100644
index c68c7e78f398..000000000000
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/ipython-6[${PYTHON_USEDEP}]
-	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_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!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-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
deleted file mode 100644
index 0d9b33445c53..000000000000
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/ipython-6[${PYTHON_USEDEP}]
-	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_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!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-5.1.3.ebuild b/dev-python/ipykernel/ipykernel-5.1.4.ebuild
index 66c8297d35ae..abd296dab6c7 100644
--- a/dev-python/ipykernel/ipykernel-5.1.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.4.ebuild
@@ -14,12 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 "
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-6[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 973783bf3b19..25e389950c4d 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -5,9 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    This package provides the IPython kernel for Jupyter.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ipykernel</remote-id>
     <remote-id type="github">ipython/ipykernel</remote-id>