commit: d9e8880e801194abfc9e5358c39ccb7891689362 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Dec 2 19:55:23 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Dec 2 19:58:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e8880e
dev-python/urwid: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/urwid/Manifest | 1 - ...-2.1.1-ignore-resetting-to-invalid-locale.patch | 32 ----------------- dev-python/urwid/urwid-2.1.1.ebuild | 41 ---------------------- 3 files changed, 74 deletions(-) diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest index 6e038e00a764..bd50588db114 100644 --- a/dev-python/urwid/Manifest +++ b/dev-python/urwid/Manifest @@ -1,2 +1 @@ -DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5 diff --git a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch deleted file mode 100644 index 61549a50d087..000000000000 --- a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fd010f8336407ad1a42522b424d2ea7b7800ebc4 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <[email protected]> -Date: Fri, 26 Jun 2020 22:26:23 +0200 -Subject: [PATCH] Ignore resetting to invalid locale (Closes: #377) - -Resetting the locale was introduced in 5dcf236, before that an invalid -locale was ignored. Restore the old behavior insofar that only valid -locales are restored. -This fixes the unit tests of scottkosty/vit with unset LANG. ---- - urwid/util.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/urwid/util.py b/urwid/util.py -index 17c049d..acd62f6 100644 ---- a/urwid/util.py -+++ b/urwid/util.py -@@ -55,7 +55,10 @@ def detect_encoding(): - else: - raise - finally: -- locale.setlocale(locale.LC_ALL, initial) -+ try: -+ locale.setlocale(locale.LC_ALL, initial) -+ except locale.Error: -+ pass - - if 'detected_encoding' not in locals(): - detected_encoding = detect_encoding() --- -2.26.2 - diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild deleted file mode 100644 index b8cb039ea982..000000000000 --- a/dev-python/urwid/urwid-2.1.1.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_{7..10} ) -PYTHON_REQ_USE="ncurses" - -inherit distutils-r1 - -DESCRIPTION="Curses-based user interface library for Python" -HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -PATCHES=( - "${FILESDIR}/${PN}-2.1.1-ignore-resetting-to-invalid-locale.patch" -) - -distutils_enable_sphinx docs -distutils_enable_tests setup.py - -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 - - distutils-r1_src_prepare -} - -python_install_all() { - use examples && dodoc -r examples - distutils-r1_python_install_all -}
