Gentoo Archives: gentoo-commits

From: Aaron Swenson <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/psycopg/files/
Date: Sun, 02 Sep 2018 11:04:59
Message-Id: 1535886282.deb4da97b578a6a59499d166d1b4686f2aae8c47.titanofold@gentoo
1 commit: deb4da97b578a6a59499d166d1b4686f2aae8c47
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 29 15:25:10 2018 +0000
4 Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 2 11:04:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb4da97
7
8 dev-python/psycopg: remove unused patches
9
10 .../psycopg/files/psycopg-2.4.2-setup.py.patch | 13 ----------
11 .../psycopg/files/psycopg-2.7.3-sphinx-1.6.patch | 29 ----------------------
12 2 files changed, 42 deletions(-)
13
14 diff --git a/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch b/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
15 deleted file mode 100644
16 index a35502270e1..00000000000
17 --- a/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
18 +++ /dev/null
19 @@ -1,13 +0,0 @@
20 -diff --git a/setup.py b/setup.py
21 -index e03876a..f5ec2ac 100644
22 ---- a/setup.py
23 -+++ b/setup.py
24 -@@ -461,7 +461,7 @@ if parser.has_option('build_ext', 'mx_include_dir'):
25 - mxincludedir = parser.get('build_ext', 'mx_include_dir')
26 - else:
27 - mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
28 --if os.path.exists(mxincludedir):
29 -+if not use_pydatetime and os.path.exists(mxincludedir):
30 - # Build the support for mx: we will check at runtime if it can be imported
31 - include_dirs.append(mxincludedir)
32 - define_macros.append(('HAVE_MXDATETIME', '1'))
33 \ No newline at end of file
34
35 diff --git a/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
36 deleted file mode 100644
37 index 4052a14649e..00000000000
38 --- a/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
39 +++ /dev/null
40 @@ -1,29 +0,0 @@
41 ---- psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2016-04-10 08:48:37.000000000 +0200
42 -+++ psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2017-12-20 22:14:19.097225121 +0100
43 -@@ -12,7 +12,7 @@
44 - from docutils import nodes
45 -
46 - from sphinx.locale import _
47 --from sphinx.util.compat import Directive, make_admonition
48 -+from docutils.parsers.rst import Directive
49 -
50 - class extension_node(nodes.Admonition, nodes.Element): pass
51 -
52 -@@ -29,12 +29,11 @@ class Extension(Directive):
53 - option_spec = {}
54 -
55 - def run(self):
56 -- nodes = make_admonition(extension_node,
57 -- self.name, [_('DB API extension')], self.options,
58 -- self.content, self.lineno, self.content_offset,
59 -- self.block_text, self.state, self.state_machine)
60 -- nodes[0]['classes'].append('dbapi-extension')
61 -- return nodes
62 -+ node = extension_node('\n'.join(self.content))
63 -+ node += nodes.title(_('DB API extension'), _('DB API extension'))
64 -+ self.state.nested_parse(self.content, self.content_offset, node)
65 -+ node['classes'].append('dbapi-extension')
66 -+ return [node]
67 -
68 -
69 - def visit_extension_node(self, node):