gentoo resync : 22.12.2021

4 files changed, 36 insertions, 9 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 06f93c76864d..23dcb8c03c65 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,8 +1,8 @@
 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
 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
+DIST ipykernel-6.6.0.tar.gz 123747 BLAKE2B b1e836ac08e24baf3311e34e1323362bec94f8a59ba4cd824703f03370031226f9af41f864930c6fb59216d185e3c7e8798d6b91e88aa6ca0c214df33c6d7d37 SHA512 bf55e26a4bca0d02f4bbb87ce53a224d22a4765596f0f5d7a6d576bfa100436f676df59fa934e1d6ec66f8d802a1c7f787a9a31b906ecaa1ffd8a77fa3d96127
+EBUILD ipykernel-6.4.2-r1.ebuild 1643 BLAKE2B 518a656392d3ab77593bb3c27114d5938016ece504c32144685ae1b7d4826ced4dbb394e9b689041943f1e84e9cde651e781e016bdf1f0e6d60c8322163dfb48 SHA512 dbba4abf3d6efb658e692086a78f6e4877df3fe61a84263008ec21f85c7de5a445f1d2943bb32715de89dc091dcd0e7c5b082543a1bd37e4b7c355e564304ad2
+EBUILD ipykernel-6.5.0-r1.ebuild 1832 BLAKE2B ea220d7c228ff8ec86671cc4fbc75cd4814f11655cd211ee6343f47367d715bca5bbfb56232f69504c19d6f917a5d753967c4ae5384e1673d65e4ab785bb7733 SHA512 017a8d52cfda02f49e51fb3a000844898fa42362220c611024910eaba805669ad66ac257ee7a425820654cd9cc4a979fec5dd82a12dd9d16dc41a17c8ba70832
+EBUILD ipykernel-6.6.0.ebuild 1789 BLAKE2B 52353c8ba04ff29bd3f94a7fedbe9f8af3c966f0ba6254ab13dca3314a31765ccd5da49e42e081b6ef7819f360cecc04ea692d9783aa6d3cc68c2e26a7c3dd3d SHA512 1cc3552b0b6967501c5ac31bef55dbb674f6821b32e96dd92ca8aa7101fe4f4860f4c4add6753673ceba7a21c2613a01aee0c869e04524d7643f95aa36464ba8
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
index 1950162a6714..2e632c2d5273 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -46,3 +46,10 @@ src_prepare() {
 	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
 	distutils-r1_src_prepare
 }
+
+src_install() {
+	distutils-r1_src_install
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.5.0.ebuild b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
index a8227c00e8fe..524e5e76b01c 100644
--- a/dev-python/ipykernel/ipykernel-6.5.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
@@ -53,3 +53,10 @@ src_prepare() {
 	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
 	distutils-r1_src_prepare
 }
+
+src_install() {
+	distutils-r1_src_install
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.4.2.ebuild b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
index 92a6db929663..a2aa44976ede 100644
--- a/dev-python/ipykernel/ipykernel-6.4.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
@@ -13,15 +13,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	$(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-4.1.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}]
@@ -40,9 +42,20 @@ BDEPEND="
 		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
 }
+
+src_install() {
+	distutils-r1_src_install
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
+}