diff options
Diffstat (limited to 'dev-python/urwid')
-rw-r--r-- | dev-python/urwid/Manifest | 5 | ||||
-rw-r--r-- | dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch | 32 | ||||
-rw-r--r-- | dev-python/urwid/urwid-2.1.1.ebuild | 41 | ||||
-rw-r--r-- | dev-python/urwid/urwid-2.1.2.ebuild | 2 |
4 files changed, 2 insertions, 78 deletions
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest index 69c178702c3b..d468287ca3de 100644 --- a/dev-python/urwid/Manifest +++ b/dev-python/urwid/Manifest @@ -1,6 +1,3 @@ -AUX urwid-2.1.1-ignore-resetting-to-invalid-locale.patch 998 BLAKE2B c76965b4bb61df264d01ec898d327f99e761909f49b7fcb5fcf222eaf74fa50fd89d16477d48d1fe939ed98d1c3c55969cf0b6e50204e26f6b0adf395edfe042 SHA512 d2aa4e8edc96583b7a1c68788e9301d200004100a00fa03157e0c6cf0f295b1320c1f1d249c9b67d30766cad65ee36ea1b5796fa9312f8cda52b509e4730af67 -DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5 -EBUILD urwid-2.1.1.ebuild 1052 BLAKE2B 4dc95579f968c9389d79c84df653b002c54e070aa52c4c62568054ff5d318603d5adf26a4ee04d99dedef58050d1d6a47f1e49ba261e55c224b0821c011f02dc SHA512 734839627cc21ff6922f6414f05992b8a4296819004bc3a37638d91f82249df2d0dcf535513a985fedfe56d13b8c2cbe3ca57a1c909aa43e441409316904483a -EBUILD urwid-2.1.2.ebuild 1157 BLAKE2B 7b83823f4f0598533579ddfe85a68ae6f1a8e2d49d60a0570d6faa83f3a46d4a645f571abe11645acaa19f64c6542d86c46cf10ace58e9f4eb36af55f63ea24a SHA512 494764c4ac96b2a9560cfde4f6ade89d4a384ebeed5408a7f447153d5b3b5f5a210441b24ae012cd8a9508e1e5ba76f4e38f0b006387a538907951d74c93a33d +EBUILD urwid-2.1.2.ebuild 1153 BLAKE2B 2ba2ff52fd3b850f804451e24ef23da35767041a829bd8372d2198b95c53dcfbca5b764fd1b4c5952b016b0f266da08e2e6db831a5c96cd8a08590bc5ebea918 SHA512 92385dd69d6f8f898326990eb21888030d57492f63b98f5d08cf80f1a3bbc03e63186ca24681e0ae5112d3df6841b459691777cf3ba1d025f52808b2eda30ed9 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f 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 <git@jochen.sprickerhof.de> -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 -} diff --git a/dev-python/urwid/urwid-2.1.2.ebuild b/dev-python/urwid/urwid-2.1.2.ebuild index f2501abefd2a..5dc1bb46d9b1 100644 --- a/dev-python/urwid/urwid-2.1.2.ebuild +++ b/dev-python/urwid/urwid-2.1.2.ebuild @@ -13,7 +13,7 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="examples" distutils_enable_sphinx docs |