Import of pkgsrc-2016Q3

graphics/py-matplotlib/Makefile

@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.42 2014/02/06 01:53:16 obache Exp $
+# $NetBSD: Makefile,v 1.45 2016/08/17 13:45:25 richard Exp $
 
-DISTNAME=		matplotlib-1.3.1
+DISTNAME=		matplotlib-1.5.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=		1
 CATEGORIES=		graphics python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=matplotlib/}
+GITHUB_PROJECT=		matplotlib
+GITHUB_TAG=		v${PKGVERSION_NOREV}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://matplotlib.org/
 COMMENT=		Matlab-style plotting package for Python
+# LICENSE=		see ${WRKSRC}/LICENSE/LICENSE
 
 DEPENDS+=		${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
 DEPENDS+=		${PYPKGPREFIX}-pyparsing>=1.5.6:../../devel/py-pyparsing
+DEPENDS+=		${PYPKGPREFIX}-cycler-[0-9]*:../../graphics/py-cycler
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 
@@ -35,6 +39,16 @@ post-patch:
 	${ECHO} "tkagg = False"; \
 	${ECHO} "wxagg = False" ) > ${WRKSRC}/setup.cfg
 
+# It needs:
+# devel/py-nose
+# devel/py-mock
+do-test:
+	${ECHO} "backend      : GTKAgg" > ${WRKSRC}/matplotlibrc
+	${RUN} cd ${WRKSRC} && MPLCONFIGDIR=$PWD \
+	MATPLOTLIBDATA=${WRKSRC}/lib/matplotlib/mpl-data \
+	PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} \
+	${PYTHONBIN} -c "import matplotlib; matplotlib.test()"
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"

graphics/py-matplotlib/PLIST.Darwin

@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2016/03/27 22:34:00 jperkin Exp $
+${PYSITELIB}/matplotlib/backends/_macosx.so

graphics/py-matplotlib/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2014/02/26 10:36:58 wiedi Exp $
+$NetBSD: distinfo,v 1.25 2016/08/04 00:04:18 kamil Exp $
 
-SHA1 (matplotlib-1.3.1.tar.gz) = 8578afc86424392591c0ee03f7613ffa9b6f68ee
-RMD160 (matplotlib-1.3.1.tar.gz) = 7c2647ae1d6aafdc1c32e47183239c7da0d91956
-Size (matplotlib-1.3.1.tar.gz) = 42163182 bytes
-SHA1 (patch-ab) = 416ceee9a060b98b615ef9a98ac8cab25fa9f408
-SHA1 (patch-lib_matplotlib_tri___tri.cpp) = ca21c3045eef3dae741ad2b4403f78b505e0b579
-SHA1 (patch-lib_matplotlib_tri___tri.h) = f51cf95eed8e2a490d366ce39730587c944c60f4
+SHA1 (matplotlib-1.5.2.tar.gz) = 2c78d4b1d9cc1e064a7592158977cb22d6606ca7
+RMD160 (matplotlib-1.5.2.tar.gz) = 17406f510748a81dc5fc582a61cfba60b7e4bc9a
+SHA512 (matplotlib-1.5.2.tar.gz) = 7d4688665273d30a08edf0cf2414cf0c05c619335f72b190c6ea125687e74cafe6133b7f3b6588e969c931ec8f970593d44654766205e6cc19f760925826a7e3
+Size (matplotlib-1.5.2.tar.gz) = 50914982 bytes
+SHA1 (patch-setup.py) = 9f48a0035dc4573136635842b7b23e4b6dba3f76

graphics/py-matplotlib/patches/patch-lib_matplotlib_tri___tri.cpp

@@ -1,24 +0,0 @@
-$NetBSD: patch-lib_matplotlib_tri___tri.cpp,v 1.1 2014/02/26 10:36:58 wiedi Exp $
-
-Rename C++ variables to avoid use of reserved identifiers
-See: https://github.com/matplotlib/matplotlib/issues/2463
---- lib/matplotlib/tri/_tri.cpp.orig	2013-10-10 12:42:48.000000000 +0000
-+++ lib/matplotlib/tri/_tri.cpp
-@@ -2177,14 +2177,14 @@ TrapezoidMapTriFinder::Trapezoid::set_up
- 
- 
- RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)
--    : _M(21870), _A(1291), _C(4621), _seed(seed % _M)
-+    : _m(21870), _a(1291), _c(4621), _seed(seed % _m)
- {}
- 
- unsigned long
- RandomNumberGenerator::operator()(unsigned long max_value)
- {
--    _seed = (_seed*_A + _C) % _M;
--    return (_seed*max_value) / _M;
-+    _seed = (_seed*_a + _c) % _m;
-+    return (_seed*max_value) / _m;
- }
- 
- 

graphics/py-matplotlib/patches/patch-lib_matplotlib_tri___tri.h

@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_matplotlib_tri___tri.h,v 1.1 2014/02/26 10:36:58 wiedi Exp $
-
-Rename C++ variables to avoid use of reserved identifiers
-See: https://github.com/matplotlib/matplotlib/issues/2463
---- lib/matplotlib/tri/_tri.h.orig	2013-10-10 12:42:48.000000000 +0000
-+++ lib/matplotlib/tri/_tri.h
-@@ -818,7 +818,7 @@ public:
-     unsigned long operator()(unsigned long max_value);
- 
- private:
--    const unsigned long _M, _A, _C;
-+    const unsigned long _m, _a, _c;
-     unsigned long _seed;
- };
- 

graphics/py-matplotlib/patches/patch-setup.py

@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2014/01/21 21:14:06 drochner Exp $
+$NetBSD: patch-setup.py,v 1.1 2016/08/04 00:04:19 kamil Exp $
 
---- setup.py.orig	2013-10-10 12:42:48.000000000 +0000
+--- setup.py.orig	2016-07-03 15:37:10.000000000 +0000
 +++ setup.py
-@@ -88,12 +88,12 @@ mpl_packages = [
-     # work will be selected as the default backend.
+@@ -97,12 +97,12 @@ mpl_packages = [
      setupext.BackendMacOSX(),
+     setupext.BackendQt5(),
      setupext.BackendQt4(),
 -    setupext.BackendGtk3Agg(),
 -    setupext.BackendGtk3Cairo(),