gentoo auto-resync : 29:11:2023 - 10:51:05

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 275c14d1542a..cd84f8456f5f 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,6 +1,3 @@
-AUX urwid-2.1.2-fix-py3.11.patch 924 BLAKE2B a0c8452f4a025a9ed4f94b746f4c487c7c9e6b84a20a552ba56d13d03493abcaa1179c209214a003e62549cbf6b7d3b42e2cffcc055e5823acefcca8cc3de9bb SHA512 36671f9582f322f0419554eebdeff020ab48431f61e8a335b4d54b3798dda439acd78356269369c8b255f22be560e5c214c819cbe0256f7b7a632c625c0c054e
-DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
 DIST urwid-2.2.3.tar.gz 677723 BLAKE2B 4aeae29e557e0ecbe902b56865feef3b2978263e657f2159194d8334852627ac6ccee82730d6a7e24b8914e5548ca88ac00eeddd7c2a34299d135843a99008fb SHA512 48588d0c819b229bdaaa70bec3a279c3bf232b8520d95e1f45a83bea927244634e91fd47cc161647c2d8155e523543549bc5ed2ccb5eac29843e12515e5dfd22
-EBUILD urwid-2.1.2-r1.ebuild 1272 BLAKE2B ff35eb7c30f726c298f3d0fd63a13246525609db18ea256ad6c8d394742d112cdd066b03387a2ac1177b903f04f8bbf93ab8328b028c1b7396946a55423fd5b9 SHA512 08d628d5ac1ca27da368c1ab883309daf07c36267ce06b57bb873cdf3be8aa0ff487de78ce2040d5860968a317b2e2e58ac101e87066174fd6791f24b68745c5
-EBUILD urwid-2.2.3.ebuild 816 BLAKE2B 95f9e29f7cb89e5b29a7de3957112262ef2052b49228119da84c3181e6d84c4be9747ba21bc17dea8ddcc9e57eb3a6244377bdf23f55030941b4ebfc35dd0774 SHA512 8e03b658e40c72e48251da06eb7c94a2e247081ca7c1b6a335aca7f23cd54f403df57d7ad1d21be0454388a062ed3dd6beb40cb91d079440de5b466d5260b723
+EBUILD urwid-2.2.3.ebuild 815 BLAKE2B fd114925b60d335c752bce1c6ff0c98963e2e345607bc11b3a933a30004fda86818c8e04ebca5b5df0481d56898aba7996f298c28d89a179c431acfe79e05f69 SHA512 3d3cecc0da00a02e14c18bcf2ec1682d9ee1d13648df1524b008144a502524cf0eac03d864f6bebbf3a900f07d670411984350376dfc1e5fc3406718e018b3ee
 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f
diff --git a/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch b/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
deleted file mode 100644
index dd60b8a220b9..000000000000
--- a/dev-python/urwid/files/urwid-2.1.2-fix-py3.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/urwid/urwid/pull/517
-From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
-Date: Fri, 20 Jan 2023 11:37:15 -0800
-Subject: [PATCH] make tests compatible with Python 3.11
-
---- a/urwid/tests/test_event_loops.py
-+++ b/urwid/tests/test_event_loops.py
-@@ -201,15 +201,14 @@ def test_error(self):
-             evl.alarm(0.5, lambda: 1 / 0)  # Simulate error in event loop
-             self.assertRaises(ZeroDivisionError, evl.run)
-
--        def test_coroutine_error(self):
-+        async def test_coroutine_error(self):
-             evl = self.evl
-
--            @asyncio.coroutine
--            def error_coro():
-+            async def error_coro():
-                 result = 1 / 0 # Simulate error in coroutine
-                 yield result
-
--            asyncio.ensure_future(error_coro())
-+            asyncio.ensure_future(await error_coro())
-             self.assertRaises(ZeroDivisionError, evl.run)
-
-
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
deleted file mode 100644
index 9e12ae1ba045..000000000000
--- a/dev-python/urwid/urwid-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="
-	https://urwid.org/
-	https://pypi.org/project/urwid/
-	https://github.com/urwid/urwid/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-PATCHES=(
-	# https://github.com/urwid/urwid/pull/517
-	"${FILESDIR}/${P}-fix-py3.11.patch"
-)
-
-src_prepare() {
-	# optional tests broken by modern tornado versions
-	sed -e 's:import tornado:&_broken:' \
-		-i urwid/tests/test_event_loops.py || die
-
-	# Fix doc generation
-	sed -e 's/!defindex/layout/' -i docs/tools/templates/indexcontent.html || die
-
-	# Fix for >=dev-python/trio-0.15
-	sed -e 's/hazmat/lowlevel/' -i urwid/_async_kw_event_loop.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Trio event loop" "dev-python/trio"
-}
diff --git a/dev-python/urwid/urwid-2.2.3.ebuild b/dev-python/urwid/urwid-2.2.3.ebuild
index e63568924885..21c925c89bce 100644
--- a/dev-python/urwid/urwid-2.2.3.ebuild
+++ b/dev-python/urwid/urwid-2.2.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests unittest