1 |
commit: 7a11479f7a96cee817b13aa634bfdfd12ad6f0f5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 28 17:34:01 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 28 17:43:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a11479f |
7 |
|
8 |
dev-python/pygments: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pygments/Manifest | 2 - |
13 |
.../pygments/files/pygments-2.2.0-pep479.patch | 46 -------------------- |
14 |
.../pygments/files/pygments-2.2.0-sphinx17.patch | 22 ---------- |
15 |
dev-python/pygments/pygments-2.3.1.ebuild | 50 ---------------------- |
16 |
dev-python/pygments/pygments-2.4.2.ebuild | 42 ------------------ |
17 |
5 files changed, 162 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest |
20 |
index 63a00627e86..7a18ca65096 100644 |
21 |
--- a/dev-python/pygments/Manifest |
22 |
+++ b/dev-python/pygments/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e |
25 |
-DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66 |
26 |
DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859 |
27 |
DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932 |
28 |
|
29 |
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch |
30 |
deleted file mode 100644 |
31 |
index 28d40e9566a..00000000000 |
32 |
--- a/dev-python/pygments/files/pygments-2.2.0-pep479.patch |
33 |
+++ /dev/null |
34 |
@@ -1,46 +0,0 @@ |
35 |
-# HG changeset patch |
36 |
-# User Miro Hrončok <miro@×××××××.cz> |
37 |
-# Date 1530720528 -7200 |
38 |
-# Branch py37 |
39 |
-# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87 |
40 |
-# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80 |
41 |
-PEP 479: Raising StopIteration from a generator is now an error |
42 |
- |
43 |
-So we return instead. Fix needed for Python 3.7. |
44 |
- |
45 |
-Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457 |
46 |
- |
47 |
-diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py |
48 |
---- a/pygments/lexers/lisp.py |
49 |
-+++ b/pygments/lexers/lisp.py |
50 |
-@@ -2327,13 +2327,13 @@ |
51 |
- token = Name.Function if token == Literal else token |
52 |
- yield index, token, value |
53 |
- |
54 |
-- raise StopIteration |
55 |
-+ return |
56 |
- |
57 |
- def _process_signature(self, tokens): |
58 |
- for index, token, value in tokens: |
59 |
- if token == Literal and value == '}': |
60 |
- yield index, Punctuation, value |
61 |
-- raise StopIteration |
62 |
-+ return |
63 |
- elif token in (Literal, Name.Function): |
64 |
- token = Name.Variable if value.istitle() else Keyword.Type |
65 |
- yield index, token, value |
66 |
-diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py |
67 |
---- a/pygments/lexers/sql.py |
68 |
-+++ b/pygments/lexers/sql.py |
69 |
-@@ -347,7 +347,10 @@ |
70 |
- # Emit the output lines |
71 |
- out_token = Generic.Output |
72 |
- while 1: |
73 |
-- line = next(lines) |
74 |
-+ try: |
75 |
-+ line = next(lines) |
76 |
-+ except StopIteration: |
77 |
-+ return |
78 |
- mprompt = re_prompt.match(line) |
79 |
- if mprompt is not None: |
80 |
- # push the line back to have it processed by the prompt |
81 |
|
82 |
diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch |
83 |
deleted file mode 100644 |
84 |
index bb7c6074ff9..00000000000 |
85 |
--- a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch |
86 |
+++ /dev/null |
87 |
@@ -1,22 +0,0 @@ |
88 |
-# HG changeset patch |
89 |
-# User WAKAYAMA Shirou <shirou.faw@×××××.com> |
90 |
-# Date 1500298269 -32400 |
91 |
-# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540 |
92 |
-# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80 |
93 |
-Change to docutils.parsers in sphinxext. |
94 |
- |
95 |
-From Sphinx 1.7, sphinx.utils.compat will be removed. |
96 |
- |
97 |
-diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py |
98 |
---- a/pygments/sphinxext.py |
99 |
-+++ b/pygments/sphinxext.py |
100 |
-@@ -16,7 +16,7 @@ |
101 |
- |
102 |
- from docutils import nodes |
103 |
- from docutils.statemachine import ViewList |
104 |
--from sphinx.util.compat import Directive |
105 |
-+from docutils.parsers.rst import Directive |
106 |
- from sphinx.util.nodes import nested_parse_with_titles |
107 |
- |
108 |
- |
109 |
- |
110 |
|
111 |
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild |
112 |
deleted file mode 100644 |
113 |
index a76b5759872..00000000000 |
114 |
--- a/dev-python/pygments/pygments-2.3.1.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,50 +0,0 @@ |
117 |
-# Copyright 1999-2020 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=7 |
121 |
- |
122 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) |
123 |
- |
124 |
-inherit distutils-r1 bash-completion-r1 |
125 |
- |
126 |
-MY_PN="Pygments" |
127 |
-MY_P="${MY_PN}-${PV}" |
128 |
- |
129 |
-DESCRIPTION="Pygments is a syntax highlighting package written in Python" |
130 |
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/" |
131 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
132 |
- |
133 |
-LICENSE="BSD" |
134 |
-SLOT="0" |
135 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
136 |
-IUSE="doc test" |
137 |
-RESTRICT="!test? ( test )" |
138 |
- |
139 |
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
140 |
-DEPEND="${RDEPEND} |
141 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
142 |
- test? ( |
143 |
- dev-python/nose[${PYTHON_USEDEP}] |
144 |
- virtual/ttf-fonts |
145 |
- )" |
146 |
- |
147 |
-S="${WORKDIR}/${MY_P}" |
148 |
- |
149 |
-python_compile_all() { |
150 |
- use doc && emake -C doc html |
151 |
-} |
152 |
- |
153 |
-python_test() { |
154 |
- cp -r -l tests "${BUILD_DIR}"/ || die |
155 |
- # With pypy3 there is 1 error out of 1556 tests when run as is and |
156 |
- # (SKIP=8, errors=1, failures=1) when run with 2to3; meh |
157 |
- nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \ |
158 |
- || die "Tests fail with ${EPYTHON}" |
159 |
-} |
160 |
- |
161 |
-python_install_all() { |
162 |
- use doc && local HTML_DOCS=( doc/_build/html/. ) |
163 |
- |
164 |
- distutils-r1_python_install_all |
165 |
- newbashcomp external/pygments.bashcomp pygmentize |
166 |
-} |
167 |
|
168 |
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild |
169 |
deleted file mode 100644 |
170 |
index 8f27abd2d8b..00000000000 |
171 |
--- a/dev-python/pygments/pygments-2.4.2.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,42 +0,0 @@ |
174 |
-# Copyright 1999-2020 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=7 |
178 |
- |
179 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
180 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) |
181 |
- |
182 |
-inherit distutils-r1 bash-completion-r1 |
183 |
- |
184 |
-MY_PN="Pygments" |
185 |
-MY_P="${MY_PN}-${PV}" |
186 |
- |
187 |
-DESCRIPTION="Pygments is a syntax highlighting package written in Python" |
188 |
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/" |
189 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
190 |
-S="${WORKDIR}/${MY_P}" |
191 |
- |
192 |
-LICENSE="BSD" |
193 |
-SLOT="0" |
194 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
195 |
-IUSE="test" |
196 |
-RESTRICT="!test? ( test )" |
197 |
- |
198 |
-DEPEND=" |
199 |
- test? ( |
200 |
- dev-python/nose[${PYTHON_USEDEP}] |
201 |
- virtual/ttf-fonts |
202 |
- )" |
203 |
- |
204 |
-distutils_enable_sphinx doc |
205 |
- |
206 |
-python_test() { |
207 |
- cp -r -l tests "${BUILD_DIR}"/ || die |
208 |
- nosetests --verbosity=3 -w "${BUILD_DIR}"/tests || |
209 |
- die "Tests fail with ${EPYTHON}" |
210 |
-} |
211 |
- |
212 |
-python_install_all() { |
213 |
- distutils-r1_python_install_all |
214 |
- newbashcomp external/pygments.bashcomp pygmentize |
215 |
-} |