gentoo resync : 05.12.2021

6 files changed, 75 insertions, 61 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 45e8f2836792..06f93c76864d 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,8 @@
-DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
+AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a94414debec73ae849ceab34f69fe3dfe6ae225c31503f33f09d3c0460b5ed98677a2eba71285948e9b8f75b1704d7328b9a4eb0d9 SHA512 df15b568d93709ffa2a8ad2e28c8f3c6ad7aac8108c0306a1922041ccda82c5871149aa5eb4e507bfad0cf948bccdfac7e49d63f4cb6b9302c71673d6c0fa038
 DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
 DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
-EBUILD ipykernel-5.5.4-r1.ebuild 1533 BLAKE2B 5a3d2bacbd430b1b575370c3901dc507c9e2930e59e141064455dd71114b1d3b58373009b85242480fbc9a93ca4b5d68dadbf0730965a0ccc98ed28b14c1b920 SHA512 3b62c83b0580c3457f9d24471b09172cc56f25cdfcc0348cb8961c269af3caf85a8a4119a11a3c890558b73ec9c09dbfa2d4191035dfad69641e2a9c8f333bb3
-EBUILD ipykernel-6.2.0.ebuild 1385 BLAKE2B 49ddb907acf20992918bff947891bcdaeaa8abd34688449b8e7208b8ad92a52639a487d97af87c39a2638d1cf9c8636e43ceb2c70e2420cdf4e015504c23024c SHA512 3d0e55878c3cfb945dfd187140316122538bdd80ad604181d6c62df06a3ca7c643b9de73c512b0363242f9de71fa75bcc21b8b35478e58c1af7ad673449f7215
-EBUILD ipykernel-6.4.2.ebuild 1436 BLAKE2B 5f952e30d98f92c83f977712c8fa9c110f3faca97c577988475cf9ed3fd14e33206c150d4b1e65f9c370f0fff26db9641256f357e8e72318c9d0c3dd7db31b47 SHA512 1c01f379d4ebc9097467e15953ce5e46bdc002352cbeec39062c9c642ded2f3dfdb59e91d1461952bee6234b5e204632220c9be43d04ee37071d31ae18a24d00
+DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
+EBUILD ipykernel-6.2.0-r1.ebuild 1433 BLAKE2B c7b76008b82090342a46204092061196a1b99985ae0cf15478bbaf745c1ad55a92377bf2821edef4e681cf2feb7c813cb33f76691ea129b73a64db88f6ee1eed SHA512 c784872b8d5af827a24b70989c48105633cd031eb72d206effb9475ae108c7ad3f9195583201372e5404d8863a0382639956d4afd1fdfd55faecacc0076bd568
+EBUILD ipykernel-6.4.2.ebuild 1442 BLAKE2B 129e213b04d1d28b736a13340ba73930de9f15e2b8b7895254e725399e6c3c1e5ea70d4851332ca422c7ca52075bcb9bec3b7626a1dcd5d1d4c85395578fd966 SHA512 ad6a5a34e4530f175cb367d1ff12d957b39a1a97c46b6ae520ccecd532bcc0b64fa2c8a0f17364ddb71b5c35ff5418fc8ca83d56d88a1f00ea003545e02eba23
+EBUILD ipykernel-6.5.0.ebuild 1623 BLAKE2B c26df3971b590cb4da0be5908c3da3808eb50b399ce5d1e24970fcd85d0a3efe6940789fa6772b9cbd3d18dd3ee1254f9b9573be1074d0fc332a4a5defcf907f SHA512 9478d9b741f45255681e6735ec935dc4f44d3376889b70c1f9dc6e22ac8921ff0940d2d11eaa0fea4a3de8cc89a24c2e11d6d07b6141aafb3c7e6b156c452517
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/files/ipykernel-6.5.0-drop-pytest-cov.patch b/dev-python/ipykernel/files/ipykernel-6.5.0-drop-pytest-cov.patch
new file mode 100644
index 000000000000..3b792d21f47e
--- /dev/null
+++ b/dev-python/ipykernel/files/ipykernel-6.5.0-drop-pytest-cov.patch
@@ -0,0 +1,12 @@
+Drop unnecessary pytest-cov dependency (we don't care downstream about running coverage
+reports in unit tests for users).
+--- a/setup.py
++++ b/setup.py
+@@ -76,7 +76,6 @@ setup_args = dict(
+     extras_require={
+         "test": [
+             "pytest !=5.3.4",
+-            "pytest-cov",
+             "flaky",
+             "nose",  # nose because we are still using nose streams from ipython
+             "ipyparallel",
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
deleted file mode 100644
index cabbd9e137fe..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# TODO
-		ipykernel/tests/test_serialize.py::test_numpy_in_seq
-		ipykernel/tests/test_serialize.py::test_numpy_in_dict
-		ipykernel/tests/test_serialize.py::test_class
-		ipykernel/tests/test_serialize.py::test_class_oldstyle
-		ipykernel/tests/test_serialize.py::test_class_inheritance
-		'ipykernel/tests/test_async.py::test_async_interrupt[trio]'
-		'ipykernel/tests/test_async.py::test_async_interrupt[trio]'
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
index 245f56213f05..1950162a6714 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
 	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.4.2.ebuild b/dev-python/ipykernel/ipykernel-6.4.2.ebuild
index de2e7bc889bb..92a6db929663 100644
--- a/dev-python/ipykernel/ipykernel-6.4.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.5.0.ebuild b/dev-python/ipykernel/ipykernel-6.5.0.ebuild
new file mode 100644
index 000000000000..a8227c00e8fe
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/argcomplete-1.12.3[${PYTHON_USEDEP}]
+	' python3_8 pypy3)
+	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
+	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
+	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}