gentoo resync : 03.07.2021

3 files changed, 6 insertions, 52 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 62ef8cf031d8..89a1713948bd 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,3 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
-DIST ipykernel-5.5.5.tar.gz 112909 BLAKE2B ff898dc10f767838353de13571de4c42ea59aae9b367046265808d9f1f7abfbd3934b7b4370fe024b647b5268316c573f7d52b2e62284a6c430005a901dfd6bf SHA512 580c3a3d5d10c325524287c091a885955981bedb8c7bd8eac569ee19393b258dbfbc7ea8700137071c2c55bfa94b5a7bfae1c687bc5e2d532525c6fc3e043835
-EBUILD ipykernel-5.5.4-r1.ebuild 1179 BLAKE2B e22ff0adfde053c8ae020cf4169198729109fd8259725f786ba007d5fdd63eb6ecf4537547c4add4c41b69939942739787d05862ff270e9da9dfb6f0f0565a31 SHA512 d40baf32263c4de155f0037ad7bce58eee9362fb16c98a54dd3dd3112e62459a579b9404a25c64b9ace1fc73b4f74766598656df23a0d85dbf623ec9e5d36b56
-EBUILD ipykernel-5.5.5.ebuild 1140 BLAKE2B a33ffe5b5e8ce99108729bd99e1074695df2a936497811f367eaee228b6e2870952bee60f48a48aea4f6194b1f813adb2ebd1b00ba2c5fa96aa7cbc7f2aa3a7f SHA512 7486b112f5189d01fb3aa9ecf058f0aeb286ce688aed329f5dfb8787a7ed28bab769193aacdd259f8856be479d30d0d5bf8c9f042602a64feeaf0276e428d8a1
+EBUILD ipykernel-5.5.4-r1.ebuild 1310 BLAKE2B 116a07cabfa93df7d827496d4d184b92ac728dc0ce1fff27e64568b1a32cf56d46f864ff34c2da9f5c5c64d88d89b49854b5c63033ad8048c17609463b6c77ee SHA512 535610b18eb24fa06fb47fe6ab0afd34b7916c91d781e844c99323e2c91ea6182164eb761e9a001a06738f381560a55c2af2d58860f060b0254da29e8e129636
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index 65b4062023eb..2da34f268a79 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-
 inherit distutils-r1
 
 DESCRIPTION="IPython Kernel for Jupyter"
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 
 RDEPEND="
@@ -40,6 +39,8 @@ python_test() {
 		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-5.5.5.ebuild b/dev-python/ipykernel/ipykernel-5.5.5.ebuild
deleted file mode 100644
index c392b74130f6..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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=""
-
-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}]"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-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
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}