gentoo resync : 22.12.2021

5 files changed, 2 insertions, 103 deletions

diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index b93a25129b41..8c76caccafa0 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,7 +1,3 @@
-AUX bpython-0.21-fix-py3.10.patch 1896 BLAKE2B e57af6c6a3e8769e4e82e919eade1414dd7c6823e2060fbc7fb60d1b7038765cc8eafeb2c19c04174fad7d668fe97a49b904efc2cc58ecbb5f8272145412c3d3 SHA512 49ecc91fa3c7e3e4b0d5b6fa7fcbf4ebce3fee3d8682f92960c2e469497239e770639c5ed30a57925dbb3a46d32ddde8bfdc477d69deebaba7e2cf4b75fc2f58
-AUX bpython-sphinx-4.patch 393 BLAKE2B 09bddc348da1ac845554edc57ba37a6eb9eaa748c86647cc437557784ebb924b25ae80a7830ecb80ed73bfb6b06bf3fda2c124e9e1577b51b6322909e324ccdc SHA512 fb72027c11e52222adf25212299dc7ff3d2ee8710997d0f5f3882038448c57173a49e6619989bf0273b8bf8be676b8a7d1caa6860356d56d7421e30e2417fa4e
-DIST bpython-0.21.tar.gz 208206 BLAKE2B 22db7abe3786df337af50f6217fa8c6702871b50de41245797270e70622084a22b3d6615cfe634044599a532c5bc14677b01dc77042d228213eaae2cad11b623 SHA512 a0eea1b9c2329ce5665456e99703ef476faab38f880eb8a330a6536970888cfdaada9f0e377d3c1acd8b6c79eb0c562ada43e82bac9df4cce5878594c3399ddf
 DIST bpython-0.22.1.tar.gz 217294 BLAKE2B 907b51753182add775d3e2ba08c3999d30ba23ab13d59f364d03ce5f22191e1a90031f7c3b5477fd00c94342a5ee204aa2618a7cd1a9470bbc898cfc266ba9bd SHA512 6b29235c41b645c3658812b8c80637d1e76029a6386f8628e5c681b2f3fdea653f89a12f4e28f55381464755e04fa7a33f023f096e75d889d5a588222c0d06c3
-EBUILD bpython-0.21.ebuild 1132 BLAKE2B 0368fe587ec53216f44d7a9dd5ca12aa0b019cf9545e77548e7f52d1737ba69d6686c05374fa604747674f873fbc29186dc6ed2111683aa4ffdb4a717d2572b1 SHA512 05bcd291576827a8cb522f510aba1d11e26bbb35a4c8997cdaff6bd82c12df1f7b3c4dd40f3fad3b334395ae31f23f9d0716f44421cabffc4d032919cf47293f
-EBUILD bpython-0.22.1.ebuild 1218 BLAKE2B 2f6869142130fe7a1fc354143f9a1053c6c4b21eacb43c179555790518253f3c33ef5b2eea4787262895bff69c812dcad2036d7186c363b16523b00a2d2f378e SHA512 757055510a67c98c97f148e187ac86ce840e56402f5fcd5a07637d6a49536b9613405d79b34b463d435ab9575d253aac76fb3ab2e387869746bcf45b25b02e18
+EBUILD bpython-0.22.1.ebuild 1216 BLAKE2B 302e83c381a00ba00c26b37818b5964e8c6034c0f4e526815226ae2423cde001300074d836515cffd4f3fb3863b2b859bb7a3260940fdef1bbd5c28292661419 SHA512 efbcd9013a0187a97e257762dd4523b6aa877fba99dd6ab2f275a0759298ced880ad87bca424d61bbc268d524191683ed5176e6614ec2c38860fd379aa5c4287
 MISC metadata.xml 866 BLAKE2B 0abfdfadfdd88b477380ca383047987b12e2a4f6f8e666e1e8ac9a245da606fe587fec0ff406e0784396e41f8897dba84b02618b63fb8ffe56dbdb990b1bd2d4 SHA512 cc3b9f87ae93e16094cf7a227e5bd84db52f82dc7ed5e36d5d0f6b07a7242e314dcf8911e12ebf6d1e6574ff7d05833798b9a095d0696094b93941aaf68da45f
