diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2020-01-26 09:13:40 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2020-01-26 09:19:01 +0800 |
| commit | e099f966bfcfe82d06cf946568d6874ff37e1be4 (patch) | |
| tree | 1125802c721dc57667ec96cb62d16e3bd2306d0b /dev-python/matplotlib/files | |
| parent | profiles/alpha: Remove extra " (diff) | |
| download | gentoo-e099f966bfcfe82d06cf946568d6874ff37e1be4.tar.gz gentoo-e099f966bfcfe82d06cf946568d6874ff37e1be4.tar.bz2 gentoo-e099f966bfcfe82d06cf946568d6874ff37e1be4.zip | |
dev-python/matplotlib: bump to 3.1.2.
- Unbundle qhull.
- Depend on pyobject:3[cairo] for USE="gtk3 cairo".
- p/arch/arm64/package.use.mask: mask USE=wxwidgets
dev-python/wxpython does not have arm64 keyword.
Closes: https://bugs.gentoo.org/671796
Closes: https://bugs.gentoo.org/680176
Closes: https://bugs.gentoo.org/665560
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'dev-python/matplotlib/files')
| -rw-r--r-- | dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch | 15 | ||||
| -rw-r--r-- | dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch | 20 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch new file mode 100644 index 000000000000..145f321039b9 --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch @@ -0,0 +1,15 @@ +Index: matplotlib-3.1.2/setup.py +=================================================================== +--- matplotlib-3.1.2.orig/setup.py ++++ matplotlib-3.1.2/setup.py +@@ -125,7 +125,9 @@ cmdclass['build_ext'] = BuildExtraLibrar + + + def _download_jquery_to(dest): +- if os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")): ++ # Avoid downloading jquery ui during emerge: we already have it in ++ # pypi's tarball. use this! ++ if True: + return + + # If we are installing from an sdist, use the already downloaded jquery-ui diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch new file mode 100644 index 000000000000..e02e03e65edb --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch @@ -0,0 +1,20 @@ +Index: matplotlib-3.1.2/setupext.py +=================================================================== +--- matplotlib-3.1.2.orig/setupext.py ++++ matplotlib-3.1.2/setupext.py +@@ -839,14 +839,7 @@ class Qhull(SetupPackage): + name = "qhull" + + def add_flags(self, ext): +- # Qhull doesn't distribute pkg-config info, so we have no way of +- # knowing whether a system install is recent enough. Thus, always use +- # the vendored version. +- ext.include_dirs.insert(0, 'extern') +- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c'))) +- if sysconfig.get_config_var('LIBM') == '-lm': +- ext.libraries.extend('m') +- ++ ext.libraries.extend(['qhull']) + + class TTConv(SetupPackage): + name = "ttconv" |