diff options
29 files changed, 93 insertions, 1512 deletions
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest index 2770c0b618f5..92e0ce26aea5 100644 --- a/app-misc/neofetch/Manifest +++ b/app-misc/neofetch/Manifest @@ -1,4 +1,2 @@ -DIST neofetch-3.1.0.tar.gz 68930 BLAKE2B 4809b972f0cb3ea641cbda00e7777617808891d4ae12ddfd52670d8ee490f4659540faf55b994d212e047d5926349dbe8478dc7e3caccf0f22c2b97b57cb9cdc SHA512 0a13acadf1841c1e714c07f9643028446a1f4df6a79e7c3189c4c11d8854813dfbb983784d62dc59a9209893ee2339ca5642fe413d1066a5cb6e9e167ae74975 -DIST neofetch-3.2.0.tar.gz 71331 BLAKE2B 073eeaa74691b3d262fcd0da8da76d9264dc012fda89ce045b4ccdbfead490049bd551d3ff95042a21fb0d6073d1120170f889492ec4ee50c57c3ecd786cb9e4 SHA512 790dd282b99437a416f25a895d5a3359be31d162447e2f59863c635c144045a6b81672e4469ca9b6eeba56fc927e787a67f0a317309bbc0f52500b0f9e072764 DIST neofetch-3.3.0.tar.gz 76325 BLAKE2B c7bd860dd1f89f4b0e64a5a4dcc6551d548103abbdda0606fdbfa5edbe27d91da053198f219e223af56571a87d3af4b93f8f8d615ad4f377b1754da4bee50526 SHA512 aa220f3d177a3f58e7cb665209e6bd70334eb3d2daccf7ec9cb32353b8c23f53e000f7d412422c8d5fcf1132b39f4a9dc51141ed7359f45c1f0f7a189853baf0 DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b diff --git a/app-misc/neofetch/neofetch-3.1.0.ebuild b/app-misc/neofetch/neofetch-3.1.0.ebuild deleted file mode 100644 index 74d58f581757..000000000000 --- a/app-misc/neofetch/neofetch-3.1.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple information system script" -HOMEPAGE="https://github.com/dylanaraps/neofetch" -SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz" -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="sys-apps/pciutils - X? ( - x11-apps/xprop - x11-apps/xwininfo - x11-apps/xrandr - www-client/w3m[imlib] - media-libs/imlib2 - media-gfx/imagemagick - )" diff --git a/app-misc/neofetch/neofetch-3.2.0.ebuild b/app-misc/neofetch/neofetch-3.2.0.ebuild deleted file mode 100644 index 74d58f581757..000000000000 --- a/app-misc/neofetch/neofetch-3.2.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple information system script" -HOMEPAGE="https://github.com/dylanaraps/neofetch" -SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz" -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="sys-apps/pciutils - X? ( - x11-apps/xprop - x11-apps/xwininfo - x11-apps/xrandr - www-client/w3m[imlib] - media-libs/imlib2 - media-gfx/imagemagick - )" diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild index 0bfd665036b1..02361f6c21ce 100644 --- a/app-misc/neofetch/neofetch-3.4.0.ebuild +++ b/app-misc/neofetch/neofetch-3.4.0.ebuild @@ -13,10 +13,10 @@ IUSE="X" RDEPEND="sys-apps/pciutils X? ( + media-gfx/imagemagick + media-libs/imlib2 + www-client/w3m[imlib] x11-apps/xprop - x11-apps/xwininfo x11-apps/xrandr - www-client/w3m[imlib] - media-libs/imlib2 - media-gfx/imagemagick + x11-apps/xwininfo )" diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild index 6a5cf4e804aa..2bcaa63beeae 100644 --- a/app-misc/neofetch/neofetch-9999.ebuild +++ b/app-misc/neofetch/neofetch-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,10 +12,11 @@ SLOT="0" IUSE="X" RDEPEND="sys-apps/pciutils - X? ( x11-apps/xprop - x11-apps/xwininfo - x11-apps/xrandr - www-client/w3m[imlib] - media-libs/imlib2 - media-gfx/imagemagick -)" + X? ( + media-gfx/imagemagick + media-libs/imlib2 + www-client/w3m[imlib] + x11-apps/xprop + x11-apps/xrandr + x11-apps/xwininfo + )" diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild new file mode 100644 index 000000000000..7987c23cfe1d --- /dev/null +++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Abstraction layer for PyQt5/PySide" +HOMEPAGE="https://github.com/spyder-ide/qtpy" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="designer gui opengl svg testlib webkit" + +RDEPEND=" + dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] + gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) + testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) +" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + default + + sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die +} diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild deleted file mode 100644 index de40764e990a..000000000000 --- a/dev-python/QtPy/QtPy-1.3.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Abstraction layer for PyQt5/PySide" -HOMEPAGE="https://github.com/spyder-ide/qtpy" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit" - -REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )" - -RDEPEND=" - pyqt5? ( - dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] - gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) - testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) - ) - pyside? ( - dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?] - gui? ( dev-python/pyside[${PYTHON_USEDEP},X] ) - testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] ) - ) -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - default - - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die - - if ! use pyqt5; then - sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die - fi - - if ! use pyside; then - sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die - sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die - fi -} diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild new file mode 100644 index 000000000000..0ec5a63afb85 --- /dev/null +++ b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Abstraction layer for PyQt5/PySide" +HOMEPAGE="https://github.com/spyder-ide/qtpy" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="designer gui opengl svg testlib webkit webengine" + +RDEPEND=" + dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?] + gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) + testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) +" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + default + + sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die +} diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild deleted file mode 100644 index 67ff013c69fe..000000000000 --- a/dev-python/QtPy/QtPy-1.4.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Abstraction layer for PyQt5/PySide" -HOMEPAGE="https://github.com/spyder-ide/qtpy" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit webengine" - -REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )" - -RDEPEND=" - pyqt5? ( - dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?] - gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) - testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) - ) - pyside? ( - dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?] - gui? ( dev-python/pyside[${PYTHON_USEDEP},X] ) - testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] ) - ) -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - default - - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die - - if ! use pyqt5; then - sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die - fi - - if ! use pyside; then - sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die - sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die - fi -} diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml index f7b2b130bc4a..e1b8d6e3aa72 100644 --- a/dev-python/QtPy/metadata.xml +++ b/dev-python/QtPy/metadata.xml @@ -18,8 +18,6 @@ <use> <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag> <flag name="gui">Build bindings for the QtGui module</flag> - <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag> - <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag> <flag name="svg">Build bindings for the QtSvg module</flag> <flag name="testlib">Build bindings for the QtTest module</flag> <flag name="webengine">Build bindings for the QtWebEngine module</flag> diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 39b41fe50aa5..1eded76c0c56 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,3 +1,2 @@ DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061 -DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320 diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch deleted file mode 100644 index d6b2ae860038..000000000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit f98c4846dc3c15b3d24aafb973764cb9b860d935 -Author: Thomas A Caswell <tcaswell@gmail.com> -Date: Sat Jan 10 16:10:29 2015 -0500 - - MNT : removed deprecated method/kwargs from patheffects - - Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae - - attn @pelson had to known-fail a test which was using the - proxy renderer to verify that PathEffectRender was working - correctly. - -diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py -index 13f8ce0..19e1c4a 100644 ---- a/lib/matplotlib/patheffects.py -+++ b/lib/matplotlib/patheffects.py -@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function, - import six - - from matplotlib.backend_bases import RendererBase --from matplotlib.backends.backend_mixed import MixedModeRenderer - import matplotlib.transforms as mtransforms --import matplotlib.cbook as cbook - from matplotlib.colors import colorConverter - import matplotlib.patches as mpatches - -@@ -42,12 +40,6 @@ class AbstractPathEffect(object): - return transform + self._offset_trans.clear().translate(offset_x, - offset_y) - -- def get_proxy_renderer(self, renderer): -- """Return a PathEffectRenderer instance for this PathEffect.""" -- cbook.deprecated('v1.4', name='get_proxy_renderer', -- alternative='PathEffectRenderer') -- return PathEffectRenderer([self], renderer) -- - def _update_gc(self, gc, new_gc_dict): - """ - Update the given GraphicsCollection with the given -@@ -219,9 +211,9 @@ class withStroke(Stroke): - - class SimplePatchShadow(AbstractPathEffect): - """A simple shadow via a filled patch.""" -- def __init__(self, offset=(2,-2), -- shadow_rgbFace=None, alpha=None, patch_alpha=None, -- rho=0.3, offset_xy=None, **kwargs): -+ def __init__(self, offset=(2, -2), -+ shadow_rgbFace=None, alpha=None, -+ rho=0.3, **kwargs): - """ - Parameters - ---------- -@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect): - :meth:`AbstractPathEffect._update_gc`. - - """ -- if offset_xy is not None: -- cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. ' -- 'Use the offset keyword instead.') -- offset = offset_xy - super(SimplePatchShadow, self).__init__(offset) - - if shadow_rgbFace is None: - self._shadow_rgbFace = shadow_rgbFace - else: - self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace) -- if patch_alpha is not None: -- cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. ' -- 'Use the alpha keyword instead. Transform your ' -- 'patch_alpha by alpha = 1 - patch_alpha') -- if alpha is not None: -- raise ValueError("Both alpha and patch_alpha were set. " -- "Just use alpha.") -- alpha = 1 - patch_alpha - - if alpha is None: - alpha = 0.3 -diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py -index 8298ceb..5af71e5 100644 ---- a/lib/matplotlib/tests/test_patheffects.py -+++ b/lib/matplotlib/tests/test_patheffects.py -@@ -5,7 +5,8 @@ import six - - import numpy as np - --from matplotlib.testing.decorators import image_comparison, cleanup -+from matplotlib.testing.decorators import (image_comparison, cleanup, -+ knownfailureif) - import matplotlib.pyplot as plt - import matplotlib.patheffects as path_effects - -@@ -84,19 +85,7 @@ def test_patheffect3(): - - - @cleanup --def test_PathEffect_get_proxy(): -- pe = path_effects.AbstractPathEffect() -- fig = plt.gcf() -- renderer = fig.canvas.get_renderer() -- -- with mock.patch('matplotlib.cbook.deprecated') as dep: -- proxy_renderer = pe.get_proxy_renderer(renderer) -- assert_equal(proxy_renderer._renderer, renderer) -- assert_equal(proxy_renderer._path_effects, [pe]) -- dep.assert_called() -- -- --@cleanup -+@knownfailureif(True) - def test_PathEffect_points_to_pixels(): - fig = plt.figure(dpi=150) - p1, = plt.plot(range(10)) -@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels(): - pe_renderer.points_to_pixels(15)) - - --def test_SimplePatchShadow_offset_xy(): -- with mock.patch('matplotlib.cbook.deprecated') as dep: -- pe = path_effects.SimplePatchShadow(offset_xy=(4, 5)) -+def test_SimplePatchShadow_offset(): -+ pe = path_effects.SimplePatchShadow(offset=(4, 5)) - assert_equal(pe._offset, (4, 5)) -- dep.assert_called() - - - @image_comparison(baseline_images=['collection']) diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch deleted file mode 100644 index 065731441311..000000000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/matplotlib/matplotlib/pull/4430 - -From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Fri, 15 May 2015 03:36:45 -0400 -Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG - -When cross-compiling, it is common to set the PKG_CONFIG env var to a -custom pkg-config that knows about the target. Make sure we respect -that just like the standard pkg-config tools suggest (pkg.m4). If it -isn't set, we use the same default as today -- "pkg-config". ---- - setupext.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/setupext.py b/setupext.py -index 80b2a6c..29cddf9 100755 ---- a/setupext.py -+++ b/setupext.py -@@ -253,7 +253,8 @@ class PkgConfig(object): - self.has_pkgconfig = False - else: - self.set_pkgconfig_path() -- status, output = getstatusoutput("pkg-config --help") -+ self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config') -+ status, output = getstatusoutput("%s --help" % self.pkgconfig) - self.has_pkgconfig = (status == 0) - if not self.has_pkgconfig: - print("IMPORTANT WARNING:") -@@ -286,7 +287,7 @@ class PkgConfig(object): - - executable = alt_exec - if self.has_pkgconfig: -- executable = 'pkg-config {0}'.format(package) -+ executable = '%s %s' % (self.pkgconfig, package) - - use_defaults = True - -@@ -330,7 +331,7 @@ class PkgConfig(object): - return None - - status, output = getstatusoutput( -- "pkg-config %s --modversion" % (package)) -+ '%s %s --modversion' % (self.pkgconfig, package)) - if status == 0: - return output - return None --- -2.4.0 - diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch deleted file mode 100644 index 9580c70b2ae9..000000000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/matplotlib/matplotlib/pull/4430 - -From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Fri, 15 May 2015 03:43:17 -0400 -Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH - -The current code always sets PKG_CONFIG_PATH to build paths in / which -breaks cross-compiling -- things like /usr/lib are for the build system -(e.g. x86) and not for the target (e.g. arm). Since we're adding paths -that are already the default for pkg-config, there's no point in trying -to be smart here. Just punt the code. - -This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148. ---- - setupext.py | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/setupext.py b/setupext.py -index 29cddf9..57d80e7 100755 ---- a/setupext.py -+++ b/setupext.py -@@ -252,7 +252,6 @@ class PkgConfig(object): - if sys.platform == 'win32': - self.has_pkgconfig = False - else: -- self.set_pkgconfig_path() - self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config') - status, output = getstatusoutput("%s --help" % self.pkgconfig) - self.has_pkgconfig = (status == 0) -@@ -262,20 +261,6 @@ class PkgConfig(object): - " pkg-config is not installed.\n" - " matplotlib may not be able to find some of its dependencies") - -- def set_pkgconfig_path(self): -- pkgconfig_path = sysconfig.get_config_var('LIBDIR') -- if pkgconfig_path is None: -- return -- -- pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig') -- if not os.path.isdir(pkgconfig_path): -- return -- -- try: -- os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path -- except KeyError: -- os.environ['PKG_CONFIG_PATH'] = pkgconfig_path -- - def setup_extension(self, ext, package, default_include_dirs=[], - default_library_dirs=[], default_libraries=[], - alt_exec=None): --- -2.4.0 - diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch deleted file mode 100644 index 21fdf128863c..000000000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://github.com/matplotlib/matplotlib/pull/4430 - -From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Fri, 15 May 2015 03:49:02 -0400 -Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths - -The native compiler should already know the right paths to look for -includes and libraries. Hardcoding a specific list of those paths -breaks both cross-compiling and multilib. In the former, paths like -/usr/include and /usr/lib are for x86 but when you want to build for -arm, mixing them leads to bad failures. In the latter, paths like -/usr/lib typically hold 32it libraries, but when you're building for -64bit, you want the libs from /usr/lib64. This goes even further as -there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither -of which are handled here. - -Instead, delete the code entirely and rely on the compiler being -properly configured. If you want to use a misconfigured compiler, -you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L -that your system needs. ---- - setupext.py | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/setupext.py b/setupext.py -index 57d80e7..7473e3a 100755 ---- a/setupext.py -+++ b/setupext.py -@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler - - def make_extension(name, files, *args, **kwargs): - """ -- Make a new extension. Automatically sets include_dirs and -- library_dirs to the base directories appropriate for this -- platform. -+ Make a new extension. - - `name` is the name of the extension. - -@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs): - `distutils.core.Extension` constructor. - """ - ext = DelayedExtension(name, files, *args, **kwargs) -- for dir in get_base_dirs(): -- include_dir = os.path.join(dir, 'include') -- if os.path.exists(include_dir): -- ext.include_dirs.append(include_dir) -- for lib in ('lib', 'lib64'): -- lib_dir = os.path.join(dir, lib) -- if os.path.exists(lib_dir): -- ext.library_dirs.append(lib_dir) - ext.include_dirs.append('.') - - return ext --- -2.4.0 - diff --git a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch deleted file mode 100644 index 7ca0c6974234..000000000000 --- a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py ---- matplotlib-2.1.2.orig/doc/conf.py 2018-01-19 11:07:49.000000000 +0700 -+++ matplotlib-2.1.2/doc/conf.py 2018-01-21 20:06:44.120901546 +0700 -@@ -136,5 +136,5 @@ - } - --plot_gallery = 'True' -+plot_gallery = True - - # Add any paths that contain templates here, relative to this directory. diff --git a/dev-python/matplotlib/matplotlib-2.2.0.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild index d1fc0c28597f..6cf20a9bd9ec 100644 --- a/dev-python/matplotlib/matplotlib-2.2.0.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild @@ -19,7 +19,7 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets" +IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" @@ -102,9 +102,7 @@ RDEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) - pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) - " + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" # A few C++ source files are written to srcdir. # Other than that, the ebuild shall be fit for out-of-source build. @@ -177,11 +175,12 @@ python_configure() { tests = $(usex test True False) [gui_support] agg = True + pyside = False + pysideagg = False qt4 = False qt4agg = False $(use_setup cairo) $(use_setup gtk3) - $(use_setup pyside) $(use_setup qt5) $(use_setup tk) EOF diff --git a/dev-python/matplotlib/matplotlib-2.2.2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2.ebuild deleted file mode 100644 index ab5d6e06efaa..000000000000 --- a/dev-python/matplotlib/matplotlib-2.2.2.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix - -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="https://matplotlib.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" -IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets" - -PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" -REQUIRED_USE=" - doc? ( ${PY2_FLAGS} ) - excel? ( ${PY2_FLAGS} ) - gtk2? ( ${PY2_FLAGS} ) - wxwidgets? ( ${PY2_FLAGS} ) - test? ( - cairo latex qt5 tk wxwidgets - || ( gtk2 gtk3 ) - )" - -# #456704 -- a lot of py2-only deps -PY2_USEDEP=$(python_gen_usedep python2_7) -PY2_DEPEND=" - $(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" -COMMON_DEPEND=" - dev-python/cycler[${PYTHON_USEDEP}] - >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/six-1.10[${PYTHON_USEDEP}] - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013 - >=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}] - cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) - gtk2? ( - dev-libs/glib:2= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - dev-python/pygtk[${PY2_USEDEP}] ) - wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" - -# internal copy of pycxx highly patched -# dev-python/pycxx - -DEPEND="${COMMON_DEPEND} - ${PY2_DEPEND} - dev-python/versioneer[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - app-text/dvipng - dev-python/colorspacious[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/mock[${PY2_USEDEP}] - dev-python/numpydoc[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - media-gfx/graphviz[cairo] - ) - test? ( - dev-python/mock[${PYTHON_USEDEP}] - >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - ${PY2_DEPEND} - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) - gtk3? ( - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] ) - latex? ( - virtual/latex-base - app-text/ghostscript-gpl - app-text/dvipng - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-xetex - ) - pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) - " - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -pkg_setup() { - unset DISPLAY # bug #278524 -} - -use_setup() { - local uword="${2:-${1}}" - if use ${1}; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - hprefixify setupext.py - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [packages] - tests = $(usex test True False) - [gui_support] - agg = True - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup pyside) - $(use_setup qt5) - $(use_setup tk) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi - - if python_is_python3; then - cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die - gtk = False - gtkagg = False - wx = False - wxagg = False - EOF - else - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - $(use_setup gtk2 gtk) - $(use_setup wxwidgets wx) - EOF - fi -} - -wrap_setup() { - local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg - unset DISPLAY - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -python_test() { - wrap_setup distutils_install_for_testing - - virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" -} - -python_install() { - wrap_setup distutils-r1_python_install - - # mpl_toolkits namespace - python_moduleinto mpl_toolkits - python_domodule lib/mpl_toolkits/__init__.py -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index 47834984e715..98ec197ce5f7 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="" -IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" +IUSE="cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" @@ -31,7 +31,7 @@ REQUIRED_USE=" gtk2? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) test? ( - cairo fltk latex pyside qt5 qt4 tk wxwidgets + cairo fltk latex qt5 tk wxwidgets || ( gtk2 gtk3 ) )" @@ -102,10 +102,7 @@ RDEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) - pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) - qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) - " + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" # A few C++ source files are written to srcdir. # Other than that, the ebuild shall be fit for out-of-source build. @@ -182,9 +179,11 @@ python_configure() { dateutil = False [gui_support] agg = True + pyside = False + pysideagg = False + qt4 = False + qt4agg = False $(use_setup cairo) - $(use_setup pyside) - $(use_setup qt4) $(use_setup qt5) $(use_setup tk) EOF diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest index ca22c715c1cb..d1daf66ed35d 100644 --- a/dev-python/pandas/Manifest +++ b/dev-python/pandas/Manifest @@ -1,7 +1,2 @@ -DIST pandas-0.16.2.tar.gz 4931751 BLAKE2B 5ffd1df908580d966f782a7b371c7798b65ae7caacda3d8591c8de770e2f9008a3d026d9cb7f80ae857db3c24c41c0d21b8586862c39ec1b20f6e02c28e1a79f SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b -DIST pandas-0.17.0.tar.gz 6508621 BLAKE2B 226bf513c4fc7261331114832880da71f7b881e906d6739a81bc7c6bb048f3eeecc9806aa65c7eed246ea4df16c380595bd432ab7c25b9964ca8b879a7f705cf SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b -DIST pandas-0.17.1.tar.gz 6674479 BLAKE2B 0d61f0a603f758aaef6c2eddf6d70307255679b2ef0b599e81b3a4c0e67ebd7584b1f3d436e34d02264b9c17317508f40c5186fd874b4a362efa6edf68eef900 SHA512 9d9f9064585b1f3551625e0c8f4eedaaa1253790c2a5cb28e58e70eb805cc18f9770d793aa748cbd76798488ff60efdd01eb4b21daf5ad8f1dc4d9c050487234 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f -DIST pandas-0.20.1.tar.gz 10307434 BLAKE2B f8490a4a7f5c165753df274a0dea81552efc90a0cbf78d9e1fbeb6d0bc26e8ffaf3dbdf796a3abfb29d01332004af2adfbd9946c69d905f309cc730613de8123 SHA512 d477a815914c825efd6430f7eb19f3f9115c1c4ab03000ca6d4f64023f7b5f53eff512792fea2d8b33c7febb3667fc3a3de55f11eeb453f285cae40e6b473707 -DIST pandas-0.20.3.tar.gz 10402185 BLAKE2B a2c8d8f0007d481ccb897d2e9be106319cd3b7c0edf397fb99e7c6f43511c218ff5e7a7f099fcf23406f7e3ea691272e75c0f130cce991ccf159df7223d26584 SHA512 891c7e04d075f96fadf3775e903472e279eaeaa4509eb0da81a74261a3ed86ff309de0b5a2c100ee93dd968fed1df6d7e426ca78785b2b36785fe7679218fdc5 DIST pandas-0.23.0rc2.tar.gz 12542694 BLAKE2B 7c6383d32430fec89b7d5cbb1f8eef0f2201ba85d5865118fa035b6ad4c852b5f4e691f98f0cf3ac5c1283720025f8500c43414d0931af5211972208428537bd SHA512 3df13f74dbcac00baffd39c732751d4e7bd16adf529b60b05b2373651d86e0aba37d6f3a4339df170e9ab3d89ee03fc18827dd3728ff972bcdfe3a0604bff59d diff --git a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch deleted file mode 100644 index c83319256f22..000000000000 --- a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch +++ /dev/null @@ -1,28 +0,0 @@ - pandas/tests/test_categorical.py | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py -old mode 100755 -new mode 100644 -index e97010e..1d14323 ---- a/pandas/tests/test_categorical.py -+++ b/pandas/tests/test_categorical.py -@@ -86,12 +86,14 @@ class TestCategorical(tm.TestCase): - factor = Categorical.from_array(arr, ordered=False) - self.assertFalse(factor.ordered) - -- # this however will raise as cannot be sorted -- # but fixed in newer versions of numpy -- if LooseVersion(np.__version__) < "1.10": -+ if compat.PY3: - self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True)) - else: -- Categorical.from_array(arr, ordered=True) -+ # this however will raise as cannot be sorted (on PY3 or older numpies) -+ if LooseVersion(np.__version__) < "1.10": -+ self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True)) -+ else: -+ Categorical.from_array(arr, ordered=True) - - def test_is_equal_dtype(self): - diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml index 2633bf05b9c0..2afb9b3d5636 100644 --- a/dev-python/pandas/metadata.xml +++ b/dev-python/pandas/metadata.xml @@ -14,9 +14,6 @@ </longdescription> <use> <flag name="full-support">Pull all packages to give pandas full support</flag> - <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag> - <flag name="html">Enable HTML i/o via <pkg>dev-python/beautifulsoup</pkg></flag> - <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag> </use> <upstream> <remote-id type="pypi">pandas</remote-id> diff --git a/dev-python/pandas/pandas-0.16.2.ebuild b/dev-python/pandas/pandas-0.16.2.ebuild deleted file mode 100644 index 7b2da1706956..000000000000 --- a/dev-python/pandas/pandas-0.16.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils flag-o-matic virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="http://pandas.pydata.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc excel html test R" - -EXTRA_DEPEND=" - >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] - dev-python/openpyxl[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] - dev-python/psycopg:2[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - " -CDEPEND=" - >dev-python/numpy-1.7[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] - doc? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - dev-python/openpyxl[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[$(python_gen_usedep 'python2_7')] - dev-python/xlwt[$(python_gen_usedep 'python2_7')] - x11-misc/xclip - ) - test? ( - ${EXTRA_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND="${CDEPEND} - >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] - dev-python/bottleneck[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pytables[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - excel? ( - dev-python/xlrd[$(python_gen_usedep 'python2_7')] - dev-python/xlwt[$(python_gen_usedep 'python2_7')] - || ( - dev-python/xlsxwriter[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - ) - ) - html? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - || ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] ) - ) - R? ( dev-python/rpy[${PYTHON_USEDEP}] )" - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die - fi -} - -python_test() { - local test_pandas='not network and not disabled' - [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' - pushd "${BUILD_DIR}"/lib > /dev/null - VIRTUALX_COMMAND="nosetests" - PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - virtualmake --verbosity=3 -A "${test_pandas}" pandas - popd > /dev/null -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - local x - elog "Please install" - for x in ${EXTRA_DEPEND}; do - optfeature "additional functionality" "${x%%[*}" - done -} diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild deleted file mode 100644 index 22a63f27a32a..000000000000 --- a/dev-python/pandas/pandas-0.17.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils flag-o-matic virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="http://pandas.pydata.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc excel html test R" - -EXTRA_DEPEND=" - >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] - dev-python/openpyxl[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] - dev-python/psycopg:2[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - " -CDEPEND=" - >dev-python/numpy-1.7[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] - doc? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - x11-misc/xclip - ) - test? ( - ${EXTRA_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND="${CDEPEND} - >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] - dev-python/bottleneck[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pytables[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - excel? ( - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - || ( - dev-python/xlsxwriter[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - ) - ) - html? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - || ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] ) - ) - R? ( dev-python/rpy[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-testfix-backport.patch -) - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - - # https://github.com/pydata/pandas/issues/11299 - sed \ - -e 's:testOdArray:disable:g' \ - -i pandas/io/tests/test_json/test_ujson.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die - fi -} - -python_test() { - local test_pandas='not network and not disabled' - [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' - pushd "${BUILD_DIR}"/lib > /dev/null - "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die - VIRTUALX_COMMAND="nosetests" - PYTHONPATH=. MPLCONFIGDIR=. \ - virtualmake --verbosity=3 -A "${test_pandas}" pandas - popd > /dev/null -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - local x - elog "Please install" - for x in ${EXTRA_DEPEND}; do - optfeature "additional functionality" "${x%%[*}" - done -} diff --git a/dev-python/pandas/pandas-0.17.1.ebuild b/dev-python/pandas/pandas-0.17.1.ebuild deleted file mode 100644 index 8ddf16d1d5b1..000000000000 --- a/dev-python/pandas/pandas-0.17.1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -VIRTUALX_REQUIRED="manual" - -inherit distutils-r1 eutils flag-o-matic virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="http://pandas.pydata.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc -minimal full-support test X" - -MINIMAL_DEPEND=" - >dev-python/numpy-1.7[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - !<dev-python/numexpr-2.1[${PYTHON_USEDEP}] - !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" -RECOMMENDED_DEPEND=" - dev-python/bottleneck[${PYTHON_USEDEP}] - >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]" -OPTIONAL_DEPEND=" - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/blosc[${PYTHON_USEDEP}] - dev-python/boto[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] - || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ) - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] ) - >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}] - dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] - dev-python/rpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - X? ( - || ( - dev-python/PyQt4[${PYTHON_USEDEP}] - dev-python/pyside[${PYTHON_USEDEP}] - dev-python/pygtk[$(python_gen_usedep python2_7)] - ) - || ( - x11-misc/xclip - x11-misc/xsel - ) - ) - " - -DEPEND="${MINIMAL_DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] - doc? ( - ${VIRTUALX_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - x11-misc/xclip - ) - test? ( - ${VIRTUALX_DEPEND} - ${RECOMMENDED_DEPEND} - ${OPTIONAL_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - dev-python/psycopg:2[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND=" - ${MINIMAL_DEPEND} - !minimal? ( ${RECOMMENDED_DEPEND} ) - full-support? ( ${OPTIONAL_DEPEND} )" - -_PATCHES=( - "${FILESDIR}"/${P}-testfix-backport.patch -) - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - - # https://github.com/pydata/pandas/issues/11299 - sed \ - -e 's:testOdArray:disable:g' \ - -i pandas/io/tests/test_json/test_ujson.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - VIRTUALX_COMMAND="${EPYTHON}" - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. virtualmake make.py html || die - fi -} - -python_test() { - local test_pandas='not network and not disabled' - [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' - pushd "${BUILD_DIR}"/lib > /dev/null - "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die - VIRTUALX_COMMAND="nosetests" - PYTHONPATH=. MPLCONFIGDIR=. \ - virtualmake --verbosity=3 -A "${test_pandas}" pandas - popd > /dev/null -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck - optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1" - optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml - optfeature "for msgpack compression using blosc" dev-python/blosc - optfeature "necessary for Amazon S3 access" dev-python/boto - optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0" - optfeature "Template engine for conditional HTML formatting" dev-python/jinja - optfeature "Plotting support" dev-python/matplotlib - optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt - optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1" - optfeature "R I/O support" dev-python/rpy - optfeature "Needed for parts of pandas.stats" dev-python/statsmodels - optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1" - optfeature "miscellaneous statistical functions" sci-libs/scipy - optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel -} diff --git a/dev-python/pandas/pandas-0.20.1.ebuild b/dev-python/pandas/pandas-0.20.1.ebuild deleted file mode 100644 index 9e3b7f8bd657..000000000000 --- a/dev-python/pandas/pandas-0.20.1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -VIRTUALX_REQUIRED="manual" - -inherit distutils-r1 eutils flag-o-matic virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="http://pandas.pydata.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc -minimal full-support test X" - -MINIMAL_DEPEND=" - >dev-python/numpy-1.7[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - !<dev-python/numexpr-2.1[${PYTHON_USEDEP}] - !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" -RECOMMENDED_DEPEND=" - dev-python/bottleneck[${PYTHON_USEDEP}] - >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]" -OPTIONAL_DEPEND=" - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/blosc[${PYTHON_USEDEP}] - dev-python/boto[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] - || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ) - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] ) - >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}] - dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] - dev-python/rpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - X? ( - || ( - dev-python/PyQt4[${PYTHON_USEDEP}] - dev-python/pyside[${PYTHON_USEDEP}] - dev-python/pygtk[$(python_gen_usedep python2_7)] - ) - || ( - x11-misc/xclip - x11-misc/xsel - ) - ) - " - -DEPEND="${MINIMAL_DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cython-0.23[${PYTHON_USEDEP}] - doc? ( - ${VIRTUALX_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - x11-misc/xclip - ) - test? ( - ${VIRTUALX_DEPEND} - ${RECOMMENDED_DEPEND} - ${OPTIONAL_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - dev-python/psycopg:2[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND=" - ${MINIMAL_DEPEND} - !minimal? ( ${RECOMMENDED_DEPEND} ) - full-support? ( ${OPTIONAL_DEPEND} )" - -python_prepare_all() { - # Prevent un-needed download during build - sed \ - -e "/^ 'sphinx.ext.intersphinx',/d" \ - -i doc/source/conf.py || die - - # https://github.com/pydata/pandas/issues/11299 - sed \ - -e 's:testOdArray:disable:g' \ - -i pandas/tests/io/json/test_ujson.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die - fi -} - -python_test() { - local test_pandas='not network and not disabled' - [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' - pushd "${BUILD_DIR}"/lib > /dev/null - "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die - PYTHONPATH=. MPLCONFIGDIR=. \ - virtx nosetests --verbosity=3 -A "${test_pandas}" pandas - popd > /dev/null -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck - optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1" - optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml - optfeature "for msgpack compression using blosc" dev-python/blosc - optfeature "necessary for Amazon S3 access" dev-python/boto - optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0" - optfeature "Template engine for conditional HTML formatting" dev-python/jinja - optfeature "Plotting support" dev-python/matplotlib - optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt - optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1" - optfeature "R I/O support" dev-python/rpy - optfeature "Needed for parts of pandas.stats" dev-python/statsmodels - optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1" - optfeature "miscellaneous statistical functions" sci-libs/scipy - optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel -} diff --git a/dev-python/pandas/pandas-0.20.3.ebuild b/dev-python/pandas/pandas-0.20.3.ebuild deleted file mode 100644 index a28647857c1c..000000000000 --- a/dev-python/pandas/pandas-0.20.3.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -VIRTUALX_REQUIRED="manual" - -inherit distutils-r1 eutils flag-o-matic virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="http://pandas.pydata.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc -minimal full-support test X" - -MINIMAL_DEPEND=" - >dev-python/numpy-1.7[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - !<dev-python/numexpr-2.1[${PYTHON_USEDEP}] - !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" -RECOMMENDED_DEPEND=" - dev-python/bottleneck[${PYTHON_USEDEP}] - >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]" -OPTIONAL_DEPEND=" - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/blosc[${PYTHON_USEDEP}] - dev-python/boto[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] - || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ) - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] ) - >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}] - dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] - dev-python/rpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}] - dev-python/xarray[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - X? ( - || ( - dev-python/PyQt4[${PYTHON_USEDEP}] - dev-python/pyside[${PYTHON_USEDEP}] - dev-python/pygtk[$(python_gen_usedep python2_7)] - ) - || ( - x11-misc/xclip - x11-misc/xsel - ) - ) - " - -DEPEND="${MINIMAL_DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cython-0.23[${PYTHON_USEDEP}] - doc? ( - ${VIRTUALX_DEPEND} - app-text/pandoc - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - x11-misc/xclip - ) - test? ( - ${VIRTUALX_DEPEND} - ${RECOMMENDED_DEPEND} - ${OPTIONAL_DEPEND} - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - dev-python/psycopg:2[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND=" - ${MINIMAL_DEPEND} - !minimal? ( ${RECOMMENDED_DEPEND} ) - full-support? ( ${OPTIONAL_DEPEND} )" - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" \ - -i doc/source/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die - fi -} - -python_test() { - local test_pandas='not network and not disabled' - [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' - pushd "${BUILD_DIR}"/lib > /dev/null - "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die - PYTHONPATH=. MPLCONFIGDIR=. \ - virtx nosetests --verbosity=3 -A "${test_pandas}" pandas - popd > /dev/null -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck - optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1" - optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml - optfeature "for msgpack compression using blosc" dev-python/blosc - optfeature "necessary for Amazon S3 access" dev-python/boto - optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0" - optfeature "Template engine for conditional HTML formatting" dev-python/jinja - optfeature "Plotting support" dev-python/matplotlib - optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt - optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1" - optfeature "R I/O support" dev-python/rpy - optfeature "Needed for parts of pandas.stats" dev-python/statsmodels - optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1" - optfeature "miscellaneous statistical functions" sci-libs/scipy - optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel -} diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild index b06261624b06..5c6c63027b57 100644 --- a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326.ebuild +++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND="${DEPEND} dev-python/u-msgpack[${PYTHON_USEDEP}] ) dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/QtPy[gui,pyqt5,${PYTHON_USEDEP}] + >=dev-python/QtPy-1.3.1[gui,pyqt5(+),${PYTHON_USEDEP}] debug? ( dev-python/python-prctl[${PYTHON_USEDEP}] ) libnotify? ( dev-python/pygobject[${PYTHON_USEDEP}] diff --git a/profiles/package.mask b/profiles/package.mask index 09efcdc8571c..bc989747a7ae 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,10 @@ #--- END OF EXAMPLES --- # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018) +# Depends on dead Qt4. Masked for removal in 30 days. +dev-python/pyside-tools + +# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018) # Depends on dead Qt4, newer versions do not provide a GUI. # Masked for removal, bug #649572 <x11-misc/synergy-1.9.0 |