gentoo resync : 12.05.2022

7 files changed, 2 insertions, 296 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 7ac04a357207..5e11f6b971c8 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,12 +1,3 @@
-AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a94414debec73ae849ceab34f69fe3dfe6ae225c31503f33f09d3c0460b5ed98677a2eba71285948e9b8f75b1704d7328b9a4eb0d9 SHA512 df15b568d93709ffa2a8ad2e28c8f3c6ad7aac8108c0306a1922041ccda82c5871149aa5eb4e507bfad0cf948bccdfac7e49d63f4cb6b9302c71673d6c0fa038
-DIST ipykernel-6.10.0.tar.gz 129057 BLAKE2B e50fd0b5d041236002d29360eb670e5bcf97ad6e0eff091e62a4189567d14832b6fa95915bbd29818b897430fa3f37b930c54155a407cc46d7a9607aa19caf2b SHA512 9f2c9e24244e5c3aafbfd2da6a131cbf19abfeb8164e6a64c69aa4b65dad92101137482c71f53eb5d8395944d6714938a73556e5dbfc8a6c92303c716d6244b5
-DIST ipykernel-6.11.0.tar.gz 129429 BLAKE2B 746cff0b32a1282f8abe02bd339d35061ceb04d3f4d7fc325bc97b744185958ed91beaff83c19d269e0d8ec7b35c5c88412c135c1aa2dcbf770846986eddc82f SHA512 69b88e3c8b552f5277f392a004a33a5c64c2edc93aeea0d2c2d03b0d8ee649f41fc1378068c1dd8322807cce188f5579c0d92730760baeca8170a98f585f500b
-DIST ipykernel-6.12.1.tar.gz 129979 BLAKE2B 96ee301974c9353374b6869003995238068f4abcdaa0cf4c2b6294c1ef8c4e6358e93a41feaa49fcba587fb94ca719f3180eac2b47fbbf6c54fa9fb315d784ad SHA512 309701a287e8b87d0f8b07eac402e2fc163515f471f3b5b3187bc210c47714d4cfb496f40e34ebad47be5e7eca8157ef0eea7da141fb16a6fd943f4a2095f360
 DIST ipykernel-6.13.0.tar.gz 131331 BLAKE2B 95a662b5ff6062fd8f6712a214b2bdcb227064acec145ebbb2ff7dfc0647ee9c486bbb560502e8ab6c5f74bb44c7715a1ee16f4b8cd2661b7a6e77206be7ab67 SHA512 6025a540d7ae08f637d2cc9a022805df54c11844c93d989be73a3a800fb0985ec56f2ce5d8ee940a5ce51d41b4d1f632131b25c1f5847cb51623c285c4944f39
