gentoo resync : 16.04.2022

4 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 407214e426e8..eb7630898a0d 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,6 +1,3 @@
-AUX ipywidgets-7.6.3-py310.patch 1526 BLAKE2B 102af6c7656f938aa6019a3e1cb82868d879f8bd233ec5ee6df99bb6e7f2f06bc9b4b90f13813844bf607f4b72908ad98823e7e2714b0919e9f61bb469471a90 SHA512 6a539b3c1d617facb0e9ebe0121c390d524a2181e4bfa11c59494a56f41265483bcedda06b9b3b6f60d81eccea971bf94a108014baa4aef78712f624ce0b956d
-DIST ipywidgets-7.6.5.tar.gz 4072535 BLAKE2B bc2347863af42254e740454e1d91ca8b7fc03de9dc6a2fdddaf9dbb13da2fe7af0f429733166865ebcdda9840189fc65dc677b7181b34f1c0dc697905aa3af4f SHA512 4952f1cd293f1a4bf1721222579273c95f59adfa9385963617924f5f28232e1940ec045e18aeae83ad138176e4d887e952fe875b960279f3e0b7d982a790a4dc
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
-EBUILD ipywidgets-7.6.5-r2.ebuild 1044 BLAKE2B a4a1331cc4077b6bfa780bc1d0824bfd7f5420a5fdaae397b1fbe3147620a7125cc7946ce514020592ef2665d580fb0028059cfbf2a1db127633f5ad38112190 SHA512 02cf286b027827a5588008fc14dc116a272742f1b1c1e89261d40f56f07d8d84159985421179936f7af8869a66704f9763ae6197d89ed1edcfaa3f54c15abb5f
-EBUILD ipywidgets-7.7.0.ebuild 998 BLAKE2B 16610a5b3a60cc31b47b4083c6e88167631793dee5d4ba152b0a963092d1167dad181dcf91e11636824d614ecea4801004a350dbfb5f373f45eb9bfd6e80b973 SHA512 e775a3e1b9b70ec9465f14591b6d20becd6a48b8e76554dc115779ff6779ee77b7b6d4ff81e5f4406f4c6f64c941a546665fe3318d5405c9efd83999eab68017
+EBUILD ipywidgets-7.7.0.ebuild 990 BLAKE2B db29723bd37454ce6bb52d34ba08d00f1098970651fd53fc892532cecbce6591704130047860230e67e66f2c0dab785383f4b8de1387582f8065d2d71db7962e SHA512 23d1814f143bf6c54be421bb4a53fc38046dff9f0ea48332d4587d8942bc655b7d1fbf706ea51c115e0379c7a9802f42c6cbe6cb2a504ee301ed4539da3609f3
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch b/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
deleted file mode 100644
index f3d82d0a8ec1..000000000000
--- a/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f9a13dbb3b8f1ffefef483bdb4c14f04f7743ff1 Mon Sep 17 00:00:00 2001
-From: Jason Grout <jgrout6@bloomberg.net>
-Date: Tue, 31 Dec 2019 12:57:52 -0800
-Subject: [PATCH] Fix more python 3 deprecations
-
----
- ipywidgets/widgets/interaction.py            | 2 +-
- ipywidgets/widgets/tests/test_interaction.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ipywidgets/widgets/interaction.py b/ipywidgets/widgets/interaction.py
-index 3dd7272047..6e3b9fc955 100644
---- a/ipywidgets/widgets/interaction.py
-+++ b/ipywidgets/widgets/interaction.py
-@@ -246,7 +246,7 @@ def update(self, *args):
-         except Exception as e:
-             ip = get_ipython()
-             if ip is None:
--                self.log.warn("Exception in interact callback: %s", e, exc_info=True)
-+                self.log.warning("Exception in interact callback: %s", e, exc_info=True)
-             else:
-                 ip.showtraceback()
-         finally:
-diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py
-index 1ee946744e..c792c5377a 100644
---- a/ipywidgets/widgets/tests/test_interaction.py
-+++ b/ipywidgets/widgets/tests/test_interaction.py
-@@ -249,7 +249,8 @@ def test_iterable_tuple():
-     check_widgets(c, lis=d)
- 
- def test_mapping():
--    from collections import Mapping, OrderedDict
-+    from collections.abc import Mapping
-+    from collections import OrderedDict
-     class TestMapping(Mapping):
-         def __init__(self, values):
-             self.values = values
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
deleted file mode 100644
index a3cebfe5cd69..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
+++ /dev/null
@@ -1,39 +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 HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-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 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.6.3-py310.patch"
-)
-
-src_prepare() {
-	# upstream hack to autoconfigure ipywidgets in jupyter
-	# we don't have jupyterlab_widgets packaged
-	sed -i -e '/jupyterlab_widgets/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
index 53ac748a0cc1..60ff4498a5c9 100644
--- a/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.7.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]