1 |
commit: e8990b7ce9eee1eaec4eb1825a47f859c600f51b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 10:16:29 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 10:31:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8990b7c |
7 |
|
8 |
dev-python/sphinx: Clean old versions up |
9 |
|
10 |
dev-python/sphinx/Manifest | 2 - |
11 |
.../files/sphinx-1.1.3-docutils-manpage.patch | 35 ------ |
12 |
dev-python/sphinx/files/sphinx-1.1.3-python3.patch | 45 -------- |
13 |
dev-python/sphinx/sphinx-1.1.3-r8.ebuild | 128 --------------------- |
14 |
dev-python/sphinx/sphinx-1.5.1-r2.ebuild | 113 ------------------ |
15 |
5 files changed, 323 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest |
18 |
index 1d76be7a1b7..345a00b4448 100644 |
19 |
--- a/dev-python/sphinx/Manifest |
20 |
+++ b/dev-python/sphinx/Manifest |
21 |
@@ -1,7 +1,5 @@ |
22 |
-DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 SHA512 b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052 WHIRLPOOL a40c4d0f5c32cf1d4b9b662b0fb2b2b0956e0455abbc88d6b5f95c54f93cc2baae25e8b9196dd0b64090d30a1a796c336ca4b6866243be4198ccdf67a7e18b48 |
23 |
DIST Sphinx-1.2.2.tar.gz 3143671 SHA256 2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c WHIRLPOOL c5ed15b51682d3be9f8349ab838c6758cb4e25023b6ad13622d748b771594ed75f786709a25fb2d61ad245ecef0925e5bcc1aafb93fc355a0f0ea50df63efcd7 |
24 |
DIST Sphinx-1.2.3.tar.gz 3200548 SHA256 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 WHIRLPOOL 0c0e2e21a52829893857939f977e8312c4eac11f5d2aec3b8e4f9c8ffdbf14c4aa46a6c26dac0ad4abfe92b3bdad72a3468e6d2ff2485df6efaf3fccd17ae69b |
25 |
DIST Sphinx-1.3.1.tar.gz 3469782 SHA256 1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94 WHIRLPOOL f3e442fd1f1c260b21f3e2381f028884b6247758448439e7be4cf784f50ec12494e384c77a0c4ccac473f25d7bb88f5424be937d72bb3fac1b6f6387a5746f66 |
26 |
DIST Sphinx-1.3.5.tar.gz 3679978 SHA256 b7d133bb4990d010a2ad934c319b52d8a2156cb0491484f5e2a558619bc9ae04 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc WHIRLPOOL 5877015f700ed0818e0879868f2190ec818d088e235d9c12fe6bd472b0006bd8d26156273023ff93a098c8503bdc440cedd1ba8758fdc25f742bb5794940559f |
27 |
-DIST Sphinx-1.5.1.tar.gz 4397246 SHA256 8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5 SHA512 ec06998921663c0e01096743c7908131b6173ace42373eea8a95a3e24706db119eaf3eb096a70e12ecb5a4a135ee599abdf36c53f786bd392a32fdad45438794 WHIRLPOOL 11bc6a0d308513c8e1face57123a0048899788a7307ee75ed0d52508628f08cc64d08a889d1af3ed67f70ef71d3549fbc5ee394d79203286cb690ca61a8f8ee0 |
28 |
DIST Sphinx-1.5.2.tar.gz 4418646 SHA256 049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722 SHA512 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88 WHIRLPOOL 08fcf21ea37834e52a89f3956df289dc2ffe97e419cc0463815b3f10b95042dae5cf41be74fd1780529d5525ea349c10dd0e0bda6ac24b330ccb21e4a79e22e1 |
29 |
|
30 |
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch b/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch |
31 |
deleted file mode 100644 |
32 |
index 82609f4afdc..00000000000 |
33 |
--- a/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch |
34 |
+++ /dev/null |
35 |
@@ -1,35 +0,0 @@ |
36 |
-# HG changeset patch |
37 |
-# User Georg Brandl <georg@××××××.org> |
38 |
-# Date 1351590528 -3600 |
39 |
-# Node ID ffb145b7884fc926d6a68f4aaeede1d4964f727c |
40 |
-# Parent 2c107bc997e8817c451ba24089766eefb6e60fc3 |
41 |
-Closes #998: fix manpage writer in expectation of docutils 0.10 API change |
42 |
- |
43 |
-diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py |
44 |
---- a/sphinx/writers/manpage.py |
45 |
-+++ b/sphinx/writers/manpage.py |
46 |
-@@ -72,6 +72,11 @@ |
47 |
- # since self.append_header() is never called, need to do this here |
48 |
- self.body.append(MACRO_DEF) |
49 |
- |
50 |
-+ # Overwrite admonition label translations with our own |
51 |
-+ for label, translation in admonitionlabels.items(): |
52 |
-+ self.language.labels[label] = self.deunicode(translation) |
53 |
-+ |
54 |
-+ |
55 |
- # overwritten -- added quotes around all .TH arguments |
56 |
- def header(self): |
57 |
- tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\"" |
58 |
-@@ -193,12 +198,6 @@ |
59 |
- def depart_seealso(self, node): |
60 |
- self.depart_admonition(node) |
61 |
- |
62 |
-- # overwritten -- use our own label translations |
63 |
-- def visit_admonition(self, node, name=None): |
64 |
-- if name: |
65 |
-- self.body.append('.IP %s\n' % |
66 |
-- self.deunicode(admonitionlabels.get(name, name))) |
67 |
-- |
68 |
- def visit_productionlist(self, node): |
69 |
- self.ensure_eol() |
70 |
- names = [] |
71 |
|
72 |
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-python3.patch b/dev-python/sphinx/files/sphinx-1.1.3-python3.patch |
73 |
deleted file mode 100644 |
74 |
index 4817034eb68..00000000000 |
75 |
--- a/dev-python/sphinx/files/sphinx-1.1.3-python3.patch |
76 |
+++ /dev/null |
77 |
@@ -1,45 +0,0 @@ |
78 |
-# HG changeset patch |
79 |
-# User Rob Reilink <r.reilink@×××××××××××××××.nl> |
80 |
-# Date 1331657734 -3600 |
81 |
-# Node ID 8aba132b1337fc351fe1464f3a4b61f21f55e64e |
82 |
-# Parent 4a6d33249418befdf587603fc31db58fb863fee4 |
83 |
-fixed encoding for hashing functions for Python 3 |
84 |
- |
85 |
-diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/graphviz.py |
86 |
---- a/sphinx/ext/graphviz.py Sat Mar 10 22:24:59 2012 +0100 |
87 |
-+++ b/sphinx/ext/graphviz.py Tue Mar 13 17:55:34 2012 +0100 |
88 |
-@@ -121,9 +121,11 @@ |
89 |
- |
90 |
- def render_dot(self, code, options, format, prefix='graphviz'): |
91 |
- """Render graphviz code into a PNG or PDF output file.""" |
92 |
-- hashkey = code.encode('utf-8') + str(options) + \ |
93 |
-+ hashkey = (code + str(options) + \ |
94 |
- str(self.builder.config.graphviz_dot) + \ |
95 |
- str(self.builder.config.graphviz_dot_args) |
96 |
-+ ).encode('utf-8') |
97 |
-+ |
98 |
- fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format) |
99 |
- if hasattr(self.builder, 'imgpath'): |
100 |
- # HTML |
101 |
-diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/inheritance_diagram.py |
102 |
---- a/sphinx/ext/inheritance_diagram.py Sat Mar 10 22:24:59 2012 +0100 |
103 |
-+++ b/sphinx/ext/inheritance_diagram.py Tue Mar 13 17:55:34 2012 +0100 |
104 |
-@@ -39,7 +39,7 @@ |
105 |
- import re |
106 |
- import sys |
107 |
- import inspect |
108 |
--import __builtin__ |
109 |
-+import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility |
110 |
- try: |
111 |
- from hashlib import md5 |
112 |
- except ImportError: |
113 |
-@@ -314,7 +314,8 @@ |
114 |
- |
115 |
- |
116 |
- def get_graph_hash(node): |
117 |
-- return md5(node['content'] + str(node['parts'])).hexdigest()[-10:] |
118 |
-+ encoded = (node['content'] + str(node['parts'])).encode('utf-8') |
119 |
-+ return md5(encoded).hexdigest()[-10:] |
120 |
- |
121 |
- |
122 |
- def html_visit_inheritance_diagram(self, node): |
123 |
|
124 |
diff --git a/dev-python/sphinx/sphinx-1.1.3-r8.ebuild b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild |
125 |
deleted file mode 100644 |
126 |
index 8d3dfce5aa0..00000000000 |
127 |
--- a/dev-python/sphinx/sphinx-1.1.3-r8.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,128 +0,0 @@ |
130 |
-# Copyright 1999-2017 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-EAPI=5 |
134 |
- |
135 |
-PYTHON_COMPAT=( python2_7 pypy ) |
136 |
-PYTHON_REQ_USE="threads(+)" |
137 |
- |
138 |
-inherit distutils-r1 eutils versionator |
139 |
- |
140 |
-MY_PN="Sphinx" |
141 |
-MY_P="${MY_PN}-${PV}" |
142 |
- |
143 |
-DESCRIPTION="Python documentation generator" |
144 |
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx" |
145 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
146 |
- |
147 |
-LICENSE="BSD" |
148 |
-SLOT="0" |
149 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
150 |
-IUSE="doc latex test" |
151 |
- |
152 |
-# Split the jinja dep to allow different slots to satisfy it |
153 |
-RDEPEND=" |
154 |
- <dev-python/docutils-0.13[${PYTHON_USEDEP}] |
155 |
- >=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
156 |
- >=dev-python/pygments-1.2[${PYTHON_USEDEP}] |
157 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
158 |
- latex? ( |
159 |
- dev-texlive/texlive-latexextra |
160 |
- app-text/dvipng |
161 |
- )" |
162 |
-DEPEND="${DEPEND} |
163 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
164 |
- |
165 |
-S="${WORKDIR}/${MY_P}" |
166 |
- |
167 |
-PATCHES=( |
168 |
- "${FILESDIR}"/${P}-python3.patch |
169 |
- "${FILESDIR}"/${P}-docutils-manpage.patch |
170 |
-) |
171 |
- |
172 |
-python_compile() { |
173 |
- distutils-r1_python_compile |
174 |
- |
175 |
- # Generate the grammar. It will be caught by install somehow. |
176 |
- # Note that the tests usually do it for us. However, I don't want |
177 |
- # to trust USE=test really running all the tests, especially |
178 |
- # with FEATURES=test-fail-continue. |
179 |
- cd "${BUILD_DIR}"/lib || die |
180 |
- "${PYTHON}" -m sphinx.pycode.__init__ \ |
181 |
- || die "Grammar generation failed." |
182 |
-} |
183 |
- |
184 |
-python_compile_all() { |
185 |
- use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html |
186 |
-} |
187 |
- |
188 |
-python_test() { |
189 |
- cp -r -l tests "${BUILD_DIR}"/ || die |
190 |
- |
191 |
- if [[ ${EPYTHON} == python3* ]]; then |
192 |
- 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die |
193 |
- fi |
194 |
- |
195 |
- nosetests -w "${BUILD_DIR}"/tests \ |
196 |
- || die "Tests fail with ${EPYTHON}" |
197 |
-} |
198 |
- |
199 |
-python_install_all() { |
200 |
- use doc && local HTML_DOCS=( doc/_build/html/. ) |
201 |
- |
202 |
- distutils-r1_python_install_all |
203 |
-} |
204 |
- |
205 |
-replacing_python_eclass() { |
206 |
- local pv |
207 |
- for pv in ${REPLACING_VERSIONS}; do |
208 |
- if ! version_is_at_least 1.1.3-r4 ${pv}; then |
209 |
- return 0 |
210 |
- fi |
211 |
- done |
212 |
- |
213 |
- return 1 |
214 |
-} |
215 |
- |
216 |
-pkg_preinst() { |
217 |
- if replacing_python_eclass; then |
218 |
- # the old python.eclass ebuild will want to remove our pickles... |
219 |
- backup_pickle() { |
220 |
- # array to enable filename expansion |
221 |
- local pickle_name=( |
222 |
- "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle |
223 |
- ) |
224 |
- |
225 |
- local dest=${ROOT}${pickle_name[0]#${D}}.backup |
226 |
- |
227 |
- eumask_push 022 |
228 |
- mkdir -p "${dest%/*}" || die |
229 |
- eumask_pop |
230 |
- |
231 |
- cp -p -v "${pickle_name[0]}" "${dest}" \ |
232 |
- || die "Unable to backup grammar pickle from overwriting" |
233 |
- } |
234 |
- |
235 |
- python_foreach_impl backup_pickle |
236 |
- fi |
237 |
-} |
238 |
- |
239 |
-pkg_postinst() { |
240 |
- if replacing_python_eclass; then |
241 |
- local warned |
242 |
- |
243 |
- restore_pickle() { |
244 |
- local backup_name=( |
245 |
- "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup |
246 |
- ) |
247 |
- local dest=${backup_name[0]%.backup} |
248 |
- |
249 |
- mv -v "${backup_name[0]}" "${dest}" \ |
250 |
- || die "Unable to restore grammar pickle backup" |
251 |
- } |
252 |
- |
253 |
- python_foreach_impl restore_pickle |
254 |
- |
255 |
- [[ ${warned} ]] && ewarn "Please try rebuilding the package." |
256 |
- fi |
257 |
-} |
258 |
|
259 |
diff --git a/dev-python/sphinx/sphinx-1.5.1-r2.ebuild b/dev-python/sphinx/sphinx-1.5.1-r2.ebuild |
260 |
deleted file mode 100644 |
261 |
index a646038ca5d..00000000000 |
262 |
--- a/dev-python/sphinx/sphinx-1.5.1-r2.ebuild |
263 |
+++ /dev/null |
264 |
@@ -1,113 +0,0 @@ |
265 |
-# Copyright 1999-2017 Gentoo Foundation |
266 |
-# Distributed under the terms of the GNU General Public License v2 |
267 |
- |
268 |
-EAPI=6 |
269 |
- |
270 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
271 |
-PYTHON_REQ_USE="threads(+)" |
272 |
- |
273 |
-inherit distutils-r1 eutils versionator |
274 |
- |
275 |
-DESCRIPTION="Python documentation generator" |
276 |
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx" |
277 |
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz" |
278 |
- |
279 |
-LICENSE="BSD" |
280 |
-SLOT="0" |
281 |
-KEYWORDS="~alpha ~amd64 ~hppa ~x86" |
282 |
-IUSE="doc latex net test" |
283 |
- |
284 |
-RDEPEND=" |
285 |
- >=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}] |
286 |
- <dev-python/alabaster-0.8[${PYTHON_USEDEP}] |
287 |
- >=dev-python/docutils-0.11[${PYTHON_USEDEP}] |
288 |
- >=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
289 |
- >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] |
290 |
- >=dev-python/six-1.5[${PYTHON_USEDEP}] |
291 |
- >=dev-python/Babel-2.1.1[${PYTHON_USEDEP}] |
292 |
- dev-python/requests[${PYTHON_USEDEP}] |
293 |
- >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}] |
294 |
- >=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}] |
295 |
- <dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}] |
296 |
- dev-python/imagesize[${PYTHON_USEDEP}] |
297 |
- latex? ( |
298 |
- dev-texlive/texlive-latexextra |
299 |
- app-text/dvipng |
300 |
- ) |
301 |
- net? ( |
302 |
- >=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}] |
303 |
- >=dev-python/whoosh-2.0[${PYTHON_USEDEP}] |
304 |
- )" |
305 |
-DEPEND="${RDEPEND} |
306 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
307 |
- test? ( |
308 |
- dev-python/nose[${PYTHON_USEDEP}] |
309 |
- dev-python/mock[${PYTHON_USEDEP}] |
310 |
- $(python_gen_cond_dep 'dev-python/simplejson[${PYTHON_USEDEP}]' pypy) |
311 |
- dev-python/html5lib[${PYTHON_USEDEP}] |
312 |
- >=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}] |
313 |
- >=dev-python/whoosh-2.0[${PYTHON_USEDEP}] |
314 |
- dev-python/flake8[${PYTHON_USEDEP}] |
315 |
- $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'pypy*' 'python2*') |
316 |
- $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' 'pypy*' 'python2*' python3_4 ) |
317 |
- )" |
318 |
- |
319 |
-S="${WORKDIR}/${P^}" |
320 |
- |
321 |
-PATCHES=( |
322 |
- "${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch |
323 |
-) |
324 |
- |
325 |
-python_prepare_all() { |
326 |
- # remove tests that fail due to network-sandbox |
327 |
- rm tests/test_websupport.py || die "Failed to remove web tests" |
328 |
- rm tests/test_searchadapters.py || die "Failed to remove web tests" |
329 |
- rm tests/test_build_linkcheck.py || die "Failed to remove web tests" |
330 |
- |
331 |
- distutils-r1_python_prepare_all |
332 |
-} |
333 |
- |
334 |
-python_compile() { |
335 |
- distutils-r1_python_compile |
336 |
- |
337 |
- # Generate the grammar. It will be caught by install somehow. |
338 |
- # Note that the tests usually do it for us. However, I don't want |
339 |
- # to trust USE=test really running all the tests, especially |
340 |
- # with FEATURES=test-fail-continue. |
341 |
- pushd "${BUILD_DIR}"/lib >/dev/null || die |
342 |
- "${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed." |
343 |
- popd >/dev/null || die |
344 |
-} |
345 |
- |
346 |
-python_compile_all() { |
347 |
- if use doc; then |
348 |
- emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html |
349 |
- HTML_DOCS=( doc/_build/html/. ) |
350 |
- fi |
351 |
-} |
352 |
- |
353 |
-python_test() { |
354 |
- mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die |
355 |
- local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir" |
356 |
- cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests" |
357 |
- cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile" |
358 |
- emake test |
359 |
-} |
360 |
- |
361 |
-pkg_postinst() { |
362 |
- replacing_python_eclass() { |
363 |
- local pv |
364 |
- for pv in ${REPLACING_VERSIONS}; do |
365 |
- if ! version_is_at_least 1.1.3-r4 ${pv}; then |
366 |
- return 0 |
367 |
- fi |
368 |
- done |
369 |
- |
370 |
- return 1 |
371 |
- } |
372 |
- |
373 |
- if replacing_python_eclass; then |
374 |
- ewarn "Replaced a very old sphinx version. If you are" |
375 |
- ewarn "experiencing problems, please re-emerge sphinx." |
376 |
- fi |
377 |
-} |