From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/urwid/Manifest | 8 +-- dev-python/urwid/files/urwid-1.1.0-sphinx.patch | 11 ---- .../urwid/files/urwid-1.3.1-test-vterm-EINTR.patch | 52 ------------------- dev-python/urwid/urwid-1.3.1.ebuild | 58 ---------------------- dev-python/urwid/urwid-2.0.1.ebuild | 49 ------------------ dev-python/urwid/urwid-2.1.0.ebuild | 2 +- 6 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 dev-python/urwid/files/urwid-1.1.0-sphinx.patch delete mode 100644 dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch delete mode 100644 dev-python/urwid/urwid-1.3.1.ebuild delete mode 100644 dev-python/urwid/urwid-2.0.1.ebuild (limited to 'dev-python/urwid') diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest index 5a8a9ca81291..afda40c16c4b 100644 --- a/dev-python/urwid/Manifest +++ b/dev-python/urwid/Manifest @@ -1,9 +1,3 @@ -AUX urwid-1.1.0-sphinx.patch 453 BLAKE2B 3ef9cbc0486cca3f7e8833d029a95e021cf79553cb6cc3e23fb77ea77df95eaa75fac4abd34de148397a33fcead01db6e59997963bfa7bcf6507127f8bce6cef SHA512 6156aba86718b5ccaf5eb6b1d6cddf61c5d1496b450ba0541fff55057070211e9a37bde96034d752a921ec4d2899084c36ec4743480c43cc89809734d644fa8a -AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 BLAKE2B 91385ddb7b343a4bbe89718cdf095d6ff79f2ecf64140d993ae664972c66e672b18de353e4fa81f38f86863eb95cae1b15a7ade787048e7d3093d3cec0b7b41c SHA512 0746938ff78d98cda847adbe49f8848e603eca4d6460921e57ef8c211dd19a21aaa9027f83cb24c53e5396f4a3fdd194396ea82a457729b8b252306c00bfff97 -DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed -DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654 -EBUILD urwid-1.3.1.ebuild 1219 BLAKE2B 7eb13d92e9494b513c4450ace81bb5adaa4e4ccd26594e51a9496440f402b4cab7575d01297eb72c957903266740cdb62df49f6337f05d29dac429b95616c88e SHA512 4a1d1abaff1a6ecae8f32b76a12700f0725013d871f4d3d2f9b780f819dc266bf911899fa6ceeb9c390082dca2aeefd80fecd2a84e01a2ecd636c0c998d26edc -EBUILD urwid-2.0.1.ebuild 1028 BLAKE2B c379b8b7ab8a9738cda6a1127a43f3177f5434705080c4d16b14dc416fb4b2c490c29bb422c4124276307b8ce1dce6fc78a9cca1496be30a6fe9cf1541e3dfe1 SHA512 8993a739ed021dbe28a348877a26f66029ffcb22f6ea4fad182f92996b0eed21db392e55c081d794ecc0b7705a332c099f04a2dbc329f6130f41256f8873488b -EBUILD urwid-2.1.0.ebuild 824 BLAKE2B 9d37d887d1b9010afa68765b70f47f0621b2bd92af3a65dd6c4581b4f7b961e1bf5ee8693c52df7aec7497ebf874820a069e37cce9b6c5efb8523518a8bdf35b SHA512 264edb97618a3d0a8856d06c6a80a53a3537b801985a4bbeae8935bf5594f9b9a68d14afc0c6008bf79c5508aee7eeb0cb0e5a826d3119b0a099f06b007c2418 +EBUILD urwid-2.1.0.ebuild 820 BLAKE2B 48073eac0b63673f33c55eeb2551badfc98889873bd8b12811c9ae76242900e4a4e89a2f0b55aedc786eb17dda846b8e46ea47ed6c1b685ffd2ab56367a6f93c SHA512 c56af9057dc7256305f81efd4e0fcd7c977a9d51d390394dbd6fd72e6e4d1e1f8a43cbbb3259ea2497aee1859e8df9f17ac963c203cbc553df4b69e84b80fa09 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680 diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch deleted file mode 100644 index 442aeea67500..000000000000 --- a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- urwid-1.1.0/docs/conf.py -+++ urwid-1.1.0/docs/conf.py -@@ -46,7 +46,7 @@ - # The version info for the project you're documenting, acts as replacement for - # |version| and |release|, also used in various other places throughout the - # built documents. --FILE_PATH = os.path.dirname(__file__).decode('utf-8') -+FILE_PATH = os.path.dirname(__file__) - VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH, - '../urwid/version.py')) - VERSION_VARS = {} diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch deleted file mode 100644 index 04b6e2c949c4..000000000000 --- a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 3 Jun 2017 14:53:51 -0400 -Subject: [PATCH] test_vterm: handle EINTR when reading from pipe - -Fixes: https://github.com/urwid/urwid/issues/230 ---- - urwid/tests/test_vterm.py | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py -index 4dadfcc..075c653 100644 ---- a/urwid/tests/test_vterm.py -+++ b/urwid/tests/test_vterm.py -@@ -18,6 +18,7 @@ - # - # Urwid web site: http://excess.org/urwid/ - -+import errno - import os - import sys - import unittest -@@ -28,7 +29,6 @@ - from urwid import signals - from urwid.compat import B - -- - class DummyCommand(object): - QUITSTRING = B('|||quit|||') - -@@ -41,12 +41,20 @@ def __call__(self): - stdout.write(B('\x1bc')) - - while True: -- data = os.read(self.reader, 1024) -+ data = self.read(1024) - if self.QUITSTRING == data: - break - stdout.write(data) - stdout.flush() - -+ def read(self, size): -+ while True: -+ try: -+ return os.read(self.reader, size) -+ except OSError as e: -+ if e.errno != errno.EINTR: -+ raise -+ - def write(self, data): - os.write(self.writer, data) - diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild deleted file mode 100644 index f0c427c92330..000000000000 --- a/dev-python/urwid/urwid-1.3.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_6 ) -PYTHON_REQ_USE="ncurses" - -inherit distutils-r1 - -DESCRIPTION="Curses-based user interface library for Python" -HOMEPAGE="http://urwid.org/ https://pypi.org/project/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="doc examples" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.0-sphinx.patch" - "${FILESDIR}/${PN}-1.3.1-test-vterm-EINTR.patch" -) - -python_compile_all() { - if use doc; then - if python_is_python3; then - 2to3 -nw --no-diffs docs/conf.py || die - fi - cd docs || die - sphinx-build . _build/html || die - fi -} - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS} -fno-strict-aliasing" - export CFLAGS - fi - - distutils-r1_python_compile -} - -python_test() { - esetup.py test -} - -python_install_all() { - use examples && dodoc -r examples - use doc && local HTML_DOCS=( docs/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild deleted file mode 100644 index 776c45b2f032..000000000000 --- a/dev-python/urwid/urwid-2.0.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} ) -PYTHON_REQ_USE="ncurses" - -inherit distutils-r1 - -DESCRIPTION="Curses-based user interface library for Python" -HOMEPAGE="http://urwid.org/ https://pypi.org/project/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="doc examples" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) -" - -python_compile_all() { - if use doc; then - sphinx-build docs _build/html || die - fi -} - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS} -fno-strict-aliasing" - export CFLAGS - fi - - distutils-r1_python_compile -} - -python_test() { - esetup.py test -} - -python_install_all() { - use examples && dodoc -r examples - use doc && local HTML_DOCS=( _build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild index 5685bca7c7f7..0239bc441784 100644 --- a/dev-python/urwid/urwid-2.1.0.ebuild +++ b/dev-python/urwid/urwid-2.1.0.ebuild @@ -14,7 +14,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="doc examples" distutils_enable_sphinx docs -- cgit v1.2.3