gentoo resync : 28.04.2021

6 files changed, 2 insertions, 157 deletions

diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index cd3e21b71749..d3e37941cd43 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,9 +1,3 @@
-AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
-AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
-DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
-DIST jupyter_console-6.3.0.tar.gz 35313 BLAKE2B 980eac57de949654bf99d99eb74d8600d73d0699ab394e0ad4c5e937fdc278477442e0e95887c95f631ba1bc2b2469c36cc6e4bca8d5f11f97c4943c2f312c4f SHA512 777d9cf8b842eccea108a1857c421fec1bcdf8c226a6947d7ff4ee5d5da4bdbb50096e9e63638053d8eb200e55c093c753010ffb1460dae5579de16aad4e64a6
 DIST jupyter_console-6.4.0.tar.gz 35765 BLAKE2B 48278110338184dbcae242a059c3ba7e0c642d24eaac828786ff9f3c588747f447727a8da1d366ed305eeb5d003d4fabd9b9eea063e8fd5178774108cbef77da SHA512 e2b301cfd3a56ee4cf33d5cfb297726d0f4478562167ed0f0a9320d389118fa661a85b6a5ef24db60673a76d84545bcdb9741bfdd9f8d13ccdbbc5c5e52d7227
-EBUILD jupyter_console-6.1.0-r2.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
-EBUILD jupyter_console-6.3.0.ebuild 869 BLAKE2B c8b5bc4a91b7c62f96c69ab6a02f375848d3a8599d2e3195c8d61e435888fd02e48fb1f8989b84ae9309b3cd550cb2fe31e3795164d7b0911c5662891517ba25 SHA512 c226e6b28994f958f6463a89ecbf92ac3a09f5eb6c96f0de19bf2d41725c1373825d6148bc2c59ab1800cc2d7d4955be6e0b1c14089cd3cceeea1abbb03e0e59
-EBUILD jupyter_console-6.4.0.ebuild 869 BLAKE2B c8b5bc4a91b7c62f96c69ab6a02f375848d3a8599d2e3195c8d61e435888fd02e48fb1f8989b84ae9309b3cd550cb2fe31e3795164d7b0911c5662891517ba25 SHA512 c226e6b28994f958f6463a89ecbf92ac3a09f5eb6c96f0de19bf2d41725c1373825d6148bc2c59ab1800cc2d7d4955be6e0b1c14089cd3cceeea1abbb03e0e59
+EBUILD jupyter_console-6.4.0.ebuild 867 BLAKE2B 78a779f2df622449e1f3a948b6f8057a52fe9115483bfd990d447eeefc9a5baeb3108a5ca308bb212c8ee74af6ba06e895f03a5f9eab6e0e35f1afc116c22b1b SHA512 29e95918882b55afa8993980ae1719aebe7d0d15866d057b3311d046f7a21b163d65b018173ee2c482c5a6becc4432b0781884ebd2db7c6c874db1c9a40d7b2f
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
deleted file mode 100644
index 684ecfc0a841..000000000000
--- a/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Very slow CIs take longer on this test
-
---- a/jupyter_console/tests/test_console.py
-+++ b/jupyter_console/tests/test_console.py
-@@ -65,8 +65,8 @@
-     except IOError:
-         raise SkipTest("Couldn't find command %s" % cmd)
-     
--    # timeout after one minute
--    t = 60
-+    # timeout after 5 minutes
-+    t = 300
-     idx = p.expect(r'In \[\d+\]', timeout=t)
-     return p, pexpect, t
- 
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
deleted file mode 100644
index 92d3532649e9..000000000000
--- a/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3b648aab9ce731beab1f02d714a97905ab0e42e1 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Thu, 2 Jan 2020 18:30:41 +0530
-Subject: [PATCH] Fix deprecation warning in base64
-
----
- jupyter_console/ptshell.py                  | 6 +++---
- jupyter_console/tests/test_image_handler.py | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py
-index 84af32f..6a55fe1 100644
---- a/jupyter_console/ptshell.py
-+++ b/jupyter_console/ptshell.py
-@@ -818,12 +818,12 @@ def handle_image_PIL(self, data, mime):
-             from PIL import Image, ImageShow
-         except ImportError:
-             return False
--        raw = base64.decodestring(data[mime].encode('ascii'))
-+        raw = base64.decodebytes(data[mime].encode('ascii'))
-         img = Image.open(BytesIO(raw))
-         return ImageShow.show(img)
- 
-     def handle_image_stream(self, data, mime):
--        raw = base64.decodestring(data[mime].encode('ascii'))
-+        raw = base64.decodebytes(data[mime].encode('ascii'))
-         imageformat = self._imagemime[mime]
-         fmt = dict(format=imageformat)
-         args = [s.format(**fmt) for s in self.stream_image_handler]
-@@ -835,7 +835,7 @@ def handle_image_stream(self, data, mime):
-         return (proc.returncode == 0)
- 
-     def handle_image_tempfile(self, data, mime):
--        raw = base64.decodestring(data[mime].encode('ascii'))
-+        raw = base64.decodebytes(data[mime].encode('ascii'))
-         imageformat = self._imagemime[mime]
-         filename = 'tmp.{0}'.format(imageformat)
-         with NamedFileInTemporaryDirectory(filename) as f, \
-diff --git a/jupyter_console/tests/test_image_handler.py b/jupyter_console/tests/test_image_handler.py
-index 5296635..b2a5ea9 100644
---- a/jupyter_console/tests/test_image_handler.py
-+++ b/jupyter_console/tests/test_image_handler.py
-@@ -32,7 +32,7 @@ def setUp(self):
-         self.shell = NonCommunicatingShell()
-         self.raw = b'dummy data'
-         self.mime = 'image/png'
--        self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}
-+        self.data = {self.mime: base64.encodebytes(self.raw).decode('ascii')}
- 
-     def test_call_pil_by_default(self):
-         pil_called_with = []
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
deleted file mode 100644
index bf2123863415..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-	"${FILESDIR}"/${P}-increase-test-timeout.patch
-)
-
-python_prepare_all() {
-	# use setuptools unconditionally
-	sed -i -e 's:distutils\.core:setuptools:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	script -eqc "nosetests -v" || die
-}
diff --git a/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
deleted file mode 100644
index 7a54103742fa..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
index 7a54103742fa..5df21b45ca8a 100644
--- a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]