diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2018-01-12 16:01:04 -0500 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2018-01-12 16:01:04 -0500 |
| commit | 4eeca29c1cbeec279c6cb5d572bc0518162f237e (patch) | |
| tree | 34e9d8a9266cc65e30867599598b61e8d78124e4 /dev-python/psycopg/files | |
| parent | dev-java/commons-collections: stable for amd64. mark stable for the remaining... (diff) | |
| download | gentoo-4eeca29c1cbeec279c6cb5d572bc0518162f237e.tar.gz gentoo-4eeca29c1cbeec279c6cb5d572bc0518162f237e.tar.bz2 gentoo-4eeca29c1cbeec279c6cb5d572bc0518162f237e.zip | |
dev-python/psycopg: Bump to 2.7.3.2 and many fixes
Apply a couple patches. One for building documentation (634730) and
another to avoid building against mxdatetime from the antiquated
dev-python/egenix-mx-base (452028, 629430).
This version knows how to parse the new PostgreSQL version scheme
(625540).
Docs build again (540996).
Bug: https://bugs.gentoo.org/452028
Bug: https://bugs.gentoo.org/540996
Bug: https://bugs.gentoo.org/625540
Bug: https://bugs.gentoo.org/629430
Bug: https://bugs.gentoo.org/634730
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'dev-python/psycopg/files')
| -rw-r--r-- | dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch | 40 | ||||
| -rw-r--r-- | dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch | 29 |
2 files changed, 69 insertions, 0 deletions
diff --git a/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch new file mode 100644 index 000000000000..aab130c54500 --- /dev/null +++ b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch @@ -0,0 +1,40 @@ +Index: psycopg2-2.7.3/setup.py +=================================================================== +--- psycopg2-2.7.3.orig/setup.py ++++ psycopg2-2.7.3/setup.py +@@ -527,20 +527,21 @@ have_pydatetime = True + have_mxdatetime = False + use_pydatetime = int(parser.get('build_ext', 'use_pydatetime')) + +-# check for mx package +-mxincludedir = '' +-if parser.has_option('build_ext', 'mx_include_dir'): +- mxincludedir = parser.get('build_ext', 'mx_include_dir') +-if not mxincludedir: +- mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") +-if mxincludedir.strip() and os.path.exists(mxincludedir): +- # Build the support for mx: we will check at runtime if it can be imported +- include_dirs.append(mxincludedir) +- define_macros.append(('HAVE_MXDATETIME', '1')) +- sources.append('adapter_mxdatetime.c') +- depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c']) +- have_mxdatetime = True +- version_flags.append('mx') ++if not use_pydatetime: ++ # check for mx package ++ mxincludedir = '' ++ if parser.has_option('build_ext', 'mx_include_dir'): ++ mxincludedir = parser.get('build_ext', 'mx_include_dir') ++ if not mxincludedir: ++ mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") ++ if mxincludedir.strip() and os.path.exists(mxincludedir): ++ # Build the support for mx: we will check at runtime if it can be imported ++ include_dirs.append(mxincludedir) ++ define_macros.append(('HAVE_MXDATETIME', '1')) ++ sources.append('adapter_mxdatetime.c') ++ depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c']) ++ have_mxdatetime = True ++ version_flags.append('mx') + + # now decide which package will be the default for date/time typecasts + if have_pydatetime and (use_pydatetime or not have_mxdatetime): 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 new file mode 100644 index 000000000000..4052a14649ef --- /dev/null +++ b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch @@ -0,0 +1,29 @@ +--- psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2016-04-10 08:48:37.000000000 +0200 ++++ psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2017-12-20 22:14:19.097225121 +0100 +@@ -12,7 +12,7 @@ + from docutils import nodes + + from sphinx.locale import _ +-from sphinx.util.compat import Directive, make_admonition ++from docutils.parsers.rst import Directive + + class extension_node(nodes.Admonition, nodes.Element): pass + +@@ -29,12 +29,11 @@ class Extension(Directive): + option_spec = {} + + def run(self): +- nodes = make_admonition(extension_node, +- self.name, [_('DB API extension')], self.options, +- self.content, self.lineno, self.content_offset, +- self.block_text, self.state, self.state_machine) +- nodes[0]['classes'].append('dbapi-extension') +- return nodes ++ node = extension_node('\n'.join(self.content)) ++ node += nodes.title(_('DB API extension'), _('DB API extension')) ++ self.state.nested_parse(self.content, self.content_offset, node) ++ node['classes'].append('dbapi-extension') ++ return [node] + + + def visit_extension_node(self, node): |