1 |
commit: 8e482f8f40da312ffe4347c6c507de90dc56fdf9 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 7 15:00:52 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 7 15:00:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e482f8f |
7 |
|
8 |
dev-python/urwid: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/urwid/Manifest | 2 - |
13 |
dev-python/urwid/files/urwid-1.1.0-sphinx.patch | 11 ---- |
14 |
.../urwid/files/urwid-1.3.1-test-vterm-EINTR.patch | 52 ------------------- |
15 |
dev-python/urwid/urwid-1.3.1.ebuild | 58 ---------------------- |
16 |
dev-python/urwid/urwid-2.0.1.ebuild | 49 ------------------ |
17 |
5 files changed, 172 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest |
20 |
index a1bd6c9227c..69ca17aa136 100644 |
21 |
--- a/dev-python/urwid/Manifest |
22 |
+++ b/dev-python/urwid/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed |
25 |
-DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30 |
26 |
DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654 |
27 |
|
28 |
diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch |
29 |
deleted file mode 100644 |
30 |
index 442aeea6750..00000000000 |
31 |
--- a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch |
32 |
+++ /dev/null |
33 |
@@ -1,11 +0,0 @@ |
34 |
---- urwid-1.1.0/docs/conf.py |
35 |
-+++ urwid-1.1.0/docs/conf.py |
36 |
-@@ -46,7 +46,7 @@ |
37 |
- # The version info for the project you're documenting, acts as replacement for |
38 |
- # |version| and |release|, also used in various other places throughout the |
39 |
- # built documents. |
40 |
--FILE_PATH = os.path.dirname(__file__).decode('utf-8') |
41 |
-+FILE_PATH = os.path.dirname(__file__) |
42 |
- VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH, |
43 |
- '../urwid/version.py')) |
44 |
- VERSION_VARS = {} |
45 |
|
46 |
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 |
47 |
deleted file mode 100644 |
48 |
index 04b6e2c949c..00000000000 |
49 |
--- a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch |
50 |
+++ /dev/null |
51 |
@@ -1,52 +0,0 @@ |
52 |
-From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001 |
53 |
-From: Mike Gilbert <floppym@g.o> |
54 |
-Date: Sat, 3 Jun 2017 14:53:51 -0400 |
55 |
-Subject: [PATCH] test_vterm: handle EINTR when reading from pipe |
56 |
- |
57 |
-Fixes: https://github.com/urwid/urwid/issues/230 |
58 |
---- |
59 |
- urwid/tests/test_vterm.py | 12 ++++++++++-- |
60 |
- 1 file changed, 10 insertions(+), 2 deletions(-) |
61 |
- |
62 |
-diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py |
63 |
-index 4dadfcc..075c653 100644 |
64 |
---- a/urwid/tests/test_vterm.py |
65 |
-+++ b/urwid/tests/test_vterm.py |
66 |
-@@ -18,6 +18,7 @@ |
67 |
- # |
68 |
- # Urwid web site: http://excess.org/urwid/ |
69 |
- |
70 |
-+import errno |
71 |
- import os |
72 |
- import sys |
73 |
- import unittest |
74 |
-@@ -28,7 +29,6 @@ |
75 |
- from urwid import signals |
76 |
- from urwid.compat import B |
77 |
- |
78 |
-- |
79 |
- class DummyCommand(object): |
80 |
- QUITSTRING = B('|||quit|||') |
81 |
- |
82 |
-@@ -41,12 +41,20 @@ def __call__(self): |
83 |
- stdout.write(B('\x1bc')) |
84 |
- |
85 |
- while True: |
86 |
-- data = os.read(self.reader, 1024) |
87 |
-+ data = self.read(1024) |
88 |
- if self.QUITSTRING == data: |
89 |
- break |
90 |
- stdout.write(data) |
91 |
- stdout.flush() |
92 |
- |
93 |
-+ def read(self, size): |
94 |
-+ while True: |
95 |
-+ try: |
96 |
-+ return os.read(self.reader, size) |
97 |
-+ except OSError as e: |
98 |
-+ if e.errno != errno.EINTR: |
99 |
-+ raise |
100 |
-+ |
101 |
- def write(self, data): |
102 |
- os.write(self.writer, data) |
103 |
- |
104 |
|
105 |
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild |
106 |
deleted file mode 100644 |
107 |
index f0c427c9233..00000000000 |
108 |
--- a/dev-python/urwid/urwid-1.3.1.ebuild |
109 |
+++ /dev/null |
110 |
@@ -1,58 +0,0 @@ |
111 |
-# Copyright 1999-2020 Gentoo Authors |
112 |
-# Distributed under the terms of the GNU General Public License v2 |
113 |
- |
114 |
-EAPI=6 |
115 |
- |
116 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
117 |
-PYTHON_REQ_USE="ncurses" |
118 |
- |
119 |
-inherit distutils-r1 |
120 |
- |
121 |
-DESCRIPTION="Curses-based user interface library for Python" |
122 |
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/" |
123 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
124 |
- |
125 |
-LICENSE="LGPL-2.1" |
126 |
-SLOT="0" |
127 |
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" |
128 |
-IUSE="doc examples" |
129 |
- |
130 |
-DEPEND=" |
131 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
132 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
133 |
-" |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${FILESDIR}/${PN}-1.1.0-sphinx.patch" |
137 |
- "${FILESDIR}/${PN}-1.3.1-test-vterm-EINTR.patch" |
138 |
-) |
139 |
- |
140 |
-python_compile_all() { |
141 |
- if use doc; then |
142 |
- if python_is_python3; then |
143 |
- 2to3 -nw --no-diffs docs/conf.py || die |
144 |
- fi |
145 |
- cd docs || die |
146 |
- sphinx-build . _build/html || die |
147 |
- fi |
148 |
-} |
149 |
- |
150 |
-python_compile() { |
151 |
- if ! python_is_python3; then |
152 |
- local CFLAGS="${CFLAGS} -fno-strict-aliasing" |
153 |
- export CFLAGS |
154 |
- fi |
155 |
- |
156 |
- distutils-r1_python_compile |
157 |
-} |
158 |
- |
159 |
-python_test() { |
160 |
- esetup.py test |
161 |
-} |
162 |
- |
163 |
-python_install_all() { |
164 |
- use examples && dodoc -r examples |
165 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
166 |
- |
167 |
- distutils-r1_python_install_all |
168 |
-} |
169 |
|
170 |
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild |
171 |
deleted file mode 100644 |
172 |
index 776c45b2f03..00000000000 |
173 |
--- a/dev-python/urwid/urwid-2.0.1.ebuild |
174 |
+++ /dev/null |
175 |
@@ -1,49 +0,0 @@ |
176 |
-# Copyright 1999-2020 Gentoo Authors |
177 |
-# Distributed under the terms of the GNU General Public License v2 |
178 |
- |
179 |
-EAPI=6 |
180 |
- |
181 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
182 |
-PYTHON_REQ_USE="ncurses" |
183 |
- |
184 |
-inherit distutils-r1 |
185 |
- |
186 |
-DESCRIPTION="Curses-based user interface library for Python" |
187 |
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/" |
188 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
189 |
- |
190 |
-LICENSE="LGPL-2.1" |
191 |
-SLOT="0" |
192 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
193 |
-IUSE="doc examples" |
194 |
- |
195 |
-DEPEND=" |
196 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
197 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
198 |
-" |
199 |
- |
200 |
-python_compile_all() { |
201 |
- if use doc; then |
202 |
- sphinx-build docs _build/html || die |
203 |
- fi |
204 |
-} |
205 |
- |
206 |
-python_compile() { |
207 |
- if ! python_is_python3; then |
208 |
- local CFLAGS="${CFLAGS} -fno-strict-aliasing" |
209 |
- export CFLAGS |
210 |
- fi |
211 |
- |
212 |
- distutils-r1_python_compile |
213 |
-} |
214 |
- |
215 |
-python_test() { |
216 |
- esetup.py test |
217 |
-} |
218 |
- |
219 |
-python_install_all() { |
220 |
- use examples && dodoc -r examples |
221 |
- use doc && local HTML_DOCS=( _build/html/. ) |
222 |
- |
223 |
- distutils-r1_python_install_all |
224 |
-} |