diff --git a/dev-python/bpython/bpython-0.21.ebuild b/dev-python/bpython/bpython-0.21.ebuild
deleted file mode 100644
index d815d9186569..000000000000
--- a/dev-python/bpython/bpython-0.21.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/curtsies-0.3.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-# sphinx is used implicitly to build manpages
-BDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-sphinx-4.patch
-	"${FILESDIR}"/${P}-fix-py3.10.patch
-)
-
-distutils_enable_sphinx doc/sphinx/source --no-autodoc
-distutils_enable_tests unittest
diff --git a/dev-python/bpython/bpython-0.22.1.ebuild b/dev-python/bpython/bpython-0.22.1.ebuild
index 53cc9af10082..9b331710fca8 100644
--- a/dev-python/bpython/bpython-0.22.1.ebuild
+++ b/dev-python/bpython/bpython-0.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE="clipboard +jedi urwid watch"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/curtsies-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/bpython/files/bpython-0.21-fix-py3.10.patch b/dev-python/bpython/files/bpython-0.21-fix-py3.10.patch
deleted file mode 100644
index 5b7c63767820..000000000000
--- a/dev-python/bpython/files/bpython-0.21-fix-py3.10.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 78ead4c83d7c47c35ab075dd08114f51c24a709d Mon Sep 17 00:00:00 2001
-From: Thomas Ballinger <thomasballinger@gmail.com>
-Date: Wed, 6 Oct 2021 19:59:38 -0700
-Subject: [PATCH] Test Python 3.10 (#924)
-
-* Test Python 3.10
-* Update tests for Python 3.10
-
---- a/bpython/test/test_curtsies_painting.py
-+++ b/bpython/test/test_curtsies_painting.py
-@@ -139,6 +139,14 @@ def test_completion(self):
-                 "└──────────────────────────────┘",
-                 "Welcome to bpython! Press <F1> f",
-             ]
-+            if sys.version_info[:2] < (3, 10)
-+            else [
-+                ">>> an",
-+                "┌──────────────────────────────┐",
-+                "│ and    anext( any(           │",
-+                "└──────────────────────────────┘",
-+                "Welcome to bpython! Press <F1> f",
-+            ]
-         )
-         self.assert_paint_ignoring_formatting(screen, (0, 4))
-
---- a/bpython/test/test_interpreter.py
-+++ b/bpython/test/test_interpreter.py
-@@ -35,7 +35,19 @@ def test_syntaxerror(self):
- 
-         i.runsource("1.1.1.1")
- 
--        if sys.version_info[:2] >= (3, 8):
-+        if sys.version_info[:2] >= (3, 10):
-+            expected = (
-+                "  File "
-+                + green('"<bpython-input-148>"')
-+                + ", line "
-+                + bold(magenta("1"))
-+                + "\n    1.1.1.1\n    ^^^^^\n"
-+                + bold(red("SyntaxError"))
-+                + ": "
-+                + cyan("invalid syntax. Perhaps you forgot a comma?")
-+                + "\n"
-+            )
-+        elif (3, 8) <= sys.version_info[:2] <= (3, 9):
-             expected = (
-                 "  File "
-                 + green('"<input>"')
diff --git a/dev-python/bpython/files/bpython-sphinx-4.patch b/dev-python/bpython/files/bpython-sphinx-4.patch
deleted file mode 100644
index 5003de24bcf6..000000000000
--- a/dev-python/bpython/files/bpython-sphinx-4.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -U2 -r bpython-0.21.orig/doc/sphinx/source/conf.py bpython-0.21/doc/sphinx/source/conf.py
---- bpython-0.21.orig/doc/sphinx/source/conf.py	2020-03-30 01:44:23.000000000 +0700
-+++ bpython-0.21/doc/sphinx/source/conf.py	2021-05-22 21:06:51.161746459 +0700
-@@ -215,3 +215,3 @@
- # If true, show URL addresses after external links.
- #man_show_urls = False
--
-+man_make_section_directory = False