-DIST ipykernel-6.9.2.tar.gz 128759 BLAKE2B 74740bdbe420d14cbb75e5a1dee9bfb0894c3e10ebf029bd7ceb29eb5112489ef83bc9a2075f6dd1cf16745f893d3782ee22144edfec66d650246eaa0d97215c SHA512 a452d7a44c4e33cb2d79262916045fe3044803f20db7d525bca3277dd49e9d216d07a832312b29a5a61293ecf7863641a45e0f188136059799287c5983beb0d4
-EBUILD ipykernel-6.10.0.ebuild 2200 BLAKE2B 77c1722799ea3d15759b3ab31da3627dbf9a9fd994072a215b4b4fe1323b336e01b62594cdf9d0ba4ac3a063bc9652f88479d40a67c77c8b1a6ea716ea48380e SHA512 49901d9c9d20c82449be2d408bc4ad48558772f2f998561673e7c049983ba3683e68766ad0858b62f16f12f6b6cd9da9b9d8212137fd850745d625cd8b7a200f
-EBUILD ipykernel-6.11.0.ebuild 1954 BLAKE2B 9274963c4e0e9610c258eebe67233a42be41cabf038cf9fd923cd5b71bfdd2800b0473740fb63649a62cf1a72ddb00376497daa6ea34b6fe72f566257f710376 SHA512 e5ca662cabb40d34df9271ec094f67c82d71a20327582ebc2419265fcd809adbf352949ac31c0cc58f93c7d7d950a9c32c171c060e2e377a6c06a9948d9f226a
-EBUILD ipykernel-6.12.1.ebuild 2027 BLAKE2B f0e464beeb603d1096bd5650dc3a2c3f52cb860156e43075c52d88bd8da014cd560f87f7b772025af89c723234f4d2b3e6d34f8588752a1e5599826a9ce5c720 SHA512 488d7c57ce1df00cec65e0556d1540ac2085da3e24dbd7806766b3da683a049d22ff60b687b4bb99f9d22fa4ff1a48b5e8587b1f70f793b3624a156e40aa8e7a
-EBUILD ipykernel-6.13.0.ebuild 2027 BLAKE2B f0e464beeb603d1096bd5650dc3a2c3f52cb860156e43075c52d88bd8da014cd560f87f7b772025af89c723234f4d2b3e6d34f8588752a1e5599826a9ce5c720 SHA512 488d7c57ce1df00cec65e0556d1540ac2085da3e24dbd7806766b3da683a049d22ff60b687b4bb99f9d22fa4ff1a48b5e8587b1f70f793b3624a156e40aa8e7a
-EBUILD ipykernel-6.9.2.ebuild 2192 BLAKE2B 5770e09eb90f1d2155cebd9dbce1a4c41ef2b90bb5122c2b25102e55c8d5e03632f6cc65673ee1e89396a0ab17c4ea4b28f19234690d66253648800697e46daa SHA512 928f2cd0c55b57f36f52955d17a491416e661e3520d0c8b6bb12a8a85fb9e7d5017dda0a1f5570759ae8a7eb55cece93d93ed2c3217b48ed82b595c0028a5369
+EBUILD ipykernel-6.13.0.ebuild 2019 BLAKE2B 31d026ca92036bdcdad7a1afd3d0ab6fb4e5fd924608f7196a6102169b2fe1a62f1bc155aeff2cfa9497ec6100ec8ba82d906e4bb1cb86ba16f4976323fd82e1 SHA512 df4d02205e9c0efd5a65a32730e0e2139ab94f713c6590431c303b0bbc3c2ae4a01c48cfb69ae6cb7c9253854cf2131601c35155ca91bd734df7ec7d84a699c7
 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
deleted file mode 100644
index 3b792d21f47e..000000000000
--- a/dev-python/ipykernel/files/ipykernel-6.5.0-drop-pytest-cov.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-6.10.0.ebuild b/dev-python/ipykernel/ipykernel-6.10.0.ebuild
deleted file mode 100644
index 24ffa9580d59..000000000000
--- a/dev-python/ipykernel/ipykernel-6.10.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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="
-	>=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/traitlets-5.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${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}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/psutil[${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
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.11.0.ebuild b/dev-python/ipykernel/ipykernel-6.11.0.ebuild
deleted file mode 100644
index 63c34c5dcd79..000000000000
--- a/dev-python/ipykernel/ipykernel-6.11.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-60[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.12.1.ebuild b/dev-python/ipykernel/ipykernel-6.12.1.ebuild
deleted file mode 100644
index f3c45991a014..000000000000
--- a/dev-python/ipykernel/ipykernel-6.12.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.13.0.ebuild b/dev-python/ipykernel/ipykernel-6.13.0.ebuild
index f3c45991a014..b1c29e409f85 100644
--- a/dev-python/ipykernel/ipykernel-6.13.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.13.0.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.9.2.ebuild b/dev-python/ipykernel/ipykernel-6.9.2.ebuild
deleted file mode 100644
index 61cbf240cb0a..000000000000
--- a/dev-python/ipykernel/ipykernel-6.9.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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="
-	>=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/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}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/psutil[${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
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}